fix edge cases

Author: codchen

app/abci.go

@@ -81,10 +81,10 @@ func (app *App) CheckTx(ctx context.Context, req *abci.RequestCheckTxV2) (*abci.
 
 		res := &abci.ResponseCheckTxV2{
 			ResponseCheckTx: &abci.ResponseCheckTx{
-				GasWanted:    int64(gInfo.GasWanted), // TODO: Should type accept unsigned ints?
+				GasWanted:    int64(gInfo.GasWanted), //nolint:gosec
 				Data:         result.Data,
 				Priority:     txCtx.Priority(),
-				GasEstimated: int64(gInfo.GasEstimate),
+				GasEstimated: int64(gInfo.GasEstimate), //nolint:gosec
 			},
 			ExpireTxHandler:  txCtx.ExpireTxHandler(),
 			CheckTxCallback:  txCtx.CheckTxCallback(),

app/ante/cosmos_checktx.go

@@ -80,22 +80,25 @@ func CosmosCheckTxAnte(
 			returnErr = HandleOutofGas(r, tx.(GasTx).GetGas(), ctx.GasMeter().GasConsumed())
 		}
 	}()
-	gasMeter, err := GetGasMeter(ctx.WithGasMeter(storetypes.NewNoConsumptionInfiniteGasMeter()), tx, oraclek, ek, pk)
+	gasMeter, isGasless, err := GetGasMeter(ctx.WithGasMeter(storetypes.NewNoConsumptionInfiniteGasMeter()), tx, oraclek, ek, pk)
 	if err != nil {
 		return ctx, err
 	}
 	ctx = ctx.WithGasMeter(gasMeter)
 
-	priority, err := CheckAndChargeFees(ctx, tx, accountKeeper, bankKeeper, feegrantKeeper, pk)
-	if err != nil {
-		return ctx, err
+	if !isGasless {
+		priority, err := CheckAndChargeFees(ctx, tx, accountKeeper, bankKeeper, feegrantKeeper, pk)
+		if err != nil {
+			return ctx, err
+		}
+		if priority > antedecorators.MaxPriority {
+			ctx = ctx.WithPriority(antedecorators.MaxPriority)
+		} else {
+			ctx = ctx.WithPriority(priority)
+		}
 	}
 	if oracleVote {
 		ctx = ctx.WithPriority(antedecorators.OraclePriority)
-	} else if priority > antedecorators.MaxPriority {
-		ctx = ctx.WithPriority(antedecorators.MaxPriority)
-	} else {
-		ctx = ctx.WithPriority(priority)
 	}
 
 	authParams := accountKeeper.GetParams(ctx)
@@ -144,7 +147,7 @@ func CosmosStatelessChecks(tx sdk.Tx, height int64, consensusParams *tmproto.Con
 	if cp := consensusParams; cp != nil && cp.Block != nil {
 		// If there exists a maximum block gas limit, we must ensure that the tx
 		// does not exceed it.
-		if cp.Block.MaxGas > 0 && gasTx.GetGas() > uint64(cp.Block.MaxGas) {
+		if cp.Block.MaxGas > 0 && gasTx.GetGas() > uint64(cp.Block.MaxGas) { //nolint:gosec
 			return false, sdkerrors.Wrapf(sdkerrors.ErrOutOfGas, "tx gas wanted %d exceeds block max gas limit %d", gasTx.GetGas(), cp.Block.MaxGas)
 		}
 	}
@@ -192,7 +195,7 @@ func CosmosStatelessChecks(tx sdk.Tx, height int64, consensusParams *tmproto.Con
 	}
 
 	timeoutHeight := timeoutTx.GetTimeoutHeight()
-	if timeoutHeight > 0 && uint64(height) > timeoutHeight {
+	if timeoutHeight > 0 && uint64(height) > timeoutHeight { //nolint:gosec
 		return oracleVote, sdkerrors.Wrapf(
 			sdkerrors.ErrTxTimeoutHeight, "block height: %d, timeout height: %d", height, timeoutHeight,
 		)
@@ -244,17 +247,17 @@ func GetGasMeter(
 	ctx sdk.Context, tx sdk.Tx, oracleKeeper oraclekeeper.Keeper,
 	evmKeeper *evmkeeper.Keeper,
 	paramsKeeper paramskeeper.Keeper,
-) (sdk.GasMeter, error) {
+) (sdk.GasMeter, bool, error) {
 	// TODO: may not be necessary for CheckTx
 	isGasless, err := antedecorators.IsTxGasless(tx, ctx, oracleKeeper, evmKeeper)
 	if err != nil {
-		return nil, err
+		return nil, false, err
 	}
 	if !isGasless {
 		cosmosGasParams := paramsKeeper.GetCosmosGasParams(ctx)
-		return storetypes.NewMultiplierGasMeter(tx.(GasTx).GetGas(), cosmosGasParams.CosmosGasMultiplierNumerator, cosmosGasParams.CosmosGasMultiplierDenominator), nil
+		return storetypes.NewMultiplierGasMeter(tx.(GasTx).GetGas(), cosmosGasParams.CosmosGasMultiplierNumerator, cosmosGasParams.CosmosGasMultiplierDenominator), isGasless, nil
 	}
-	return ctx.GasMeter(), nil
+	return ctx.GasMeter(), isGasless, nil
 }
 
 func CheckAndChargeFees(ctx sdk.Context, tx sdk.Tx, accountKeeper authkeeper.AccountKeeper, bankKeeper bankkeeper.Keeper, feegrantKeeper *feegrantkeeper.Keeper, paramsKeeper paramskeeper.Keeper) (priority int64, err error) {
@@ -280,7 +283,7 @@ func CheckAndChargeFees(ctx sdk.Context, tx sdk.Tx, accountKeeper authkeeper.Acc
 		}
 	}
 	if gas > 0 {
-		priority = authante.GetTxPriority(feeCoins, int64(gas))
+		priority = authante.GetTxPriority(feeCoins, int64(gas)) //nolint:gosec
 	}
 	if addr := accountKeeper.GetModuleAddress(authtypes.FeeCollectorName); addr == nil {
 		return priority, fmt.Errorf("fee collector module account (%s) has not been set", authtypes.FeeCollectorName)
@@ -362,7 +365,7 @@ func CheckPubKeys(ctx sdk.Context, tx sdk.Tx, accountKeeper authkeeper.AccountKe
 		accountKeeper.SetAccount(ctx, acc)
 
 		sigCount += authante.CountSubKeys(pk)
-		if uint64(sigCount) > authParams.TxSigLimit {
+		if uint64(sigCount) > authParams.TxSigLimit { //nolint:gosec
 			return sdkerrors.Wrapf(sdkerrors.ErrTooManySignatures,
 				"signatures: %d, limit: %d", sigCount, authParams.TxSigLimit)
 		}

app/ante/evm_checktx.go

@@ -47,12 +47,13 @@ func EvmCheckTxAnte(
 		return ctx, err
 	}
 	msg := tx.GetMsgs()[0].(*evmtypes.MsgEVMTransaction)
-	etx, txData := msg.AsTransaction() // cached and validated
 
+	txData, _ := evmtypes.UnpackTxData(msg.Data) // cached and validated
 	ctx = ctx.WithGasMeter(sdk.NewInfiniteGasMeterWithMultiplier(ctx))
 	if atx, ok := txData.(*ethtx.AssociateTx); ok {
 		return HandleAssociateTx(ctx, ek, atx)
 	}
+	etx := ethtypes.NewTx(txData.AsEthereumData())
 	evmAddr, seiAddr, seiPubkey, version, err := CheckAndDecodeSignature(ctx, txData, chainID)
 	if err != nil {
 		return ctx, err
@@ -134,6 +135,9 @@ func EvmStatelessChecks(ctx sdk.Context, tx sdk.Tx, chainID *big.Int) error {
 	if err != nil {
 		return err
 	}
+	if _, ok := txData.(*ethtx.AssociateTx); ok {
+		return nil
+	}
 	etx, _ := msg.AsTransaction()
 	if etx.To() == nil && len(etx.Data()) > params.MaxInitCodeSize {
 		return fmt.Errorf("%w: code size %v, limit %v", core.ErrMaxInitCodeSizeExceeded, len(etx.Data()), params.MaxInitCodeSize)