chore(cli): split forge, cast CLI args into separate modules (foundry-rs#5596)

* chore: separate cast and forge binaries

* chore: extract build args to cli

* chore: remove outdated comments

Author: DaniPopes

Cargo.toml

@@ -71,7 +71,7 @@ prettyplease.opt-level = 0
 lalrpop.opt-level = 0
 
 ethers-contract-abigen.opt-level = 0
-ethers-contract-abigen-derive.opt-level = 0
+ethers-contract-derive.opt-level = 0
 async-recursion.opt-level = 0
 miette-derive.opt-level = 0
 strum_macros.opt-level = 0

anvil/src/genesis.rs

@@ -224,10 +224,7 @@ pub struct CliqueConfig {
 
 pub mod secret_key {
     use ethers::{core::k256::SecretKey, signers::LocalWallet, types::Bytes};
-    use serde::{
-        de::{self},
-        Deserialize, Deserializer, Serialize, Serializer,
-    };
+    use serde::{de, Deserialize, Deserializer, Serialize, Serializer};
 
     pub fn serialize<S>(value: &Option<LocalWallet>, serializer: S) -> Result<S::Ok, S::Error>
     where

chisel/src/bin/chisel.rs

@@ -9,8 +9,8 @@ use chisel::{
 };
 use clap::Parser;
 use foundry_cli::{
-    cmd::{forge::build::BuildArgs, LoadConfig},
-    utils,
+    opts::CoreBuildArgs,
+    utils::{self, LoadConfig},
 };
 use foundry_common::evm::EvmArgs;
 use foundry_config::{
@@ -44,7 +44,7 @@ pub struct ChiselParser {
     pub sub: Option<ChiselParserSub>,
 
     #[clap(flatten)]
-    pub opts: BuildArgs,
+    pub opts: CoreBuildArgs,
 
     #[clap(flatten)]
     pub evm_opts: EvmArgs,

cli/Cargo.toml

@@ -98,12 +98,12 @@ external-integration-tests = []
 
 [[bin]]
 name = "cast"
-path = "src/cast.rs"
+path = "src/cast/main.rs"
 doc = false
 
 [[bin]]
 name = "forge"
-path = "src/forge.rs"
+path = "src/forge/main.rs"
 doc = false
 
 [[bench]]

cli/benches/cast.rs

@@ -1,8 +1,12 @@
 use criterion::{criterion_group, criterion_main, Criterion};
-use foundry_cli::cmd::cast::wallet::vanity::*;
 use rayon::prelude::*;
 use std::{hint::black_box, time::Duration};
 
+#[path = "../src/cast/cmd/wallet/mod.rs"]
+#[allow(unused)]
+mod wallet;
+use wallet::vanity::*;
+
 /// Benches `cast wallet vanity`
 ///
 /// Left or right matchers, with or without nonce do not change the outcome.

cli/src/cmd/cast/access_list.rs renamed to cli/src/cast/cmd/access_list.rs

@@ -1,15 +1,14 @@
-// cast estimate subcommands
-use crate::{
-    opts::{EthereumOpts, TransactionOpts},
-    utils::{self},
-};
 use cast::{Cast, TxBuilder};
 use clap::Parser;
 use ethers::{
     providers::Middleware,
     types::{BlockId, NameOrAddress},
 };
 use eyre::WrapErr;
+use foundry_cli::{
+    opts::{EthereumOpts, TransactionOpts},
+    utils,
+};
 use foundry_config::{Chain, Config};
 use std::str::FromStr;
 

cli/src/cmd/cast/bind.rs renamed to cli/src/cast/cmd/bind.rs

@@ -1,7 +1,7 @@
-use crate::opts::EtherscanOpts;
 use clap::{Parser, ValueHint};
 use ethers::prelude::{errors::EtherscanError, Abigen, Client, MultiAbigen};
 use eyre::Result;
+use foundry_cli::opts::EtherscanOpts;
 use foundry_config::Config;
 use std::path::{Path, PathBuf};
 

cli/src/cmd/cast/call.rs renamed to cli/src/cast/cmd/call.rs

@@ -1,9 +1,3 @@
-// cast estimate subcommands
-use crate::{
-    cmd::utils::{handle_traces, TraceResult},
-    opts::{EthereumOpts, TransactionOpts},
-    utils::{self, parse_ether_value},
-};
 use cast::{Cast, TxBuilder};
 use clap::Parser;
 use ethers::{
@@ -12,6 +6,10 @@ use ethers::{
 };
 use eyre::WrapErr;
 use forge::executor::opts::EvmOpts;
+use foundry_cli::{
+    opts::{EthereumOpts, TransactionOpts},
+    utils::{self, handle_traces, parse_ether_value, TraceResult},
+};
 use foundry_config::{find_project_root_path, Config};
 use foundry_evm::trace::TracingExecutor;
 use std::str::FromStr;

cli/src/cmd/cast/create2.rs renamed to cli/src/cast/cmd/create2.rs

@@ -1,6 +1,3 @@
-//! cast create2 subcommand
-
-use crate::cmd::Cmd;
 use cast::SimpleCast;
 use clap::Parser;
 use ethers::{
@@ -9,6 +6,7 @@ use ethers::{
     utils::{get_create2_address_from_hash, keccak256},
 };
 use eyre::{Result, WrapErr};
+use foundry_cli::utils::Cmd;
 use rayon::prelude::*;
 use regex::RegexSetBuilder;
 use std::{str::FromStr, time::Instant};

cli/src/cmd/cast/estimate.rs renamed to cli/src/cast/cmd/estimate.rs

@@ -1,12 +1,11 @@
-// cast estimate subcommands
-use crate::{
-    opts::{EtherscanOpts, RpcOpts},
-    utils::{self, parse_ether_value},
-};
 use cast::{Cast, TxBuilder};
 use clap::Parser;
 use ethers::types::{NameOrAddress, U256};
 use eyre::Result;
+use foundry_cli::{
+    opts::{EtherscanOpts, RpcOpts},
+    utils::{self, parse_ether_value},
+};
 use foundry_config::{figment::Figment, Config};
 use std::str::FromStr;