Migrate go-bt to bsv-blockchain org dependency (#6)

galt-tr · web-flow · commit 877793a18dcc · 2025-07-02T11:36:02.000-04:00
diff --git a/coinbase_placeholder.go b/coinbase_placeholder.go
@@ -1,8 +1,8 @@
 package subtree
 
 import (
-	"github.com/libsv/go-bt/v2"
-	"github.com/libsv/go-bt/v2/chainhash"
+	"github.com/bsv-blockchain/go-bt/v2"
+	"github.com/bsv-blockchain/go-bt/v2/chainhash"
 )
 
 var (
diff --git a/coinbase_placeholder_test.go b/coinbase_placeholder_test.go
@@ -3,7 +3,7 @@ package subtree
 import (
 	"testing"
 
-	"github.com/libsv/go-bt/v2"
+	"github.com/bsv-blockchain/go-bt/v2"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/go.mod b/go.mod
@@ -3,9 +3,9 @@ module github.com/bsv-blockchain/go-subtree
 go 1.24
 
 require (
-	github.com/bsv-blockchain/go-safe-conversion v1.0.0
-	github.com/bsv-blockchain/go-tx-map v1.0.0
-	github.com/libsv/go-bt/v2 v2.2.5
+	github.com/bsv-blockchain/go-bt/v2 v2.3.0
+	github.com/bsv-blockchain/go-safe-conversion v1.0.1
+	github.com/bsv-blockchain/go-tx-map v1.0.2
 	github.com/stretchr/testify v1.10.0
 	golang.org/x/exp v0.0.0-20250620022241-b7579e27df2b
 )
@@ -21,5 +21,3 @@ require (
 	google.golang.org/protobuf v1.36.6 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
-
-replace github.com/libsv/go-bt/v2 => github.com/ordishs/go-bt/v2 v2.2.22
diff --git a/go.sum b/go.sum
@@ -1,7 +1,9 @@
-github.com/bsv-blockchain/go-safe-conversion v1.0.0 h1:5KVzKpCcuDVYDwuvAiP/9E4xe80CCvFuLY/nwtht7wc=
-github.com/bsv-blockchain/go-safe-conversion v1.0.0/go.mod h1:Fmat8fhPfMrdGCGv9PZ+QOkpQutD61hssbaLto4+3ks=
-github.com/bsv-blockchain/go-tx-map v1.0.0 h1:oeGI6et039crvzuELKHojYdlZwDNf+UCv9r1+63sZHE=
-github.com/bsv-blockchain/go-tx-map v1.0.0/go.mod h1:xCauj1rtF8dxuxP8WusegkFLzmcVCuLzcYZfjwXOi3Y=
+github.com/bsv-blockchain/go-bt/v2 v2.3.0 h1:ZEFtKV93wq59qna9/DEp4NJmVb5hZgF3h1vGXNLKMeU=
+github.com/bsv-blockchain/go-bt/v2 v2.3.0/go.mod h1:NzalErv8cCi3VDZYNLaHxnP2PiiDFIQS6dgQgBGTV4A=
+github.com/bsv-blockchain/go-safe-conversion v1.0.1 h1:b/AVkGVF2JnKRgG0oVpCRFAZBgghylDbgSD47VdM6KI=
+github.com/bsv-blockchain/go-safe-conversion v1.0.1/go.mod h1:q2+SQIAONrc2T7Ip1W9OsEzKXLoWeI06vuVm0Q85Bss=
+github.com/bsv-blockchain/go-tx-map v1.0.2 h1:ysCpTSxNJg2xjksDTeF3x9vdXpLIhuoZA4St6OIMAGM=
+github.com/bsv-blockchain/go-tx-map v1.0.2/go.mod h1:ObWqa+SIkbRhXYa8swAiRSof1Bhw8Z13w4QxYBiNy6E=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/dolthub/maphash v0.1.0 h1:bsQ7JsF4FkkWyrP3oCnFJgrCUAFbFf3kOl4L/QxPDyQ=
@@ -16,8 +18,6 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/libsv/go-bk v0.1.6 h1:c9CiT5+64HRDbzxPl1v/oiFmbvWZTuUYqywCf+MBs/c=
 github.com/libsv/go-bk v0.1.6/go.mod h1:khJboDoH18FPUaZlzRFKzlVN84d4YfdmlDtdX4LAjQA=
-github.com/ordishs/go-bt/v2 v2.2.22 h1:5WmTQoX74g9FADM9hpbXZOE34uep4EqeSwpIy4CbWYE=
-github.com/ordishs/go-bt/v2 v2.2.22/go.mod h1:bOaZFOoazYognJH/nfcBjuDFud1XmIc05n7bp4Tvvfk=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
diff --git a/inpoints.go b/inpoints.go
@@ -8,8 +8,8 @@ import (
 	"math"
 	"slices"
 
-	"github.com/libsv/go-bt/v2"
-	"github.com/libsv/go-bt/v2/chainhash"
+	"github.com/bsv-blockchain/go-bt/v2"
+	"github.com/bsv-blockchain/go-bt/v2/chainhash"
 )
 
 type Inpoint struct {
diff --git a/inpoints_test.go b/inpoints_test.go
@@ -3,7 +3,7 @@ package subtree
 import (
 	"testing"
 
-	"github.com/libsv/go-bt/v2/chainhash"
+	"github.com/bsv-blockchain/go-bt/v2/chainhash"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/merkle_tree.go b/merkle_tree.go
@@ -6,7 +6,7 @@ import (
 	"math"
 	"sync"
 
-	"github.com/libsv/go-bt/v2/chainhash"
+	"github.com/bsv-blockchain/go-bt/v2/chainhash"
 )
 
 func GetMerkleProofForCoinbase(subtrees []*Subtree) ([]*chainhash.Hash, error) {
diff --git a/merkle_tree_test.go b/merkle_tree_test.go
@@ -3,7 +3,7 @@ package subtree
 import (
 	"testing"
 
-	"github.com/libsv/go-bt/v2/chainhash"
+	"github.com/bsv-blockchain/go-bt/v2/chainhash"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/subtree.go b/subtree.go
@@ -9,9 +9,9 @@ import (
 	"math"
 	"sync"
 
+	"github.com/bsv-blockchain/go-bt/v2/chainhash"
 	safe "github.com/bsv-blockchain/go-safe-conversion"
 	txmap "github.com/bsv-blockchain/go-tx-map"
-	"github.com/libsv/go-bt/v2/chainhash"
 )
 
 type SubtreeNode struct {
diff --git a/subtree_benchmark_test.go b/subtree_benchmark_test.go
@@ -5,8 +5,8 @@ import (
 	"encoding/binary"
 	"testing"
 
+	"github.com/bsv-blockchain/go-bt/v2/chainhash"
 	"github.com/bsv-blockchain/go-subtree"
-	"github.com/libsv/go-bt/v2/chainhash"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/subtree_data.go b/subtree_data.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"io"
 
-	"github.com/libsv/go-bt/v2"
-	"github.com/libsv/go-bt/v2/chainhash"
+	"github.com/bsv-blockchain/go-bt/v2"
+	"github.com/bsv-blockchain/go-bt/v2/chainhash"
 )
 
 type SubtreeData struct {
diff --git a/subtree_data_test.go b/subtree_data_test.go
@@ -6,7 +6,7 @@ import (
 	"io"
 	"testing"
 
-	"github.com/libsv/go-bt/v2"
+	"github.com/bsv-blockchain/go-bt/v2"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/subtree_meta.go b/subtree_meta.go
@@ -6,9 +6,9 @@ import (
 	"fmt"
 	"io"
 
+	"github.com/bsv-blockchain/go-bt/v2"
+	"github.com/bsv-blockchain/go-bt/v2/chainhash"
 	safe "github.com/bsv-blockchain/go-safe-conversion"
-	"github.com/libsv/go-bt/v2"
-	"github.com/libsv/go-bt/v2/chainhash"
 )
 
 type SubtreeMeta struct {
diff --git a/subtree_meta_test.go b/subtree_meta_test.go
@@ -4,8 +4,8 @@ import (
 	"bytes"
 	"testing"
 
-	"github.com/libsv/go-bt/v2"
-	"github.com/libsv/go-bt/v2/chainhash"
+	"github.com/bsv-blockchain/go-bt/v2"
+	"github.com/bsv-blockchain/go-bt/v2/chainhash"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/subtree_test.go b/subtree_test.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/libsv/go-bt/v2/chainhash"
+	"github.com/bsv-blockchain/go-bt/v2/chainhash"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`package subtree`
`2`	`2`
`3`	`3`	`import (`
`4`		`- "github.com/libsv/go-bt/v2"`
`5`		`- "github.com/libsv/go-bt/v2/chainhash"`
	`4`	`+ "github.com/bsv-blockchain/go-bt/v2"`
	`5`	`+ "github.com/bsv-blockchain/go-bt/v2/chainhash"`
`6`	`6`	`)`
`7`	`7`
`8`	`8`	`var (`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ package subtree`
`3`	`3`	`import (`
`4`	`4`	`"testing"`
`5`	`5`
`6`		`- "github.com/libsv/go-bt/v2"`
	`6`	`+ "github.com/bsv-blockchain/go-bt/v2"`
`7`	`7`	`"github.com/stretchr/testify/assert"`
`8`	`8`	`)`
`9`	`9`
Original file line number	Diff line number	Diff line change
`@@ -8,8 +8,8 @@ import (`
`8`	`8`	`"math"`
`9`	`9`	`"slices"`
`10`	`10`
`11`		`- "github.com/libsv/go-bt/v2"`
`12`		`- "github.com/libsv/go-bt/v2/chainhash"`
	`11`	`+ "github.com/bsv-blockchain/go-bt/v2"`
	`12`	`+ "github.com/bsv-blockchain/go-bt/v2/chainhash"`
`13`	`13`	`)`
`14`	`14`
`15`	`15`	`type Inpoint struct {`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ import (`
`6`	`6`	`"math"`
`7`	`7`	`"sync"`
`8`	`8`
`9`		`- "github.com/libsv/go-bt/v2/chainhash"`
	`9`	`+ "github.com/bsv-blockchain/go-bt/v2/chainhash"`
`10`	`10`	`)`
`11`	`11`
`12`	`12`	`func GetMerkleProofForCoinbase(subtrees []Subtree) ([]chainhash.Hash, error) {`
Original file line number	Diff line number	Diff line change
`@@ -9,9 +9,9 @@ import (`
`9`	`9`	`"math"`
`10`	`10`	`"sync"`
`11`	`11`
	`12`	`+ "github.com/bsv-blockchain/go-bt/v2/chainhash"`
`12`	`13`	`safe "github.com/bsv-blockchain/go-safe-conversion"`
`13`	`14`	`txmap "github.com/bsv-blockchain/go-tx-map"`
`14`		`- "github.com/libsv/go-bt/v2/chainhash"`
`15`	`15`	`)`
`16`	`16`
`17`	`17`	`type SubtreeNode struct {`
Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,8 @@ import (`
`5`	`5`	`"encoding/binary"`
`6`	`6`	`"testing"`
`7`	`7`
	`8`	`+ "github.com/bsv-blockchain/go-bt/v2/chainhash"`
`8`	`9`	`"github.com/bsv-blockchain/go-subtree"`
`9`		`- "github.com/libsv/go-bt/v2/chainhash"`
`10`	`10`	`"github.com/stretchr/testify/assert"`
`11`	`11`	`"github.com/stretchr/testify/require"`
`12`	`12`	`)`