chore: rename params

Author: RafilxTenfen

cmd/babylond/cmd/genesis.go

@@ -440,7 +440,7 @@ func TestnetGenesisParams(
 	genParams.FinalityParams.MinSignedPerWindow = minSignedPerWindow
 	genParams.FinalityParams.FinalitySigTimeout = finalitySigTimeout
 	genParams.FinalityParams.JailDuration = jailDuration
-	genParams.FinalityParams.ActivationBlockHeight = finalityActivationBlockHeight
+	genParams.FinalityParams.FinalityActivationHeight = finalityActivationBlockHeight
 	if err := genParams.FinalityParams.Validate(); err != nil {
 		panic(err)
 	}

proto/babylon/finality/v1/params.proto

@@ -30,7 +30,8 @@ message Params {
   // jail_duration is the minimum period of time that a finality provider remains jailed
   google.protobuf.Duration jail_duration = 5
   [(gogoproto.nullable) = false, (amino.dont_omitempty) = true, (gogoproto.stdduration) = true];
-  // activation_block_height is the babylon block which the finality module will start to
-  // accept public randomness commit and finality voting.
-  uint64 activation_block_height = 6;
+  // finality_activation_height is the babylon block height which the finality module will
+  // start to accept finality voting and the minimum allowed value for the public randomness
+  // commit start height.
+  uint64 finality_activation_height = 6;
 }

test/e2e/configurer/chain/commands_btcstaking.go

@@ -164,6 +164,7 @@ func (n *NodeConfig) CommitPubRandListOut(
 	numPubrand uint64,
 	commitment []byte,
 	sig *bbn.BIP340Signature,
+	success string,
 ) (outBuf, errBuf bytes.Buffer, err error) {
 	n.LogActionF("committing public randomness list")
 
@@ -195,11 +196,15 @@ func (n *NodeConfig) CommitPubRandListOut(
 	// gas
 	cmd = append(cmd, "--gas=500000")
 
-	return n.containerManager.ExecTxCmd(n.t, n.chainId, n.Name, cmd)
+	allTxArgs := []string{fmt.Sprintf("--chain-id=%s", n.chainId), "--gas-prices=0.002ubbn", "-b=sync", "--yes", "--keyring-backend=test", "--log_format=json", "--home=/home/babylon/babylondata"}
+	txCommand := append(cmd, allTxArgs...)
+	return n.containerManager.ExecCmd(n.t, n.Name, txCommand, success)
+
+	// return n.containerManager.ExecTxCmd(n.t, n.chainId, n.Name, cmd)
 }
 
 func (n *NodeConfig) CommitPubRandList(fpBTCPK *bbn.BIP340PubKey, startHeight uint64, numPubrand uint64, commitment []byte, sig *bbn.BIP340Signature) {
-	_, _, err := n.CommitPubRandListOut(fpBTCPK, startHeight, numPubrand, commitment, sig)
+	_, _, err := n.CommitPubRandListOut(fpBTCPK, startHeight, numPubrand, commitment, sig, "code: 0")
 	require.NoError(n.t, err)
 	n.LogActionF("successfully committed public randomness list")
 }

test/e2e/initialization/config.go

@@ -360,7 +360,7 @@ func updateBtccheckpointGenesis(btccheckpointGenState *btccheckpointtypes.Genesi
 
 func updateFinalityGenesis(finalityGenState *finalitytypes.GenesisState) {
 	finalityGenState.Params = finalitytypes.DefaultParams()
-	finalityGenState.Params.ActivationBlockHeight = 0
+	finalityGenState.Params.FinalityActivationHeight = 0
 }
 
 func updateGenUtilGenesis(c *internalChain) func(*genutiltypes.GenesisState) {

test/e2e/software_upgrade_e2e_signet_launch_test.go

@@ -163,23 +163,24 @@ func (s *SoftwareUpgradeV1TestnetTestSuite) TestUpgradeSignetLaunch() {
 	// FP tries to commit with start height before finality activation height
 	// it should fail, after commits with start height = finality activation height
 	// and it should work.
-	_, msgCommitPubRandList, err := datagen.GenRandomMsgCommitPubRandList(r, fptBTCSK, finalityParamsFromData.ActivationBlockHeight-1, 3)
+	_, msgCommitPubRandList, err := datagen.GenRandomMsgCommitPubRandList(r, fptBTCSK, finalityParamsFromData.FinalityActivationHeight-1, 3)
 	s.NoError(err)
 	out, errOut, err := n.CommitPubRandListOut(
 		fp.BtcPk,
 		msgCommitPubRandList.StartHeight,
 		msgCommitPubRandList.NumPubRand,
 		msgCommitPubRandList.Commitment,
 		msgCommitPubRandList.Sig,
+		"",
 	)
-	fmt.Printf("CommitPubRandListOut ErrOut %s", errOut.String())
-	fmt.Printf("CommitPubRandListOut out %s", out.String())
+	fmt.Printf("\nCommitPubRandListOut ErrOut %s", errOut.String())
+	fmt.Printf("\nCommitPubRandListOut out %s", out.String())
 
 	// check the error happened
 	s.ErrorContains(err, finalitytypes.ErrFinalityNotActivated.Error())
 
 	// commits with valid start height
-	_, msgCommitPubRandList, err = datagen.GenRandomMsgCommitPubRandList(r, fptBTCSK, finalityParamsFromData.ActivationBlockHeight, 3)
+	_, msgCommitPubRandList, err = datagen.GenRandomMsgCommitPubRandList(r, fptBTCSK, finalityParamsFromData.FinalityActivationHeight, 3)
 	s.NoError(err)
 	n.CommitPubRandList(
 		fp.BtcPk,

testutil/keeper/finality.go

@@ -47,7 +47,7 @@ func FinalityKeeper(t testing.TB, bsKeeper types.BTCStakingKeeper, iKeeper types
 
 	// Initialize params
 	dParams := types.DefaultParams()
-	dParams.ActivationBlockHeight = 0
+	dParams.FinalityActivationHeight = 0
 	if err := k.SetParams(ctx, dParams); err != nil {
 		panic(err)
 	}

x/finality/abci.go

@@ -21,7 +21,7 @@ func EndBlocker(ctx context.Context, k keeper.Keeper) ([]abci.ValidatorUpdate, e
 	defer telemetry.ModuleMeasureSince(types.ModuleName, time.Now(), telemetry.MetricKeyEndBlocker)
 
 	sdkCtx := sdk.UnwrapSDKContext(ctx)
-	if uint64(sdkCtx.HeaderInfo().Height) < k.GetParams(ctx).ActivationBlockHeight {
+	if uint64(sdkCtx.HeaderInfo().Height) < k.GetParams(ctx).FinalityActivationHeight {
 		return []abci.ValidatorUpdate{}, nil
 	}
 

x/finality/keeper/msg_server.go

@@ -319,7 +319,7 @@ func (k Keeper) slashFinalityProvider(ctx context.Context, fpBtcPk *bbn.BIP340Pu
 // activation block height
 func (ms msgServer) validateActivationHeight(ctx sdk.Context, height uint64) (uint64, *errorsmod.Error) {
 	// TODO: remove it after Phase-2 launch in a future coordinated upgrade
-	activationHeight := ms.GetParams(ctx).ActivationBlockHeight
+	activationHeight := ms.GetParams(ctx).FinalityActivationHeight
 	if height < activationHeight {
 		ms.Logger(ctx).With(
 			"height", height,

x/finality/keeper/msg_server_test.go

@@ -451,7 +451,7 @@ func TestVerifyActivationHeight(t *testing.T) {
 	ms := keeper.NewMsgServerImpl(*fKeeper)
 	err := fKeeper.SetParams(ctx, types.DefaultParams())
 	require.NoError(t, err)
-	activationHeight := fKeeper.GetParams(ctx).ActivationBlockHeight
+	activationHeight := fKeeper.GetParams(ctx).FinalityActivationHeight
 
 	// checks pub rand commit
 	btcSK, _, err := datagen.GenRandomBTCKeyPair(r)

x/finality/types/params.go

@@ -32,12 +32,12 @@ var _ paramtypes.ParamSet = (*Params)(nil)
 // DefaultParams returns a default set of parameters
 func DefaultParams() Params {
 	return Params{
-		FinalitySigTimeout:    DefaultFinalitySigTimeout,
-		SignedBlocksWindow:    DefaultSignedBlocksWindow,
-		MinSignedPerWindow:    DefaultMinSignedPerWindow,
-		MinPubRand:            DefaultMinPubRand,
-		JailDuration:          DefaultJailDuration,
-		ActivationBlockHeight: DefaultFinalityActivationHeight,
+		FinalitySigTimeout:       DefaultFinalitySigTimeout,
+		SignedBlocksWindow:       DefaultSignedBlocksWindow,
+		MinSignedPerWindow:       DefaultMinSignedPerWindow,
+		MinPubRand:               DefaultMinPubRand,
+		JailDuration:             DefaultJailDuration,
+		FinalityActivationHeight: DefaultFinalityActivationHeight,
 	}
 }