Merge pull request #1057 from matter-labs/upstream-39f524d

chore: Upstream 39f524d

Author: Jrigada

Cargo.lock

@@ -102,7 +102,7 @@ foundry-compilers.opt-level = 3
 serde_json.opt-level = 3
 serde.opt-level = 3
 
-solang-parser.opt-level = 3
+foundry-solang-parser.opt-level = 3
 lalrpop-util.opt-level = 3
 
 solar-ast.opt-level = 3
@@ -202,7 +202,7 @@ foundry-strategy-zksync = { path = "crates/strategy/zksync" }
 foundry-block-explorers = { version = "0.13.3", default-features = false }
 foundry-compilers = { version = "0.14.0", default-features = false }
 foundry-fork-db = "0.12"
-solang-parser = "=0.3.3"
+solang-parser = { version = "=0.3.7", package = "foundry-solang-parser" }
 solar-parse = { version = "=0.1.2", default-features = false }
 solar-sema = { version = "=0.1.2", default-features = false }
 solar-ast = { version = "=0.1.2", default-features = false }

Cargo.toml

@@ -98,9 +98,6 @@ ctrlc = { version = "3", optional = true }
 fdlimit = { version = "0.3", optional = true }
 clap_complete_fig = "4"
 
-[target.'cfg(unix)'.dependencies]
-tikv-jemallocator = { workspace = true, optional = true }
-
 [dev-dependencies]
 alloy-provider = { workspace = true, features = ["txpool-api"] }
 alloy-pubsub.workspace = true
@@ -112,7 +109,7 @@ op-alloy-rpc-types.workspace = true
 [features]
 default = ["cli", "jemalloc"]
 asm-keccak = ["alloy-primitives/asm-keccak"]
