fix(inflation): remove todos (#248)

remove todos and inflation change event log processing issue: none
piplabs · Oct 19, 2024 · 990f3c7 · 990f3c7
1 parent 1811c0c
commit 990f3c7
Show file tree

Hide file tree

Showing 21 changed files with 52 additions and 154 deletions.
diff --git a/client/x/evmengine/keeper/abci_internal_test.go b/client/x/evmengine/keeper/abci_internal_test.go
@@ -221,7 +221,6 @@ func TestKeeper_PrepareProposal(t *testing.T) {
 				ak := moduletestutil.NewMockAccountKeeper(ctrl)
 				esk := moduletestutil.NewMockEvmStakingKeeper(ctrl)
 				uk := moduletestutil.NewMockUpgradeKeeper(ctrl)
-				mk := moduletestutil.NewMockMintKeeper(ctrl)
 				dk := moduletestutil.NewMockDistrKeeper(ctrl)
 
 				if tt.setupMocks != nil {
@@ -232,7 +231,7 @@ func TestKeeper_PrepareProposal(t *testing.T) {
 				tt.mockEngine.EngineClient, err = ethclient.NewEngineMock(storeKey)
 				require.NoError(t, err)
 
-				k, err := NewKeeper(cdc, storeService, &tt.mockEngine, &tt.mockClient, txConfig, ak, esk, uk, mk, dk)
+				k, err := NewKeeper(cdc, storeService, &tt.mockEngine, &tt.mockClient, txConfig, ak, esk, uk, dk)
 				require.NoError(t, err)
 				k.SetValidatorAddress(common.BytesToAddress([]byte("test")))
 				populateGenesisHead(ctx, t, k)
@@ -263,12 +262,11 @@ func TestKeeper_PrepareProposal(t *testing.T) {
 		ak := moduletestutil.NewMockAccountKeeper(ctrl)
 		esk := moduletestutil.NewMockEvmStakingKeeper(ctrl)
 		uk := moduletestutil.NewMockUpgradeKeeper(ctrl)
-		mk := moduletestutil.NewMockMintKeeper(ctrl)
 		dk := moduletestutil.NewMockDistrKeeper(ctrl)
 		// Expected call for PeekEligibleWithdrawals
 		esk.EXPECT().PeekEligibleWithdrawals(gomock.Any()).Return(nil, nil).AnyTimes()
 
-		keeper, err := NewKeeper(cdc, storeService, &mockEngine, mockClient, txConfig, ak, esk, uk, mk, dk)
+		keeper, err := NewKeeper(cdc, storeService, &mockEngine, mockClient, txConfig, ak, esk, uk, dk)
 		require.NoError(t, err)
 		keeper.SetValidatorAddress(common.BytesToAddress([]byte("test")))
 		populateGenesisHead(ctx, t, keeper)
@@ -452,7 +450,6 @@ func TestKeeper_PostFinalize(t *testing.T) {
 			ak := moduletestutil.NewMockAccountKeeper(ctrl)
 			esk := moduletestutil.NewMockEvmStakingKeeper(ctrl)
 			uk := moduletestutil.NewMockUpgradeKeeper(ctrl)
-			mk := moduletestutil.NewMockMintKeeper(ctrl)
 			dk := moduletestutil.NewMockDistrKeeper(ctrl)
 
 			if tt.setupMocks != nil {
@@ -472,7 +469,7 @@ func TestKeeper_PostFinalize(t *testing.T) {
 			tt.mockEngine.EngineClient, err = ethclient.NewEngineMock(storeKey)
 			require.NoError(t, err)
 
-			k, err := NewKeeper(cdc, storeService, &tt.mockEngine, &tt.mockClient, txConfig, ak, esk, uk, mk, dk)
+			k, err := NewKeeper(cdc, storeService, &tt.mockEngine, &tt.mockClient, txConfig, ak, esk, uk, dk)
 			require.NoError(t, err)
 			k.SetCometAPI(cmtAPI)
 			k.SetValidatorAddress(nxtAddr)

diff --git a/client/x/evmengine/keeper/keeper.go b/client/x/evmengine/keeper/keeper.go
@@ -41,7 +41,6 @@ type Keeper struct {
 	accountKeeper    types.AccountKeeper
 	evmstakingKeeper types.EvmStakingKeeper
 	upgradeKeeper    types.UpgradeKeeper
-	mintKeeper       types.MintKeeper
 	distrKeeper      types.DistrKeeper
 
 	upgradeContract *bindings.UpgradeEntrypoint
@@ -67,7 +66,6 @@ func NewKeeper(
 	ak types.AccountKeeper,
 	esk types.EvmStakingKeeper,
 	uk types.UpgradeKeeper,
-	mk types.MintKeeper,
 	dk types.DistrKeeper,
 ) (*Keeper, error) {
 	schema := &ormv1alpha1.ModuleSchemaDescriptor{SchemaFile: []*ormv1alpha1.ModuleSchemaDescriptor_FileEntry{
@@ -105,7 +103,6 @@ func NewKeeper(
 		upgradeKeeper:    uk,
 		upgradeContract:  upgradeContract,
 		ubiContract:      ubiContract,
-		mintKeeper:       mk,
 		distrKeeper:      dk,
 	}, nil
 }

diff --git a/client/x/evmengine/keeper/keeper_internal_test.go b/client/x/evmengine/keeper/keeper_internal_test.go
@@ -49,14 +49,13 @@ func createTestKeeper(t *testing.T) (context.Context, *Keeper) {
 	ak := moduletestutil.NewMockAccountKeeper(ctrl)
 	esk := moduletestutil.NewMockEvmStakingKeeper(ctrl)
 	uk := moduletestutil.NewMockUpgradeKeeper(ctrl)
-	mk := moduletestutil.NewMockMintKeeper(ctrl)
 	dk := moduletestutil.NewMockDistrKeeper(ctrl)
 
 	ctx, storeKey, storeService := setupCtxStore(t, &header)
 	mockEngine, err := newMockEngineAPI(storeKey, 0)
 	require.NoError(t, err)
 
-	keeper, err := NewKeeper(cdc, storeService, &mockEngine, mockClient, txConfig, ak, esk, uk, mk, dk)
+	keeper, err := NewKeeper(cdc, storeService, &mockEngine, mockClient, txConfig, ak, esk, uk, dk)
 	require.NoError(t, err)
 	keeper.SetCometAPI(cmtAPI)
 
@@ -80,13 +79,12 @@ func createKeeper(t *testing.T, args args) (sdk.Context, *mockCometAPI, *Keeper)
 	ak := moduletestutil.NewMockAccountKeeper(ctrl)
 	esk := moduletestutil.NewMockEvmStakingKeeper(ctrl)
 	uk := moduletestutil.NewMockUpgradeKeeper(ctrl)
-	mk := moduletestutil.NewMockMintKeeper(ctrl)
 	dk := moduletestutil.NewMockDistrKeeper(ctrl)
 
 	ctx, storeKey, storeService := setupCtxStore(t, &header)
 	mockEngine, err := newMockEngineAPI(storeKey, 0)
 	require.NoError(t, err)
-	keeper, err := NewKeeper(cdc, storeService, &mockEngine, mockClient, txConfig, ak, esk, uk, mk, dk)
+	keeper, err := NewKeeper(cdc, storeService, &mockEngine, mockClient, txConfig, ak, esk, uk, dk)
 	require.NoError(t, err)
 	keeper.SetCometAPI(cmtAPI)
 	keeper.SetValidatorAddress(nxtAddr)

diff --git a/client/x/evmengine/keeper/msg_server.go b/client/x/evmengine/keeper/msg_server.go
@@ -115,9 +115,6 @@ func (s msgServer) ExecutionPayload(ctx context.Context, msg *types.MsgExecution
 	if err := s.ProcessUpgradeEvents(ctx, payload.Number-1, msg.PrevPayloadEvents); err != nil {
 		return nil, errors.Wrap(err, "deliver upgrade-related event logs")
 	}
-	if err := s.mintKeeper.ProcessInflationEvents(ctx, payload.Number-1, msg.PrevPayloadEvents); err != nil {
-		return nil, errors.Wrap(err, "deliver inflation-related event logs")
-	}
 	if err := s.ProcessUbiEvents(ctx, payload.Number-1, msg.PrevPayloadEvents); err != nil {
 		return nil, errors.Wrap(err, "deliver ubi-related event logs")
 	}

diff --git a/client/x/evmengine/keeper/msg_server_internal_test.go b/client/x/evmengine/keeper/msg_server_internal_test.go
@@ -40,7 +40,6 @@ func Test_msgServer_ExecutionPayload(t *testing.T) {
 	ak := moduletestutil.NewMockAccountKeeper(ctrl)
 	esk := moduletestutil.NewMockEvmStakingKeeper(ctrl)
 	uk := moduletestutil.NewMockUpgradeKeeper(ctrl)
-	mk := moduletestutil.NewMockMintKeeper(ctrl)
 	dk := moduletestutil.NewMockDistrKeeper(ctrl)
 
 	cmtAPI := newMockCometAPI(t, nil)
@@ -55,7 +54,7 @@ func Test_msgServer_ExecutionPayload(t *testing.T) {
 	evmLogProc := mockLogProvider{deliverErr: errors.New("test error")}
 	mockEngine, err := newMockEngineAPI(storeKey, 2)
 	require.NoError(t, err)
-	keeper, err := NewKeeper(cdc, storeService, &mockEngine, mockClient, txConfig, ak, esk, uk, mk, dk)
+	keeper, err := NewKeeper(cdc, storeService, &mockEngine, mockClient, txConfig, ak, esk, uk, dk)
 	require.NoError(t, err)
 	keeper.SetCometAPI(cmtAPI)
 	keeper.SetValidatorAddress(nxtAddr)
@@ -101,7 +100,6 @@ func Test_msgServer_ExecutionPayload(t *testing.T) {
 			setup: func(c context.Context) sdk.Context {
 				esk.EXPECT().DequeueEligibleWithdrawals(c).Return(nil, nil)
 				esk.EXPECT().ProcessStakingEvents(c, gomock.Any(), gomock.Any()).Return(nil)
-				mk.EXPECT().ProcessInflationEvents(c, gomock.Any(), gomock.Any()).Return(nil)
 
 				return sdk.UnwrapSDKContext(c)
 			},

diff --git a/client/x/evmengine/keeper/proposal_server_internal_test.go b/client/x/evmengine/keeper/proposal_server_internal_test.go
@@ -34,15 +34,14 @@ func Test_proposalServer_ExecutionPayload(t *testing.T) {
 	ak := moduletestutil.NewMockAccountKeeper(ctrl)
 	esk := moduletestutil.NewMockEvmStakingKeeper(ctrl)
 	uk := moduletestutil.NewMockUpgradeKeeper(ctrl)
-	mk := moduletestutil.NewMockMintKeeper(ctrl)
 	dk := moduletestutil.NewMockDistrKeeper(ctrl)
 	esk.EXPECT().PeekEligibleWithdrawals(gomock.Any()).Return(nil, nil).AnyTimes()
 
 	sdkCtx, storeKey, storeService := setupCtxStore(t, &cmtproto.Header{AppHash: tutil.RandomHash().Bytes()})
 	sdkCtx = sdkCtx.WithExecMode(sdk.ExecModeFinalize)
 	mockEngine, err := newMockEngineAPI(storeKey, 0)
 	require.NoError(t, err)
-	keeper, err := NewKeeper(cdc, storeService, &mockEngine, mockClient, txConfig, ak, esk, uk, mk, dk)
+	keeper, err := NewKeeper(cdc, storeService, &mockEngine, mockClient, txConfig, ak, esk, uk, dk)
 	require.NoError(t, err)
 	populateGenesisHead(sdkCtx, t, keeper)
 	propSrv := NewProposalServer(keeper)

diff --git a/client/x/evmengine/keeper/upgrades_internal_test.go b/client/x/evmengine/keeper/upgrades_internal_test.go
@@ -262,14 +262,13 @@ func setupTestEnvironment(t *testing.T) (*Keeper, sdk.Context, *gomock.Controlle
 	ak := moduletestutil.NewMockAccountKeeper(ctrl)
 	esk := moduletestutil.NewMockEvmStakingKeeper(ctrl)
 	uk := moduletestutil.NewMockUpgradeKeeper(ctrl)
-	mk := moduletestutil.NewMockMintKeeper(ctrl)
 	dk := moduletestutil.NewMockDistrKeeper(ctrl)
 
 	ctx, storeKey, storeService := setupCtxStore(t, &header)
 	mockEngine, err := newMockEngineAPI(storeKey, 0)
 	require.NoError(t, err)
 
-	keeper, err := NewKeeper(cdc, storeService, &mockEngine, mockClient, txConfig, ak, esk, uk, mk, dk)
+	keeper, err := NewKeeper(cdc, storeService, &mockEngine, mockClient, txConfig, ak, esk, uk, dk)
 	require.NoError(t, err)
 	keeper.SetCometAPI(cmtAPI)
 	nxtAddr, err := k1util.PubKeyToAddress(cmtAPI.validatorSet.Validators[1].PubKey)

diff --git a/client/x/evmengine/module/depinject.go b/client/x/evmengine/module/depinject.go
@@ -36,7 +36,6 @@ type ModuleInputs struct {
 	AccountKeeper    types.AccountKeeper
 	EvmStakingKeeper types.EvmStakingKeeper
 	UpgradeKeeper    types.UpgradeKeeper
-	MintKeeper       types.MintKeeper
 	DistrKeeper      types.DistrKeeper
 }
 
@@ -58,7 +57,6 @@ func ProvideModule(in ModuleInputs) (ModuleOutputs, error) {
 		in.AccountKeeper,
 		in.EvmStakingKeeper,
 		in.UpgradeKeeper,
-		in.MintKeeper,
 		in.DistrKeeper,
 	)
 	if err != nil {

diff --git a/client/x/evmengine/testutil/expected_keepers_mocks.go b/client/x/evmengine/testutil/expected_keepers_mocks.go
diff --git a/client/x/evmengine/types/expected_keepers.go b/client/x/evmengine/types/expected_keepers.go
@@ -30,10 +30,6 @@ type UpgradeKeeper interface {
 	ScheduleUpgrade(ctx context.Context, plan upgradetypes.Plan) error
 }
 
-type MintKeeper interface {
-	ProcessInflationEvents(ctx context.Context, height uint64, logs []*EVMEvent) error
-}
-
 type DistrKeeper interface {
 	SetUbi(ctx context.Context, newUbi math.LegacyDec) error
 }
diff --git a/client/x/evmstaking/keeper/keeper.go b/client/x/evmstaking/keeper/keeper.go
@@ -126,7 +126,7 @@ func (k Keeper) ProcessStakingEvents(ctx context.Context, height uint64, logs []
 		// Convert the amount from wei to gwei (Eth2 spec withdrawal is specified in gwei) by dividing by 10^9.
 		// TODO: consider rounding and decimal precision when dividing bigint.
 
-		switch ethlog.Topics[0] { // TODO(rayden): update validator commission
+		switch ethlog.Topics[0] {
 		case types.UpdateValidatorCommission.ID:
 			ev, err := k.ipTokenStakingContract.ParseUpdateValidatorCommssion(ethlog)
 			if err != nil {

diff --git a/client/x/evmstaking/keeper/validator.go b/client/x/evmstaking/keeper/validator.go
@@ -104,7 +104,6 @@ func (k Keeper) ProcessCreateValidator(ctx context.Context, ev *bindings.IPToken
 	skeeperMsgServer := skeeper.NewMsgServerImpl(evmstakingSKeeper)
 
 	if _, err = k.stakingKeeper.GetValidator(ctx, validatorAddr); err == nil {
-		// TODO(rayden): refund
 		return errors.New("validator already exists")
 	} else if !errors.Is(err, stypes.ErrNoValidatorFound) {
 		// Either the validator does not exist, or unknown error.

diff --git a/client/x/evmstaking/testutil/expected_keepers_mocks.go b/client/x/evmstaking/testutil/expected_keepers_mocks.go
diff --git a/client/x/mint/keeper/genesis_test.go b/client/x/mint/keeper/genesis_test.go
@@ -13,13 +13,14 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	moduletestutil "github.com/cosmos/cosmos-sdk/types/module/testutil"
 	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
-	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/suite"
 
 	"github.com/piplabs/story/client/x/mint/keeper"
 	mintmodule "github.com/piplabs/story/client/x/mint/module"
 	minttestutil "github.com/piplabs/story/client/x/mint/testutil"
 	"github.com/piplabs/story/client/x/mint/types"
+
+	"go.uber.org/mock/gomock"
 )
 
 var minterAcc = authtypes.NewEmptyModuleAccount(types.ModuleName, authtypes.Minter)

diff --git a/client/x/mint/keeper/grpc_query_test.go b/client/x/mint/keeper/grpc_query_test.go
@@ -13,13 +13,14 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	moduletestutil "github.com/cosmos/cosmos-sdk/types/module/testutil"
 	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
-	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/suite"
 
 	"github.com/piplabs/story/client/x/mint/keeper"
 	mintmodule "github.com/piplabs/story/client/x/mint/module"
 	minttestutil "github.com/piplabs/story/client/x/mint/testutil"
 	"github.com/piplabs/story/client/x/mint/types"
+
+	"go.uber.org/mock/gomock"
 )
 
 type MintTestSuite struct {