Reorganize Cast to expose the cli logic as pub

crates/cast/Cargo.toml

@@ -15,7 +15,7 @@ workspace = true
 
 [[bin]]
 name = "cast"
-path = "bin/main.rs"
+path = "src/cast.rs"
 
 [build-dependencies]
 vergen = { workspace = true, default-features = false, features = [

crates/cast/benches/vanity.rs

@@ -2,7 +2,7 @@ use criterion::{criterion_group, criterion_main, Criterion};
 use rayon::prelude::*;
 use std::{hint::black_box, time::Duration};
 
-#[path = "../bin/cmd/wallet/mod.rs"]
+#[path = "../src/cmd/wallet/mod.rs"]
 #[allow(unused)]
 mod wallet;
 use wallet::vanity::*;

crates/cast/src/cast.rs

@@ -0,0 +1,19 @@
+use cast::opts::CastArgs;
+use clap::Parser;
+use eyre::Result;
+use foundry_cli::{handler, utils};
+
+#[cfg(all(feature = "jemalloc", unix))]
+#[global_allocator]
+static ALLOC: tikv_jemallocator::Jemalloc = tikv_jemallocator::Jemalloc;
+
+#[tokio::main]
+async fn main() -> Result<()> {
+    handler::install();
+    utils::load_dotenv();
+    utils::subscriber();
+    utils::enable_paint();
+
+    let args = CastArgs::parse();
+    args.cmd.run().await
+}

crates/cast/bin/cmd/access_list.rs → crates/cast/src/cmd/access_list.rs

@@ -1,7 +1,6 @@
-use crate::tx::CastTxBuilder;
+use crate::{tx::CastTxBuilder, Cast};
 use alloy_primitives::TxKind;
 use alloy_rpc_types::BlockId;
-use cast::Cast;
 use clap::Parser;
 use eyre::Result;
 use foundry_cli::{

crates/cast/bin/cmd/call.rs → crates/cast/src/cmd/call.rs

@@ -1,7 +1,6 @@
-use crate::tx::CastTxBuilder;
+use crate::{traces::TraceKind, tx::CastTxBuilder, Cast};
 use alloy_primitives::{TxKind, U256};
 use alloy_rpc_types::{BlockId, BlockNumberOrTag};
-use cast::{traces::TraceKind, Cast};
 use clap::Parser;
 use eyre::Result;
 use foundry_cli::{

crates/cast/bin/cmd/find_block.rs → crates/cast/src/cmd/find_block.rs

@@ -1,5 +1,5 @@
+use crate::Cast;
 use alloy_provider::Provider;
-use cast::Cast;
 use clap::Parser;
 use eyre::Result;
 use foundry_cli::{opts::RpcOpts, utils};

crates/cast/bin/cmd/interface.rs → crates/cast/src/cmd/interface.rs

@@ -9,6 +9,7 @@ use foundry_common::fs;
 use foundry_config::Config;
 use itertools::Itertools;
 use std::path::{Path, PathBuf};
+use tracing::warn;
 
 /// CLI arguments for `cast interface`.
 #[derive(Clone, Debug, Parser)]

crates/cast/bin/cmd/logs.rs → crates/cast/src/cmd/logs.rs

@@ -1,9 +1,9 @@
+use crate::Cast;
 use alloy_dyn_abi::{DynSolType, DynSolValue, Specifier};
 use alloy_json_abi::Event;
 use alloy_network::AnyNetwork;
 use alloy_primitives::{hex::FromHex, Address, B256};
 use alloy_rpc_types::{BlockId, BlockNumberOrTag, Filter, FilterBlockOption, FilterSet, Topic};
-use cast::Cast;
 use clap::Parser;
 use eyre::Result;
 use foundry_cli::{opts::EthereumOpts, utils};

crates/cast/bin/cmd/rpc.rs → crates/cast/src/cmd/rpc.rs

@@ -1,4 +1,4 @@
-use cast::Cast;
+use crate::Cast;
 use clap::Parser;
 use eyre::Result;
 use foundry_cli::{opts::RpcOpts, utils};

crates/cast/bin/cmd/run.rs → crates/cast/src/cmd/run.rs

@@ -1,7 +1,7 @@
+use crate::{revm::primitives::EnvWithHandlerCfg, traces::TraceKind};
 use alloy_primitives::U256;
 use alloy_provider::Provider;
 use alloy_rpc_types::BlockTransactions;
-use cast::{revm::primitives::EnvWithHandlerCfg, traces::TraceKind};
 use clap::Parser;
 use eyre::{Result, WrapErr};
 use foundry_cli::{
@@ -16,6 +16,7 @@ use foundry_evm::{
     opts::EvmOpts,
     utils::configure_tx_env,
 };
+use tracing::trace;
 
 /// CLI arguments for `cast run`.
 #[derive(Clone, Debug, Parser)]

crates/cast/bin/cmd/send.rs → crates/cast/src/cmd/send.rs

@@ -1,11 +1,13 @@
-use crate::tx::{self, CastTxBuilder};
+use crate::{
+    tx::{self, CastTxBuilder},
+    Cast,
+};
 use alloy_network::{AnyNetwork, EthereumWallet};
 use alloy_provider::{Provider, ProviderBuilder};
 use alloy_rpc_types::TransactionRequest;
 use alloy_serde::WithOtherFields;
 use alloy_signer::Signer;
 use alloy_transport::Transport;
-use cast::Cast;
 use clap::Parser;
 use eyre::Result;
 use foundry_cli::{

crates/cast/bin/cmd/storage.rs → crates/cast/src/cmd/storage.rs

@@ -1,10 +1,9 @@
-use crate::opts::parse_slot;
+use crate::{opts::parse_slot, Cast};
 use alloy_network::AnyNetwork;
 use alloy_primitives::{Address, B256, U256};
 use alloy_provider::Provider;
 use alloy_rpc_types::BlockId;
 use alloy_transport::Transport;
-use cast::Cast;
 use clap::Parser;
 use comfy_table::{presets::ASCII_MARKDOWN, Table};
 use eyre::Result;

crates/cast/src/lib.rs

@@ -51,6 +51,10 @@ pub mod base;
 pub mod errors;
 mod rlp_converter;
 
+pub mod cmd;
+pub mod opts;
+pub mod tx;
+
 use rlp_converter::Item;
 
 // TODO: CastContract with common contract initializers? Same for CastProviders?