contract updates

.github/workflows/audit-ci.yml

@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [16, 18, 20]
+        node-version: [18, 20]
     steps:
       - name: Checkout
         uses: actions/checkout@v3

.github/workflows/contract-tests.yml

@@ -12,7 +12,7 @@ on:
 jobs:
   test-unit:
     name: Test unit
-    runs-on: ubuntu-latest
+    runs-on: linux-2xl
     steps:
       - uses: actions/checkout@v3
         with:
@@ -21,23 +21,23 @@ jobs:
       - name: Install Foundry
         uses: foundry-rs/foundry-toolchain@v1
         with:
-          version: nightly
+          version: nightly-5b7e4cb3c882b28f3c32ba580de27ce7381f415a
 
       - name: Setup node/yarn
         uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 18
           cache: 'yarn'
           cache-dependency-path: '**/yarn.lock'
 
       - name: Install packages
         run: yarn
 
       - name: Build
-        run: forge test
+        run: forge test --fork-url https://rpc.holesky.ethpandaops.io/
   tests:
     name: Contract tests
-    runs-on: ubuntu-8
+    runs-on: linux-2xl
     defaults:
       run:
         shell: bash
@@ -85,6 +85,9 @@ jobs:
       - name: Forge build
         run: forge build
 
+      - name: Test size
+        run: yarn contract:size
+
       - name: Test Storage Layouts
         run: yarn run test:storage
 
@@ -103,7 +106,7 @@ jobs:
           token: ${{ secrets.CODECOV_TOKEN }}
   test-4844:
     name: 4844 tests
-    runs-on: ubuntu-latest
+    runs-on: linux-2xl
     steps:
       - uses: actions/checkout@v3
         with:
@@ -123,7 +126,7 @@ jobs:
       - name: Setup nodejs
         uses: actions/setup-node@v2
         with:
-          node-version: '18'
+          node-version: 18
           cache: 'yarn'
           cache-dependency-path: '**/yarn.lock'
 
@@ -135,3 +138,98 @@ jobs:
 
       - name: Test 4844
         run: yarn test:4844
+  test-e2e:
+    name: Test e2e
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          submodules: recursive
+
+      - uses: OffchainLabs/actions/run-nitro-test-node@main
+        with:
+          l3-node: true
+          no-token-bridge: true
+          no-l3-token-bridge: true
+          nitro-contracts-branch: '${{ github.event.pull_request.head.sha || github.sha }}'
+          nitro-testnode-ref: node-18
+
+      - name: Setup node/yarn
+        uses: actions/setup-node@v3
+        with:
+          node-version: 18
+          cache: 'yarn'
+          cache-dependency-path: '**/yarn.lock'
+
+      - name: Install packages
+        run: yarn
+
+      - name: Compile contracts
+        run: yarn build
+
+      - name: Run e2e tests
+        run: yarn test:e2e
+  test-e2e-custom-fee-token:
+    name: Test e2e custom fee token
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          submodules: recursive
+
+      - uses: OffchainLabs/actions/run-nitro-test-node@main
+        with:
+          l3-node: true
+          args: --l3-fee-token
+          no-token-bridge: true
+          no-l3-token-bridge: true
+          nitro-contracts-branch: '${{ github.event.pull_request.head.sha || github.sha }}'
+          nitro-testnode-ref: node-18
+
+      - name: Setup node/yarn
+        uses: actions/setup-node@v3
+        with:
+          node-version: 18
+          cache: 'yarn'
+          cache-dependency-path: '**/yarn.lock'
+
+      - name: Install packages
+        run: yarn
+
+      - name: Compile contracts
+        run: yarn build
+
+      - name: Run e2e tests
+        run: yarn test:e2e
+  test-e2e-fee-token-6-decimals:
+    name: Test e2e fee token with 6 decimals
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          submodules: recursive
+
+      - uses: OffchainLabs/actions/run-nitro-test-node@main
+        with:
+          l3-node: true
+          args: --l3-fee-token --l3-fee-token-decimals 6
+          no-token-bridge: true
+          no-l3-token-bridge: true
+          nitro-contracts-branch: '${{ github.event.pull_request.head.sha || github.sha }}'
+          nitro-testnode-ref: 'non18-decimal-token-node-18'
+
+      - name: Setup node/yarn
+        uses: actions/setup-node@v3
+        with:
+          node-version: 18
+          cache: 'yarn'
+          cache-dependency-path: '**/yarn.lock'
+
+      - name: Install packages
+        run: yarn
+
+      - name: Compile contracts
+        run: yarn build
+
+      - name: Run e2e tests
+        run: yarn test:e2e

