Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix panic in ToAsm() caused by last commit. #109

Merged
merged 11 commits into from
Mar 19, 2022
Merged

Fix panic in ToAsm() caused by last commit. #109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
21853b4
Adding NewTxFromReader and associated io.Reader implementations
ordishs Sep 27, 2021
1a500d6
Adding test for new Reader functions
ordishs Sep 27, 2021
8aa2708
Fix "shadow" warning
ordishs Sep 27, 2021
6fe2c20
Merge branch 'v1' of https://github.com/libsv/go-bt into v1
ordishs Sep 28, 2021
7251a33
Read locktime into locktime var rather than version
ordishs Oct 1, 2021
0b8bf74
Merge branch 'v1' of https://github.com/libsv/go-bt into v1
ordishs Oct 22, 2021
a2a3bcd
Use strings.Builder to optimize toASM()
ordishs Oct 28, 2021
98992ff
Merge branch 'v1' of https://github.com/libsv/go-bt into v1
ordishs Nov 28, 2021
0d5d9a0
Fix ToAsm to match bitcoind for OP_RETURN scripts
ordishs Mar 18, 2022
dd0a19c
Merge branch 'v1' of https://github.com/libsv/go-bt into v1
ordishs Mar 19, 2022
c0c7cdf
Fix panic caused by last commit
ordishs Mar 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions bscript/script.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,10 +218,12 @@ func (s *Script) ToASM() (string, error) {
}
} else {
if data && len(p) <= 4 {
b := make([]byte, 0)
b = append(b, p...)
for i := 0; i < 4-len(p); i++ {
p = append(p, 0)
b = append(b, 0)
}
asmScript.WriteString(fmt.Sprintf("%d", binary.LittleEndian.Uint32(p)))
asmScript.WriteString(fmt.Sprintf("%d", binary.LittleEndian.Uint32(b)))
} else {
asmScript.WriteString(hex.EncodeToString(p))
}
Expand Down
16 changes: 16 additions & 0 deletions bscript/script_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,3 +214,19 @@ func TestRunScriptExample2(t *testing.T) {
t.Errorf("\nExpected %q\ngot %q", expected, asm)
}
}

func TestRunScriptExample3(t *testing.T) {
script, _ := hex.DecodeString("006a223139694733575459537362796f7333754a373333794b347a45696f69314665734e55010042666166383166326364346433663239383061623162363564616166656231656631333561626339643534386461633466366134656361623230653033656365362d300274780134")
s := bscript.Script(script)

asm, err := s.ToASM()
if err != nil {
t.Error(err)
t.FailNow()
}

expected := "0 OP_RETURN 3139694733575459537362796f7333754a373333794b347a45696f69314665734e55 0 666166383166326364346433663239383061623162363564616166656231656631333561626339643534386461633466366134656361623230653033656365362d30 30836 52"
if asm != expected {
t.Errorf("\nExpected %q\ngot %q", expected, asm)
}
}