diff --git a/Cargo.lock b/Cargo.lock index f0fa4fb35b3116..a60548edd0a8e1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3110,6 +3110,15 @@ 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" @@ -5185,35 +5194,23 @@ dependencies = [ [[package]] name = "solana-frozen-abi" -version = "1.11.3" +version = "1.10.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6d2bcb469e59d941e9d45702c91af940f6a8f4a5947f51bafe72844ed9b71a4" +checksum = "49a5d3280421bb53fc12bdba1eaa505153fb4f99a06b5609dae22192652ead3b" dependencies = [ - "ahash", - "blake3", - "block-buffer 0.9.0", "bs58", "bv", - "byteorder", - "cc", - "either", "generic-array 0.14.5", - "getrandom 0.1.16", - "hashbrown 0.11.2", "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.11.3", - "subtle", + "solana-frozen-abi-macro 1.10.33", "thiserror", ] @@ -5252,9 +5249,9 @@ dependencies = [ [[package]] name = "solana-frozen-abi-macro" -version = "1.11.3" +version = "1.10.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f1f8cd2f387d17ccfb2bd5dd097d9b3c1fa14acfa49e95a63ece15a4622b8d0" +checksum = "635c60ac96b1347af272c625465068b908aff919d19f29b5795a44310310494d" dependencies = [ "proc-macro2 1.0.41", "quote 1.0.18", @@ -5567,9 +5564,9 @@ dependencies = [ [[package]] name = "solana-logger" -version = "1.11.3" +version = "1.10.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3faca9d9fe587dc5827e06acdcca072e5b744bef0488b98fb21b77932e642afb" +checksum = "b12cb6e6f1f9c9876d356c928b8c2ac532f6715e7cd2a1b4343d747bee3eca73" dependencies = [ "env_logger", "lazy_static", @@ -5738,9 +5735,9 @@ dependencies = [ [[package]] name = "solana-program" -version = "1.11.3" +version = "1.10.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b57df37154125f5e4ba0eaa0e5ea3cbc747a950480ddd89395036c4d3b77b66b" +checksum = "eeecf504cee2821b006871f70e7a1f54db15f914cedf259eaf5976fe606470f0" dependencies = [ "base64 0.13.0", "bincode", @@ -5751,38 +5748,31 @@ dependencies = [ "bs58", "bv", "bytemuck", - "cc", "console_error_panic_hook", "console_log", "curve25519-dalek", - "getrandom 0.2.3", + "getrandom 0.1.16", "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.1", - "solana-frozen-abi 1.11.3", - "solana-frozen-abi-macro 1.11.3", - "solana-sdk-macro 1.11.3", + "solana-frozen-abi 1.10.33", + "solana-frozen-abi-macro 1.10.33", + "solana-sdk-macro 1.10.33", "thiserror", - "tiny-bip39", "wasm-bindgen", - "zeroize", ] [[package]] @@ -6053,9 +6043,9 @@ dependencies = [ [[package]] name = "solana-sdk" -version = "1.11.3" +version = "1.10.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09d17897e0ca6c36cf90dc4d58a8f6bb2e3af80afc74b1825e779ee087af5c4a" +checksum = "636f6c615aca6f75e22b6baceaf0ffed9d74367f9320b07ed57cd9b5ce2e4ff9" dependencies = [ "assert_matches", "base64 0.13.0", @@ -6080,7 +6070,7 @@ dependencies = [ "memmap2", "num-derive", "num-traits", - "pbkdf2 0.11.0", + "pbkdf2 0.10.1", "qstring", "rand 0.7.3", "rand_chacha 0.2.2", @@ -6092,11 +6082,11 @@ dependencies = [ "serde_json", "sha2 0.10.2", "sha3 0.10.1", - "solana-frozen-abi 1.11.3", - "solana-frozen-abi-macro 1.11.3", - "solana-logger 1.11.3", - "solana-program 1.11.3", - "solana-sdk-macro 1.11.3", + "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", "thiserror", "uriparse", "wasm-bindgen", @@ -6157,9 +6147,9 @@ dependencies = [ [[package]] name = "solana-sdk-macro" -version = "1.11.3" +version = "1.10.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "148d14ba16fed65d2426cd33fbe0661c4c8543721bfb5472f486a509cf01f8c2" +checksum = "2b8bcac4394644f21dc013e932a7df9f536fcecef3e5df43fe362b4ec532ce30" dependencies = [ "bs58", "proc-macro2 1.0.41", @@ -6567,9 +6557,9 @@ dependencies = [ [[package]] name = "solana-zk-token-sdk" -version = "1.11.3" +version = "1.10.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03ca28bafde8d752654a1efbe0911cffc0f2f1518d3eefe094db94cbda8fc965" +checksum = "410ee53a26ac91098c289c983863535d4fbb6604b229ae1159503f48fa4fc90f" dependencies = [ "aes-gcm-siv", "arrayref", @@ -6588,8 +6578,8 @@ dependencies = [ "serde", "serde_json", "sha3 0.9.1", - "solana-program 1.11.3", - "solana-sdk 1.11.3", + "solana-program 1.10.33", + "solana-sdk 1.10.33", "subtle", "thiserror", "zeroize", @@ -6670,7 +6660,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b013067447a1396303ddfc294f36e3d260a32f8a16c501c295bcdc7de39b490" dependencies = [ "borsh", - "solana-program 1.11.3", + "solana-program 1.10.33", "spl-token", ] @@ -6680,7 +6670,7 @@ version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd0dc6f70db6bacea7ff25870b016a65ba1d1b6013536f08e4fd79a8f9005325" dependencies = [ - "solana-program 1.11.3", + "solana-program 1.10.33", ] [[package]] @@ -6693,7 +6683,7 @@ dependencies = [ "num-derive", "num-traits", "num_enum", - "solana-program 1.11.3", + "solana-program 1.10.33", "thiserror", ] @@ -6708,8 +6698,8 @@ dependencies = [ "num-derive", "num-traits", "num_enum", - "solana-program 1.11.3", - "solana-zk-token-sdk 1.11.3", + "solana-program 1.10.33", + "solana-zk-token-sdk 1.10.33", "spl-memo", "spl-token", "thiserror", diff --git a/programs/bpf/Cargo.lock b/programs/bpf/Cargo.lock index 7c3ed6c31976c6..67a00edfd4b2f0 100644 --- a/programs/bpf/Cargo.lock +++ b/programs/bpf/Cargo.lock @@ -2838,6 +2838,15 @@ 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" @@ -4753,35 +4762,23 @@ dependencies = [ [[package]] name = "solana-frozen-abi" -version = "1.11.3" +version = "1.10.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6d2bcb469e59d941e9d45702c91af940f6a8f4a5947f51bafe72844ed9b71a4" +checksum = "49a5d3280421bb53fc12bdba1eaa505153fb4f99a06b5609dae22192652ead3b" 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.11.2", "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.11.3", - "subtle", + "solana-frozen-abi-macro 1.10.33", "thiserror", ] @@ -4819,9 +4816,9 @@ dependencies = [ [[package]] name = "solana-frozen-abi-macro" -version = "1.11.3" +version = "1.10.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f1f8cd2f387d17ccfb2bd5dd097d9b3c1fa14acfa49e95a63ece15a4622b8d0" +checksum = "635c60ac96b1347af272c625465068b908aff919d19f29b5795a44310310494d" dependencies = [ "proc-macro2 1.0.41", "quote 1.0.18", @@ -4977,9 +4974,9 @@ dependencies = [ [[package]] name = "solana-logger" -version = "1.11.3" +version = "1.10.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3faca9d9fe587dc5827e06acdcca072e5b744bef0488b98fb21b77932e642afb" +checksum = "b12cb6e6f1f9c9876d356c928b8c2ac532f6715e7cd2a1b4343d747bee3eca73" dependencies = [ "env_logger", "lazy_static", @@ -5088,9 +5085,9 @@ dependencies = [ [[package]] name = "solana-program" -version = "1.11.3" +version = "1.10.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b57df37154125f5e4ba0eaa0e5ea3cbc747a950480ddd89395036c4d3b77b66b" +checksum = "eeecf504cee2821b006871f70e7a1f54db15f914cedf259eaf5976fe606470f0" dependencies = [ "base64 0.13.0", "bincode", @@ -5101,38 +5098,31 @@ dependencies = [ "bs58", "bv", "bytemuck", - "cc", "console_error_panic_hook", "console_log", "curve25519-dalek", - "getrandom 0.2.4", + "getrandom 0.1.14", "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", "rustversion", "serde", "serde_bytes", "serde_derive", - "serde_json", "sha2 0.10.2", "sha3 0.10.1", - "solana-frozen-abi 1.11.3", - "solana-frozen-abi-macro 1.11.3", - "solana-sdk-macro 1.11.3", + "solana-frozen-abi 1.10.33", + "solana-frozen-abi-macro 1.10.33", + "solana-sdk-macro 1.10.33", "thiserror", - "tiny-bip39", "wasm-bindgen", - "zeroize", ] [[package]] @@ -5365,9 +5355,9 @@ dependencies = [ [[package]] name = "solana-sdk" -version = "1.11.3" +version = "1.10.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09d17897e0ca6c36cf90dc4d58a8f6bb2e3af80afc74b1825e779ee087af5c4a" +checksum = "636f6c615aca6f75e22b6baceaf0ffed9d74367f9320b07ed57cd9b5ce2e4ff9" dependencies = [ "assert_matches", "base64 0.13.0", @@ -5392,7 +5382,7 @@ dependencies = [ "memmap2", "num-derive", "num-traits", - "pbkdf2 0.11.0", + "pbkdf2 0.10.1", "qstring", "rand 0.7.3", "rand_chacha 0.2.2", @@ -5404,11 +5394,11 @@ dependencies = [ "serde_json", "sha2 0.10.2", "sha3 0.10.1", - "solana-frozen-abi 1.11.3", - "solana-frozen-abi-macro 1.11.3", - "solana-logger 1.11.3", - "solana-program 1.11.3", - "solana-sdk-macro 1.11.3", + "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", "thiserror", "uriparse", "wasm-bindgen", @@ -5465,9 +5455,9 @@ dependencies = [ [[package]] name = "solana-sdk-macro" -version = "1.11.3" +version = "1.10.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "148d14ba16fed65d2426cd33fbe0661c4c8543721bfb5472f486a509cf01f8c2" +checksum = "2b8bcac4394644f21dc013e932a7df9f536fcecef3e5df43fe362b4ec532ce30" dependencies = [ "bs58", "proc-macro2 1.0.41", @@ -5759,9 +5749,9 @@ dependencies = [ [[package]] name = "solana-zk-token-sdk" -version = "1.11.3" +version = "1.10.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03ca28bafde8d752654a1efbe0911cffc0f2f1518d3eefe094db94cbda8fc965" +checksum = "410ee53a26ac91098c289c983863535d4fbb6604b229ae1159503f48fa4fc90f" dependencies = [ "aes-gcm-siv", "arrayref", @@ -5780,8 +5770,8 @@ dependencies = [ "serde", "serde_json", "sha3 0.9.1", - "solana-program 1.11.3", - "solana-sdk 1.11.3", + "solana-program 1.10.33", + "solana-sdk 1.10.33", "subtle", "thiserror", "zeroize", @@ -5862,7 +5852,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b013067447a1396303ddfc294f36e3d260a32f8a16c501c295bcdc7de39b490" dependencies = [ "borsh", - "solana-program 1.11.3", + "solana-program 1.10.33", "spl-token", ] @@ -5872,7 +5862,7 @@ version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd0dc6f70db6bacea7ff25870b016a65ba1d1b6013536f08e4fd79a8f9005325" dependencies = [ - "solana-program 1.11.3", + "solana-program 1.10.33", ] [[package]] @@ -5885,7 +5875,7 @@ dependencies = [ "num-derive", "num-traits", "num_enum", - "solana-program 1.11.3", + "solana-program 1.10.33", "thiserror", ] @@ -5900,8 +5890,8 @@ dependencies = [ "num-derive", "num-traits", "num_enum", - "solana-program 1.11.3", - "solana-zk-token-sdk 1.11.3", + "solana-program 1.10.33", + "solana-zk-token-sdk 1.10.33", "spl-memo", "spl-token", "thiserror",