Parse more token-2022 extensions and instructions (backport #26746)

account-decoder/Cargo.toml

@@ -23,7 +23,7 @@ solana-config-program = { path = "../programs/config", version = "=1.10.35" }
 solana-sdk = { path = "../sdk", version = "=1.10.35" }
 solana-vote-program = { path = "../programs/vote", version = "=1.10.35" }
 spl-token = { version = "=3.3.1", features = ["no-entrypoint"] }
-spl-token-2022 = { version = "=0.3.0", features = ["no-entrypoint"] }
+spl-token-2022 = { version = "=0.4.1", features = ["no-entrypoint"] }
 thiserror = "1.0"
 zstd = "0.11.1"
 

account-decoder/src/parse_token.rs

@@ -552,8 +552,10 @@ mod test {
         account_state.pack_base();
         account_state.init_account_type().unwrap();
 
-        account_state.init_extension::<ImmutableOwner>().unwrap();
-        let mut memo_transfer = account_state.init_extension::<MemoTransfer>().unwrap();
+        account_state
+            .init_extension::<ImmutableOwner>(true)
+            .unwrap();
+        let mut memo_transfer = account_state.init_extension::<MemoTransfer>(true).unwrap();
         memo_transfer.require_incoming_transfer_memos = true.into();
 
         assert!(parse_token(&account_data, None).is_err());
@@ -620,7 +622,9 @@ mod test {
         let mut mint_state =
             StateWithExtensionsMut::<Mint>::unpack_uninitialized(&mut mint_data).unwrap();
 
-        let mut mint_close_authority = mint_state.init_extension::<MintCloseAuthority>().unwrap();
+        let mut mint_close_authority = mint_state
+            .init_extension::<MintCloseAuthority>(true)
+            .unwrap();
         mint_close_authority.close_authority =
             OptionalNonZeroPubkey::try_from(Some(owner_pubkey)).unwrap();
 

account-decoder/src/parse_token_extension.rs

@@ -1,5 +1,6 @@
 use {
     crate::parse_token::UiAccountState,
+    solana_sdk::clock::UnixTimestamp,
     spl_token_2022::{
         extension::{self, BaseState, ExtensionType, StateWithExtensions},
         solana_program::pubkey::Pubkey,
@@ -18,6 +19,8 @@ pub enum UiExtension {
     DefaultAccountState(UiDefaultAccountState),
     ImmutableOwner,
     MemoTransfer(UiMemoTransfer),
+    NonTransferable,
+    InterestBearingConfig(UiInterestBearingConfig),
     UnparseableExtension,
 }
 
@@ -50,6 +53,11 @@ pub fn parse_extension<S: BaseState>(
             .get_extension::<extension::memo_transfer::MemoTransfer>()
             .map(|&extension| UiExtension::MemoTransfer(extension.into()))
             .unwrap_or(UiExtension::UnparseableExtension),
+        ExtensionType::NonTransferable => UiExtension::NonTransferable,
+        ExtensionType::InterestBearingConfig => account
+            .get_extension::<extension::interest_bearing_mint::InterestBearingConfig>()
+            .map(|&extension| UiExtension::InterestBearingConfig(extension.into()))
+            .unwrap_or(UiExtension::UnparseableExtension),
     }
 }
 
@@ -159,3 +167,33 @@ impl From<extension::memo_transfer::MemoTransfer> for UiMemoTransfer {
         }
     }
 }
+
+#[derive(Debug, Serialize, Deserialize, PartialEq, Eq)]
+#[serde(rename_all = "camelCase")]
+pub struct UiInterestBearingConfig {
+    pub rate_authority: Option<String>,
+    pub initialization_timestamp: UnixTimestamp,
+    pub pre_update_average_rate: i16,
+    pub last_update_timestamp: UnixTimestamp,
+    pub current_rate: i16,
+}
+
+impl From<extension::interest_bearing_mint::InterestBearingConfig> for UiInterestBearingConfig {
+    fn from(
+        interest_bearing_config: extension::interest_bearing_mint::InterestBearingConfig,
+    ) -> Self {
+        let rate_authority: Option<Pubkey> = interest_bearing_config.rate_authority.into();
+
+        Self {
+            rate_authority: rate_authority.map(|pubkey| pubkey.to_string()),
+            initialization_timestamp: UnixTimestamp::from(
+                interest_bearing_config.initialization_timestamp,
+            ),
+            pre_update_average_rate: i16::from(interest_bearing_config.pre_update_average_rate),
+            last_update_timestamp: UnixTimestamp::from(
+                interest_bearing_config.last_update_timestamp,
+            ),
+            current_rate: i16::from(interest_bearing_config.current_rate),
+        }
+    }
+}

client/Cargo.toml

@@ -50,7 +50,7 @@ solana-streamer = { path = "../streamer", version = "=1.10.35" }
 solana-transaction-status = { path = "../transaction-status", version = "=1.10.35" }
 solana-version = { path = "../version", version = "=1.10.35" }
 solana-vote-program = { path = "../programs/vote", version = "=1.10.35" }
-spl-token-2022 = { version = "=0.3.0", features = ["no-entrypoint"] }
+spl-token-2022 = { version = "=0.4.1", features = ["no-entrypoint"] }
 thiserror = "1.0"
 tokio = { version = "~1.14.1", features = ["full"] }
 tokio-stream = "0.1.8"

rpc/Cargo.toml

@@ -49,7 +49,7 @@ solana-transaction-status = { path = "../transaction-status", version = "=1.10.3
 solana-version = { path = "../version", version = "=1.10.35" }
 solana-vote-program = { path = "../programs/vote", version = "=1.10.35" }
 spl-token = { version = "=3.3.1", features = ["no-entrypoint"] }
-spl-token-2022 = { version = "=0.3.0", features = ["no-entrypoint"] }
+spl-token-2022 = { version = "=0.4.1", features = ["no-entrypoint"] }
 stream-cancel = "0.8.1"
 thiserror = "1.0"
 tokio = { version = "~1.14.1", features = ["full"] }

rpc/src/rpc.rs

@@ -7265,8 +7265,10 @@ pub mod tests {
                 account_state.base = account_base;
                 account_state.pack_base();
                 account_state.init_account_type().unwrap();
-                account_state.init_extension::<ImmutableOwner>().unwrap();
-                let mut memo_transfer = account_state.init_extension::<MemoTransfer>().unwrap();
+                account_state
+                    .init_extension::<ImmutableOwner>(true)
+                    .unwrap();
+                let mut memo_transfer = account_state.init_extension::<MemoTransfer>(true).unwrap();
                 memo_transfer.require_incoming_transfer_memos = true.into();
 
                 let token_account = AccountSharedData::from(Account {
@@ -7294,8 +7296,9 @@ pub mod tests {
                 mint_state.base = mint_base;
                 mint_state.pack_base();
                 mint_state.init_account_type().unwrap();
-                let mut mint_close_authority =
-                    mint_state.init_extension::<MintCloseAuthority>().unwrap();
+                let mut mint_close_authority = mint_state
+                    .init_extension::<MintCloseAuthority>(true)
+                    .unwrap();
                 mint_close_authority.close_authority =
                     OptionalNonZeroPubkey::try_from(Some(owner)).unwrap();
 
@@ -7763,8 +7766,10 @@ pub mod tests {
                 account_state.base = account_base;
                 account_state.pack_base();
                 account_state.init_account_type().unwrap();
-                account_state.init_extension::<ImmutableOwner>().unwrap();
-                let mut memo_transfer = account_state.init_extension::<MemoTransfer>().unwrap();
+                account_state
+                    .init_extension::<ImmutableOwner>(true)
+                    .unwrap();
+                let mut memo_transfer = account_state.init_extension::<MemoTransfer>(true).unwrap();
                 memo_transfer.require_incoming_transfer_memos = true.into();
 
                 let token_account = AccountSharedData::from(Account {
@@ -7791,8 +7796,9 @@ pub mod tests {
                 mint_state.base = mint_base;
                 mint_state.pack_base();
                 mint_state.init_account_type().unwrap();
-                let mut mint_close_authority =
-                    mint_state.init_extension::<MintCloseAuthority>().unwrap();
+                let mut mint_close_authority = mint_state
+                    .init_extension::<MintCloseAuthority>(true)
+                    .unwrap();
                 mint_close_authority.close_authority =
                     OptionalNonZeroPubkey::try_from(Some(owner)).unwrap();
 

transaction-status/Cargo.toml

@@ -28,7 +28,7 @@ solana-vote-program = { path = "../programs/vote", version = "=1.10.35" }
 spl-associated-token-account = { version = "=1.0.5", features = ["no-entrypoint"] }
 spl-memo = { version = "=3.0.1", features = ["no-entrypoint"] }
 spl-token = { version = "=3.3.1", features = ["no-entrypoint"] }
-spl-token-2022 = { version = "=0.3.0", features = ["no-entrypoint"] }
+spl-token-2022 = { version = "=0.4.1", features = ["no-entrypoint"] }
 thiserror = "1.0"
 
 [package.metadata.docs.rs]

transaction-status/src/parse_token.rs

@@ -3,8 +3,8 @@ use {
         check_num_accounts, ParsableProgram, ParseInstructionError, ParsedInstructionEnum,
     },
     extension::{
-        default_account_state::*, memo_transfer::*, mint_close_authority::*, reallocate::*,
-        transfer_fee::*,
+        default_account_state::*, interest_bearing_mint::*, memo_transfer::*,
+        mint_close_authority::*, reallocate::*, transfer_fee::*,
     },
     serde_json::{json, Map, Value},
     solana_account_decoder::parse_token::{
@@ -227,7 +227,8 @@ pub fn parse_token(
                 | AuthorityType::FreezeAccount
                 | AuthorityType::TransferFeeConfig
                 | AuthorityType::WithheldWithdraw
-                | AuthorityType::CloseMint => "mint",
+                | AuthorityType::CloseMint
+                | AuthorityType::InterestRate => "mint",
                 AuthorityType::AccountOwner | AuthorityType::CloseAccount => "account",
             };
             let mut value = json!({
@@ -550,6 +551,27 @@ pub fn parse_token(
                 }),
             })
         }
+        TokenInstruction::InitializeNonTransferableMint => {
+            check_num_token_accounts(&instruction.accounts, 1)?;
+            Ok(ParsedInstructionEnum {
+                instruction_type: "initializeNonTransferableMint".to_string(),
+                info: json!({
+                    "mint": account_keys[instruction.accounts[0] as usize].to_string(),
+                }),
+            })
+        }
+        TokenInstruction::InterestBearingMintExtension => {
+            if instruction.data.len() < 2 {
+                return Err(ParseInstructionError::InstructionNotParsable(
+                    ParsableProgram::SplToken,
+                ));
+            }
+            parse_interest_bearing_mint_instruction(
+                &instruction.data[1..],
+                &instruction.accounts,
+                account_keys,
+            )
+        }
     }
 }
 
@@ -563,6 +585,7 @@ pub enum UiAuthorityType {
     TransferFeeConfig,
     WithheldWithdraw,
     CloseMint,
+    InterestRate,
 }
 
 impl From<AuthorityType> for UiAuthorityType {
@@ -575,6 +598,7 @@ impl From<AuthorityType> for UiAuthorityType {
             AuthorityType::TransferFeeConfig => UiAuthorityType::TransferFeeConfig,
             AuthorityType::WithheldWithdraw => UiAuthorityType::WithheldWithdraw,
             AuthorityType::CloseMint => UiAuthorityType::CloseMint,
+            AuthorityType::InterestRate => UiAuthorityType::InterestRate,
         }
     }
 }
@@ -591,6 +615,8 @@ pub enum UiExtensionType {
     DefaultAccountState,
     ImmutableOwner,
     MemoTransfer,
+    NonTransferable,
+    InterestBearingConfig,
 }
 
 impl From<ExtensionType> for UiExtensionType {
@@ -607,6 +633,8 @@ impl From<ExtensionType> for UiExtensionType {
             ExtensionType::DefaultAccountState => UiExtensionType::DefaultAccountState,
             ExtensionType::ImmutableOwner => UiExtensionType::ImmutableOwner,
             ExtensionType::MemoTransfer => UiExtensionType::MemoTransfer,
+            ExtensionType::NonTransferable => UiExtensionType::NonTransferable,
+            ExtensionType::InterestBearingConfig => UiExtensionType::InterestBearingConfig,
         }
     }
 }