refactor: move abi and selectors code to common (#3343)

Author: mattsse

Cargo.lock

@@ -19,9 +19,8 @@ use ethers_core::{
 use ethers_etherscan::Client;
 use ethers_providers::{Middleware, PendingTransaction};
 use eyre::{Context, Result};
-use foundry_common::fmt::*;
+use foundry_common::{abi::encode_args, fmt::*};
 pub use foundry_evm::*;
-use foundry_utils::encode_args;
 use rustc_hex::{FromHexIter, ToHex};
 use std::{path::PathBuf, str::FromStr};
 pub use tx::TxBuilder;
@@ -1151,7 +1150,7 @@ impl SimpleCast {
     /// }
     /// ```
     pub fn abi_decode(sig: &str, calldata: &str, input: bool) -> Result<Vec<Token>> {
-        foundry_utils::abi_decode(sig, calldata, input)
+        foundry_common::abi::abi_decode(sig, calldata, input)
     }
 
     /// Performs ABI encoding based off of the function signature. Does not include

cast/src/lib.rs

@@ -7,8 +7,8 @@ use ethers_core::{
 };
 use ethers_providers::Middleware;
 use eyre::{eyre, Result, WrapErr};
+use foundry_common::abi::{encode_args, get_func, get_func_etherscan};
 use foundry_config::Chain;
-use foundry_utils::{encode_args, get_func, get_func_etherscan};
 use futures::future::join_all;
 
 use crate::strip_0x;

cast/src/tx.rs

@@ -15,15 +15,16 @@ use foundry_cli::{
     utils,
     utils::consume_config_rpc_url,
 };
-use foundry_common::{fs, try_get_http_provider};
-use foundry_config::{Chain, Config};
-use foundry_utils::{
-    format_tokens,
+use foundry_common::{
+    abi::format_tokens,
+    fs,
     selectors::{
         decode_calldata, decode_event_topic, decode_function_selector, import_selectors,
         parse_signatures, pretty_calldata, ParsedSignatures, SelectorImportData,
     },
+    try_get_http_provider,
 };
+use foundry_config::{Chain, Config};
 use rustc_hex::ToHex;
 use std::{
     io::{self, Read, Write},

cli/src/cast.rs

@@ -16,8 +16,7 @@ use ethers::{
     types::{transaction::eip2718::TypedTransaction, Chain},
 };
 use eyre::Context;
-use foundry_common::{compile, try_get_http_provider};
-use foundry_utils::parse_tokens;
+use foundry_common::{abi::parse_tokens, compile, try_get_http_provider};
 use rustc_hex::ToHex;
 use serde_json::json;
 use std::{path::PathBuf, sync::Arc};

cli/src/cmd/forge/create.rs

@@ -4,8 +4,10 @@ use crate::{
 };
 use clap::Parser;
 use ethers::prelude::artifacts::output_selection::ContractOutputSelection;
-use foundry_common::compile;
-use foundry_utils::selectors::{import_selectors, SelectorImportData};
+use foundry_common::{
+    compile,
+    selectors::{import_selectors, SelectorImportData},
+};
 
 #[derive(Debug, Clone, Parser)]
 pub struct UploadSelectorsArgs {

cli/src/cmd/forge/fourbyte.rs

@@ -28,9 +28,10 @@ use forge::{
     },
     CallKind,
 };
-use foundry_common::{evm::EvmArgs, ContractsByArtifact, CONTRACT_MAX_SIZE, SELECTOR_LEN};
+use foundry_common::{
+    abi::format_token, evm::EvmArgs, ContractsByArtifact, CONTRACT_MAX_SIZE, SELECTOR_LEN,
+};
 use foundry_config::{figment, Config};
-use foundry_utils::{encode_args, format_token};
 use serde::{Deserialize, Serialize};
 use std::{
     collections::{BTreeMap, HashMap, VecDeque},
@@ -40,7 +41,7 @@ use yansi::Paint;
 
 mod build;
 use build::{filter_sources_and_artifacts, BuildOutput};
-use foundry_common::{contracts::get_contract_name, errors::UnlinkedByteCode};
+use foundry_common::{abi::encode_args, contracts::get_contract_name, errors::UnlinkedByteCode};
 use foundry_config::figment::{
     value::{Dict, Map},
     Metadata, Profile, Provider,

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

@@ -6,8 +6,7 @@ use ethers::{
     prelude::{NameOrAddress, H256 as TxHash},
     types::transaction::eip2718::TypedTransaction,
 };
-use foundry_common::SELECTOR_LEN;
-use foundry_utils::format_token;
+use foundry_common::{abi::format_token, SELECTOR_LEN};
 
 use serde::{Deserialize, Serialize};
 use std::collections::BTreeMap;

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

@@ -19,8 +19,9 @@ use ethers::{
     },
 };
 use eyre::{eyre, Context};
+use foundry_common::abi::encode_args;
 use foundry_config::{Chain, Config, SolcReq};
-use foundry_utils::{encode_args, Retry};
+use foundry_utils::Retry;
 use futures::FutureExt;
 use once_cell::sync::Lazy;
 use regex::Regex;

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

@@ -17,6 +17,7 @@ foundry-config = { path = "../config" }
 ethers-core = { git = "https://github.com/gakonst/ethers-rs", default-features = false }
 ethers-solc = { git = "https://github.com/gakonst/ethers-rs", default-features = false }
 ethers-providers = { git = "https://github.com/gakonst/ethers-rs", default-features = false }
+ethers-etherscan = { git = "https://github.com/gakonst/ethers-rs", default-features = false }
 
 # io
 reqwest = { version = "0.11", default-features = false }
@@ -45,3 +46,6 @@ semver = "1.0.5"
 once_cell = "1.13.1"
 dunce = "1.0.2"
 regex = "1.6.0"
+
+[dev-dependencies]
+tokio = { version = "1", features = ["rt-multi-thread", "macros"] }