Skip to content

Commit fdad1fa

Browse files
RoasbeefRoasbeef
committed
multi: pin new v2 submodule tags and bump to v0.26.0-beta.rc1
In this commit, we strip all of the local `replace ... => ../...` directives that were introduced as part of #1825 (the v2 module restructuring), now that proper tags exist for every freshly carved-out submodule. Every in-tree go.mod is pinned to the newly published tags: chainhash/v2.0.0, wire/v2.0.0, chaincfg/v2.0.0, address/v2.0.0, txscript/v2.0.0, btcutil/v2.0.0, psbt/v2.0.0, and btcec is bumped to v2.5.0 since it now depends on chainhash/v2 (previously chaincfg/chainhash). While here, we also unify the Go toolchain to 1.25 across every submodule so the workspace resolves a consistent set of language features. Finally, we bump the main btcd version to v0.26.0-beta.rc1 in preparation for the upcoming release candidate.
1 parent 258049c commit fdad1fa

18 files changed

Lines changed: 76 additions & 109 deletions

File tree

‎address/go.mod‎

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module github.com/btcsuite/btcd/address/v2
33
go 1.25
44

55
require (
6-
github.com/btcsuite/btcd/btcec/v2 v2.3.2
6+
github.com/btcsuite/btcd/btcec/v2 v2.5.0
77
github.com/btcsuite/btcd/chaincfg/v2 v2.0.0
88
github.com/btcsuite/btcd/wire/v2 v2.0.0
99
github.com/stretchr/testify v1.10.0
@@ -18,15 +18,3 @@ require (
1818
golang.org/x/sys v0.35.0 // indirect
1919
gopkg.in/yaml.v3 v3.0.1 // indirect
2020
)
21-
22-
// TODO(guggero): Remove this as soon as we have a tagged version of btcec.
23-
replace github.com/btcsuite/btcd/btcec/v2 => ../btcec
24-
25-
// TODO(guggero): Remove this as soon as we have a tagged version of chaincfg.
26-
replace github.com/btcsuite/btcd/chaincfg/v2 => ../chaincfg
27-
28-
// TODO(guggero): Remove this as soon as we have a tagged version of chainhash.
29-
replace github.com/btcsuite/btcd/chainhash/v2 => ../chainhash
30-
31-
// TODO(guggero): Remove this as soon as we have a tagged version of wire.
32-
replace github.com/btcsuite/btcd/wire/v2 => ../wire

‎address/go.sum‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
github.com/btcsuite/btcd/btcec/v2 v2.5.0 h1:KioMXOWa76b86sTZZOmbzv/ldaQCmB8KFAyn5PbB8E8=
2+
github.com/btcsuite/btcd/btcec/v2 v2.5.0/go.mod h1:+K/MYXcLBtHEQjRbjHuJChuybk4LCgjdjgRwil+e+Kk=
3+
github.com/btcsuite/btcd/chaincfg/v2 v2.0.0 h1:M/RTtXfXA9odC1RUEOyZFXj/NXKVHPYZXVjb60xTOok=
4+
github.com/btcsuite/btcd/chaincfg/v2 v2.0.0/go.mod h1:rHgHIXYYfn70m25a+BJ9f9z7VZAsTiDQGB2XYaippGQ=
5+
github.com/btcsuite/btcd/chainhash/v2 v2.0.0 h1:PMLlSloHJuEeB80XG9EjpXWNEKAZAMLl6YHZ6YsEuoA=
6+
github.com/btcsuite/btcd/chainhash/v2 v2.0.0/go.mod h1:mKxcZ7oGTXE7IRV+sS9hP4EVBwc/SzfNR+52IsOP9j8=
7+
github.com/btcsuite/btcd/wire/v2 v2.0.0 h1:mYSKzZZ0a1sK+aMhXzfDSVsSzRkWkU3x2U04TFRS2z8=
8+
github.com/btcsuite/btcd/wire/v2 v2.0.0/go.mod h1:bGxkPkk8IiDvUo1D96wE03llBIk7p2MdWYRyAQwLmqM=
19
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
210
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
311
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0 h1:NMZiJj8QnKe1LgsbDayM4UoHwbvwDRwnI3hwNaAHRnc=

‎btcec/go.mod‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,3 @@ require (
1414
github.com/pmezard/go-difflib v1.0.0 // indirect
1515
gopkg.in/yaml.v3 v3.0.1 // indirect
1616
)
17-
18-
// TODO(guggero): Remove once we have a tagged version of the chainhash package.
19-
replace github.com/btcsuite/btcd/chainhash/v2 => ../chainhash

‎btcec/go.sum‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
github.com/btcsuite/btcd/chainhash/v2 v2.0.0 h1:PMLlSloHJuEeB80XG9EjpXWNEKAZAMLl6YHZ6YsEuoA=
2+
github.com/btcsuite/btcd/chainhash/v2 v2.0.0/go.mod h1:mKxcZ7oGTXE7IRV+sS9hP4EVBwc/SzfNR+52IsOP9j8=
13
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
24
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
35
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=

‎btcutil/go.mod‎

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ go 1.25
55
require (
66
github.com/aead/siphash v1.0.1
77
github.com/btcsuite/btcd/address/v2 v2.0.0
8-
github.com/btcsuite/btcd/btcec/v2 v2.4.0
8+
github.com/btcsuite/btcd/btcec/v2 v2.5.0
99
github.com/btcsuite/btcd/chaincfg/v2 v2.0.0
1010
github.com/btcsuite/btcd/chainhash/v2 v2.0.0
1111
github.com/btcsuite/btcd/txscript/v2 v2.0.0
@@ -22,21 +22,3 @@ require (
2222
golang.org/x/crypto v0.40.0 // indirect
2323
golang.org/x/sys v0.35.0 // indirect
2424
)
25-
26-
// TODO(guggero): Remove this as soon as we have a tagged version of address.
27-
replace github.com/btcsuite/btcd/address/v2 => ../address
28-
29-
// TODO(guggero): Remove this as soon as we have a tagged version of btcec.
30-
replace github.com/btcsuite/btcd/btcec/v2 => ../btcec
31-
32-
// TODO(guggero): Remove this as soon as we have a tagged version of chaincfg.
33-
replace github.com/btcsuite/btcd/chaincfg/v2 => ../chaincfg
34-
35-
// TODO(guggero): Remove this as soon as we have a tagged version of chainhash.
36-
replace github.com/btcsuite/btcd/chainhash/v2 => ../chainhash
37-
38-
// TODO(guggero): Remove this as soon as we have a tagged version of txscript.
39-
replace github.com/btcsuite/btcd/txscript/v2 => ../txscript
40-
41-
// TODO(guggero): Remove this as soon as we have a tagged version of wire.
42-
replace github.com/btcsuite/btcd/wire/v2 => ../wire

‎btcutil/go.sum‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,17 @@
11
github.com/aead/siphash v1.0.1 h1:FwHfE/T45KPKYuuSAKyyvE+oPWcaQ+CUmFW0bPlM+kg=
22
github.com/aead/siphash v1.0.1/go.mod h1:Nywa3cDsYNNK3gaciGTWPwHt0wlpNV15vwmswBAUSII=
3+
github.com/btcsuite/btcd/address/v2 v2.0.0 h1:UVu8Hal6Siu4XastFe+JX5JkeBYONbDUIY5E+SVTs6I=
4+
github.com/btcsuite/btcd/address/v2 v2.0.0/go.mod h1:htJK1AtaeK3bKNfZY63ep2oN8LbrI6qvmPGe1vekb3I=
5+
github.com/btcsuite/btcd/btcec/v2 v2.5.0 h1:KioMXOWa76b86sTZZOmbzv/ldaQCmB8KFAyn5PbB8E8=
6+
github.com/btcsuite/btcd/btcec/v2 v2.5.0/go.mod h1:+K/MYXcLBtHEQjRbjHuJChuybk4LCgjdjgRwil+e+Kk=
7+
github.com/btcsuite/btcd/chaincfg/v2 v2.0.0 h1:M/RTtXfXA9odC1RUEOyZFXj/NXKVHPYZXVjb60xTOok=
8+
github.com/btcsuite/btcd/chaincfg/v2 v2.0.0/go.mod h1:rHgHIXYYfn70m25a+BJ9f9z7VZAsTiDQGB2XYaippGQ=
9+
github.com/btcsuite/btcd/chainhash/v2 v2.0.0 h1:PMLlSloHJuEeB80XG9EjpXWNEKAZAMLl6YHZ6YsEuoA=
10+
github.com/btcsuite/btcd/chainhash/v2 v2.0.0/go.mod h1:mKxcZ7oGTXE7IRV+sS9hP4EVBwc/SzfNR+52IsOP9j8=
11+
github.com/btcsuite/btcd/txscript/v2 v2.0.0 h1:pEmmHaC8eRx6KSB63zSVJD7qrit9/c9cLSrw++XrYP8=
12+
github.com/btcsuite/btcd/txscript/v2 v2.0.0/go.mod h1:pZXabc11Xr9nz/18kXY3yErdAajYc3gi28Zqb3KqlFo=
13+
github.com/btcsuite/btcd/wire/v2 v2.0.0 h1:mYSKzZZ0a1sK+aMhXzfDSVsSzRkWkU3x2U04TFRS2z8=
14+
github.com/btcsuite/btcd/wire/v2 v2.0.0/go.mod h1:bGxkPkk8IiDvUo1D96wE03llBIk7p2MdWYRyAQwLmqM=
315
github.com/btcsuite/btclog v1.0.0 h1:sEkpKJMmfGiyZjADwEIgB1NSwMyfdD1FB8v6+w1T0Ns=
416
github.com/btcsuite/btclog v1.0.0/go.mod h1:w7xnGOhwT3lmrS4H3b/D1XAXxvh+tbhUm8xeHN2y3TQ=
517
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=

‎chaincfg/go.mod‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/btcsuite/btcd/chaincfg/v2
22

3-
go 1.23.2
3+
go 1.25
44

55
require (
66
github.com/btcsuite/btcd/chainhash/v2 v2.0.0
@@ -15,9 +15,3 @@ require (
1515
golang.org/x/sys v0.35.0 // indirect
1616
gopkg.in/yaml.v3 v3.0.1 // indirect
1717
)
18-
19-
// TODO(guggero): Remove once we have a tagged version of the chainhash package.
20-
replace github.com/btcsuite/btcd/chainhash/v2 => ../chainhash
21-
22-
// TODO(guggero): Remove once we have a tagged version of the wire package.
23-
replace github.com/btcsuite/btcd/wire/v2 => ../wire

‎chaincfg/go.sum‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
github.com/btcsuite/btcd/chainhash/v2 v2.0.0 h1:PMLlSloHJuEeB80XG9EjpXWNEKAZAMLl6YHZ6YsEuoA=
2+
github.com/btcsuite/btcd/chainhash/v2 v2.0.0/go.mod h1:mKxcZ7oGTXE7IRV+sS9hP4EVBwc/SzfNR+52IsOP9j8=
3+
github.com/btcsuite/btcd/wire/v2 v2.0.0 h1:mYSKzZZ0a1sK+aMhXzfDSVsSzRkWkU3x2U04TFRS2z8=
4+
github.com/btcsuite/btcd/wire/v2 v2.0.0/go.mod h1:bGxkPkk8IiDvUo1D96wE03llBIk7p2MdWYRyAQwLmqM=
15
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
26
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
37
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=

‎chainhash/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
module github.com/btcsuite/btcd/chainhash/v2
22

3-
go 1.23.2
3+
go 1.25

‎go.mod‎

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ go 1.25
44

55
require (
66
github.com/btcsuite/btcd/address/v2 v2.0.0
7-
github.com/btcsuite/btcd/btcec/v2 v2.4.0
7+
github.com/btcsuite/btcd/btcec/v2 v2.5.0
88
github.com/btcsuite/btcd/btcutil/v2 v2.0.0
99
github.com/btcsuite/btcd/chaincfg/v2 v2.0.0
1010
github.com/btcsuite/btcd/chainhash/v2 v2.0.0
@@ -39,27 +39,6 @@ require (
3939
gopkg.in/yaml.v3 v3.0.1 // indirect
4040
)
4141

42-
// TODO(guggero): Remove this as soon as we have a tagged version of address.
43-
replace github.com/btcsuite/btcd/address/v2 => ./address
44-
45-
// TODO(guggero): Remove this as soon as we have a tagged version of btcec.
46-
replace github.com/btcsuite/btcd/btcec/v2 => ./btcec
47-
48-
// TODO(guggero): Remove this as soon as we have a tagged version of btcutil.
49-
replace github.com/btcsuite/btcd/btcutil/v2 => ./btcutil
50-
51-
// TODO(guggero): Remove this as soon as we have a tagged version of chaincfg.
52-
replace github.com/btcsuite/btcd/chaincfg/v2 => ./chaincfg
53-
54-
// TODO(guggero): Remove this as soon as we have a tagged version of chainhash.
55-
replace github.com/btcsuite/btcd/chainhash/v2 => ./chainhash
56-
57-
// TODO(guggero): Remove this as soon as we have a tagged version of txscript.
58-
replace github.com/btcsuite/btcd/txscript/v2 => ./txscript
59-
60-
// TODO(guggero): Remove this as soon as we have a tagged version of wire.
61-
replace github.com/btcsuite/btcd/wire/v2 => ./wire
62-
6342
// The retract statements below fixes an accidental push of the tags of a btcd
6443
// fork.
6544
retract (

0 commit comments

Comments
 (0)