anza-xyz · t-nelson · May 23, 2025 · May 23, 2025 · May 23, 2025
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -53,7 +53,8 @@ members = [
     "dos",
     "download-utils",
     "entry",
-    "faucet",
+    "faucet-bin",
+    "faucet-interface",
     "feature-set",
     "fee",
     "genesis",
@@ -434,7 +435,7 @@ solana-epoch-rewards = "2.2.1"
 solana-epoch-rewards-hasher = "2.2.1"
 solana-epoch-schedule = "2.2.1"
 solana-example-mocks = "2.2.1"
-solana-faucet = { path = "faucet", version = "=2.3.0" }
+solana-faucet-interface = { path = "faucet-interface", version = "=2.3.0" }
 solana-feature-gate-client = "0.0.2"
 solana-feature-gate-interface = "2.2.2"
 solana-fee-calculator = "2.2.1"

diff --git a/accounts-cluster-bench/Cargo.toml b/accounts-cluster-bench/Cargo.toml
@@ -44,7 +44,7 @@ spl-token = { workspace = true, features = ["no-entrypoint"] }
 [dev-dependencies]
 solana-accounts-db = { workspace = true }
 solana-core = { workspace = true, features = ["dev-context-only-utils"] }
-solana-faucet = { workspace = true }
+solana-faucet-interface = { workspace = true }
 solana-local-cluster = { workspace = true }
 solana-native-token = { workspace = true }
 solana-poh-config = { workspace = true }

diff --git a/accounts-cluster-bench/src/main.rs b/accounts-cluster-bench/src/main.rs
@@ -1410,7 +1410,7 @@ pub mod test {
             accounts_index::{AccountIndex, AccountSecondaryIndexes},
         },
         solana_core::validator::ValidatorConfig,
-        solana_faucet::faucet::run_local_faucet,
+        solana_faucet_interface::faucet::run_local_faucet,
         solana_local_cluster::{
             local_cluster::{ClusterConfig, LocalCluster},
             validator_configs::make_identical_validator_configs,

diff --git a/bench-tps/Cargo.toml b/bench-tps/Cargo.toml
@@ -29,7 +29,7 @@ solana-commitment-config = { workspace = true }
 solana-compute-budget-interface = { workspace = true }
 solana-connection-cache = { workspace = true }
 solana-core = { workspace = true, features = ["dev-context-only-utils"] }
-solana-faucet = { workspace = true }
+solana-faucet-interface = { workspace = true }
 solana-fee-calculator = { workspace = true }
 solana-genesis = { workspace = true }
 solana-genesis-config = { workspace = true }

diff --git a/bench-tps/tests/bench_tps.rs b/bench-tps/tests/bench_tps.rs
@@ -11,7 +11,7 @@ use {
     solana_commitment_config::CommitmentConfig,
     solana_connection_cache::connection_cache::NewConnectionConfig,
     solana_core::validator::ValidatorConfig,
-    solana_faucet::faucet::run_local_faucet,
+    solana_faucet_interface::faucet::run_local_faucet,
     solana_fee_calculator::FeeRateGovernor,
     solana_keypair::Keypair,
     solana_local_cluster::{

diff --git a/cli/Cargo.toml b/cli/Cargo.toml
@@ -94,7 +94,7 @@ tiny-bip39 = { workspace = true }
 
 [dev-dependencies]
 assert_matches = { workspace = true }
-solana-faucet = { workspace = true }
+solana-faucet-interface = { workspace = true }
 solana-nonce-account = { workspace = true }
 solana-presigner = { workspace = true }
 solana-rpc = { workspace = true }

diff --git a/cli/tests/address_lookup_table.rs b/cli/tests/address_lookup_table.rs
@@ -7,7 +7,7 @@ use {
         cli::{process_command, CliCommand, CliConfig},
     },
     solana_cli_output::{CliAddressLookupTable, CliAddressLookupTableCreated, OutputFormat},
-    solana_faucet::faucet::run_local_faucet,
+    solana_faucet_interface::faucet::run_local_faucet,
     solana_keypair::Keypair,
     solana_native_token::LAMPORTS_PER_SOL,
     solana_pubkey::Pubkey,

diff --git a/cli/tests/cluster_query.rs b/cli/tests/cluster_query.rs
@@ -5,7 +5,7 @@ use {
         test_utils::check_ready,
     },
     solana_commitment_config::CommitmentConfig,
-    solana_faucet::faucet::run_local_faucet,
+    solana_faucet_interface::faucet::run_local_faucet,
     solana_fee_structure::FeeStructure,
     solana_keypair::Keypair,
     solana_native_token::sol_to_lamports,

diff --git a/cli/tests/nonce.rs b/cli/tests/nonce.rs
@@ -8,7 +8,7 @@ use {
     },
     solana_cli_output::{parse_sign_only_reply_string, OutputFormat},
     solana_commitment_config::CommitmentConfig,
-    solana_faucet::faucet::run_local_faucet,
+    solana_faucet_interface::faucet::run_local_faucet,
     solana_hash::Hash,
     solana_keypair::{keypair_from_seed, Keypair},
     solana_native_token::sol_to_lamports,

diff --git a/cli/tests/program.rs b/cli/tests/program.rs
@@ -18,7 +18,7 @@ use {
     solana_client::rpc_config::RpcSendTransactionConfig,
     solana_commitment_config::CommitmentConfig,
     solana_compute_budget_interface::ComputeBudgetInstruction,
-    solana_faucet::faucet::run_local_faucet,
+    solana_faucet_interface::faucet::run_local_faucet,
     solana_fee_calculator::FeeRateGovernor,
     solana_keypair::Keypair,
     solana_loader_v3_interface::state::UpgradeableLoaderState,

diff --git a/cli/tests/request_airdrop.rs b/cli/tests/request_airdrop.rs
@@ -2,7 +2,7 @@
 use {
     solana_cli::cli::{process_command, CliCommand, CliConfig},
     solana_commitment_config::CommitmentConfig,
-    solana_faucet::faucet::run_local_faucet,
+    solana_faucet_interface::faucet::run_local_faucet,
     solana_keypair::Keypair,
     solana_native_token::sol_to_lamports,
     solana_rpc_client::rpc_client::RpcClient,

diff --git a/cli/tests/stake.rs b/cli/tests/stake.rs
@@ -12,7 +12,7 @@ use {
     solana_cli_output::{parse_sign_only_reply_string, OutputFormat},
     solana_commitment_config::CommitmentConfig,
     solana_epoch_schedule::EpochSchedule,
-    solana_faucet::faucet::run_local_faucet,
+    solana_faucet_interface::faucet::run_local_faucet,
     solana_fee_calculator::FeeRateGovernor,
     solana_fee_structure::FeeStructure,
     solana_keypair::{keypair_from_seed, Keypair},

diff --git a/cli/tests/transfer.rs b/cli/tests/transfer.rs
@@ -9,7 +9,7 @@ use {
     solana_cli_output::{parse_sign_only_reply_string, OutputFormat},
     solana_commitment_config::CommitmentConfig,
     solana_compute_budget_interface::ComputeBudgetInstruction,
-    solana_faucet::faucet::run_local_faucet,
+    solana_faucet_interface::faucet::run_local_faucet,
     solana_fee_structure::FeeStructure,
     solana_keypair::{keypair_from_seed, Keypair},
     solana_message::Message,

diff --git a/cli/tests/validator_info.rs b/cli/tests/validator_info.rs
@@ -5,7 +5,7 @@ use {
         cli::{process_command, request_and_confirm_airdrop, CliCommand, CliConfig},
     },
     solana_commitment_config::CommitmentConfig,
-    solana_faucet::faucet::run_local_faucet,
+    solana_faucet_interface::faucet::run_local_faucet,
     solana_keypair::{keypair_from_seed, Keypair},
     solana_rpc_client::rpc_client::RpcClient,
     solana_signer::Signer,

diff --git a/cli/tests/vote.rs b/cli/tests/vote.rs
@@ -8,7 +8,7 @@ use {
     },
     solana_cli_output::{parse_sign_only_reply_string, OutputFormat},
     solana_commitment_config::CommitmentConfig,
-    solana_faucet::faucet::run_local_faucet,
+    solana_faucet_interface::faucet::run_local_faucet,
     solana_keypair::Keypair,
     solana_rpc_client::rpc_client::RpcClient,
     solana_rpc_client_nonce_utils::blockhash_query::{self, BlockhashQuery},

diff --git a/dos/Cargo.toml b/dos/Cargo.toml
@@ -21,7 +21,7 @@ solana-bench-tps = { workspace = true }
 solana-client = { workspace = true }
 solana-connection-cache = { workspace = true }
 solana-core = { workspace = true }
-solana-faucet = { workspace = true }
+solana-faucet-interface = { workspace = true }
 solana-gossip = { workspace = true }
 solana-hash = { workspace = true }
 solana-instruction = { workspace = true }

diff --git a/dos/src/main.rs b/dos/src/main.rs
@@ -831,7 +831,7 @@ pub mod test {
     use {
         super::*,
         solana_core::validator::ValidatorConfig,
-        solana_faucet::faucet::run_local_faucet,
+        solana_faucet_interface::faucet::run_local_faucet,
         solana_local_cluster::{
             cluster::Cluster,
             local_cluster::{ClusterConfig, LocalCluster},

diff --git a/faucet-bin/Cargo.toml b/faucet-bin/Cargo.toml
@@ -0,0 +1,28 @@
+[package]
+name = "solana-faucet-bin"
+description = "Provides the `solana-faucet` binary"
+version = { workspace = true }
+authors = { workspace = true }
+repository = { workspace = true }
+homepage = { workspace = true }
+license = { workspace = true }
+edition = { workspace = true }
+
+[dependencies]
+clap = { workspace = true }
+log = { workspace = true }
+solana-clap-utils = { workspace = true }
+solana-cli-config = { workspace = true }
+solana-faucet-interface = { workspace = true }
+solana-keypair = "=2.2.1"
+solana-logger = "=2.3.1"
+solana-metrics = { workspace = true }
+solana-version = { workspace = true }
+tokio = { workspace = true, features = ["full"] }
+
+[[bin]]
+name = "solana-faucet"
+path = "src/main.rs"
+
+[lints]
+workspace = true
diff --git a/faucet/src/bin/faucet.rs → faucet-bin/src/main.rs b/faucet/src/bin/faucet.rs → faucet-bin/src/main.rs
@@ -2,7 +2,7 @@ use {
     clap::{crate_description, crate_name, values_t, App, Arg},
     log::*,
     solana_clap_utils::input_parsers::{lamports_of_sol, value_of},
-    solana_faucet::{
+    solana_faucet_interface::{
         faucet::{run_faucet, Faucet, FAUCET_PORT},
         socketaddr,
     },

diff --git a/faucet/.gitignore → faucet-interface/.gitignore b/faucet/.gitignore → faucet-interface/.gitignore
diff --git a/faucet-interface/Cargo.toml b/faucet-interface/Cargo.toml
@@ -0,0 +1,35 @@
+[package]
+name = "solana-faucet-interface"
+description = "Solana Faucet"
+documentation = "https://docs.rs/solana-faucet-interface"
+version = { workspace = true }
+authors = { workspace = true }
+repository = { workspace = true }
+homepage = { workspace = true }
+license = { workspace = true }
+edition = { workspace = true }
+
+[dependencies]
+bincode = { workspace = true }
+crossbeam-channel = { workspace = true }
+log = { workspace = true }
+serde = { workspace = true }
+serde_derive = { workspace = true }
+solana-hash = { workspace = true }
+solana-instruction = { workspace = true }
+solana-keypair = { workspace = true }
+solana-message = { workspace = true }
+solana-metrics = { workspace = true }
+solana-native-token = { workspace = true }
+solana-packet = { workspace = true }
+solana-pubkey = { workspace = true, features = ["rand"] }
+solana-signer = { workspace = true }
+solana-system-interface = { workspace = true }
+solana-system-transaction = { workspace = true }
+solana-transaction = { workspace = true }
+spl-memo = { workspace = true, features = ["no-entrypoint"] }
+thiserror = { workspace = true }
+tokio = { workspace = true, features = ["full"] }
+
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
diff --git a/faucet/src/faucet.rs → faucet-interface/src/faucet.rs b/faucet/src/faucet.rs → faucet-interface/src/faucet.rs
diff --git a/faucet/src/faucet_mock.rs → faucet-interface/src/faucet_mock.rs b/faucet/src/faucet_mock.rs → faucet-interface/src/faucet_mock.rs
diff --git a/faucet/src/lib.rs → faucet-interface/src/lib.rs b/faucet/src/lib.rs → faucet-interface/src/lib.rs
diff --git a/faucet/tests/local-faucet.rs → faucet-interface/tests/local-faucet.rs b/faucet/tests/local-faucet.rs → faucet-interface/tests/local-faucet.rs
@@ -1,5 +1,5 @@
 use {
-    solana_faucet::faucet::{request_airdrop_transaction, run_local_faucet},
+    solana_faucet_interface::faucet::{request_airdrop_transaction, run_local_faucet},
     solana_hash::Hash,
     solana_keypair::Keypair,
     solana_message::Message,