77 "context"
88 "encoding/hex"
99 "fmt"
10+ "math"
1011 "testing"
1112 "time"
1213
@@ -74,8 +75,9 @@ func defaultStakingData() *stakingData {
7475 stakingAmount : btcutil .Amount (100000 ),
7576 stakingTime : 10000 ,
7677 stakingFeeRate : btcutil .Amount (5000 ), // feeRatePerKb
77- unbondingTime : 100 ,
78- unbondingFee : btcutil .Amount (10000 ),
78+ // TODO: Move those to global params
79+ unbondingTime : 100 ,
80+ unbondingFee : btcutil .Amount (10000 ),
7981 }
8082}
8183
@@ -130,9 +132,7 @@ func StartManager(
130132 appConfig .Btc .Network = netParams .Name
131133
132134 magicBytes := []byte {0x0 , 0x1 , 0x2 , 0x3 }
133- signerCfg , quorum , signingServer := startSigningServer (t , magicBytes )
134- parsedSignerCfg , err := signerCfg .Parse ()
135- require .NoError (t , err )
135+ signerCfg , signerGlobalParams , signingServer := startSigningServer (t , magicBytes )
136136
137137 appConfig .Signer = * signerCfg
138138 appConfig .Db .Address = fmt .Sprintf ("mongodb://%s" , m .MongoHost ())
@@ -141,8 +141,8 @@ func StartManager(
141141
142142 ver := services.ParsedVersionedGlobalParams {
143143 Version : 0 ,
144- CovenantPks : parsedSignerCfg . PublicKeys ,
145- CovenantQuorum : quorum ,
144+ CovenantPks : signerGlobalParams . Versions [ 0 ]. CovenantPks ,
145+ CovenantQuorum : signerGlobalParams . Versions [ 0 ]. CovenantQuorum ,
146146 Tag : magicBytes ,
147147 }
148148
@@ -164,7 +164,7 @@ func StartManager(
164164
165165 err = client .UnlockWallet (60 * 60 * 60 , passphrase )
166166 require .NoError (t , err )
167- stakerPrivKey , err := client . DumpPrivateKey ( walletAddress )
167+ stakerPrivKey , err := btcec . NewPrivateKey ( )
168168 require .NoError (t , err )
169169
170170 fpKey , err := btcec .NewPrivateKey ()
@@ -187,8 +187,8 @@ func StartManager(
187187 bitcoindHandler : h ,
188188 walletPass : passphrase ,
189189 btcClient : client ,
190- covenantPublicKeys : parsedSignerCfg . PublicKeys ,
191- covenantQuorum : quorum ,
190+ covenantPublicKeys : signerGlobalParams . Versions [ 0 ]. CovenantPks ,
191+ covenantQuorum : signerGlobalParams . Versions [ 0 ]. CovenantQuorum ,
192192 finalityProviderKey : fpKey ,
193193 stakerAddress : walletAddress ,
194194 stakerPrivKey : stakerPrivKey ,
@@ -205,9 +205,8 @@ func StartManager(
205205func startSigningServer (
206206 t * testing.T ,
207207 magicBytes []byte ,
208- ) (* config.RemoteSignerConfig , uint32 , * signerservice.SigningServer ) {
208+ ) (* config.RemoteSignerConfig , * signerapp. ParsedGlobalParams , * signerservice.SigningServer ) {
209209 appConfig := signercfg .DefaultConfig ()
210- logger := logger .DefaultLogger ()
211210 appConfig .BtcNodeConfig .Host = "127.0.0.1:18443"
212211 appConfig .BtcNodeConfig .User = "user"
213212 appConfig .BtcNodeConfig .Pass = "pass"
@@ -263,31 +262,42 @@ func startSigningServer(
263262
264263 appConfig .Server .Host = host
265264 appConfig .Server .Port = port
266- appConfig .Params .CovenantQuorum = quorum
267- appConfig .Params .MagicBytes = hex .EncodeToString (magicBytes )
268- appConfig .Params .W = 1
269- appConfig .Params .CovenantPublicKeys = covenantPksStr
270-
271265 parsedconfig , err := appConfig .Parse ()
272266 require .NoError (t , err )
273267
274268 // In e2e test we are using the same node for signing as for indexing functionalities
275269 chainInfo := signerapp .NewBitcoindChainInfo (client )
276- // TODO: Use signer with psbt, this require some changes in tests
277- signer := signerapp .NewPrivKeySigner (client )
278- paramsGetter := signerapp .NewConfigParamsRetriever (parsedconfig .ParamsConfig )
270+ signer := signerapp .NewPsbtSigner (client )
271+
272+ signerGlobalParams := signerapp.ParsedGlobalParams {
273+ Versions : []* signerapp.ParsedVersionedGlobalParams {
274+ {
275+ Version : 0 ,
276+ ActivationHeight : 0 ,
277+ StakingCap : btcutil .Amount (100000000000 ),
278+ Tag : magicBytes ,
279+ CovenantQuorum : quorum ,
280+ CovenantPks : []* btcec.PublicKey {localCovenantKey1 , localCovenantKey2 },
281+ ConfirmationDepth : 1 ,
282+ UnbondingTime : 100 ,
283+ UnbondingFee : btcutil .Amount (10000 ),
284+ MinStakingTime : 1 ,
285+ MaxStakingTime : math .MaxUint16 ,
286+ MinStakingAmount : btcutil .Amount (1 ),
287+ MaxStakingAmount : btcutil .Amount (100000000000 ),
288+ },
289+ },
290+ }
279291
280292 app := signerapp .NewSignerApp (
281- logger ,
282293 signer ,
283294 chainInfo ,
284- paramsGetter ,
295+ & signerGlobalParams ,
285296 netParams ,
286297 )
287298
288299 server , err := signerservice .New (
289300 context .Background (),
290- logger ,
291301 parsedconfig ,
292302 app ,
293303 )
@@ -305,7 +315,7 @@ func startSigningServer(
305315 _ = server .Stop (context .TODO ())
306316 })
307317
308- return signerCfg , quorum , server
318+ return signerCfg , & signerGlobalParams , server
309319}
310320
311321type stakingTxSigInfo struct {
0 commit comments