@arbitrum/nitro-contracts 3.1.1 → 3.2.0

package/src/rollup/ValidatorWalletCreator.sol

@@ -6,31 +6,18 @@ pragma solidity ^0.8.0;
 
 import "@openzeppelin/contracts/proxy/transparent/ProxyAdmin.sol";
 import "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";
-import "@openzeppelin/contracts/access/Ownable.sol";
 
 import "./ValidatorWallet.sol";
 
-contract ValidatorWalletCreator is Ownable {
+contract ValidatorWalletCreator {
     event WalletCreated(
         address indexed walletAddress,
         address indexed executorAddress,
         address indexed ownerAddress,
         address adminProxy
     );
-    event TemplateUpdated();
 
-    address public template;
-
-    constructor() Ownable() {
-        template = address(new ValidatorWallet());
-    }
-
-    function setTemplate(
-        address _template
-    ) external onlyOwner {
-        template = _template;
-        emit TemplateUpdated();
-    }
+    address public immutable template = address(new ValidatorWallet());
 
     function createWallet(
         address[] calldata initialExecutorAllowedDests

package/src/state/Instructions.sol

@@ -142,6 +142,7 @@ library Instructions {
     uint16 internal constant GET_GLOBAL_STATE_U64 = 0x8012;
     uint16 internal constant SET_GLOBAL_STATE_U64 = 0x8013;
 
+    uint16 internal constant VALIDATE_CERTIFICATE = 0x8019;
     uint16 internal constant READ_PRE_IMAGE = 0x8020;
     uint16 internal constant READ_INBOX_MESSAGE = 0x8021;
     uint16 internal constant HALT_AND_SET_FINISHED = 0x8022;

package/build/contracts/@openzeppelin/contracts/proxy/beacon/UpgradeableBeacon.sol/UpgradeableBeacon.dbg.json

@@ -1,4 +0,0 @@
-{
-  "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../../build-info/db15eeb0a9cfbd6e506aecb04c404862.json"
-}

package/build/contracts/@openzeppelin/contracts/proxy/beacon/UpgradeableBeacon.sol/UpgradeableBeacon.json

@@ -1,113 +0,0 @@
-{
-  "_format": "hh-sol-artifact-1",
-  "contractName": "UpgradeableBeacon",
-  "sourceName": "@openzeppelin/contracts/proxy/beacon/UpgradeableBeacon.sol",
-  "abi": [
-    {
-      "inputs": [
-        {
-          "internalType": "address",
-          "name": "implementation_",
-          "type": "address"
-        }
-      ],
-      "stateMutability": "nonpayable",
-      "type": "constructor"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "internalType": "address",
-          "name": "previousOwner",
-          "type": "address"
-        },
-        {
-          "indexed": true,
-          "internalType": "address",
-          "name": "newOwner",
-          "type": "address"
-        }
-      ],
-      "name": "OwnershipTransferred",
-      "type": "event"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "internalType": "address",
-          "name": "implementation",
-          "type": "address"
-        }
-      ],
-      "name": "Upgraded",
-      "type": "event"
-    },
-    {
-      "inputs": [],
-      "name": "implementation",
-      "outputs": [
-        {
-          "internalType": "address",
-          "name": "",
-          "type": "address"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [],
-      "name": "owner",
-      "outputs": [
-        {
-          "internalType": "address",
-          "name": "",
-          "type": "address"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [],
-      "name": "renounceOwnership",
-      "outputs": [],
-      "stateMutability": "nonpayable",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "address",
-          "name": "newOwner",
-          "type": "address"
-        }
-      ],
-      "name": "transferOwnership",
-      "outputs": [],
-      "stateMutability": "nonpayable",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "address",
-          "name": "newImplementation",
-          "type": "address"
-        }
-      ],
-      "name": "upgradeTo",
-      "outputs": [],
-      "stateMutability": "nonpayable",
-      "type": "function"
-    }
-  ],
-  "bytecode": "0x608060405234801561001057600080fd5b5060405161054538038061054583398101604081905261002f91610151565b61003833610047565b61004181610097565b50610181565b600080546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b6100aa8161014260201b6101c71760201c565b6101205760405162461bcd60e51b815260206004820152603360248201527f5570677261646561626c65426561636f6e3a20696d706c656d656e746174696f60448201527f6e206973206e6f74206120636f6e747261637400000000000000000000000000606482015260840160405180910390fd5b600180546001600160a01b0319166001600160a01b0392909216919091179055565b6001600160a01b03163b151590565b60006020828403121561016357600080fd5b81516001600160a01b038116811461017a57600080fd5b9392505050565b6103b5806101906000396000f3fe608060405234801561001057600080fd5b50600436106100675760003560e01c8063715018a611610050578063715018a6146100aa5780638da5cb5b146100b2578063f2fde38b146100c357600080fd5b80633659cfe61461006c5780635c60da1b14610081575b600080fd5b61007f61007a36600461034f565b6100d6565b005b6001546001600160a01b03165b6040516001600160a01b03909116815260200160405180910390f35b61007f61011e565b6000546001600160a01b031661008e565b61007f6100d136600461034f565b610132565b6100de6101d6565b6100e781610230565b6040516001600160a01b038216907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a250565b6101266101d6565b61013060006102e7565b565b61013a6101d6565b6001600160a01b0381166101bb5760405162461bcd60e51b815260206004820152602660248201527f4f776e61626c653a206e6577206f776e657220697320746865207a65726f206160448201527f646472657373000000000000000000000000000000000000000000000000000060648201526084015b60405180910390fd5b6101c4816102e7565b50565b6001600160a01b03163b151590565b6000546001600160a01b031633146101305760405162461bcd60e51b815260206004820181905260248201527f4f776e61626c653a2063616c6c6572206973206e6f7420746865206f776e657260448201526064016101b2565b6001600160a01b0381163b6102ad5760405162461bcd60e51b815260206004820152603360248201527f5570677261646561626c65426561636f6e3a20696d706c656d656e746174696f60448201527f6e206973206e6f74206120636f6e74726163740000000000000000000000000060648201526084016101b2565b600180547fffffffffffffffffffffffff0000000000000000000000000000000000000000166001600160a01b0392909216919091179055565b600080546001600160a01b038381167fffffffffffffffffffffffff0000000000000000000000000000000000000000831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b60006020828403121561036157600080fd5b81356001600160a01b038116811461037857600080fd5b939250505056fea264697066735822122082bdf18b8afef01ae881bcc91b53c55a0657fb16c57c252ccebc3cce6473db3864736f6c63430008110033",
-  "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100675760003560e01c8063715018a611610050578063715018a6146100aa5780638da5cb5b146100b2578063f2fde38b146100c357600080fd5b80633659cfe61461006c5780635c60da1b14610081575b600080fd5b61007f61007a36600461034f565b6100d6565b005b6001546001600160a01b03165b6040516001600160a01b03909116815260200160405180910390f35b61007f61011e565b6000546001600160a01b031661008e565b61007f6100d136600461034f565b610132565b6100de6101d6565b6100e781610230565b6040516001600160a01b038216907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a250565b6101266101d6565b61013060006102e7565b565b61013a6101d6565b6001600160a01b0381166101bb5760405162461bcd60e51b815260206004820152602660248201527f4f776e61626c653a206e6577206f776e657220697320746865207a65726f206160448201527f646472657373000000000000000000000000000000000000000000000000000060648201526084015b60405180910390fd5b6101c4816102e7565b50565b6001600160a01b03163b151590565b6000546001600160a01b031633146101305760405162461bcd60e51b815260206004820181905260248201527f4f776e61626c653a2063616c6c6572206973206e6f7420746865206f776e657260448201526064016101b2565b6001600160a01b0381163b6102ad5760405162461bcd60e51b815260206004820152603360248201527f5570677261646561626c65426561636f6e3a20696d706c656d656e746174696f60448201527f6e206973206e6f74206120636f6e74726163740000000000000000000000000060648201526084016101b2565b600180547fffffffffffffffffffffffff0000000000000000000000000000000000000000166001600160a01b0392909216919091179055565b600080546001600160a01b038381167fffffffffffffffffffffffff0000000000000000000000000000000000000000831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b60006020828403121561036157600080fd5b81356001600160a01b038116811461037857600080fd5b939250505056fea264697066735822122082bdf18b8afef01ae881bcc91b53c55a0657fb16c57c252ccebc3cce6473db3864736f6c63430008110033",
-  "linkReferences": {},
-  "deployedLinkReferences": {}
-}

