rpc: Include interest-bearing configuration for UI amount calculation (solana-labs#1549)

* Plumb new SplTokenAdditionalData everywhere

* account-decoder: Calculate ui amount with interest

* rpc / ledger: Populate interest bearing information

* rpc: Test interest-bearing config

* Deprecate `parse_token` for `parse_token_v2`

* Deprecate parse_account_data and AccountAdditionalData for v2

* Deprecate token_amount_to_ui_amount -> v2

* Make get_mint_owner_and_additional_data pub(crate)

* ledger: Revert changes, always use raw amount

Author: joncinque

account-decoder/src/lib.rs

@@ -18,7 +18,7 @@ pub mod parse_vote;
 pub mod validator_info;
 
 use {
-    crate::parse_account_data::{parse_account_data, AccountAdditionalData, ParsedAccount},
+    crate::parse_account_data::{parse_account_data_v2, AccountAdditionalDataV2, ParsedAccount},
     base64::{prelude::BASE64_STANDARD, Engine},
     solana_sdk::{
         account::{ReadableAccount, WritableAccount},
@@ -108,7 +108,7 @@ impl UiAccount {
         pubkey: &Pubkey,
         account: &T,
         encoding: UiAccountEncoding,
-        additional_data: Option<AccountAdditionalData>,
+        additional_data: Option<AccountAdditionalDataV2>,
         data_slice_config: Option<UiDataSliceConfig>,
     ) -> Self {
         let space = account.data().len();
@@ -142,7 +142,7 @@ impl UiAccount {
             }
             UiAccountEncoding::JsonParsed => {
                 if let Ok(parsed_data) =
-                    parse_account_data(pubkey, account.owner(), account.data(), additional_data)
+                    parse_account_data_v2(pubkey, account.owner(), account.data(), additional_data)
                 {
                     UiAccountData::Json(parsed_data)
                 } else {

account-decoder/src/parse_account_data.rs

@@ -3,14 +3,15 @@ use {
         parse_address_lookup_table::parse_address_lookup_table,
         parse_bpf_loader::parse_bpf_upgradeable_loader, parse_config::parse_config,
         parse_nonce::parse_nonce, parse_stake::parse_stake, parse_sysvar::parse_sysvar,
-        parse_token::parse_token, parse_vote::parse_vote,
+        parse_token::parse_token_v2, parse_vote::parse_vote,
     },
     inflector::Inflector,
     serde_json::Value,
     solana_sdk::{
-        address_lookup_table, instruction::InstructionError, pubkey::Pubkey, stake, system_program,
-        sysvar, vote,
+        address_lookup_table, clock::UnixTimestamp, instruction::InstructionError, pubkey::Pubkey,
+        stake, system_program, sysvar, vote,
     },
+    spl_token_2022::extension::interest_bearing_mint::InterestBearingConfig,
     std::collections::HashMap,
     thiserror::Error,
 };
@@ -84,16 +85,57 @@ pub enum ParsableAccount {
     Vote,
 }
 
+#[deprecated(since = "2.0.0", note = "Use `AccountAdditionalDataV2` instead")]
 #[derive(Clone, Copy, Default)]
 pub struct AccountAdditionalData {
     pub spl_token_decimals: Option<u8>,
 }
 
+#[derive(Clone, Copy, Default)]
+pub struct AccountAdditionalDataV2 {
+    pub spl_token_additional_data: Option<SplTokenAdditionalData>,
+}
+
+#[derive(Clone, Copy, Default)]
+pub struct SplTokenAdditionalData {
+    pub decimals: u8,
+    pub interest_bearing_config: Option<(InterestBearingConfig, UnixTimestamp)>,
+}
+
+impl SplTokenAdditionalData {
+    pub fn with_decimals(decimals: u8) -> Self {
+        Self {
+            decimals,
+            ..Default::default()
+        }
+    }
+}
+
+#[deprecated(since = "2.0.0", note = "Use `parse_account_data_v2` instead")]
+#[allow(deprecated)]
 pub fn parse_account_data(
     pubkey: &Pubkey,
     program_id: &Pubkey,
     data: &[u8],
     additional_data: Option<AccountAdditionalData>,
+) -> Result<ParsedAccount, ParseAccountError> {
+    parse_account_data_v2(
+        pubkey,
+        program_id,
+        data,
+        additional_data.map(|d| AccountAdditionalDataV2 {
+            spl_token_additional_data: d
+                .spl_token_decimals
+                .map(SplTokenAdditionalData::with_decimals),
+        }),
+    )
+}
+
+pub fn parse_account_data_v2(
+    pubkey: &Pubkey,
+    program_id: &Pubkey,
+    data: &[u8],
+    additional_data: Option<AccountAdditionalDataV2>,
 ) -> Result<ParsedAccount, ParseAccountError> {
     let program_name = PARSABLE_PROGRAM_IDS
         .get(program_id)
@@ -108,9 +150,9 @@ pub fn parse_account_data(
         }
         ParsableAccount::Config => serde_json::to_value(parse_config(data, pubkey)?)?,
         ParsableAccount::Nonce => serde_json::to_value(parse_nonce(data)?)?,
-        ParsableAccount::SplToken | ParsableAccount::SplToken2022 => {
-            serde_json::to_value(parse_token(data, additional_data.spl_token_decimals)?)?
-        }
+        ParsableAccount::SplToken | ParsableAccount::SplToken2022 => serde_json::to_value(
+            parse_token_v2(data, additional_data.spl_token_additional_data.as_ref())?,
+        )?,
         ParsableAccount::Stake => serde_json::to_value(parse_stake(data)?)?,
         ParsableAccount::Sysvar => serde_json::to_value(parse_sysvar(data, pubkey)?)?,
         ParsableAccount::Vote => serde_json::to_value(parse_vote(data)?)?,
@@ -143,13 +185,13 @@ mod test {
         let account_pubkey = solana_sdk::pubkey::new_rand();
         let other_program = solana_sdk::pubkey::new_rand();
         let data = vec![0; 4];
-        assert!(parse_account_data(&account_pubkey, &other_program, &data, None).is_err());
+        assert!(parse_account_data_v2(&account_pubkey, &other_program, &data, None).is_err());
 
         let vote_state = VoteState::default();
         let mut vote_account_data: Vec<u8> = vec![0; VoteState::size_of()];
         let versioned = VoteStateVersions::new_current(vote_state);
         VoteState::serialize(&versioned, &mut vote_account_data).unwrap();
-        let parsed = parse_account_data(
+        let parsed = parse_account_data_v2(
             &account_pubkey,
             &vote_program_id(),
             &vote_account_data,
@@ -161,7 +203,7 @@ mod test {
 
         let nonce_data = Versions::new(State::Initialized(Data::default()));
         let nonce_account_data = bincode::serialize(&nonce_data).unwrap();
-        let parsed = parse_account_data(
+        let parsed = parse_account_data_v2(
             &account_pubkey,
             &system_program::id(),
             &nonce_account_data,