@arbitrum/nitro-contracts 1.0.2 → 1.0.3-beta.1

package/src/rollup/RollupCreator.sol

@@ -1,5 +1,5 @@
 // Copyright 2021-2022, Offchain Labs, Inc.
-// For license information, see https://github.com/nitro/blob/master/LICENSE
+// For license information, see https://github.com/OffchainLabs/nitro-contracts/blob/main/LICENSE
 // SPDX-License-Identifier: BUSL-1.1
 
 pragma solidity ^0.8.0;
@@ -52,82 +52,70 @@ contract RollupCreator is Ownable {
         emit TemplatesUpdated();
     }
 
-    struct CreateRollupFrame {
-        ProxyAdmin admin;
-        IBridge bridge;
-        ISequencerInbox sequencerInbox;
-        IInbox inbox;
-        IRollupEventInbox rollupEventInbox;
-        IOutbox outbox;
-        RollupProxy rollup;
-    }
-
     // After this setup:
     // Rollup should be the owner of bridge
     // RollupOwner should be the owner of Rollup's ProxyAdmin
     // RollupOwner should be the owner of Rollup
     // Bridge should have a single inbox and outbox
-    function createRollup(Config memory config, address expectedRollupAddr)
-        external
-        returns (address)
-    {
-        CreateRollupFrame memory frame;
-        frame.admin = new ProxyAdmin();
+    function createRollup(Config memory config) external returns (address) {
+        ProxyAdmin proxyAdmin = new ProxyAdmin();
+
+        // Create the rollup proxy to figure out the address and initialize it later
+        RollupProxy rollup = new RollupProxy{salt: keccak256(abi.encode(config))}();
 
         (
-            frame.bridge,
-            frame.sequencerInbox,
-            frame.inbox,
-            frame.rollupEventInbox,
-            frame.outbox
+            IBridge bridge,
+            ISequencerInbox sequencerInbox,
+            IInbox inbox,
+            IRollupEventInbox rollupEventInbox,
+            IOutbox outbox
         ) = bridgeCreator.createBridge(
-            address(frame.admin),
-            expectedRollupAddr,
-            config.sequencerInboxMaxTimeVariation
-        );
+                address(proxyAdmin),
+                address(rollup),
+                config.sequencerInboxMaxTimeVariation
+            );
 
-        frame.admin.transferOwnership(config.owner);
+        proxyAdmin.transferOwnership(config.owner);
 
         IChallengeManager challengeManager = IChallengeManager(
             address(
                 new TransparentUpgradeableProxy(
                     address(challengeManagerTemplate),
-                    address(frame.admin),
+                    address(proxyAdmin),
                     ""
                 )
             )
         );
         challengeManager.initialize(
-            IChallengeResultReceiver(expectedRollupAddr),
-            frame.sequencerInbox,
-            frame.bridge,
+            IChallengeResultReceiver(address(rollup)),
+            sequencerInbox,
+            bridge,
             osp
         );
 
-        frame.rollup = new RollupProxy(
+        rollup.initializeProxy(
             config,
             ContractDependencies({
-                bridge: frame.bridge,
-                sequencerInbox: frame.sequencerInbox,
-                inbox: frame.inbox,
-                outbox: frame.outbox,
-                rollupEventInbox: frame.rollupEventInbox,
+                bridge: bridge,
+                sequencerInbox: sequencerInbox,
+                inbox: inbox,
+                outbox: outbox,
+                rollupEventInbox: rollupEventInbox,
                 challengeManager: challengeManager,
-                rollupAdminLogic: rollupAdminLogic,
+                rollupAdminLogic: address(rollupAdminLogic),
                 rollupUserLogic: rollupUserLogic,
                 validatorUtils: validatorUtils,
                 validatorWalletCreator: validatorWalletCreator
             })
         );
-        require(address(frame.rollup) == expectedRollupAddr, "WRONG_ROLLUP_ADDR");
 
         emit RollupCreated(
-            address(frame.rollup),
-            address(frame.inbox),
-            address(frame.admin),
-            address(frame.sequencerInbox),
-            address(frame.bridge)
+            address(rollup),
+            address(inbox),
+            address(proxyAdmin),
+            address(sequencerInbox),
+            address(bridge)
         );
-        return address(frame.rollup);
+        return address(rollup);
     }
 }

