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

package/src/osp/OneStepProofEntry.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/osp/OneStepProver0.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/osp/OneStepProverHostIo.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,6 +7,7 @@ pragma solidity ^0.8.0;
 import "../state/Value.sol";
 import "../state/Machine.sol";
 import "../state/Deserialize.sol";
+import "../state/ModuleMemory.sol";
 import "./IOneStepProver.sol";
 import "../bridge/Messages.sol";
 import "../bridge/IBridge.sol";

package/src/osp/OneStepProverMath.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/osp/OneStepProverMemory.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,6 +7,7 @@ pragma solidity ^0.8.0;
 import "../state/Value.sol";
 import "../state/Machine.sol";
 import "../state/Deserialize.sol";
+import "../state/ModuleMemory.sol";
 import "./IOneStepProver.sol";
 
 contract OneStepProverMemory is IOneStepProver {

package/src/precompiles/ArbAddressTable.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.4.21 <0.9.0;

package/src/precompiles/ArbAggregator.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.4.21 <0.9.0;

package/src/precompiles/ArbBLS.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.4.21 <0.9.0;

package/src/precompiles/ArbDebug.sol

@@ -1,5 +1,5 @@
 // Copyright 2021-2023, Offchain Labs, Inc.
-// For license information, see https://github.com/OffchainLabs/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.4.21 <0.9.0;

package/src/precompiles/ArbFunctionTable.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.4.21 <0.9.0;

package/src/precompiles/ArbGasInfo.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.4.21 <0.9.0;

package/src/precompiles/ArbInfo.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.4.21 <0.9.0;

package/src/precompiles/ArbOwner.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.4.21 <0.9.0;
@@ -84,6 +84,9 @@ interface ArbOwner {
     /// @notice Releases surplus funds from L1PricerFundsPoolAddress for use
     function releaseL1PricerSurplusFunds(uint256 maxWeiToRelease) external returns (uint256);
 
+    /// @notice Sets serialized chain config in ArbOS state
+    function setChainConfig(string calldata chainConfig) external;
+
     // Emitted when a successful call is made to this precompile
     event OwnerActs(bytes4 indexed method, address indexed owner, bytes data);
 }

package/src/precompiles/ArbOwnerPublic.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.4.21 <0.9.0;

package/src/precompiles/ArbRetryableTx.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.4.21 <0.9.0;

package/src/precompiles/ArbStatistics.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.4.21 <0.9.0;

package/src/precompiles/ArbSys.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.4.21 <0.9.0;

package/src/precompiles/ArbosTest.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.4.21 <0.9.0;

package/src/rollup/BridgeCreator.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/Config.sol

@@ -0,0 +1,43 @@
+// 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;
+
+import "../state/GlobalState.sol";
+import "../state/Machine.sol";
+import "../bridge/ISequencerInbox.sol";
+import "../bridge/IBridge.sol";
+import "../bridge/IOutbox.sol";
+import "../bridge/IInbox.sol";
+import "./IRollupEventInbox.sol";
+import "./IRollupLogic.sol";
+import "../challenge/IChallengeManager.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;
+    address rollupAdminLogic;
+    IRollupUser rollupUserLogic;
+    // misc contracts that are useful when interacting with the rollup
+    address validatorUtils;
+    address validatorWalletCreator;
+}

package/src/rollup/IRollupAdmin.sol

@@ -0,0 +1,138 @@
+// 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;
+
+import "./IRollupCore.sol";
+import "../bridge/ISequencerInbox.sol";
+import "../bridge/IOutbox.sol";
+import "../bridge/IOwnable.sol";
+import "./Config.sol";
+
+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,
+        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/IRollupCore.sol

@@ -1,11 +1,15 @@
 // 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 "./Node.sol";
-import "./RollupLib.sol";
+import "../bridge/IBridge.sol";
+import "../bridge/IOutbox.sol";
+import "../bridge/IInbox.sol";
+import "./IRollupEventInbox.sol";
+import "../challenge/IChallengeManager.sol";
 
 interface IRollupCore {
     struct Staker {
@@ -24,7 +28,7 @@ interface IRollupCore {
         bytes32 indexed parentNodeHash,
         bytes32 indexed nodeHash,
         bytes32 executionHash,
-        RollupLib.Assertion assertion,
+        Assertion assertion,
         bytes32 afterInboxBatchAcc,
         bytes32 wasmModuleRoot,
         uint256 inboxMaxCount
@@ -84,6 +88,15 @@ interface IRollupCore {
      */
     function getNode(uint64 nodeNum) external view returns (Node memory);
 
+    /**
+     * @notice Returns the block in which the given node was created for looking up its creation event.
+     * Unlike the Node's createdAtBlock field, this will be the ArbSys blockNumber if the host chain is an Arbitrum chain.
+     * That means that the block number returned for this is usable for event queries.
+     * This function will revert if the given node number does not exist.
+     * @dev This function is meant for internal use only and has no stability guarantees.
+     */
+    function getNodeCreationBlockForLogLookup(uint64 nodeNum) external view returns (uint256);
+
     /**
      * @notice Check if the specified node has been staked on by the provided staker.
      * Only accurate at the latest confirmed node and afterwards.

package/src/rollup/IRollupEventInbox.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;
@@ -13,5 +13,5 @@ interface IRollupEventInbox {
 
     function rollup() external view returns (address);
 
-    function rollupInitialized(uint256 chainId) external;
+    function rollupInitialized(uint256 chainId, string calldata chainConfig) external;
 }

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";
@@ -36,7 +37,7 @@ contract RollupAdminLogic is RollupCore, IRollupAdmin, DoubleLogicUUPSUpgradeabl
             true
         );
 
-        connectedContracts.rollupEventInbox.rollupInitialized(config.chainId);
+        connectedContracts.rollupEventInbox.rollupInitialized(config.chainId, config.chainConfig);
         connectedContracts.sequencerInbox.addSequencerL2Batch(
             0,
             "",
@@ -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;