@arbitrum/nitro-contracts 1.0.1 → 1.0.2

package/README.md

@@ -1,15 +1,19 @@
-# Arbitrum Nitro Contracts
+# Arbitrum Nitro Rollup Contracts
 
 This is the package with the smart contract code that powers Arbitrum Nitro.
 It includes the rollup and fraud proof smart contracts, as well as interfaces for interacting with precompiles.
 
-For more information see https://developer.arbitrum.io/docs/public_nitro_devnet
+For more information see https://developer.arbitrum.io/intro
 
-Compile the contracts locally by running
+For the deployed addresses of these contracts for Arbitrum chains see https://developer.arbitrum.io/useful-addresses
+
+For the token bridge contracts see https://github.com/OffchainLabs/token-bridge-contracts
+
+Compile these contracts locally by running
 
 ```bash
-git clone https://github.com/offchainlabs/nitro
-cd nitro/contracts
+git clone https://github.com/offchainlabs/rollup-contracts
+cd rollup-contracts
 yarn install
 yarn build
 ```

package/package.json

@@ -1,29 +1,25 @@
 {
   "name": "@arbitrum/nitro-contracts",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "Layer 2 precompiles and rollup for Arbitrum Nitro",
   "author": "Offchain Labs, Inc.",
   "license": "BUSL-1.1",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/offchainlabs/nitro.git",
-    "directory": "contracts"
+    "url": "git+https://github.com/offchainlabs/nitro-contracts.git"
   },
   "files": [
-    "src/",
-    "scripts/build.bash",
-    "hardhat.prod-config.js"
+    "src/"
   ],
   "bugs": {
-    "url": "https://github.com/offchainlabs/nitro/issues"
+    "url": "https://github.com/offchainlabs/nitro-contracts/issues"
   },
   "scripts": {
-    "build": "./scripts/build.bash",
+    "build": "hardhat compile",
     "lint:test": "eslint ./test",
     "solhint": "solhint -f table src/**/*.sol",
     "prettier:solidity": "prettier --write src/**/*.sol",
     "format": "prettier './**/*.{js,json,md,ts,yml,sol}' --write && yarn run lint:test --fix",
-    "hardhat:prod": "hardhat --config hardhat.prod-config.js",
     "build:0.6": "INTERFACE_TESTER_SOLC_VERSION=0.6.9 yarn run build",
     "build:0.7": "INTERFACE_TESTER_SOLC_VERSION=0.7.0 yarn run build",
     "test:compatibility": "yarn run build:0.6 && yarn run build:0.7",
@@ -33,7 +29,6 @@
   "dependencies": {
     "@openzeppelin/contracts": "4.5.0",
     "@openzeppelin/contracts-upgradeable": "4.5.2",
-    "hardhat": "^2.6.6",
     "patch-package": "^6.4.7"
   },
   "private": false,
@@ -56,6 +51,7 @@
     "eslint-plugin-prettier": "^4.0.0",
     "ethereum-waffle": "^3.4.0",
     "ethers": "^5.5.2",
+    "hardhat": "^2.6.6",
     "hardhat-deploy": "^0.11.4",
     "hardhat-gas-reporter": "^1.0.8",
     "postinstall-postinstall": "^2.1.0",

package/src/challenge/ChallengeManager.sol

@@ -285,7 +285,7 @@ contract ChallengeManager is DelegateCallAware, IChallengeManager {
         return challenges[challengeIndex].current.addr;
     }
 
-    function isTimedOut(uint64 challengeIndex) public view override returns (bool) {
+    function isTimedOut(uint64 challengeIndex) public view virtual override returns (bool) {
         return challenges[challengeIndex].isTimedOut();
     }
 

package/src/mocks/InboxStub.sol

@@ -151,7 +151,7 @@ contract InboxStub is IInbox {
         address,
         uint256,
         bytes calldata
-    ) external returns (uint256) {
+    ) external pure returns (uint256) {
         revert("NOT_IMPLEMENTED");
     }
 
@@ -161,7 +161,7 @@ contract InboxStub is IInbox {
         uint256,
         uint256,
         address
-    ) external returns (uint256) {
+    ) external pure returns (uint256) {
         revert("NOT_IMPLEMENTED");
     }
 

package/src/mocks/ProxyAdminForBinding.sol

@@ -0,0 +1,9 @@
+// Copyright 2021-2022, Offchain Labs, Inc.
+// For license information, see https://github.com/nitro/blob/master/LICENSE
+// SPDX-License-Identifier: BUSL-1.1
+
+pragma solidity ^0.8.0;
+
+import "@openzeppelin/contracts/proxy/transparent/ProxyAdmin.sol";
+
+contract ProxyAdminForBinding is ProxyAdmin {}

package/src/mocks/Simple.sol

@@ -13,11 +13,17 @@ contract Simple {
     event CounterEvent(uint64 count);
     event RedeemedEvent(address caller, address redeemer);
     event NullEvent();
+    event LogAndIncrementCalled(uint256 expected, uint256 have);
 
     function increment() external {
         counter++;
     }
 
+    function logAndIncrement(uint256 expected) external {
+        emit LogAndIncrementCalled(expected, counter);
+        counter++;
+    }
+
     function incrementEmit() external {
         counter++;
         emit CounterEvent(counter);
@@ -104,4 +110,12 @@ contract Simple {
         (success, ) = address(this).call(data);
         require(success, "CALL_FAILED");
     }
+
+    function checkGasUsed(address to, bytes calldata input) external view returns (uint256) {
+        uint256 before = gasleft();
+        // The inner call may revert, but we still want to return the amount of gas used,
+        // so we ignore the result of this call.
+        (to.staticcall{gas: before - 10000}(input));
+        return before - gasleft();
+    }
 }

package/src/mocks/TimedOutChallengeManager.sol

@@ -0,0 +1,13 @@
+// Copyright 2021-2022, Offchain Labs, Inc.
+// For license information, see https://github.com/nitro/blob/master/LICENSE
+// SPDX-License-Identifier: BUSL-1.1
+
+pragma solidity ^0.8.0;
+
+import "../challenge/ChallengeManager.sol";
+
+contract TimedOutChallengeManager is ChallengeManager {
+    function isTimedOut(uint64) public pure override returns (bool) {
+        return true;
+    }
+}

package/src/precompiles/ArbDebug.sol

@@ -1,5 +1,5 @@
-// Copyright 2021-2022, Offchain Labs, Inc.
-// For license information, see https://github.com/nitro/blob/master/LICENSE
+// Copyright 2021-2023, Offchain Labs, Inc.
+// For license information, see https://github.com/OffchainLabs/nitro/blob/master/LICENSE
 // SPDX-License-Identifier: BUSL-1.1
 
 pragma solidity >=0.4.21 <0.9.0;
@@ -15,6 +15,9 @@ interface ArbDebug {
     /// @notice Emit events with values based on the args provided
     function events(bool flag, bytes32 value) external payable returns (address, uint256);
 
+    /// @notice Tries (and fails) to emit logs in a view context
+    function eventsView() external view;
+
     // Events that exist for testing log creation and pricing
     event Basic(bool flag, bytes32 indexed value);
     event Mixed(
@@ -34,6 +37,8 @@ interface ArbDebug {
 
     function customRevert(uint64 number) external pure;
 
+    function legacyError() external pure;
+
     error Custom(uint64, string, bool);
     error Unused();
 }

package/src/precompiles/ArbSys.sol

@@ -147,4 +147,6 @@ interface ArbSys {
         bytes32 indexed hash,
         uint256 indexed position
     );
+
+    error InvalidBlockNumber(uint256 requested, uint256 current);
 }

package/hardhat.prod-config.js

@@ -1,18 +0,0 @@
-/**
- * @type import('hardhat/config').HardhatUserConfig
- */
-module.exports = {
-  solidity: {
-    version: '0.8.9',
-    settings: {
-      optimizer: {
-        enabled: true,
-        runs: 100,
-      },
-    },
-  },
-  paths: {
-    sources: './src',
-    artifacts: 'build/contracts',
-  },
-}

package/scripts/build.bash

@@ -1,5 +0,0 @@
-#!/bin/bash
-if [[ $PWD == */contracts ]];
-    then $npm_execpath run hardhat compile;
-    else $npm_execpath run hardhat:prod compile;
-fi