refactor: extract verify to separate crate (foundry-rs#7326)

* refactor: extract verify to separate crate

* warn unused deps

Author: klkvr

Cargo.lock

@@ -118,6 +118,7 @@ forge = { path = "crates/forge" }
 
 forge-doc = { path = "crates/doc" }
 forge-fmt = { path = "crates/fmt" }
+forge-verify = { path = "crates/verify" }
 foundry-cheatcodes = { path = "crates/cheatcodes" }
 foundry-cheatcodes-spec = { path = "crates/cheatcodes/spec" }
 foundry-cli = { path = "crates/cli" }

Cargo.toml

@@ -45,6 +45,7 @@ yansi = "0.5"
 # bin
 forge-doc.workspace = true
 forge-fmt.workspace = true
+forge-verify.workspace = true
 foundry-cli.workspace = true
 foundry-debugger.workspace = true
 

crates/forge/Cargo.toml

@@ -1,4 +1,3 @@
-use super::{retry::RetryArgs, verify};
 use alloy_dyn_abi::{DynSolValue, JsonAbiExt, ResolveSolType};
 use alloy_json_abi::{Constructor, JsonAbi};
 use alloy_primitives::{Address, Bytes};
@@ -14,6 +13,7 @@ use ethers_core::{
 use ethers_middleware::SignerMiddleware;
 use ethers_providers::Middleware;
 use eyre::{Context, Result};
+use forge_verify::RetryArgs;
 use foundry_cli::{
     opts::{CoreBuildArgs, EthereumOpts, EtherscanOpts, TransactionOpts},
     utils::{self, read_constructor_args_file, remove_contract, LoadConfig},
@@ -80,7 +80,7 @@ pub struct CreateArgs {
     eth: EthereumOpts,
 
     #[command(flatten)]
-    pub verifier: verify::VerifierArgs,
+    pub verifier: forge_verify::VerifierArgs,
 
     #[command(flatten)]
     retry: RetryArgs,
@@ -169,7 +169,7 @@ impl CreateArgs {
     ) -> Result<()> {
         // NOTE: this does not represent the same `VerifyArgs` that would be sent after deployment,
         // since we don't know the address yet.
-        let mut verify = verify::VerifyArgs {
+        let mut verify = forge_verify::VerifyArgs {
             address: Default::default(),
             contract: self.contract.clone(),
             compiler_version: None,
@@ -323,7 +323,7 @@ impl CreateArgs {
 
         let num_of_optimizations =
             if self.opts.compiler.optimize { self.opts.compiler.optimizer_runs } else { None };
-        let verify = verify::VerifyArgs {
+        let verify = forge_verify::VerifyArgs {
             address,
             contract: self.contract,
             compiler_version: None,

crates/forge/bin/cmd/create.rs

@@ -1,5 +1,6 @@
-use super::{build::BuildArgs, retry::RETRY_VERIFY_ON_CREATE, script::ScriptArgs};
+use super::{build::BuildArgs, script::ScriptArgs};
 use clap::{Parser, ValueHint};
+use forge_verify::retry::RETRY_VERIFY_ON_CREATE;
 use foundry_cli::opts::CoreBuildArgs;
 use foundry_common::evm::EvmArgs;
 use std::path::PathBuf;

crates/forge/bin/cmd/debug.rs

@@ -56,12 +56,10 @@ pub mod inspect;
 pub mod install;
 pub mod remappings;
 pub mod remove;
-pub mod retry;
 pub mod script;
 pub mod selectors;
 pub mod snapshot;
 pub mod test;
 pub mod tree;
 pub mod update;
-pub mod verify;
 pub mod watch;

crates/forge/bin/cmd/mod.rs

@@ -1,4 +1,4 @@
-use super::{build::BuildArgs, retry::RetryArgs};
+use super::build::BuildArgs;
 use alloy_dyn_abi::FunctionExt;
 use alloy_json_abi::{Function, InternalType, JsonAbi};
 use alloy_primitives::{Address, Bytes, Log, U256, U64};
@@ -17,6 +17,7 @@ use forge::{
         render_trace_arena, CallTraceDecoder, CallTraceDecoderBuilder, TraceKind, Traces,
     },
 };
+use forge_verify::RetryArgs;
 use foundry_common::{
     abi::{encode_function_args, get_func},
     errors::UnlinkedByteCode,
@@ -182,7 +183,7 @@ pub struct ScriptArgs {
     pub evm_opts: EvmArgs,
 
     #[command(flatten)]
-    pub verifier: super::verify::VerifierArgs,
+    pub verifier: forge_verify::VerifierArgs,
 
     #[command(flatten)]
     pub retry: RetryArgs,

crates/forge/bin/cmd/script/mod.rs

@@ -5,11 +5,11 @@ use crate::cmd::{
         transaction::{wrapper, AdditionalContract, TransactionWithMetadata},
         verify::VerifyBundle,
     },
-    verify::provider::VerificationProviderType,
 };
 use alloy_primitives::{Address, TxHash};
 use ethers_core::types::{transaction::eip2718::TypedTransaction, TransactionReceipt};
 use eyre::{ContextCompat, Result, WrapErr};
+use forge_verify::provider::VerificationProviderType;
 use foundry_cli::utils::now;
 use foundry_common::{
     fs, shell,

crates/forge/bin/cmd/script/sequence.rs

@@ -1,8 +1,5 @@
-use crate::cmd::{
-    retry::RetryArgs,
-    verify::{VerifierArgs, VerifyArgs},
-};
 use alloy_primitives::Address;
+use forge_verify::{RetryArgs, VerifierArgs, VerifyArgs};
 use foundry_cli::opts::{EtherscanOpts, ProjectPathsArgs};
 use foundry_common::ContractsByArtifact;
 use foundry_compilers::{info::ContractInfo, Project};

crates/forge/bin/cmd/script/verify.rs

@@ -1,25 +1,11 @@
 use crate::cmd::{
-    bind::BindArgs,
-    build::BuildArgs,
-    cache::CacheArgs,
-    config, coverage,
-    create::CreateArgs,
-    debug::DebugArgs,
-    doc::DocArgs,
-    flatten,
-    fmt::FmtArgs,
-    geiger, generate,
-    init::InitArgs,
-    inspect,
-    install::InstallArgs,
-    remappings::RemappingArgs,
-    remove::RemoveArgs,
-    script::ScriptArgs,
-    selectors::SelectorsSubcommands,
-    snapshot, test, tree, update,
-    verify::{VerifyArgs, VerifyCheckArgs},
+    bind::BindArgs, build::BuildArgs, cache::CacheArgs, config, coverage, create::CreateArgs,
+    debug::DebugArgs, doc::DocArgs, flatten, fmt::FmtArgs, geiger, generate, init::InitArgs,
+    inspect, install::InstallArgs, remappings::RemappingArgs, remove::RemoveArgs,
+    script::ScriptArgs, selectors::SelectorsSubcommands, snapshot, test, tree, update,
 };
 use clap::{Parser, Subcommand, ValueHint};
+use forge_verify::{VerifyArgs, VerifyCheckArgs};
 use std::path::PathBuf;
 
 const VERSION_MESSAGE: &str = concat!(