package/src/rollup/RollupEventInbox.sol

@@ -1,5 +1,5 @@
 // Copyright 2021-2022, Offchain Labs, Inc.
-// For license information, see https://github.com/nitro/blob/master/LICENSE
+// For license information, see https://github.com/OffchainLabs/nitro-contracts/blob/main/LICENSE
 // SPDX-License-Identifier: BUSL-1.1
 
 pragma solidity ^0.8.0;
@@ -30,8 +30,13 @@ contract RollupEventInbox is IRollupEventInbox, IDelayedMessageProvider, Delegat
         rollup = address(_bridge.rollup());
     }
 
-    function rollupInitialized(uint256 chainId) external override onlyRollup {
-        bytes memory initMsg = abi.encodePacked(chainId);
+    function rollupInitialized(uint256 chainId, string calldata chainConfig)
+        external
+        override
+        onlyRollup
+    {
+        require(bytes(chainConfig).length > 0, "EMPTY_CHAIN_CONFIG");
+        bytes memory initMsg = abi.encodePacked(chainId, uint8(0), chainConfig);
         uint256 num = bridge.enqueueDelayedMessage(
             INITIALIZATION_MSG_TYPE,
             address(0),

package/src/rollup/RollupLib.sol

@@ -1,5 +1,5 @@
 // Copyright 2021-2022, Offchain Labs, Inc.
-// For license information, see https://github.com/nitro/blob/master/LICENSE
+// For license information, see https://github.com/OffchainLabs/nitro-contracts/blob/main/LICENSE
 // SPDX-License-Identifier: BUSL-1.1
 
 pragma solidity ^0.8.0;
@@ -12,44 +12,12 @@ import "../bridge/ISequencerInbox.sol";
 import "../bridge/IBridge.sol";
 import "../bridge/IOutbox.sol";
 import "../bridge/IInbox.sol";
+import "./Node.sol";
 import "./IRollupEventInbox.sol";
-import "./IRollupLogic.sol";
-
-struct Config {
-    uint64 confirmPeriodBlocks;
-    uint64 extraChallengeTimeBlocks;
-    address stakeToken;
-    uint256 baseStake;
-    bytes32 wasmModuleRoot;
-    address owner;
-    address loserStakeEscrow;
-    uint256 chainId;
-    uint64 genesisBlockNum;
-    ISequencerInbox.MaxTimeVariation sequencerInboxMaxTimeVariation;
-}
-
-struct ContractDependencies {
-    IBridge bridge;
-    ISequencerInbox sequencerInbox;
-    IInbox inbox;
-    IOutbox outbox;
-    IRollupEventInbox rollupEventInbox;
-    IChallengeManager challengeManager;
-    IRollupAdmin rollupAdminLogic;
-    IRollupUser rollupUserLogic;
-    // misc contracts that are useful when interacting with the rollup
-    address validatorUtils;
-    address validatorWalletCreator;
-}
 
 library RollupLib {
     using GlobalStateLib for GlobalState;
 
-    struct ExecutionState {
-        GlobalState globalState;
-        MachineStatus machineStatus;
-    }
-
     function stateHash(ExecutionState calldata execState, uint256 inboxMaxCount)
         internal
         pure
@@ -81,12 +49,6 @@ library RollupLib {
             );
     }
 
-    struct Assertion {
-        ExecutionState beforeState;
-        ExecutionState afterState;
-        uint64 numBlocks;
-    }
-
     function executionHash(Assertion memory assertion) internal pure returns (bytes32) {
         MachineStatus[2] memory statuses;
         statuses[0] = assertion.beforeState.machineStatus;

package/src/rollup/RollupProxy.sol

@@ -1,20 +1,35 @@
 // Copyright 2021-2022, Offchain Labs, Inc.
-// For license information, see https://github.com/nitro/blob/master/LICENSE
+// For license information, see https://github.com/OffchainLabs/nitro-contracts/blob/main/LICENSE
 // SPDX-License-Identifier: BUSL-1.1
 
 pragma solidity ^0.8.0;
 
 import "../libraries/AdminFallbackProxy.sol";
-import "./IRollupLogic.sol";
+import "./IRollupAdmin.sol";
+import "./Config.sol";
 
 contract RollupProxy is AdminFallbackProxy {
-    constructor(Config memory config, ContractDependencies memory connectedContracts)
-        AdminFallbackProxy(
-            address(connectedContracts.rollupAdminLogic),
-            abi.encodeWithSelector(IRollupAdmin.initialize.selector, config, connectedContracts),
-            address(connectedContracts.rollupUserLogic),
-            abi.encodeWithSelector(IRollupUserAbs.initialize.selector, config.stakeToken),
-            config.owner
-        )
-    {}
+    function initializeProxy(Config memory config, ContractDependencies memory connectedContracts)
+        external
+    {
+        if (
+            _getAdmin() == address(0) &&
+            _getImplementation() == address(0) &&
+            _getSecondaryImplementation() == address(0)
+        ) {
+            _initialize(
+                address(connectedContracts.rollupAdminLogic),
+                abi.encodeWithSelector(
+                    IRollupAdmin.initialize.selector,
+                    config,
+                    connectedContracts
+                ),
+                address(connectedContracts.rollupUserLogic),
+                abi.encodeWithSelector(IRollupUserAbs.initialize.selector, config.stakeToken),
+                config.owner
+            );
+        } else {
+            _fallback();
+        }
+    }
 }

package/src/rollup/RollupUserLogic.sol

@@ -1,5 +1,5 @@
 // Copyright 2021-2022, Offchain Labs, Inc.
-// For license information, see https://github.com/nitro/blob/master/LICENSE
+// For license information, see https://github.com/OffchainLabs/nitro-contracts/blob/main/LICENSE
 // SPDX-License-Identifier: BUSL-1.1
 
 pragma solidity ^0.8.0;
@@ -9,6 +9,8 @@ import "@openzeppelin/contracts-upgradeable/token/ERC20/IERC20Upgradeable.sol";
 import {IRollupUser} from "./IRollupLogic.sol";
 import "../libraries/UUPSNotUpgradeable.sol";
 import "./RollupCore.sol";
+import "./IRollupLogic.sol";
+
 import {ETH_POS_BLOCK_TIME} from "../libraries/Constants.sol";
 
 abstract contract AbsRollupUserLogic is
@@ -189,7 +191,7 @@ abstract contract AbsRollupUserLogic is
      * @param expectedNodeHash The hash of the node being created (protects against reorgs)
      */
     function stakeOnNewNode(
-        RollupLib.Assertion calldata assertion,
+        Assertion calldata assertion,
         bytes32 expectedNodeHash,
         uint256 prevNodeInboxMaxCount
     ) public onlyValidator whenNotPaused {
@@ -632,7 +634,7 @@ contract RollupUserLogic is AbsRollupUserLogic, IRollupUser {
      * @param prevNodeInboxMaxCount Total of messages in the inbox as of the previous node
      */
     function newStakeOnNewNode(
-        RollupLib.Assertion calldata assertion,
+        Assertion calldata assertion,
         bytes32 expectedNodeHash,
         uint256 prevNodeInboxMaxCount
     ) external payable override {
@@ -701,7 +703,7 @@ contract ERC20RollupUserLogic is AbsRollupUserLogic, IRollupUserERC20 {
      */
     function newStakeOnNewNode(
         uint256 tokenAmount,
-        RollupLib.Assertion calldata assertion,
+        Assertion calldata assertion,
         bytes32 expectedNodeHash,
         uint256 prevNodeInboxMaxCount
     ) external override {

package/src/rollup/ValidatorUtils.sol

@@ -1,5 +1,5 @@
 // Copyright 2021-2022, Offchain Labs, Inc.
-// For license information, see https://github.com/nitro/blob/master/LICENSE
+// For license information, see https://github.com/OffchainLabs/nitro-contracts/blob/main/LICENSE
 // SPDX-License-Identifier: BUSL-1.1
 
 pragma solidity ^0.8.0;
@@ -8,6 +8,7 @@ pragma experimental ABIEncoderV2;
 
 import "../rollup/IRollupCore.sol";
 import "../challenge/IChallengeManager.sol";
+import "./IRollupLogic.sol";
 
 import {NO_CHAL_INDEX} from "../libraries/Constants.sol";
 

package/src/rollup/ValidatorWallet.sol

@@ -1,5 +1,5 @@
 // Copyright 2021-2022, Offchain Labs, Inc.
-// For license information, see https://github.com/nitro/blob/master/LICENSE
+// For license information, see https://github.com/OffchainLabs/nitro-contracts/blob/main/LICENSE
 // SPDX-License-Identifier: BUSL-1.1
 
 pragma solidity ^0.8.0;

package/src/rollup/ValidatorWalletCreator.sol

@@ -1,5 +1,5 @@
 // Copyright 2021-2022, Offchain Labs, Inc.
-// For license information, see https://github.com/nitro/blob/master/LICENSE
+// For license information, see https://github.com/OffchainLabs/nitro-contracts/blob/main/LICENSE
 // SPDX-License-Identifier: BUSL-1.1
 
 pragma solidity ^0.8.0;

package/src/state/Deserialize.sol

@@ -1,5 +1,5 @@
 // Copyright 2021-2022, Offchain Labs, Inc.
-// For license information, see https://github.com/nitro/blob/master/LICENSE
+// For license information, see https://github.com/OffchainLabs/nitro-contracts/blob/main/LICENSE
 // SPDX-License-Identifier: BUSL-1.1
 
 pragma solidity ^0.8.0;
@@ -10,7 +10,7 @@ import "./Machine.sol";
 import "./Instructions.sol";
 import "./StackFrame.sol";
 import "./MerkleProof.sol";
-import "./ModuleMemory.sol";
+import "./ModuleMemoryCompact.sol";
 import "./Module.sol";
 import "./GlobalState.sol";
 

package/src/state/GlobalState.sol

@@ -1,5 +1,5 @@
 // Copyright 2021-2022, Offchain Labs, Inc.
-// For license information, see https://github.com/nitro/blob/master/LICENSE
+// For license information, see https://github.com/OffchainLabs/nitro-contracts/blob/main/LICENSE
 // SPDX-License-Identifier: BUSL-1.1
 
 pragma solidity ^0.8.0;

package/src/state/Instructions.sol

@@ -1,5 +1,5 @@
 // Copyright 2021-2022, Offchain Labs, Inc.
-// For license information, see https://github.com/nitro/blob/master/LICENSE
+// For license information, see https://github.com/OffchainLabs/nitro-contracts/blob/main/LICENSE
 // SPDX-License-Identifier: BUSL-1.1
 
 pragma solidity ^0.8.0;

package/src/state/Machine.sol

@@ -1,5 +1,5 @@
 // Copyright 2021-2022, Offchain Labs, Inc.
-// For license information, see https://github.com/nitro/blob/master/LICENSE
+// For license information, see https://github.com/OffchainLabs/nitro-contracts/blob/main/LICENSE
 // SPDX-License-Identifier: BUSL-1.1
 
 pragma solidity ^0.8.0;

package/src/state/MerkleProof.sol

@@ -1,5 +1,5 @@
 // Copyright 2021-2022, Offchain Labs, Inc.
-// For license information, see https://github.com/nitro/blob/master/LICENSE
+// For license information, see https://github.com/OffchainLabs/nitro-contracts/blob/main/LICENSE
 // SPDX-License-Identifier: BUSL-1.1
 
 pragma solidity ^0.8.0;

package/src/state/Module.sol

@@ -1,10 +1,10 @@
 // Copyright 2021-2022, Offchain Labs, Inc.
-// For license information, see https://github.com/nitro/blob/master/LICENSE
+// For license information, see https://github.com/OffchainLabs/nitro-contracts/blob/main/LICENSE
 // SPDX-License-Identifier: BUSL-1.1
 
 pragma solidity ^0.8.0;
 
-import "./ModuleMemory.sol";
+import "./ModuleMemoryCompact.sol";
 
 struct Module {
     bytes32 globalsMerkleRoot;
@@ -15,7 +15,7 @@ struct Module {
 }
 
 library ModuleLib {
-    using ModuleMemoryLib for ModuleMemory;
+    using ModuleMemoryCompactLib for ModuleMemory;
 
     function hash(Module memory mod) internal pure returns (bytes32) {
         return

package/src/state/ModuleMemory.sol

@@ -1,23 +1,18 @@
 // Copyright 2021-2022, Offchain Labs, Inc.
-// For license information, see https://github.com/nitro/blob/master/LICENSE
+// For license information, see https://github.com/OffchainLabs/nitro-contracts/blob/main/LICENSE
 // SPDX-License-Identifier: BUSL-1.1
 
 pragma solidity ^0.8.0;
 
 import "./MerkleProof.sol";
 import "./Deserialize.sol";
-
-struct ModuleMemory {
-    uint64 size;
-    uint64 maxSize;
-    bytes32 merkleRoot;
-}
+import "./ModuleMemoryCompact.sol";
 
 library ModuleMemoryLib {
     using MerkleProofLib for MerkleProof;
 
     function hash(ModuleMemory memory mem) internal pure returns (bytes32) {
-        return keccak256(abi.encodePacked("Memory:", mem.size, mem.maxSize, mem.merkleRoot));
+        return ModuleMemoryCompactLib.hash(mem);
     }
 
     function proveLeaf(

package/src/state/ModuleMemoryCompact.sol

@@ -0,0 +1,17 @@
+// Copyright 2021-2022, Offchain Labs, Inc.
+// For license information, see https://github.com/OffchainLabs/nitro-contracts/blob/main/LICENSE
+// SPDX-License-Identifier: BUSL-1.1
+
+pragma solidity ^0.8.0;
+
+struct ModuleMemory {
+    uint64 size;
+    uint64 maxSize;
+    bytes32 merkleRoot;
+}
+
+library ModuleMemoryCompactLib {
+    function hash(ModuleMemory memory mem) internal pure returns (bytes32) {
+        return keccak256(abi.encodePacked("Memory:", mem.size, mem.maxSize, mem.merkleRoot));
+    }
+}

package/src/state/PcArray.sol

@@ -1,5 +1,5 @@
 // Copyright 2021-2022, Offchain Labs, Inc.
-// For license information, see https://github.com/nitro/blob/master/LICENSE
+// For license information, see https://github.com/OffchainLabs/nitro-contracts/blob/main/LICENSE
 // SPDX-License-Identifier: BUSL-1.1
 
 pragma solidity ^0.8.0;

package/src/state/StackFrame.sol

@@ -1,5 +1,5 @@
 // Copyright 2021-2022, Offchain Labs, Inc.
-// For license information, see https://github.com/nitro/blob/master/LICENSE
+// For license information, see https://github.com/OffchainLabs/nitro-contracts/blob/main/LICENSE
 // SPDX-License-Identifier: BUSL-1.1
 
 pragma solidity ^0.8.0;

package/src/state/Value.sol

@@ -1,5 +1,5 @@
 // Copyright 2021-2022, Offchain Labs, Inc.
-// For license information, see https://github.com/nitro/blob/master/LICENSE
+// For license information, see https://github.com/OffchainLabs/nitro-contracts/blob/main/LICENSE
 // SPDX-License-Identifier: BUSL-1.1
 
 pragma solidity ^0.8.0;

package/src/state/ValueArray.sol

@@ -1,5 +1,5 @@
 // Copyright 2021-2022, Offchain Labs, Inc.
-// For license information, see https://github.com/nitro/blob/master/LICENSE
+// For license information, see https://github.com/OffchainLabs/nitro-contracts/blob/main/LICENSE
 // SPDX-License-Identifier: BUSL-1.1
 
 pragma solidity ^0.8.0;

package/src/state/ValueStack.sol

@@ -1,5 +1,5 @@
 // Copyright 2021-2022, Offchain Labs, Inc.
-// For license information, see https://github.com/nitro/blob/master/LICENSE
+// For license information, see https://github.com/OffchainLabs/nitro-contracts/blob/main/LICENSE
 // SPDX-License-Identifier: BUSL-1.1
 
 pragma solidity ^0.8.0;

package/src/test-helpers/BridgeTester.sol

@@ -1,5 +1,5 @@
 // Copyright 2021-2022, Offchain Labs, Inc.
-// For license information, see https://github.com/nitro/blob/master/LICENSE
+// For license information, see https://github.com/OffchainLabs/nitro-contracts/blob/main/LICENSE
 // SPDX-License-Identifier: BUSL-1.1
 
 pragma solidity ^0.8.4;

package/src/test-helpers/CryptographyPrimitivesTester.sol

@@ -1,5 +1,5 @@
 // Copyright 2021-2022, Offchain Labs, Inc.
-// For license information, see https://github.com/nitro/blob/master/LICENSE
+// For license information, see https://github.com/OffchainLabs/nitro-contracts/blob/main/LICENSE
 // SPDX-License-Identifier: BUSL-1.1
 
 pragma solidity ^0.8.0;

package/src/test-helpers/InterfaceCompatibilityTester.sol

@@ -1,5 +1,5 @@
 // Copyright 2021-2022, Offchain Labs, Inc.
-// For license information, see https://github.com/nitro/blob/master/LICENSE
+// For license information, see https://github.com/OffchainLabs/nitro-contracts/blob/main/LICENSE
 // SPDX-License-Identifier: BUSL-1.1
 
 // solhint-disable-next-line compiler-version

package/src/test-helpers/MessageTester.sol

@@ -1,5 +1,5 @@
 // Copyright 2021-2022, Offchain Labs, Inc.
-// For license information, see https://github.com/nitro/blob/master/LICENSE
+// For license information, see https://github.com/OffchainLabs/nitro-contracts/blob/main/LICENSE
 // SPDX-License-Identifier: BUSL-1.1
 
 pragma solidity ^0.8.0;

package/src/test-helpers/OutboxWithoutOptTester.sol

@@ -1,5 +1,5 @@
 // Copyright 2021-2022, Offchain Labs, Inc.
-// For license information, see https://github.com/nitro/blob/master/LICENSE
+// For license information, see https://github.com/OffchainLabs/nitro-contracts/blob/main/LICENSE
 // SPDX-License-Identifier: BUSL-1.1
 
 pragma solidity ^0.8.4;

package/src/test-helpers/RollupMock.sol

@@ -1,5 +1,5 @@
 // Copyright 2021-2022, Offchain Labs, Inc.
-// For license information, see https://github.com/nitro/blob/master/LICENSE
+// For license information, see https://github.com/OffchainLabs/nitro-contracts/blob/main/LICENSE
 // SPDX-License-Identifier: BUSL-1.1
 
 pragma solidity ^0.8.4;

package/src/test-helpers/ValueArrayTester.sol

@@ -1,5 +1,5 @@
 // Copyright 2021-2022, Offchain Labs, Inc.
-// For license information, see https://github.com/nitro/blob/master/LICENSE
+// For license information, see https://github.com/OffchainLabs/nitro-contracts/blob/main/LICENSE
 // SPDX-License-Identifier: BUSL-1.1
 
 pragma solidity ^0.8.0;