Rename solana-wallet program to just solana (#5604)

* Rename wallet/ to cli/

* Rename the solana-wallet crate to solana-cli

* Rename solana-wallet program to solana

* cargo fmt

cli/tests/deploy.rs

@@ -0,0 +1,80 @@
+use serde_json::{json, Value};
+use solana_cli::wallet::{process_command, WalletCommand, WalletConfig};
+use solana_client::rpc_client::RpcClient;
+use solana_client::rpc_request::RpcRequest;
+use solana_core::validator::new_validator_for_tests;
+use solana_drone::drone::run_local_drone;
+use solana_sdk::bpf_loader;
+use std::fs::{remove_dir_all, File};
+use std::io::Read;
+use std::path::PathBuf;
+use std::sync::mpsc::channel;
+
+#[test]
+fn test_wallet_deploy_program() {
+    solana_logger::setup();
+
+    let mut pathbuf = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
+    pathbuf.push("tests");
+    pathbuf.push("fixtures");
+    pathbuf.push("noop");
+    pathbuf.set_extension("so");
+
+    let (server, leader_data, alice, ledger_path) = new_validator_for_tests();
+
+    let (sender, receiver) = channel();
+    run_local_drone(alice, sender, None);
+    let drone_addr = receiver.recv().unwrap();
+
+    let rpc_client = RpcClient::new_socket(leader_data.rpc);
+
+    let mut config = WalletConfig::default();
+    config.drone_port = drone_addr.port();
+    config.json_rpc_url = format!("http://{}:{}", leader_data.rpc.ip(), leader_data.rpc.port());
+    config.command = WalletCommand::Airdrop(50);
+    process_command(&config).unwrap();
+
+    config.command = WalletCommand::Deploy(pathbuf.to_str().unwrap().to_string());
+
+    let response = process_command(&config);
+    let json: Value = serde_json::from_str(&response.unwrap()).unwrap();
+    let program_id_str = json
+        .as_object()
+        .unwrap()
+        .get("programId")
+        .unwrap()
+        .as_str()
+        .unwrap();
+
+    let params = json!([program_id_str]);
+    let account_info = rpc_client
+        .retry_make_rpc_request(&RpcRequest::GetAccountInfo, Some(params), 0)
+        .unwrap();
+    let account_info_obj = account_info.as_object().unwrap();
+    assert_eq!(
+        account_info_obj.get("lamports").unwrap().as_u64().unwrap(),
+        1
+    );
+    let owner_array = account_info.get("owner").unwrap();
+    assert_eq!(owner_array, &json!(bpf_loader::id()));
+    assert_eq!(
+        account_info_obj
+            .get("executable")
+            .unwrap()
+            .as_bool()
+            .unwrap(),
+        true
+    );
+
+    let mut file = File::open(pathbuf.to_str().unwrap().to_string()).unwrap();
+    let mut elf = Vec::new();
+    file.read_to_end(&mut elf).unwrap();
+
+    assert_eq!(
+        account_info_obj.get("data").unwrap().as_array().unwrap(),
+        &elf
+    );
+
+    server.close().unwrap();
+    remove_dir_all(ledger_path).unwrap();
+}

cli/tests/fixtures/build.sh

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+set -ex
+
+cd "$(dirname "$0")"
+
+make -C ../../../programs/bpf/c/
+cp ../../../programs/bpf/c/out/noop.so .

cli/tests/pay.rs

@@ -0,0 +1,233 @@
+use chrono::prelude::*;
+use serde_json::Value;
+use solana_cli::wallet::{
+    process_command, request_and_confirm_airdrop, WalletCommand, WalletConfig,
+};
+use solana_client::rpc_client::RpcClient;
+use solana_drone::drone::run_local_drone;
+use solana_sdk::pubkey::Pubkey;
+use solana_sdk::signature::KeypairUtil;
+use std::fs::remove_dir_all;
+use std::sync::mpsc::channel;
+
+#[cfg(test)]
+use solana_core::validator::new_validator_for_tests;
+use std::thread::sleep;
+use std::time::Duration;
+
+fn check_balance(expected_balance: u64, client: &RpcClient, pubkey: &Pubkey) {
+    (0..5).for_each(|tries| {
+        let balance = client.retry_get_balance(pubkey, 1).unwrap().unwrap();
+        if balance == expected_balance {
+            return;
+        }
+        if tries == 4 {
+            assert_eq!(balance, expected_balance);
+        }
+        sleep(Duration::from_millis(500));
+    });
+}
+
+#[test]
+fn test_wallet_timestamp_tx() {
+    let (server, leader_data, alice, ledger_path) = new_validator_for_tests();
+    let bob_pubkey = Pubkey::new_rand();
+
+    let (sender, receiver) = channel();
+    run_local_drone(alice, sender, None);
+    let drone_addr = receiver.recv().unwrap();
+
+    let rpc_client = RpcClient::new_socket(leader_data.rpc);
+
+    let mut config_payer = WalletConfig::default();
+    config_payer.drone_port = drone_addr.port();
+    config_payer.json_rpc_url =
+        format!("http://{}:{}", leader_data.rpc.ip(), leader_data.rpc.port());
+
+    let mut config_witness = WalletConfig::default();
+    config_witness.drone_port = config_payer.drone_port;
+    config_witness.json_rpc_url = config_payer.json_rpc_url.clone();
+
+    assert_ne!(
+        config_payer.keypair.pubkey(),
+        config_witness.keypair.pubkey()
+    );
+
+    request_and_confirm_airdrop(&rpc_client, &drone_addr, &config_payer.keypair.pubkey(), 50)
+        .unwrap();
+    check_balance(50, &rpc_client, &config_payer.keypair.pubkey());
+
+    request_and_confirm_airdrop(
+        &rpc_client,
+        &drone_addr,
+        &config_witness.keypair.pubkey(),
+        1,
+    )
+    .unwrap();
+
+    // Make transaction (from config_payer to bob_pubkey) requiring timestamp from config_witness
+    let date_string = "\"2018-09-19T17:30:59Z\"";
+    let dt: DateTime<Utc> = serde_json::from_str(&date_string).unwrap();
+    config_payer.command = WalletCommand::Pay(
+        10,
+        bob_pubkey,
+        Some(dt),
+        Some(config_witness.keypair.pubkey()),
+        None,
+        None,
+    );
+    let sig_response = process_command(&config_payer);
+
+    let object: Value = serde_json::from_str(&sig_response.unwrap()).unwrap();
+    let process_id_str = object.get("processId").unwrap().as_str().unwrap();
+    let process_id_vec = bs58::decode(process_id_str)
+        .into_vec()
+        .expect("base58-encoded public key");
+    let process_id = Pubkey::new(&process_id_vec);
+
+    check_balance(40, &rpc_client, &config_payer.keypair.pubkey()); // config_payer balance
+    check_balance(10, &rpc_client, &process_id); // contract balance
+    check_balance(0, &rpc_client, &bob_pubkey); // recipient balance
+
+    // Sign transaction by config_witness
+    config_witness.command = WalletCommand::TimeElapsed(bob_pubkey, process_id, dt);
+    process_command(&config_witness).unwrap();
+
+    check_balance(40, &rpc_client, &config_payer.keypair.pubkey()); // config_payer balance
+    check_balance(0, &rpc_client, &process_id); // contract balance
+    check_balance(10, &rpc_client, &bob_pubkey); // recipient balance
+
+    server.close().unwrap();
+    remove_dir_all(ledger_path).unwrap();
+}
+
+#[test]
+fn test_wallet_witness_tx() {
+    let (server, leader_data, alice, ledger_path) = new_validator_for_tests();
+    let bob_pubkey = Pubkey::new_rand();
+
+    let (sender, receiver) = channel();
+    run_local_drone(alice, sender, None);
+    let drone_addr = receiver.recv().unwrap();
+
+    let rpc_client = RpcClient::new_socket(leader_data.rpc);
+
+    let mut config_payer = WalletConfig::default();
+    config_payer.drone_port = drone_addr.port();
+    config_payer.json_rpc_url =
+        format!("http://{}:{}", leader_data.rpc.ip(), leader_data.rpc.port());
+
+    let mut config_witness = WalletConfig::default();
+    config_witness.drone_port = config_payer.drone_port;
+    config_witness.json_rpc_url = config_payer.json_rpc_url.clone();
+
+    assert_ne!(
+        config_payer.keypair.pubkey(),
+        config_witness.keypair.pubkey()
+    );
+
+    request_and_confirm_airdrop(&rpc_client, &drone_addr, &config_payer.keypair.pubkey(), 50)
+        .unwrap();
+    request_and_confirm_airdrop(
+        &rpc_client,
+        &drone_addr,
+        &config_witness.keypair.pubkey(),
+        1,
+    )
+    .unwrap();
+
+    // Make transaction (from config_payer to bob_pubkey) requiring witness signature from config_witness
+    config_payer.command = WalletCommand::Pay(
+        10,
+        bob_pubkey,
+        None,
+        None,
+        Some(vec![config_witness.keypair.pubkey()]),
+        None,
+    );
+    let sig_response = process_command(&config_payer);
+
+    let object: Value = serde_json::from_str(&sig_response.unwrap()).unwrap();
+    let process_id_str = object.get("processId").unwrap().as_str().unwrap();
+    let process_id_vec = bs58::decode(process_id_str)
+        .into_vec()
+        .expect("base58-encoded public key");
+    let process_id = Pubkey::new(&process_id_vec);
+
+    check_balance(40, &rpc_client, &config_payer.keypair.pubkey()); // config_payer balance
+    check_balance(10, &rpc_client, &process_id); // contract balance
+    check_balance(0, &rpc_client, &bob_pubkey); // recipient balance
+
+    // Sign transaction by config_witness
+    config_witness.command = WalletCommand::Witness(bob_pubkey, process_id);
+    process_command(&config_witness).unwrap();
+
+    check_balance(40, &rpc_client, &config_payer.keypair.pubkey()); // config_payer balance
+    check_balance(0, &rpc_client, &process_id); // contract balance
+    check_balance(10, &rpc_client, &bob_pubkey); // recipient balance
+
+    server.close().unwrap();
+    remove_dir_all(ledger_path).unwrap();
+}
+
+#[test]
+fn test_wallet_cancel_tx() {
+    let (server, leader_data, alice, ledger_path) = new_validator_for_tests();
+    let bob_pubkey = Pubkey::new_rand();
+
+    let (sender, receiver) = channel();
+    run_local_drone(alice, sender, None);
+    let drone_addr = receiver.recv().unwrap();
+
+    let rpc_client = RpcClient::new_socket(leader_data.rpc);
+
+    let mut config_payer = WalletConfig::default();
+    config_payer.drone_port = drone_addr.port();
+    config_payer.json_rpc_url =
+        format!("http://{}:{}", leader_data.rpc.ip(), leader_data.rpc.port());
+
+    let mut config_witness = WalletConfig::default();
+    config_witness.drone_port = config_payer.drone_port;
+    config_witness.json_rpc_url = config_payer.json_rpc_url.clone();
+
+    assert_ne!(
+        config_payer.keypair.pubkey(),
+        config_witness.keypair.pubkey()
+    );
+
+    request_and_confirm_airdrop(&rpc_client, &drone_addr, &config_payer.keypair.pubkey(), 50)
+        .unwrap();
+
+    // Make transaction (from config_payer to bob_pubkey) requiring witness signature from config_witness
+    config_payer.command = WalletCommand::Pay(
+        10,
+        bob_pubkey,
+        None,
+        None,
+        Some(vec![config_witness.keypair.pubkey()]),
+        Some(config_payer.keypair.pubkey()),
+    );
+    let sig_response = process_command(&config_payer).unwrap();
+
+    let object: Value = serde_json::from_str(&sig_response).unwrap();
+    let process_id_str = object.get("processId").unwrap().as_str().unwrap();
+    let process_id_vec = bs58::decode(process_id_str)
+        .into_vec()
+        .expect("base58-encoded public key");
+    let process_id = Pubkey::new(&process_id_vec);
+
+    check_balance(40, &rpc_client, &config_payer.keypair.pubkey()); // config_payer balance
+    check_balance(10, &rpc_client, &process_id); // contract balance
+    check_balance(0, &rpc_client, &bob_pubkey); // recipient balance
+
+    // Sign transaction by config_witness
+    config_payer.command = WalletCommand::Cancel(process_id);
+    process_command(&config_payer).unwrap();
+
+    check_balance(50, &rpc_client, &config_payer.keypair.pubkey()); // config_payer balance
+    check_balance(0, &rpc_client, &process_id); // contract balance
+    check_balance(0, &rpc_client, &bob_pubkey); // recipient balance
+
+    server.close().unwrap();
+    remove_dir_all(ledger_path).unwrap();
+}

cli/tests/request_airdrop.rs

@@ -0,0 +1,35 @@
+use solana_cli::wallet::{process_command, WalletCommand, WalletConfig};
+use solana_client::rpc_client::RpcClient;
+use solana_core::validator::new_validator_for_tests;
+use solana_drone::drone::run_local_drone;
+use solana_sdk::signature::KeypairUtil;
+use std::fs::remove_dir_all;
+use std::sync::mpsc::channel;
+
+#[test]
+fn test_wallet_request_airdrop() {
+    let (server, leader_data, alice, ledger_path) = new_validator_for_tests();
+    let (sender, receiver) = channel();
+    run_local_drone(alice, sender, None);
+    let drone_addr = receiver.recv().unwrap();
+
+    let mut bob_config = WalletConfig::default();
+    bob_config.drone_port = drone_addr.port();
+    bob_config.json_rpc_url = format!("http://{}:{}", leader_data.rpc.ip(), leader_data.rpc.port());
+
+    bob_config.command = WalletCommand::Airdrop(50);
+
+    let sig_response = process_command(&bob_config);
+    sig_response.unwrap();
+
+    let rpc_client = RpcClient::new_socket(leader_data.rpc);
+
+    let balance = rpc_client
+        .retry_get_balance(&bob_config.keypair.pubkey(), 1)
+        .unwrap()
+        .unwrap();
+    assert_eq!(balance, 50);
+
+    server.close().unwrap();
+    remove_dir_all(ledger_path).unwrap();
+}