Add --json to cast interface (foundry-rs#5748)

New clippy lints 🦀

Remove `cast abi` in favor of `cast interface <address> --json`

Write to file if the output location is specified

Improve

Author: clabby

crates/cast/bin/cmd/interface.rs

@@ -33,14 +33,24 @@ pub struct InterfaceArgs {
     )]
     output: Option<PathBuf>,
 
+    /// If specified, the interface will be output as JSON rather than Solidity.
+    #[clap(long, short)]
+    json: bool,
+
     #[clap(flatten)]
     etherscan: EtherscanOpts,
 }
 
 impl InterfaceArgs {
     pub async fn run(self) -> Result<()> {
-        let InterfaceArgs { path_or_address, name, pragma, output: output_location, etherscan } =
-            self;
+        let InterfaceArgs {
+            path_or_address,
+            name,
+            pragma,
+            output: output_location,
+            etherscan,
+            json,
+        } = self;
         let config = Config::from(&etherscan);
         let chain = config.chain_id.unwrap_or_default();
         let source = if Path::new(&path_or_address).exists() {
@@ -53,10 +63,17 @@ impl InterfaceArgs {
         let interfaces = SimpleCast::generate_interface(source).await?;
 
         // put it all together
-        let pragma = format!("pragma solidity {pragma};");
-        let interfaces =
-            interfaces.iter().map(|iface| iface.source.to_string()).collect::<Vec<_>>().join("\n");
-        let res = format!("{pragma}\n\n{interfaces}");
+        let res = if json {
+            interfaces.into_iter().map(|iface| iface.json_abi).collect::<Vec<_>>().join("\n")
+        } else {
+            let pragma = format!("pragma solidity {pragma};");
+            let interfaces = interfaces
+                .iter()
+                .map(|iface| iface.source.to_string())
+                .collect::<Vec<_>>()
+                .join("\n");
+            format!("{pragma}\n\n{interfaces}")
+        };
 
         // print or write to file
         if let Some(loc) = output_location {

crates/cast/src/lib.rs

@@ -820,6 +820,7 @@ where
 
 pub struct InterfaceSource {
     pub name: String,
+    pub json_abi: String,
     pub source: String,
 }
 
@@ -1535,7 +1536,11 @@ impl SimpleCast {
             .zip(contract_names)
             .map(|(contract_abi, name)| {
                 let source = foundry_utils::abi::abi_to_solidity(contract_abi, &name)?;
-                Ok(InterfaceSource { name, source })
+                Ok(InterfaceSource {
+                    name,
+                    json_abi: serde_json::to_string_pretty(contract_abi)?,
+                    source,
+                })
             })
             .collect::<Result<Vec<InterfaceSource>>>()
     }

crates/common/src/selectors.rs

@@ -224,8 +224,8 @@ impl SignEthClient {
         // filter for signatures that can be decoded
         Ok(sigs
             .iter()
-            .cloned()
             .filter(|sig| abi_decode(sig, calldata, true, true).is_ok())
+            .cloned()
             .collect::<Vec<String>>())
     }
 

crates/fmt/src/solang_ext/ast_eq.rs

@@ -22,7 +22,7 @@ fn to_num_reversed(string: &str) -> U256 {
 /// Helper to filter [ParameterList] to omit empty
 /// parameters
 fn filter_params(list: &ParameterList) -> ParameterList {
-    list.iter().cloned().filter(|(_, param)| param.is_some()).collect::<Vec<_>>()
+    list.iter().filter(|(_, param)| param.is_some()).cloned().collect::<Vec<_>>()
 }
 
 /// Check if two ParseTrees are equal ignoring location information or ordering if ordering does