move logic

Author: thomas-nguy

x/evm/types/tx_args.go

@@ -133,18 +133,16 @@ func (args *TransactionArgs) ToMessage(globalGasCap uint64, baseFee *big.Int) (*
 		return nil, errors.New("both gasPrice and (maxFeePerGas or maxPriorityFeePerGas) specified")
 	}
 
-	// Ethereum block size is ~36000000
-	MaxGasCap := uint64(100000000)
-
 	// Set sender address or use zero address if none specified.
 	addr := args.GetFrom()
 
+	// Ethereum block size is ~36000000, we limit this value to protect against DOS
+	MaxGasCap := uint64(100000000)
+
 	// Set default gas & gas price if none were set
-	gas := globalGasCap
-	if gas == 0 {
-		gas = MaxGasCap
-	}
-	if args.Gas != nil {
+	gas := MaxGasCap
+
+	if args.Gas != nil && uint64(*args.Gas) < MaxGasCap {
 		gas = uint64(*args.Gas)
 	}
 	if globalGasCap != 0 && globalGasCap < gas {
@@ -201,11 +199,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,