fix: Do not perform conversions on the commission (ethereum-optimism#166

)
babylonlabs-io · Dec 5, 2023 · e617478 · e617478
1 parent eebea03
commit e617478
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 15 deletions.
diff --git a/clientcontroller/babylon.go b/clientcontroller/babylon.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"encoding/hex"
 	"fmt"
-	"math/big"
 	"time"
 
 	"cosmossdk.io/math"
@@ -150,16 +149,14 @@ func (bc *BabylonController) RegisterValidator(
 	chainPk []byte,
 	valPk *btcec.PublicKey,
 	pop []byte,
-	commission *big.Int,
+	commission *math.LegacyDec,
 	description []byte,
 ) (*types.TxResponse, error) {
 	var bbnPop btcstakingtypes.ProofOfPossession
 	if err := bbnPop.Unmarshal(pop); err != nil {
 		return nil, fmt.Errorf("invalid proof-of-possession: %w", err)
 	}
 
-	sdkCommission := math.LegacyNewDecFromBigInt(commission)
-
 	var sdkDescription sttypes.Description
 	if err := sdkDescription.Unmarshal(description); err != nil {
 		return nil, fmt.Errorf("invalid description: %w", err)
@@ -170,7 +167,7 @@ func (bc *BabylonController) RegisterValidator(
 		BabylonPk:   &secp256k1.PubKey{Key: chainPk},
 		BtcPk:       bbntypes.NewBIP340PubKeyFromBTCPK(valPk),
 		Pop:         &bbnPop,
-		Commission:  &sdkCommission,
+		Commission:  commission,
 		Description: &sdkDescription,
 	}
 

diff --git a/clientcontroller/interface.go b/clientcontroller/interface.go
@@ -1,9 +1,8 @@
 package clientcontroller
 
 import (
+	"cosmossdk.io/math"
 	"fmt"
-	"math/big"
-
 	"github.com/btcsuite/btcd/chaincfg"
 	"go.uber.org/zap"
 
@@ -36,7 +35,7 @@ type ValidatorAPIs interface {
 		chainPk []byte,
 		valPk *btcec.PublicKey,
 		pop []byte,
-		commission *big.Int,
+		commission *math.LegacyDec,
 		description []byte,
 	) (*types.TxResponse, error)
 

diff --git a/itest/test_manager.go b/itest/test_manager.go
@@ -200,6 +200,8 @@ func StartManagerWithValidator(t *testing.T) (*TestManager, *service.ValidatorIn
 func (tm *TestManager) Stop(t *testing.T) {
 	err := tm.Va.Stop()
 	require.NoError(t, err)
+	err = tm.CovenantEmulator.Stop()
+	require.NoError(t, err)
 	err = tm.BabylonHandler.Stop()
 	require.NoError(t, err)
 	err = os.RemoveAll(tm.ValConfig.DatabaseConfig.Path)
@@ -209,8 +211,6 @@ func (tm *TestManager) Stop(t *testing.T) {
 	tm.EOTSServerHandler.Stop()
 	err = os.RemoveAll(tm.EOTSServerHandler.baseDir)
 	require.NoError(t, err)
-	err = tm.CovenantEmulator.Stop()
-	require.NoError(t, err)
 }
 
 func (tm *TestManager) WaitForValRegistered(t *testing.T, bbnPk *secp256k1.PubKey) {

diff --git a/testutil/mocks/babylon.go b/testutil/mocks/babylon.go
diff --git a/validator/service/app.go b/validator/service/app.go
@@ -432,7 +432,7 @@ func (app *ValidatorApp) registrationLoop() {
 				req.bbnPubKey.Key,
 				req.btcPubKey.MustToBTCPK(),
 				popBytes,
-				req.commission.BigInt(),
+				req.commission,
 				req.description,
 			)
 

diff --git a/validator/service/app_test.go b/validator/service/app_test.go
@@ -80,7 +80,7 @@ func FuzzRegisterValidator(f *testing.F) {
 				validator.GetBabylonPK().Key,
 				validator.MustGetBIP340BTCPK().MustToBTCPK(),
 				popBytes,
-				testutil.ZeroCommissionRate().BigInt(),
+				testutil.ZeroCommissionRate(),
 				testutil.EmptyDescription(),
 			).Return(&types.TxResponse{TxHash: txHash}, nil).AnyTimes()