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

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

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 07:54:09 +00:00
committed by GitHub
parent b524e0a1a7
commit ff8f78199d
8 changed files with 149 additions and 241 deletions
Download Patch File Download Diff File Expand all files Collapse all files

145
programs/bpf/Cargo.lock generated
View File

@@ -3141,26 +3141,6 @@ dependencies = [
"tokio 1.1.1",
]
[[package]]
name = "solana-frozen-abi"
version = "1.6.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f81ac3925c8995d935d3af27390cf7b748a81837a29feb75a00e115f40dae6dc"
dependencies = [
"bs58",
"bv",
"generic-array 0.14.3",
"log",
"memmap2",
"rustc_version",
"serde",
"serde_derive",
"sha2 0.9.2",
"solana-frozen-abi-macro 1.6.4",
"solana-logger 1.6.4",
"thiserror",
]
[[package]]
name = "solana-frozen-abi"
version = "1.6.12"
@@ -3180,16 +3160,23 @@ dependencies = [
]
[[package]]
name = "solana-frozen-abi-macro"
version = "1.6.4"
name = "solana-frozen-abi"
version = "1.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ae448159038e470f3b2dd1ab0d219246211f940a10bf1e656a02cb5c2d897437"
checksum = "95c481f0f29753f5b2d382628abae98a1dd87b572ddc7cbe5fe55ca62b6f7f07"
dependencies = [
"lazy_static",
"proc-macro2 1.0.24",
"quote 1.0.6",
"bs58",
"bv",
"generic-array 0.14.3",
"log",
"memmap2",
"rustc_version",
"syn 1.0.60",
"serde",
"serde_derive",
"sha2 0.9.2",
"solana-frozen-abi-macro 1.7.1",
"solana-logger 1.7.1",
"thiserror",
]
[[package]]
@@ -3204,10 +3191,20 @@ dependencies = [
]
[[package]]
name = "solana-logger"
version = "1.6.4"
name = "solana-frozen-abi-macro"
version = "1.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7fa7bddd7b89c26c6e3ef4af9b47d6bc8d60888559affb5160f5ade18c0cd058"
checksum = "f2068bcc47160ac9081893439b10a05e4bbe85cc0f6bccb6f1b0815423fbdd0c"
dependencies = [
"proc-macro2 1.0.24",
"quote 1.0.6",
"rustc_version",
"syn 1.0.60",
]
[[package]]
name = "solana-logger"
version = "1.6.12"
dependencies = [
"env_logger",
"lazy_static",
@@ -3216,7 +3213,9 @@ dependencies = [
[[package]]
name = "solana-logger"
version = "1.6.12"
version = "1.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7ea5932e186629f47859924b3773cfd8bcb4b8796898ac85c1fa0a6a2024e5c6"
dependencies = [
"env_logger",
"lazy_static",
@@ -3265,38 +3264,6 @@ dependencies = [
"url",
]
[[package]]
name = "solana-program"
version = "1.6.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "231bf4cd42997b6f34e7c74a1449e8a1e8816fd83662fc3a5a0922da48fc667b"
dependencies = [
"bincode",
"borsh",
"borsh-derive",
"bs58",
"bv",
"curve25519-dalek 2.1.0",
"hex",
"itertools 0.9.0",
"lazy_static",
"log",
"num-derive 0.3.0",
"num-traits",
"rand 0.7.3",
"rustc_version",
"rustversion",
"serde",
"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",
"thiserror",
]
[[package]]
name = "solana-program"
version = "1.6.12"
@@ -3329,6 +3296,40 @@ dependencies = [
"thiserror",
]
[[package]]
name = "solana-program"
version = "1.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7a2df39c63e21c5b58e2012e7675bed5e8dd5100470ffddedcafb78f5a7e3abe"
dependencies = [
"bincode",
"blake3",
"borsh",
"borsh-derive",
"bs58",
"bv",
"curve25519-dalek 2.1.0",
"hex",
"itertools 0.9.0",
"lazy_static",
"log",
"num-derive 0.3.0",
"num-traits",
"rand 0.7.3",
"rustc_version",
"rustversion",
"serde",
"serde_bytes",
"serde_derive",
"sha2 0.9.2",
"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",
]
[[package]]
name = "solana-rayon-threadlimit"
version = "1.6.12"
@@ -3454,9 +3455,7 @@ dependencies = [
[[package]]
name = "solana-sdk-macro"
version = "1.6.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3c805f1e32677f8ec0cc0b2f470833a0d5ab0922f068e52be3a4a93b468c9c70"
version = "1.6.12"
dependencies = [
"bs58",
"proc-macro2 1.0.24",
@@ -3467,7 +3466,9 @@ dependencies = [
[[package]]
name = "solana-sdk-macro"
version = "1.6.12"
version = "1.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6473d8fa445520564c84e8803320721404d160ffd876a125326a726541f11534"
dependencies = [
"bs58",
"proc-macro2 1.0.24",
@@ -3595,7 +3596,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",
]
@@ -3605,20 +3606,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",
]