chore: resolve conflicts

CHANGELOG.md

@@ -55,6 +55,7 @@ documentation.
 - [#2129](https://github.com/NibiruChain/nibiru/pull/2129) - fix(evm): issue with infinite recursion in erc20 funtoken contracts
 - [#2134](https://github.com/NibiruChain/nibiru/pull/2134) - fix(evm): query of NIBI should use bank state, not the StateDB
 - [#2141](https://github.com/NibiruChain/nibiru/pull/2141) - refactor: simplify account retrieval operation in `nibid q evm account`.
+- [#2142](https://github.com/NibiruChain/nibiru/pull/2142) - fix(bank): add additional missing methods to the NibiruBankKeeper
 
 #### Nibiru EVM | Before Audit 2 - 2024-12-06
 

x/evm/keeper/bank_extension.go

@@ -5,16 +5,14 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	auth "github.com/cosmos/cosmos-sdk/x/auth/types"
 	bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper"
+	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
 
 	"github.com/NibiruChain/nibiru/v2/eth"
 	"github.com/NibiruChain/nibiru/v2/x/evm"
 	"github.com/NibiruChain/nibiru/v2/x/evm/statedb"
 )
 
-var (
-	_ bankkeeper.Keeper     = &NibiruBankKeeper{}
-	_ bankkeeper.SendKeeper = &NibiruBankKeeper{}
-)
+var _ bankkeeper.Keeper = &NibiruBankKeeper{}
 
 type NibiruBankKeeper struct {
 	bankkeeper.BaseKeeper
@@ -29,6 +27,69 @@ func (evmKeeper *Keeper) NewStateDB(
 	return stateDB
 }
 
+func (bk NibiruBankKeeper) InputOutputCoins(
+	ctx sdk.Context,
+	input []banktypes.Input,
+	output []banktypes.Output,
+) error {
+	return bk.ForceGasInvariant(
+		ctx,
+		func(ctx sdk.Context) error {
+			return bk.BaseKeeper.InputOutputCoins(ctx, input, output)
+		},
+		func(ctx sdk.Context) {
+			for _, input := range input {
+				if findEtherBalanceChangeFromCoins(input.Coins) {
+					bk.SyncStateDBWithAccount(ctx, sdk.MustAccAddressFromBech32(input.Address))
+				}
+			}
+			for _, output := range output {
+				if findEtherBalanceChangeFromCoins(output.Coins) {
+					bk.SyncStateDBWithAccount(ctx, sdk.MustAccAddressFromBech32(output.Address))
+				}
+			}
+		},
+	)
+}
+
+func (bk NibiruBankKeeper) DelegateCoins(
+	ctx sdk.Context,
+	delegatorAddr sdk.AccAddress,
+	moduleBech32Addr sdk.AccAddress,
+	coins sdk.Coins,
+) error {
+	return bk.ForceGasInvariant(
+		ctx,
+		func(ctx sdk.Context) error {
+			return bk.BaseKeeper.DelegateCoins(ctx, delegatorAddr, moduleBech32Addr, coins)
+		},
+		func(ctx sdk.Context) {
+			if findEtherBalanceChangeFromCoins(coins) {
+				bk.SyncStateDBWithAccount(ctx, delegatorAddr)
+			}
+		},
+	)
+}
+
+func (bk NibiruBankKeeper) UndelegateCoins(
+	ctx sdk.Context,
+	delegatorAddr sdk.AccAddress,
+	moduleBech32Addr sdk.AccAddress,
+	coins sdk.Coins,
+) error {
+	return bk.ForceGasInvariant(
+		ctx,
+		func(ctx sdk.Context) error {
+			return bk.BaseKeeper.UndelegateCoins(ctx, delegatorAddr, moduleBech32Addr, coins)
+		},
+		func(ctx sdk.Context) {
+			if findEtherBalanceChangeFromCoins(coins) {
+				bk.SyncStateDBWithAccount(ctx, delegatorAddr)
+			}
+		},
+	)
+}
+
 func (bk NibiruBankKeeper) MintCoins(
 	ctx sdk.Context,
 	moduleName string,