Fee token pricers v2 old

.env-sample

@@ -0,0 +1,5 @@
+L1_RPC_URL="http://127.0.0.1:8545"
+L1_PRIV_KEY="0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80"
+CONFIG_NETWORK_NAME="arb1"
+DEPLOYED_CONTRACTS_DIR="./scripts/files/"
+DISABLE_VERIFICATION=true

.env.sample.testnode

@@ -0,0 +1,5 @@
+L1_RPC_URL="http://localhost:8545"
+L1_PRIV_KEY="0xdc04c5399f82306ec4b4d654a342f40e2e0620fe39950d967e1e574b32d4dd36"
+CONFIG_NETWORK_NAME="local"
+DEPLOYED_CONTRACTS_DIR="./scripts/files/"
+DISABLE_VERIFICATION=true

.github/workflows/contract-tests.yml

@@ -34,7 +34,7 @@ jobs:
         run: yarn
 
       - name: Build
-        run: forge test
+        run: yarn test:foundry
   tests:
     name: Contract tests
     runs-on: ubuntu-8
@@ -64,6 +64,9 @@ jobs:
         with:
           version: nightly
 
+      - name: Check Contracts Format
+        run: forge fmt --check
+
       - name: Install dependencies
         run: yarn install
 
@@ -147,20 +150,114 @@ jobs:
 
       - name: Test 4844
         run: yarn test:4844
-  test-e2e:
-    name: Test e2e
+  # 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
+
+  bold-upgrade:
+    name: BOLD upgrade test
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
         with:
           submodules: recursive
 
-      - uses: OffchainLabs/actions/run-nitro-test-node@main
+      - name: Install Foundry
+        uses: foundry-rs/foundry-toolchain@v1
         with:
-          l3-node: true
-          no-token-bridge: true
-          no-l3-token-bridge: true
-          nitro-contracts-branch: '${{ github.event.pull_request.head.sha || github.sha }}'
+          version: nightly
 
       - name: Setup node/yarn
         uses: actions/setup-node@v3
@@ -173,10 +270,15 @@ jobs:
         run: yarn
 
       - name: Compile contracts
-        run: yarn build
+        run: yarn build:all
+
+      - name: Copy .env
+        run: |
+          cp ./.env-sample ./.env
+
+      - name: Test upgrade
+        run: L1_RPC=${{ secrets.L1_RPC || 'https://rpc.ankr.com/eth' }} yarn test:upgrade
 
-      - name: Run e2e orbit tests
-        run: yarn test:e2e:orbit
   test-e2e-custom-fee-token:
     name: Test e2e custom fee token
     runs-on: ubuntu-latest
@@ -244,6 +346,6 @@ jobs:
 
       - name: Run e2e tests
         run: yarn test:e2e:orbit
-      
+
       - name: Run e2e orbit custom fee token rollup tests
         run: yarn test:e2e:orbit-fee-token-rollup

.gitignore

@@ -9,4 +9,7 @@ deployments/
 scripts/config.ts
 forge-cache/
 out/
-.env
+.env
+.DS_Store
+lcov.info
+output_directory

.prettierignore

