Skip to content

Commit cffbf1e

Browse files
committed
Merge #19073: Remove outdated comment about DER encoding
4c82579 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: bitcoin/bitcoin#3843 But in bitcoin/bitcoin#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 4c82579 Tree-SHA512: 7afbbae84ed4ecfaa0a273ae024b14f2b7ffe65307f078086fe0b5b645c57722bc2952fb15d167d9e4fa5b052d1d0ac6e5e33f57e8fc881c0ea611d352bccc1e
2 parents 48e114e + 4c82579 commit cffbf1e

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

src/script/standard.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,7 @@ extern unsigned nMaxDatacarrierBytes;
4444
/**
4545
* Mandatory script verification flags that all new blocks must comply with for
4646
* them to be valid. (but old blocks may not comply with) Currently just P2SH,
47-
* but in the future other flags may be added, such as a soft-fork to enforce
48-
* strict DER encoding.
47+
* but in the future other flags may be added.
4948
*
5049
* Failing one of these tests may trigger a DoS ban - see CheckInputScripts() for
5150
* details.

0 commit comments

Comments
 (0)