fix: stateDB should not commit on ERC20 calls

x/evm/evmmodule/genesis_test.go

@@ -48,7 +48,7 @@ func (s *Suite) TestExportInitGenesis() {
 	s.Require().NoError(err)
 	erc20Addr := deployResp.ContractAddr
 
-	evmObj := deps.NewEVM()
+	evmObj, _ := deps.NewEVM()
 	totalSupply, err := deps.EvmKeeper.ERC20().LoadERC20BigInt(
 		deps.Ctx, evmObj, erc20Contract.ABI, erc20Addr, "totalSupply",
 	)

x/evm/evmtest/test_deps.go

@@ -52,10 +52,10 @@ func (deps TestDeps) NewStateDB() *statedb.StateDB {
 	)
 }
 
-func (deps TestDeps) NewEVM() *vm.EVM {
+func (deps TestDeps) NewEVM() (*vm.EVM, *statedb.StateDB) {
 	stateDB := deps.EvmKeeper.NewStateDB(deps.Ctx, statedb.NewEmptyTxConfig(gethcommon.BytesToHash(deps.Ctx.HeaderHash())))
 	evmObj := deps.EvmKeeper.NewEVM(deps.Ctx, MOCK_GETH_MESSAGE, deps.EvmKeeper.GetEVMConfig(deps.Ctx), evm.NewNoOpTracer(), stateDB)
-	return evmObj
+	return evmObj, stateDB
 }
 
 func (deps *TestDeps) GethSigner() gethcore.Signer {

x/evm/keeper/erc20.go

@@ -74,7 +74,7 @@ func (e erc20Calls) Mint(
 	if err != nil {
 		return nil, err
 	}
-	return e.CallContractWithInput(ctx, evmObj, sender, &erc20Contract, true /*commit*/, contractInput, getCallGasWithLimit(ctx, Erc20GasLimitExecute))
+	return e.CallContractWithInput(ctx, evmObj, sender, &erc20Contract, false /*commit*/, contractInput, getCallGasWithLimit(ctx, Erc20GasLimitExecute))
 }
 
 /*
@@ -163,7 +163,7 @@ func (e erc20Calls) Burn(
 	if err != nil {
 		return nil, err
 	}
-	return e.CallContractWithInput(ctx, evmObj, sender, &erc20Contract, false /*commit*/, contractInput, getCallGasWithLimit(ctx, Erc20GasLimitExecute))
+	return e.CallContractWithInput(ctx, evmObj, sender, &erc20Contract, true /*commit*/, contractInput, getCallGasWithLimit(ctx, Erc20GasLimitExecute))
 }
 
 func (e erc20Calls) LoadERC20Name(

x/evm/keeper/erc20_test.go

@@ -12,90 +12,92 @@ func (s *Suite) TestERC20Calls() {
 	deps := evmtest.NewTestDeps()
 	bankDenom := "ibc/btc"
 	funtoken := evmtest.CreateFunTokenForBankCoin(deps, bankDenom, &s.Suite)
-	contract := funtoken.Erc20Addr.Address
+	erc20 := funtoken.Erc20Addr.Address
 
 	s.Run("Mint tokens - Fail from non-owner", func() {
+		evmObj, _ := deps.NewEVM()
 		_, err := deps.EvmKeeper.ERC20().Mint(
-			contract, deps.Sender.EthAddr, evm.EVM_MODULE_ADDRESS,
-			big.NewInt(69_420), deps.Ctx, deps.NewEVM(),
+			erc20, deps.Sender.EthAddr, evm.EVM_MODULE_ADDRESS,
+			big.NewInt(69_420), deps.Ctx, evmObj,
 		)
 		s.ErrorContains(err, "Ownable: caller is not the owner")
 	})
 
-	s.Run("Mint tokens - Success", func() {
-		evmObj := deps.NewEVM()
+	s.Run("successfully mint 69420 tokens", func() {
+		evmObj, stateDB := deps.NewEVM()
 		_, err := deps.EvmKeeper.ERC20().Mint(
-			contract,               /*erc20Addr*/
+			erc20,                  /*erc20Addr*/
 			evm.EVM_MODULE_ADDRESS, /*sender*/
 			evm.EVM_MODULE_ADDRESS, /*recipient*/
 			big.NewInt(69_420),     /*amount*/
 			deps.Ctx,
 			evmObj,
 		)
 		s.Require().NoError(err)
+		stateDB.Commit()
 
-		evmtest.AssertERC20BalanceEqualWithDescription(s.T(), deps, evmObj, contract, evm.EVM_MODULE_ADDRESS, big.NewInt(69_420), "expect nonzero balance")
-		evmtest.AssertERC20BalanceEqualWithDescription(s.T(), deps, evmObj, contract, deps.Sender.EthAddr, big.NewInt(0), "expect zero balance")
+		evmtest.AssertERC20BalanceEqualWithDescription(s.T(), deps, evmObj, erc20, evm.EVM_MODULE_ADDRESS, big.NewInt(69_420), "expect 69420 tokens")
+		evmtest.AssertERC20BalanceEqualWithDescription(s.T(), deps, evmObj, erc20, deps.Sender.EthAddr, big.NewInt(0), "expect zero tokens")
 	})
 
 	s.Run("Transfer - Not enough funds", func() {
-		evmObj := deps.NewEVM()
+		evmObj, _ := deps.NewEVM()
 		_, _, err := deps.EvmKeeper.ERC20().Transfer(
-			contract, deps.Sender.EthAddr, evm.EVM_MODULE_ADDRESS,
+			erc20, deps.Sender.EthAddr, evm.EVM_MODULE_ADDRESS,
 			big.NewInt(9_420), deps.Ctx, evmObj,
 		)
 		s.ErrorContains(err, "ERC20: transfer amount exceeds balance")
 		// balances unchanged
-		evmtest.AssertERC20BalanceEqualWithDescription(s.T(), deps, evmObj, contract, evm.EVM_MODULE_ADDRESS, big.NewInt(69_420), "expect nonzero balance")
-		evmtest.AssertERC20BalanceEqualWithDescription(s.T(), deps, evmObj, contract, deps.Sender.EthAddr, big.NewInt(0), "expect zero balance")
+		evmtest.AssertERC20BalanceEqualWithDescription(s.T(), deps, evmObj, erc20, evm.EVM_MODULE_ADDRESS, big.NewInt(69_420), "expect nonzero balance")
+		evmtest.AssertERC20BalanceEqualWithDescription(s.T(), deps, evmObj, erc20, deps.Sender.EthAddr, big.NewInt(0), "expect zero balance")
 	})
 
 	s.Run("Transfer - Success (sanity check)", func() {
-		evmObj := deps.NewEVM()
+		evmObj, stateDB := deps.NewEVM()
 		sentAmt, _, err := deps.EvmKeeper.ERC20().Transfer(
-			contract,               /*erc20Addr*/
+			erc20,                  /*erc20Addr*/
 			evm.EVM_MODULE_ADDRESS, /*sender*/
 			deps.Sender.EthAddr,    /*recipient*/
 			big.NewInt(9_420),      /*amount*/
 			deps.Ctx,
 			evmObj,
 		)
 		s.Require().NoError(err)
-
+		stateDB.Commit()
 		evmtest.AssertERC20BalanceEqualWithDescription(
-			s.T(), deps, evmObj, contract, deps.Sender.EthAddr, big.NewInt(9_420), "expect nonzero balance")
+			s.T(), deps, evmObj, erc20, deps.Sender.EthAddr, big.NewInt(9_420), "expect nonzero balance")
 		evmtest.AssertERC20BalanceEqualWithDescription(
-			s.T(), deps, evmObj, contract, evm.EVM_MODULE_ADDRESS, big.NewInt(60_000), "expect nonzero balance")
+			s.T(), deps, evmObj, erc20, evm.EVM_MODULE_ADDRESS, big.NewInt(60_000), "expect nonzero balance")
 		s.Require().EqualValues(big.NewInt(9_420), sentAmt)
 	})
 
 	s.Run("Burn tokens - Allowed as non-owner", func() {
-		evmObj := deps.NewEVM()
+		evmObj, stateDB := deps.NewEVM()
 		_, err := deps.EvmKeeper.ERC20().Burn(
-			contract,            /*erc20Addr*/
+			erc20,               /*erc20Addr*/
 			deps.Sender.EthAddr, /*sender*/
 			big.NewInt(6_000),   /*amount*/
 			deps.Ctx,
 			evmObj,
 		)
 		s.Require().NoError(err)
-
-		evmtest.AssertERC20BalanceEqualWithDescription(s.T(), deps, evmObj, contract, deps.Sender.EthAddr, big.NewInt(3_420), "expect nonzero balance")
-		evmtest.AssertERC20BalanceEqualWithDescription(s.T(), deps, evmObj, contract, evm.EVM_MODULE_ADDRESS, big.NewInt(60_000), "expect nonzero balance")
+		stateDB.Commit()
+		evmtest.AssertERC20BalanceEqualWithDescription(s.T(), deps, evmObj, erc20, deps.Sender.EthAddr, big.NewInt(3_420), "expect 3420 tokens")
+		evmtest.AssertERC20BalanceEqualWithDescription(s.T(), deps, evmObj, erc20, evm.EVM_MODULE_ADDRESS, big.NewInt(60_000), "expect 60000 tokens")
 	})
 
 	s.Run("Burn tokens - Allowed as owner", func() {
-		evmObj := deps.NewEVM()
+		evmObj, stateDB := deps.NewEVM()
 		_, err := deps.EvmKeeper.ERC20().Burn(
-			contract,               /*erc20Addr*/
+			erc20,                  /*erc20Addr*/
 			evm.EVM_MODULE_ADDRESS, /*sender*/
 			big.NewInt(6_000),      /*amount*/
 			deps.Ctx,
 			evmObj,
 		)
 		s.Require().NoError(err)
-
-		evmtest.AssertERC20BalanceEqualWithDescription(s.T(), deps, evmObj, contract, deps.Sender.EthAddr, big.NewInt(3_420), "expect nonzero balance")
-		evmtest.AssertERC20BalanceEqualWithDescription(s.T(), deps, evmObj, contract, evm.EVM_MODULE_ADDRESS, big.NewInt(54_000), "expect nonzero balance")
+		stateDB.Commit()
+		evmtest.AssertERC20BalanceEqualWithDescription(s.T(), deps, evmObj, erc20, deps.Sender.EthAddr, big.NewInt(3_420), "expect 3420 tokens")
+		evmtest.AssertERC20BalanceEqualWithDescription(s.T(), deps, evmObj, erc20, evm.EVM_MODULE_ADDRESS, big.NewInt(54_000), "expect 54000 tokens")
 	})
 }

x/evm/keeper/funtoken_from_coin_test.go

@@ -27,7 +27,7 @@ func (s *FunTokenFromCoinSuite) TestCreateFunTokenFromCoin() {
 	// Compute contract address. FindERC20 should fail
 	nonce := deps.NewStateDB().GetNonce(deps.Sender.EthAddr)
 	contractAddress := crypto.CreateAddress(deps.Sender.EthAddr, nonce)
-	evmObj := deps.NewEVM()
+	evmObj, _ := deps.NewEVM()
 	metadata, err := deps.EvmKeeper.FindERC20Metadata(deps.Ctx, evmObj, contractAddress)
 	s.Require().Error(err)
 	s.Require().Nil(metadata)
@@ -169,7 +169,7 @@ func (s *FunTokenFromCoinSuite) TestCreateFunTokenFromCoin() {
 
 func (s *FunTokenFromCoinSuite) TestConvertCoinToEvmAndBack() {
 	deps := evmtest.NewTestDeps()
-	evmObj := deps.NewEVM()
+	evmObj, _ := deps.NewEVM()
 	alice := evmtest.NewEthPrivAcc()
 
 	// Initial setup
@@ -236,7 +236,7 @@ func (s *FunTokenFromCoinSuite) TestConvertCoinToEvmAndBack() {
 		deps.Sender.NibiruAddr.String(),
 	)
 	s.Require().NoError(err)
-	evmObj = deps.NewEVM()
+	evmObj, _ = deps.NewEVM()
 	_, err = deps.EvmKeeper.CallContractWithInput(
 		deps.Ctx,
 		evmObj,
@@ -264,7 +264,7 @@ func (s *FunTokenFromCoinSuite) TestConvertCoinToEvmAndBack() {
 	deps.ResetGasMeter()
 
 	s.T().Log("sad: Convert more erc-20 to back to bank coin, insufficient funds")
-	evmObj = deps.NewEVM()
+	evmObj, _ = deps.NewEVM()
 	_, err = deps.EvmKeeper.CallContractWithInput(
 		deps.Ctx,
 		evmObj,
@@ -297,7 +297,7 @@ func (s *FunTokenFromCoinSuite) TestConvertCoinToEvmAndBack() {
 // - Module account: 0 NIBI escrowed
 func (s *FunTokenFromCoinSuite) TestNativeSendThenPrecompileSend() {
 	deps := evmtest.NewTestDeps()
-	evmObj := deps.NewEVM()
+	evmObj, _ := deps.NewEVM()
 	bankDenom := evm.EVMBankDenom
 
 	// Initial setup
@@ -375,7 +375,7 @@ func (s *FunTokenFromCoinSuite) TestNativeSendThenPrecompileSend() {
 		newSendAmtSendToBank,      /*amount*/
 	)
 	s.Require().NoError(err)
-	evmObj = deps.NewEVM()
+	evmObj, _ = deps.NewEVM()
 	evmResp, err := deps.EvmKeeper.CallContractWithInput(
 		deps.Ctx,
 		evmObj,
@@ -418,7 +418,7 @@ func (s *FunTokenFromCoinSuite) TestNativeSendThenPrecompileSend() {
 		newSendAmtSendToBank,      /*amount*/
 	)
 	s.Require().NoError(err)
-	evmObj = deps.NewEVM()
+	evmObj, _ = deps.NewEVM()
 	evmResp, err = deps.EvmKeeper.CallContractWithInput(
 		deps.Ctx,
 		evmObj,
@@ -473,7 +473,7 @@ func (s *FunTokenFromCoinSuite) TestNativeSendThenPrecompileSend() {
 // - Module account: 1 NIBI escrowed (which Alice holds as 1 WNIBI)
 func (s *FunTokenFromCoinSuite) TestERC20TransferThenPrecompileSend() {
 	deps := evmtest.NewTestDeps()
-	evmObj := deps.NewEVM()
+	evmObj, _ := deps.NewEVM()
 
 	funToken := s.fundAndCreateFunToken(deps, 10e6)
 
@@ -531,7 +531,7 @@ func (s *FunTokenFromCoinSuite) TestERC20TransferThenPrecompileSend() {
 		big.NewInt(9e6),           /*amount*/
 	)
 	s.Require().NoError(err)
-	evmObj = deps.NewEVM()
+	evmObj, _ = deps.NewEVM()
 	_, err = deps.EvmKeeper.CallContractWithInput(
 		deps.Ctx,
 		evmObj,
@@ -587,7 +587,7 @@ func (s *FunTokenFromCoinSuite) TestERC20TransferThenPrecompileSend() {
 // - Module account: 10 NIBI escrowed (which Test contract holds as 10 WNIBI)
 func (s *FunTokenFromCoinSuite) TestPrecompileSelfCallRevert() {
 	deps := evmtest.NewTestDeps()
-	evmObj := deps.NewEVM()
+	evmObj, _ := deps.NewEVM()
 
 	// Initial setup
 	funToken := s.fundAndCreateFunToken(deps, 10e6)

x/evm/keeper/funtoken_from_erc20_test.go

@@ -40,7 +40,7 @@ func (s *FunTokenFromErc20Suite) TestCreateFunTokenFromERC20() {
 	s.Require().NoError(err)
 	s.Require().Equal(expectedERC20Addr, deployResp.ContractAddr)
 
-	evmObj := deps.NewEVM()
+	evmObj, _ := deps.NewEVM()
 
 	actualMetadata, err := deps.EvmKeeper.FindERC20Metadata(deps.Ctx, evmObj, deployResp.ContractAddr)
 	s.Require().NoError(err)
@@ -201,7 +201,7 @@ func (s *FunTokenFromErc20Suite) TestSendFromEvmToBank_MadeFromErc20() {
 	s.T().Logf("mint erc20 tokens to %s", deps.Sender.EthAddr.String())
 	contractInput, err := embeds.SmartContract_ERC20Minter.ABI.Pack("mint", deps.Sender.EthAddr, big.NewInt(69_420))
 	s.Require().NoError(err)
-	evmObj := deps.NewEVM()
+	evmObj, _ := deps.NewEVM()
 	_, err = deps.EvmKeeper.CallContractWithInput(
 		deps.Ctx,
 		evmObj,
@@ -219,7 +219,7 @@ func (s *FunTokenFromErc20Suite) TestSendFromEvmToBank_MadeFromErc20() {
 	deps.ResetGasMeter()
 	contractInput, err = embeds.SmartContract_FunToken.ABI.Pack("sendToBank", deployResp.ContractAddr, big.NewInt(1), randomAcc.String())
 	s.Require().NoError(err)
-	evmObj = deps.NewEVM()
+	evmObj, _ = deps.NewEVM()
 	_, err = deps.EvmKeeper.CallContractWithInput(
 		deps.Ctx,
 		evmObj,
@@ -243,7 +243,7 @@ func (s *FunTokenFromErc20Suite) TestSendFromEvmToBank_MadeFromErc20() {
 	s.T().Log("sad: send too many erc20 tokens to Bank")
 	contractInput, err = embeds.SmartContract_FunToken.ABI.Pack("sendToBank", deployResp.ContractAddr, big.NewInt(70_000), randomAcc.String())
 	s.Require().NoError(err)
-	evmObj = deps.NewEVM()
+	evmObj, _ = deps.NewEVM()
 	evmResp, err := deps.EvmKeeper.CallContractWithInput(
 		deps.Ctx,
 		evmObj,
@@ -270,7 +270,7 @@ func (s *FunTokenFromErc20Suite) TestSendFromEvmToBank_MadeFromErc20() {
 	s.Require().NoError(err)
 
 	s.T().Log("check balances")
-	evmObj = deps.NewEVM()
+	evmObj, _ = deps.NewEVM()
 	evmtest.AssertERC20BalanceEqualWithDescription(s.T(), deps, evmObj, deployResp.ContractAddr, deps.Sender.EthAddr, big.NewInt(69_420), "expect nonzero balance")
 	evmtest.AssertERC20BalanceEqualWithDescription(s.T(), deps, evmObj, deployResp.ContractAddr, evm.EVM_MODULE_ADDRESS, big.NewInt(0), "expect nonzero balance")
 	s.Require().True(
@@ -374,7 +374,7 @@ func (s *FunTokenFromErc20Suite) TestFunTokenFromERC20MaliciousTransfer() {
 	s.T().Log("send erc20 tokens to cosmos")
 	input, err := embeds.SmartContract_FunToken.ABI.Pack("sendToBank", deployResp.ContractAddr, big.NewInt(1), randomAcc.String())
 	s.Require().NoError(err)
-	evmObj := deps.NewEVM()
+	evmObj, _ := deps.NewEVM()
 	_, err = deps.EvmKeeper.CallContractWithInput(
 		deps.Ctx,
 		evmObj,
@@ -429,7 +429,7 @@ func (s *FunTokenFromErc20Suite) TestFunTokenInfiniteRecursionERC20() {
 	s.T().Log("happy: call attackBalance()")
 	contractInput, err := embeds.SmartContract_TestInfiniteRecursionERC20.ABI.Pack("attackBalance")
 	s.Require().NoError(err)
-	evmObj := deps.NewEVM()
+	evmObj, _ := deps.NewEVM()
 	_, err = deps.EvmKeeper.CallContractWithInput(
 		deps.Ctx,
 		evmObj,
@@ -444,7 +444,7 @@ func (s *FunTokenFromErc20Suite) TestFunTokenInfiniteRecursionERC20() {
 	s.T().Log("sad: call attackTransfer()")
 	contractInput, err = embeds.SmartContract_TestInfiniteRecursionERC20.ABI.Pack("attackTransfer")
 	s.Require().NoError(err)
-	evmObj = deps.NewEVM()
+	evmObj, _ = deps.NewEVM()
 	_, err = deps.EvmKeeper.CallContractWithInput(
 		deps.Ctx,
 		evmObj,
@@ -503,7 +503,7 @@ func (s *FunTokenFromErc20Suite) TestSendERC20WithFee() {
 		randomAcc.String(),      /*to*/
 	)
 	s.Require().NoError(err)
-	evmObj := deps.NewEVM()
+	evmObj, _ := deps.NewEVM()
 	_, err = deps.EvmKeeper.CallContractWithInput(
 		deps.Ctx,
 		evmObj,
@@ -537,7 +537,7 @@ func (s *FunTokenFromErc20Suite) TestSendERC20WithFee() {
 	s.Require().NoError(err)
 
 	s.T().Log("check balances")
-	evmObj = deps.NewEVM()
+	evmObj, _ = deps.NewEVM()
 	evmtest.AssertERC20BalanceEqualWithDescription(s.T(), deps, evmObj, deployResp.ContractAddr, deps.Sender.EthAddr, big.NewInt(981), "expect 981 balance")
 	evmtest.AssertERC20BalanceEqualWithDescription(s.T(), deps, evmObj, deployResp.ContractAddr, deployResp.ContractAddr, big.NewInt(19), "expect 19 balance")
 	evmtest.AssertERC20BalanceEqualWithDescription(s.T(), deps, evmObj, deployResp.ContractAddr, evm.EVM_MODULE_ADDRESS, big.NewInt(0), "expect 0 balance")

x/evm/keeper/random_test.go

@@ -11,7 +11,7 @@ import (
 // TestRandom tests the random value generation within the EVM.
 func (s *Suite) TestRandom() {
 	deps := evmtest.NewTestDeps()
-	evmObj := deps.NewEVM()
+	evmObj, _ := deps.NewEVM()
 	deployResp, err := evmtest.DeployContract(&deps, embeds.SmartContract_TestRandom)
 	s.Require().NoError(err)
 	randomContractAddr := deployResp.ContractAddr
@@ -26,7 +26,7 @@ func (s *Suite) TestRandom() {
 
 	// Update block time to check that random changes
 	deps.Ctx = deps.Ctx.WithBlockTime(deps.Ctx.BlockTime().Add(1 * time.Second))
-	evmObj = deps.NewEVM()
+	evmObj, _ = deps.NewEVM()
 	random2, err := deps.EvmKeeper.ERC20().LoadERC20BigInt(
 		deps.Ctx, evmObj, embeds.SmartContract_TestRandom.ABI, randomContractAddr, "getRandom",
 	)