diff options
| author | fanquake <fanquake@gmail.com> | 2020-05-27 18:14:55 +0800 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2020-05-27 18:35:54 +0800 |
| commit | cffbf1eb9a4771034bda6f0a4faa2465e7640b2e (patch) | |
| tree | 452671a06e3458d1dee76a25909e847f9252eff4 /src | |
| parent | 48e114e0a86f0b3e97303333877d1c3086155c2f (diff) | |
| parent | 4c825792dd9f4eaf4936c3e376ac7a5c177528e2 (diff) | |
| download | bitcoin-cffbf1eb9a4771034bda6f0a4faa2465e7640b2e.tar.xz | |
Merge #19073: Remove outdated comment about DER encoding
4c825792dd9f4eaf4936c3e376ac7a5c177528e2 Remove outdated comment about DER encoding (Elichai Turkel)
Pull request description:
This comment got me confused about the status of BIP66 (Thanks jnewbery for explaining)
The comment was added in: https://github.com/bitcoin/bitcoin/pull/3843
But in https://github.com/bitcoin/bitcoin/pull/5713 strict DER encoding was enforced in consensus,
and is now it's buried and enforced by the height of the block here: https://github.com/bitcoin/bitcoin/blob/4af01b37d40246cd1fdb54719855927e36a36b46/src/validation.cpp#L1889
P.S. This is also quite confusing: https://github.com/bitcoin/bitcoin/blob/4af01b37d40246cd1fdb54719855927e36a36b46/src/validation.cpp#L1560-L1563 But seems to be intentional: https://github.com/bitcoin/bitcoin/blob/4af01b37d40246cd1fdb54719855927e36a36b46/src/validation.cpp#L1510-L1511
ACKs for top commit:
laanwj:
ACK 4c825792dd9f4eaf4936c3e376ac7a5c177528e2
Tree-SHA512: 7afbbae84ed4ecfaa0a273ae024b14f2b7ffe65307f078086fe0b5b645c57722bc2952fb15d167d9e4fa5b052d1d0ac6e5e33f57e8fc881c0ea611d352bccc1e
Diffstat (limited to 'src')
| -rw-r--r-- | src/script/standard.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/script/standard.h b/src/script/standard.h index 49a45f3eba..8e50e064bb 100644 --- a/src/script/standard.h +++ b/src/script/standard.h @@ -44,8 +44,7 @@ extern unsigned nMaxDatacarrierBytes; /** * Mandatory script verification flags that all new blocks must comply with for * them to be valid. (but old blocks may not comply with) Currently just P2SH, - * but in the future other flags may be added, such as a soft-fork to enforce - * strict DER encoding. + * but in the future other flags may be added. * * Failing one of these tests may trigger a DoS ban - see CheckInputScripts() for * details. |