@arbitrum/nitro-contracts 2.1.1-beta.0 → 3.0.0-alpha.1

package/src/test-helpers/BridgeTester.sol

@@ -59,7 +59,9 @@ contract BridgeTester is Initializable, DelegateCallAware, IBridge, IEthBridge {
         _;
     }
 
-    function setSequencerInbox(address _sequencerInbox) external override onlyRollupOrOwner {
+    function setSequencerInbox(
+        address _sequencerInbox
+    ) external override onlyRollupOrOwner {
         sequencerInbox = _sequencerInbox;
         emit SequencerInboxUpdated(_sequencerInbox);
     }
@@ -72,12 +74,16 @@ contract BridgeTester is Initializable, DelegateCallAware, IBridge, IEthBridge {
 
     address private constant EMPTY_ACTIVEOUTBOX = address(type(uint160).max);
 
-    function initialize(IOwnable rollup_) external initializer {
+    function initialize(
+        IOwnable rollup_
+    ) external initializer {
         _activeOutbox = EMPTY_ACTIVEOUTBOX;
         rollup = rollup_;
     }
 
-    function updateRollupAddress(IOwnable _rollup) external {
+    function updateRollupAddress(
+        IOwnable _rollup
+    ) external {
         rollup = _rollup;
     }
 
@@ -86,11 +92,15 @@ contract BridgeTester is Initializable, DelegateCallAware, IBridge, IEthBridge {
         return _activeOutbox;
     }
 
-    function allowedDelayedInboxes(address inbox) external view override returns (bool) {
+    function allowedDelayedInboxes(
+        address inbox
+    ) external view override returns (bool) {
         return allowedInboxesMap[inbox].allowed;
     }
 
-    function allowedOutboxes(address outbox) external view override returns (bool) {
+    function allowedOutboxes(
+        address outbox
+    ) external view override returns (bool) {
         return allowedOutboxesMap[outbox].allowed;
     }
 
@@ -101,20 +111,15 @@ contract BridgeTester is Initializable, DelegateCallAware, IBridge, IEthBridge {
         uint256 newMessageCount
     )
         external
-        returns (
-            uint256 seqMessageIndex,
-            bytes32 beforeAcc,
-            bytes32 delayedAcc,
-            bytes32 acc
-        )
+        returns (uint256 seqMessageIndex, bytes32 beforeAcc, bytes32 delayedAcc, bytes32 acc)
     {
         // TODO: implement stub logic
     }
 
-    function submitBatchSpendingReport(address batchPoster, bytes32 dataHash)
-        external
-        returns (uint256)
-    {
+    function submitBatchSpendingReport(
+        address batchPoster,
+        bytes32 dataHash
+    ) external returns (uint256) {
         // TODO: implement stub
     }
 
@@ -129,15 +134,14 @@ contract BridgeTester is Initializable, DelegateCallAware, IBridge, IEthBridge {
         bytes32 messageDataHash
     ) external payable override returns (uint256) {
         if (!allowedInboxesMap[msg.sender].allowed) revert NotDelayedInbox(msg.sender);
-        return
-            addMessageToDelayedAccumulator(
-                kind,
-                sender,
-                uint64(block.number),
-                uint64(block.timestamp), // solhint-disable-line not-rely-on-time
-                block.basefee,
-                messageDataHash
-            );
+        return addMessageToDelayedAccumulator(
+            kind,
+            sender,
+            uint64(block.number),
+            uint64(block.timestamp), // solhint-disable-line not-rely-on-time
+            block.basefee,
+            messageDataHash
+        );
     }
 
     function addMessageToDelayedAccumulator(
@@ -150,13 +154,7 @@ contract BridgeTester is Initializable, DelegateCallAware, IBridge, IEthBridge {
     ) internal returns (uint256) {
         uint256 count = delayedInboxAccs.length;
         bytes32 messageHash = Messages.messageHash(
-            kind,
-            sender,
-            blockNumber,
-            blockTimestamp,
-            count,
-            baseFeeL1,
-            messageDataHash
+            kind, sender, blockNumber, blockTimestamp, count, baseFeeL1, messageDataHash
         );
         bytes32 prevAcc = 0;
         if (count > 0) {
@@ -164,14 +162,7 @@ contract BridgeTester is Initializable, DelegateCallAware, IBridge, IEthBridge {
         }
         delayedInboxAccs.push(Messages.accumulateInboxMessage(prevAcc, messageHash));
         emit MessageDelivered(
-            count,
-            prevAcc,
-            msg.sender,
-            kind,
-            sender,
-            messageDataHash,
-            baseFeeL1,
-            blockTimestamp
+            count, prevAcc, msg.sender, kind, sender, messageDataHash, baseFeeL1, blockTimestamp
         );
         return count;
     }
@@ -206,9 +197,8 @@ contract BridgeTester is Initializable, DelegateCallAware, IBridge, IEthBridge {
             allowedInboxesMap[inbox] = InOutInfo(allowedDelayedInboxList.length, true);
             allowedDelayedInboxList.push(inbox);
         } else {
-            allowedDelayedInboxList[info.index] = allowedDelayedInboxList[
-                allowedDelayedInboxList.length - 1
-            ];
+            allowedDelayedInboxList[info.index] =
+                allowedDelayedInboxList[allowedDelayedInboxList.length - 1];
             allowedInboxesMap[allowedDelayedInboxList[info.index]].index = info.index;
             allowedDelayedInboxList.pop();
             delete allowedInboxesMap[inbox];

package/src/test-helpers/CryptographyPrimitivesTester.sol

@@ -7,21 +7,20 @@ pragma solidity ^0.8.0;
 import "../libraries/CryptographyPrimitives.sol";
 
 library CryptographyPrimitivesTester {
-    function keccakF(uint256[25] memory input) public pure returns (uint256[25] memory) {
+    function keccakF(
+        uint256[25] memory input
+    ) public pure returns (uint256[25] memory) {
         return CryptographyPrimitives.keccakF(input);
     }
 
-    function sha256Block(bytes32[2] memory inputChunk, bytes32 hashState)
-        public
-        pure
-        returns (bytes32)
-    {
-        return
-            bytes32(
-                CryptographyPrimitives.sha256Block(
-                    [uint256(inputChunk[0]), uint256(inputChunk[1])],
-                    uint256(hashState)
-                )
-            );
+    function sha256Block(
+        bytes32[2] memory inputChunk,
+        bytes32 hashState
+    ) public pure returns (bytes32) {
+        return bytes32(
+            CryptographyPrimitives.sha256Block(
+                [uint256(inputChunk[0]), uint256(inputChunk[1])], uint256(hashState)
+            )
+        );
     }
 }

package/src/test-helpers/EthVault.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,9 @@ pragma solidity ^0.8.0;
 contract EthVault {
     uint256 public version = 0;
 
-    function setVersion(uint256 _version) external payable {
+    function setVersion(
+        uint256 _version
+    ) external payable {
         version = _version;
     }
 

package/src/test-helpers/InterfaceCompatibilityTester.sol

@@ -7,5 +7,5 @@ pragma solidity >=0.6.9 <0.9.0;
 
 import "../bridge/IBridge.sol";
 import "../bridge/IOutbox.sol";
-import "../bridge/IInboxBase.sol";
+import "../bridge/IInbox.sol";
 import "../bridge/ISequencerInbox.sol";

package/src/test-helpers/MessageTester.sol

@@ -16,16 +16,9 @@ contract MessageTester {
         uint256 gasPriceL1,
         bytes32 messageDataHash
     ) public pure returns (bytes32) {
-        return
-            Messages.messageHash(
-                messageType,
-                sender,
-                blockNumber,
-                timestamp,
-                inboxSeqNum,
-                gasPriceL1,
-                messageDataHash
-            );
+        return Messages.messageHash(
+            messageType, sender, blockNumber, timestamp, inboxSeqNum, gasPriceL1, messageDataHash
+        );
     }
 
     function accumulateInboxMessage(bytes32 inbox, bytes32 message) public pure returns (bytes32) {

package/src/test-helpers/OutboxWithoutOptTester.sol

@@ -22,7 +22,9 @@ contract OutboxWithoutOptTester is DelegateCallAware, IOutbox {
     address public rollup; // the rollup contract
     IBridge public bridge; // the bridge contract
 
-    function spent(uint256) external pure override returns (bytes32) {
+    function spent(
+        uint256
+    ) external pure override returns (bytes32) {
         revert("NOT_IMPLEMETED");
     }
 
@@ -39,10 +41,13 @@ contract OutboxWithoutOptTester is DelegateCallAware, IOutbox {
     // Note, these variables are set and then wiped during a single transaction.
     // Therefore their values don't need to be maintained, and their slots will
     // be empty outside of transactions
+
     L2ToL1Context internal context;
     uint128 public constant OUTBOX_VERSION = 2;
 
-    function initialize(IBridge _bridge) external {
+    function initialize(
+        IBridge _bridge
+    ) external {
         if (address(bridge) != address(0)) revert AlreadyInit();
         bridge = _bridge;
         rollup = address(_bridge.rollup());
@@ -115,15 +120,8 @@ contract OutboxWithoutOptTester is DelegateCallAware, IOutbox {
     ) external virtual override {
         bytes32 outputId;
         {
-            bytes32 userTx = calculateItemHash(
-                l2Sender,
-                to,
-                l2Block,
-                l1Block,
-                l2Timestamp,
-                value,
-                data
-            );
+            bytes32 userTx =
+                calculateItemHash(l2Sender, to, l2Block, l1Block, l2Timestamp, value, data);
 
             outputId = recordOutputAsSpent(proof, index, userTx);
             emit OutBoxTransactionExecuted(to, l2Sender, 0, index);
@@ -166,7 +164,7 @@ contract OutboxWithoutOptTester is DelegateCallAware, IOutbox {
         bytes32 item
     ) internal returns (bytes32) {
         if (proof.length >= 256) revert ProofTooLong(proof.length);
-        if (index >= 2**proof.length) revert PathNotMinimal(index, 2**proof.length);
+        if (index >= 2 ** proof.length) revert PathNotMinimal(index, 2 ** proof.length);
 
         // Hash the leaf an extra time to prove it's a leaf
         bytes32 calcRoot = calculateMerkleRoot(proof, index, item);
@@ -178,11 +176,7 @@ contract OutboxWithoutOptTester is DelegateCallAware, IOutbox {
         return bytes32(index);
     }
 
-    function executeBridgeCall(
-        address to,
-        uint256 value,
-        bytes memory data
-    ) internal {
+    function executeBridgeCall(address to, uint256 value, bytes memory data) internal {
         (bool success, bytes memory returndata) = bridge.executeCall(to, value, data);
         if (!success) {
             if (returndata.length > 0) {
@@ -206,8 +200,7 @@ contract OutboxWithoutOptTester is DelegateCallAware, IOutbox {
         uint256 value,
         bytes calldata data
     ) public pure override returns (bytes32) {
-        return
-            keccak256(abi.encodePacked(l2Sender, to, l2Block, l1Block, l2Timestamp, value, data));
+        return keccak256(abi.encodePacked(l2Sender, to, l2Block, l1Block, l2Timestamp, value, data));
     }
 
     function calculateMerkleRoot(

package/src/test-helpers/RollupMock.sol

@@ -10,7 +10,9 @@ contract RollupMock {
 
     address public owner;
 
-    constructor(address _owner) {
+    constructor(
+        address _owner
+    ) {
         owner = _owner;
     }
 
@@ -18,10 +20,4 @@ contract RollupMock {
         emit WithdrawTriggered();
         return 0;
     }
-
-    function removeOldZombies(
-        uint256 /* startIndex */
-    ) external {
-        emit ZombieTriggered();
-    }
 }

package/src/test-helpers/TestToken.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,9 @@ import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";
  * Basic ERC20 token
  */
 contract TestToken is ERC20 {
-    constructor(uint256 initialSupply) ERC20("TestToken", "TT") {
+    constructor(
+        uint256 initialSupply
+    ) ERC20("TestToken", "TT") {
         _mint(msg.sender, initialSupply);
     }
 }

package/build/contracts/@openzeppelin/contracts/utils/cryptography/ECDSA.sol/ECDSA.dbg.json

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

package/build/contracts/@openzeppelin/contracts-upgradeable/access/AccessControlEnumerableUpgradeable.sol/AccessControlEnumerableUpgradeable.dbg.json

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

package/build/contracts/@openzeppelin/contracts-upgradeable/access/AccessControlEnumerableUpgradeable.sol/AccessControlEnumerableUpgradeable.json

@@ -1,258 +0,0 @@
-{
-  "_format": "hh-sol-artifact-1",
-  "contractName": "AccessControlEnumerableUpgradeable",
-  "sourceName": "@openzeppelin/contracts-upgradeable/access/AccessControlEnumerableUpgradeable.sol",
-  "abi": [
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "internalType": "bytes32",
-          "name": "role",
-          "type": "bytes32"
-        },
-        {
-          "indexed": true,
-          "internalType": "bytes32",
-          "name": "previousAdminRole",
-          "type": "bytes32"
-        },
-        {
-          "indexed": true,
-          "internalType": "bytes32",
-          "name": "newAdminRole",
-          "type": "bytes32"
-        }
-      ],
-      "name": "RoleAdminChanged",
-      "type": "event"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "internalType": "bytes32",
-          "name": "role",
-          "type": "bytes32"
-        },
-        {
-          "indexed": true,
-          "internalType": "address",
-          "name": "account",
-          "type": "address"
-        },
-        {
-          "indexed": true,
-          "internalType": "address",
-          "name": "sender",
-          "type": "address"
-        }
-      ],
-      "name": "RoleGranted",
-      "type": "event"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "internalType": "bytes32",
-          "name": "role",
-          "type": "bytes32"
-        },
-        {
-          "indexed": true,
-          "internalType": "address",
-          "name": "account",
-          "type": "address"
-        },
-        {
-          "indexed": true,
-          "internalType": "address",
-          "name": "sender",
-          "type": "address"
-        }
-      ],
-      "name": "RoleRevoked",
-      "type": "event"
-    },
-    {
-      "inputs": [],
-      "name": "DEFAULT_ADMIN_ROLE",
-      "outputs": [
-        {
-          "internalType": "bytes32",
-          "name": "",
-          "type": "bytes32"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "bytes32",
-          "name": "role",
-          "type": "bytes32"
-        }
-      ],
-      "name": "getRoleAdmin",
-      "outputs": [
-        {
-          "internalType": "bytes32",
-          "name": "",
-          "type": "bytes32"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "bytes32",
-          "name": "role",
-          "type": "bytes32"
-        },
-        {
-          "internalType": "uint256",
-          "name": "index",
-          "type": "uint256"
-        }
-      ],
-      "name": "getRoleMember",
-      "outputs": [
-        {
-          "internalType": "address",
-          "name": "",
-          "type": "address"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "bytes32",
-          "name": "role",
-          "type": "bytes32"
-        }
-      ],
-      "name": "getRoleMemberCount",
-      "outputs": [
-        {
-          "internalType": "uint256",
-          "name": "",
-          "type": "uint256"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "bytes32",
-          "name": "role",
-          "type": "bytes32"
-        },
-        {
-          "internalType": "address",
-          "name": "account",
-          "type": "address"
-        }
-      ],
-      "name": "grantRole",
-      "outputs": [],
-      "stateMutability": "nonpayable",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "bytes32",
-          "name": "role",
-          "type": "bytes32"
-        },
-        {
-          "internalType": "address",
-          "name": "account",
-          "type": "address"
-        }
-      ],
-      "name": "hasRole",
-      "outputs": [
-        {
-          "internalType": "bool",
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "bytes32",
-          "name": "role",
-          "type": "bytes32"
-        },
-        {
-          "internalType": "address",
-          "name": "account",
-          "type": "address"
-        }
-      ],
-      "name": "renounceRole",
-      "outputs": [],
-      "stateMutability": "nonpayable",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "bytes32",
-          "name": "role",
-          "type": "bytes32"
-        },
-        {
-          "internalType": "address",
-          "name": "account",
-          "type": "address"
-        }
-      ],
-      "name": "revokeRole",
-      "outputs": [],
-      "stateMutability": "nonpayable",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "bytes4",
-          "name": "interfaceId",
-          "type": "bytes4"
-        }
-      ],
-      "name": "supportsInterface",
-      "outputs": [
-        {
-          "internalType": "bool",
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    }
-  ],
-  "bytecode": "0x",
-  "deployedBytecode": "0x",
-  "linkReferences": {},
-  "deployedLinkReferences": {}
-}

package/build/contracts/@openzeppelin/contracts-upgradeable/access/IAccessControlEnumerableUpgradeable.sol/IAccessControlEnumerableUpgradeable.dbg.json

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