use create2 for factory deployment

.env-sample

@@ -2,6 +2,9 @@ L1_PRIV_KEY="0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80"
 CONFIG_NETWORK_NAME="custom"
 DEPLOYED_CONTRACTS_DIR="./scripts/files/"
 DISABLE_VERIFICATION=true
+FACTORY_OWNER=0x000000000000000000000000000000000000dead
+
+CREATE2_FACTORY=0x4e59b44847b379578588920cA78FbF26c0B4956C
 
 # to use the 'custom' hardhat network, set the following variables
 CUSTOM_RPC_URL="http://127.0.0.1:8545"

.github/workflows/contract-tests.yml

@@ -79,6 +79,9 @@ jobs:
       - name: Lint Test Scripts
         run: yarn lint:test
 
+      - name: Compare bytecodes
+        run: yarn test:bytecodes
+
       - name: Build
         run: yarn build:all
 
@@ -169,7 +172,7 @@ jobs:
           no-token-bridge: true
           no-l3-token-bridge: true
           nitro-contracts-branch: '${{ github.event.pull_request.head.sha || github.sha }}'
-          nitro-testnode-ref: release
+          nitro-testnode-ref: geth-allow-pre155
 
       - name: Setup node/yarn
         uses: actions/setup-node@v3
@@ -202,7 +205,7 @@ jobs:
           no-token-bridge: true
           no-l3-token-bridge: true
           nitro-contracts-branch: '${{ github.event.pull_request.head.sha || github.sha }}'
-          nitro-testnode-ref: release
+          nitro-testnode-ref: geth-allow-pre155
 
       - name: Setup node/yarn
         uses: actions/setup-node@v3
@@ -234,7 +237,7 @@ jobs:
           args: --l3-fee-token --l3-fee-token-pricer --l3-fee-token-decimals 6
           no-token-bridge: true
           no-l3-token-bridge: true
-          nitro-testnode-ref: release
+          nitro-testnode-ref: geth-allow-pre155
           nitro-contracts-branch: '${{ github.event.pull_request.head.sha || github.sha }}'
 
       - name: Setup node/yarn

foundry.toml

@@ -7,7 +7,9 @@ cache_path = 'forge-cache/sol'
 optimizer = true
 optimizer_runs = 2000
 via_ir = false
