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

Bump spl-token to v3.1.1 (backport #17951) (#17958)

Browse Source 
* Bump spl-token to v3.1.1 (#17951)

(cherry picked from commit b7de369992)

# Conflicts:
#	Cargo.lock
#	account-decoder/Cargo.toml
#	accounts-cluster-bench/Cargo.toml
#	programs/bpf/Cargo.lock
#	rpc/Cargo.toml
#	tokens/Cargo.toml

* Fix conflicts

Co-authored-by: Tyera Eulberg <teulberg@gmail.com>
Co-authored-by: Tyera Eulberg <tyera@solana.com>
This commit is contained in:
mergify[bot]
2021-06-15 08:29:54 +00:00
committed by GitHub
parent d6f17517cb
commit 991f99b239
8 changed files with 52 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
Cargo.lock generated
View File

@ -4444,9 +4444,9 @@ dependencies = [
[[package]]
name = "solana-frozen-abi"
version = "1.6.4"
version = "1.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f81ac3925c8995d935d3af27390cf7b748a81837a29feb75a00e115f40dae6dc"
checksum = "95c481f0f29753f5b2d382628abae98a1dd87b572ddc7cbe5fe55ca62b6f7f07"
dependencies = [
"bs58",
"bv",
@ -4457,8 +4457,8 @@ dependencies = [
"serde",
"serde_derive",
"sha2 0.9.2",
"solana-frozen-abi-macro 1.6.4",
"solana-logger 1.6.4",
"solana-frozen-abi-macro 1.7.1",
"solana-logger 1.7.1",
"thiserror",
]
@ -4482,11 +4482,10 @@ dependencies = [
[[package]]
name = "solana-frozen-abi-macro"
version = "1.6.4"
version = "1.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ae448159038e470f3b2dd1ab0d219246211f940a10bf1e656a02cb5c2d897437"
checksum = "f2068bcc47160ac9081893439b10a05e4bbe85cc0f6bccb6f1b0815423fbdd0c"
dependencies = [
"lazy_static",
"proc-macro2 1.0.24",
"quote 1.0.6",
"rustc_version",
@ -4763,9 +4762,9 @@ dependencies = [
[[package]]
name = "solana-logger"
version = "1.6.4"
version = "1.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7fa7bddd7b89c26c6e3ef4af9b47d6bc8d60888559affb5160f5ade18c0cd058"
checksum = "7ea5932e186629f47859924b3773cfd8bcb4b8796898ac85c1fa0a6a2024e5c6"
dependencies = [
"env_logger",
"lazy_static",
@ -4949,11 +4948,12 @@ dependencies = [
[[package]]
name = "solana-program"
version = "1.6.4"
version = "1.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "231bf4cd42997b6f34e7c74a1449e8a1e8816fd83662fc3a5a0922da48fc667b"
checksum = "7a2df39c63e21c5b58e2012e7675bed5e8dd5100470ffddedcafb78f5a7e3abe"
dependencies = [
"bincode",
"blake3",
"borsh",
"borsh-derive",
"bs58",
@ -4972,10 +4972,11 @@ dependencies = [
"serde_bytes",
"serde_derive",
"sha2 0.9.2",
"solana-frozen-abi 1.6.4",
"solana-frozen-abi-macro 1.6.4",
"solana-logger 1.6.4",
"solana-sdk-macro 1.6.4",
"sha3",
"solana-frozen-abi 1.7.1",
"solana-frozen-abi-macro 1.7.1",
"solana-logger 1.7.1",
"solana-sdk-macro 1.7.1",
"thiserror",
]
@ -5224,9 +5225,9 @@ dependencies = [
[[package]]
name = "solana-sdk-macro"
version = "1.6.4"
version = "1.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3c805f1e32677f8ec0cc0b2f470833a0d5ab0922f068e52be3a4a93b468c9c70"
checksum = "6473d8fa445520564c84e8803320721404d160ffd876a125326a726541f11534"
dependencies = [
"bs58",
"proc-macro2 1.0.24",
@ -5596,7 +5597,7 @@ version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4adc47eebe5d2b662cbaaba1843719c28a67e5ec5d0460bc3ca60900a51f74e2"
dependencies = [
"solana-program 1.6.4",
"solana-program 1.7.1",
"spl-token",
]
@ -5606,20 +5607,20 @@ version = "3.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bd0dc6f70db6bacea7ff25870b016a65ba1d1b6013536f08e4fd79a8f9005325"
dependencies = [
"solana-program 1.6.4",
"solana-program 1.7.1",
]
[[package]]
name = "spl-token"
version = "3.1.0"
version = "3.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b795e50d15dfd35aa5460b80a16414503a322be115a417a43db987c5824c6798"
checksum = "fbfa8fd791aeb4d7ad5fedb7872478de9f4e8b4fcb02dfd9e7f2f9ae3f3ddd73"
dependencies = [
"arrayref",
"num-derive",
"num-traits",
"num_enum",
"solana-program 1.6.4",
"solana-program 1.7.1",
"thiserror",
]

2
account-decoder/Cargo.toml
View File

@ -23,7 +23,7 @@ solana-config-program = { path = "../programs/config", version = "=1.7.2" }
solana-sdk = { path = "../sdk", version = "=1.7.2" }
solana-stake-program = { path = "../programs/stake", version = "=1.7.2" }
solana-vote-program = { path = "../programs/vote", version = "=1.7.2" }
spl-token-v2-0 = { package = "spl-token", version = "=3.1.0", features = ["no-entrypoint"] }
spl-token-v2-0 = { package = "spl-token", version = "=3.1.1", features = ["no-entrypoint"] }
thiserror = "1.0"
zstd = "0.5.1"

2
accounts-cluster-bench/Cargo.toml
View File

@ -26,7 +26,7 @@ solana-runtime = { path = "../runtime", version = "=1.7.2" }
solana-sdk = { path = "../sdk", version = "=1.7.2" }
solana-transaction-status = { path = "../transaction-status", version = "=1.7.2" }
solana-version = { path = "../version", version = "=1.7.2" }
spl-token-v2-0 = { package = "spl-token", version = "=3.1.0", features = ["no-entrypoint"] }
spl-token-v2-0 = { package = "spl-token", version = "=3.1.1", features = ["no-entrypoint"] }
[dev-dependencies]
solana-local-cluster = { path = "../local-cluster", version = "=1.7.2" }

2
core/Cargo.toml
View File

@ -67,7 +67,7 @@ solana-streamer = { path = "../streamer", version = "=1.7.2" }
solana-transaction-status = { path = "../transaction-status", version = "=1.7.2" }
solana-version = { path = "../version", version = "=1.7.2" }
solana-vote-program = { path = "../programs/vote", version = "=1.7.2" }
spl-token-v2-0 = { package = "spl-token", version = "=3.1.0", features = ["no-entrypoint"] }
spl-token-v2-0 = { package = "spl-token", version = "=3.1.1", features = ["no-entrypoint"] }
tempfile = "3.1.0"
thiserror = "1.0"
solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "=1.7.2" }

45
programs/bpf/Cargo.lock generated
View File

@ -3223,9 +3223,9 @@ dependencies = [
[[package]]
name = "solana-frozen-abi"
version = "1.6.4"
version = "1.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f81ac3925c8995d935d3af27390cf7b748a81837a29feb75a00e115f40dae6dc"
checksum = "95c481f0f29753f5b2d382628abae98a1dd87b572ddc7cbe5fe55ca62b6f7f07"
dependencies = [
"bs58",
"bv",
@ -3236,8 +3236,8 @@ dependencies = [
"serde",
"serde_derive",
"sha2 0.9.2",
"solana-frozen-abi-macro 1.6.4",
"solana-logger 1.6.4",
"solana-frozen-abi-macro 1.7.1",
"solana-logger 1.7.1",
"thiserror",
]
@ -3261,11 +3261,10 @@ dependencies = [
[[package]]
name = "solana-frozen-abi-macro"
version = "1.6.4"
version = "1.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ae448159038e470f3b2dd1ab0d219246211f940a10bf1e656a02cb5c2d897437"
checksum = "f2068bcc47160ac9081893439b10a05e4bbe85cc0f6bccb6f1b0815423fbdd0c"
dependencies = [
"lazy_static",
"proc-macro2 1.0.24",
"quote 1.0.6",
"rustc_version",
@ -3284,9 +3283,9 @@ dependencies = [
[[package]]
name = "solana-logger"
version = "1.6.4"
version = "1.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7fa7bddd7b89c26c6e3ef4af9b47d6bc8d60888559affb5160f5ade18c0cd058"
checksum = "7ea5932e186629f47859924b3773cfd8bcb4b8796898ac85c1fa0a6a2024e5c6"
dependencies = [
"env_logger",
"lazy_static",
@ -3344,11 +3343,12 @@ dependencies = [
[[package]]
name = "solana-program"
version = "1.6.4"
version = "1.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "231bf4cd42997b6f34e7c74a1449e8a1e8816fd83662fc3a5a0922da48fc667b"
checksum = "7a2df39c63e21c5b58e2012e7675bed5e8dd5100470ffddedcafb78f5a7e3abe"
dependencies = [
"bincode",
"blake3",
"borsh",
"borsh-derive",
"bs58",
@ -3367,10 +3367,11 @@ dependencies = [
"serde_bytes",
"serde_derive",
"sha2 0.9.2",
"solana-frozen-abi 1.6.4",
"solana-frozen-abi-macro 1.6.4",
"solana-logger 1.6.4",
"solana-sdk-macro 1.6.4",
"sha3",
"solana-frozen-abi 1.7.1",
"solana-frozen-abi-macro 1.7.1",
"solana-logger 1.7.1",
"solana-sdk-macro 1.7.1",
"thiserror",
]
@ -3555,9 +3556,9 @@ dependencies = [
[[package]]
name = "solana-sdk-macro"
version = "1.6.4"
version = "1.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3c805f1e32677f8ec0cc0b2f470833a0d5ab0922f068e52be3a4a93b468c9c70"
checksum = "6473d8fa445520564c84e8803320721404d160ffd876a125326a726541f11534"
dependencies = [
"bs58",
"proc-macro2 1.0.24",
@ -3697,7 +3698,7 @@ version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4adc47eebe5d2b662cbaaba1843719c28a67e5ec5d0460bc3ca60900a51f74e2"
dependencies = [
"solana-program 1.6.4",
"solana-program 1.7.1",
"spl-token",
]
@ -3707,20 +3708,20 @@ version = "3.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bd0dc6f70db6bacea7ff25870b016a65ba1d1b6013536f08e4fd79a8f9005325"
dependencies = [
"solana-program 1.6.4",
"solana-program 1.7.1",
]
[[package]]
name = "spl-token"
version = "3.1.0"
version = "3.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b795e50d15dfd35aa5460b80a16414503a322be115a417a43db987c5824c6798"
checksum = "fbfa8fd791aeb4d7ad5fedb7872478de9f4e8b4fcb02dfd9e7f2f9ae3f3ddd73"
dependencies = [
"arrayref",
"num-derive 0.3.0",
"num-traits",
"num_enum",
"solana-program 1.6.4",
"solana-program 1.7.1",
"thiserror",
]

2
rpc/Cargo.toml
View File

@ -43,7 +43,7 @@ solana-storage-bigtable = { path = "../storage-bigtable", version = "=1.7.2" }
solana-transaction-status = { path = "../transaction-status", version = "=1.7.2" }
solana-version = { path = "../version", version = "=1.7.2" }
solana-vote-program = { path = "../programs/vote", version = "=1.7.2" }
spl-token-v2-0 = { package = "spl-token", version = "=3.1.0", features = ["no-entrypoint"] }
spl-token-v2-0 = { package = "spl-token", version = "=3.1.1", features = ["no-entrypoint"] }
tokio = { version = "1", features = ["full"] }
tokio_02 = { version = "0.2", package = "tokio", features = ["full"] }
tokio-util = { version = "0.3", features = ["codec"] } # This crate needs to stay in sync with tokio_02, until that dependency can be removed

2
tokens/Cargo.toml
View File

@ -31,7 +31,7 @@ solana-stake-program = { path = "../programs/stake", version = "=1.7.2" }
solana-transaction-status = { path = "../transaction-status", version = "=1.7.2" }
solana-version = { path = "../version", version = "=1.7.2" }
spl-associated-token-account-v1-0 = { package = "spl-associated-token-account", version = "=1.0.2" }
spl-token-v2-0 = { package = "spl-token", version = "=3.1.0", features = ["no-entrypoint"] }
spl-token-v2-0 = { package = "spl-token", version = "=3.1.1", features = ["no-entrypoint"] }
tempfile = "3.1.0"
thiserror = "1.0"

2
transaction-status/Cargo.toml
View File

@ -25,7 +25,7 @@ solana-stake-program = { path = "../programs/stake", version = "=1.7.2" }
solana-vote-program = { path = "../programs/vote", version = "=1.7.2" }
spl-associated-token-account-v1-0 = { package = "spl-associated-token-account", version = "=1.0.2", features = ["no-entrypoint"] }
spl-memo = { version = "=3.0.1", features = ["no-entrypoint"] }
spl-token-v2-0 = { package = "spl-token", version = "=3.1.0", features = ["no-entrypoint"] }
spl-token-v2-0 = { package = "spl-token", version = "=3.1.1", features = ["no-entrypoint"] }
thiserror = "1.0"
[package.metadata.docs.rs]