update compilers

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

@@ -11,6 +11,7 @@ echo "$PROJECTS" | jq -c '.[]' | while read -r project; do
   WORKING_DIR=$(echo "$project" | jq -r '.working_dir // ""')
   WORKING_DIRS=$(echo "$project" | jq -r '.working_dirs // ""')
   SETUP=$(echo "$project" | jq -r '.setup // ""')
+  EXTRA_ARGS=$(echo "$project" | jq -r '.extraArgs // ""')
 
   echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
   echo "Testing: $PROJECT_NAME"
@@ -40,7 +41,7 @@ echo "$PROJECTS" | jq -c '.[]' | while read -r project; do
     if [ -n "$WORKING_DIR" ]; then
       cd "$WORKING_DIR"
     fi
-    forge test --polkadot 2>&1 | tee "${GITHUB_WORKSPACE}/test-output-${PROJECT_NAME}.log"
+    forge test --polkadot $EXTRA_ARGS 2>&1 | tee "${GITHUB_WORKSPACE}/test-output-${PROJECT_NAME}.log"
   fi
 
   cd "$GITHUB_WORKSPACE"

.github/workflows/nextest.yml

@@ -14,7 +14,7 @@ concurrency:
 env:
   CARGO_TERM_COLOR: always
   RUST_BACKTRACE: full
-  RESOLC_VERSION: 0.3.0
+  RESOLC_VERSION: 0.6.0
   DLRP_API_KEY: ${{ secrets.DLRP_API_KEY }}
   ETHERSCAN_API_KEYS: ${{ secrets.ETHERSCAN_API_KEYS }}
   SNAPSHOTS: overwrite

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

@@ -19,28 +19,33 @@ env:
         "name": "layerzero-protocol",
         "repo": "LayerZero-Labs/LayerZero-v2",
         "working_dir": "packages/layerzero-v2/evm/protocol",
-        "setup": "yarn install\n(cd packages/layerzero-v2/evm/protocol && forge install)"
+        "setup": "yarn install\n(cd packages/layerzero-v2/evm/protocol && forge install)",
+        "extraArgs": ""
       },
       {
         "name": "wormhole",
         "repo": "wormhole-foundation/wormhole",
         "working_dir": "ethereum",
-        "setup": "(cd ethereum && npm install && forge install foundry-rs/forge-std@v1.5.5)"
+        "setup": "(cd ethereum && make dependencies)",
+        "extraArgs": "--no-match-test .*_KEVM"
       },
       {
         "name": "aave-v3",
         "repo": "aave-dao/aave-v3-origin",
-        "setup": "cp .env.example .env || true\nforge install"
+        "setup": "cp .env.example .env || true\nforge install",
+        "extraArgs": ""
       },
       {
         "name": "dragonswap",
         "repo": "dragonswap-app/dragonswap-airdrop-and-staker",
-        "setup": "cp .env.example .env || true"
+        "setup": "cp .env.example .env || true",
+        "extraArgs": ""
       },
       {
         "name": "morpho-blue",
         "repo": "morpho-org/morpho-blue",
-        "setup": "forge install"
+        "setup": "forge install",
+        "extraArgs": ""
       }
     ]
 

crates/forge/tests/cli/revive_build.rs

@@ -4,8 +4,8 @@ use foundry_test_utils::snapbox::IntoData;
 use semver::Version;
 
 use crate::utils::generate_large_init_contract;
-pub const OTHER_RESOLC_VERSION: &str = "0.1.0-dev.13";
-pub const NEWEST_RESOLC_VERSION: &str = "0.1.0-dev.16";
+pub const OTHER_RESOLC_VERSION: &str = "0.6.0";
+pub const NEWEST_RESOLC_VERSION: &str = "0.6.0";
 
 forgetest_init!(can_build_with_resolc, |prj, cmd| {
     cmd.args(["build", "--resolc-compile"]).assert_success().stdout_eq(str![[r#"
@@ -49,7 +49,7 @@ Compiler run successful!
 ╭---------------+------------------+-------------------+--------------------+---------------------╮
 | Contract      | Runtime Size (B) | Initcode Size (B) | Runtime Margin (B) | Initcode Margin (B) |
 +=================================================================================================+
-| LargeContract | 527,706          | 527,706           | -277,706           | -277,706            |
+| LargeContract | 258,026          | 258,026           | -8,026             | -8,026              |
 ╰---------------+------------------+-------------------+--------------------+---------------------╯
 
 
@@ -69,10 +69,10 @@ Compiler run successful!
             str![[r#"
 {
   "LargeContract": {
-    "runtime_size": 527706,
-    "init_size": 527706,
-    "runtime_margin": -277706,
-    "init_margin": -277706
+    "runtime_size": 258026,
+    "init_size": 258026,
+    "runtime_margin": -8026,
+    "init_margin": -8026
   }
 }
 "#]]
@@ -93,7 +93,7 @@ forgetest_init!(build_contracts_with_optimization, |prj, cmd| {
     ])
     .assert_success()
     .stdout_eq(str![[r#"
-{"Counter":{"runtime_size":11175,"init_size":11175,"runtime_margin":238825,"init_margin":238825}}
+{"Counter":{"runtime_size":11267,"init_size":11267,"runtime_margin":238733,"init_margin":238733}}
 
 
 "#]]);
@@ -111,7 +111,7 @@ forgetest_init!(build_contracts_with_optimization, |prj, cmd| {
         ])
         .assert_success()
         .stdout_eq(str![[r#"
-{"Counter":{"runtime_size":4994,"init_size":4994,"runtime_margin":245006,"init_margin":245006}}
+{"Counter":{"runtime_size":2628,"init_size":2628,"runtime_margin":247372,"init_margin":247372}}
 
 
 "#]]);