fix(evmante): use deterministic ResponseDeliverTx gas wanted and gas consumed on failed EVM tx; nonce increment on the ctx should only happen in DeliverTx and ReCheckTx, not CheckTx (#2434)

* fix(evmante): nonce increment on the ctx should only happen in DeliverTx and ReCheckTx, not CheckTx

* fix: pull golangci.yml update from other branch

* fix: impl panic-safe guard for fixed gas taken by true ante failures in DeliverTx

* fix if statement

* chore: upgrade handler for v2.9

Author: Unique-Divine

.golangci.yml

@@ -30,6 +30,8 @@ linters:
           alias: cmttypes
       no-unaliased: true
       no-extra-aliases: false
+    govet: # https://golangci-lint.run/docs/linters/configuration/#govet
+      disable: ["buildtag"]
     misspell:
       locale: US
     staticcheck:

app/upgrades/all_upgrades.go

@@ -43,6 +43,7 @@ var AllUpgrades = []Upgrade{
 	Upgrade2_6_0,
 	Upgrade2_7_0,
 	Upgrade2_8_0,
+	Upgrade2_9_0,
 }
 
 // DefaultUpgradeHandler runs module manager migrations without running any other

app/upgrades/v2.go

@@ -129,4 +129,10 @@ var (
 		CreateUpgradeHandler: DefaultUpgradeHandler,
 		StoreUpgrades:        store.StoreUpgrades{},
 	}
+
+	Upgrade2_9_0 = Upgrade{
+		UpgradeName:          "v2.9.0",
+		CreateUpgradeHandler: DefaultUpgradeHandler,
+		StoreUpgrades:        store.StoreUpgrades{},
+	}
 )

x/evm/evmante/all_evmante.go

@@ -3,13 +3,17 @@ package evmante
 // Copyright (c) 2023-2024 Nibi, Inc.
 
 import (
+	"fmt"
 	"log"
+	"math/big"
 	"path"
 	"reflect"
 	"runtime"
 	"strings"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
+	"github.com/ethereum/go-ethereum/core"
+	"github.com/ethereum/go-ethereum/params"
 
 	"github.com/NibiruChain/nibiru/v2/app/ante"
 	"github.com/NibiruChain/nibiru/v2/x/evm"
@@ -56,17 +60,69 @@ func NewAnteHandlerEvm(
 // CanTransfer function to see if the address can execute the transaction.
 func (handlerGroup AnteHandlerEvm) AnteHandle(
 	ctx sdk.Context, tx sdk.Tx, simulate bool, next sdk.AnteHandler,
-) (sdk.Context, error) {
-	msgEthTx, err := evm.RequireStandardEVMTxMsg(tx)
+) (rCtx sdk.Context, rerr error) {
+	var (
+		sdb      *evmstate.SDB
+		msgEthTx *evm.MsgEthereumTx
+	)
+	defer func() {
+		var (
+			perr error // panic error
+
+			// Panic-safe guard for fixed gas taken by true ante failures in DeliverTx
+			deterministicGasCost = params.TxGas
+		)
+		if panicInfo := recover(); panicInfo != nil {
+			perr = fmt.Errorf("%v", panicInfo)
+		}
+
+		if rerr != nil || perr != nil {
+			if sdb != nil && msgEthTx != nil {
+				ethTx := msgEthTx.AsTransaction()
+				contractCreation := ethTx.To() == nil
+				rules := sdb.Keeper().GetEVMConfig(sdb.Ctx()).ChainConfig.Rules(
+					big.NewInt(sdb.Ctx().BlockHeight()),
+					false,
+					evm.ParseBlockTimeUnixU64(sdb.Ctx()),
+				)
+				intrinsicGasCost, err := core.IntrinsicGas(
+					ethTx.Data(), ethTx.AccessList(),
+					contractCreation,
+					rules.IsHomestead,
+					rules.IsIstanbul,
+					rules.IsShanghai,
+				)
+				if err == nil {
+					deterministicGasCost = intrinsicGasCost
+				}
+			}
+
+			rCtx = rCtx.WithGasMeter(
+				func() sdk.GasMeter {
+					gm := sdk.NewGasMeter(deterministicGasCost)
+					gm.ConsumeGas(deterministicGasCost, "EVM ante failure fixed gas")
+					return gm
+				}(),
+			)
+		}
+
+		if perr != nil {
+			rerr = perr
+		}
+	}()
+
+	var err error
+	msgEthTx, err = evm.RequireStandardEVMTxMsg(tx)
 	if err != nil {
 		return ctx, err
 	}
 
-	sdb := evmstate.NewSDB(
+	sdb = evmstate.NewSDB(
 		ctx,
 		handlerGroup.EVMKeeper,
 		handlerGroup.TxConfig(ctx, msgEthTx.AsTransaction().Hash()),
 	)
+
 	log.Printf(
 		"EthState AnteHandle BEGIN:\ntxhash: %s\n{ IsCheckTx %v, IsDeliverTx %v  ReCheckTx%v }",
 		msgEthTx.Hash, sdb.Ctx().IsCheckTx(), sdb.IsDeliverTx(), sdb.Ctx().IsReCheckTx())

x/evm/evmante/evmante_increment_sender_seq.go

@@ -70,11 +70,10 @@ func AnteStepIncrementNonce(
 				"invalid nonce; got %d, expected %d", txNonce, stateNonce,
 			)
 		}
+		newNonce := stateNonce + 1
+		sdb.SetNonce(msgEthTx.FromAddr(), newNonce)
 	default:
 	}
 
-	newNonce := stateNonce + 1
-	sdb.SetNonce(msgEthTx.FromAddr(), newNonce)
-
 	return nil
 }