Merge pull request OffchainLabs#2389 from OffchainLabs/nitro-migrator

Nitro migratoooor

packages/MACHINEHASH

@@ -1 +1 @@
-0x3197f955bbd671d5074ea6de2e2b2172798b56fb3ac0a1ddb9a13f446aef14b7
+0x1e9ccb390c15a084d695ad2fe83b27bc6212ca120213f2769fe39f6ba3899a17

packages/arb-bridge-eth/.eslintrc.js

@@ -31,7 +31,7 @@ module.exports = {
       ],
       parser: '@typescript-eslint/parser',
       parserOptions: {
-        project: 'tsconfig.json',
+        project: './tsconfig.json',
       },
       extends: [
         'eslint:recommended',

packages/arb-bridge-eth/contracts/bridge/Bridge.sol

@@ -18,6 +18,7 @@
 
 pragma solidity ^0.6.11;
 
+import { NitroReadyMagicNums } from "./NitroMigratorUtil.sol";
 import "./Inbox.sol";
 import "./Outbox.sol";
 import "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";
@@ -153,4 +154,12 @@ contract Bridge is OwnableUpgradeable, IBridge {
     function messageCount() external view override returns (uint256) {
         return inboxAccs.length;
     }
+
+    function allowedOutboxListLength() external view returns (uint256) {
+        return allowedOutboxList.length;
+    }
+
+    function isNitroReady() external view override returns (uint256) {
+        return NitroReadyMagicNums.BRIDGE;
+    }
 }

packages/arb-bridge-eth/contracts/bridge/Inbox.sol

@@ -22,6 +22,7 @@ import "./interfaces/IInbox.sol";
 import "./interfaces/IBridge.sol";
 import "../rollup/Rollup.sol";
 
+import { NitroReadyMagicNums } from "./NitroMigratorUtil.sol";
 import "./Messages.sol";
 import "../libraries/Cloneable.sol";
 import "../libraries/Whitelist.sol";
@@ -36,6 +37,8 @@ contract Inbox is IInbox, WhitelistConsumer, Cloneable {
     uint8 internal constant L2_MSG = 3;
     uint8 internal constant L1MessageType_L2FundedByL1 = 7;
     uint8 internal constant L1MessageType_submitRetryableTx = 9;
+    uint8 internal constant L1MessageType_endOfBlock = 6;
+    uint8 internal constant L1MessageType_shutdownForNitro = 128;
 
     uint8 internal constant L2MessageType_unsignedEOATx = 0;
     uint8 internal constant L2MessageType_unsignedContractTx = 1;
@@ -51,6 +54,19 @@ contract Inbox is IInbox, WhitelistConsumer, Cloneable {
         WhitelistConsumer.whitelist = _whitelist;
     }
 
+    function isNitroReady() external pure returns (uint256) {
+        return NitroReadyMagicNums.DELAYED_INBOX;
+    }
+
+    function shutdownForNitro() external returns (uint256 msgNum) {
+        require(msg.sender == Bridge(address(bridge)).owner(), "ONLY_BRIDGE_OWNER");
+        // we deliver an end of block message followed by the shutdown message
+        msgNum = _deliverMessage(L1MessageType_endOfBlock, msg.sender, abi.encodePacked(""));
+        msgNum = _deliverMessage(L1MessageType_shutdownForNitro, msg.sender, abi.encodePacked(""));
+        // return the new message _count_ (one greater than the last _sequence number_)
+        return msgNum + 1;
+    }
+
     /**
      * @notice Send a generic L2 message to the chain
      * @dev This method is an optimization to avoid having to emit the entirety of the messageData in a log. Instead validators are expected to be able to parse the data from the transaction's input