From 3e51e450dfc004aeda1f386ebdf83890347c5638 Mon Sep 17 00:00:00 2001
From: dusan-maksimovic <dusan.maksimovic@ethernal.tech>
Date: Mon, 5 Jun 2023 11:59:33 +0200
Subject: [PATCH] fixed error handling for op code CREATE2

---
 state/runtime/evm/instructions.go      |  4 +-
 state/runtime/evm/instructions_test.go | 51 ++++++++++++++++++++++++++
 2 files changed, 54 insertions(+), 1 deletion(-)

diff --git a/state/runtime/evm/instructions.go b/state/runtime/evm/instructions.go
index 5c1bccf489..f85a1afaef 100644
--- a/state/runtime/evm/instructions.go
+++ b/state/runtime/evm/instructions.go
@@ -1101,7 +1101,9 @@ func opCreate(op OpCode) instruction {
 		v := c.push1()
 		if op == CREATE && c.config.Homestead && errors.Is(result.Err, runtime.ErrCodeStoreOutOfGas) {
 			v.Set(zero)
-		} else if result.Failed() && !errors.Is(result.Err, runtime.ErrCodeStoreOutOfGas) {
+		} else if op == CREATE && result.Failed() && !errors.Is(result.Err, runtime.ErrCodeStoreOutOfGas) {
+			v.Set(zero)
+		} else if op == CREATE2 && result.Failed() {
 			v.Set(zero)
 		} else {
 			v.SetBytes(contract.Address.Bytes())
diff --git a/state/runtime/evm/instructions_test.go b/state/runtime/evm/instructions_test.go
index 2d29cf2f53..e17f79fdcc 100644
--- a/state/runtime/evm/instructions_test.go
+++ b/state/runtime/evm/instructions_test.go
@@ -359,6 +359,57 @@ func TestCreate(t *testing.T) {
 				},
 			},
 		},
+		{
+			name: "should set zero address if contract call throws any error for CREATE2",
+			op:   CREATE2,
+			contract: &runtime.Contract{
+				Static:  false,
+				Address: addr1,
+			},
+			config: &chain.ForksInTime{
+				Homestead:      true,
+				Constantinople: true,
+			},
+			initState: &state{
+				gas: 1000,
+				sp:  4,
+				stack: []*big.Int{
+					big.NewInt(0x01), // salt
+					big.NewInt(0x01), // length
+					big.NewInt(0x00), // offset
+					big.NewInt(0x00), // value
+				},
+				memory: []byte{
+					byte(REVERT),
+				},
+				stop: false,
+				err:  nil,
+			},
+			// during creation of code with length 1 for CREATE2 op code, 985 gas units are spent by buildCreateContract()
+			resultState: &state{
+				gas: 15,
+				sp:  1,
+				stack: []*big.Int{
+					big.NewInt(0x01).SetInt64(0x00),
+					big.NewInt(0x01),
+					big.NewInt(0x00),
+					big.NewInt(0x00),
+				},
+				memory: []byte{
+					byte(REVERT),
+				},
+				stop: false,
+				err:  nil,
+			},
+			mockHost: &mockHostForInstructions{
+				nonce: 0,
+				callxResult: &runtime.ExecutionResult{
+					// if it is ErrCodeStoreOutOfGas then we set GasLeft to 0
+					GasLeft: 0,
+					Err:     runtime.ErrCodeStoreOutOfGas,
+				},
+			},
+		},
 	}
 
 	for _, tt := range tests {