* Add commitment config to CliConfig * Use config.commitment in cluster_query * Use config.commitment in vote * Add method with spinner + commitment * Add send-transaction config to CliConfig * Remove superfluous nonce check * Add with_commitment helper fns * Update src to use commitment * Fix pay and transfer integration tests * Fix nonce int tests * Fix deploy int test * Fix vote int test * Fix stake int tests * Nightly clippy * Review comments
		
			
				
	
	
		
			363 lines
		
	
	
		
			12 KiB
		
	
	
	
		
			Rust
		
	
	
	
	
	
			
		
		
	
	
			363 lines
		
	
	
		
			12 KiB
		
	
	
	
		
			Rust
		
	
	
	
	
	
| use solana_cli::{
 | |
|     cli::{process_command, request_and_confirm_airdrop, CliCommand, CliConfig},
 | |
|     cli_output::OutputFormat,
 | |
|     nonce,
 | |
|     offline::{
 | |
|         blockhash_query::{self, BlockhashQuery},
 | |
|         parse_sign_only_reply_string,
 | |
|     },
 | |
|     spend_utils::SpendAmount,
 | |
|     test_utils::{check_ready, check_recent_balance},
 | |
| };
 | |
| use solana_client::rpc_client::RpcClient;
 | |
| use solana_core::contact_info::ContactInfo;
 | |
| use solana_core::validator::{TestValidator, TestValidatorOptions};
 | |
| use solana_faucet::faucet::run_local_faucet;
 | |
| use solana_sdk::{
 | |
|     commitment_config::CommitmentConfig,
 | |
|     hash::Hash,
 | |
|     pubkey::Pubkey,
 | |
|     signature::{keypair_from_seed, Keypair, Signer},
 | |
|     system_program,
 | |
| };
 | |
| use std::{fs::remove_dir_all, sync::mpsc::channel};
 | |
| 
 | |
| #[test]
 | |
| fn test_nonce() {
 | |
|     solana_logger::setup();
 | |
|     let TestValidator {
 | |
|         server,
 | |
|         leader_data,
 | |
|         alice,
 | |
|         ledger_path,
 | |
|         ..
 | |
|     } = TestValidator::run();
 | |
| 
 | |
|     full_battery_tests(leader_data, alice, None, false);
 | |
| 
 | |
|     server.close().unwrap();
 | |
|     remove_dir_all(ledger_path).unwrap();
 | |
| }
 | |
| 
 | |
| #[test]
 | |
| fn test_nonce_with_seed() {
 | |
|     let TestValidator {
 | |
|         server,
 | |
|         leader_data,
 | |
|         alice,
 | |
|         ledger_path,
 | |
|         ..
 | |
|     } = TestValidator::run();
 | |
| 
 | |
|     full_battery_tests(leader_data, alice, Some(String::from("seed")), false);
 | |
| 
 | |
|     server.close().unwrap();
 | |
|     remove_dir_all(ledger_path).unwrap();
 | |
| }
 | |
| 
 | |
| #[test]
 | |
| fn test_nonce_with_authority() {
 | |
|     let TestValidator {
 | |
|         server,
 | |
|         leader_data,
 | |
|         alice,
 | |
|         ledger_path,
 | |
|         ..
 | |
|     } = TestValidator::run();
 | |
| 
 | |
|     full_battery_tests(leader_data, alice, None, true);
 | |
| 
 | |
|     server.close().unwrap();
 | |
|     remove_dir_all(ledger_path).unwrap();
 | |
| }
 | |
| 
 | |