-evm_version = 'cancun'
+evm_version = 'london'
+solc_version = '0.8.17'
+bytecode_hash = 'none'
 remappings = ['ds-test/=lib/forge-std/lib/ds-test/src/',
               'forge-std/=lib/forge-std/src/',
               '@openzeppelin/contracts-upgradeable/=node_modules/@openzeppelin/contracts-upgradeable/', 
@@ -16,14 +18,33 @@ remappings = ['ds-test/=lib/forge-std/lib/ds-test/src/',
               '@uniswap/v2-core/=node_modules/@uniswap/v2-core/contracts',
               '@uniswap/lib/=node_modules/@uniswap/lib/contracts']
 fs_permissions = [{ access = "read", path = "./"}]
+additional_compiler_profiles = [
+    { name = "20_runs", optimizer_runs = 20 },
+    { name = "200_runs", optimizer_runs = 200 },
+    { name = "default", optimizer_runs = 2000 }
+]
+compilation_restrictions = [
+    { paths = "src/rollup/RollupUserLogic.sol", optimizer_runs = 20 },
+    { paths = "src/challengeV2/EdgeChallengeManager.sol", optimizer_runs = 200 },
+]
+skip = ['test/*']
+
+[profile.test]
+inherit = "default"
+optimizer = false
+additional_compiler_profiles = []
+compilation_restrictions = []
+skip = []
 
 [profile.yul]
+inherit = "default"
 src = 'yul'
 out = 'out/yul'
 libs = ['node_modules', 'lib']
 cache_path = 'forge-cache/yul'
 remappings = []
 auto_detect_remappings = false
+skip = ['*.sol', 'test/*']
 
 [fmt]
 line_length = 100

hardhat.config.ts

@@ -8,64 +8,51 @@ import 'hardhat-gas-reporter'
 import 'hardhat-contract-sizer'
 import 'hardhat-ignore-warnings'
 import dotenv from 'dotenv'
+import { SolidityConfig } from 'hardhat/types'
 
 dotenv.config()
 
-const solidity = {
+const commonSetting = {
+  metadata: {
+    bytecodeHash: 'none',
+  },
+  optimizer: {
+    enabled: true,
+    runs: 2000, // default value, can be overridden
+  },
+  evmVersion: 'london',
+}
+
+const solidity: SolidityConfig = {
   compilers: [
     {
       version: '0.8.17',
-      settings: {
-        optimizer: {
-          enabled: true,
-          runs: 2000,
-        },
-      },
+      settings: { ...commonSetting },
     },
   ],
   overrides: {
     'src/rollup/RollupUserLogic.sol': {
       version: '0.8.17',
       settings: {
-        optimizer: {
-          enabled: true,
-          runs: 20,
-        },
+        ...commonSetting,
+        optimizer: { ...commonSetting.optimizer, runs: 20 },
       },
     },
     'src/challengeV2/EdgeChallengeManager.sol': {
       version: '0.8.17',
       settings: {
-        optimizer: {
-          enabled: true,
-          runs: 200,
-        },
-      },
-    },
-    'src/mocks/HostioTest.sol': {
-      version: '0.8.24',
-      settings: {
-        optimizer: {
-          enabled: true,
-          runs: 100,
-        },
-        evmVersion: 'cancun',
-      },
-    },
-    'src/mocks/ArbOS11To32UpgradeTest.sol': {
-      version: '0.8.24',
-      settings: {
-        optimizer: {
-          enabled: true,
-          runs: 100,
-        },
-        evmVersion: 'cancun',
+        ...commonSetting,
+        optimizer: { ...commonSetting.optimizer, runs: 200 },
       },
     },
   },
 }
 
 if (process.env['INTERFACE_TESTER_SOLC_VERSION']) {
+  console.log(
+    'Running in interface tester mode with solc version',
+    process.env['INTERFACE_TESTER_SOLC_VERSION']
+  )
   solidity.compilers.push({
     version: process.env['INTERFACE_TESTER_SOLC_VERSION'],
     settings: {
@@ -88,26 +75,6 @@ if (process.env['INTERFACE_TESTER_SOLC_VERSION']) {
         },
       },
     },
-    'src/mocks/HostioTest.sol': {
-      version: '0.8.24',
-      settings: {
-        optimizer: {
-          enabled: true,
-          runs: 100,
-        },
-        evmVersion: 'cancun',
-      },
-    },
-    'src/mocks/ArbOS11To32UpgradeTest.sol': {
-      version: '0.8.24',
-      settings: {
-        optimizer: {
-          enabled: true,
-          runs: 100,
-        },
-        evmVersion: 'cancun',
-      },
-    },
   }
 }
 

package.json

@@ -21,11 +21,11 @@
     "audit:ci": "audit-ci --config ./audit-ci.jsonc",
     "audit:fix": "yarn-audit-fix",
     "prepublishOnly": "hardhat clean && forge clean && hardhat compile && yarn build:forge:yul",
-    "coverage": "forge coverage --report lcov --ir-minimum && lcov --remove lcov.info 'node_modules/*' 'test/*' 'script/*' 'src/test-helpers/*' 'challenge/*' --ignore-errors unused -o lcov.info && genhtml lcov.info --branch-coverage --output-dir coverage",
+    "coverage": "FOUNDRY_PROFILE=test forge coverage --report lcov --ir-minimum && lcov --remove lcov.info 'node_modules/*' 'test/*' 'script/*' 'src/test-helpers/*' 'challenge/*' --ignore-errors unused -o lcov.info && genhtml lcov.info --branch-coverage --output-dir coverage",
     "build:all": "yarn build && yarn build:forge",
     "build": "hardhat compile",
     "build:forge:sol": "forge build --skip *.yul",
-    "build:forge:yul": "FOUNDRY_PROFILE=yul forge build --skip *.sol",
+    "build:forge:yul": "FOUNDRY_PROFILE=yul forge build",
     "build:forge": "yarn build:forge:sol && yarn build:forge:yul",
     "contract:size": "hardhat size-contracts",
     "lint:test": "eslint ./test",
@@ -44,8 +44,9 @@
     "test:e2e": "hardhat test test/e2e/*.ts",
     "test:e2e:stylus": "hardhat test test/e2e/stylusDeployer.ts",
     "test:upgrade": "./scripts/testUpgrade.bash",
-    "test:foundry": "forge test --gas-limit 10000000000",
+    "test:foundry": "FOUNDRY_PROFILE=test forge test --gas-limit 10000000000",
     "test:update": "yarn run test:signatures || yarn run test:storage",
+    "test:bytecodes": "hardhat clean && forge clean && hardhat run scripts/compareBytecodes.ts",
     "metadatahash": "yarn build:all && hardhat run scripts/printMetadataHashes.ts",
     "upload-4bytes": "forge build && find ./out -type f -name \"*.json\" -exec cast upload-signature {} + | grep -v Duplicated:",
     "postinstall": "patch-package",