Problem: trace block not accurate for dynamic fee transaction

yihuang · Sep 23, 2024 · c8d3113 · c8d3113
1 parent 7e30762
commit c8d3113
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 17 deletions.
diff --git a/x/evm/keeper/state_transition.go b/x/evm/keeper/state_transition.go
@@ -322,33 +322,39 @@ func (k *Keeper) ApplyMessageWithConfig(
 		return nil, errorsmod.Wrap(types.ErrCallDisabled, "failed to call contract")
 	}
 
-	stateDB := statedb.NewWithParams(ctx, k, cfg.TxConfig, cfg.Params.EvmDenom)
-	var evm *vm.EVM
-	if cfg.Overrides != nil {
-		if err := cfg.Overrides.Apply(stateDB); err != nil {
-			return nil, errorsmod.Wrap(err, "failed to apply state override")
-		}
-	}
-	evm = k.NewEVM(ctx, msg, cfg, stateDB)
-	leftoverGas := msg.GasLimit
-	sender := vm.AccountRef(msg.From)
 	// Allow the tracer captures the tx level events, mainly the gas consumption.
-	vmCfg := evm.Config
-	if vmCfg.Tracer != nil {
+	leftoverGas := msg.GasLimit
+	sender := sdk.AccAddress(msg.From.Bytes())
+	if cfg.Tracer != nil {
 		if cfg.DebugTrace {
 			// msg.GasPrice should have been set to effective gas price
-			stateDB.SubBalance(sender.Address(), new(big.Int).Mul(msg.GasPrice, new(big.Int).SetUint64(msg.GasLimit)))
-			stateDB.SetNonce(sender.Address(), stateDB.GetNonce(sender.Address())+1)
+			amount := new(big.Int).Mul(msg.GasPrice, new(big.Int).SetUint64(msg.GasLimit))
+			if err := k.SubBalance(ctx, sender, sdk.NewCoins(sdk.NewCoin(cfg.Params.EvmDenom, sdkmath.NewIntFromBigInt(amount)))); err != nil {
+				return nil, errorsmod.Wrap(err, "failed to subtract balance")
+			}
+			if err := k.incrNonce(ctx, sender); err != nil {
+				return nil, errorsmod.Wrap(err, "failed to increment nonce")
+			}
 		}
-		vmCfg.Tracer.CaptureTxStart(leftoverGas)
+		cfg.Tracer.CaptureTxStart(leftoverGas)
 		defer func() {
 			if cfg.DebugTrace {
-				stateDB.AddBalance(sender.Address(), new(big.Int).Mul(msg.GasPrice, new(big.Int).SetUint64(leftoverGas)))
+				amount := new(big.Int).Mul(msg.GasPrice, new(big.Int).SetUint64(leftoverGas))
+				k.AddBalance(ctx, sender, sdk.NewCoins(sdk.NewCoin(cfg.Params.EvmDenom, sdkmath.NewIntFromBigInt(amount))))
 			}
-			vmCfg.Tracer.CaptureTxEnd(leftoverGas)
+			cfg.Tracer.CaptureTxEnd(leftoverGas)
 		}()
 	}
 
+	stateDB := statedb.NewWithParams(ctx, k, cfg.TxConfig, cfg.Params.EvmDenom)
+	var evm *vm.EVM
+	if cfg.Overrides != nil {
+		if err := cfg.Overrides.Apply(stateDB); err != nil {
+			return nil, errorsmod.Wrap(err, "failed to apply state override")
+		}
+	}
+	evm = k.NewEVM(ctx, msg, cfg, stateDB)
+
 	rules := cfg.Rules
 	contractCreation := msg.To == nil
 	intrinsicGas, err := k.GetEthIntrinsicGas(msg, rules, contractCreation)

diff --git a/x/evm/keeper/statedb.go b/x/evm/keeper/statedb.go
@@ -138,6 +138,20 @@ func (k *Keeper) SetAccount(ctx sdk.Context, addr common.Address, account stated
 	return nil
 }
 
+func (k *Keeper) incrNonce(ctx sdk.Context, addr sdk.AccAddress) error {
+	acct := k.accountKeeper.GetAccount(ctx, addr)
+	if acct == nil {
+		acct = k.accountKeeper.NewAccountWithAddress(ctx, addr)
+	}
+
+	if err := acct.SetSequence(acct.GetSequence() + 1); err != nil {
+		return err
+	}
+
+	k.accountKeeper.SetAccount(ctx, acct)
+	return nil
+}
+
 // SetState update contract storage, delete if value is empty.
 func (k *Keeper) SetState(ctx sdk.Context, addr common.Address, key common.Hash, value []byte) {
 	store := prefix.NewStore(ctx.KVStore(k.storeKey), types.AddressStoragePrefix(addr))