Merge pull request ethereum#6 from zama-ai/petar/create2-protected-st…

…orage

Create protected storage on the CREATE2 opcode

core/vm/evm.go

@@ -518,9 +518,21 @@ func (evm *EVM) Create(caller ContractRef, code []byte, gas uint64, value *big.I
 // The different between Create2 with Create is Create2 uses keccak256(0xff ++ msg.sender ++ salt ++ keccak256(init_code))[12:]
 // instead of the usual sender-and-nonce-hash as the address where the contract is initialized at.
 func (evm *EVM) Create2(caller ContractRef, code []byte, gas uint64, endowment *big.Int, salt *uint256.Int) (ret []byte, contractAddr common.Address, leftOverGas uint64, err error) {
-	codeAndHash := &codeAndHash{code: code}
-	contractAddr = crypto.CreateAddress2(caller.Address(), salt.Bytes32(), codeAndHash.Hash().Bytes())
-	return evm.create(caller, codeAndHash, gas, endowment, contractAddr, CREATE2)
+	actualCodeAndHash := &codeAndHash{code: code}
+
+	// Create the actual contract.
+	contractAddr = crypto.CreateAddress2(caller.Address(), salt.Bytes32(), actualCodeAndHash.Hash().Bytes())
+
+	ret, contractAddr, leftOverGas, err = evm.create(caller, actualCodeAndHash, gas, endowment, contractAddr, CREATE2)
+	if err != nil {
+		return
+	}
+
+	// Create a separate contract that would be used for protected storage.
+	// Return the actual contract's return value and contract address.
+	protectedStorageContractAddr := crypto.CreateProtectedStorageContractAddress(contractAddr)
+	_, _, leftOverGas, err = evm.create(caller, &codeAndHash{}, gas, endowment, protectedStorageContractAddr, CREATE2)
+	return
 }
 
 // ChainConfig returns the environment's chain configuration

tests/solidity/zama/create2.sol

@@ -0,0 +1,50 @@
+// SPDX-License-Identifier: BSD-3-Clause-Clear
+
+pragma solidity >=0.7.0 <0.9.0;
+
+contract Contract {
+    uint256 public value;
+
+    constructor(uint256 v) {
+        value = v;
+    }
+
+    function get() public view returns (uint256) {
+        return value;
+    }
+
+    function destruct() public {
+        selfdestruct(payable(tx.origin));
+    }
+}
+
+// Salt: 0x0102abcdef0102abcdef0102abcdef0102abcdef0102abcdef0102abcdefaaaa
+
+// Creates a member contract via the CREATE2 opcode.
+contract Factory {
+    Contract public c;
+    bytes32 public original_salt;
+    uint256 public original_value;
+    address public original_address;
+
+    constructor(bytes32 salt, uint256 value) {
+        c = new Contract{salt: salt}(value);
+        original_salt = salt;
+        original_value = value;
+        original_address = address(c);
+    }
+
+    function get() public view returns (uint256) {
+        return c.get();
+    }
+
+    function destruct() public {
+        c.destruct();
+    }
+
+    // After `destruct()` is called, `recreate()` must succeed and `c` must have the same address as before.
+    function recreate() public {
+        c = new Contract{salt: original_salt}(original_value);
+        require(original_address == address(c));
+    }
+}

tests/solidity/zama/handles.sol

@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0
+// SPDX-License-Identifier: BSD-3-Clause-Clear
 
 pragma solidity >=0.7.0 <0.9.0;