Merge branch 'dev' into fix-precision-error

okx · Jan 26, 2021 · 1aaeb0c · 1aaeb0c
2 parents fa2b1f5 + fbd5a75
commit 1aaeb0c
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git a/x/evm/handler.go b/x/evm/handler.go
@@ -100,6 +100,7 @@ func handleMsgEthereumTx(ctx sdk.Context, k *Keeper, msg types.MsgEthereumTx) (*
 			if refundErr != nil {
 				panic(refundErr)
 			}
+			st.Csdb.WithContext(ctx.WithGasMeter(sdk.NewInfiniteGasMeter())).UpdateAccounts()
 		}
 	}()
 
@@ -195,6 +196,7 @@ func handleMsgEthermint(ctx sdk.Context, k *Keeper, msg types.MsgEthermint) (*sd
 			if refundErr != nil {
 				panic(refundErr)
 			}
+			st.Csdb.WithContext(ctx.WithGasMeter(sdk.NewInfiniteGasMeter())).UpdateAccounts()
 		}
 	}()
 

diff --git a/x/evm/handler_test.go b/x/evm/handler_test.go
@@ -637,8 +637,6 @@ func (suite *EvmTestSuite) TestRefundGas() {
 			gasLeft := big.NewInt(1).SetUint64(gasLimit - suite.ctx.GasMeter().GasConsumed())
 			gasRefund := big.NewInt(1).Mul(gasPrice, gasLeft)
 
-			suite.app.EvmKeeper.UpdateAccounts(suite.ctx)
-
 			balanceAfterHandler := big.NewInt(1).Sub(userBalance, tc.consumed)
 			balanceAfterRefund := suite.app.EvmKeeper.GetBalance(suite.ctx, sender)
 

diff --git a/x/evm/types/state_transition.go b/x/evm/types/state_transition.go
@@ -267,8 +267,6 @@ func (st StateTransition) TransitionDb(ctx sdk.Context, config ChainConfig) (*Ex
 		},
 	}
 
-	// TODO: Refund unused gas here, if intended in future
-
 	// Consume gas from evm execution
 	// Out of gas check does not need to be done here since it is done within the EVM execution
 	ctx.WithGasMeter(currentGasMeter).GasMeter().ConsumeGas(gasConsumed, "EVM execution consumption")