Bump spl-token-2022 (#27181)

* Bump token-2022 to 0.4.3

* Allow cargo to bump stuff to v1.11.5
This commit is contained in:
Tyera Eulberg 2022-08-16 14:47:12 -07:00 committed by GitHub
parent 9fb7ec77c8
commit 74f487c828
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 111 additions and 91 deletions

96
Cargo.lock generated
View File

@ -3122,15 +3122,6 @@ dependencies = [
"crypto-mac",
]
[[package]]
name = "pbkdf2"
version = "0.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "271779f35b581956db91a3e55737327a03aa051e90b1c47aeb189508533adfd7"
dependencies = [
"digest 0.10.3",
]
[[package]]
name = "pbkdf2"
version = "0.11.0"
@ -5203,23 +5194,35 @@ dependencies = [
[[package]]
name = "solana-frozen-abi"
version = "1.10.33"
version = "1.11.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "49a5d3280421bb53fc12bdba1eaa505153fb4f99a06b5609dae22192652ead3b"
checksum = "28e4e35bc58c465f161bde764ebce41fdfcb503583cf3a77e0211274cc12b22d"
dependencies = [
"ahash",
"blake3",
"block-buffer 0.9.0",
"bs58",
"bv",
"byteorder",
"cc",
"either",
"generic-array 0.14.5",
"getrandom 0.1.16",
"hashbrown 0.12.3",
"im",
"lazy_static",
"log",
"memmap2",
"once_cell",
"rand_core 0.6.3",
"rustc_version 0.4.0",
"serde",
"serde_bytes",
"serde_derive",
"serde_json",
"sha2 0.10.2",
"solana-frozen-abi-macro 1.10.33",
"solana-frozen-abi-macro 1.11.5",
"subtle",
"thiserror",
]
@ -5258,9 +5261,9 @@ dependencies = [
[[package]]
name = "solana-frozen-abi-macro"
version = "1.10.33"
version = "1.11.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "635c60ac96b1347af272c625465068b908aff919d19f29b5795a44310310494d"
checksum = "708f837d748e574b1e53b250ab1f4a69ba330bbc10d041d02381165f0f36291a"
dependencies = [
"proc-macro2 1.0.41",
"quote 1.0.18",
@ -5576,9 +5579,9 @@ dependencies = [
[[package]]
name = "solana-logger"
version = "1.10.33"
version = "1.11.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b12cb6e6f1f9c9876d356c928b8c2ac532f6715e7cd2a1b4343d747bee3eca73"
checksum = "e7ea6fc68d63d33d862d919d4c8ad7f613ec243ccf6762d595c660020b289b57"
dependencies = [
"env_logger",
"lazy_static",
@ -5747,9 +5750,9 @@ dependencies = [
[[package]]
name = "solana-program"
version = "1.10.33"
version = "1.11.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "eeecf504cee2821b006871f70e7a1f54db15f914cedf259eaf5976fe606470f0"
checksum = "bdd314d85b171bb20ccdcaf07346a9d52a012b10d84f4706f0628813d002fef8"
dependencies = [
"base64 0.13.0",
"bincode",
@ -5760,31 +5763,38 @@ dependencies = [
"bs58",
"bv",
"bytemuck",
"cc",
"console_error_panic_hook",
"console_log",
"curve25519-dalek",
"getrandom 0.1.16",
"getrandom 0.2.3",
"itertools",
"js-sys",
"lazy_static",
"libc",
"libsecp256k1",
"log",
"memoffset",
"num-derive",
"num-traits",
"parking_lot 0.12.1",
"rand 0.7.3",
"rand_chacha 0.2.2",
"rustc_version 0.4.0",
"rustversion",
"serde",
"serde_bytes",
"serde_derive",
"serde_json",
"sha2 0.10.2",
"sha3 0.10.2",
"solana-frozen-abi 1.10.33",
"solana-frozen-abi-macro 1.10.33",
"solana-sdk-macro 1.10.33",
"solana-frozen-abi 1.11.5",
"solana-frozen-abi-macro 1.11.5",
"solana-sdk-macro 1.11.5",
"thiserror",
"tiny-bip39",
"wasm-bindgen",
"zeroize",
]
[[package]]
@ -6055,9 +6065,9 @@ dependencies = [
[[package]]
name = "solana-sdk"
version = "1.10.33"
version = "1.11.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "636f6c615aca6f75e22b6baceaf0ffed9d74367f9320b07ed57cd9b5ce2e4ff9"
checksum = "ad7d954df63b267857e26670e3aacfd8e2943ca703653b0418e5afc85046c2f3"
dependencies = [
"assert_matches",
"base64 0.13.0",
@ -6082,7 +6092,7 @@ dependencies = [
"memmap2",
"num-derive",
"num-traits",
"pbkdf2 0.10.1",
"pbkdf2 0.11.0",
"qstring",
"rand 0.7.3",
"rand_chacha 0.2.2",
@ -6094,11 +6104,11 @@ dependencies = [
"serde_json",
"sha2 0.10.2",
"sha3 0.10.2",
"solana-frozen-abi 1.10.33",
"solana-frozen-abi-macro 1.10.33",
"solana-logger 1.10.33",
"solana-program 1.10.33",
"solana-sdk-macro 1.10.33",
"solana-frozen-abi 1.11.5",
"solana-frozen-abi-macro 1.11.5",
"solana-logger 1.11.5",
"solana-program 1.11.5",
"solana-sdk-macro 1.11.5",
"thiserror",
"uriparse",
"wasm-bindgen",
@ -6160,9 +6170,9 @@ dependencies = [
[[package]]
name = "solana-sdk-macro"
version = "1.10.33"
version = "1.11.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2b8bcac4394644f21dc013e932a7df9f536fcecef3e5df43fe362b4ec532ce30"
checksum = "d0d9e81bc46edcc517b2df504856d57a5101c7586ec63f3143ae11fbe2eba613"
dependencies = [
"bs58",
"proc-macro2 1.0.41",
@ -6575,9 +6585,9 @@ dependencies = [
[[package]]
name = "solana-zk-token-sdk"
version = "1.10.33"
version = "1.11.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "410ee53a26ac91098c289c983863535d4fbb6604b229ae1159503f48fa4fc90f"
checksum = "62415c05a9ebfffaf8befaa61b24492ebf88269cf84cbeba714bac4125ec4ea3"
dependencies = [
"aes-gcm-siv",
"arrayref",
@ -6596,8 +6606,8 @@ dependencies = [
"serde",
"serde_json",
"sha3 0.9.1",
"solana-program 1.10.33",
"solana-sdk 1.10.33",
"solana-program 1.11.5",
"solana-sdk 1.11.5",
"subtle",
"thiserror",
"zeroize",
@ -6681,7 +6691,7 @@ dependencies = [
"borsh",
"num-derive",
"num-traits",
"solana-program 1.10.33",
"solana-program 1.11.5",
"spl-token",
"spl-token-2022",
"thiserror",
@ -6693,7 +6703,7 @@ version = "3.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bd0dc6f70db6bacea7ff25870b016a65ba1d1b6013536f08e4fd79a8f9005325"
dependencies = [
"solana-program 1.10.33",
"solana-program 1.11.5",
]
[[package]]
@ -6707,23 +6717,23 @@ dependencies = [
"num-derive",
"num-traits",
"num_enum",
"solana-program 1.10.33",
"solana-program 1.11.5",
"thiserror",
]
[[package]]
name = "spl-token-2022"
version = "0.4.2"
version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f0a97cbf60b91b610c846ccf8eecca96d92a24a19ffbf9fe06cd0c84e76ec45e"
checksum = "e4c0ebca4740cc4c892aa31e07d0b4dc1a24cac4748376d4b34f8eb0fee9ff46"
dependencies = [
"arrayref",
"bytemuck",
"num-derive",
"num-traits",
"num_enum",
"solana-program 1.10.33",
"solana-zk-token-sdk 1.10.33",
"solana-program 1.11.5",
"solana-zk-token-sdk 1.11.5",
"spl-memo",
"spl-token",
"thiserror",

View File

@ -24,7 +24,7 @@ solana-config-program = { path = "../programs/config", version = "=1.12.0" }
solana-sdk = { path = "../sdk", version = "=1.12.0" }
solana-vote-program = { path = "../programs/vote", version = "=1.12.0" }
spl-token = { version = "=3.5.0", features = ["no-entrypoint"] }
spl-token-2022 = { version = "=0.4.2", features = ["no-entrypoint"] }
spl-token-2022 = { version = "=0.4.3", features = ["no-entrypoint"] }
thiserror = "1.0"
zstd = "0.11.2"

View File

@ -49,7 +49,7 @@ solana-streamer = { path = "../streamer", version = "=1.12.0" }
solana-transaction-status = { path = "../transaction-status", version = "=1.12.0" }
solana-version = { path = "../version", version = "=1.12.0" }
solana-vote-program = { path = "../programs/vote", version = "=1.12.0" }
spl-token-2022 = { version = "=0.4.2", features = ["no-entrypoint"] }
spl-token-2022 = { version = "=0.4.3", features = ["no-entrypoint"] }
thiserror = "1.0"
tokio = { version = "1", features = ["full"] }
tokio-stream = "0.1.9"

View File

@ -52,7 +52,7 @@ solana-storage-proto = { path = "../storage-proto", version = "=1.12.0" }
solana-transaction-status = { path = "../transaction-status", version = "=1.12.0" }
solana-vote-program = { path = "../programs/vote", version = "=1.12.0" }
spl-token = { version = "=3.5.0", features = ["no-entrypoint"] }
spl-token-2022 = { version = "=0.4.2", features = ["no-entrypoint"] }
spl-token-2022 = { version = "=0.4.3", features = ["no-entrypoint"] }
static_assertions = "1.1.0"
tempfile = "3.3.0"
thiserror = "1.0"

View File

@ -2906,15 +2906,6 @@ dependencies = [
"crypto-mac",
]
[[package]]
name = "pbkdf2"
version = "0.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "271779f35b581956db91a3e55737327a03aa051e90b1c47aeb189508533adfd7"
dependencies = [
"digest 0.10.3",
]
[[package]]
name = "pbkdf2"
version = "0.11.0"
@ -4840,23 +4831,35 @@ dependencies = [
[[package]]
name = "solana-frozen-abi"
version = "1.10.33"
version = "1.11.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "49a5d3280421bb53fc12bdba1eaa505153fb4f99a06b5609dae22192652ead3b"
checksum = "28e4e35bc58c465f161bde764ebce41fdfcb503583cf3a77e0211274cc12b22d"
dependencies = [
"ahash",
"blake3",
"block-buffer 0.9.0",
"bs58",
"bv",
"byteorder 1.4.3",
"cc",
"either",
"generic-array 0.14.5",
"getrandom 0.1.14",
"hashbrown 0.12.3",
"im",
"lazy_static",
"log",
"memmap2",
"once_cell",
"rand_core 0.6.3",
"rustc_version",
"serde",
"serde_bytes",
"serde_derive",
"serde_json",
"sha2 0.10.2",
"solana-frozen-abi-macro 1.10.33",
"solana-frozen-abi-macro 1.11.5",
"subtle",
"thiserror",
]
@ -4894,9 +4897,9 @@ dependencies = [
[[package]]
name = "solana-frozen-abi-macro"
version = "1.10.33"
version = "1.11.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "635c60ac96b1347af272c625465068b908aff919d19f29b5795a44310310494d"
checksum = "708f837d748e574b1e53b250ab1f4a69ba330bbc10d041d02381165f0f36291a"
dependencies = [
"proc-macro2 1.0.41",
"quote 1.0.18",
@ -5055,9 +5058,9 @@ dependencies = [
[[package]]
name = "solana-logger"
version = "1.10.33"
version = "1.11.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b12cb6e6f1f9c9876d356c928b8c2ac532f6715e7cd2a1b4343d747bee3eca73"
checksum = "e7ea6fc68d63d33d862d919d4c8ad7f613ec243ccf6762d595c660020b289b57"
dependencies = [
"env_logger",
"lazy_static",
@ -5166,9 +5169,9 @@ dependencies = [
[[package]]
name = "solana-program"
version = "1.10.33"
version = "1.11.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "eeecf504cee2821b006871f70e7a1f54db15f914cedf259eaf5976fe606470f0"
checksum = "bdd314d85b171bb20ccdcaf07346a9d52a012b10d84f4706f0628813d002fef8"
dependencies = [
"base64 0.13.0",
"bincode",
@ -5179,31 +5182,38 @@ dependencies = [
"bs58",
"bv",
"bytemuck",
"cc",
"console_error_panic_hook",
"console_log",
"curve25519-dalek",
"getrandom 0.1.14",
"getrandom 0.2.4",
"itertools",
"js-sys",
"lazy_static",
"libc",
"libsecp256k1 0.6.0",
"log",
"memoffset",
"num-derive",
"num-traits",
"parking_lot 0.12.1",
"rand 0.7.3",
"rand_chacha 0.2.2",
"rustc_version",
"rustversion",
"serde",
"serde_bytes",
"serde_derive",
"serde_json",
"sha2 0.10.2",
"sha3 0.10.2",
"solana-frozen-abi 1.10.33",
"solana-frozen-abi-macro 1.10.33",
"solana-sdk-macro 1.10.33",
"solana-frozen-abi 1.11.5",
"solana-frozen-abi-macro 1.11.5",
"solana-sdk-macro 1.11.5",
"thiserror",
"tiny-bip39",
"wasm-bindgen",
"zeroize",
]
[[package]]
@ -5436,9 +5446,9 @@ dependencies = [
[[package]]
name = "solana-sdk"
version = "1.10.33"
version = "1.11.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "636f6c615aca6f75e22b6baceaf0ffed9d74367f9320b07ed57cd9b5ce2e4ff9"
checksum = "ad7d954df63b267857e26670e3aacfd8e2943ca703653b0418e5afc85046c2f3"
dependencies = [
"assert_matches",
"base64 0.13.0",
@ -5463,7 +5473,7 @@ dependencies = [
"memmap2",
"num-derive",
"num-traits",
"pbkdf2 0.10.1",
"pbkdf2 0.11.0",
"qstring",
"rand 0.7.3",
"rand_chacha 0.2.2",
@ -5475,11 +5485,11 @@ dependencies = [
"serde_json",
"sha2 0.10.2",
"sha3 0.10.2",
"solana-frozen-abi 1.10.33",
"solana-frozen-abi-macro 1.10.33",
"solana-logger 1.10.33",
"solana-program 1.10.33",
"solana-sdk-macro 1.10.33",
"solana-frozen-abi 1.11.5",
"solana-frozen-abi-macro 1.11.5",
"solana-logger 1.11.5",
"solana-program 1.11.5",
"solana-sdk-macro 1.11.5",
"thiserror",
"uriparse",
"wasm-bindgen",
@ -5536,9 +5546,9 @@ dependencies = [
[[package]]
name = "solana-sdk-macro"
version = "1.10.33"
version = "1.11.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2b8bcac4394644f21dc013e932a7df9f536fcecef3e5df43fe362b4ec532ce30"
checksum = "d0d9e81bc46edcc517b2df504856d57a5101c7586ec63f3143ae11fbe2eba613"
dependencies = [
"bs58",
"proc-macro2 1.0.41",
@ -5834,9 +5844,9 @@ dependencies = [
[[package]]
name = "solana-zk-token-sdk"
version = "1.10.33"
version = "1.11.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "410ee53a26ac91098c289c983863535d4fbb6604b229ae1159503f48fa4fc90f"
checksum = "62415c05a9ebfffaf8befaa61b24492ebf88269cf84cbeba714bac4125ec4ea3"
dependencies = [
"aes-gcm-siv",
"arrayref",
@ -5855,8 +5865,8 @@ dependencies = [
"serde",
"serde_json",
"sha3 0.9.1",
"solana-program 1.10.33",
"solana-sdk 1.10.33",
"solana-program 1.11.5",
"solana-sdk 1.11.5",
"subtle",
"thiserror",
"zeroize",
@ -5940,7 +5950,7 @@ dependencies = [
"borsh",
"num-derive",
"num-traits",
"solana-program 1.10.33",
"solana-program 1.11.5",
"spl-token",
"spl-token-2022",
"thiserror",
@ -5952,7 +5962,7 @@ version = "3.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bd0dc6f70db6bacea7ff25870b016a65ba1d1b6013536f08e4fd79a8f9005325"
dependencies = [
"solana-program 1.10.33",
"solana-program 1.11.5",
]
[[package]]
@ -5966,23 +5976,23 @@ dependencies = [
"num-derive",
"num-traits",
"num_enum",
"solana-program 1.10.33",
"solana-program 1.11.5",
"thiserror",
]
[[package]]
name = "spl-token-2022"
version = "0.4.2"
version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f0a97cbf60b91b610c846ccf8eecca96d92a24a19ffbf9fe06cd0c84e76ec45e"
checksum = "e4c0ebca4740cc4c892aa31e07d0b4dc1a24cac4748376d4b34f8eb0fee9ff46"
dependencies = [
"arrayref",
"bytemuck",
"num-derive",
"num-traits",
"num_enum",
"solana-program 1.10.33",
"solana-zk-token-sdk 1.10.33",
"solana-program 1.11.5",
"solana-zk-token-sdk 1.11.5",
"spl-memo",
"spl-token",
"thiserror",

View File

@ -50,7 +50,7 @@ solana-transaction-status = { path = "../transaction-status", version = "=1.12.0
solana-version = { path = "../version", version = "=1.12.0" }
solana-vote-program = { path = "../programs/vote", version = "=1.12.0" }
spl-token = { version = "=3.5.0", features = ["no-entrypoint"] }
spl-token-2022 = { version = "=0.4.2", features = ["no-entrypoint"] }
spl-token-2022 = { version = "=0.4.3", features = ["no-entrypoint"] }
stream-cancel = "0.8.1"
thiserror = "1.0"
tokio = { version = "~1.14.1", features = ["full"] }

View File

@ -28,7 +28,7 @@ solana-vote-program = { path = "../programs/vote", version = "=1.12.0" }
spl-associated-token-account = { version = "=1.1.1", features = ["no-entrypoint"] }
spl-memo = { version = "=3.0.1", features = ["no-entrypoint"] }
spl-token = { version = "=3.5.0", features = ["no-entrypoint"] }
spl-token-2022 = { version = "=0.4.2", features = ["no-entrypoint"] }
spl-token-2022 = { version = "=0.4.3", features = ["no-entrypoint"] }
thiserror = "1.0"
[package.metadata.docs.rs]