move logic

Author: thomas-nguy

x/evm/types/tx_args.go

@@ -150,6 +150,10 @@ func (args *TransactionArgs) ToMessage(globalGasCap uint64, baseFee *big.Int) (*
 	if globalGasCap != 0 && globalGasCap < gas {
 		gas = globalGasCap
 	}
+	// Limit gas cap to avoid DOS during simulation
+	if gas > MaxGasCap {
+		gas = MaxGasCap
+	}
 
 	var (
 		gasPrice  *big.Int
@@ -201,11 +205,6 @@ func (args *TransactionArgs) ToMessage(globalGasCap uint64, baseFee *big.Int) (*
 		nonce = uint64(*args.Nonce)
 	}
 
-	// Limit gas cap to avoid DOS during simulation
-	if gas > MaxGasCap {
-		gas = MaxGasCap
-	}
-
 	msg := &core.Message{
 		From:              addr,
 		To:                args.To,