Skip to content

Commit acdc1d9

Browse files
authored
update compilers (#497)
* update foundry-compilers * hardcode resolc version
1 parent 07e4794 commit acdc1d9

File tree

10 files changed

+84
-74
lines changed

10 files changed

+84
-74
lines changed

.github/scripts/test-external-projects.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ echo "$PROJECTS" | jq -c '.[]' | while read -r project; do
1111
WORKING_DIR=$(echo "$project" | jq -r '.working_dir // ""')
1212
WORKING_DIRS=$(echo "$project" | jq -r '.working_dirs // ""')
1313
SETUP=$(echo "$project" | jq -r '.setup // ""')
14+
EXTRA_ARGS=$(echo "$project" | jq -r '.extraArgs // ""')
1415

1516
echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
1617
echo "Testing: $PROJECT_NAME"
@@ -40,7 +41,7 @@ echo "$PROJECTS" | jq -c '.[]' | while read -r project; do
4041
if [ -n "$WORKING_DIR" ]; then
4142
cd "$WORKING_DIR"
4243
fi
43-
forge test --polkadot 2>&1 | tee "${GITHUB_WORKSPACE}/test-output-${PROJECT_NAME}.log"
44+
forge test --polkadot $EXTRA_ARGS 2>&1 | tee "${GITHUB_WORKSPACE}/test-output-${PROJECT_NAME}.log"
4445
fi
4546

4647
cd "$GITHUB_WORKSPACE"

.github/workflows/nextest.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ concurrency:
1414
env:
1515
CARGO_TERM_COLOR: always
1616
RUST_BACKTRACE: full
17-
RESOLC_VERSION: 0.3.0
17+
RESOLC_VERSION: 0.6.0
1818
DLRP_API_KEY: ${{ secrets.DLRP_API_KEY }}
1919
ETHERSCAN_API_KEYS: ${{ secrets.ETHERSCAN_API_KEYS }}
2020
SNAPSHOTS: overwrite

.github/workflows/test-external-projects.yml

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,28 +19,33 @@ env:
1919
"name": "layerzero-protocol",
2020
"repo": "LayerZero-Labs/LayerZero-v2",
2121
"working_dir": "packages/layerzero-v2/evm/protocol",
22-
"setup": "yarn install\n(cd packages/layerzero-v2/evm/protocol && forge install)"
22+
"setup": "yarn install\n(cd packages/layerzero-v2/evm/protocol && forge install)",
23+
"extraArgs": ""
2324
},
2425
{
2526
"name": "wormhole",
2627
"repo": "wormhole-foundation/wormhole",
2728
"working_dir": "ethereum",
28-
"setup": "(cd ethereum && npm install && forge install foundry-rs/[email protected])"
29+
"setup": "(cd ethereum && make dependencies)",
30+
"extraArgs": "--no-match-test .*_KEVM"
2931
},
3032
{
3133
"name": "aave-v3",
3234
"repo": "aave-dao/aave-v3-origin",
33-
"setup": "cp .env.example .env || true\nforge install"
35+
"setup": "cp .env.example .env || true\nforge install",
36+
"extraArgs": ""
3437
},
3538
{
3639
"name": "dragonswap",
3740
"repo": "dragonswap-app/dragonswap-airdrop-and-staker",
38-
"setup": "cp .env.example .env || true"
41+
"setup": "cp .env.example .env || true",
42+
"extraArgs": ""
3943
},
4044
{
4145
"name": "morpho-blue",
4246
"repo": "morpho-org/morpho-blue",
43-
"setup": "forge install"
47+
"setup": "forge install",
48+
"extraArgs": ""
4449
}
4550
]
4651

Cargo.lock

Lines changed: 34 additions & 30 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

crates/forge/tests/cli/revive_build.rs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ use foundry_test_utils::snapbox::IntoData;
44
use semver::Version;
55

66
use crate::utils::generate_large_init_contract;
7-
pub const OTHER_RESOLC_VERSION: &str = "0.1.0-dev.13";
8-
pub const NEWEST_RESOLC_VERSION: &str = "0.1.0-dev.16";
7+
pub const OTHER_RESOLC_VERSION: &str = "0.6.0";
8+
pub const NEWEST_RESOLC_VERSION: &str = "0.6.0";
99

1010
forgetest_init!(can_build_with_resolc, |prj, cmd| {
1111
cmd.args(["build", "--resolc-compile"]).assert_success().stdout_eq(str![[r#"
@@ -49,7 +49,7 @@ Compiler run successful!
4949
╭---------------+------------------+-------------------+--------------------+---------------------╮
5050
| Contract | Runtime Size (B) | Initcode Size (B) | Runtime Margin (B) | Initcode Margin (B) |
5151
+=================================================================================================+
52-
| LargeContract | 527,706 | 527,706 | -277,706 | -277,706 |
52+
| LargeContract | 258,026 | 258,026 | -8,026 | -8,026 |
5353
╰---------------+------------------+-------------------+--------------------+---------------------╯
5454
5555
@@ -69,10 +69,10 @@ Compiler run successful!
6969
str![[r#"
7070
{
7171
"LargeContract": {
72-
"runtime_size": 527706,
73-
"init_size": 527706,
74-
"runtime_margin": -277706,
75-
"init_margin": -277706
72+
"runtime_size": 258026,
73+
"init_size": 258026,
74+
"runtime_margin": -8026,
75+
"init_margin": -8026
7676
}
7777
}
7878
"#]]
@@ -93,7 +93,7 @@ forgetest_init!(build_contracts_with_optimization, |prj, cmd| {
9393
])
9494
.assert_success()
9595
.stdout_eq(str![[r#"
96-
{"Counter":{"runtime_size":11175,"init_size":11175,"runtime_margin":238825,"init_margin":238825}}
96+
{"Counter":{"runtime_size":11267,"init_size":11267,"runtime_margin":238733,"init_margin":238733}}
9797
9898
9999
"#]]);
@@ -111,7 +111,7 @@ forgetest_init!(build_contracts_with_optimization, |prj, cmd| {
111111
])
112112
.assert_success()
113113
.stdout_eq(str![[r#"
114-
{"Counter":{"runtime_size":4994,"init_size":4994,"runtime_margin":245006,"init_margin":245006}}
114+
{"Counter":{"runtime_size":2628,"init_size":2628,"runtime_margin":247372,"init_margin":247372}}
115115
116116
117117
"#]]);

0 commit comments

Comments
 (0)