feat: depend on foundry-wallets and nuke much of eth-commons code

Author: 0xferrous

Cargo.lock

@@ -8,12 +8,12 @@ members = [".", "ethx-commons"]
 
 [dependencies]
 alloy-chains = "0.2"
-alloy-contract = "2.0.0-rc.0"
-alloy-network = "2.0.0-rc.0"
+alloy-contract = "2.0.0"
+alloy-network = "2.0.0"
 alloy-primitives = "1.5.7"
-alloy-provider = { version = "2.0.0-rc.0", features = ["reqwest", "ws", "ipc"] }
-alloy-rpc-types-eth = "2.0.0-rc.0"
-alloy-signer = "2.0.0-rc.0"
+alloy-provider = { version = "2.0.0", features = ["reqwest", "ws", "ipc"] }
+alloy-rpc-types-eth = "2.0.0"
+alloy-signer = "2.0.0"
 alloy-sol-types = "1.5.7"
 clap = { version = "4", features = ["derive", "env", "unicode", "wrap_help"] }
 eyre = "0.6"
@@ -25,29 +25,5 @@ thiserror = "2"
 tokio = { version = "1", features = ["macros", "rt-multi-thread"] }
 
 [dev-dependencies]
-alloy-node-bindings = { git = "https://github.com/alloy-rs/alloy", rev = "100a3325ac4d624f3eb0bd404125750e76edf8ca" }
-alloy-signer-local = { git = "https://github.com/alloy-rs/alloy", rev = "100a3325ac4d624f3eb0bd404125750e76edf8ca" }
-
-[patch.crates-io]
-alloy-consensus = { git = "https://github.com/alloy-rs/alloy", rev = "100a3325ac4d624f3eb0bd404125750e76edf8ca" }
-alloy-contract = { git = "https://github.com/alloy-rs/alloy", rev = "100a3325ac4d624f3eb0bd404125750e76edf8ca" }
-alloy-eips = { git = "https://github.com/alloy-rs/alloy", rev = "100a3325ac4d624f3eb0bd404125750e76edf8ca" }
-alloy-ens = { git = "https://github.com/alloy-rs/alloy", rev = "100a3325ac4d624f3eb0bd404125750e76edf8ca" }
-alloy-genesis = { git = "https://github.com/alloy-rs/alloy", rev = "100a3325ac4d624f3eb0bd404125750e76edf8ca" }
-alloy-json-rpc = { git = "https://github.com/alloy-rs/alloy", rev = "100a3325ac4d624f3eb0bd404125750e76edf8ca" }
-alloy-network = { git = "https://github.com/alloy-rs/alloy", rev = "100a3325ac4d624f3eb0bd404125750e76edf8ca" }
-alloy-network-primitives = { git = "https://github.com/alloy-rs/alloy", rev = "100a3325ac4d624f3eb0bd404125750e76edf8ca" }
-alloy-provider = { git = "https://github.com/alloy-rs/alloy", rev = "100a3325ac4d624f3eb0bd404125750e76edf8ca" }
-alloy-pubsub = { git = "https://github.com/alloy-rs/alloy", rev = "100a3325ac4d624f3eb0bd404125750e76edf8ca" }
-alloy-rpc-client = { git = "https://github.com/alloy-rs/alloy", rev = "100a3325ac4d624f3eb0bd404125750e76edf8ca" }
-alloy-rpc-types-eth = { git = "https://github.com/alloy-rs/alloy", rev = "100a3325ac4d624f3eb0bd404125750e76edf8ca" }
-alloy-serde = { git = "https://github.com/alloy-rs/alloy", rev = "100a3325ac4d624f3eb0bd404125750e76edf8ca" }
-alloy-signer = { git = "https://github.com/alloy-rs/alloy", rev = "100a3325ac4d624f3eb0bd404125750e76edf8ca" }
-alloy-signer-ledger = { git = "https://github.com/alloy-rs/alloy", rev = "100a3325ac4d624f3eb0bd404125750e76edf8ca" }
-alloy-signer-local = { git = "https://github.com/alloy-rs/alloy", rev = "100a3325ac4d624f3eb0bd404125750e76edf8ca" }
-alloy-signer-trezor = { git = "https://github.com/alloy-rs/alloy", rev = "100a3325ac4d624f3eb0bd404125750e76edf8ca" }
-alloy-transport = { git = "https://github.com/alloy-rs/alloy", rev = "100a3325ac4d624f3eb0bd404125750e76edf8ca" }
-alloy-transport-http = { git = "https://github.com/alloy-rs/alloy", rev = "100a3325ac4d624f3eb0bd404125750e76edf8ca" }
-alloy-transport-ipc = { git = "https://github.com/alloy-rs/alloy", rev = "100a3325ac4d624f3eb0bd404125750e76edf8ca" }
-alloy-transport-ws = { git = "https://github.com/alloy-rs/alloy", rev = "100a3325ac4d624f3eb0bd404125750e76edf8ca" }
-
+alloy-node-bindings = "2.0.0"
+alloy-signer-local = "2.0.0"

