From c19aea71211605a946f5ca12b648c3204016d345 Mon Sep 17 00:00:00 2001 From: Lazar Date: Thu, 5 Dec 2024 13:59:24 +0100 Subject: [PATCH 1/2] bump bbn --- go.mod | 6 +++--- go.sum | 8 ++++---- harness/btcstaker.go | 4 ++++ harness/finalityprovider.go | 3 ++- 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/go.mod b/go.mod index eda8915..694f883 100644 --- a/go.mod +++ b/go.mod @@ -13,16 +13,16 @@ replace ( require ( cosmossdk.io/errors v1.0.1 - cosmossdk.io/math v1.3.0 + cosmossdk.io/math v1.4.0 github.com/avast/retry-go/v4 v4.6.0 - github.com/babylonlabs-io/babylon v0.16.0 + github.com/babylonlabs-io/babylon v0.18.0 github.com/babylonlabs-io/finality-provider v0.9.1 github.com/btcsuite/btcd v0.24.2 github.com/btcsuite/btcd/btcec/v2 v2.3.4 github.com/btcsuite/btcd/btcutil v1.1.6 github.com/btcsuite/btcd/btcutil/psbt v1.1.8 github.com/btcsuite/btcd/chaincfg/chainhash v1.1.0 - github.com/cometbft/cometbft v0.38.14 + github.com/cometbft/cometbft v0.38.15 github.com/cosmos/cosmos-sdk v0.50.9 github.com/cosmos/relayer/v2 v2.5.2 github.com/docker/docker v27.1.1+incompatible diff --git a/go.sum b/go.sum index 4d4288e..cd17159 100644 --- a/go.sum +++ b/go.sum @@ -1326,8 +1326,8 @@ cosmossdk.io/errors v1.0.1 h1:bzu+Kcr0kS/1DuPBtUFdWjzLqyUuCiyHjyJB6srBV/0= cosmossdk.io/errors v1.0.1/go.mod h1:MeelVSZThMi4bEakzhhhE/CKqVv3nOJDA25bIqRDu/U= cosmossdk.io/log v1.4.1 h1:wKdjfDRbDyZRuWa8M+9nuvpVYxrEOwbD/CA8hvhU8QM= cosmossdk.io/log v1.4.1/go.mod h1:k08v0Pyq+gCP6phvdI6RCGhLf/r425UT6Rk/m+o74rU= -cosmossdk.io/math v1.3.0 h1:RC+jryuKeytIiictDslBP9i1fhkVm6ZDmZEoNP316zE= -cosmossdk.io/math v1.3.0/go.mod h1:vnRTxewy+M7BtXBNFybkuhSH4WfedVAAnERHgVFhp3k= +cosmossdk.io/math v1.4.0 h1:XbgExXFnXmF/CccPPEto40gOO7FpWu9yWNAZPN3nkNQ= +cosmossdk.io/math v1.4.0/go.mod h1:O5PkD4apz2jZs4zqFdTr16e1dcaQCc5z6lkEnrrppuk= cosmossdk.io/store v1.1.1 h1:NA3PioJtWDVU7cHHeyvdva5J/ggyLDkyH0hGHl2804Y= cosmossdk.io/store v1.1.1/go.mod h1:8DwVTz83/2PSI366FERGbWSH7hL6sB7HbYp8bqksNwM= cosmossdk.io/x/circuit v0.1.1 h1:KPJCnLChWrxD4jLwUiuQaf5mFD/1m7Omyo7oooefBVQ= @@ -1428,8 +1428,8 @@ github.com/aws/aws-sdk-go v1.44.122/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX github.com/aws/aws-sdk-go v1.44.312 h1:llrElfzeqG/YOLFFKjg1xNpZCFJ2xraIi3PqSuP+95k= github.com/aws/aws-sdk-go v1.44.312/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g= -github.com/babylonlabs-io/babylon v0.16.0 h1:SwCBwQLC3jRrvBR+jGzfUNstaCvzH1Mu6PTqQ6at+E0= -github.com/babylonlabs-io/babylon v0.16.0/go.mod h1:wEbfZ6NS/mDRP1ina17WB/4oNtpkFL9Z97bp8Ar6okQ= +github.com/babylonlabs-io/babylon v0.18.0 h1:phMY/GiR9N5MpD3XCmvyPpZkc1I3kTM9yX+Cf0h3OnU= +github.com/babylonlabs-io/babylon v0.18.0/go.mod h1:sT+KG2U+M0tDMNZZ2L5CwlXX0OpagGEs56BiWXqaZFw= github.com/babylonlabs-io/finality-provider v0.9.1 h1:IXbypMY8McBOABbnuZABO94XA9f4XW9lhjqvuXRBPJ4= github.com/babylonlabs-io/finality-provider v0.9.1/go.mod h1:UgG9KO8Iny8vL6f8Xs6ICLP5tkt2xIWO6Z2wAhRSLco= github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= diff --git a/harness/btcstaker.go b/harness/btcstaker.go index eb873b1..b0d7452 100644 --- a/harness/btcstaker.go +++ b/harness/btcstaker.go @@ -273,6 +273,10 @@ func (s *BTCStaker) SignOneInputTaprootSpendingTransaction( return nil, fmt.Errorf("failed to encode PSBT packet: %w", err) } + if err := s.tm.TestRpcClient.WalletPassphrase("pass", 600); err != nil { + return nil, fmt.Errorf("failed to unlock wallet: %w", err) + } + sign := true signResult, err := s.tm.TestRpcClient.WalletProcessPsbt( psbtEncoded, diff --git a/harness/finalityprovider.go b/harness/finalityprovider.go index 801350c..7f8dc6d 100644 --- a/harness/finalityprovider.go +++ b/harness/finalityprovider.go @@ -533,11 +533,12 @@ func (fpm *FinalityProviderManager) waitForActivation(ctx context.Context) (uint err := lib.Eventually(ctx, func() bool { res, err := fpm.client.ActivatedHeight() if err != nil { + fmt.Printf("err: %s\n", err) return false } height = res.Height return height > 0 - }, 120*time.Second, eventuallyPollTime) + }, 320*time.Second, eventuallyPollTime) if err != nil { return 0, fmt.Errorf("err getting activated height err:%v\n", err) From 9343914055954c4eb59a8c6603df134edfff0f8c Mon Sep 17 00:00:00 2001 From: KonradStaniec Date: Fri, 6 Dec 2024 05:18:50 +0100 Subject: [PATCH 2/2] fix unbonding time --- harness/btcstaker.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/harness/btcstaker.go b/harness/btcstaker.go index b0d7452..c116947 100644 --- a/harness/btcstaker.go +++ b/harness/btcstaker.go @@ -6,6 +6,10 @@ import ( "encoding/base64" "encoding/hex" "fmt" + "strings" + "sync/atomic" + "time" + staking "github.com/babylonlabs-io/babylon/btcstaking" "github.com/babylonlabs-io/babylon/crypto/bip322" bbn "github.com/babylonlabs-io/babylon/types" @@ -23,9 +27,6 @@ import ( "github.com/btcsuite/btcd/wire" "github.com/cometbft/cometbft/crypto/tmhash" sdk "github.com/cosmos/cosmos-sdk/types" - "strings" - "sync/atomic" - "time" ) type BTCStaker struct { @@ -402,7 +403,7 @@ func (s *BTCStaker) buildAndSendStakingTransaction( stakerPk *btcec.PublicKey, params *btcstypes.Params, ) error { - unbondingTime := uint16(100) + unbondingTime := uint16(21) covKeys, err := bbnPksToBtcPks(params.CovenantPks) if err != nil { return fmt.Errorf("err bbnPksToBtcPks: %w", err)