underflow test fix

state/runtime/evm/dispatch_table.go

@@ -61,7 +61,7 @@ func init() {
 	register(SLT, handler{inst: opSlt, stack: 2, gas: 3})
 	register(SGT, handler{inst: opSgt, stack: 2, gas: 3})
 
-	register(SIGNEXTEND, handler{inst: opSignExtension, stack: 1, gas: 5})
+	register(SIGNEXTEND, handler{inst: opSignExtension, stack: 2, gas: 5})
 
 	register(SHL, handler{inst: opShl, stack: 2, gas: 3})
 	register(SHR, handler{inst: opShr, stack: 2, gas: 3})

state/runtime/evm/instructions.go

@@ -1418,9 +1418,6 @@ func (c *state) buildCreateContract(op OpCode) (*runtime.Contract, error) {
 
 	// Calculate and consume gas cost
 
-	// var overflow bool
-	var gasCost uint64
-
 	// Both CREATE and CREATE2 use memory
 	var input []byte
 
@@ -1431,17 +1428,6 @@ func (c *state) buildCreateContract(op OpCode) (*runtime.Contract, error) {
 		return nil, nil
 	}
 
-	// Consume memory resize gas (TODO, change with get2) (to be fixed in EVM-528) //nolint:godox
-	if !c.consumeGas(gasCost) {
-		return nil, nil
-	}
-
-	if hasTransfer {
-		if c.host.GetBalance(c.msg.Address).Cmp(value) < 0 {
-			return nil, types.ErrInsufficientFunds
-		}
-	}
-
 	if op == CREATE2 {
 		// Consume sha3 gas cost
 		size := length.Uint64()
@@ -1450,6 +1436,12 @@ func (c *state) buildCreateContract(op OpCode) (*runtime.Contract, error) {
 		}
 	}
 
+	if hasTransfer {
+		if c.host.GetBalance(c.msg.Address).Cmp(value) < 0 {
+			return nil, types.ErrInsufficientFunds
+		}
+	}
+
 	// Calculate and consume gas for the call
 	gas := c.gas
 

state/transition_test.go

@@ -48,7 +48,7 @@ func TestSubGasLimitPrice(t *testing.T) {
 			expectedErr: nil,
 		},
 		{
-			name: "should fail by ErrNotEnoughFunds",
+			name: "should fail by ErrInsufficientFunds",
 			preState: map[types.Address]*PreState{
 				addr1: {
 					Nonce:   0,
@@ -59,7 +59,7 @@ func TestSubGasLimitPrice(t *testing.T) {
 			from:     addr1,
 			gas:      10,
 			gasPrice: 10,
-			// should return ErrNotEnoughFundsForGas when state.SubBalance returns ErrNotEnoughFunds
+			// should return ErrInsufficientFunds when state.SubBalance returns ErrNotEnoughFunds
 			expectedErr: ErrInsufficientFunds,
 		},
 	}