package/build/contracts/src/rollup/FactoryDeployerHelper.sol/FactoryDeployerHelper.dbg.json

@@ -1,4 +0,0 @@
-{
-  "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/db15eeb0a9cfbd6e506aecb04c404862.json"
-}

package/build/contracts/src/rollup/FactoryDeployerHelper.sol/FactoryDeployerHelper.json

@@ -1,68 +0,0 @@
-{
-  "_format": "hh-sol-artifact-1",
-  "contractName": "FactoryDeployerHelper",
-  "sourceName": "src/rollup/FactoryDeployerHelper.sol",
-  "abi": [
-    {
-      "inputs": [],
-      "name": "DEPLOY_HELPER",
-      "outputs": [
-        {
-          "internalType": "address",
-          "name": "",
-          "type": "address"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [],
-      "name": "MAX_FEE_PER_GAS",
-      "outputs": [
-        {
-          "internalType": "uint256",
-          "name": "",
-          "type": "uint256"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "address",
-          "name": "inbox",
-          "type": "address"
-        },
-        {
-          "internalType": "uint256",
-          "name": "maxFeePerGas",
-          "type": "uint256"
-        }
-      ],
-      "name": "deploy",
-      "outputs": [],
-      "stateMutability": "nonpayable",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "address",
-          "name": "inbox",
-          "type": "address"
-        }
-      ],
-      "name": "deploy",
-      "outputs": [],
-      "stateMutability": "nonpayable",
-      "type": "function"
-    }
-  ],
-  "bytecode": "0x608060405234801561001057600080fd5b506104c8806100206000396000f3fe608060405234801561001057600080fd5b506004361061004c5760003560e01c806313a694a9146100515780634956eaf01461006f5780634c96a389146100845780636d739b4214610097575b600080fd5b61005c6305f5e10081565b6040519081526020015b60405180910390f35b61008261007d3660046103ea565b6100d7565b005b610082610092366004610416565b6103b7565b6100b27390d68b056c411015eae3ec0b98ad94e2c91419f181565b60405173ffffffffffffffffffffffffffffffffffffffff9091168152602001610066565b60008273ffffffffffffffffffffffffffffffffffffffff1663e78cea926040518163ffffffff1660e01b8152600401602060405180830381865afa158015610124573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610148919061043a565b905060008173ffffffffffffffffffffffffffffffffffffffff1663e1758bd86040518163ffffffff1660e01b8152600401602060405180830381865afa158015610197573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101bb919061043a565b6040517facd7d02a00000000000000000000000000000000000000000000000000000000815273ffffffffffffffffffffffffffffffffffffffff86166004820152602481018590529091506000907390d68b056c411015eae3ec0b98ad94e2c91419f19063acd7d02a90604401602060405180830381865afa158015610246573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061026a9190610457565b6040517f23b872dd00000000000000000000000000000000000000000000000000000000815233600482015273ffffffffffffffffffffffffffffffffffffffff878116602483015260448201839052919250908316906323b872dd906064016020604051808303816000875af11580156102e9573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061030d9190610470565b506040517fd7c641e700000000000000000000000000000000000000000000000000000000815273ffffffffffffffffffffffffffffffffffffffff808716600483015283166024820152604481018590527390d68b056c411015eae3ec0b98ad94e2c91419f19063d7c641e790606401600060405180830381600087803b15801561039857600080fd5b505af11580156103ac573d6000803e3d6000fd5b505050505050505050565b6103c5816305f5e1006100d7565b50565b73ffffffffffffffffffffffffffffffffffffffff811681146103c557600080fd5b600080604083850312156103fd57600080fd5b8235610408816103c8565b946020939093013593505050565b60006020828403121561042857600080fd5b8135610433816103c8565b9392505050565b60006020828403121561044c57600080fd5b8151610433816103c8565b60006020828403121561046957600080fd5b5051919050565b60006020828403121561048257600080fd5b8151801515811461043357600080fdfea26469706673582212202cf4eb641cfddabbd4522eee9ee009ed43a5352ab686f3bfe3f7038b268f5dda64736f6c63430008110033",
-  "deployedBytecode": "0x608060405234801561001057600080fd5b506004361061004c5760003560e01c806313a694a9146100515780634956eaf01461006f5780634c96a389146100845780636d739b4214610097575b600080fd5b61005c6305f5e10081565b6040519081526020015b60405180910390f35b61008261007d3660046103ea565b6100d7565b005b610082610092366004610416565b6103b7565b6100b27390d68b056c411015eae3ec0b98ad94e2c91419f181565b60405173ffffffffffffffffffffffffffffffffffffffff9091168152602001610066565b60008273ffffffffffffffffffffffffffffffffffffffff1663e78cea926040518163ffffffff1660e01b8152600401602060405180830381865afa158015610124573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610148919061043a565b905060008173ffffffffffffffffffffffffffffffffffffffff1663e1758bd86040518163ffffffff1660e01b8152600401602060405180830381865afa158015610197573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101bb919061043a565b6040517facd7d02a00000000000000000000000000000000000000000000000000000000815273ffffffffffffffffffffffffffffffffffffffff86166004820152602481018590529091506000907390d68b056c411015eae3ec0b98ad94e2c91419f19063acd7d02a90604401602060405180830381865afa158015610246573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061026a9190610457565b6040517f23b872dd00000000000000000000000000000000000000000000000000000000815233600482015273ffffffffffffffffffffffffffffffffffffffff878116602483015260448201839052919250908316906323b872dd906064016020604051808303816000875af11580156102e9573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061030d9190610470565b506040517fd7c641e700000000000000000000000000000000000000000000000000000000815273ffffffffffffffffffffffffffffffffffffffff808716600483015283166024820152604481018590527390d68b056c411015eae3ec0b98ad94e2c91419f19063d7c641e790606401600060405180830381600087803b15801561039857600080fd5b505af11580156103ac573d6000803e3d6000fd5b505050505050505050565b6103c5816305f5e1006100d7565b50565b73ffffffffffffffffffffffffffffffffffffffff811681146103c557600080fd5b600080604083850312156103fd57600080fd5b8235610408816103c8565b946020939093013593505050565b60006020828403121561042857600080fd5b8135610433816103c8565b9392505050565b60006020828403121561044c57600080fd5b8151610433816103c8565b60006020828403121561046957600080fd5b5051919050565b60006020828403121561048257600080fd5b8151801515811461043357600080fdfea26469706673582212202cf4eb641cfddabbd4522eee9ee009ed43a5352ab686f3bfe3f7038b268f5dda64736f6c63430008110033",
-  "linkReferences": {},
-  "deployedLinkReferences": {}
-}

