Skip to content

Commit 6180f11

Browse files
rohenazrohenaz
committed
fix tx parsing issue
1 parent a704072 commit 6180f11

10 files changed

+364
-114
lines changed

‎README.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ vet Run the Go vet application
127127
## Examples & Tests
128128

129129
All unit tests and [examples](examples) run via [Github Actions](https://github.com/BitcoinSchema/go-bob/actions) and
130-
uses [Go version 1.17.x](https://golang.org/doc/go1.17). View the [configuration file](.github/workflows/run-tests.yml).
130+
uses [Go version 1.19.x](https://golang.org/doc/go1.19). View the [configuration file](.github/workflows/run-tests.yml).
131131

132132
Run all tests (including integration tests)
133133

@@ -191,8 +191,6 @@ type Tx struct {
191191

192192
### BOB Helpers
193193

194-
**BOB from bytes ([bitbus](https://docs.bitbus.network/#/))**
195-
196194
```go
197195
bobTx, err = NewFromBytes(tx)
198196
```

‎bob_test.go

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,19 @@ import (
55
"testing"
66

77
"github.com/bitcoinschema/go-bitcoin/v2"
8+
"github.com/bitcoinschema/go-bob/test"
89
"github.com/libsv/go-bt/v2"
910
"github.com/stretchr/testify/assert"
1011
)
1112

13+
var sampleBobTx, sampleBobTxBadStrings, rawBobTx string
14+
15+
func init() {
16+
sampleBobTx = test.GetTestHex("./test/bob/207eaadc096849e037b8944df21a8bba6d91d8445848db047c0a3f963121e19d.json")
17+
sampleBobTxBadStrings = test.GetTestHex("./test/bob/26b754e6fdf04121b8d91160a0b252a22ae30204fc552605b7f6d3f08419f29e.json")
18+
rawBobTx = test.GetTestHex("./test/tx/2.hex")
19+
}
20+
1221
// TestNewFromBytes tests for nil case in NewFromBytes()
1322
func TestNewFromBytes(t *testing.T) {
1423

@@ -356,6 +365,23 @@ func TestNewFromTx(t *testing.T) {
356365
}
357366
}
358367

368+
func TestNewFromTxString(t *testing.T) {
369+
// BAP attestation
370+
testHex := test.GetTestHex("./test/tx/98a5f6ef18eaea188bdfdc048f89a48af82627a15a76fd53584975f28ab3cc39.hex")
371+
bobTxFromString, err := NewFromRawTxString(testHex)
372+
if err != nil {
373+
t.Fatalf("error occurred1: %s", err.Error())
374+
}
375+
376+
bapOut := &bobTxFromString.Out[0].Tape[1]
377+
const bapPrefix = "1BAPSuaPnfGnSBM3GLV9yhxUdYe4vGbdMT"
378+
379+
if bapOut.Cell[0].S != bapPrefix {
380+
t.Errorf("Expected string(%s) is not same as actual string (%s)", bapPrefix, bapOut.Cell[0].S)
381+
}
382+
383+
}
384+
359385
// ExampleNewFromTx example using NewFromTx()
360386
func ExampleNewFromTx() {
361387
// Use an example TX

‎go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/bitcoinschema/go-bob
22

3-
go 1.17
3+
go 1.19
44

55
require (
66
github.com/bitcoinschema/go-bitcoin/v2 v2.0.0-alpha.3
@@ -14,7 +14,7 @@ require (
1414
github.com/libsv/go-bk v0.1.6 // indirect
1515
github.com/pkg/errors v0.9.1 // indirect
1616
github.com/pmezard/go-difflib v1.0.0 // indirect
17-
golang.org/x/crypto v0.4.0 // indirect
17+
golang.org/x/crypto v0.5.0 // indirect
1818
gopkg.in/yaml.v3 v3.0.1 // indirect
1919
)
2020

‎go.sum

Lines changed: 2 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
77
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
88
github.com/libsv/go-bk v0.1.6 h1:c9CiT5+64HRDbzxPl1v/oiFmbvWZTuUYqywCf+MBs/c=
99
github.com/libsv/go-bk v0.1.6/go.mod h1:khJboDoH18FPUaZlzRFKzlVN84d4YfdmlDtdX4LAjQA=
10-
github.com/libsv/go-bt/v2 v2.1.0-beta.2.0.20211221142324-0d686850c5e0/go.mod h1:KbBf6ugGNMtVwtCSUtlSAHoVhbAie4hu2VM97d1ZL8I=
1110
github.com/libsv/go-bt/v2 v2.1.1 h1:mhE1re2uEOCPTm9vKVtvTcmc2htVFrw2Qna3k9jdbGg=
1211
github.com/libsv/go-bt/v2 v2.1.1/go.mod h1:mdzxtlFZ3Ht8gVCyMJOEza6+xMmpiAfF6Whv8+PDqNI=
1312
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
@@ -17,47 +16,12 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN
1716
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
1817
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
1918
github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
20-
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
2119
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
2220
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
2321
github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
2422
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
25-
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
26-
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
27-
golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
28-
golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
29-
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
30-
golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
31-
golang.org/x/crypto v0.4.0 h1:UVQgzMY87xqpKNgb+kDsll2Igd33HszWHFLmpaRMq/8=
32-
golang.org/x/crypto v0.4.0/go.mod h1:3quD/ATkf6oY+rnes5c3ExXTbLc8mueNue5/DoinL80=
33-
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
34-
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
35-
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
36-
golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
37-
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
38-
golang.org/x/net v0.3.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE=
39-
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
40-
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
41-
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
42-
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
43-
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
44-
golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
45-
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
46-
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
47-
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
48-
golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
49-
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
50-
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
51-
golang.org/x/term v0.3.0/go.mod h1:q750SLmJuPmVoN1blW3UFBPREJfb1KmY3vwxfr+nFDA=
52-
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
53-
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
54-
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
55-
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
56-
golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
57-
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
58-
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
59-
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
60-
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
23+
golang.org/x/crypto v0.5.0 h1:U/0M97KRkSFvyD/3FSmdP5W5swImpNgle/EHFhOsQPE=
24+
golang.org/x/crypto v0.5.0/go.mod h1:NK/OQwhpMQP3MwtdjgLlYHnH9ebylxKWv3e0fK+mkQU=
6125
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
6226
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
6327
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

‎test/bob/207eaadc096849e037b8944df21a8bba6d91d8445848db047c0a3f963121e19d.json

Lines changed: 134 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,134 @@
1+
{
2+
"_id": "5ed082db57cd6b1658b88400",
3+
"tx": {
4+
"h": "207eaadc096849e037b8944df21a8bba6d91d8445848db047c0a3f963121e19d"
5+
},
6+
"in": [
7+
{
8+
"i": 0,
9+
"tape": [
10+
{
11+
"cell": [
12+
{
13+
"b": "MEUCIQDwEsO9N4EJGqjlPKsv/LkKzO2MZVALQQhv0iXkjJjB1wIgC4/xF7js0rLX6VVRvFobO7zKgEmGRHmii+2dyEKoaARB",
14+
"s": "0E\u0002!\u0000�\u0012ý7�\t\u001a��<�/��\n��eP\u000bA\bo�%䌘��\u0002 \u000b��\u0017��Ҳ��UQ�Z\u001b;�ʀI�Dy����B�h\u0004A",
15+
"ii": 0,
16+
"i": 0
17+
},
18+
{
19+
"b": "A+9bsilk1SnAr3SNmmOBQy8FKY56Zu0v4i55dbFQJSin",
20+
"s": "\u0003�[�)d�)��t��c�C/\u0005)�zf�/�.yu�P%(�",
21+
"ii": 1,
22+
"i": 1
23+
}
24+
],
25+
"i": 0
26+
}
27+
],
28+
"e": {
29+
"h": "3d1fc854830cb7f5cf4e89459f1e2f4331ffed09ad66a02ce1140c553c9d5af1",
30+
"i": 1,
31+
"a": "1FFuYLM8a66GddCG25nUbarazeMr5dnUwC"
32+
},
33+
"seq": 4294967295
34+
}
35+
],
36+
"out": [
37+
{
38+
"i": 0,
39+
"tape": [
40+
{
41+
"cell": [
42+
{
43+
"op": 0,
44+
"ops": "OP_0",
45+
"ii": 0,
46+
"i": 0
47+
},
48+
{
49+
"op": 106,
50+
"ops": "OP_RETURN",
51+
"ii": 1,
52+
"i": 1
53+
}
54+
],
55+
"i": 0
56+
},
57+
{
58+
"cell": [
59+
{
60+
"b": "5LiA54Gv6IO96Zmk5Y2D5bm05pqX",
61+
"s": "一灯能除千年暗",
62+
"ii": 2,
63+
"i": 0
64+
},
65+
{
66+
"b": "NThhNTk3",
67+
"s": "58a597",
68+
"ii": 3,
69+
"i": 1
70+
}
71+
],
72+
"i": 1
73+
}
74+
],
75+
"e": {
76+
"v": 0,
77+
"i": 0,
78+
"a": "false"
79+
}
80+
},
81+
{
82+
"i": 1,
83+
"tape": [
84+
{
85+
"cell": [
86+
{
87+
"op": 118,
88+
"ops": "OP_DUP",
89+
"ii": 0,
90+
"i": 0
91+
},
92+
{
93+
"op": 169,
94+
"ops": "OP_HASH160",
95+
"ii": 1,
96+
"i": 1
97+
},
98+
{
99+
"b": "nGNxXG0fpsYbMdKRFRbhw9s736g=",
100+
"s": "�cq\\m\u001f��\u001b1ґ\u0015\u0016���;ߨ",
101+
"ii": 2,
102+
"i": 2
103+
},
104+
{
105+
"op": 136,
106+
"ops": "OP_EQUALVERIFY",
107+
"ii": 3,
108+
"i": 3
109+
},
110+
{
111+
"op": 172,
112+
"ops": "OP_CHECKSIG",
113+
"ii": 4,
114+
"i": 4
115+
}
116+
],
117+
"i": 0
118+
}
119+
],
120+
"e": {
121+
"v": 111411,
122+
"i": 1,
123+
"a": "1FFuYLM8a66GddCG25nUbarazeMr5dnUwC"
124+
}
125+
}
126+
],
127+
"lock": 0,
128+
"blk": {
129+
"i": 635140,
130+
"h": "0000000000000000031d01ce0a8471d6cfab81d403ba10c878f671eac28d5d39",
131+
"t": 1589607858
132+
},
133+
"i": 4042
134+
}

0 commit comments

Comments
 (0)