token-cli: Support base token-2022 (without extensions) (#3071)

Author: joncinque

Cargo.lock

@@ -28,6 +28,7 @@ solana-remote-wallet = "=1.10.29"
 solana-sdk = "=1.10.29"
 solana-transaction-status = "=1.10.29"
 spl-token = { version = "3.3", path="../program", features = [ "no-entrypoint" ] }
+spl-token-2022 = { version = "0.4", path="../program-2022", features = [ "no-entrypoint" ] }
 spl-associated-token-account = { version = "1.0.5", path="../../associated-token-account/program", features = [ "no-entrypoint" ] }
 spl-memo = { version = "3.0.1", path="../../memo/program", features = ["no-entrypoint"] }
 strum = "0.24"

token/cli/Cargo.toml

@@ -16,7 +16,8 @@ use {
         system_instruction,
     },
     spl_associated_token_account::*,
-    spl_token::{
+    spl_token_2022::{
+        extension::StateWithExtensions,
         instruction,
         state::{Account, Mint},
     },
@@ -265,7 +266,7 @@ async fn get_valid_mint_program_id(
         .await
         .map_err(|err| format!("Token mint {} does not exist: {}", token, err))?;
 
-    Mint::unpack(&mint_account.data)
+    StateWithExtensions::<Mint>::unpack(&mint_account.data)
         .map_err(|err| format!("Invalid token mint {}: {}", token, err))?;
     Ok(mint_account.owner)
 }
@@ -341,9 +342,9 @@ async fn command_close_accounts(
 
         for (account, (address, _seed)) in accounts_chunk.iter().zip(address_chunk) {
             if let Some(account) = account {
-                match Account::unpack(&account.data) {
+                match StateWithExtensions::<Account>::unpack(&account.data) {
                     Ok(token_account) => {
-                        if token_account.amount != 0 {
+                        if token_account.base.amount != 0 {
                             eprintln!(
                                 "Token account {} holds a balance; unable to close it",
                                 address,

token/cli/src/bench.rs

@@ -7,9 +7,12 @@ use solana_clap_utils::{
 use solana_cli_output::OutputFormat;
 use solana_client::nonblocking::rpc_client::RpcClient;
 use solana_remote_wallet::remote_wallet::RemoteWalletManager;
-use solana_sdk::{program_pack::Pack, pubkey::Pubkey, signature::Signer};
+use solana_sdk::{pubkey::Pubkey, signature::Signer};
 use spl_associated_token_account::*;
-use spl_token::state::{Account, Mint};
+use spl_token_2022::{
+    extension::StateWithExtensionsOwned,
+    state::{Account, Mint},
+};
 use std::{process::exit, sync::Arc};
 
 #[cfg(test)]
@@ -223,21 +226,21 @@ impl<'a> Config<'a> {
         } else {
             let account = self.rpc_client.get_account(mint).await?;
             self.check_owner(mint, &account.owner)?;
-            let mint_account = Mint::unpack(&account.data)
+            let mint_account = StateWithExtensionsOwned::<Mint>::unpack(account.data)
                 .map_err(|_| format!("Could not find mint account {}", mint))?;
             if let Some(decimals) = mint_decimals {
-                if decimals != mint_account.decimals {
+                if decimals != mint_account.base.decimals {
                     return Err(format!(
                         "Mint {:?} has decimals {}, not configured decimals {}",
-                        mint, mint_account.decimals, decimals
+                        mint, mint_account.base.decimals, decimals
                     )
                     .into());
                 }
             }
             Ok(MintInfo {
                 program_id: account.owner,
                 address: *mint,
-                decimals: mint_account.decimals,
+                decimals: mint_account.base.decimals,
             })
         }
     }
@@ -261,9 +264,9 @@ impl<'a> Config<'a> {
     ) -> Result<Pubkey, Error> {
         if !self.sign_only {
             let account = self.rpc_client.get_account(token_account).await?;
-            let source_account = Account::unpack(&account.data)
+            let source_account = StateWithExtensionsOwned::<Account>::unpack(account.data)
                 .map_err(|_| format!("Could not find token account {}", token_account))?;
-            let source_mint = source_account.mint;
+            let source_mint = source_account.base.mint;
             if let Some(mint) = mint_address {
                 if source_mint != mint {
                     return Err(format!(