package/build/contracts/src/rollup/FactoryDeployerHelper.sol/IDeployHelper.dbg.json

@@ -1,4 +0,0 @@
-{
-  "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/db15eeb0a9cfbd6e506aecb04c404862.json"
-}

package/build/contracts/src/rollup/FactoryDeployerHelper.sol/IDeployHelper.json

@@ -1,58 +0,0 @@
-{
-  "_format": "hh-sol-artifact-1",
-  "contractName": "IDeployHelper",
-  "sourceName": "src/rollup/FactoryDeployerHelper.sol",
-  "abi": [
-    {
-      "inputs": [
-        {
-          "internalType": "address",
-          "name": "inbox",
-          "type": "address"
-        },
-        {
-          "internalType": "uint256",
-          "name": "maxFeePerGas",
-          "type": "uint256"
-        }
-      ],
-      "name": "getDeploymentTotalCost",
-      "outputs": [
-        {
-          "internalType": "uint256",
-          "name": "",
-          "type": "uint256"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "address",
-          "name": "_inbox",
-          "type": "address"
-        },
-        {
-          "internalType": "address",
-          "name": "_nativeToken",
-          "type": "address"
-        },
-        {
-          "internalType": "uint256",
-          "name": "_maxFeePerGas",
-          "type": "uint256"
-        }
-      ],
-      "name": "perform",
-      "outputs": [],
-      "stateMutability": "payable",
-      "type": "function"
-    }
-  ],
-  "bytecode": "0x",
-  "deployedBytecode": "0x",
-  "linkReferences": {},
-  "deployedLinkReferences": {}
-}

