gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Bump spl-token to clean up magic number (bp #11726) (#11738)

Browse Source 
* Bump spl-token to clean up magic number (#11726)

(cherry picked from commit 2fd2aceeb2)

# Conflicts:
#	account-decoder/Cargo.toml
#	core/Cargo.toml

* Fix conflicts and toml order

Co-authored-by: Tyera Eulberg <teulberg@gmail.com>
Co-authored-by: Tyera Eulberg <tyera@solana.com>
This commit is contained in:
mergify[bot]
2020-08-20 18:02:28 +00:00
committed by GitHub
parent e938925b95
commit e41d9c87c5
5 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Cargo.lock generated
View File

@ -4629,12 +4629,12 @@ dependencies = [
[[package]] [[package]]
name = "spl-token" name = "spl-token"
version = "1.0.6" version = "1.0.8"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "07c8482ae4aac6bb7d73aef79df5fb403a16a0cfbe200442532cff6b98613383" checksum = "7e8bee8b59279b46d0627490b544c3bc38e440ff4da9851a34a26ab0a24bfe7d"
dependencies = [ dependencies = [
"cbindgen", "cbindgen",
"num-derive 0.2.5", "num-derive 0.3.0",
"num-traits", "num-traits",
"remove_dir_all", "remove_dir_all",
"solana-sdk 1.2.17", "solana-sdk 1.2.17",

8
account-decoder/Cargo.toml
View File

@ -15,14 +15,14 @@ bs58 = "0.3.1"
bv = "0.11.1" bv = "0.11.1"
Inflector = "0.11.4" Inflector = "0.11.4"
lazy_static = "1.4.0" lazy_static = "1.4.0"
serde = "1.0.112"
serde_derive = "1.0.103"
serde_json = "1.0.56"
solana-config-program = { path = "../programs/config", version = "1.3.5" } solana-config-program = { path = "../programs/config", version = "1.3.5" }
solana-sdk = { path = "../sdk", version = "1.3.5" } solana-sdk = { path = "../sdk", version = "1.3.5" }
solana-stake-program = { path = "../programs/stake", version = "1.3.5" } solana-stake-program = { path = "../programs/stake", version = "1.3.5" }
solana-vote-program = { path = "../programs/vote", version = "1.3.5" } solana-vote-program = { path = "../programs/vote", version = "1.3.5" }
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"] }
serde = "1.0.112"
serde_derive = "1.0.103"
serde_json = "1.0.56"
thiserror = "1.0" thiserror = "1.0"
[package.metadata.docs.rs] [package.metadata.docs.rs]

2
core/Cargo.toml
View File

@ -69,7 +69,7 @@ solana-transaction-status = { path = "../transaction-status", version = "1.3.5"
solana-version = { path = "../version", version = "1.3.5" } solana-version = { path = "../version", version = "1.3.5" }
solana-vote-program = { path = "../programs/vote", version = "1.3.5" } solana-vote-program = { path = "../programs/vote", version = "1.3.5" }
solana-vote-signer = { path = "../vote-signer", version = "1.3.5" } solana-vote-signer = { path = "../vote-signer", version = "1.3.5" }
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" tempfile = "3.1.0"
thiserror = "1.0" thiserror = "1.0"
tokio_01 = { version = "0.1", package = "tokio" } tokio_01 = { version = "0.1", package = "tokio" }

4
core/src/rpc.rs
View File

@ -1388,9 +1388,7 @@ fn get_token_program_id_and_mint(
/// program_id) and decimals /// program_id) and decimals
fn get_mint_owner_and_decimals(bank: &Arc<Bank>, mint: &Pubkey) -> Result<(Pubkey, u8)> { fn get_mint_owner_and_decimals(bank: &Arc<Bank>, mint: &Pubkey) -> Result<(Pubkey, u8)> {
if mint == &spl_token_v1_0_native_mint() { 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(), spl_token_v1_0::native_mint::DECIMALS))
Ok((spl_token_id_v1_0(), 9))
} else { } else {
let mint_account = bank.get_account(mint).ok_or_else(|| { let mint_account = bank.get_account(mint).ok_or_else(|| {
Error::invalid_params("Invalid param: could not find mint".to_string()) Error::invalid_params("Invalid param: could not find mint".to_string())

2
transaction-status/Cargo.toml
View File

@ -19,7 +19,7 @@ solana-sdk = { path = "../sdk", version = "1.3.5" }
solana-stake-program = { path = "../programs/stake", version = "1.3.5" } solana-stake-program = { path = "../programs/stake", version = "1.3.5" }
solana-vote-program = { path = "../programs/vote", version = "1.3.5" } solana-vote-program = { path = "../programs/vote", version = "1.3.5" }
spl-memo-v1-0 = { package = "spl-memo", version = "1.0.7", features = ["skip-no-mangle"] } 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"] } spl-token-v1-0 = { package = "spl-token", version = "1.0.8", features = ["skip-no-mangle"] }
serde = "1.0.112" serde = "1.0.112"
serde_derive = "1.0.103" serde_derive = "1.0.103"
serde_json = "1.0.56" serde_json = "1.0.56"