From d91c7697f0649bb940cb62a72b137bd8d57be118 Mon Sep 17 00:00:00 2001 From: Daniel Wang Date: Thu, 15 Feb 2024 15:13:50 +0800 Subject: [PATCH] removed --evm-version cancun from foundry --- packages/protocol/foundry.toml | 3 --- packages/protocol/genesis/generate_genesis.test.sh | 1 + packages/protocol/package.json | 8 ++++---- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/packages/protocol/foundry.toml b/packages/protocol/foundry.toml index 31cf62f3949..b0dfbfcbc14 100644 --- a/packages/protocol/foundry.toml +++ b/packages/protocol/foundry.toml @@ -12,9 +12,6 @@ ffi = true gas_limit = '18446744073709551615' memory_limit = 2073741824 -# David C: do we need to remove this as well? -evm_version = 'cancun' - # Do not change the block_gas_limit value, TaikoL2.t.sol depends on it. block_gas_limit = 80000000 #80M # For mainnet_mock tokenomics test we need a huge value to run lots of iterations. diff --git a/packages/protocol/genesis/generate_genesis.test.sh b/packages/protocol/genesis/generate_genesis.test.sh index 7a239d55696..23581247b9b 100755 --- a/packages/protocol/genesis/generate_genesis.test.sh +++ b/packages/protocol/genesis/generate_genesis.test.sh @@ -101,5 +101,6 @@ 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 index 552d105e431..20ffd5e3d98 100644 --- 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 --build-info --extra-output storage-layout", + "compile": "forge build --evm-version cancun --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 --match-path 'test/**/*.t.sol'", - "test": "forge test -vvv --match-path test/*.t.sol", + "snapshot": "forge snapshot --evm-version cancun --match-path 'test/**/*.t.sol'", + "test": "forge test -vvv --evm-version cancun --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 --match-test 'test_simulation' -vv > simulation/out/simconf_$(date +%s).txt" + "export:simconf": "forge test --evm-version cancun --match-test 'test_simulation' -vv > simulation/out/simconf_$(date +%s).txt" }, "keywords": [ "ZKP",