Merge branch 'evm-equivalence-yul' into vv-use-caches-gas-manager

matter-labs · Aug 29, 2024 · c7b8312 · c7b8312
2 parents 1a05ce3 + 2fe0652
commit c7b8312
Show file tree

Hide file tree

Showing 9 changed files with 525 additions and 464 deletions.
diff --git a/system-contracts/contracts/ContractDeployer.sol b/system-contracts/contracts/ContractDeployer.sol
@@ -37,7 +37,13 @@ contract ContractDeployer is IContractDeployer, ISystemContract {
 
     uint256 public constructorReturnGas;
 
-    function setDeployedCode(uint256 constructorGasLeft, bytes calldata paddedNewDeployedCode) external {
+    modifier onlySystemEvm() {
+        require(ACCOUNT_CODE_STORAGE_SYSTEM_CONTRACT.isAccountEVM(msg.sender), "only system evm");
+        require(SystemContractHelper.isSystemCall(), "This method require system call flag");
+        _;
+    }
+
+    function setDeployedCode(uint256 constructorGasLeft, bytes calldata paddedNewDeployedCode) external onlySystemEvm {
         require(ACCOUNT_CODE_STORAGE_SYSTEM_CONTRACT.isAccountEVM(msg.sender));
 
         uint256 bytecodeLen = uint256(bytes32(paddedNewDeployedCode[:32]));
@@ -185,9 +191,15 @@ contract ContractDeployer is IContractDeployer, ISystemContract {
     function createEVM(bytes calldata _initCode) external payable override returns (address) {
         // If the account is an EOA, use the min nonce. If it's a contract, use deployment nonce
         // Subtract 1 for EOA since the nonce has already been incremented for this transaction
+
+        uint256 deploymentNonce = NONCE_HOLDER_SYSTEM_CONTRACT.getDeploymentNonce(msg.sender);
+        if ((msg.sender != tx.origin) && deploymentNonce == 0) {
+            NONCE_HOLDER_SYSTEM_CONTRACT.incrementDeploymentNonce(msg.sender);
+        }
+
         uint256 senderNonce = msg.sender == tx.origin
             ? NONCE_HOLDER_SYSTEM_CONTRACT.getMinNonce(msg.sender) - 1
-            : NONCE_HOLDER_SYSTEM_CONTRACT.incrementDeploymentNonce(msg.sender) + 1;
+            : NONCE_HOLDER_SYSTEM_CONTRACT.incrementDeploymentNonce(msg.sender);
         address newAddress = Utils.getNewAddressCreateEVM(msg.sender, senderNonce);
         _evmDeployOnAddress(newAddress, _initCode);
         return newAddress;
@@ -209,11 +221,6 @@ contract ContractDeployer is IContractDeployer, ISystemContract {
         return newAddress;
     }
 
-    function createEVMInternal(address _newAddress, bytes calldata _initCode) external payable {
-        require(ACCOUNT_CODE_STORAGE_SYSTEM_CONTRACT.isAccountEVM(msg.sender));
-        _evmDeployOnAddress(_newAddress, _initCode);
-    }
-
     /// @notice Deploys a contract account with similar address derivation rules to the EVM's `CREATE2` opcode.
     /// @param _salt The CREATE2 salt
     /// @param _bytecodeHash The correctly formatted hash of the bytecode.

diff --git a/system-contracts/contracts/EvmGasManager.sol b/system-contracts/contracts/EvmGasManager.sol
@@ -5,6 +5,8 @@ import "./EvmConstants.sol";
 import "./libraries/Utils.sol";
 
 import {ACCOUNT_CODE_STORAGE_SYSTEM_CONTRACT} from "./Constants.sol";
+import {ISystemContract} from "./interfaces/ISystemContract.sol";
+import {SystemContractHelper} from "./libraries/SystemContractHelper.sol";
 
 // We consider all the contracts (including system ones) as warm.
 uint160 constant PRECOMPILES_END = 0xffff;
@@ -55,6 +57,7 @@ contract EvmGasManager {
         }
 
         require(isEVM, "only system evm");
+        require(SystemContractHelper.isSystemCall(), "This method requires system call flag");
         _;
     }
 
@@ -133,13 +136,13 @@ contract EvmGasManager {
 
     */
 
-    function pushEVMFrame(uint256 _passGas, bool _isStatic) external {
+    function pushEVMFrame(uint256 _passGas, bool _isStatic) external onlySystemEvm {
         EVMStackFrameInfo memory frame = EVMStackFrameInfo({passGas: _passGas, isStatic: _isStatic});
 
         evmStackFrames.push(frame);
     }
 
-    function consumeEvmFrame() external returns (uint256 passGas, bool isStatic) {
+    function consumeEvmFrame() external onlySystemEvm returns (uint256 passGas, bool isStatic) {
         if (evmStackFrames.length == 0) return (INF_PASS_GAS, false);
 
         EVMStackFrameInfo storage frameInfo = evmStackFrames[evmStackFrames.length - 1];
@@ -151,7 +154,7 @@ contract EvmGasManager {
         frameInfo.passGas = INF_PASS_GAS;
     }
 
-    function popEVMFrame() external {
+    function popEVMFrame() external onlySystemEvm {
         evmStackFrames.pop();
     }
 }
diff --git a/system-contracts/contracts/EvmInterpreter.sol b/system-contracts/contracts/EvmInterpreter.sol
@@ -980,7 +980,7 @@ contract EvmInterpreter {
         return (_createdAddress, _gasLeft);
     }
 
-    uint32 constant CREATE_EVM_INTERNAL_SELECTOR = uint32(DEPLOYER_SYSTEM_CONTRACT.createEVMInternal.selector);
+    uint32 constant CREATE_EVM_INTERNAL_SELECTOR = uint32(DEPLOYER_SYSTEM_CONTRACT.createEVM.selector);
 
     function _performCreateCall(
         address _deployedAddress,

diff --git a/system-contracts/contracts/EvmInterpreter.template.yul b/system-contracts/contracts/EvmInterpreter.template.yul
@@ -26,7 +26,20 @@ object "EVMInterpreter" {
             mstore(sub(offset, 64), 0x40)
             mstore(sub(offset, 32), len)
 
-            let success := call(gas(), DEPLOYER_SYSTEM_CONTRACT(), 0, sub(offset, 100), add(len, 100), 0, 0)
+            let farCallAbi := getFarCallABI(
+                0,
+                0,
+                sub(offset, 100),
+                add(len, 100),
+                gas(),
+                // Only rollup is supported for now
+                0,
+                0,
+                0,
+                1
+            )
+            let to := DEPLOYER_SYSTEM_CONTRACT()
+            let success := verbatim_6i_1o("system_call", to, farCallAbi, 0, 0, 0, 0)
 
             if iszero(success) {
                 // This error should never happen