Merge remote-tracking branch 'origin/reentrance' into reentrance

taikoxyz · Feb 15, 2024 · bc50c15 · bc50c15
2 parents 2094cfe + 2765afe
commit bc50c15
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/packages/protocol/foundry.toml b/packages/protocol/foundry.toml
@@ -11,6 +11,7 @@ optimizer_runs = 200
 ffi = true
 gas_limit = '18446744073709551615'
 memory_limit = 2073741824
+evm_version = 'cancun'
 
 # Do not change the block_gas_limit value, TaikoL2.t.sol depends on it.
 block_gas_limit = 80000000 #80M

diff --git a/packages/protocol/genesis/generate_genesis.test.sh b/packages/protocol/genesis/generate_genesis.test.sh
@@ -101,6 +101,5 @@ forge test \
   --fork-url http://localhost:18545 \
   --fork-retry-backoff 120 \
   --no-storage-caching \
-  --evm-version cancun \
   --match-path genesis/*.g.sol \
   --block-gas-limit 1000000000
diff --git a/packages/protocol/package.json b/packages/protocol/package.json
@@ -5,18 +5,18 @@
   "scripts": {
     "buildMerkle": "ts-node ./utils/airdrop/buildMerkleTree.ts ./utils/airdrop/airdrop_db/example_claimList.json",
     "clean": "rm -rf abis cache* && forge clean",
-    "compile": "forge build --evm-version cancun --build-info --extra-output storage-layout",
+    "compile": "forge build --build-info --extra-output storage-layout",
     "test:deploy": "./script/download_solc.sh && ./script/test_deploy_on_l1.sh",
     "eslint": "pnpm exec eslint --ignore-path .eslintignore --ext .js,.ts .",
     "eslint:fix": "pnpm exec eslint --ignore-path .eslintignore --ext .js,.ts . --fix",
     "fmt:sol": "forge fmt",
     "generate:genesis": "ts-node ./utils/generate_genesis/main.ts",
     "lint:sol": "forge fmt && pnpm solhint 'contracts/**/*.sol' --fix",
-    "snapshot": "forge snapshot --evm-version cancun --match-path 'test/**/*.t.sol'",
-    "test": "forge test -vvv --evm-version cancun --match-path test/*.t.sol",
+    "snapshot": "forge snapshot --match-path 'test/**/*.t.sol'",
+    "test": "forge test -vvv --match-path test/*.t.sol",
     "test:coverage": "mkdir -p coverage && forge coverage --report lcov && lcov --remove ./lcov.info -o ./coverage/lcov.info 'test/' 'script/' 'contracts/thirdparty/' && genhtml coverage/lcov.info --branch-coverage --output-dir coverage --ignore-errors category && open coverage/index.html",
     "test:genesis": "pnpm compile && FOUNDRY_PROFILE=genesis ./genesis/generate_genesis.test.sh",
-    "export:simconf": "forge test --evm-version cancun --match-test 'test_simulation' -vv > simulation/out/simconf_$(date +%s).txt"
+    "export:simconf": "forge test --match-test 'test_simulation' -vv > simulation/out/simconf_$(date +%s).txt"
   },
   "keywords": [
     "ZKP",

diff --git a/packages/protocol/script/test_deploy_on_l1.sh b/packages/protocol/script/test_deploy_on_l1.sh
@@ -22,6 +22,5 @@ forge script script/DeployOnL1.s.sol:DeployOnL1 \
     --broadcast \
     --ffi \
     -vvvv \
-    --evm-version cancun \
     --private-key 0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80 \
     --block-gas-limit 100000000