Merge branch 'main' into upstream-5e72c69

Author: MBerguer

.github/scripts/matrices.py

@@ -116,7 +116,8 @@ def main():
                     os_str = f" ({target.target})"
 
                 name = case.name
-                flags = f"-E '{case.filter}'"
+                # NOTE(zk): filter out zk tests from upstream ci runs
+                flags = f"-E '{case.filter} & not (test(~zk) or test(~test_zk_aave_di) or package(~zksync))'"
                 if case.n_partitions > 1:
                     s = f"{partition}/{case.n_partitions}"
                     name += f" ({s})"

.github/workflows/nextest.yml

@@ -83,4 +83,4 @@ jobs:
           SVM_TARGET_PLATFORM: ${{ matrix.svm_target_platform }}
           HTTP_ARCHIVE_URLS: ${{ secrets.HTTP_ARCHIVE_URLS }}
           WS_ARCHIVE_URLS: ${{ secrets.WS_ARCHIVE_URLS }}
-        run: cargo nextest run ${{ matrix.flags }} --filter-expr 'not (test(~zk) or test(~test_zk_aave_di))'
+        run: cargo nextest run ${{ matrix.flags }}

.github/workflows/release.yml

@@ -88,7 +88,6 @@ jobs:
         uses: mikepenz/release-changelog-builder-action@v4
         with:
           configuration: "./.github/changelog.json"
-          fromTag: ${{ env.IS_NIGHTLY == 'true' && 'nightly' || '' }}
           fromTag: 'nightly'
           toTag: ${{ steps.release_info.outputs.tag_name }}
         env:

.github/workflows/test.yml

@@ -140,7 +140,7 @@ jobs:
           RUST_BACKTRACE: full
           TEST_MAINNET_URL: http://localhost:8011
         run: |
-          ZK_DEBUG_HISTORICAL_BLOCK_HASHES=5 cargo nextest run --package '*' --lib --test '*' --filter-expr 'test(~zk) and not test(~test_zk_aave_di)'
+          ZK_DEBUG_HISTORICAL_BLOCK_HASHES=5 cargo nextest run --package '*' --lib --test '*' -E '(test(~zk) or package(~zksync)) and not test(~test_zk_aave_di)'
 
   deny:
     uses: ithacaxyz/ci/.github/workflows/deny.yml@main

Cargo.lock

@@ -254,7 +254,7 @@ zksync_vm_interface = { git = "https://github.com/matter-labs/zksync-era.git", r
 zksync_multivm = { git = "https://github.com/matter-labs/zksync-era.git", rev = "core-v25.4.0" }
 zksync_utils = { git = "https://github.com/matter-labs/zksync-era.git", rev = "core-v25.4.0" }
 zksync_contracts = { git = "https://github.com/matter-labs/zksync-era.git", rev = "core-v25.4.0" }
-era-solc = { git = "https://github.com/matter-labs/era-compiler-solidity.git", tag = "1.5.10", package = "era-solc" }
+era-solc = { git = "https://github.com/matter-labs/era-compiler-solidity.git", tag = "1.5.11", package = "era-solc" }
 
 # macros
 proc-macro2 = "1.0"

Cargo.toml

@@ -176,7 +176,7 @@ pub fn config_zksolc_compiler(config: &Config) -> Result<ZkSolcCompiler, SolcErr
     {
         zksolc
     } else if !config.offline {
-        let default_version = semver::Version::new(1, 5, 10);
+        let default_version = semver::Version::new(1, 5, 11);
         let mut zksolc = ZkSolc::find_installed_version(&default_version)?;
         if zksolc.is_none() {
             ZkSolc::blocking_install(&default_version)?;

crates/config/src/zksync.rs

@@ -201,7 +201,7 @@ impl ForgeTestProfile {
         zk_config.zksync.startup = true;
         zk_config.zksync.fallback_oz = true;
         zk_config.zksync.optimizer_mode = '3';
-        zk_config.zksync.zksolc = Some(foundry_config::SolcReq::Version(Version::new(1, 5, 10)));
+        zk_config.zksync.zksolc = Some(foundry_config::SolcReq::Version(Version::new(1, 5, 11)));
         zk_config.fuzz.no_zksync_reserved_addresses = true;
         zk_config.invariant.depth = 15;
 

crates/forge/tests/it/test_helpers.rs

@@ -40,7 +40,7 @@ pub const ZKSOLC: &str = "zksolc";
 /// ZKsync solc release used for all ZKsync solc versions
 pub const ZKSYNC_SOLC_RELEASE: Version = Version::new(1, 0, 1);
 /// Default zksolc version
-pub const ZKSOLC_VERSION: Version = Version::new(1, 5, 10);
+pub const ZKSOLC_VERSION: Version = Version::new(1, 5, 11);
 
 #[cfg(test)]
 macro_rules! take_solc_installer_lock {