fix(evm): ensure stateDB doesn't persist after upgrade handler (#2328)

* fix(evm): ensure stateDB doesn't persist after upgrade handler

* Update CHANGELOG.md

* fix unit tests

* Revert "fix unit tests"

This reverts commit cc14439.

* fix: ensure that the stateDB is nil when entering the upgrade

Author: k-yang

CHANGELOG.md

@@ -52,6 +52,7 @@ See https://github.com/dangoslen/changelog-enforcer.
 - [#2316](https://github.com/NibiruChain/nibiru/pull/2316) - feat(ux): add GET behavior to the Ethereum JSON-RPC endpoints for Nibiru so they return info instead of a blank page or error.
 - [#2324](https://github.com/NibiruChain/nibiru/pull/2324) - fix(evm): adjust the v2.5.0 upgrade handler to maintain the original stNIBI ERC20 contract's state.
 - [#2327](https://github.com/NibiruChain/nibiru/pull/2327) - fix(eth): implement unmarshal json for TransactionReceipt
+- [#2328](https://github.com/NibiruChain/nibiru/pull/2328) - fix(evm): ensure StateDB doesn't persist between EVM calls
 
 ## [v2.4.0](https://github.com/NibiruChain/nibiru/releases/tag/v2.4.0) - 2025-05-29
 

app/upgrades/v2_5_0/v2_5_0.go

@@ -149,8 +149,14 @@ func UpgradeStNibiContractOnMainnet(
 		SkipNonceChecks:  false,
 		SkipFromEOACheck: false,
 	}
-	sdb := keepers.EvmKeeper.NewStateDB(ctx, keepers.EvmKeeper.TxConfig(ctx, gethcommon.Hash{}))
-	evmObj := keepers.EvmKeeper.NewEVM(ctx, evmMsg, keepers.EvmKeeper.GetEVMConfig(ctx), nil, sdb)
+	stateDB := keepers.EvmKeeper.Bank.StateDB
+	if stateDB == nil {
+		stateDB = keepers.EvmKeeper.NewStateDB(ctx, keepers.EvmKeeper.TxConfig(ctx, gethcommon.Hash{}))
+	}
+	defer func() {
+		keepers.EvmKeeper.Bank.StateDB = nil
+	}()
+	evmObj := keepers.EvmKeeper.NewEVM(ctx, evmMsg, keepers.EvmKeeper.GetEVMConfig(ctx), nil, stateDB)
 
 	evmResp, err := keepers.EvmKeeper.CallContractWithInput(
 		ctx, evmObj, evmMsg.From, nil, true /*commit*/, contractInput,

app/upgrades/v2_5_0/v2_5_0_test.go

@@ -118,6 +118,7 @@ func (s *Suite) TestUpgrade() {
 
 	s.Run(fmt.Sprintf("Perform upgrade on stNIBI ERC20 address: %s", funtoken.Erc20Addr.Address), func() {
 		s.T().Log("IMPORTANT: Schedule the upgrade")
+		deps.EvmKeeper.Bank.StateDB = nil // IMPORTANT: make sure to clear the StateDB before running the upgrade
 		s.Require().True(deps.App.UpgradeKeeper.HasHandler(v2_5_0.Upgrade.UpgradeName))
 
 		beforeEvents := deps.Ctx.EventManager().Events()