From c6b5da9bb9ac2114c50d5d712bdb48dc7fc2d92b Mon Sep 17 00:00:00 2001 From: d1onys1us <13951458+d1onys1us@users.noreply.github.com> Date: Mon, 12 Feb 2024 17:59:09 -0500 Subject: [PATCH 1/3] fix(protocol): set evm_version to cancun as default --- packages/protocol/foundry.toml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/protocol/foundry.toml b/packages/protocol/foundry.toml index 2f5082ea097..be1451b6ed6 100644 --- a/packages/protocol/foundry.toml +++ b/packages/protocol/foundry.toml @@ -5,12 +5,13 @@ src = 'contracts' out = 'out' test = 'test' libs = ['lib'] -gas_price = 10000000000 # gas price is 10 Gwei +gas_price = 10000000000 # gas price is 10 Gwei optimizer = true 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 From fb2eee443250d7e56aa2f73c23326689d6684ef6 Mon Sep 17 00:00:00 2001 From: d1onys1us <13951458+d1onys1us@users.noreply.github.com> Date: Mon, 12 Feb 2024 17:59:41 -0500 Subject: [PATCH 2/3] fix(protocol): set evm_version to cancun as default --- packages/protocol/foundry.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/protocol/foundry.toml b/packages/protocol/foundry.toml index be1451b6ed6..c32dc2be278 100644 --- a/packages/protocol/foundry.toml +++ b/packages/protocol/foundry.toml @@ -5,7 +5,7 @@ src = 'contracts' out = 'out' test = 'test' libs = ['lib'] -gas_price = 10000000000 # gas price is 10 Gwei +gas_price = 10000000000 # gas price is 10 Gwei optimizer = true optimizer_runs = 200 ffi = true From 21b5a0259ecd6a8c348d6db20f3860301478fed7 Mon Sep 17 00:00:00 2001 From: Daniel Wang Date: Tue, 13 Feb 2024 09:25:43 +0800 Subject: [PATCH 3/3] additional changes relatd to `--evm-version cancun` --- .github/workflows/protocol.yml | 2 +- packages/protocol/README.md | 2 +- packages/protocol/genesis/generate_genesis.test.sh | 1 - packages/protocol/package.json | 10 +++++----- packages/protocol/script/test_deploy_on_l1.sh | 3 +-- 5 files changed, 8 insertions(+), 10 deletions(-) diff --git a/.github/workflows/protocol.yml b/.github/workflows/protocol.yml index 7add028e744..def550b14b1 100644 --- a/.github/workflows/protocol.yml +++ b/.github/workflows/protocol.yml @@ -53,7 +53,7 @@ jobs: while ! nc -z localhost 8545; do sleep 1 done - pnpm deploy:foundry + pnpm test:deploy # - name: protocol - Upload coverage to Codecov # uses: codecov/codecov-action@v3 diff --git a/packages/protocol/README.md b/packages/protocol/README.md index 2037a682d10..b4042c08bd0 100644 --- a/packages/protocol/README.md +++ b/packages/protocol/README.md @@ -126,7 +126,7 @@ pnpm hardhat node 4. **Deploy Contracts Using Foundry:** Once your network is running, open a new terminal window and execute the deployment scripts using Foundry: ```sh -pnpm deploy:foundry +pnpm test:deploy ``` This command will deploy the L1 contracts using the settings and addresses you’ve provided in the `test_deploy_on_l1.sh` script. diff --git a/packages/protocol/genesis/generate_genesis.test.sh b/packages/protocol/genesis/generate_genesis.test.sh index 23581247b9b..7a239d55696 100755 --- 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 index fd7e9fabb42..0aad6804162 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 --evm-version cancun --build-info --extra-output storage-layout", - "deploy:foundry": "./script/download_solc.sh && ./script/test_deploy_on_l1.sh", + "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 index 733a2547755..e371b2e3207 100755 --- a/packages/protocol/script/test_deploy_on_l1.sh +++ b/packages/protocol/script/test_deploy_on_l1.sh @@ -1,6 +1,6 @@ #!/bin/sh -# This script is only used by `pnpm deploy:foundry`. +# This script is only used by `pnpm test:deploy`. set -e PRIVATE_KEY=0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80 \ @@ -21,7 +21,6 @@ forge script script/DeployOnL1.s.sol:DeployOnL1 \ --fork-url http://localhost:8545 \ --broadcast \ --ffi \ - --evm-version cancun \ -vvvv \ --private-key 0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80 \ --block-gas-limit 100000000