Skip to content

Commit

Permalink
update babylon version with parameter update
Browse files Browse the repository at this point in the history
  • Loading branch information
gitferry committed Sep 5, 2024
1 parent 0682d26 commit 76582de
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 17 deletions.
8 changes: 2 additions & 6 deletions clientcontroller/babylon.go
Original file line number Diff line number Diff line change
Expand Up @@ -556,20 +556,16 @@ func (bc *BabylonController) QueryStakingParams() (*types.StakingParams, error)
}
covenantPks = append(covenantPks, covPk)
}
slashingAddress, err := btcutil.DecodeAddress(stakingParamRes.Params.SlashingAddress, bc.btcParams)
if err != nil {
return nil, err
}

return &types.StakingParams{
ComfirmationTimeBlocks: ckptParamRes.Params.BtcConfirmationDepth,
FinalizationTimeoutBlocks: ckptParamRes.Params.CheckpointFinalizationTimeout,
MinSlashingTxFeeSat: btcutil.Amount(stakingParamRes.Params.MinSlashingTxFeeSat),
CovenantPks: covenantPks,
SlashingAddress: slashingAddress,
SlashingPkScript: stakingParamRes.Params.SlashingPkScript,
CovenantQuorum: stakingParamRes.Params.CovenantQuorum,
SlashingRate: stakingParamRes.Params.SlashingRate,
MinUnbondingTime: stakingParamRes.Params.MinUnbondingTime,
MinUnbondingTime: stakingParamRes.Params.MinUnbondingTimeBlocks,
}, nil
}

Expand Down
16 changes: 14 additions & 2 deletions itest/babylon_node_handler.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,27 @@ package e2etest

import (
"bytes"
"encoding/hex"
"fmt"
"log"
"math/rand"
"os"
"os/exec"
"path/filepath"
"runtime"
"strings"
"testing"
"time"

"github.com/babylonlabs-io/babylon/testutil/datagen"
"github.com/babylonlabs-io/babylon/types"
"github.com/btcsuite/btcd/chaincfg"
"github.com/btcsuite/btcd/txscript"
"github.com/stretchr/testify/require"
)

const testSlashingAddress = "SZtRT4BySL3o4efdGLh3k7Kny8GAnsBrSW"

Check failure on line 24 in itest/babylon_node_handler.go

View workflow job for this annotation

GitHub Actions / lint_test / lint

const `testSlashingAddress` is unused (unused)

type BabylonNode struct {
cmd *exec.Cmd
pidFile string
Expand Down Expand Up @@ -117,7 +125,11 @@ func NewBabylonNodeHandler(t *testing.T, covenantQuorum int, covenantPks []*type
walletName := "node0"
nodeDataDir := filepath.Join(testDir, walletName, "babylond")

slashingAddr := "SZtRT4BySL3o4efdGLh3k7Kny8GAnsBrSW"
r := rand.New(rand.NewSource(time.Now().Unix()))
slashingAddress, err := datagen.GenRandomBTCAddress(r, &chaincfg.SigNetParams)
require.NoError(t, err)
slashingPkScript, err := txscript.PayToAddrScript(slashingAddress)
require.NoError(t, err)

var covenantPksStr []string
for _, pk := range covenantPks {
Expand All @@ -134,7 +146,7 @@ func NewBabylonNodeHandler(t *testing.T, covenantQuorum int, covenantPks []*type
"--chain-id=chain-test",
"--additional-sender-account",
fmt.Sprintf("--epoch-interval=%d", 5),
fmt.Sprintf("--slashing-address=%s", slashingAddr),
fmt.Sprintf("--slashing-pk-script=%s", hex.EncodeToString(slashingPkScript)),
fmt.Sprintf("--covenant-quorum=%d", covenantQuorum),
fmt.Sprintf("--covenant-pks=%s", strings.Join(covenantPksStr, ",")),
)
Expand Down
14 changes: 7 additions & 7 deletions itest/test_manager.go
Original file line number Diff line number Diff line change
Expand Up @@ -78,10 +78,10 @@ type TestDelegationData struct {
DelegatorSig *bbntypes.BIP340Signature
FpPks []*btcec.PublicKey

SlashingAddr string
ChangeAddr string
StakingTime uint16
StakingAmount int64
SlashingPkScript []byte
ChangeAddr string
StakingTime uint16
StakingAmount int64
}

func StartManager(t *testing.T) *TestManager {
Expand Down Expand Up @@ -677,7 +677,7 @@ func (tm *TestManager) InsertBTCDelegation(t *testing.T, fpPks []*btcec.PublicKe
params.CovenantQuorum,
stakingTime,
stakingAmount,
params.SlashingAddress.String(),
params.SlashingPkScript,
params.SlashingRate,
unbondingTime,
)
Expand Down Expand Up @@ -742,7 +742,7 @@ func (tm *TestManager) InsertBTCDelegation(t *testing.T, fpPks []*btcec.PublicKe
wire.NewOutPoint(&stakingTxHash, 0),
unbondingTime,
unbondingValue,
params.SlashingAddress.String(),
params.SlashingPkScript,
params.SlashingRate,
unbondingTime,
)
Expand Down Expand Up @@ -791,7 +791,7 @@ func (tm *TestManager) InsertBTCDelegation(t *testing.T, fpPks []*btcec.PublicKe
SlashingTx: testStakingInfo.SlashingTx,
StakingTxInfo: txInfo,
DelegatorSig: delegatorSig,
SlashingAddr: params.SlashingAddress.String(),
SlashingPkScript: params.SlashingPkScript,
StakingTime: stakingTime,
StakingAmount: stakingAmount,
}
Expand Down
5 changes: 3 additions & 2 deletions types/stakingparams.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,9 @@ type StakingParams struct {
// Bitcoin public keys of the covenant committee
CovenantPks []*btcec.PublicKey

// Address to which slashing transactions are sent
SlashingAddress btcutil.Address
// The pk_script expected in slashing output i.e., the first
// output of slashing transaction
SlashingPkScript []byte

// Minimum number of signatures needed for the covenant multisignature
CovenantQuorum uint32
Expand Down

0 comments on commit 76582de

Please sign in to comment.