Cargo.toml

@@ -5,32 +5,23 @@ edition = "2024"
 
 [dependencies]
 alloy-chains = "0.2"
-alloy-consensus = "2.0.0-rc.0"
 alloy-dyn-abi = "1.4.1"
-alloy-eips = "2.0.0-rc.0"
-alloy-ens = { version = "2.0.0-rc.0", features = ["provider"] }
+alloy-eips = "2.0.0"
+alloy-ens = { version = "2.0.0", features = ["provider"] }
 alloy-json-abi = "1.5.7"
-alloy-network = "2.0.0-rc.0"
+alloy-network = "2.0.0"
 alloy-primitives = "1.5.7"
-alloy-provider = { version = "2.0.0-rc.0", features = ["reqwest", "ws", "ipc"] }
+alloy-provider = { version = "2.0.0", features = ["reqwest", "ws", "ipc"] }
 alloy-rlp = "0.3"
-alloy-signer = { version = "2.0.0-rc.0", features = ["eip712"] }
-alloy-signer-ledger = { version = "2.0.0-rc.0", features = ["eip712"] }
-alloy-signer-local = { version = "2.0.0-rc.0", features = ["mnemonic", "keystore"] }
-alloy-signer-trezor = "2.0.0-rc.0"
-alloy-sol-types = "1.5.7"
-async-trait = "0.1"
 clap = { version = "4", features = ["derive", "env", "unicode", "wrap_help"] }
-eth-keystore = "0.5.0"
 eyre = "0.6"
 foundry-block-explorers = "0.22"
-rpassword = "7"
+foundry-wallets = "0.1"
 futures = "0.3"
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
-thiserror = "2"
 tracing = "0.1"
 
 [dev-dependencies]
-alloy-node-bindings = { git = "https://github.com/alloy-rs/alloy", rev = "100a3325ac4d624f3eb0bd404125750e76edf8ca" }
+alloy-node-bindings = "2.0.0"
 tokio = { version = "1", features = ["macros", "rt-multi-thread"] }

ethx-commons/Cargo.toml

@@ -1,38 +1,28 @@
-//! Shared wallet and Ethereum CLI support types for `ethx`.
+//! Shared Ethereum CLI support types for `ethx`.
 //!
-//! This crate mirrors the wallet-facing API shape previously consumed from
-//! Foundry so `ethx` can migrate away incrementally while preserving its CLI.
+//! Wallet parsing and signer resolution are re-exported from `foundry-wallets`; this crate keeps
+//! the remaining `ethx`-specific ABI, RPC/explorer, and transaction option helpers in one place.
 
 /// ABI and calldata parsing helpers.
 pub mod abi;
-/// Error types for wallet parsing and signer construction.
-pub mod error;
 /// Ethereum CLI option wrappers composed from RPC, explorer, and wallet options.
 pub mod ethereum;
-/// Top-level wallet CLI options and signer resolution helpers.
-pub mod opts;
-/// Signer abstractions and signer-related helpers.
-pub mod signer;
-/// Tempo-related compatibility types.
-pub mod tempo;
 /// Transaction option types used by `ethx`.
 pub mod tx;
-/// Utility functions for wallet loading and signer creation.
+/// Small CLI parsing utilities that are not provided by `foundry-wallets`.
 pub mod utils;
-/// Raw wallet CLI options such as private keys and mnemonics.
-pub mod wallet_raw;
 
 /// ABI and calldata parsing helpers.
 pub use abi::parse_function_args;
 /// Combined Ethereum CLI options used by `ethx`.
 pub use ethereum::{EthereumOpts, EtherscanOpts, RpcOpts};
-/// Wallet CLI options and signer resolution entrypoints.
-pub use opts::WalletOpts;
+/// Tempo access-key configuration compatibility type from `foundry-wallets`.
+pub use foundry_wallets::MaybeTempoConfig as TempoAccessKeyConfig;
+/// Raw wallet CLI options used by [`WalletOpts`].
+pub use foundry_wallets::RawWalletOpts;
+/// Wallet CLI options and signer resolution entrypoints provided by `foundry-wallets`.
+pub use foundry_wallets::WalletOpts;
 /// Signers that require deferred user interaction and the resolved signer type.
-pub use signer::{PendingSigner, WalletSigner};
-/// Tempo access-key configuration placeholder used for compatibility.
-pub use tempo::TempoAccessKeyConfig;
+pub use foundry_wallets::{PendingSigner, WalletSigner};
 /// Transaction options and authorization-list helpers.
 pub use tx::{CliAuthorizationList, TransactionOpts};
-/// Raw wallet CLI options used by [`WalletOpts`].
-pub use wallet_raw::RawWalletOpts;