dep: solang parser 0.2.2 (#4328)

Cargo.toml

@@ -70,4 +70,4 @@ codegen-units = 1
 # ethers-solc = { path = "../ethers-rs/ethers-solc" }
 
 # [patch.crates-io]
-# revm = { path = "../revm/crates/revm" }
+# revm = { path = "../revm/crates/revm" }

anvil/tests/it/ganache.rs

@@ -3,7 +3,7 @@
 use crate::init_tracing;
 use ethers::{
     abi::Address,
-    contract::{Contract, ContractFactory},
+    contract::{Contract, ContractFactory, ContractInstance},
     core::k256::SecretKey,
     prelude::{abigen, Middleware, Signer, SignerMiddleware, TransactionRequest, Ws},
     providers::{Http, Provider},
@@ -159,7 +159,7 @@ contract Contract {
         Provider::<Http>::try_from("http://127.0.0.1:8545").unwrap(),
         ganache_wallet2(),
     );
-    let contract = Contract::new(contract.address(), abi.unwrap(), provider);
+    let contract = ContractInstance::new(contract.address(), abi.unwrap(), provider);
     let resp = contract.method::<_, U256>("getSecret", ()).unwrap().legacy().call().await;
     resp.unwrap_err();
 

anvil/tests/it/revert.rs

@@ -1,6 +1,6 @@
 use anvil::{spawn, NodeConfig};
 use ethers::{
-    contract::{Contract, ContractFactory},
+    contract::{ContractFactory, ContractInstance},
     middleware::SignerMiddleware,
     types::U256,
     utils::WEI_IN_ETHER,
@@ -82,7 +82,7 @@ contract Contract {
     let factory = ContractFactory::new(abi.clone().unwrap(), bytecode.unwrap(), client);
     let contract = factory.deploy(()).unwrap().send().await.unwrap();
 
-    let contract = Contract::new(
+    let contract = ContractInstance::new(
         contract.address(),
         abi.unwrap(),
         SignerMiddleware::new(handle.http_provider(), wallets[1].clone()),
@@ -139,7 +139,7 @@ async fn test_solc_revert_example() {
     let factory = ContractFactory::new(abi.clone().unwrap(), bytecode.unwrap(), client);
     let contract = factory.deploy(()).unwrap().send().await.unwrap();
 
-    let contract = Contract::new(
+    let contract = ContractInstance::new(
         contract.address(),
         abi.unwrap(),
         SignerMiddleware::new(handle.http_provider(), wallets[1].clone()),
@@ -193,7 +193,7 @@ contract Contract {
     let factory = ContractFactory::new(abi.clone().unwrap(), bytecode.unwrap(), client);
     let contract = factory.deploy(()).unwrap().send().await.unwrap();
 
-    let contract = Contract::new(
+    let contract = ContractInstance::new(
         contract.address(),
         abi.unwrap(),
         SignerMiddleware::new(handle.http_provider(), wallets[1].clone()),

anvil/tests/it/traces.rs

@@ -1,7 +1,7 @@
 use crate::fork::fork_config;
 use anvil::{spawn, NodeConfig};
 use ethers::{
-    contract::Contract,
+    contract::ContractInstance,
     prelude::{
         Action, ContractFactory, GethTrace, GethTraceFrame, Middleware, Signer, SignerMiddleware,
         TransactionRequest,
@@ -80,7 +80,7 @@ contract Contract {
     let factory = ContractFactory::new(abi.clone().unwrap(), bytecode.unwrap(), client);
     let contract = factory.deploy(()).unwrap().send().await.unwrap();
 
-    let contract = Contract::new(
+    let contract = ContractInstance::new(
         contract.address(),
         abi.unwrap(),
         SignerMiddleware::new(handle.http_provider(), wallets[1].clone()),
@@ -127,7 +127,7 @@ contract Contract {
     let factory = ContractFactory::new(abi.clone().unwrap(), bytecode.unwrap(), client);
     let contract = factory.deploy(()).unwrap().send().await.unwrap();
 
-    let contract = Contract::new(
+    let contract = ContractInstance::new(
         contract.address(),
         abi.unwrap(),
         SignerMiddleware::new(handle.http_provider(), wallets[1].clone()),
@@ -144,7 +144,7 @@ contract Contract {
             GethTraceFrame::Default(traces) => {
                 assert!(!traces.failed);
             }
-            GethTraceFrame::CallTracer(_) => {
+            _ => {
                 unreachable!()
             }
         },

chisel/Cargo.toml

@@ -40,7 +40,7 @@ reqwest = { version = "0.11", default-features = false, features = ["rustls"] }
 # misc
 clap = { version = "4.0", features = ["derive", "env", "wrap_help"] }
 rustyline = "10.0.0"
-solang-parser = "=0.2.1"
+solang-parser = "=0.2.2"
 yansi = "0.5.1"
 strum = { version = "0.24.1", features = ["derive"] }
 serde = "1.0.145"

chisel/src/executor.rs

@@ -597,7 +597,7 @@ impl Type {
             pt::Type::Uint(size) => Self::Builtin(ParamType::Uint(*size as usize)),
             pt::Type::Bytes(size) => Self::Builtin(ParamType::FixedBytes(*size as usize)),
             pt::Type::DynamicBytes => Self::Builtin(ParamType::Bytes),
-            pt::Type::Mapping(_, _, right) => Self::from_expression(right)?,
+            pt::Type::Mapping { value, .. } => Self::from_expression(value)?,
             pt::Type::Function { params, returns, .. } => {
                 let params = map_parameters(params);
                 let returns = returns

chisel/src/session_source.rs

@@ -245,8 +245,8 @@ impl SessionSource {
     /// source.
     pub fn compiler_input(&self) -> CompilerInput {
         let mut sources = Sources::new();
-        sources.insert(PathBuf::from("forge-std/Vm.sol"), Source { content: VM_SOURCE.to_owned() });
-        sources.insert(self.file_name.clone(), Source { content: self.to_repl_source() });
+        sources.insert(PathBuf::from("forge-std/Vm.sol"), Source::new(VM_SOURCE.to_owned()));
+        sources.insert(self.file_name.clone(), Source::new(self.to_repl_source()));
         CompilerInput::with_sources(sources).pop().unwrap()
     }
 

cli/Cargo.toml

@@ -23,7 +23,7 @@ ui = { path = "../ui" }
 
 # eth
 ethers = { git = "https://github.com/gakonst/ethers-rs", default-features = false, features = ["rustls"] }
-solang-parser = "=0.2.1"
+solang-parser = "=0.2.2"
 
 # cli
 clap = { version = "4.0", features = ["derive", "env", "unicode", "wrap_help"] }

cli/src/cmd/forge/script/build.rs

@@ -285,7 +285,7 @@ pub fn filter_sources_and_artifacts(
             }
 
             if !is_standalone {
-                target_tree.get(&resolved).map(|source| (id, source.content.clone()))
+                target_tree.get(&resolved).map(|source| (id, source.content.as_str().to_string()))
             } else {
                 Some((
                     id,

cli/src/cmd/forge/verify/etherscan/flatten.rs

@@ -74,7 +74,7 @@ impl EtherscanFlattenedSource {
 
         let input = CompilerInput {
             language: "Solidity".to_string(),
-            sources: BTreeMap::from([("contract.sol".into(), Source { content: content.into() })]),
+            sources: BTreeMap::from([("contract.sol".into(), Source::new(content))]),
             settings: Default::default(),
         };
 

config/src/lib.rs

@@ -3846,7 +3846,8 @@ mod tests {
                         ModelCheckerTarget::Assert,
                         ModelCheckerTarget::OutOfBounds
                     ]),
-                    timeout: Some(10000)
+                    timeout: Some(10000),
+                    invariants: None,
                 })
             );
 
@@ -3902,7 +3903,8 @@ mod tests {
                         ModelCheckerTarget::Assert,
                         ModelCheckerTarget::OutOfBounds
                     ]),
-                    timeout: Some(10000)
+                    timeout: Some(10000),
+                    invariants: None,
                 })
             );
 

doc/Cargo.toml

@@ -37,7 +37,7 @@ tokio = { version = "1", features = ["macros", "rt-multi-thread"] }
 futures-util = "0.3.4"
 
 # misc
-solang-parser = "=0.2.1"
+solang-parser = "=0.2.2"
 eyre = "0.6"
 thiserror = "1.0.30"
 rayon = "1.5.1"

doc/src/writer/as_string.rs

@@ -25,8 +25,18 @@ impl AsString for Expression {
                 Type::DynamicBytes => "bytes".to_owned(),
                 Type::Int(n) => format!("int{n}"),
                 Type::Uint(n) => format!("uint{n}"),
-                Type::Mapping(_, from, to) => {
-                    format!("mapping({} => {})", from.as_string(), to.as_string())
+                Type::Mapping { key, key_name, value, value_name, .. } => {
+                    let mut key = key.as_string();
+                    if let Some(name) = key_name {
+                        key.push(' ');
+                        key.push_str(&name.to_string());
+                    }
+                    let mut value = value.as_string();
+                    if let Some(name) = value_name {
+                        value.push(' ');
+                        value.push_str(&name.to_string());
+                    }
+                    format!("mapping({key} => {value})")
                 }
                 Type::Function { params, attributes, returns } => {
                     let params = params.as_string();

fmt/Cargo.toml

@@ -16,7 +16,7 @@ foundry-config = { path = "../config" }
 ethers-core = { git = "https://github.com/gakonst/ethers-rs", default-features = false }
 
 # parser
-solang-parser = "=0.2.1"
+solang-parser = "=0.2.2"
 
 # misc
 semver = "1.0.4"

fmt/src/chunk.rs

@@ -27,6 +27,7 @@ impl From<&str> for Chunk {
 pub struct SurroundingChunk {
     pub before: Option<usize>,
     pub next: Option<usize>,
+    pub spaced: Option<bool>,
     pub content: String,
 }
 
@@ -36,14 +37,24 @@ impl SurroundingChunk {
         before: Option<usize>,
         next: Option<usize>,
     ) -> Self {
-        SurroundingChunk { before, next, content: format!("{content}") }
+        SurroundingChunk { before, next, content: format!("{content}"), spaced: None }
+    }
+
+    pub fn spaced(mut self) -> Self {
+        self.spaced = Some(true);
+        self
+    }
+
+    pub fn non_spaced(mut self) -> Self {
+        self.spaced = Some(false);
+        self
     }
 
     pub fn loc_before(&self) -> usize {
         self.before.unwrap_or_default()
     }
 
-    pub fn loc_next(&self) -> usize {
-        self.next.unwrap_or_default()
+    pub fn loc_next(&self) -> Option<usize> {
+        self.next
     }
 }