Update spl-token to v2.0 (solana-labs#11884)

* Update account-decoder to spl-token v2.0 * Update transaction-status to spl-token v2.0 * Update rpc to spl-token v2.0 * Update getTokenSupply to pull from Mint directly * Fixup to spl-token v2.0.1
takeuchi5512 · Aug 28, 2020 · 76be36c · 76be36c
1 parent 0a8523b
commit 76be36c
Show file tree

Hide file tree

Showing 10 changed files with 984 additions and 369 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/account-decoder/Cargo.toml b/account-decoder/Cargo.toml
@@ -19,7 +19,7 @@ solana-config-program = { path = "../programs/config", version = "1.4.0" }
 solana-sdk = { path = "../sdk", version = "1.4.0" }
 solana-stake-program = { path = "../programs/stake", version = "1.4.0" }
 solana-vote-program = { path = "../programs/vote", version = "1.4.0" }
-spl-token-v1-0 = { package = "spl-token", version = "1.0.8", features = ["skip-no-mangle"] }
+spl-token-v2-0 = { package = "spl-token", version = "2.0.1", features = ["skip-no-mangle"] }
 serde = "1.0.112"
 serde_derive = "1.0.103"
 serde_json = "1.0.56"

diff --git a/account-decoder/src/parse_account_data.rs b/account-decoder/src/parse_account_data.rs
@@ -3,7 +3,7 @@ use crate::{
     parse_nonce::parse_nonce,
     parse_stake::parse_stake,
     parse_sysvar::parse_sysvar,
-    parse_token::{parse_token, spl_token_id_v1_0},
+    parse_token::{parse_token, spl_token_id_v2_0},
     parse_vote::parse_vote,
 };
 use inflector::Inflector;
@@ -17,7 +17,7 @@ lazy_static! {
     static ref STAKE_PROGRAM_ID: Pubkey = solana_stake_program::id();
     static ref SYSTEM_PROGRAM_ID: Pubkey = system_program::id();
     static ref SYSVAR_PROGRAM_ID: Pubkey = sysvar::id();
-    static ref TOKEN_PROGRAM_ID: Pubkey = spl_token_id_v1_0();
+    static ref TOKEN_PROGRAM_ID: Pubkey = spl_token_id_v2_0();
     static ref VOTE_PROGRAM_ID: Pubkey = solana_vote_program::id();
     pub static ref PARSABLE_PROGRAM_IDS: HashMap<Pubkey, ParsableAccount> = {
         let mut m = HashMap::new();