Skip to content
This repository has been archived by the owner on Jan 10, 2025. It is now read-only.

[toekn-cli] Replace is_valid_pubkey validator with signer source parser #7447

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

[toekn-cli] Replace is_valid_pubkey validator with signer source parser #7447

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
76f5da8
update `Config::pubkey_or_default`
samkim-crypto Nov 15, 2024
58e0441
update `Config::new_with_clients_and_ws_url` to parse owner from source
samkim-crypto Nov 22, 2024
dc311a7
update `owner_address_arg` to use parser instead of validator
samkim-crypto Nov 22, 2024
8d27503
remove instances of `is_valid_pubkey`
samkim-crypto Nov 22, 2024
1210f98
clean up transfer hook account validator and parser
samkim-crypto Nov 22, 2024
92d4006
remove unnecessary imports
samkim-crypto Nov 22, 2024
ae6082d
only parse default keypair source when necessary
samkim-crypto Nov 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions token/cli/src/bench.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
use {
crate::{clap_app::Error, command::CommandResult, config::Config},
clap::ArgMatches,
solana_clap_v3_utils::input_parsers::{pubkey_of_signer, Amount},
solana_clap_v3_utils::input_parsers::{signer::SignerSource, Amount},
solana_client::{
nonblocking::rpc_client::RpcClient, rpc_client::RpcClient as BlockingRpcClient,
tpu_client::TpuClient, tpu_client::TpuClientConfig,
Expand Down Expand Up @@ -31,7 +31,7 @@ pub(crate) async fn bench_process_command(

match matches.subcommand() {
Some(("create-accounts", arg_matches)) => {
let token = pubkey_of_signer(arg_matches, "token", wallet_manager)
let token = SignerSource::try_get_pubkey(arg_matches, "token", wallet_manager)
.unwrap()
.unwrap();
let n = *arg_matches.get_one::<usize>("n").unwrap();
Expand All @@ -43,7 +43,7 @@ pub(crate) async fn bench_process_command(
command_create_accounts(config, signers, &token, n, &owner).await?;
}
Some(("close-accounts", arg_matches)) => {
let token = pubkey_of_signer(arg_matches, "token", wallet_manager)
let token = SignerSource::try_get_pubkey(arg_matches, "token", wallet_manager)
.unwrap()
.unwrap();
let n = *arg_matches.get_one::<usize>("n").unwrap();
Expand All @@ -54,30 +54,30 @@ pub(crate) async fn bench_process_command(
command_close_accounts(config, signers, &token, n, &owner).await?;
}
Some(("deposit-into", arg_matches)) => {
let token = pubkey_of_signer(arg_matches, "token", wallet_manager)
let token = SignerSource::try_get_pubkey(arg_matches, "token", wallet_manager)
.unwrap()
.unwrap();
let n = *arg_matches.get_one::<usize>("n").unwrap();
let ui_amount = *arg_matches.get_one::<Amount>("amount").unwrap();
let (owner_signer, owner) =
config.signer_or_default(arg_matches, "owner", wallet_manager);
signers.push(owner_signer);
let from = pubkey_of_signer(arg_matches, "from", wallet_manager).unwrap();
let from = SignerSource::try_get_pubkey(arg_matches, "from", wallet_manager).unwrap();
command_deposit_into_or_withdraw_from(
config, signers, &token, n, &owner, ui_amount, from, true,
)
.await?;
}
Some(("withdraw-from", arg_matches)) => {
let token = pubkey_of_signer(arg_matches, "token", wallet_manager)
let token = SignerSource::try_get_pubkey(arg_matches, "token", wallet_manager)
.unwrap()
.unwrap();
let n = *arg_matches.get_one::<usize>("n").unwrap();
let ui_amount = *arg_matches.get_one::<Amount>("amount").unwrap();
let (owner_signer, owner) =
config.signer_or_default(arg_matches, "owner", wallet_manager);
signers.push(owner_signer);
let to = pubkey_of_signer(arg_matches, "to", wallet_manager).unwrap();
let to = SignerSource::try_get_pubkey(arg_matches, "to", wallet_manager).unwrap();
command_deposit_into_or_withdraw_from(
config, signers, &token, n, &owner, ui_amount, to, false,
)
Expand Down
Loading
Loading