@@ -8,3 +8,5 @@ src/lib/abi/**
 out/**
 lib/**
 src/mocks/MultiCallTest.sol
+slither.db.json
+LICENSE.md

.prettierrc.js

@@ -6,16 +6,4 @@ module.exports = {
   tabWidth: 2,
   arrowParens: 'avoid',
   bracketSpacing: true,
-  overrides: [
-    {
-      files: '*.sol',
-      options: {
-        tabWidth: 4,
-        printWidth: 100,
-        singleQuote: false,
-        bracketSpacing: false,
-        compiler: '0.8.9',
-      },
-    },
-  ],
 }

.solhint.json

@@ -1,7 +1,6 @@
 {
   "extends": ["solhint:recommended"],
   "rules": {
-    "prettier/prettier": "error",
     "avoid-throw": "off",
     "avoid-suicide": "error",
     "avoid-sha3": "warn",
@@ -12,7 +11,11 @@
     "reason-string": ["warn", { "maxLength": 128 }],
     "not-rely-on-time": "off",
     "max-states-count": ["warn", 40],
-    "no-inline-assembly": "off"
+    "no-inline-assembly": "off",
+    "no-global-import": "off",
+    "custom-errors": "off",
+    "immutable-vars-naming": "off",
+    "var-name-mixedcase": "off"
   },
-  "plugins": ["prettier"]
+  "plugins": []
 }

.solhintignore

@@ -0,0 +1,3 @@
+src/mocks
+src/precompiles
+src/test-helpers

audit-ci.jsonc

@@ -67,6 +67,14 @@
     // Regular Expression Denial of Service (ReDoS) in micromatch
     "GHSA-952p-6rrq-rcjv",
     // cookie accepts cookie name, path, and domain with out of bounds characters
-    "GHSA-pxg6-pf52-xh8x"
+    "GHSA-pxg6-pf52-xh8x",
+    // Elliptic's verify function omits uniqueness validation
+    "GHSA-434g-2637-qmqr",
+    // Valid ECDSA signatures erroneously rejected in Elliptic
+    "GHSA-fc9h-whq2-v747",
+    // secp256k1-node allows private key extraction over ECDH
+    "GHSA-584q-6j8j-r5pm",
+    // Regular Expression Denial of Service (ReDoS) in cross-spawn
+    "GHSA-3xgq-45jj-v275"
   ]
 }

deploy/ExpressLaneAuction.js

@@ -0,0 +1,45 @@
+module.exports = async hre => {
+  const { deployments, getNamedAccounts } = hre
+  const { deploy } = deployments
+  const { deployer } = await getNamedAccounts()
+
+  await deploy('ExpressLaneAuction', {
+    from: deployer,
+    args: [],
+    proxy: {
+      proxyContract: 'TransparentUpgradeableProxy',
+      execute: {
+        init: {
+          methodName: 'initialize',
+          args: [
+            {
+              _auctioneer: '0xeee584DA928A94950E177235EcB9A99bb655c7A0',
+              _biddingToken: '0x980B62Da83eFf3D4576C647993b0c1D7faf17c73', // WETH
+              _beneficiary: '0xeee584DA928A94950E177235EcB9A99bb655c7A0',
+              _roundTimingInfo: {
+                offsetTimestamp: 1727870000,
+                roundDurationSeconds: 60,
+                auctionClosingSeconds: 15,
+                reserveSubmissionSeconds: 15,
+              },
+              _minReservePrice: ethers.utils.parseEther('0.00001'),
+              _auctioneerAdmin: '0xeee584DA928A94950E177235EcB9A99bb655c7A0',
+              _minReservePriceSetter:
+                '0xeee584DA928A94950E177235EcB9A99bb655c7A0',
+              _reservePriceSetter: '0xeee584DA928A94950E177235EcB9A99bb655c7A0',
+              _reservePriceSetterAdmin:
+                '0xeee584DA928A94950E177235EcB9A99bb655c7A0',
+              _beneficiarySetter: '0xeee584DA928A94950E177235EcB9A99bb655c7A0',
+              _roundTimingSetter: '0xeee584DA928A94950E177235EcB9A99bb655c7A0',
+              _masterAdmin: '0xeee584DA928A94950E177235EcB9A99bb655c7A0',
+            },
+          ],
+        },
+      },
+      owner: deployer,
+    },
+  })
+}
+
+module.exports.tags = ['ExpressLaneAuction']
+module.exports.dependencies = []

foundry.toml

@@ -1,31 +1,47 @@
 [profile.default]
-src = 'src/'
+src = 'src'
 out = 'out'
 libs = ['node_modules', 'lib']
 test = 'test/foundry'
-cache_path  = 'forge-cache/sol'
+cache_path = 'forge-cache/sol'
 optimizer = true
-optimizer_runs = 100
+optimizer_runs = 2000
 via_ir = false
 evm_version = 'cancun'
 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/', 
+              '@openzeppelin/contracts/=node_modules/@openzeppelin/contracts/', 
+              '@offchainlabs/upgrade-executor/=node_modules/@offchainlabs/upgrade-executor/',
+              '@uniswap/v2-core/=node_modules/@uniswap/v2-core/contracts',
+              '@uniswap/lib/=node_modules/@uniswap/lib/contracts']
+fs_permissions = [{ access = "read", path = "./"}]
 
 [profile.yul]
 src = 'yul'
 out = 'out/yul'
 libs = ['node_modules', 'lib']
-cache_path  = 'forge-cache/yul'
+cache_path = 'forge-cache/yul'
 remappings = []
 auto_detect_remappings = false
 
 [fmt]
-number_underscore = 'thousands'
 line_length = 100
+tab_width = 4
+bracket_spacing = false
+int_types = "long"
+multiline_func_header = "params_first"
+quote_style = "double"
+number_underscore = "preserve"
+hex_underscore = "remove"
+single_line_statement_blocks = "preserve"
+override_spacing = false
+wrap_comments = false
+ignore = []
+contract_new_lines = false
+sort_imports = false
 
 [fuzz]
-runs = 5000
+runs = 1000
 
 # See more config options https://github.com/foundry-rs/foundry/tree/master/config