| fn full_battery_tests(
 | |
|     leader_data: ContactInfo,
 | |
|     alice: Keypair,
 | |
|     seed: Option<String>,
 | |
|     use_nonce_authority: bool,
 | |
| ) {
 | |
|     let (sender, receiver) = channel();
 | |
|     run_local_faucet(alice, sender, None);
 | |
|     let faucet_addr = receiver.recv().unwrap();
 | |
| 
 | |
|     let rpc_client = RpcClient::new_socket(leader_data.rpc);
 | |
|     let json_rpc_url = format!("http://{}:{}", leader_data.rpc.ip(), leader_data.rpc.port());
 | |
| 
 | |
|     let mut config_payer = CliConfig::recent_for_tests();
 | |
|     config_payer.json_rpc_url = json_rpc_url.clone();
 | |
|     let payer = Keypair::new();
 | |
|     config_payer.signers = vec![&payer];
 | |
| 
 | |
|     request_and_confirm_airdrop(
 | |
|         &rpc_client,
 | |
|         &faucet_addr,
 | |
|         &config_payer.signers[0].pubkey(),
 | |
|         2000,
 | |
|         &config_payer,
 | |
|     )
 | |
|     .unwrap();
 | |
|     check_recent_balance(2000, &rpc_client, &config_payer.signers[0].pubkey());
 | |
| 
 | |
|     let mut config_nonce = CliConfig::recent_for_tests();
 | |
|     config_nonce.json_rpc_url = json_rpc_url;
 | |
|     let nonce_keypair = keypair_from_seed(&[0u8; 32]).unwrap();
 | |
|     config_nonce.signers = vec![&nonce_keypair];
 | |
| 
 | |
|     let nonce_account = if let Some(seed) = seed.as_ref() {
 | |
|         Pubkey::create_with_seed(
 | |
|             &config_nonce.signers[0].pubkey(),
 | |
|             seed,
 | |
|             &system_program::id(),
 | |
|         )
 | |
|         .unwrap()
 | |
|     } else {
 | |
|         nonce_keypair.pubkey()
 | |
|     };
 | |
| 
 | |
|     let nonce_authority = Keypair::new();
 | |
|     let optional_authority = if use_nonce_authority {
 | |
|         Some(nonce_authority.pubkey())
 | |
|     } else {
 | |
|         None
 | |
|     };
 | |
| 
 | |
|     // Create nonce account
 | |
|     config_payer.signers.push(&nonce_keypair);
 | |
|     config_payer.command = CliCommand::CreateNonceAccount {
 | |
|         nonce_account: 1,
 | |
|         seed,
 | |
|         nonce_authority: optional_authority,
 | |
|         amount: SpendAmount::Some(1000),
 | |
|     };
 | |
| 
 | |
|     process_command(&config_payer).unwrap();
 | |
|     check_recent_balance(1000, &rpc_client, &config_payer.signers[0].pubkey());
 | |
|     check_recent_balance(1000, &rpc_client, &nonce_account);
 | |
| 
 | |
|     // Get nonce
 | |
|     config_payer.signers.pop();
 | |
|     config_payer.command = CliCommand::GetNonce(nonce_account);
 | |
|     let first_nonce_string = process_command(&config_payer).unwrap();
 | |
|     let first_nonce = first_nonce_string.parse::<Hash>().unwrap();
 | |
| 
 | |
|     // Get nonce
 | |
|     config_payer.command = CliCommand::GetNonce(nonce_account);
 | |
|     let second_nonce_string = process_command(&config_payer).unwrap();
 | |
|     let second_nonce = second_nonce_string.parse::<Hash>().unwrap();
 | |
| 
 | |
|     assert_eq!(first_nonce, second_nonce);
 | |
| 
 | |
|     let mut authorized_signers: Vec<&dyn Signer> = vec![&payer];
 | |
|     let index = if use_nonce_authority {
 | |
|         authorized_signers.push(&nonce_authority);
 | |
|         1
 | |
|     } else {
 | |
|         0
 | |
|     };
 | |
| 
 | |
|     // New nonce
 | |
|     config_payer.signers = authorized_signers.clone();
 | |
|     config_payer.command = CliCommand::NewNonce {
 | |
|         nonce_account,
 | |
|         nonce_authority: index,
 | |
|     };
 | |
|     process_command(&config_payer).unwrap();
 | |
| 
 | |
|     // Get nonce
 | |
|     config_payer.signers = vec![&payer];
 | |
|     config_payer.command = CliCommand::GetNonce(nonce_account);
 | |
|     let third_nonce_string = process_command(&config_payer).unwrap();
 | |
|     let third_nonce = third_nonce_string.parse::<Hash>().unwrap();
 | |
| 
 | |
|     assert_ne!(first_nonce, third_nonce);
 | |
| 
 | |
|     // Withdraw from nonce account
 | |
|     let payee_pubkey = Pubkey::new_rand();
 | |
|     config_payer.signers = authorized_signers;
 | |
|     config_payer.command = CliCommand::WithdrawFromNonceAccount {
 | |
|         nonce_account,
 | |
|         nonce_authority: index,
 | |
|         destination_account_pubkey: payee_pubkey,
 | |
|         lamports: 100,
 | |
|     };
 | |
|     process_command(&config_payer).unwrap();
 | |
|     check_recent_balance(1000, &rpc_client, &config_payer.signers[0].pubkey());
 | |
|     check_recent_balance(900, &rpc_client, &nonce_account);
 | |
|     check_recent_balance(100, &rpc_client, &payee_pubkey);
 | |
| 
 | |
|     // Show nonce account
 | |
|     config_payer.command = CliCommand::ShowNonceAccount {
 | |
|         nonce_account_pubkey: nonce_account,
 | |
|         use_lamports_unit: true,
 | |
|     };
 | |
|     process_command(&config_payer).unwrap();
 | |
| 
 | |
|     // Set new authority
 | |
|     let new_authority = Keypair::new();
 | |
|     config_payer.command = CliCommand::AuthorizeNonceAccount {
 | |
|         nonce_account,
 | |
|         nonce_authority: index,
 | |
|         new_authority: new_authority.pubkey(),
 | |
|     };
 | |
|     process_command(&config_payer).unwrap();
 | |
| 
 | |
|     // Old authority fails now
 | |
|     config_payer.command = CliCommand::NewNonce {
 | |
|         nonce_account,
 | |
|         nonce_authority: index,
 | |
|     };
 | |
|     process_command(&config_payer).unwrap_err();
 | |
| 
 | |
|     // New authority can advance nonce
 | |
|     config_payer.signers = vec![&payer, &new_authority];
 | |
|     config_payer.command = CliCommand::NewNonce {
 | |
|         nonce_account,
 | |
|         nonce_authority: 1,
 | |
|     };
 | |
|     process_command(&config_payer).unwrap();
 | |
| 
 | |
|     // New authority can withdraw from nonce account
 | |
|     config_payer.command = CliCommand::WithdrawFromNonceAccount {
 | |
|         nonce_account,
 | |
|         nonce_authority: 1,
 | |
|         destination_account_pubkey: payee_pubkey,
 | |
|         lamports: 100,
 | |
|     };
 | |
|     process_command(&config_payer).unwrap();
 | |
|     check_recent_balance(1000, &rpc_client, &config_payer.signers[0].pubkey());
 | |
|     check_recent_balance(800, &rpc_client, &nonce_account);
 | |
|     check_recent_balance(200, &rpc_client, &payee_pubkey);
 | |
| }
 | |