.github/workflows/slither.yml

@@ -11,11 +11,12 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Run Slither
-        uses: crytic/slither-action@v0.3.1
+        uses: crytic/slither-action@v0.4.0
         id: slither
         with:
           sarif: results.sarif
           fail-on: medium
+          slither-args: --skip-assembly
 
       - name: Upload SARIF file
         if: always()

.gitmodules

@@ -1,3 +1,6 @@
 [submodule "lib/forge-std"]
 	path = lib/forge-std
 	url = https://github.com/foundry-rs/forge-std
+[submodule "lib/eigenda"]
+	path = lib/eigenda
+	url = https://github.com/Layr-Labs/eigenda

README.md

@@ -20,7 +20,7 @@ yarn build
 
 ## License
 
-Nitro is currently licensed under a [Business Source License](./LICENSE), similar to our friends at Uniswap and Aave, with an "Additional Use Grant" to ensure that everyone can have full comfort using and running nodes on all public Arbitrum chains.
+Nitro is currently licensed under a [Business Source License](./LICENSE.md), similar to our friends at Uniswap and Aave, with an "Additional Use Grant" to ensure that everyone can have full comfort using and running nodes on all public Arbitrum chains.
 
 The Additional Use Grant also permits the deployment of the Nitro software, in a permissionless fashion and without cost, as a new blockchain provided that the chain settles to either Arbitrum One or Arbitrum Nova.
 

audit-ci.jsonc

@@ -47,6 +47,14 @@
     // Exposure of sensitive information in follow-redirects
     "GHSA-74fj-2j2h-c42q",
     // Open Zeppelin: Base64 encoding may read from potentially dirty memory
-    "GHSA-9vx6-7xxf-x967"
+    "GHSA-9vx6-7xxf-x967",
+    // semver vulnerable to Regular Expression Denial of Service
+    "GHSA-c2qf-rxjj-qqgw",
+    // follow-redirects' Proxy-Authorization header kept across hosts
+    "GHSA-cxjh-pqwp-8mfp",
+    // Prototype Pollution in async
+    "GHSA-fwr7-v2mv-hh25",
+    // ws affected by a DoS when handling a request with many HTTP headers
+    "GHSA-3h5v-q93c-6h6q"
   ]
 }

deploy/EigenDARollupManager.js

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

deploy/EigenDARollupManagerStubCreator.js

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

deploy/EigenDAServiceManagerStubCreator.js

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

deploy/SequencerInbox.js

@@ -6,8 +6,12 @@ module.exports = async hre => {
   const blobBasefeeReader = await ethers.getContract('BlobBasefeeReader')
   const dataHashReader = await ethers.getContract('DataHashReader')
 
-  await deploy('SequencerInbox', { from: deployer, args: [117964] })
+  const EigenDARollupUtils = await ethers.getContract('EigenDARollupUtils')
+
+
+
+  await deploy('SequencerInbox', { from: deployer, args: [117964], libraries: { EigenDARollupUtils: EigenDARollupUtils.address } })
 }
 
 module.exports.tags = ['SequencerInbox']
-module.exports.dependencies = []
+module.exports.dependencies = ['EigenDARollupUtils']

deploy/SequencerInboxStubCreator.js

@@ -15,6 +15,7 @@ module.exports = async hre => {
     delaySeconds: 10000,
     futureSeconds: 10000,
   }
