diff --git a/Cargo.lock b/Cargo.lock index 848dcabe7d..455e320c20 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4593,12 +4593,12 @@ dependencies = [ [[package]] name = "spl-token" -version = "1.0.6" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07c8482ae4aac6bb7d73aef79df5fb403a16a0cfbe200442532cff6b98613383" +checksum = "7e8bee8b59279b46d0627490b544c3bc38e440ff4da9851a34a26ab0a24bfe7d" dependencies = [ "cbindgen", - "num-derive 0.2.5", + "num-derive 0.3.0", "num-traits", "remove_dir_all", "solana-sdk 1.2.17", diff --git a/account-decoder/Cargo.toml b/account-decoder/Cargo.toml index e5a382c344..e052ce5b28 100644 --- a/account-decoder/Cargo.toml +++ b/account-decoder/Cargo.toml @@ -15,14 +15,14 @@ bs58 = "0.3.1" bv = "0.11.1" Inflector = "0.11.4" lazy_static = "1.4.0" +serde = "1.0.112" +serde_derive = "1.0.103" +serde_json = "1.0.54" solana-config-program = { path = "../programs/config", version = "1.2.26" } solana-sdk = { path = "../sdk", version = "1.2.26" } solana-stake-program = { path = "../programs/stake", version = "1.2.26" } solana-vote-program = { path = "../programs/vote", version = "1.2.26" } -spl-token-v1-0 = { package = "spl-token", version = "1.0.6", features = ["skip-no-mangle"] } -serde = "1.0.112" -serde_derive = "1.0.103" -serde_json = "1.0.54" +spl-token-v1-0 = { package = "spl-token", version = "1.0.8", features = ["skip-no-mangle"] } thiserror = "1.0" [package.metadata.docs.rs] diff --git a/core/Cargo.toml b/core/Cargo.toml index 846973890c..639d6f012a 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -67,7 +67,7 @@ solana-version = { path = "../version", version = "1.2.26" } solana-vote-program = { path = "../programs/vote", version = "1.2.26" } solana-vote-signer = { path = "../vote-signer", version = "1.2.26" } solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "1.2.26" } -spl-token-v1-0 = { package = "spl-token", version = "1.0.6", features = ["skip-no-mangle"] } +spl-token-v1-0 = { package = "spl-token", version = "1.0.8", features = ["skip-no-mangle"] } tempfile = "3.1.0" thiserror = "1.0" tokio = { version = "0.2.22", features = ["full"] } diff --git a/core/src/rpc.rs b/core/src/rpc.rs index 3eb9b5bb77..c7de1c404a 100644 --- a/core/src/rpc.rs +++ b/core/src/rpc.rs @@ -1356,9 +1356,7 @@ fn get_token_program_id_and_mint( /// program_id) and decimals fn get_mint_owner_and_decimals(bank: &Arc, mint: &Pubkey) -> Result<(Pubkey, u8)> { if mint == &spl_token_v1_0_native_mint() { - // Uncomment the following once spl_token is bumped to a version that includes native_mint::DECIMALS - // Ok((spl_token_id_v1_0(), spl_token_v1_0::native_mint::DECIMALS)) - Ok((spl_token_id_v1_0(), 9)) + Ok((spl_token_id_v1_0(), spl_token_v1_0::native_mint::DECIMALS)) } else { let mint_account = bank.get_account(mint).ok_or_else(|| { Error::invalid_params("Invalid param: could not find mint".to_string()) diff --git a/transaction-status/Cargo.toml b/transaction-status/Cargo.toml index 655074ffc5..295a3db6b1 100644 --- a/transaction-status/Cargo.toml +++ b/transaction-status/Cargo.toml @@ -14,13 +14,13 @@ bincode = "1.2.1" bs58 = "0.3.1" Inflector = "0.11.4" lazy_static = "1.4.0" -solana-account-decoder = { path = "../account-decoder", version = "1.2.26" } -solana-sdk = { path = "../sdk", version = "1.2.26" } -spl-memo-v1-0 = { package = "spl-memo", version = "1.0.7", features = ["skip-no-mangle"] } -spl-token-v1-0 = { package = "spl-token", version = "1.0.6", features = ["skip-no-mangle"] } serde = "1.0.110" serde_derive = "1.0.103" serde_json = "1.0.54" +solana-account-decoder = { path = "../account-decoder", version = "1.2.26" } +solana-sdk = { path = "../sdk", version = "1.2.26" } +spl-memo-v1-0 = { package = "spl-memo", version = "1.0.7", features = ["skip-no-mangle"] } +spl-token-v1-0 = { package = "spl-token", version = "1.0.8", features = ["skip-no-mangle"] } thiserror = "1.0" [package.metadata.docs.rs]