From fc2a0d53d9d4f34bb49c69935342ed79fd988d41 Mon Sep 17 00:00:00 2001
From: Tyera Eulberg <teulberg@gmail.com>
Date: Sun, 16 Feb 2020 11:41:00 -0700
Subject: [PATCH] CLI: Add optional airdrop recipient (#8291)

* CLI: Add optional airdrop recipient

* Update book usage page
---
 book/src/cli/usage.md        |  3 ++-
 cli/src/cli.rs               | 28 +++++++++++++++++++++++-----
 cli/tests/deploy.rs          |  1 +
 cli/tests/request_airdrop.rs |  1 +
 4 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/book/src/cli/usage.md b/book/src/cli/usage.md
index 2e3bf190c..6926cf0f4 100644
--- a/book/src/cli/usage.md
+++ b/book/src/cli/usage.md
@@ -320,7 +320,7 @@ solana-airdrop
 Request lamports
 
 USAGE:
-    solana airdrop [FLAGS] [OPTIONS] <AMOUNT>
+    solana airdrop [FLAGS] [OPTIONS] <AMOUNT> [PUBKEY]
 
 FLAGS:
     -h, --help                           Prints help information
@@ -341,6 +341,7 @@ OPTIONS:
 
 ARGS:
     <AMOUNT>    The airdrop amount to request, in SOL
+    <PUBKEY>    The pubkey of airdrop recipient
 ```
 
 #### solana-authorize-nonce-account
diff --git a/cli/src/cli.rs b/cli/src/cli.rs
index e75c65b2c..1c1bca18d 100644
--- a/cli/src/cli.rs
+++ b/cli/src/cli.rs
@@ -410,6 +410,7 @@ pub enum CliCommand {
     Airdrop {
         faucet_host: Option<IpAddr>,
         faucet_port: u16,
+        pubkey: Option<Pubkey>,
         lamports: u64,
     },
     Balance {
@@ -643,11 +644,13 @@ pub fn parse_command(matches: &ArgMatches<'_>) -> Result<CliCommandInfo, Box<dyn
             } else {
                 None
             };
+            let pubkey = pubkey_of(&matches, "to");
             let lamports = lamports_of_sol(matches, "amount").unwrap();
             Ok(CliCommandInfo {
                 command: CliCommand::Airdrop {
                     faucet_host,
                     faucet_port,
+                    pubkey,
                     lamports,
                 },
                 require_keypair: true,
@@ -943,9 +946,10 @@ fn process_airdrop(
     rpc_client: &RpcClient,
     config: &CliConfig,
     faucet_addr: &SocketAddr,
+    pubkey: &Option<Pubkey>,
     lamports: u64,
 ) -> ProcessResult {
-    let pubkey = config.pubkey()?;
+    let pubkey = pubkey.unwrap_or(config.pubkey()?);
     println!(
         "Requesting airdrop of {} from {}",
         build_balance_message(lamports, false, true),
@@ -1849,6 +1853,7 @@ pub fn process_command(config: &CliConfig) -> ProcessResult {
         CliCommand::Airdrop {
             faucet_host,
             faucet_port,
+            pubkey,
             lamports,
         } => {
             let faucet_addr = SocketAddr::new(
@@ -1865,7 +1870,7 @@ pub fn process_command(config: &CliConfig) -> ProcessResult {
                 *faucet_port,
             );
 
-            process_airdrop(&rpc_client, config, &faucet_addr, *lamports)
+            process_airdrop(&rpc_client, config, &faucet_addr, pubkey, *lamports)
         }
         // Check client balance
         CliCommand::Balance {
@@ -2098,6 +2103,14 @@ pub fn app<'ab, 'v>(name: &str, about: &'ab str, version: &'v str) -> App<'ab, '
                         .validator(is_amount)
                         .required(true)
                         .help("The airdrop amount to request, in SOL"),
+                )
+                .arg(
+                    Arg::with_name("to")
+                        .index(2)
+                        .value_name("PUBKEY")
+                        .takes_value(true)
+                        .validator(is_pubkey_or_keypair)
+                        .help("The pubkey of airdrop recipient"),
                 ),
         )
         .subcommand(
@@ -2411,15 +2424,17 @@ mod tests {
         let dt = Utc.ymd(2018, 9, 19).and_hms(17, 30, 59);
 
         // Test Airdrop Subcommand
-        let test_airdrop = test_commands
-            .clone()
-            .get_matches_from(vec!["test", "airdrop", "50"]);
+        let test_airdrop =
+            test_commands
+                .clone()
+                .get_matches_from(vec!["test", "airdrop", "50", &pubkey_string]);
         assert_eq!(
             parse_command(&test_airdrop).unwrap(),
             CliCommandInfo {
                 command: CliCommand::Airdrop {
                     faucet_host: None,
                     faucet_port: solana_faucet::faucet::FAUCET_PORT,
+                    pubkey: Some(pubkey),
                     lamports: 50_000_000_000,
                 },
                 require_keypair: true,
@@ -3209,9 +3224,11 @@ mod tests {
         assert_eq!(signature.unwrap(), SIGNATURE.to_string());
 
         // Need airdrop cases
+        let to = Pubkey::new_rand();
         config.command = CliCommand::Airdrop {
             faucet_host: None,
             faucet_port: 1234,
+            pubkey: Some(to),
             lamports: 50,
         };
         assert!(process_command(&config).is_ok());
@@ -3249,6 +3266,7 @@ mod tests {
         config.command = CliCommand::Airdrop {
             faucet_host: None,
             faucet_port: 1234,
+            pubkey: None,
             lamports: 50,
         };
         assert!(process_command(&config).is_err());
diff --git a/cli/tests/deploy.rs b/cli/tests/deploy.rs
index 6376067b5..58c3c8f73 100644
--- a/cli/tests/deploy.rs
+++ b/cli/tests/deploy.rs
@@ -42,6 +42,7 @@ fn test_cli_deploy_program() {
     config.command = CliCommand::Airdrop {
         faucet_host: None,
         faucet_port: faucet_addr.port(),
+        pubkey: None,
         lamports: minimum_balance_for_rent_exemption + 1, // min balance for rent exemption + leftover for tx processing
     };
     process_command(&config).unwrap();
diff --git a/cli/tests/request_airdrop.rs b/cli/tests/request_airdrop.rs
index d15bf7a21..0f3e2282c 100644
--- a/cli/tests/request_airdrop.rs
+++ b/cli/tests/request_airdrop.rs
@@ -18,6 +18,7 @@ fn test_cli_request_airdrop() {
     bob_config.command = CliCommand::Airdrop {
         faucet_host: None,
         faucet_port: faucet_addr.port(),
+        pubkey: None,
         lamports: 50,
     };