feat: bold

.gitignore

@@ -9,4 +9,5 @@ deployments/
 scripts/config.ts
 forge-cache/
 out/
-.env
+.env
+.DS_Store

foundry.toml

@@ -1,17 +1,16 @@
 [profile.default]
-src = 'src/'
+src = 'src'
 out = 'out'
 libs = ['node_modules', 'lib']
-test = 'test/foundry'
 cache_path  = 'forge-cache/sol'
 optimizer = true
-optimizer_runs = 100
+optimizer_runs = 2000
 via_ir = false
-solc_version = '0.8.9'
-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/']
+solc_version = '0.8.17'
+remappings = ['@openzeppelin/contracts-upgradeable/=node_modules/@openzeppelin/contracts-upgradeable/', 
+              '@openzeppelin/contracts/=node_modules/@openzeppelin/contracts/', 
+              '@offchainlabs/upgrade-executor/=node_modules/@offchainlabs/upgrade-executor/']
+fs_permissions = [{ access = "read", path = "./"}]
 
 [profile.yul]
 src = 'yul'
@@ -21,7 +20,4 @@ cache_path  = 'forge-cache/yul'
 remappings = []
 auto_detect_remappings = false
 
-[fmt]
-number_underscore = 'thousands'
-line_length = 100
-# See more config options https://github.com/foundry-rs/foundry/tree/master/config
+# See more config options https://github.com/foundry-rs/foundry/tree/master/config

hardhat.config.ts

@@ -5,25 +5,31 @@ import '@nomiclabs/hardhat-etherscan'
 import '@typechain/hardhat'
 import 'solidity-coverage'
 import 'hardhat-gas-reporter'
-import 'hardhat-ignore-warnings'
-// import '@tovarishfin/hardhat-yul';
-import dotenv from 'dotenv'
-
-dotenv.config()
+import 'hardhat-contract-sizer'
 
 const solidity = {
   compilers: [
     {
-      version: '0.8.9',
+      version: '0.8.17',
       settings: {
         optimizer: {
           enabled: true,
-          runs: 100,
+          runs: 2000,
         },
       },
     },
   ],
-  overrides: {},
+  overrides: {
+    'src/challengeV2/EdgeChallengeManager.sol': {
+      version: '0.8.17',
+      settings: {
+        optimizer: {
+          enabled: true,
+          runs: 200,
+        },
+      },
+    },
+  },
 }
 
 if (process.env['INTERFACE_TESTER_SOLC_VERSION']) {
@@ -37,12 +43,15 @@ if (process.env['INTERFACE_TESTER_SOLC_VERSION']) {
     },
   })
   solidity.overrides = {
-    'src/test-helpers/InterfaceCompatibilityTester.sol': {
-      version: process.env['INTERFACE_TESTER_SOLC_VERSION'],
-      settings: {
-        optimizer: {
-          enabled: true,
-          runs: 100,
+    ...(solidity.overrides || {}),
+    ...{
+      'src/test-helpers/InterfaceCompatibilityTester.sol': {
+        version: process.env['INTERFACE_TESTER_SOLC_VERSION'],
+        settings: {
+          optimizer: {
+            enabled: true,
+            runs: 100,
+          },
         },
       },
     },
@@ -93,12 +102,6 @@ module.exports = {
         ? [process.env['DEVNET_PRIVKEY']]
         : [],
     },
-    sepolia: {
-      url: 'https://sepolia.infura.io/v3/' + process.env['INFURA_KEY'],
-      accounts: process.env['DEVNET_PRIVKEY']
-        ? [process.env['DEVNET_PRIVKEY']]
-        : [],
-    },
     rinkeby: {
       url: 'https://rinkeby.infura.io/v3/' + process.env['INFURA_KEY'],
       accounts: process.env['DEVNET_PRIVKEY']
@@ -117,12 +120,6 @@ module.exports = {
         ? [process.env['DEVNET_PRIVKEY']]
         : [],
     },
-    arbSepolia: {
-      url: 'https://sepolia-rollup.arbitrum.io/rpc',
-      accounts: process.env['DEVNET_PRIVKEY']
-        ? [process.env['DEVNET_PRIVKEY']]
-        : [],
-    },
     arb1: {
       url: 'https://arb1.arbitrum.io/rpc',
       accounts: process.env['MAINNET_PRIVKEY']
@@ -143,13 +140,11 @@ module.exports = {
     apiKey: {
       mainnet: process.env['ETHERSCAN_API_KEY'],
       goerli: process.env['ETHERSCAN_API_KEY'],
-      sepolia: process.env['ETHERSCAN_API_KEY'],
       rinkeby: process.env['ETHERSCAN_API_KEY'],
       arbitrumOne: process.env['ARBISCAN_API_KEY'],
       arbitrumTestnet: process.env['ARBISCAN_API_KEY'],
       nova: process.env['NOVA_ARBISCAN_API_KEY'],
       arbGoerliRollup: process.env['ARBISCAN_API_KEY'],
-      arbSepolia: process.env['ARBISCAN_API_KEY'],
     },
     customChains: [
       {
@@ -168,14 +163,6 @@ module.exports = {
           browserURL: 'https://goerli.arbiscan.io/',
         },
       },
-      {
-        network: 'arbSepolia',
-        chainId: 421614,
-        urls: {
-          apiURL: 'https://sepolia-explorer.arbitrum.io/api',
-          browserURL: 'https://sepolia-explorer.arbitrum.io/',
-        },
-      },
     ],
   },
   mocha: {
@@ -188,4 +175,7 @@ module.exports = {
     outDir: 'build/types',
     target: 'ethers-v5',
   },
+  contractSizer: {
+    strict: process.env.STRICT ? true : false
+  }
 }

package.json

@@ -21,15 +21,17 @@
     "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",
     "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": "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",
-    "format": "prettier './**/*.{js,json,ts,yml,sol}' --write && yarn run lint:test --fix",
+    "format": "prettier './**/*.{js,json,md,ts,yml,sol}' --write && yarn run lint:test --fix",
     "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": "DISABLE_GAS_REPORTER=true hardhat --network hardhat test test/contract/*.spec.ts",
@@ -42,12 +44,15 @@
     "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",
+    "script:bold-prepare": "hardhat run ./scripts/prepareBoldUpgrade.ts",
+    "script:bold-populate-lookup": "hardhat run ./scripts/populateLookup.ts",
+    "script:bold-local-execute": "hardhat run ./scripts/testLocalExecuteBoldUpgrade.ts"
   },
   "dependencies": {
     "@offchainlabs/upgrade-executor": "1.1.0-beta.0",
-    "@openzeppelin/contracts": "4.5.0",
-    "@openzeppelin/contracts-upgradeable": "4.5.2",
+    "@openzeppelin/contracts": "4.7.3",
+    "@openzeppelin/contracts-upgradeable": "4.7.3",
     "patch-package": "^6.4.7",
     "solady": "0.0.182"
   },
@@ -80,6 +85,7 @@
     "hardhat-deploy": "^0.11.37",
     "hardhat-gas-reporter": "^1.0.9",
     "hardhat-ignore-warnings": "^0.2.9",
+    "hardhat-contract-sizer": "^2.10.0",
     "postinstall-postinstall": "^2.1.0",
     "prettier": "^2.5.1",
     "prettier-plugin-solidity": "^1.0.0-beta.19",