package/build/contracts/src/rollup/FactoryDeployerHelper.sol/IERC20.dbg.json

@@ -1,4 +0,0 @@
-{
-  "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/db15eeb0a9cfbd6e506aecb04c404862.json"
-}

package/build/contracts/src/rollup/FactoryDeployerHelper.sol/IERC20.json

@@ -1,40 +0,0 @@
-{
-  "_format": "hh-sol-artifact-1",
-  "contractName": "IERC20",
-  "sourceName": "src/rollup/FactoryDeployerHelper.sol",
-  "abi": [
-    {
-      "inputs": [
-        {
-          "internalType": "address",
-          "name": "from",
-          "type": "address"
-        },
-        {
-          "internalType": "address",
-          "name": "to",
-          "type": "address"
-        },
-        {
-          "internalType": "uint256",
-          "name": "value",
-          "type": "uint256"
-        }
-      ],
-      "name": "transferFrom",
-      "outputs": [
-        {
-          "internalType": "bool",
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "stateMutability": "nonpayable",
-      "type": "function"
-    }
-  ],
-  "bytecode": "0x",
-  "deployedBytecode": "0x",
-  "linkReferences": {},
-  "deployedLinkReferences": {}
-}

package/build/contracts/src/rollup/FactoryDeployerHelper.sol/IERC20Bridge.dbg.json

@@ -1,4 +0,0 @@
-{
-  "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/db15eeb0a9cfbd6e506aecb04c404862.json"
-}

package/build/contracts/src/rollup/FactoryDeployerHelper.sol/IERC20Bridge.json

@@ -1,24 +0,0 @@
-{
-  "_format": "hh-sol-artifact-1",
-  "contractName": "IERC20Bridge",
-  "sourceName": "src/rollup/FactoryDeployerHelper.sol",
-  "abi": [
-    {
-      "inputs": [],
-      "name": "nativeToken",
-      "outputs": [
-        {
-          "internalType": "address",
-          "name": "",
-          "type": "address"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    }
-  ],
-  "bytecode": "0x",
-  "deployedBytecode": "0x",
-  "linkReferences": {},
-  "deployedLinkReferences": {}
-}

package/build/contracts/src/rollup/FactoryDeployerHelper.sol/IInboxBase.dbg.json

@@ -1,4 +0,0 @@
-{
-  "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/db15eeb0a9cfbd6e506aecb04c404862.json"
-}

package/build/contracts/src/rollup/FactoryDeployerHelper.sol/IInboxBase.json

@@ -1,24 +0,0 @@
-{
-  "_format": "hh-sol-artifact-1",
-  "contractName": "IInboxBase",
-  "sourceName": "src/rollup/FactoryDeployerHelper.sol",
-  "abi": [
-    {
-      "inputs": [],
-      "name": "bridge",
-      "outputs": [
-        {
-          "internalType": "address",
-          "name": "",
-          "type": "address"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    }
-  ],
-  "bytecode": "0x",
-  "deployedBytecode": "0x",
-  "linkReferences": {},
-  "deployedLinkReferences": {}
-}

package/src/rollup/FactoryDeployerHelper.sol

@@ -1,52 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity ^0.8.0;
-
-/**
- * @title Helper contract for cross-chain deployment of deterministic factories when rollup uses custom fee token
- * @notice It bundles sending the fee token to inbox and invoking the factory deployment function.
- *         Prerequisite: fee token must be approved for this contract to send it to inbox.
- */
-contract FactoryDeployerHelper {
-    address public constant DEPLOY_HELPER = address(0x90D68B056c411015eaE3EC0b98AD94E2C91419F1);
-    uint256 public constant MAX_FEE_PER_GAS = 100_000_000;
-
-    function deploy(
-        address inbox
-    ) external {
-        deploy(inbox, MAX_FEE_PER_GAS);
-    }
-
-    function deploy(address inbox, uint256 maxFeePerGas) public {
-        address bridge = address(IInboxBase(inbox).bridge());
-        address feeToken = IERC20Bridge(bridge).nativeToken();
-
-        uint256 amount = IDeployHelper(DEPLOY_HELPER).getDeploymentTotalCost(inbox, maxFeePerGas);
-        IERC20(feeToken).transferFrom(msg.sender, inbox, amount);
-        IDeployHelper(DEPLOY_HELPER).perform(inbox, feeToken, maxFeePerGas);
-    }
-}
-
-interface IERC20 {
-    function transferFrom(address from, address to, uint256 value) external returns (bool);
-}
-
-interface IDeployHelper {
-    function getDeploymentTotalCost(
-        address inbox,
-        uint256 maxFeePerGas
-    ) external view returns (uint256);
-
-    function perform(
-        address _inbox,
-        address _nativeToken,
-        uint256 _maxFeePerGas
-    ) external payable;
-}
-
-interface IInboxBase {
-    function bridge() external view returns (address);
-}
-
-interface IERC20Bridge {
-    function nativeToken() external view returns (address);
-}