fix(cast): use new raw abi api (#3417)

foundry-rs · Sep 29, 2022 · 5c01493 · 5c01493
1 parent b25f321
commit 5c01493
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 27 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/cast/src/lib.rs b/cast/src/lib.rs
@@ -5,11 +5,10 @@
 use crate::rlp_converter::Item;
 use base::{Base, NumberWithBase, ToBase};
 use chrono::NaiveDateTime;
-use ethers_contract::RawAbi;
 use ethers_core::{
     abi::{
         token::{LenientTokenizer, Tokenizer},
-        Function, HumanReadableParser, Token,
+        Function, HumanReadableParser, RawAbi, Token,
     },
     types::{Chain, *},
     utils::{
@@ -1274,8 +1273,7 @@ impl SimpleCast {
                     .map(|item| item.contract_name.clone())
                     .collect::<Vec<String>>();
 
-                // TODO: Abi to RawAbi ?
-                let abis = source.abis().iter().cloned().map(|_| todo!()).collect();
+                let abis = source.raw_abis()?;
 
                 (abis, names)
             }

diff --git a/common/src/abi.rs b/common/src/abi.rs
@@ -267,13 +267,13 @@ pub async fn get_func_etherscan(
     let source = find_source(client, contract).await?;
     let metadata = source.items.first().wrap_err("etherscan returned empty metadata")?;
 
-    let empty = vec![];
-    let funcs = metadata.abi.functions.get(function_name).unwrap_or(&empty);
+    let mut abi = metadata.abi()?;
+    let funcs = abi.functions.remove(function_name).unwrap_or_default();
 
     for func in funcs {
-        let res = encode_args(func, args);
+        let res = encode_args(&func, args);
         if res.is_ok() {
-            return Ok(func.clone())
+            return Ok(func)
         }
     }
 

diff --git a/evm/src/trace/identifier/etherscan.rs b/evm/src/trace/identifier/etherscan.rs
@@ -127,14 +127,14 @@ impl TraceIdentifier for EtherscanIdentifier {
             let fut = fetcher
                 .map(|(address, metadata)| {
                     let label = metadata.contract_name.clone();
-                    let abi = metadata.abi.clone();
+                    let abi = metadata.abi().ok().map(Cow::Owned);
                     self.contracts.insert(address, metadata);
 
                     AddressIdentity {
                         address,
                         label: Some(label.clone()),
                         contract: Some(label),
-                        abi: Some(Cow::Owned(abi)),
+                        abi,
                         artifact_id: None,
                     }
                 })

diff --git a/utils/src/abi.rs b/utils/src/abi.rs
@@ -1,11 +1,11 @@
 //! Convert a json abi into solidity inerface
 
-use ethers_contract::{InternalStructs, RawAbi};
+use ethers_contract::InternalStructs;
 use ethers_core::{
     abi,
     abi::{
         struct_def::{FieldType, StructFieldType},
-        Contract as Abi, Event, EventParam, Function, Param, ParamType, SolStruct,
+        Contract as Abi, Event, EventParam, Function, Param, ParamType, RawAbi, SolStruct,
     },
 };
 use std::collections::BTreeMap;
@@ -339,8 +339,6 @@ fn struct_field_to_type(ty: &StructFieldType) -> String {
 mod tests {
     use super::*;
 
-    use ethers_contract::RawAbi;
-
     #[test]
     #[cfg(any(target_os = "linux", target_os = "macos"))]
     fn abi2solidity() {