+
   await deploy('SequencerInboxStub', {
     from: deployer,
     args: [

foundry.toml

@@ -7,11 +7,16 @@ cache_path  = 'forge-cache/sol'
 optimizer = true
 optimizer_runs = 100
 via_ir = false
-solc_version = '0.8.9'
+solc_version = '0.8.12'
 remappings = ['ds-test/=lib/forge-std/lib/ds-test/src/',
               'forge-std/=lib/forge-std/src/',
               '@openzeppelin/contracts/=node_modules/@openzeppelin/contracts/',
-              '@openzeppelin/contracts-upgradeable/=node_modules/@openzeppelin/contracts-upgradeable/']
+              '@openzeppelin/contracts-upgradeable/=node_modules/@openzeppelin/contracts-upgradeable/',
+              'eigenda/contracts/=lib/eigenda/contracts/src',
+              'eigenlayer-middleware/=lib/eigenda/contracts/lib/eigenlayer-middleware/src/',
+              'eigenlayer-core/=lib/eigenda/contracts/lib/eigenlayer-middleware/lib/eigenlayer-contracts/src/'
+              ]
+fs_permissions = [{ access = "read", path = "./"}]
 
 [profile.yul]
 src = 'yul'

hardhat.config.ts

@@ -5,6 +5,7 @@ import '@nomiclabs/hardhat-etherscan'
 import '@typechain/hardhat'
 import 'solidity-coverage'
 import 'hardhat-gas-reporter'
+import 'hardhat-contract-sizer'
 import 'hardhat-ignore-warnings'
 // import '@tovarishfin/hardhat-yul';
 import dotenv from 'dotenv'
@@ -14,7 +15,7 @@ dotenv.config()
 const solidity = {
   compilers: [
     {
-      version: '0.8.9',
+      version: '0.8.12',
       settings: {
         optimizer: {
           enabled: true,

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arbitrum/nitro-contracts",
-  "version": "1.2.1",
+  "version": "2.0.0-beta.1",
   "description": "Layer 2 precompiles and rollup for Arbitrum Nitro",
   "author": "Offchain Labs, Inc.",
   "license": "BUSL-1.1",
@@ -26,6 +26,7 @@
     "build:forge:sol": "forge build --skip *.yul",
     "build:forge:yul": "FOUNDRY_PROFILE=yul forge build --skip *.sol",
     "build:forge": "yarn build:forge:sol && yarn build:forge:yul",
+    "contract:size": "STRICT=true hardhat size-contracts",
     "lint:test": "eslint ./test",
     "solhint": "solhint -f table src/**/*.sol",
     "prettier:solidity": "prettier --write src/**/*.sol",
@@ -42,18 +43,23 @@
     "deploy-factory": "hardhat run scripts/deployment.ts",
     "deploy-eth-rollup": "hardhat run scripts/createEthRollup.ts",
     "deploy-erc20-rollup": "hardhat run scripts/createERC20Rollup.ts",
-    "create-rollup-testnode": "hardhat run scripts/local-deployment/deployCreatorAndCreateRollup.ts"
+    "create-rollup-testnode": "hardhat run scripts/local-deployment/deployCreatorAndCreateRollup.ts",
+    "deploy-cachemanager-testnode": "hardhat run scripts/local-deployment/deployCacheManager.ts"
   },
   "dependencies": {
+    "@eigenda/eigenda-utils": "2.0.0",
+    "@grpc/grpc-js": "^1.8.22",
+    "@grpc/proto-loader": "^0.7.13",
     "@offchainlabs/upgrade-executor": "1.1.0-beta.0",
-    "@openzeppelin/contracts": "4.5.0",
-    "@openzeppelin/contracts-upgradeable": "4.5.2",
+    "@openzeppelin/contracts": "4.7.0",
+    "@openzeppelin-upgrades/contracts": "npm:@openzeppelin/contracts-upgradeable@4.7",
+    "@openzeppelin/contracts-upgradeable": "4.7.2",
     "patch-package": "^6.4.7",
     "solady": "0.0.182"
   },
   "private": false,
   "devDependencies": {
-    "@arbitrum/sdk": "^3.1.3",
+    "@arbitrum/sdk": "^3.4.1",
     "@ethersproject/providers": "^5.7.2",
     "@nomiclabs/hardhat-ethers": "npm:hardhat-deploy-ethers@^0.3.0-beta.13",
     "@nomiclabs/hardhat-etherscan": "^3.1.0",
@@ -62,6 +68,7 @@
     "@typechain/ethers-v5": "^10.0.0",
     "@typechain/hardhat": "^6.0.0",
     "@types/chai": "^4.3.0",
+    "@types/google-protobuf": "^3.15.12",
     "@types/mocha": "^9.0.0",
     "@types/node": "^17.0.5",
     "@typescript-eslint/eslint-plugin": "^5.14.0",
@@ -77,6 +84,7 @@
     "ethereum-waffle": "^4.0.10",
     "ethers": "^5.5.4",
     "hardhat": "^2.17.2",
+    "hardhat-contract-sizer": "^2.10.0",
     "hardhat-deploy": "^0.11.37",
     "hardhat-gas-reporter": "^1.0.9",
     "hardhat-ignore-warnings": "^0.2.9",