diff --git a/Cargo.lock b/Cargo.lock index 7af36557..644edb36 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -9,46 +9,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3" [[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - -[[package]] -name = "aead" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b613b8e1e3cf911a086f53f03bf286f52fd7a7258e4fa606f0ef220d39d8877" -dependencies = [ - "generic-array", -] - -[[package]] -name = "aes" -version = "0.7.5" +name = "addr2line" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8" +checksum = "b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b" dependencies = [ - "cfg-if", - "cipher 0.3.0", - "cpufeatures", - "opaque-debug", + "gimli", ] [[package]] -name = "aes-gcm-siv" -version = "0.10.3" +name = "adler" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "589c637f0e68c877bbd59a4599bbe849cac8e5f3e4b5a3ebae8f528cd218dcdc" -dependencies = [ - "aead", - "aes", - "cipher 0.3.0", - "ctr", - "polyval", - "subtle", - "zeroize", -] +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "ahash" @@ -238,7 +211,7 @@ dependencies = [ "quote", "serde", "serde_json", - "sha2 0.9.9", + "sha2", "syn", "thiserror", ] @@ -307,6 +280,21 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f771a5d1f5503f7f4279a30f3643d3421ba149848b89ecaaec0ea2acf04a5ac4" +[[package]] +name = "backtrace" +version = "0.3.64" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e121dee8023ce33ab248d9ce1493df03c3b38a659b240096fcbd7048ff9c31f" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + [[package]] name = "base64" version = "0.12.3" @@ -537,25 +525,6 @@ dependencies = [ "chrono", ] -[[package]] -name = "cipher" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ee52072ec15386f770805afd189a01c8841be8696bed250fa2f13c4c0d6dfb7" -dependencies = [ - "generic-array", -] - -[[package]] -name = "cipher" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1873270f8f7942c191139cb8a40fd228da6c3fd2fc376d7e92d47aa14aeb59e" -dependencies = [ - "crypto-common", - "inout", -] - [[package]] name = "combine" version = "3.8.1" @@ -685,12 +654,23 @@ dependencies = [ ] [[package]] -name = "ctr" -version = "0.8.0" +name = "crypto-mac" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "049bb91fb4aaf0e3c7efa6cd5ef877dbbbd15b39dad06d9948de4ec8a75761ea" +checksum = "58bcd97a54c7ca5ce2f6eb16f6bede5b0ab5f0055fedc17d2f0b4466e21671ca" dependencies = [ - "cipher 0.3.0", + "generic-array", + "subtle", +] + +[[package]] +name = "crypto-mac" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1d1a86f49236c215f271d40892d5fc950490551400b02ef360692c29815c714" +dependencies = [ + "generic-array", + "subtle", ] [[package]] @@ -702,7 +682,6 @@ dependencies = [ "byteorder", "digest 0.9.0", "rand_core 0.5.1", - "serde", "subtle", "zeroize", ] @@ -720,9 +699,12 @@ dependencies = [ [[package]] name = "derivation-path" -version = "0.2.0" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e5c37193a1db1d8ed868c03ec7b152175f26160a5b740e5e484143877e0adf0" +checksum = "193388a8c8c75a490b604ff61775e236541b8975e98e5ca1f6ea97d122b7e2db" +dependencies = [ + "failure", +] [[package]] name = "digest" @@ -772,20 +754,21 @@ dependencies = [ "ed25519", "rand 0.7.3", "serde", - "sha2 0.9.9", + "sha2", "zeroize", ] [[package]] name = "ed25519-dalek-bip32" -version = "0.2.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d2be62a4061b872c8c0873ee4fc6f101ce7b889d039f019c5fa2af471a59908" +checksum = "057f328f31294b5ab432e6c39642f54afd1531677d6d4ba2905932844cc242f3" dependencies = [ "derivation-path", "ed25519-dalek", - "hmac 0.12.1", - "sha2 0.10.2", + "failure", + "hmac 0.9.0", + "sha2", ] [[package]] @@ -815,26 +798,6 @@ dependencies = [ "cfg-if", ] -[[package]] -name = "enum-iterator" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eeac5c5edb79e4e39fe8439ef35207780a11f69c52cbe424ce3dfad4cb78de6" -dependencies = [ - "enum-iterator-derive", -] - -[[package]] -name = "enum-iterator-derive" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c134c37760b27a871ba422106eedbb8247da973a09e82558bf26d619c882b159" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "enum-ordinalize" version = "3.1.11" @@ -882,6 +845,28 @@ dependencies = [ "termcolor", ] +[[package]] +name = "failure" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d32e9bd16cc02eae7db7ef620b392808b89f6a5e16bb3497d159c6b92a0f4f86" +dependencies = [ + "backtrace", + "failure_derive", +] + +[[package]] +name = "failure_derive" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "synstructure", +] + [[package]] name = "fastrand" version = "1.7.0" @@ -995,6 +980,12 @@ dependencies = [ "percent-encoding", ] +[[package]] +name = "fs_extra" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2022715d62ab30faffd124d40b76f4134a550a87792276512b18d63272333394" + [[package]] name = "futures" version = "0.3.21" @@ -1129,6 +1120,12 @@ dependencies = [ "wasi 0.10.2+wasi-snapshot-preview1", ] +[[package]] +name = "gimli" +version = "0.26.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78cc372d058dcf6d5ecd98510e7fbc9e5aec4d21de70f65fea8fecebcd881bd4" + [[package]] name = "goblin" version = "0.4.3" @@ -1207,17 +1204,28 @@ version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "126888268dcc288495a26bf004b38c5fdbb31682f992c84ceb046a1f0fe38840" dependencies = [ - "crypto-mac", + "crypto-mac 0.8.0", "digest 0.9.0", ] [[package]] name = "hmac" -version = "0.12.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" +checksum = "deae6d9dbb35ec2c502d62b8f7b1c000a0822c3b0794ba36b3149c0a1c840dff" dependencies = [ - "digest 0.10.3", + "crypto-mac 0.9.1", + "digest 0.9.0", +] + +[[package]] +name = "hmac" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a2a2320eb7ec0ebe8da8f744d7812d9fc4cb4d09344ac01898dbcb6a20ae69b" +dependencies = [ + "crypto-mac 0.11.1", + "digest 0.9.0", ] [[package]] @@ -1335,15 +1343,6 @@ dependencies = [ "hashbrown", ] -[[package]] -name = "inout" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1f03d4ab4d5dc9ec2d219f86c15d2a15fc08239d1cd3b2d6a19717c0a2f443" -dependencies = [ - "generic-array", -] - [[package]] name = "instant" version = "0.1.12" @@ -1444,7 +1443,7 @@ dependencies = [ "libsecp256k1-gen-genmult", "rand 0.7.3", "serde", - "sha2 0.9.9", + "sha2", "typenum", ] @@ -1585,18 +1584,6 @@ dependencies = [ "autocfg", ] -[[package]] -name = "merlin" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58c38e2799fc0978b65dfff8023ec7843e2330bb462f19198840b34b6582397d" -dependencies = [ - "byteorder", - "keccak", - "rand_core 0.6.3", - "zeroize", -] - [[package]] name = "mime" version = "0.3.16" @@ -1636,27 +1623,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "modular-bitfield" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a53d79ba8304ac1c4f9eb3b9d281f21f7be9d4626f72ce7df4ad8fbde4f38a74" -dependencies = [ - "modular-bitfield-impl", - "static_assertions", -] - -[[package]] -name = "modular-bitfield-impl" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a7d5f7076603ebc68de2dc6a650ec331a062a13abaa346975be747bbfa4b789" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "ntapi" version = "0.3.7" @@ -1738,6 +1704,15 @@ dependencies = [ "syn", ] +[[package]] +name = "object" +version = "0.27.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67ac1d3f9a1d3616fd9a60c8d74296f22406a238b6a72f5cc1e6f314df4ffbf9" +dependencies = [ + "memchr", +] + [[package]] name = "once_cell" version = "1.10.0" @@ -1785,9 +1760,9 @@ dependencies = [ [[package]] name = "ouroboros" -version = "0.14.2" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71643f290d126e18ac2598876d01e1d57aed164afc78fdb6e2a0c6589a1f6662" +checksum = "f357ef82d1b4db66fbed0b8d542cbd3c22d0bf5b393b3c257b9ba4568e70c9c3" dependencies = [ "aliasable", "ouroboros_macro", @@ -1796,9 +1771,9 @@ dependencies = [ [[package]] name = "ouroboros_macro" -version = "0.14.2" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed9a247206016d424fe8497bc611e510887af5c261fbbf977877c4bb55ca4d82" +checksum = "44a0b52c2cbaef7dffa5fec1a43274afe8bd2a644fa9fc50a9ef4ff0269b1257" dependencies = [ "Inflector", "proc-macro-error", @@ -1807,6 +1782,17 @@ dependencies = [ "syn", ] +[[package]] +name = "parking_lot" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" +dependencies = [ + "instant", + "lock_api", + "parking_lot_core 0.8.5", +] + [[package]] name = "parking_lot" version = "0.12.0" @@ -1814,7 +1800,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "87f5ec2493a61ac0506c0f4199f99070cbe83857b0337006a30f3e6719b8ef58" dependencies = [ "lock_api", - "parking_lot_core", + "parking_lot_core 0.9.1", +] + +[[package]] +name = "parking_lot_core" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216" +dependencies = [ + "cfg-if", + "instant", + "libc", + "redox_syscall", + "smallvec", + "winapi", ] [[package]] @@ -1838,11 +1838,11 @@ checksum = "0744126afe1a6dd7f394cb50a716dbe086cb06e255e53d8d0185d82828358fb5" [[package]] name = "pbkdf2" -version = "0.10.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "271779f35b581956db91a3e55737327a03aa051e90b1c47aeb189508533adfd7" +checksum = "f05894bce6a1ba4be299d0c5f29563e08af2bc18bb7d48313113bed71e904739" dependencies = [ - "digest 0.10.3", + "crypto-mac 0.11.1", ] [[package]] @@ -1904,18 +1904,6 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6" -[[package]] -name = "polyval" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8419d2b623c7c0896ff2d5d96e2cb4ede590fed28fcc34934f4c33c036e620a1" -dependencies = [ - "cfg-if", - "cpufeatures", - "opaque-debug", - "universal-hash", -] - [[package]] name = "ppv-lite86" version = "0.2.16" @@ -2449,17 +2437,6 @@ dependencies = [ "opaque-debug", ] -[[package]] -name = "sha2" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55deaec60f81eefe3cce0dc50bda92d6d8e88f2a27df7c5033b42afeb1ed2676" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest 0.10.3", -] - [[package]] name = "sha3" version = "0.9.1" @@ -2472,16 +2449,6 @@ dependencies = [ "opaque-debug", ] -[[package]] -name = "sha3" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "881bf8156c87b6301fc5ca6b27f11eeb2761224c7081e69b409d5a1951a70c86" -dependencies = [ - "digest 0.10.3", - "keccak", -] - [[package]] name = "sharded-slab" version = "0.1.4" @@ -2530,9 +2497,9 @@ dependencies = [ [[package]] name = "solana-address-lookup-table-program" -version = "1.10.2" +version = "1.9.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcb7b46e3d99948c7b3a9f9578a51cf08b973017397aaf68292bbb138e6eb4a8" +checksum = "4956621cc7bf19dea58d9c98a2052d4294ce747816422f24b4691f508593251a" dependencies = [ "bincode", "bytemuck", @@ -2550,9 +2517,9 @@ dependencies = [ [[package]] name = "solana-banks-client" -version = "1.10.2" +version = "1.9.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a57332d2919367b6ac3448cbc82290dbe0c606c28a94a9416e3df774cb5b3765" +checksum = "45904d62acdd8d9a5379cdc74bd5425a29e4c1ffa7a5ed43a2d24b9412531f02" dependencies = [ "borsh", "futures", @@ -2567,9 +2534,9 @@ dependencies = [ [[package]] name = "solana-banks-interface" -version = "1.10.2" +version = "1.9.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bee758ce8843fc8966c6974af747b997ce8fe82b4554779f8c08b70afde6f61" +checksum = "8ba0e8614e1043d7c326c77ae4e3632a032ea8447f59c1740c6e5e3cb521b70d" dependencies = [ "serde", "solana-sdk", @@ -2578,12 +2545,11 @@ dependencies = [ [[package]] name = "solana-banks-server" -version = "1.10.2" +version = "1.9.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f795c7c966481777ebc0085fb590486a4b5b21567ec804f8e58bc20b9fd9ad2" +checksum = "756570caf0004fbfa51eb081a3d74edf13b37f2cc61fbce3216d53e67e461fa1" dependencies = [ "bincode", - "crossbeam-channel", "futures", "solana-banks-interface", "solana-runtime", @@ -2595,11 +2561,30 @@ dependencies = [ "tokio-stream", ] +[[package]] +name = "solana-bloom" +version = "1.9.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e33a0f93c50e30f4d79ed637ed531a55b53282809b01987e8de8fa9c2e10b88b" +dependencies = [ + "bv", + "fnv", + "log", + "rand 0.7.3", + "rayon", + "rustc_version 0.4.0", + "serde", + "serde_derive", + "solana-frozen-abi", + "solana-frozen-abi-macro", + "solana-sdk", +] + [[package]] name = "solana-bpf-loader-program" -version = "1.10.2" +version = "1.9.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71bcc6ba4ac45682f3112cf4bcdd8d18e9ddaf4808f06a0767c1a8457934dcc7" +checksum = "bf53ecd29908f2c9bca9a05c5f97520dbbb6037cca840b19ab3ab7e6bf7501f4" dependencies = [ "bincode", "byteorder", @@ -2609,21 +2594,22 @@ dependencies = [ "solana-metrics", "solana-program-runtime", "solana-sdk", - "solana-zk-token-sdk", "solana_rbpf", "thiserror", ] [[package]] name = "solana-bucket-map" -version = "1.10.2" +version = "1.9.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9aeb354a3440bd9d74c80a2267e0de73904808c7b02276232f8d7359b6f05b6" +checksum = "1b25e29aa9050a54d241118e14b6d69a1f9efab5075ba1d60cb15b456d4d32eb" dependencies = [ + "fs_extra", "log", "memmap2", - "modular-bitfield", "rand 0.7.3", + "rayon", + "solana-logger", "solana-measure", "solana-sdk", "tempfile", @@ -2631,9 +2617,9 @@ dependencies = [ [[package]] name = "solana-compute-budget-program" -version = "1.10.2" +version = "1.9.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5738d2ca24999bf00efce3087575837db2bb3094711fc4b76015ca922c95f3d3" +checksum = "6699b945fca80b6fe7c3753f587cf7138c21648edcea861d573f782bb4c6a30e" dependencies = [ "solana-program-runtime", "solana-sdk", @@ -2641,9 +2627,9 @@ dependencies = [ [[package]] name = "solana-config-program" -version = "1.10.2" +version = "1.9.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8766cbc51531bee11e0b72cbcb2488bed52b93887dc999ba429664c633ce7346" +checksum = "d12836e8f7ffc121286b740423bcbf267ffdf919eb5300d2d17b54284834093f" dependencies = [ "bincode", "chrono", @@ -2655,9 +2641,9 @@ dependencies = [ [[package]] name = "solana-frozen-abi" -version = "1.10.2" +version = "1.9.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab9833a93c2b857e7e9fcd74e07c91f36e42918b1d882623aae132116238360f" +checksum = "0ae24bb5a815c2796908b131b7e44973d6f2e0e16eb7e67e0f0b5fcd95de0da1" dependencies = [ "bs58 0.4.0", "bv", @@ -2667,16 +2653,17 @@ dependencies = [ "rustc_version 0.4.0", "serde", "serde_derive", - "sha2 0.10.2", + "sha2", "solana-frozen-abi-macro", + "solana-logger", "thiserror", ] [[package]] name = "solana-frozen-abi-macro" -version = "1.10.2" +version = "1.9.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3579045a6b8a289bb1325279db18323af1315429e3bc8bc00ed5bee7d7eab227" +checksum = "5cff377ed697595d3041052940730acefca4f4bfc23eb26bb695595cee737fe5" dependencies = [ "proc-macro2", "quote", @@ -2686,9 +2673,9 @@ dependencies = [ [[package]] name = "solana-logger" -version = "1.10.2" +version = "1.9.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fbebca576ba558e1233b35179b76d20561a3877a94741e100dbcdcae0acd976" +checksum = "3e3e1c7bf616aa4926d70dd9015077fcccd88c9271cef29c9038e76a2da1ac5d" dependencies = [ "env_logger", "lazy_static", @@ -2697,9 +2684,9 @@ dependencies = [ [[package]] name = "solana-measure" -version = "1.10.2" +version = "1.9.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "576b18a1fec1a1495f17be99656154dc60795eef4dbc2b08ae7590002a35dab8" +checksum = "57e8cc2e8c81c72ff7443f6e0aacc45a6da4261e90421a5982ed1a85aaec1166" dependencies = [ "log", "solana-sdk", @@ -2707,11 +2694,11 @@ dependencies = [ [[package]] name = "solana-metrics" -version = "1.10.2" +version = "1.9.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d33212d0a7e27686b1188e1c31b8a50ddc18b1db8e1ebcff744ec072cb317bbf" +checksum = "fa0c27719a2b1b7425d8b1269e45fcd97e62d33cdd3a7c561f65846e94af971b" dependencies = [ - "crossbeam-channel", + "env_logger", "gethostname", "lazy_static", "log", @@ -2721,9 +2708,9 @@ dependencies = [ [[package]] name = "solana-program" -version = "1.10.2" +version = "1.9.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f70f47073fddf7f6b7505c750537b576440a8e4924338a85008b08528c4597c" +checksum = "36bead9a6131b48cffc3a3105a6e469592442715528d9d0187e114776533b01c" dependencies = [ "base64 0.13.0", "bincode", @@ -2745,17 +2732,18 @@ dependencies = [ "log", "num-derive", "num-traits", - "parking_lot", + "parking_lot 0.11.2", "rand 0.7.3", "rustc_version 0.4.0", "rustversion", "serde", "serde_bytes", "serde_derive", - "sha2 0.10.2", - "sha3 0.10.1", + "sha2", + "sha3", "solana-frozen-abi", "solana-frozen-abi-macro", + "solana-logger", "solana-sdk-macro", "thiserror", "wasm-bindgen", @@ -2763,13 +2751,12 @@ dependencies = [ [[package]] name = "solana-program-runtime" -version = "1.10.2" +version = "1.9.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b9b156aa1fd639ab04a2f202ca0c159617fd49df30123a60c179055477fe7c4" +checksum = "efbfaf4b0b12f6af1c9f70c8c7e3381cb459738dd4909832dea7b0789141b52d" dependencies = [ "base64 0.13.0", "bincode", - "enum-iterator", "itertools 0.10.3", "libc", "libloading", @@ -2780,6 +2767,7 @@ dependencies = [ "serde", "solana-frozen-abi", "solana-frozen-abi-macro", + "solana-logger", "solana-measure", "solana-sdk", "thiserror", @@ -2787,12 +2775,12 @@ dependencies = [ [[package]] name = "solana-program-test" -version = "1.10.2" +version = "1.9.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0706d1296fab4017fa2ac5b86f8c6245a511065b62aab7f5fe17b527a3add16" +checksum = "890eb48ea4b682630bcd5a0b2460d91c7690bf882ad53a4afdcf81ac766a0c60" dependencies = [ "async-trait", - "base64 0.13.0", + "base64 0.12.3", "bincode", "chrono-humanize", "log", @@ -2811,9 +2799,9 @@ dependencies = [ [[package]] name = "solana-rayon-threadlimit" -version = "1.10.2" +version = "1.9.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d292b537c7fad60714eed0bd4fb30b8674edeb9bde979fe296734cc95a83a6ee" +checksum = "355485d4ca6a841dd6474e44e901531a18fe7f528f72970cbd07344dfb6ae116" dependencies = [ "lazy_static", "num_cpus", @@ -2821,9 +2809,9 @@ dependencies = [ [[package]] name = "solana-runtime" -version = "1.10.2" +version = "1.9.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "211be624dbde8a669cc716b82999e83998f02ed85031fa771508244d86eda010" +checksum = "6133a9b8ce1183b6a0dcbf7666b0a3424413d5830c906c15a54ec3a05e662340" dependencies = [ "arrayref", "bincode", @@ -2853,11 +2841,13 @@ dependencies = [ "serde", "serde_derive", "solana-address-lookup-table-program", + "solana-bloom", "solana-bucket-map", "solana-compute-budget-program", "solana-config-program", "solana-frozen-abi", "solana-frozen-abi-macro", + "solana-logger", "solana-measure", "solana-metrics", "solana-program-runtime", @@ -2865,8 +2855,6 @@ dependencies = [ "solana-sdk", "solana-stake-program", "solana-vote-program", - "solana-zk-token-proof-program", - "solana-zk-token-sdk", "symlink", "tar", "tempfile", @@ -2876,9 +2864,9 @@ dependencies = [ [[package]] name = "solana-sdk" -version = "1.10.2" +version = "1.9.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3ce89de40443466541c66df415b319dfd6f316c24962b5b1c6273b68329c6eb" +checksum = "ba4cacac691db83aaff0c69cc901305d68fbfbc28709ed5abf28393f18bfdc87" dependencies = [ "assert_matches", "base64 0.13.0", @@ -2890,11 +2878,11 @@ dependencies = [ "byteorder", "chrono", "derivation-path", - "digest 0.10.3", + "digest 0.9.0", "ed25519-dalek", "ed25519-dalek-bip32", "generic-array", - "hmac 0.12.1", + "hmac 0.11.0", "itertools 0.10.3", "js-sys", "lazy_static", @@ -2913,8 +2901,8 @@ dependencies = [ "serde_bytes", "serde_derive", "serde_json", - "sha2 0.10.2", - "sha3 0.10.1", + "sha2", + "sha3", "solana-frozen-abi", "solana-frozen-abi-macro", "solana-logger", @@ -2927,9 +2915,9 @@ dependencies = [ [[package]] name = "solana-sdk-macro" -version = "1.10.2" +version = "1.9.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84f83b3a8e23a554f0589dbbc83f5e7e120e4a7bf87c6b42fd836428b77a6ba4" +checksum = "333726c958386c09937aba55ca4390bcfb4621c6120f47610682a94ea4d4533c" dependencies = [ "bs58 0.4.0", "proc-macro2", @@ -2940,12 +2928,12 @@ dependencies = [ [[package]] name = "solana-send-transaction-service" -version = "1.10.2" +version = "1.9.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0472178ebd3ee320fa108104e992ba78a8f96fe17c37dd5e54c35ae61845c7c0" +checksum = "e68974ce9ab1d7bbf1d6e4f8669d06f6a8d47e91f25bc192f6e59a801804c7e6" dependencies = [ - "crossbeam-channel", "log", + "solana-logger", "solana-metrics", "solana-runtime", "solana-sdk", @@ -2953,9 +2941,9 @@ dependencies = [ [[package]] name = "solana-stake-program" -version = "1.10.2" +version = "1.9.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a2b887eee6aa07abed2e5f406c3d68a661fb11509206deac2826eb761ae3874" +checksum = "73e978c1d5ad9efbe8d79edc55d1a38653d3c658181ee14b2ab5be71df3c1dde" dependencies = [ "bincode", "log", @@ -2976,9 +2964,9 @@ dependencies = [ [[package]] name = "solana-vote-program" -version = "1.10.2" +version = "1.9.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67a643f50c3432c6744cd6c7856b44afe470ac31684719abf236cd69923563a1" +checksum = "5e29d65ab135ee928338e7b14f9d2c8f81695b3365f0b23f503c4c1de663fcd6" dependencies = [ "bincode", "log", @@ -2989,57 +2977,13 @@ dependencies = [ "serde_derive", "solana-frozen-abi", "solana-frozen-abi-macro", + "solana-logger", "solana-metrics", "solana-program-runtime", "solana-sdk", "thiserror", ] -[[package]] -name = "solana-zk-token-proof-program" -version = "1.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12a269614d2f4bafe0ec064a36d963ffa7734803cd9067f9fa28885505f1dfd6" -dependencies = [ - "bytemuck", - "getrandom 0.1.16", - "num-derive", - "num-traits", - "solana-program-runtime", - "solana-sdk", - "solana-zk-token-sdk", -] - -[[package]] -name = "solana-zk-token-sdk" -version = "1.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ccdc051b6959137e43dd074eb6dcbdb2c8947821e9f93457d3beb4368710ccb" -dependencies = [ - "aes-gcm-siv", - "arrayref", - "base64 0.13.0", - "bincode", - "bytemuck", - "byteorder", - "cipher 0.4.3", - "curve25519-dalek", - "getrandom 0.1.16", - "lazy_static", - "merlin", - "num-derive", - "num-traits", - "rand 0.7.3", - "serde", - "serde_json", - "sha3 0.9.1", - "solana-program", - "solana-sdk", - "subtle", - "thiserror", - "zeroize", -] - [[package]] name = "solana_rbpf" version = "0.2.24" @@ -3341,7 +3285,7 @@ dependencies = [ "mio", "num_cpus", "once_cell", - "parking_lot", + "parking_lot 0.12.0", "pin-project-lite", "signal-hook-registry", "socket2", @@ -3542,16 +3486,6 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" -[[package]] -name = "universal-hash" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f214e8f697e925001e66ec2c6e37a4ef93f0f78c2eed7814394e10c62025b05" -dependencies = [ - "generic-array", - "subtle", -] - [[package]] name = "unreachable" version = "1.0.0" @@ -3871,18 +3805,18 @@ dependencies = [ [[package]] name = "zstd" -version = "0.11.1+zstd.1.5.2" +version = "0.9.2+zstd.1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a16b8414fde0414e90c612eba70985577451c4c504b99885ebed24762cb81a" +checksum = "2390ea1bf6c038c39674f22d95f0564725fc06034a47129179810b2fc58caa54" dependencies = [ "zstd-safe", ] [[package]] name = "zstd-safe" -version = "5.0.1+zstd.1.5.2" +version = "4.1.3+zstd.1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c12659121420dd6365c5c3de4901f97145b79651fb1d25814020ed2ed0585ae" +checksum = "e99d81b99fb3c2c2c794e3fe56c305c63d5173a16a46b5850b07c935ffc7db79" dependencies = [ "libc", "zstd-sys", @@ -3890,9 +3824,9 @@ dependencies = [ [[package]] name = "zstd-sys" -version = "2.0.1+zstd.1.5.2" +version = "1.6.2+zstd.1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fd07cbbc53846d9145dbffdf6dd09a7a0aa52be46741825f5c97bdd4f73f12b" +checksum = "2daf2f248d9ea44454bfcb2516534e8b8ad2fc91bf818a1885495fc42bc8ac9f" dependencies = [ "cc", "libc", diff --git a/common/Cargo.toml b/common/Cargo.toml index 4247cecb..2b75122c 100644 --- a/common/Cargo.toml +++ b/common/Cargo.toml @@ -4,5 +4,5 @@ version = "3.0.0" edition = "2018" [dependencies] -solana-program = "^1.8.0" +solana-program = ">=1.9.0, <1.10.0" bytemuck = "^1.7.2" diff --git a/mango-macro/Cargo.toml b/mango-macro/Cargo.toml index d9eb03d5..4897ab2e 100644 --- a/mango-macro/Cargo.toml +++ b/mango-macro/Cargo.toml @@ -8,7 +8,7 @@ proc-macro = true [dependencies] syn = "1.0.74" -solana-program = "^1.8.1" +solana-program = ">=1.9.0, <1.10.0" bytemuck = "^1.7.2" quote = "^1.0.9" safe-transmute = "^0.11.1" diff --git a/program/Cargo.toml b/program/Cargo.toml index 0971f7f7..2e7105be 100644 --- a/program/Cargo.toml +++ b/program/Cargo.toml @@ -11,7 +11,7 @@ devnet = [] client = ["no-entrypoint"] [dependencies] -solana-program = "^1.8.1" +solana-program = ">=1.9.0, <1.10.0" arrayref = "^0.3.6" serde = "^1.0.118" bs58 = "0.4.0" @@ -37,9 +37,9 @@ switchboard-utils = ">=0.1.36" anchor-lang = "0.22.1" [dev-dependencies] -solana-sdk = "^1.8.1" -solana-program-test = "^1.8.1" -solana-logger = "^1.8.1" +solana-sdk = ">=1.9.0, <1.10.0" +solana-program-test = ">=1.9.0, <1.10.0" +solana-logger = ">=1.9.0, <1.10.0" tarpc = { version = "^0.26.2", features = ["full"] } rand = "0.8.4"