Skip to content

Commit 1320849

Browse files
gitferrygitferry
authored
Merge pull request #54 from babylonchain/gai/bump-babylon-0.9.0-rc.3
hotfix: Bump babylon and renamed magic bytes to tag
2 parents 8ba711e + f472d66 commit 1320849

11 files changed

+60
-55
lines changed

‎cmd/createStakingTxCmd.go‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import (
1818
)
1919

2020
var (
21-
FlagMagicBytes = "magic-bytes"
21+
FlagTag = "tag"
2222
FlagStakerPk = "staker-pk"
2323
FlagStakingAmount = "staking-amount"
2424
FlagStakingTime = "staking-time"
@@ -186,17 +186,17 @@ func parseTimeLock(timeBlocks int64) (uint16, error) {
186186
return uint16(timeBlocks), nil
187187
}
188188

189-
func parseMagicBytesFromHex(magicBytesHex string) ([]byte, error) {
190-
magicBytes, err := hex.DecodeString(magicBytesHex)
189+
func parseTagFromHex(tagHex string) ([]byte, error) {
190+
tag, err := hex.DecodeString(tagHex)
191191
if err != nil {
192192
return nil, err
193193
}
194194

195-
if len(magicBytes) != btcstaking.MagicBytesLen {
196-
return nil, fmt.Errorf("magic bytes should be of length %d", btcstaking.MagicBytesLen)
195+
if len(tag) != btcstaking.TagLen {
196+
return nil, fmt.Errorf("tag should be of length %d", btcstaking.TagLen)
197197
}
198198

199-
return magicBytes, nil
199+
return tag, nil
200200
}
201201

202202
func parsePosNum(num int64) (uint32, error) {
@@ -216,8 +216,8 @@ type CreateStakingTxResp struct {
216216
}
217217

218218
func init() {
219-
createStakingTxCmd.Flags().String(FlagMagicBytes, "", "magic bytes")
220-
_ = createStakingTxCmd.MarkFlagRequired(FlagMagicBytes)
219+
createStakingTxCmd.Flags().String(FlagTag, "", "tag")
220+
_ = createStakingTxCmd.MarkFlagRequired(FlagTag)
221221
createStakingTxCmd.Flags().String(FlagStakerPk, "", "staker pk")
222222
_ = createStakingTxCmd.MarkFlagRequired(FlagStakerPk)
223223
createStakingTxCmd.Flags().String(FlagFinalityProviderPk, "", "finality provider pk")
@@ -246,7 +246,7 @@ var createStakingTxCmd = &cobra.Command{
246246
return err
247247
}
248248

249-
magicBytes, err := parseMagicBytesFromHex(mustGetStringFlag(cmd, FlagMagicBytes))
249+
tag, err := parseTagFromHex(mustGetStringFlag(cmd, FlagTag))
250250

251251
if err != nil {
252252
return err
@@ -289,7 +289,7 @@ var createStakingTxCmd = &cobra.Command{
289289
}
290290

291291
_, tx, err := btcstaking.BuildV0IdentifiableStakingOutputsAndTx(
292-
magicBytes,
292+
tag,
293293
stakerPk,
294294
finalityProviderPk,
295295
covenantCommitteePks,

‎cmd/createUnbondingTxCmd.go‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,15 @@ import (
55
"fmt"
66

77
"github.com/babylonchain/babylon/btcstaking"
8-
"github.com/babylonchain/cli-tools/internal/btcclient"
9-
"github.com/babylonchain/cli-tools/internal/config"
108
"github.com/btcsuite/btcd/btcec/v2"
119
"github.com/btcsuite/btcd/btcutil"
1210
"github.com/btcsuite/btcd/chaincfg"
1311
"github.com/btcsuite/btcd/wire"
1412
"github.com/decred/dcrd/dcrec/secp256k1/v4"
1513
"github.com/spf13/cobra"
14+
15+
"github.com/babylonchain/cli-tools/internal/btcclient"
16+
"github.com/babylonchain/cli-tools/internal/config"
1617
)
1718

1819
var (
@@ -31,8 +32,8 @@ func init() {
3132
// parsing it wil fail
3233
createUnbondingTxCmd.Flags().String(FlagStakingTxHex, "", "funded staking tx hex")
3334
_ = createUnbondingTxCmd.MarkFlagRequired(FlagStakingTxHex)
34-
createUnbondingTxCmd.Flags().String(FlagMagicBytes, "", "magic bytes")
35-
_ = createUnbondingTxCmd.MarkFlagRequired(FlagMagicBytes)
35+
createUnbondingTxCmd.Flags().String(FlagTag, "", "tag")
36+
_ = createUnbondingTxCmd.MarkFlagRequired(FlagTag)
3637
createUnbondingTxCmd.Flags().Int64(FlagUnbondingTime, 0, "unbonding time")
3738
_ = createUnbondingTxCmd.MarkFlagRequired(FlagUnbondingTime)
3839
createUnbondingTxCmd.Flags().Int64(FlagUnbondingTxFee, 0, "unbonding fee")
@@ -142,7 +143,7 @@ var createUnbondingTxCmd = &cobra.Command{
142143
return err
143144
}
144145

145-
magicBytes, err := parseMagicBytesFromHex(mustGetStringFlag(cmd, FlagMagicBytes))
146+
tag, err := parseTagFromHex(mustGetStringFlag(cmd, FlagTag))
146147

147148
if err != nil {
148149
return err
@@ -180,7 +181,7 @@ var createUnbondingTxCmd = &cobra.Command{
180181

181182
parsedStakingTx, err := btcstaking.ParseV0StakingTx(
182183
stakingTx,
183-
magicBytes,
184+
tag,
184185
covenantCommitteePks,
185186
covenantQuorum,
186187
btcParams,

‎cmd/createWithdrawTxCmg.go‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,14 @@ import (
44
"fmt"
55

66
"github.com/babylonchain/babylon/btcstaking"
7-
"github.com/babylonchain/cli-tools/internal/btcclient"
8-
"github.com/babylonchain/cli-tools/internal/config"
97
"github.com/btcsuite/btcd/btcec/v2"
108
"github.com/btcsuite/btcd/btcutil"
119
"github.com/btcsuite/btcd/txscript"
1210
"github.com/btcsuite/btcd/wire"
1311
"github.com/spf13/cobra"
12+
13+
"github.com/babylonchain/cli-tools/internal/btcclient"
14+
"github.com/babylonchain/cli-tools/internal/config"
1415
)
1516

1617
var (
@@ -24,8 +25,8 @@ func init() {
2425
// parsing it wil fail
2526
createWithdrawCmd.Flags().String(FlagStakingTxHex, "", "funded staking tx hex")
2627
_ = createWithdrawCmd.MarkFlagRequired(FlagStakingTxHex)
27-
createWithdrawCmd.Flags().String(FlagMagicBytes, "", "magic bytes")
28-
_ = createWithdrawCmd.MarkFlagRequired(FlagMagicBytes)
28+
createWithdrawCmd.Flags().String(FlagTag, "", "tag")
29+
_ = createWithdrawCmd.MarkFlagRequired(FlagTag)
2930
createWithdrawCmd.Flags().Int64(FlagWithdrawTxFee, 0, "withdraw fee")
3031
_ = createWithdrawCmd.MarkFlagRequired(FlagWithdrawTxFee)
3132
createWithdrawCmd.Flags().StringSlice(FlagCovenantCommitteePks, nil, "covenant committee pks")
@@ -74,7 +75,7 @@ var createWithdrawCmd = &cobra.Command{
7475
return err
7576
}
7677

77-
magicBytes, err := parseMagicBytesFromHex(mustGetStringFlag(cmd, FlagMagicBytes))
78+
tag, err := parseTagFromHex(mustGetStringFlag(cmd, FlagTag))
7879

7980
if err != nil {
8081
return err
@@ -118,7 +119,7 @@ var createWithdrawCmd = &cobra.Command{
118119

119120
parsedStakingTx, err := btcstaking.ParseV0StakingTx(
120121
stakingTx,
121-
magicBytes,
122+
tag,
122123
covenantCommitteePks,
123124
covenantQuorum,
124125
btcParams,

‎go.mod‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ go 1.22.3
55
toolchain go1.22.4
66

77
require (
8-
github.com/babylonchain/babylon v0.9.0-rc.1
8+
github.com/babylonchain/babylon v0.9.0-rc.3
99
github.com/babylonchain/covenant-signer v0.2.6
1010
github.com/babylonchain/networks/parameters v0.2.1
11-
github.com/btcsuite/btcd v0.24.0
11+
github.com/btcsuite/btcd v0.24.2
1212
github.com/btcsuite/btcd/btcec/v2 v2.3.2
1313
github.com/btcsuite/btcd/btcutil v1.1.5
1414
github.com/btcsuite/btcd/chaincfg/chainhash v1.1.0
@@ -262,6 +262,7 @@ require (
262262
github.com/sasha-s/go-deadlock v0.3.1 // indirect
263263
github.com/sirupsen/logrus v1.9.0 // indirect
264264
github.com/soheilhy/cmux v0.1.5 // indirect
265+
github.com/stretchr/objx v0.5.2 // indirect
265266
github.com/supranational/blst v0.3.11 // indirect
266267
github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d // indirect
267268
github.com/tendermint/go-amino v0.16.0 // indirect

‎go.sum‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -277,8 +277,8 @@ github.com/aws/aws-sdk-go v1.44.122/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX
277277
github.com/aws/aws-sdk-go v1.44.312 h1:llrElfzeqG/YOLFFKjg1xNpZCFJ2xraIi3PqSuP+95k=
278278
github.com/aws/aws-sdk-go v1.44.312/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI=
279279
github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g=
280-
github.com/babylonchain/babylon v0.9.0-rc.1 h1:mZYKQVHVKFUA2xaEAzJloB1kyePHvZECJPgm3p9TYas=
281-
github.com/babylonchain/babylon v0.9.0-rc.1/go.mod h1:YFALTW+Kp/b5jSDoA7Z70RggJjAedlmQTrpdeU8c3hY=
280+
github.com/babylonchain/babylon v0.9.0-rc.3 h1:Coaf37uqVvNBMpR0VR8nRcJsCx9FpAU4psRc5BGK1K8=
281+
github.com/babylonchain/babylon v0.9.0-rc.3/go.mod h1:QTjpnEAEReQofIpZikCQXUZxSkdK0TrWAUbgxOSF9yA=
282282
github.com/babylonchain/covenant-signer v0.2.6 h1:Dh72ounwl4WsPVd99IBY7uWlSv7zOXwWeMLOfkEx4+U=
283283
github.com/babylonchain/covenant-signer v0.2.6/go.mod h1:67vSxNxAi/tfDp0WhVK2Sutj/f/ml1lJERY3asR3VuU=
284284
github.com/babylonchain/networks/parameters v0.2.1 h1:OKHiCnwL/UdVN17cMwCrHz/bAjO/USauLiPyNlnVl6E=
@@ -304,8 +304,8 @@ github.com/btcsuite/btcd v0.22.0-beta.0.20220207191057-4dc4ff7963b4/go.mod h1:7a
304304
github.com/btcsuite/btcd v0.23.1/go.mod h1:0QJIIN1wwIXF/3G/m87gIwGniDMDQqjVn4SZgnFpsYY=
305305
github.com/btcsuite/btcd v0.23.3/go.mod h1:0QJIIN1wwIXF/3G/m87gIwGniDMDQqjVn4SZgnFpsYY=
306306
github.com/btcsuite/btcd v0.23.5-0.20231215221805-96c9fd8078fd/go.mod h1:nm3Bko6zh6bWP60UxwoT5LzdGJsQJaPo6HjduXq9p6A=
307-
github.com/btcsuite/btcd v0.24.0 h1:gL3uHE/IaFj6fcZSu03SvqPMSx7s/dPzfpG/atRwWdo=
308-
github.com/btcsuite/btcd v0.24.0/go.mod h1:K4IDc1593s8jKXIF7yS7yCTSxrknB9z0STzc2j6XgE4=
307+
github.com/btcsuite/btcd v0.24.2 h1:aLmxPguqxza+4ag8R1I2nnJjSu2iFn/kqtHTIImswcY=
308+
github.com/btcsuite/btcd v0.24.2/go.mod h1:5C8ChTkl5ejr3WHj8tkQSCmydiMEPB0ZhQhehpq7Dgg=
309309
github.com/btcsuite/btcd/btcec/v2 v2.1.0/go.mod h1:2VzYrv4Gm4apmbVVsSq5bqf1Ec8v56E48Vt0Y/umPgA=
310310
github.com/btcsuite/btcd/btcec/v2 v2.1.3/go.mod h1:ctjw4H1kknNJmRN4iP1R7bTQ+v3GJkZBd6mui8ZsAZE=
311311
github.com/btcsuite/btcd/btcec/v2 v2.3.2 h1:5n0X6hX0Zk+6omWcihdYvdAlGf2DfasC0GMf7DClJ3U=

‎internal/services/expected_interfaces.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ type BtcSender interface {
6565
type SystemParams struct {
6666
CovenantPublicKeys []*btcec.PublicKey
6767
CovenantQuorum uint32
68-
MagicBytes []byte
68+
Tag []byte
6969
}
7070

7171
type ParamsRetriever interface {

‎internal/services/global_params.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,6 @@ func (g *VersionedParamsRetriever) ParamsByHeight(_ context.Context, height uint
2727
return &SystemParams{
2828
CovenantPublicKeys: versionedParams.CovenantPks,
2929
CovenantQuorum: versionedParams.CovenantQuorum,
30-
MagicBytes: versionedParams.Tag,
30+
Tag: versionedParams.Tag,
3131
}, nil
3232
}

‎internal/services/unbonding_pipeline.go‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,16 @@ import (
99

1010
"github.com/babylonchain/babylon/btcstaking"
1111
"github.com/babylonchain/babylon/types"
12-
"github.com/babylonchain/cli-tools/internal/btcclient"
13-
"github.com/babylonchain/cli-tools/internal/config"
14-
"github.com/babylonchain/cli-tools/internal/db"
1512
"github.com/btcsuite/btcd/btcec/v2"
1613
"github.com/btcsuite/btcd/btcec/v2/schnorr"
1714
"github.com/btcsuite/btcd/chaincfg"
1815
"github.com/btcsuite/btcd/chaincfg/chainhash"
1916
"github.com/btcsuite/btcd/wire"
2017
"github.com/prometheus/client_golang/prometheus/push"
18+
19+
"github.com/babylonchain/cli-tools/internal/btcclient"
20+
"github.com/babylonchain/cli-tools/internal/config"
21+
"github.com/babylonchain/cli-tools/internal/db"
2122
)
2223

2324
var (
@@ -58,26 +59,26 @@ func pubKeyToStringCompressed(pubKey *btcec.PublicKey) string {
5859
type SystemParamsRetriever struct {
5960
CovenantPublicKeys []*btcec.PublicKey
6061
CovenantQuorum uint32
61-
MagicBytes []byte
62+
Tag []byte
6263
}
6364

6465
func NewSystemParamsRetriever(
6566
quorum uint32,
6667
pubKeys []*btcec.PublicKey,
67-
magicBytes []byte,
68+
tag []byte,
6869
) *SystemParamsRetriever {
6970
return &SystemParamsRetriever{
7071
CovenantQuorum: quorum,
7172
CovenantPublicKeys: pubKeys,
72-
MagicBytes: magicBytes,
73+
Tag: tag,
7374
}
7475
}
7576

7677
func (p *SystemParamsRetriever) GetParams() (*SystemParams, error) {
7778
return &SystemParams{
7879
CovenantQuorum: p.CovenantQuorum,
7980
CovenantPublicKeys: p.CovenantPublicKeys,
80-
MagicBytes: p.MagicBytes,
81+
Tag: p.Tag,
8182
}, nil
8283
}
8384

‎internal/services/unbonding_pipeline_test.go‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,6 @@ import (
55
"testing"
66

77
"github.com/babylonchain/babylon/btcstaking"
8-
"github.com/babylonchain/cli-tools/internal/config"
9-
"github.com/babylonchain/cli-tools/internal/logger"
10-
"github.com/babylonchain/cli-tools/internal/mocks"
11-
"github.com/babylonchain/cli-tools/internal/services"
128
"github.com/btcsuite/btcd/btcec/v2"
139
"github.com/btcsuite/btcd/btcec/v2/schnorr"
1410
"github.com/btcsuite/btcd/btcutil"
@@ -17,11 +13,16 @@ import (
1713
"github.com/btcsuite/btcd/wire"
1814
"github.com/golang/mock/gomock"
1915
"github.com/stretchr/testify/require"
16+
17+
"github.com/babylonchain/cli-tools/internal/config"
18+
"github.com/babylonchain/cli-tools/internal/logger"
19+
"github.com/babylonchain/cli-tools/internal/mocks"
20+
"github.com/babylonchain/cli-tools/internal/services"
2021
)
2122

2223
var (
2324
testParams = chaincfg.MainNetParams
24-
magicBytes = []byte{0x00, 0x01, 0x02, 0x03}
25+
tag = []byte{0x00, 0x01, 0x02, 0x03}
2526
)
2627

2728
type MockedDependencies struct {
@@ -56,7 +57,7 @@ func NewUnbondingData(
5657
fpKey, err := btcec.NewPrivateKey()
5758
require.NoError(t, err)
5859
stakingInfo, stakingTx, err := btcstaking.BuildV0IdentifiableStakingOutputsAndTx(
59-
magicBytes,
60+
tag,
6061
stakerPubKey,
6162
fpKey.PubKey(),
6263
covenantInfo.GetCovenantPublicKeys(),
@@ -183,7 +184,7 @@ func TestValidSigningFlow(t *testing.T) {
183184
deps.pr.EXPECT().ParamsByHeight(gomock.Any(), uint64(stakingTxHeight)).Return(&services.SystemParams{
184185
CovenantPublicKeys: covenantMembers.GetCovenantPublicKeys(),
185186
CovenantQuorum: covenantQuorum,
186-
MagicBytes: magicBytes,
187+
Tag: tag,
187188
}, nil)
188189
deps.cs.EXPECT().SignUnbondingTransaction(gomock.Any()).Return(covenantSignatures[0], nil)
189190
deps.bs.EXPECT().CheckTxOutSpendable(
@@ -229,7 +230,7 @@ func TestInvalidSignatureHandling(t *testing.T) {
229230
deps.pr.EXPECT().ParamsByHeight(gomock.Any(), uint64(stakingTxHeight)).Return(&services.SystemParams{
230231
CovenantPublicKeys: covenantMembers.GetCovenantPublicKeys(),
231232
CovenantQuorum: covenantQuorum,
232-
MagicBytes: magicBytes,
233+
Tag: tag,
233234
}, nil)
234235

235236
// tamper signature so it is invalid

‎internal/services/witness_gen.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ func CreateUnbondingPathSpendInfo(
5858
net *chaincfg.Params,
5959
) (*wire.TxOut, *staking.SpendInfo, error) {
6060
info, err := staking.BuildV0IdentifiableStakingOutputs(
61-
params.MagicBytes,
61+
params.Tag,
6262
stakingInfo.StakerPk,
6363
stakingInfo.FinalityProviderPk,
6464
params.CovenantPublicKeys,

0 commit comments

Comments
 (0)