upgrade clap version to 3.2.23

Author: samkim-crypto

Cargo.lock

@@ -13,14 +13,14 @@ walkdir = "2"
 
 [dependencies]
 base64 = "0.22.0"
-clap = "2.33.3"
+clap = "3.2.23"
 console = "0.15.8"
 futures = "0.3"
 serde = "1.0.197"
 serde_derive = "1.0.103"
 serde_json = "1.0.115"
 solana-account-decoder = ">=1.18.2,<=2"
-solana-clap-utils = ">=1.18.2,<=2"
+solana-clap-v3-utils = ">=1.18.2,<=2"
 solana-cli-config = ">=1.18.2,<=2"
 solana-cli-output = ">=1.18.2,<=2"
 solana-client = ">=1.18.2,<=2"
@@ -29,19 +29,19 @@ solana-remote-wallet = ">=1.18.2,<=2"
 solana-sdk = ">=1.18.2,<=2"
 solana-transaction-status = ">=1.18.2,<=2"
 spl-token = { version = "4.0", path = "../program", features = [
-  "no-entrypoint",
+    "no-entrypoint",
 ] }
 spl-token-2022 = { version = "3.0.2", path = "../program-2022", features = [
-  "no-entrypoint",
+    "no-entrypoint",
 ] }
 spl-token-client = { version = "0.9.2", path = "../client" }
 spl-token-metadata-interface = { version = "0.3.3", path = "../../token-metadata/interface" }
 spl-token-group-interface = { version = "0.2.3", path = "../../token-group/interface" }
 spl-associated-token-account = { version = "3.0.2", path = "../../associated-token-account/program", features = [
-  "no-entrypoint",
+    "no-entrypoint",
 ] }
 spl-memo = { version = "4.0", path = "../../memo/program", features = [
-  "no-entrypoint",
+    "no-entrypoint",
 ] }
 strum = "0.26"
 strum_macros = "0.26"

token/cli/Cargo.toml

@@ -2,7 +2,7 @@
 use {
     crate::{clap_app::Error, command::CommandResult, config::Config},
     clap::{value_t_or_exit, ArgMatches},
-    solana_clap_utils::input_parsers::pubkey_of_signer,
+    solana_clap_v3_utils::input_parsers::pubkey_of_signer,
     solana_client::{
         nonblocking::rpc_client::RpcClient, rpc_client::RpcClient as BlockingRpcClient,
         tpu_client::TpuClient, tpu_client::TpuClientConfig,

token/cli/src/bench.rs

@@ -2,7 +2,7 @@ use {
     clap::{
         crate_description, crate_name, crate_version, App, AppSettings, Arg, ArgGroup, SubCommand,
     },
-    solana_clap_utils::{
+    solana_clap_v3_utils::{
         fee_payer::fee_payer_arg,
         input_validators::{
             is_amount, is_amount_or_all, is_parsable, is_pubkey, is_url_or_moniker,

token/cli/src/clap_app.rs

@@ -15,7 +15,7 @@ use {
         parse_token::{get_token_account_mint, parse_token, TokenAccountType, UiAccountState},
         UiAccountData,
     },
-    solana_clap_utils::{
+    solana_clap_v3_utils::{
         input_parsers::{pubkey_of_signer, pubkeys_of_multiple_signers, value_of},
         keypair::signer_from_path,
     },

token/cli/src/command.rs

@@ -1,7 +1,7 @@
 use {
     crate::clap_app::{Error, COMPUTE_UNIT_LIMIT_ARG, COMPUTE_UNIT_PRICE_ARG, MULTISIG_SIGNER_ARG},
     clap::ArgMatches,
-    solana_clap_utils::{
+    solana_clap_v3_utils::{
         input_parsers::{pubkey_of_signer, value_of},
         input_validators::normalize_to_url_if_moniker,
         keypair::{signer_from_path, signer_from_path_with_config, SignerFromPathConfig},