Skip to content
This repository was archived by the owner on Mar 11, 2025. It is now read-only.

[token-upgrade] Remove deprecated functions from cli #6526

Merged
merged 7 commits into from
Apr 3, 2024
Merged

[token-upgrade] Remove deprecated functions from cli #6526

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
effdb23
removed allow deprecated
tonton-sol Mar 31, 2024
8aa347b
remove deprecated validators
tonton-sol Mar 31, 2024
03a97db
spelling
tonton-sol Mar 31, 2024
7042352
removed dep warning
tonton-sol Mar 31, 2024
f87a59e
removed dep clap functions
tonton-sol Mar 31, 2024
39ad92e
added allow_all() to SignerSourceParserBuilder
tonton-sol Apr 2, 2024
f71cf75
Merge branch 'master' into token_upgrade_cli_clap_v3
tonton-sol Apr 3, 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
28 changes: 13 additions & 15 deletions token-upgrade/cli/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
#![allow(deprecated)]

use {
clap::{crate_description, crate_name, crate_version, Arg, Command},
solana_clap_v3_utils::{
input_parsers::{parse_url_or_moniker, pubkey_of},
input_validators::{is_valid_pubkey, is_valid_signer, normalize_to_url_if_moniker},
input_parsers::{parse_url_or_moniker, pubkey_of, signer::SignerSourceParserBuilder},
input_validators::normalize_to_url_if_moniker,
keypair::{
signer_from_path, signer_from_path_with_config, DefaultSigner, SignerFromPathConfig,
},
Expand Down Expand Up @@ -225,7 +223,7 @@ async fn main() -> Result<(), Box<dyn Error>> {
Arg::new("payer")
.long("payer")
.value_name("KEYPAIR")
.validator(|s| is_valid_signer(s))
.value_parser(SignerSourceParserBuilder::default().allow_all().build())
.takes_value(true)
.global(true)
.help("Filepath or URL to a keypair [default: client keypair]"),
Expand All @@ -252,7 +250,7 @@ async fn main() -> Result<(), Box<dyn Error>> {
Command::new("create-escrow").about("Create token account for the program escrow")
.arg(
Arg::new("original_mint")
.validator(|s| is_valid_pubkey(s))
.value_parser(SignerSourceParserBuilder::default().allow_all().build())
.value_name("ADDRESS")
.required(true)
.takes_value(true)
Expand All @@ -261,7 +259,7 @@ async fn main() -> Result<(), Box<dyn Error>> {
)
.arg(
Arg::new("new_mint")
.validator(|s| is_valid_pubkey(s))
.value_parser(SignerSourceParserBuilder::default().allow_all().build())
.value_name("ADDRESS")
.required(true)
.takes_value(true)
Expand All @@ -271,7 +269,7 @@ async fn main() -> Result<(), Box<dyn Error>> {
.arg(
Arg::new("account_keypair")
.value_name("ACCOUNT_KEYPAIR")
.validator(|s| is_valid_signer(s))
.value_parser(SignerSourceParserBuilder::default().allow_all().build())
.takes_value(true)
.index(3)
.help("Specify the account keypair. This may be a keypair file or the ASK keyword. [default: associated token account for escrow authority]"),
Expand All @@ -281,7 +279,7 @@ async fn main() -> Result<(), Box<dyn Error>> {
Command::new("exchange").about("Exchange original tokens for new tokens")
.arg(
Arg::new("original_mint")
.validator(|s| is_valid_pubkey(s))
.value_parser(SignerSourceParserBuilder::default().allow_all().build())
.value_name("ADDRESS")
.required(true)
.takes_value(true)
Expand All @@ -290,7 +288,7 @@ async fn main() -> Result<(), Box<dyn Error>> {
)
.arg(
Arg::new("new_mint")
.validator(|s| is_valid_pubkey(s))
.value_parser(SignerSourceParserBuilder::default().allow_all().build())
.value_name("ADDRESS")
.required(true)
.takes_value(true)
Expand All @@ -301,38 +299,38 @@ async fn main() -> Result<(), Box<dyn Error>> {
Arg::new("owner")
.long("owner")
.value_name("OWNER_KEYPAIR")
.validator(|s| is_valid_signer(s))
.value_parser(SignerSourceParserBuilder::default().allow_all().build())
.takes_value(true)
.help("Specify the owner or delegate for the burnt account. This may be a keypair file or the ASK keyword. [default: fee payer]"),
)
.arg(
Arg::new("burn_from")
.long("burn-from")
.value_name("BURN_TOKEN_ACCOUNT_ADDRESS")
.validator(|s| is_valid_pubkey(s))
.value_parser(SignerSourceParserBuilder::default().allow_all().build())
.takes_value(true)
.help("Specify the burnt account address. [default: associated token account for owner on original mint]"),
)
.arg(
Arg::new("escrow")
.long("escrow")
.value_name("ESCROW_TOKEN_ACCOUNT_ADDRESS")
.validator(|s| is_valid_pubkey(s))
.value_parser(SignerSourceParserBuilder::default().allow_all().build())
.takes_value(true)
.help("Specify the escrow account address to transfer from. [default: associated token account for the escrow authority on new mint]"),
)
.arg(
Arg::new("destination")
.long("destination")
.value_name("DESTINATION_ACCOUNT_ADDRESS")
.validator(|s| is_valid_pubkey(s))
.value_parser(SignerSourceParserBuilder::default().allow_all().build())
.takes_value(true)
.help("Specify the destination account to receive new tokens. [default: associated token account for owner on new mint]"),
)
.arg(
Arg::new("multisig_signer")
.long("multisig-signer")
.validator(|s| is_valid_signer(s))
.value_parser(SignerSourceParserBuilder::default().allow_all().build())
.value_name("MULTISIG_SIGNER")
.takes_value(true)
.multiple(true)
Expand Down
30 changes: 13 additions & 17 deletions token/transfer-hook/cli/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
#![allow(deprecated)]

pub mod meta;

use {
crate::meta::parse_transfer_hook_account_arg,
clap::{crate_description, crate_name, crate_version, Arg, Command},
solana_clap_v3_utils::{
input_parsers::{parse_url_or_moniker, pubkey_of_signer},
input_validators::{is_valid_pubkey, is_valid_signer, normalize_to_url_if_moniker},
input_parsers::{
parse_url_or_moniker, pubkey_of_signer, signer::SignerSourceParserBuilder,
},
input_validators::normalize_to_url_if_moniker,
keypair::DefaultSigner,
},
solana_client::nonblocking::rpc_client::RpcClient,
Expand All @@ -28,10 +28,6 @@ use {
std::{process::exit, rc::Rc},
};

fn clap_is_valid_pubkey(arg: &str) -> Result<(), String> {
is_valid_pubkey(arg)
}

// Helper function to calculate the required lamports for rent
async fn calculate_rent_lamports(
rpc_client: &RpcClient,
Expand Down Expand Up @@ -209,7 +205,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
Arg::new("fee_payer")
.long("fee-payer")
.value_name("KEYPAIR")
.validator(|s| is_valid_signer(s))
.value_parser(SignerSourceParserBuilder::default().build())
.takes_value(true)
.global(true)
.help("Filepath or URL to a keypair to pay transaction fee [default: client keypair]"),
Expand Down Expand Up @@ -237,7 +233,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
.about("Create the extra account metas account for a transfer hook program")
.arg(
Arg::with_name("program_id")
.validator(clap_is_valid_pubkey)
.value_parser(SignerSourceParserBuilder::default().allow_pubkey().allow_file_path().build())
.value_name("TRANSFER_HOOK_PROGRAM")
.takes_value(true)
.index(1)
Expand All @@ -246,7 +242,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
)
.arg(
Arg::with_name("token")
.validator(clap_is_valid_pubkey)
.value_parser(SignerSourceParserBuilder::default().allow_pubkey().allow_file_path().build())
.value_name("TOKEN_MINT_ADDRESS")
.takes_value(true)
.index(2)
Expand All @@ -265,7 +261,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {

Additional accounts with known fixed addresses can be passed at the command line in the format "<PUBKEY>:<ROLE>". The role must be "readonly", "writable". "readonlySigner", or "writableSigner".

Additional acounts requiring seed configurations can be defined in a configuration file using either JSON or YAML. The format is as follows:
Additional accounts requiring seed configurations can be defined in a configuration file using either JSON or YAML. The format is as follows:

```json
{
Expand Down Expand Up @@ -310,7 +306,7 @@ extraMetas:
Arg::new("mint_authority")
.long("mint-authority")
.value_name("KEYPAIR")
.validator(|s| is_valid_signer(s))
.value_parser(SignerSourceParserBuilder::default().build())
.takes_value(true)
.global(true)
.help("Filepath or URL to mint-authority keypair [default: client keypair]"),
Expand All @@ -321,7 +317,7 @@ extraMetas:
.about("Update the extra account metas account for a transfer hook program")
.arg(
Arg::with_name("program_id")
.validator(clap_is_valid_pubkey)
.value_parser(SignerSourceParserBuilder::default().allow_pubkey().allow_file_path().build())
.value_name("TRANSFER_HOOK_PROGRAM")
.takes_value(true)
.index(1)
Expand All @@ -330,7 +326,7 @@ extraMetas:
)
.arg(
Arg::with_name("token")
.validator(clap_is_valid_pubkey)
.value_parser(SignerSourceParserBuilder::default().allow_pubkey().allow_file_path().build())
.value_name("TOKEN_MINT_ADDRESS")
.takes_value(true)
.index(2)
Expand All @@ -349,7 +345,7 @@ extraMetas:

Additional accounts with known fixed addresses can be passed at the command line in the format "<PUBKEY>:<ROLE>". The role must be "readonly", "writable". "readonlySigner", or "writableSigner".

Additional acounts requiring seed configurations can be defined in a configuration file using either JSON or YAML. The format is as follows:
Additional accounts requiring seed configurations can be defined in a configuration file using either JSON or YAML. The format is as follows:

```json
{
Expand Down Expand Up @@ -394,7 +390,7 @@ extraMetas:
Arg::new("mint_authority")
.long("mint-authority")
.value_name("KEYPAIR")
.validator(|s| is_valid_signer(s))
.value_parser(SignerSourceParserBuilder::default().build())
.takes_value(true)
.global(true)
.help("Filepath or URL to mint-authority keypair [default: client keypair]"),
Expand Down