@arbitrum/nitro-contracts 1.1.0-alpha.1 → 1.1.0-alpha.3

package/src/rollup/IRollupLogic.sol

@@ -1,10 +1,9 @@
 // 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 "./RollupLib.sol";
 import "./IRollupCore.sol";
 import "../bridge/ISequencerInbox.sol";
 import "../bridge/IOutbox.sol";
@@ -28,7 +27,7 @@ interface IRollupUserAbs is IRollupCore, IOwnable {
     function stakeOnExistingNode(uint64 nodeNum, bytes32 nodeHash) external;
 
     function stakeOnNewNode(
-        RollupLib.Assertion memory assertion,
+        Assertion memory assertion,
         bytes32 expectedNodeHash,
         uint256 prevNodeInboxMaxCount
     ) external;
@@ -75,7 +74,7 @@ interface IRollupUser is IRollupUserAbs {
     function newStakeOnExistingNode(uint64 nodeNum, bytes32 nodeHash) external payable;
 
     function newStakeOnNewNode(
-        RollupLib.Assertion calldata assertion,
+        Assertion calldata assertion,
         bytes32 expectedNodeHash,
         uint256 prevNodeInboxMaxCount
     ) external payable;
@@ -92,137 +91,10 @@ interface IRollupUserERC20 is IRollupUserAbs {
 
     function newStakeOnNewNode(
         uint256 tokenAmount,
-        RollupLib.Assertion calldata assertion,
+        Assertion calldata assertion,
         bytes32 expectedNodeHash,
         uint256 prevNodeInboxMaxCount
     ) external;
 
     function addToDeposit(address stakerAddress, uint256 tokenAmount) external;
 }
-
-interface IRollupAdmin {
-    event OwnerFunctionCalled(uint256 indexed id);
-
-    function initialize(Config calldata config, ContractDependencies calldata connectedContracts)
-        external;
-
-    /**
-     * @notice Add a contract authorized to put messages into this rollup's inbox
-     * @param _outbox Outbox contract to add
-     */
-    function setOutbox(IOutbox _outbox) external;
-
-    /**
-     * @notice Disable an old outbox from interacting with the bridge
-     * @param _outbox Outbox contract to remove
-     */
-    function removeOldOutbox(address _outbox) external;
-
-    /**
-     * @notice Enable or disable an inbox contract
-     * @param _inbox Inbox contract to add or remove
-     * @param _enabled New status of inbox
-     */
-    function setDelayedInbox(address _inbox, bool _enabled) external;
-
-    /**
-     * @notice Pause interaction with the rollup contract
-     */
-    function pause() external;
-
-    /**
-     * @notice Resume interaction with the rollup contract
-     */
-    function resume() external;
-
-    /**
-     * @notice Set the addresses of the validator whitelist
-     * @dev It is expected that both arrays are same length, and validator at
-     * position i corresponds to the value at position i
-     * @param _validator addresses to set in the whitelist
-     * @param _val value to set in the whitelist for corresponding address
-     */
-    function setValidator(address[] memory _validator, bool[] memory _val) external;
-
-    /**
-     * @notice Set a new owner address for the rollup proxy
-     * @param newOwner address of new rollup owner
-     */
-    function setOwner(address newOwner) external;
-
-    /**
-     * @notice Set minimum assertion period for the rollup
-     * @param newPeriod new minimum period for assertions
-     */
-    function setMinimumAssertionPeriod(uint256 newPeriod) external;
-
-    /**
-     * @notice Set number of blocks until a node is considered confirmed
-     * @param newConfirmPeriod new number of blocks until a node is confirmed
-     */
-    function setConfirmPeriodBlocks(uint64 newConfirmPeriod) external;
-
-    /**
-     * @notice Set number of extra blocks after a challenge
-     * @param newExtraTimeBlocks new number of blocks
-     */
-    function setExtraChallengeTimeBlocks(uint64 newExtraTimeBlocks) external;
-
-    /**
-     * @notice Set base stake required for an assertion
-     * @param newBaseStake maximum avmgas to be used per block
-     */
-    function setBaseStake(uint256 newBaseStake) external;
-
-    /**
-     * @notice Set the token used for stake, where address(0) == eth
-     * @dev Before changing the base stake token, you might need to change the
-     * implementation of the Rollup User logic!
-     * @param newStakeToken address of token used for staking
-     */
-    function setStakeToken(address newStakeToken) external;
-
-    /**
-     * @notice Upgrades the implementation of a beacon controlled by the rollup
-     * @param beacon address of beacon to be upgraded
-     * @param newImplementation new address of implementation
-     */
-    function upgradeBeacon(address beacon, address newImplementation) external;
-
-    function forceResolveChallenge(address[] memory stackerA, address[] memory stackerB) external;
-
-    function forceRefundStaker(address[] memory stacker) external;
-
-    function forceCreateNode(
-        uint64 prevNode,
-        uint256 prevNodeInboxMaxCount,
-        RollupLib.Assertion memory assertion,
-        bytes32 expectedNodeHash
-    ) external;
-
-    function forceConfirmNode(
-        uint64 nodeNum,
-        bytes32 blockHash,
-        bytes32 sendRoot
-    ) external;
-
-    function setLoserStakeEscrow(address newLoserStakerEscrow) external;
-
-    /**
-     * @notice Set the proving WASM module root
-     * @param newWasmModuleRoot new module root
-     */
-    function setWasmModuleRoot(bytes32 newWasmModuleRoot) external;
-
-    /**
-     * @notice set a new sequencer inbox contract
-     * @param _sequencerInbox new address of sequencer inbox
-     */
-    function setSequencerInbox(address _sequencerInbox) external;
-
-    /**
-     * @notice set the validatorWhitelistDisabled flag
-     * @param _validatorWhitelistDisabled new value of validatorWhitelistDisabled, i.e. true = disabled
-     */
-    function setValidatorWhitelistDisabled(bool _validatorWhitelistDisabled) external;
-}

package/src/rollup/Node.sol

@@ -1,9 +1,23 @@
 // 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 "../state/GlobalState.sol";
+import "../state/Machine.sol";
+
+struct ExecutionState {
+    GlobalState globalState;
+    MachineStatus machineStatus;
+}
+
+struct Assertion {
+    ExecutionState beforeState;
+    ExecutionState afterState;
+    uint64 numBlocks;
+}
+
 struct Node {
     // Hash of the state of the chain as of this node
     bytes32 stateHash;

package/src/rollup/RollupAdminLogic.sol

@@ -1,10 +1,11 @@
 // 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 {IRollupAdmin, IRollupUser} from "./IRollupLogic.sol";
+import "./IRollupAdmin.sol";
+import "./IRollupLogic.sol";
 import "./RollupCore.sol";
 import "../bridge/IOutbox.sol";
 import "../bridge/ISequencerInbox.sol";
@@ -76,7 +77,7 @@ contract RollupAdminLogic is RollupCore, IRollupAdmin, DoubleLogicUUPSUpgradeabl
     function createInitialNode() private view returns (Node memory) {
         GlobalState memory emptyGlobalState;
         bytes32 state = RollupLib.stateHashMem(
-            RollupLib.ExecutionState(emptyGlobalState, MachineStatus.FINISHED),
+            ExecutionState(emptyGlobalState, MachineStatus.FINISHED),
             1 // inboxMaxCount - force the first assertion to read a message
         );
         return
@@ -285,7 +286,7 @@ contract RollupAdminLogic is RollupCore, IRollupAdmin, DoubleLogicUUPSUpgradeabl
     function forceCreateNode(
         uint64 prevNode,
         uint256 prevNodeInboxMaxCount,
-        RollupLib.Assertion calldata assertion,
+        Assertion calldata assertion,
         bytes32 expectedNodeHash
     ) external override whenPaused {
         require(prevNode == latestConfirmed(), "ONLY_LATEST_CONFIRMED");
@@ -340,10 +341,7 @@ contract RollupAdminLogic is RollupCore, IRollupAdmin, DoubleLogicUUPSUpgradeabl
         emit OwnerFunctionCalled(28);
     }
 
-    function createNitroMigrationGenesis(RollupLib.Assertion calldata assertion)
-        external
-        whenPaused
-    {
+    function createNitroMigrationGenesis(Assertion calldata assertion) external whenPaused {
         bytes32 expectedSendRoot = bytes32(0);
         uint64 expectedInboxCount = 1;
 

package/src/rollup/RollupCore.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;
@@ -7,7 +7,6 @@ pragma solidity ^0.8.0;
 import "@openzeppelin/contracts-upgradeable/security/PausableUpgradeable.sol";
 
 import "./Node.sol";
-import "./IRollupCore.sol";
 import "./RollupLib.sol";
 import "./IRollupEventInbox.sol";
 import "./IRollupCore.sol";
@@ -20,6 +19,7 @@ import "../bridge/IOutbox.sol";
 
 import "../precompiles/ArbSys.sol";
 
+import "../libraries/ArbitrumChecker.sol";
 import {NO_CHAL_INDEX} from "../libraries/Constants.sol";
 
 abstract contract RollupCore is IRollupCore, PausableUpgradeable {
@@ -79,17 +79,10 @@ abstract contract RollupCore is IRollupCore, PausableUpgradeable {
     bool public validatorWhitelistDisabled;
 
     // If the chain this RollupCore is deployed on is an Arbitrum chain.
-    bool internal immutable _hostChainIsArbitrum;
+    bool internal immutable _hostChainIsArbitrum = ArbitrumChecker.runningOnArbitrum();
     // If the chain RollupCore is deployed on, this will contain the ArbSys.blockNumber() at each node's creation.
     mapping(uint64 => uint256) internal _nodeCreatedAtArbSysBlock;
 
-    constructor() {
-        (bool ok, bytes memory data) = address(100).staticcall(
-            abi.encodeWithSelector(ArbSys.arbOSVersion.selector)
-        );
-        _hostChainIsArbitrum = ok && data.length == 32;
-    }
-
     /**
      * @notice Get a storage reference to the Node for the given node index
      * @param nodeNum Index of the node
@@ -568,7 +561,7 @@ abstract contract RollupCore is IRollupCore, PausableUpgradeable {
     }
 
     function createNewNode(
-        RollupLib.Assertion calldata assertion,
+        Assertion calldata assertion,
         uint64 prevNodeNum,
         uint256 prevNodeInboxMaxCount,
         bytes32 expectedNodeHash

package/src/rollup/RollupCreator.sol

@@ -1,121 +1,46 @@
 // 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 "./AbsRollupCreator.sol";
 import "./BridgeCreator.sol";
 
-import "@openzeppelin/contracts/proxy/transparent/ProxyAdmin.sol";
-import "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";
-import "@openzeppelin/contracts/access/Ownable.sol";
-
-import "./RollupProxy.sol";
-
-contract RollupCreator is Ownable {
-    event RollupCreated(
-        address indexed rollupAddress,
-        address inboxAddress,
-        address adminProxy,
-        address sequencerInbox,
-        address bridge
-    );
-    event TemplatesUpdated();
-
-    BridgeCreator public bridgeCreator;
-    IOneStepProofEntry public osp;
-    IChallengeManager public challengeManagerTemplate;
-    IRollupAdmin public rollupAdminLogic;
-    IRollupUser public rollupUserLogic;
-
-    address public validatorUtils;
-    address public validatorWalletCreator;
-
-    constructor() Ownable() {}
-
-    function setTemplates(
-        BridgeCreator _bridgeCreator,
-        IOneStepProofEntry _osp,
-        IChallengeManager _challengeManagerLogic,
-        IRollupAdmin _rollupAdminLogic,
-        IRollupUser _rollupUserLogic,
-        address _validatorUtils,
-        address _validatorWalletCreator
-    ) external onlyOwner {
-        bridgeCreator = _bridgeCreator;
-        osp = _osp;
-        challengeManagerTemplate = _challengeManagerLogic;
-        rollupAdminLogic = _rollupAdminLogic;
-        rollupUserLogic = _rollupUserLogic;
-        validatorUtils = _validatorUtils;
-        validatorWalletCreator = _validatorWalletCreator;
-        emit TemplatesUpdated();
-    }
+contract RollupCreator is AbsRollupCreator, IEthRollupCreator {
+    constructor() AbsRollupCreator() {}
 
     // 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) 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))}();
+    function createRollup(
+        Config memory config,
+        address _batchPoster,
+        address[] calldata _validators
+    ) external override returns (address) {
+        return _createRollup(config, _batchPoster, _validators, address(0));
+    }
 
+    function _createBridge(
+        address proxyAdmin,
+        address rollup,
+        ISequencerInbox.MaxTimeVariation memory maxTimeVariation,
+        address // nativeToken does not exist in context of standard Eth based rollup
+    ) internal override returns (BridgeContracts memory) {
         (
             IBridge bridge,
             ISequencerInbox sequencerInbox,
             IInbox inbox,
             IRollupEventInbox rollupEventInbox,
             IOutbox outbox
-        ) = bridgeCreator.createBridge(
-                address(proxyAdmin),
-                address(rollup),
-                config.sequencerInboxMaxTimeVariation
+        ) = BridgeCreator(address(bridgeCreator)).createBridge(
+                proxyAdmin,
+                rollup,
+                maxTimeVariation
             );
 
-        proxyAdmin.transferOwnership(config.owner);
-
-        IChallengeManager challengeManager = IChallengeManager(
-            address(
-                new TransparentUpgradeableProxy(
-                    address(challengeManagerTemplate),
-                    address(proxyAdmin),
-                    ""
-                )
-            )
-        );
-        challengeManager.initialize(
-            IChallengeResultReceiver(address(rollup)),
-            sequencerInbox,
-            bridge,
-            osp
-        );
-
-        rollup.initializeProxy(
-            config,
-            ContractDependencies({
-                bridge: bridge,
-                sequencerInbox: sequencerInbox,
-                inbox: inbox,
-                outbox: outbox,
-                rollupEventInbox: rollupEventInbox,
-                challengeManager: challengeManager,
-                rollupAdminLogic: rollupAdminLogic,
-                rollupUserLogic: rollupUserLogic,
-                validatorUtils: validatorUtils,
-                validatorWalletCreator: validatorWalletCreator
-            })
-        );
-
-        emit RollupCreated(
-            address(rollup),
-            address(inbox),
-            address(proxyAdmin),
-            address(sequencerInbox),
-            address(bridge)
-        );
-        return address(rollup);
+        return BridgeContracts(bridge, sequencerInbox, inbox, rollupEventInbox, outbox);
     }
 }

package/src/rollup/RollupEventInbox.sol

@@ -1,47 +1,24 @@
 // 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 "./IRollupEventInbox.sol";
-import "../bridge/IBridge.sol";
-import "../bridge/IDelayedMessageProvider.sol";
-import "../libraries/DelegateCallAware.sol";
-import {INITIALIZATION_MSG_TYPE} from "../libraries/MessageTypes.sol";
-import {AlreadyInit, HadZeroInit} from "../libraries/Error.sol";
+import "./AbsRollupEventInbox.sol";
+import "../bridge/IEthBridge.sol";
 
 /**
  * @title The inbox for rollup protocol events
  */
-contract RollupEventInbox is IRollupEventInbox, IDelayedMessageProvider, DelegateCallAware {
-    IBridge public override bridge;
-    address public override rollup;
+contract RollupEventInbox is AbsRollupEventInbox {
+    constructor() AbsRollupEventInbox() {}
 
-    modifier onlyRollup() {
-        require(msg.sender == rollup, "ONLY_ROLLUP");
-        _;
-    }
-
-    function initialize(IBridge _bridge) external override onlyDelegated {
-        if (address(bridge) != address(0)) revert AlreadyInit();
-        if (address(_bridge) == address(0)) revert HadZeroInit();
-        bridge = _bridge;
-        rollup = address(_bridge.rollup());
-    }
-
-    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),
-            keccak256(initMsg)
-        );
-        emit InboxMessageDelivered(num, initMsg);
+    function _enqueueInitializationMsg(bytes memory initMsg) internal override returns (uint256) {
+        return
+            IEthBridge(address(bridge)).enqueueDelayedMessage(
+                INITIALIZATION_MSG_TYPE,
+                address(0),
+                keccak256(initMsg)
+            );
     }
 }

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,45 +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;
-    string chainConfig;
-    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
@@ -82,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,11 +1,12 @@
 // 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 {
     function initializeProxy(Config memory config, ContractDependencies memory connectedContracts)

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;