-jemalloc = ["dep:tikv-jemallocator"]
+jemalloc = ["foundry-cli/jemalloc"]
 cli = ["tokio/full", "cmd"]
 cmd = [
     "clap",

crates/anvil/Cargo.toml

@@ -2,9 +2,8 @@
 
 use anvil::args::run;
 
-#[cfg(all(feature = "jemalloc", unix))]
 #[global_allocator]
-static ALLOC: tikv_jemallocator::Jemalloc = tikv_jemallocator::Jemalloc;
+static ALLOC: foundry_cli::utils::Allocator = foundry_cli::utils::new_allocator();
 
 fn main() {
     if let Err(err) = run() {

crates/anvil/bin/main.rs

@@ -90,17 +90,14 @@ tracing.workspace = true
 yansi.workspace = true
 evmole.workspace = true
 
-[target.'cfg(unix)'.dependencies]
-tikv-jemallocator = { workspace = true, optional = true }
-
 [dev-dependencies]
 anvil.workspace = true
 foundry-test-utils.workspace = true
 
 [features]
 default = ["jemalloc"]
 asm-keccak = ["alloy-primitives/asm-keccak"]
-jemalloc = ["dep:tikv-jemallocator"]
+jemalloc = ["foundry-cli/jemalloc"]
 aws-kms = ["foundry-wallets/aws-kms", "dep:aws-sdk-kms"]
 gcp-kms = ["foundry-wallets/gcp-kms", "dep:gcloud-sdk"]
 isolate-by-default = ["foundry-config/isolate-by-default"]

crates/cast/Cargo.toml

@@ -6,9 +6,8 @@ use foundry_cli::utils;
 use foundry_common::{POSTHOG_API_KEY, TELEMETRY_CONFIG_NAME};
 use zksync_telemetry::init_telemetry;
 
-#[cfg(all(feature = "jemalloc", unix))]
 #[global_allocator]
-static ALLOC: tikv_jemallocator::Jemalloc = tikv_jemallocator::Jemalloc;
+static ALLOC: foundry_cli::utils::Allocator = foundry_cli::utils::new_allocator();
 
 fn main() {
     let _ = utils::block_on(init_telemetry(

crates/cast/bin/main.rs

@@ -454,7 +454,29 @@ impl WalletSubcommands {
                 } else {
                     wallet.sign_message(&Self::hex_str_to_bytes(&message)?).await?
                 };
-                sh_println!("0x{}", hex::encode(sig.as_bytes()))?;
+
+                if shell::verbosity() > 0 {
+                    if shell::is_json() {
+                        sh_println!(
+                            "{}",
+                            serde_json::to_string_pretty(&json!({
+                                "message": message,
+                                "address": wallet.address(),
+                                "signature": hex::encode(sig.as_bytes()),
+                            }))?
+                        )?;
+                    } else {
+                        sh_println!(
+                            "Successfully signed!\n   Message: {}\n   Address: {}\n   Signature: 0x{}",
+                            message,
+                            wallet.address(),
+                            hex::encode(sig.as_bytes()),
+                        )?;
+                    }
+                } else {
+                    // Pipe friendly output
+                    sh_println!("0x{}", hex::encode(sig.as_bytes()))?;
+                }
             }
             Self::SignAuth { rpc, nonce, chain, wallet, address } => {
                 let wallet = wallet.signer().await?;
@@ -472,7 +494,31 @@ impl WalletSubcommands {
                 let auth = Authorization { chain_id: U256::from(chain_id), address, nonce };
                 let signature = wallet.sign_hash(&auth.signature_hash()).await?;
                 let auth = auth.into_signed(signature);
-                sh_println!("{}", hex::encode_prefixed(alloy_rlp::encode(&auth)))?;
+
+                if shell::verbosity() > 0 {
+                    if shell::is_json() {
+                        sh_println!(
+                            "{}",
+                            serde_json::to_string_pretty(&json!({
+                                "nonce": nonce,
+                                "chain_id": chain_id,
+                                "address": wallet.address(),
+                                "signature": hex::encode_prefixed(alloy_rlp::encode(&auth)),
+                            }))?
+                        )?;
+                    } else {
+                        sh_println!(
+                            "Successfully signed!\n   Nonce: {}\n   Chain ID: {}\n   Address: {}\n   Signature: 0x{}",
+                            nonce,
+                            chain_id,
+                            wallet.address(),
+                            hex::encode_prefixed(alloy_rlp::encode(&auth)),
+                        )?;
+                    }
+                } else {
+                    // Pipe friendly output
+                    sh_println!("{}", hex::encode_prefixed(alloy_rlp::encode(&auth)))?;
+                }
             }
             Self::Verify { message, signature, address } => {
                 let recovered_address = Self::recover_address_from_message(&message, &signature)?;

crates/cast/src/cmd/wallet/mod.rs

@@ -370,7 +370,7 @@ impl<P: Provider<AnyNetwork>> Cast<P> {
         let block = self
             .provider
             .get_block(block)
-            .full()
+            .kind(full.into())
             .await?
             .ok_or_else(|| eyre::eyre!("block {:?} not found", block))?;
 

crates/cast/src/lib.rs

@@ -715,7 +715,7 @@ casttest!(test_zk_cast_run_with_create, async |prj, cmd| {
         output.contains(&format!(
             "Traces:
   [91] → new <unknown>@{deployed_addr}
-    └─ ← [Return] 224 bytes of code
+    └─ ← [Return] 288 bytes of code
 "
         )),
         "trace mismatch, got output:\n{output}"

crates/cast/tests/cli/zk.rs

@@ -577,7 +577,7 @@ impl Cheatcode for coolCall {
         let Self { target } = self;
         if let Some(account) = ccx.ecx.journaled_state.state.get_mut(target) {
             account.unmark_touch();
-            account.storage.clear();
+            account.storage.values_mut().for_each(|slot| slot.mark_cold());
         }
         Ok(Default::default())
     }

crates/cheatcodes/src/evm.rs

@@ -787,14 +787,23 @@ impl Cheatcodes {
         // Apply our prank
         if let Some(prank) = &self.get_prank(curr_depth) {
             if curr_depth >= prank.depth && input.caller() == prank.prank_caller {
+                let mut prank_applied = false;
                 // At the target depth we set `msg.sender`
                 if ecx_inner.journaled_state.depth() == prank.depth {
                     input.set_caller(prank.new_caller);
+                    prank_applied = true;
                 }
 
                 // At the target depth, or deeper, we set `tx.origin`
                 if let Some(new_origin) = prank.new_origin {
                     ecx_inner.env.tx.caller = new_origin;
+                    prank_applied = true;
+                }
+                // If prank applied for first time, then update
+                if prank_applied {
+                    if let Some(applied_prank) = prank.first_time_applied() {
+                        self.pranks.insert(curr_depth, applied_prank);
+                    }
                 }
             }
         }
@@ -1758,8 +1767,9 @@ impl Inspector<&mut dyn DatabaseExt> for Cheatcodes {
                 })
                 .collect::<Vec<_>>();
 
-            // Not all emits were matched.
-            if self.expected_emits.iter().any(|(expected, _)| !expected.found) {
+            // Revert if not all emits expected were matched.
+            if self.expected_emits.iter().any(|(expected, _)| !expected.found && expected.count > 0)
+            {
                 outcome.result.result = InstructionResult::Revert;
                 outcome.result.output = "log != expected log".abi_encode().into();
                 return outcome;

crates/cheatcodes/src/inspector.rs

@@ -58,13 +58,10 @@ yansi.workspace = true
 tracing.workspace = true
 walkdir.workspace = true
 
-[target.'cfg(unix)'.dependencies]
-tikv-jemallocator = { workspace = true, optional = true }
-
 [dev-dependencies]
 tracing-subscriber.workspace = true
 
 [features]
 default = ["jemalloc"]
 asm-keccak = ["alloy-primitives/asm-keccak"]
-jemalloc = ["dep:tikv-jemallocator"]
+jemalloc = ["foundry-cli/jemalloc"]

crates/chisel/Cargo.toml

@@ -2,9 +2,8 @@
 
 use chisel::args::run;
 
-#[cfg(all(feature = "jemalloc", unix))]
 #[global_allocator]
-static ALLOC: tikv_jemallocator::Jemalloc = tikv_jemallocator::Jemalloc;
+static ALLOC: foundry_cli::utils::Allocator = foundry_cli::utils::new_allocator();
 
 fn main() {
     if let Err(err) = run() {

crates/chisel/bin/main.rs

@@ -33,6 +33,7 @@ alloy-rlp.workspace = true
 alloy-chains.workspace = true
 alloy-zksync.workspace = true
 
+cfg-if = "1.0"
 clap = { version = "4", features = ["derive", "env", "unicode", "wrap_help"] }
 color-eyre.workspace = true
 dotenvy = "0.15"
@@ -60,5 +61,9 @@ foundry-zksync-compilers.workspace = true
 [dev-dependencies]
 tempfile.workspace = true
 
+[target.'cfg(unix)'.dependencies]
+tikv-jemallocator = { workspace = true, optional = true }
+
 [features]
 tracy = ["dep:tracing-tracy"]
+jemalloc = ["dep:tikv-jemallocator"]

crates/cli/Cargo.toml

@@ -0,0 +1,18 @@
+//! Abstract global allocator implementation.
+
+// If jemalloc feature is enabled on Unix systems, use jemalloc as the global allocator.
+// Otherwise, explicitly use the system allocator.
+cfg_if::cfg_if! {
+    if #[cfg(all(feature = "jemalloc", unix))] {
+        type AllocatorInner = tikv_jemallocator::Jemalloc;
+    } else {
+        type AllocatorInner = std::alloc::System;
+    }
+}
+
+pub type Allocator = AllocatorInner;
+
+/// Creates a new [allocator][Allocator].
+pub const fn new_allocator() -> Allocator {
+    AllocatorInner {}
+}

crates/cli/src/utils/allocator.rs

@@ -220,7 +220,10 @@ pub fn has_different_gas_calc(chain_id: u64) -> bool {
                     NamedChain::Moonbeam |
                     NamedChain::MoonbeamDev |
                     NamedChain::Moonriver |
-                    NamedChain::Metis
+                    NamedChain::Metis |
+                    NamedChain::Abstract |
+                    NamedChain::ZkSync |
+                    NamedChain::ZkSyncTestnet
             );
     }
     false

crates/cli/src/utils/cmd.rs

@@ -29,6 +29,9 @@ pub use suggestions::*;
 mod abi;
 pub use abi::*;
 
+mod allocator;
+pub use allocator::*;
+
 // reexport all `foundry_config::utils`
 #[doc(hidden)]
 pub use foundry_config::utils::*;

crates/cli/src/utils/mod.rs

@@ -454,6 +454,29 @@ pub fn find_target_path(project: &Project, identifier: &PathOrContractInfo) -> R
     match identifier {
         PathOrContractInfo::Path(path) => Ok(canonicalized(project.root().join(path))),
         PathOrContractInfo::ContractInfo(info) => {
+            if let Some(path) = info.path.as_ref() {
+                let path = canonicalized(project.root().join(path));
+                let sources = project.sources()?;
+                let contract_path = sources
+                    .iter()
+                    .find_map(|(src_path, _)| {
+                        if **src_path == path {
+                            return Some(src_path.clone());
+                        }
+                        None
+                    })
+                    .ok_or_else(|| {
+                        eyre::eyre!(
+                            "Could not find source file for contract `{}` at {}",
+                            info.name,
+                            path.strip_prefix(project.root()).unwrap().display()
+                        )
+                    })?;
+                return Ok(contract_path)
+            }
+            // If ContractInfo.path hasn't been provided we try to find the contract using the name.
+            // This will fail if projects have multiple contracts with the same name. In that case,
+            // path must be specified.
             let path = project.find_contract_path(&info.name)?;
             Ok(path)
         }