BIP141 fix #416

pull jl2012 wants to merge 1 commits into bitcoin:master from jl2012:patch-26 changing 1 files +10 −13

jl2012 commented at 2:36 PM on July 10, 2016: contributor
@sipa
1. Make the use of "witness program" consistent
2. Fix: P2WSH script has a 10000 byte limit
3. Remove the mention of extending 32 bytes witness program with softfork

in bip-0141.mediawiki:None in 50ca5bc0e6 outdated

 122 | @@ -123,14 +123,14 @@ Sigops per block is currently limited to 20,000. We change this restriction as f
 123 |  Sigops in the current pubkey script, signature script, and P2SH check script are counted at 4 times their previous value.
 124 |  The sigop limit is likewise quadrupled to ≤ 80,000.
 125 |  
 126 | -In addition, opcodes within the witness program are counted identical to as previously within the P2SH check script.
 127 | -That is, CHECKSIG in a witness program is counted as only 1 sigop, and CHECKMULTISIG in a witness program is counted as 1 to 20 sigops according to the arguments. This rule applies to both native witness program and P2SH witness program.
 128 | +In addition, opcodes within the P2WPKH/P2WSH program are counted identical to as previously within the P2SH check script.
 129 | +That is, CHECKSIG in a P2WPKH/P2WSH program is counted as only 1 sigop, and CHECKMULTISIG in a P2WSH program is counted as 1 to 20 sigops according to the arguments. This rule applies to both native witness program and P2SH witness program.
 130 |

CodeShark commented at 3:12 AM on July 11, 2016:

I suggest we use the term "witness script" rather than "P2WPKH/P2WSH program" when talking about the unhashed sequence of op codes and data pushes that then get hashed into a P2WSH witness program. In the case of P2WPKH, the witness program is the pubkey hash and the script is implicit.

jl2012 commented at 6:37 PM on July 11, 2016: contributor

@CodeShark fixed
luke-jr commented at 2:58 PM on July 15, 2016: member

@jl2012 You are an Author of this BIP, so any PRs you open will automatically get merged... so please don't open PRs until you are certain of a change.

In this case, I will wait for an explicit ACK since it sounds like you're checking with @sipa before desiring it to be merged.
luke-jr added the label Proposed BIP modification on Jul 15, 2016

in bip-0141.mediawiki:None in f9eaecdec6 outdated

 122 | @@ -123,14 +123,16 @@ Sigops per block is currently limited to 20,000. We change this restriction as f
 123 |  Sigops in the current pubkey script, signature script, and P2SH check script are counted at 4 times their previous value.
 124 |  The sigop limit is likewise quadrupled to ≤ 80,000.
 125 |  
 126 | -In addition, opcodes within the witness program are counted identical to as previously within the P2SH check script.
 127 | -That is, CHECKSIG in a witness program is counted as only 1 sigop, and CHECKMULTISIG in a witness program is counted as 1 to 20 sigops according to the arguments. This rule applies to both native witness program and P2SH witness program.
 128 | +Each P2WPKH input is counted as 1 sigop.
 129 | +
 130 | +In addition, opcodes within a P2WSH witnessScript are counted identical to as previously within the P2SH check script.

sipa commented at 12:13 AM on July 16, 2016:

I'm not sure this sentence is grammatically correct.

CodeShark commented at 5:29 AM on July 16, 2016:

Right, it should be "identically as" - not "identical to as"

jl2012 force-pushed on Jul 18, 2016
BIP141 terms fix 55c3d8068a
jl2012 force-pushed on Jul 18, 2016
jl2012 commented at 4:17 PM on July 18, 2016: contributor

fixed and squashed
jl2012 cross-referenced this on Jul 18, 2016 from issue Sigops are in witnessScript, not witness program by instagibbs
sipa commented at 4:08 PM on July 21, 2016: member

ACK
luke-jr merged this on Jul 21, 2016
luke-jr closed this on Jul 21, 2016
theStack cross-referenced this on Jul 11, 2021 from issue test: refactor: fix segwit terminology (s/witness_program/witness_script/) by theStack
MarcoFalke referenced this in commit f2e41d1109 on Aug 1, 2021
sidhujag referenced this in commit 37caae2f93 on Aug 1, 2021

Contributors

Labels

Proposed BIP modification

Linked (view graph)

#379 Sigops are in witnessScript, not witness program