bump signer to v0.2.0 (#40)

babylonchain · Jun 7, 2024 · 3c29492 · 3c29492
1 parent 63f7956
commit 3c29492
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/go.mod b/go.mod
@@ -50,6 +50,7 @@ require (
 
 require (
 	github.com/babylonchain/covenant-signer v0.1.2
+	github.com/babylonchain/networks/parameters v0.2.0
 	github.com/btcsuite/btcd/chaincfg/chainhash v1.1.0
 	github.com/btcsuite/btcwallet/wallet/txauthor v1.3.4
 	github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0
@@ -91,7 +92,6 @@ require (
 	github.com/aead/siphash v1.0.1 // indirect
 	github.com/andybalholm/brotli v1.0.5 // indirect
 	github.com/aws/aws-sdk-go v1.44.312 // indirect
-	github.com/babylonchain/networks/parameters v0.2.0 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect
 	github.com/bgentry/speakeasy v0.1.1-0.20220910012023-760eaf8b6816 // indirect
@@ -327,4 +327,4 @@ require (
 	sigs.k8s.io/yaml v1.4.0 // indirect
 )
 
-replace github.com/babylonchain/covenant-signer => github.com/babylonchain/covenant-signer v0.1.2
+replace github.com/babylonchain/covenant-signer => github.com/babylonchain/covenant-signer-private v0.2.0
diff --git a/go.sum b/go.sum
@@ -279,8 +279,8 @@ github.com/aws/aws-sdk-go v1.44.312/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8
 github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g=
 github.com/babylonchain/babylon v0.8.6-0.20240426101001-7778c798e236 h1:Ydna4VcP56xu1+zdgygqHdSCeMduZjuznVhr4exO5do=
 github.com/babylonchain/babylon v0.8.6-0.20240426101001-7778c798e236/go.mod h1:lfeASLNJgcUsX7LEns3HRUv0k+MjzcB2q2AMasfz38M=
-github.com/babylonchain/covenant-signer v0.1.2 h1:MaiMG2Rouw+wsA4PhWUtx9/WCYh0Y9r1rMENvzYs8zY=
-github.com/babylonchain/covenant-signer v0.1.2/go.mod h1:alX7NoDE2m7gW4O17hLAsluU30P0XaP5RlThAco8Y9Q=
+github.com/babylonchain/covenant-signer-private v0.2.0 h1:/Z6o9KLDSSHz0A3M/bUKzTjSr7pKX6cIG36tRE/4UzQ=
+github.com/babylonchain/covenant-signer-private v0.2.0/go.mod h1:eJOoz//rsRCCrAhop+/EqXcnsEgPEy+T8LO7ak6dBHo=
 github.com/babylonchain/networks/parameters v0.2.0 h1:f3e1MwMFm33mIKji7AgQk39aO9YIfbCbbjXtQHEQ99E=
 github.com/babylonchain/networks/parameters v0.2.0/go.mod h1:nejhvrL7Iwh5Vunvkg7pnomQZlHnyNzOY9lQaDp6tOA=
 github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=

diff --git a/itest/e2e_test.go b/itest/e2e_test.go
@@ -228,7 +228,7 @@ func StartManager(
 func startSigningServer(
 	t *testing.T,
 	magicBytes []byte,
-) (*config.RemoteSignerConfig, *signerapp.ParsedGlobalParams, *signerservice.SigningServer) {
+) (*config.RemoteSignerConfig, *parser.ParsedGlobalParams, *signerservice.SigningServer) {
 	appConfig := signercfg.DefaultConfig()
 	appConfig.BtcNodeConfig.Host = "127.0.0.1:18443"
 	appConfig.BtcNodeConfig.User = "user"
@@ -292,8 +292,8 @@ func startSigningServer(
 	chainInfo := signerapp.NewBitcoindChainInfo(client)
 	signer := signerapp.NewPsbtSigner(client)
 
-	signerGlobalParams := signerapp.ParsedGlobalParams{
-		Versions: []*signerapp.ParsedVersionedGlobalParams{
+	signerGlobalParams := parser.ParsedGlobalParams{
+		Versions: []*parser.ParsedVersionedGlobalParams{
 			{
 				Version:           0,
 				ActivationHeight:  0,
@@ -315,7 +315,9 @@ func startSigningServer(
 	app := signerapp.NewSignerApp(
 		signer,
 		chainInfo,
-		&signerGlobalParams,
+		&signerapp.VersionedParamsRetriever{
+			ParsedGlobalParams: &signerGlobalParams,
+		},
 		netParams,
 	)