wire: remove erroneous witness size check in wire parsing
In this commit, we fix a bug that would cause nodes to be unable to parse a given block from the wire. The block would be properly accepted if fed in via other mechanisms. The issue here is that the old checks for the maximum witness size, circa segwit v0 where placed in the wire package _as well_ as the tx engine. This check should only be in the engine, since it's properly gated by other related scrip validation flags. The fix itself is simple: limit witnesses only based on the maximum block size in bytes, or ~4MB.
This commit is contained in:
parent
a0ff51b84a
commit
df89776a17
1 changed files with 6 additions and 6 deletions
|
@ -103,10 +103,9 @@ const (
|
|||
maxWitnessItemsPerInput = 500000
|
||||
|
||||
// maxWitnessItemSize is the maximum allowed size for an item within
|
||||
// an input's witness data. This number is derived from the fact that
|
||||
// for script validation, each pushed item onto the stack must be less
|
||||
// than 10k bytes.
|
||||
maxWitnessItemSize = 11000
|
||||
// an input's witness data. This value is bounded by the largest
|
||||
// possible block size, post segwit v1 (taproot).
|
||||
maxWitnessItemSize = 4_000_000
|
||||
)
|
||||
|
||||
// TxFlagMarker is the first byte of the FLAG field in a bitcoin tx
|
||||
|
@ -588,8 +587,9 @@ func (msg *MsgTx) BtcDecode(r io.Reader, pver uint32, enc MessageEncoding) error
|
|||
// item itself.
|
||||
txin.Witness = make([][]byte, witCount)
|
||||
for j := uint64(0); j < witCount; j++ {
|
||||
txin.Witness[j], err = readScript(r, pver,
|
||||
maxWitnessItemSize, "script witness item")
|
||||
txin.Witness[j], err = readScript(
|
||||
r, pver, maxWitnessItemSize, "script witness item",
|
||||
)
|
||||
if err != nil {
|
||||
returnScriptBuffers()
|
||||
return err
|
||||
|
|
Loading…
Reference in a new issue