LBRYCommunity/lbcd
1
0
Fork 0
Code Issues 17 Pull requests 4 Projects Releases 28 Packages Wiki Activity

AddData([]byte{}) is valid and should push empty to the stack.

Browse source 
Doing so is perfectly idiomatic.  Fixes the last of the valid bitcoind
script tests. (by fixing the script parser :)
This commit is contained in:
Owain G. Ainsworth 2014-03-14 20:11:49 +00:00
parent 299dcc2fad
commit 02ee7762e4
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
scriptbuilder.go
View file

@ -41,18 +41,15 @@ func (b *ScriptBuilder) AddOp(opcode byte) *ScriptBuilder {
} }
// AddData pushes the passed data to the end of the script. It automatically // AddData pushes the passed data to the end of the script. It automatically
// chooses canonical opcodes depending on the length of the data. // chooses canonical opcodes depending on the length of the data. A zero length
// buffer will lead to a push of empty data onto the stack.
func (b *ScriptBuilder) AddData(data []byte) *ScriptBuilder { func (b *ScriptBuilder) AddData(data []byte) *ScriptBuilder {
// Don't modify the script at all if no data was passed.
dataLen := len(data) dataLen := len(data)
if dataLen == 0 {
return b
}
// When the data consists of a single number that can be represented // When the data consists of a single number that can be represented
// by one of the "small integer" opcodes, use that opcode instead of // by one of the "small integer" opcodes, use that opcode instead of
// a data push opcode followed by the number. // a data push opcode followed by the number.
if dataLen == 1 && data[0] == 0 { if dataLen == 0 || dataLen == 1 && data[0] == 0 {
b.script = append(b.script, OP_0) b.script = append(b.script, OP_0)
return b return b
} else if dataLen == 1 && data[0] <= 16 { } else if dataLen == 1 && data[0] <= 16 {