@arbitrum/nitro-contracts 1.0.0-beta.1 → 1.0.0-beta.4

package/src/rollup/ValidatorUtils.sol

@@ -7,7 +7,6 @@ pragma solidity ^0.8.0;
 pragma experimental ABIEncoderV2;
 
 import "../rollup/IRollupCore.sol";
-import "../rollup/IRollupLogic.sol";
 import "../challenge/IChallengeManager.sol";
 
 import {NO_CHAL_INDEX} from "../libraries/Constants.sol";

package/src/rollup/ValidatorWallet.sol

@@ -4,7 +4,6 @@
 
 pragma solidity ^0.8.0;
 
-import "./IRollupLogic.sol";
 import "../challenge/IChallengeManager.sol";
 import "../libraries/DelegateCallAware.sol";
 import "@openzeppelin/contracts/utils/Address.sol";

package/src/state/Instructions.sol

@@ -150,6 +150,8 @@ library Instructions {
     uint16 internal constant READ_INBOX_MESSAGE = 0x8021;
     uint16 internal constant HALT_AND_SET_FINISHED = 0x8022;
 
+    uint16 internal constant ARBITRARY_JUMP = 0x8023;
+
     uint256 internal constant INBOX_INDEX_SEQUENCER = 0;
     uint256 internal constant INBOX_INDEX_DELAYED = 1;
 

package/.prettierrc

@@ -1,5 +0,0 @@
-{
-  "printWidth": 100,
-  "singleQuote": false,
-  "compiler": "0.8.6"
-}

package/.solhint.json

@@ -1,18 +0,0 @@
-{
-  "extends": ["solhint:recommended"],
-  "rules": {
-    "prettier/prettier": "error",
-    "avoid-throw": "off",
-    "avoid-suicide": "error",
-    "avoid-sha3": "warn",
-    "max-line-length": "off",
-    "compiler-version": "off",
-    "func-visibility": ["warn",{"ignoreConstructors":true}],
-    "no-empty-blocks": "off",
-    "reason-string": ["warn",{"maxLength":128}],
-    "not-rely-on-time": "off",
-    "max-states-count": ["warn",30],
-    "no-inline-assembly": "off"
-  },
-  "plugins": ["prettier"]
-}

package/deploy/BridgeStubCreator.js

@@ -1,10 +0,0 @@
-module.exports = async (hre) => {
-  const { deployments, getNamedAccounts, ethers } = hre;
-  const { deploy } = deployments;
-  const { deployer } = await getNamedAccounts();
-
-  await deploy("BridgeStub", {from: deployer, args: []});
-};
-
-module.exports.tags = ["BridgeStub", "test"];
-module.exports.dependencies = [];

package/deploy/HashProofHelper.js

@@ -1,13 +0,0 @@
-module.exports = async (hre) => {
-  const { deployments, getNamedAccounts } = hre;
-  const { deploy } = deployments;
-  const { deployer } = await getNamedAccounts();
-
-  await deploy("HashProofHelper", {
-    from: deployer,
-    args: [],
-  });
-};
-
-module.exports.tags = ["HashProofHelper", "test", "live"];
-module.exports.dependencies = [];

package/deploy/InboxStubCreator.js

@@ -1,17 +0,0 @@
-module.exports = async (hre) => {
-  const { deployments, getNamedAccounts, ethers } = hre;
-  const { deploy } = deployments;
-  const { deployer } = await getNamedAccounts();
-
-  await deploy("InboxStub", {from: deployer, args: []});
-
-  const bridge = await ethers.getContract("BridgeStub");
-  const inbox = await ethers.getContract("InboxStub");
-
-  await bridge.setInbox(inbox.address, true);
-  await inbox.initialize(bridge.address);
-};
-
-module.exports.tags = ["InboxStub", "test"];
-module.exports.dependencies = ["BridgeStub"];
-

package/deploy/OneStepProofEntryCreator.js

@@ -1,19 +0,0 @@
-module.exports = async (hre) => {
-  const { deployments, getNamedAccounts } = hre;
-  const { deploy } = deployments;
-  const { deployer } = await getNamedAccounts();
-
-  await deploy("OneStepProofEntry", {
-    from: deployer,
-    args: [
-      (await deployments.get("OneStepProver0")).address,
-      (await deployments.get("OneStepProverMemory")).address,
-      (await deployments.get("OneStepProverMath")).address,
-      (await deployments.get("OneStepProverHostIo")).address,
-    ],
-  });
-};
-
-module.exports.tags = ["OneStepProofEntry"];
-module.exports.dependencies = ["OneStepProver0", "OneStepProverMemory", "OneStepProverMath", "OneStepProverHostIo"];
-

package/deploy/OneStepProver0Creator.js

@@ -1,14 +0,0 @@
-module.exports = async (hre) => {
-  const { deployments, getNamedAccounts } = hre;
-  const { deploy } = deployments;
-  const { deployer } = await getNamedAccounts();
-
-  await deploy("OneStepProver0", {
-    from: deployer,
-    args: [],
-  });
-};
-
-module.exports.tags = ["OneStepProver0", "live", "test"];
-module.exports.dependencies = [];
-

package/deploy/OneStepProverHostIoCreator.js

@@ -1,14 +0,0 @@
-module.exports = async (hre) => {
-  const { deployments, getNamedAccounts, ethers } = hre;
-  const { deploy } = deployments;
-  const { deployer } = await getNamedAccounts();
-
-  await deploy("OneStepProverHostIo", {
-    from: deployer,
-    args: [],
-  });
-};
-
-module.exports.tags = ["OneStepProverHostIo"];
-module.exports.dependencies = [];
-

package/deploy/OneStepProverMathCreator.js

@@ -1,14 +0,0 @@
-module.exports = async (hre) => {
-  const { deployments, getNamedAccounts } = hre;
-  const { deploy } = deployments;
-  const { deployer } = await getNamedAccounts();
-
-  await deploy("OneStepProverMath", {
-    from: deployer,
-    args: [],
-  });
-};
-
-module.exports.tags = ["OneStepProverMath", "live", "test"];
-module.exports.dependencies = [];
-

package/deploy/OneStepProverMemoryCreator.js

@@ -1,14 +0,0 @@
-module.exports = async (hre) => {
-  const { deployments, getNamedAccounts } = hre;
-  const { deploy } = deployments;
-  const { deployer } = await getNamedAccounts();
-
-  await deploy("OneStepProverMemory", {
-    from: deployer,
-    args: [],
-  });
-};
-
-module.exports.tags = ["OneStepProverMemory", "live", "test"];
-module.exports.dependencies = [];
-

package/deploy/SequencerInboxStubCreator.js

@@ -1,13 +0,0 @@
-module.exports = async (hre) => {
-  const { deployments, getNamedAccounts, ethers } = hre;
-  const { deploy } = deployments;
-  const { deployer } = await getNamedAccounts();
-
-  const bridge = await ethers.getContract("BridgeStub");
-  const maxTime = {delayBlocks: 10000, futureBlocks: 10000, delaySeconds: 10000, futureSeconds: 10000}
-  await deploy("SequencerInboxStub", {from: deployer, args: [bridge.address, deployer, maxTime]})
-};
-
-module.exports.tags = ["SequencerInboxStub", "test"];
-module.exports.dependencies = ["BridgeStub"];
-

package/deploy/ValueArrayTesterCreator.js

@@ -1,13 +0,0 @@
-module.exports = async (hre) => {
-  const { deployments, getNamedAccounts } = hre;
-  const { deploy } = deployments;
-  const { deployer } = await getNamedAccounts();
-
-  await deploy("ValueArrayTester", {
-    from: deployer,
-    args: [],
-  });
-};
-
-module.exports.tags = ["ValueArrayTester", "test"];
-module.exports.dependencies = [];

package/hardhat.config.ts

@@ -1,47 +0,0 @@
-import '@nomiclabs/hardhat-waffle'
-import 'hardhat-deploy'
-import '@nomiclabs/hardhat-ethers'
-import '@typechain/hardhat'
-import 'solidity-coverage'
-import prodConfig from "./hardhat.prod-config"
-
-/**
- * @type import('hardhat/config').HardhatUserConfig
- */
-module.exports = {
-  ...prodConfig,
-  namedAccounts: {
-    deployer: {
-      default: 0,
-    },
-  },
-  networks: {
-    hardhat: {
-      chainId: 1338,
-      throwOnTransactionFailures: true,
-      allowUnlimitedContractSize: true,
-      accounts: {
-        accountsBalance: '1000000000000000000000000000',
-      },
-      blockGasLimit: 200000000,
-      // mining: {
-      //   auto: false,
-      //   interval: 1000,
-      // },
-      forking: {
-        url: 'https://mainnet.infura.io/v3/' + process.env['INFURA_KEY'],
-        enabled: process.env['SHOULD_FORK'] === '1',
-      },
-    },
-    geth: {
-      url: 'http://localhost:8545',
-    },
-  },
-  mocha: {
-    timeout: 0,
-  },
-  typechain: {
-    outDir: 'build/types',
-    target: 'ethers-v5',
-  },
-}

package/src/mocks/Counter.sol

@@ -1,13 +0,0 @@
-// 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;
-
-contract Simple {
-    uint64 public counter;
-
-    function increment() external {
-        counter++;
-    }
-}