| 
 | |
| #[test]
 | |
| fn test_create_account_with_seed() {
 | |
|     let TestValidator {
 | |
|         server,
 | |
|         leader_data,
 | |
|         alice: mint_keypair,
 | |
|         ledger_path,
 | |
|         ..
 | |
|     } = TestValidator::run_with_options(TestValidatorOptions {
 | |
|         fees: 1,
 | |
|         bootstrap_validator_lamports: 42_000,
 | |
|         ..TestValidatorOptions::default()
 | |
|     });
 | |
| 
 | |
|     let (sender, receiver) = channel();
 | |
|     run_local_faucet(mint_keypair, sender, None);
 | |
|     let faucet_addr = receiver.recv().unwrap();
 | |
| 
 | |
|     let offline_nonce_authority_signer = keypair_from_seed(&[1u8; 32]).unwrap();
 | |
|     let online_nonce_creator_signer = keypair_from_seed(&[2u8; 32]).unwrap();
 | |
|     let to_address = Pubkey::new(&[3u8; 32]);
 | |
|     let config = CliConfig::recent_for_tests();
 | |
| 
 | |
|     // Setup accounts
 | |
|     let rpc_client = RpcClient::new_socket(leader_data.rpc);
 | |
|     request_and_confirm_airdrop(
 | |
|         &rpc_client,
 | |
|         &faucet_addr,
 | |
|         &offline_nonce_authority_signer.pubkey(),
 | |
|         42,
 | |
|         &config,
 | |
|     )
 | |
|     .unwrap();
 | |
|     request_and_confirm_airdrop(
 | |
|         &rpc_client,
 | |
|         &faucet_addr,
 | |
|         &online_nonce_creator_signer.pubkey(),
 | |
|         4242,
 | |
|         &config,
 | |
|     )
 | |
|     .unwrap();
 | |
|     check_recent_balance(42, &rpc_client, &offline_nonce_authority_signer.pubkey());
 | |
|     check_recent_balance(4242, &rpc_client, &online_nonce_creator_signer.pubkey());
 | |
|     check_recent_balance(0, &rpc_client, &to_address);
 | |
| 
 | |
|     check_ready(&rpc_client);
 | |
| 
 | |
|     // Create nonce account
 | |
|     let creator_pubkey = online_nonce_creator_signer.pubkey();
 | |
|     let authority_pubkey = offline_nonce_authority_signer.pubkey();
 | |
|     let seed = authority_pubkey.to_string()[0..32].to_string();
 | |
|     let nonce_address =
 | |
|         Pubkey::create_with_seed(&creator_pubkey, &seed, &system_program::id()).unwrap();
 | |
|     check_recent_balance(0, &rpc_client, &nonce_address);
 | |
| 
 | |
|     let mut creator_config = CliConfig::recent_for_tests();
 | |
|     creator_config.json_rpc_url =
 | |
|         format!("http://{}:{}", leader_data.rpc.ip(), leader_data.rpc.port());
 | |
|     creator_config.signers = vec![&online_nonce_creator_signer];
 | |
|     creator_config.command = CliCommand::CreateNonceAccount {
 | |
|         nonce_account: 0,
 | |
|         seed: Some(seed),
 | |
|         nonce_authority: Some(authority_pubkey),
 | |
|         amount: SpendAmount::Some(241),
 | |
|     };
 | |
|     process_command(&creator_config).unwrap();
 | |
|     check_recent_balance(241, &rpc_client, &nonce_address);
 | |
|     check_recent_balance(42, &rpc_client, &offline_nonce_authority_signer.pubkey());
 | |
|     check_recent_balance(4000, &rpc_client, &online_nonce_creator_signer.pubkey());
 | |
|     check_recent_balance(0, &rpc_client, &to_address);
 | |
| 
 | |
|     // Fetch nonce hash
 | |
|     let nonce_hash =
 | |
|         nonce::get_account_with_commitment(&rpc_client, &nonce_address, CommitmentConfig::recent())
 | |
|             .and_then(|ref a| nonce::data_from_account(a))
 | |
|             .unwrap()
 | |
|             .blockhash;
 | |
| 
 | |
|     // Test by creating transfer TX with nonce, fully offline
 | |
|     let mut authority_config = CliConfig::recent_for_tests();
 | |
|     authority_config.json_rpc_url = String::default();
 | |
|     authority_config.signers = vec![&offline_nonce_authority_signer];
 | |
|     // Verify we cannot contact the cluster
 | |
|     authority_config.command = CliCommand::ClusterVersion;
 | |
|     process_command(&authority_config).unwrap_err();
 | |
|     authority_config.command = CliCommand::Transfer {
 | |
|         amount: SpendAmount::Some(10),
 | |
|         to: to_address,
 | |
|         from: 0,
 | |
|         sign_only: true,
 | |
|         no_wait: false,
 | |
|         blockhash_query: BlockhashQuery::None(nonce_hash),
 | |
|         nonce_account: Some(nonce_address),
 | |
|         nonce_authority: 0,
 | |
|         fee_payer: 0,
 | |
|     };
 | |
|     authority_config.output_format = OutputFormat::JsonCompact;
 | |
|     let sign_only_reply = process_command(&authority_config).unwrap();
 | |
|     let sign_only = parse_sign_only_reply_string(&sign_only_reply);
 | |
|     let authority_presigner = sign_only.presigner_of(&authority_pubkey).unwrap();
 | |
|     assert_eq!(sign_only.blockhash, nonce_hash);
 | |
| 
 | |
|     // And submit it
 | |
|     let mut submit_config = CliConfig::recent_for_tests();
 | |
|     submit_config.json_rpc_url =
 | |
|         format!("http://{}:{}", leader_data.rpc.ip(), leader_data.rpc.port());
 | |
|     submit_config.signers = vec![&authority_presigner];
 | |
|     submit_config.command = CliCommand::Transfer {
 | |
|         amount: SpendAmount::Some(10),
 | |
|         to: to_address,
 | |
|         from: 0,
 | |
|         sign_only: false,
 | |
|         no_wait: false,
 | |
|         blockhash_query: BlockhashQuery::FeeCalculator(
 | |
|             blockhash_query::Source::NonceAccount(nonce_address),
 | |
|             sign_only.blockhash,
 | |
|         ),
 | |
|         nonce_account: Some(nonce_address),
 | |
|         nonce_authority: 0,
 | |
|         fee_payer: 0,
 | |
|     };
 | |
|     process_command(&submit_config).unwrap();
 | |
|     check_recent_balance(241, &rpc_client, &nonce_address);
 | |
|     check_recent_balance(31, &rpc_client, &offline_nonce_authority_signer.pubkey());
 | |
|     check_recent_balance(4000, &rpc_client, &online_nonce_creator_signer.pubkey());
 | |
|     check_recent_balance(10, &rpc_client, &to_address);
 | |
| 
 | |
|     server.close().unwrap();
 | |
|     remove_dir_all(ledger_path).unwrap();
 | |
| }
 |