diff --git a/.gitmodules b/.gitmodules index e9cb424..9240a3a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,4 +4,4 @@ [submodule "deps/solana"] path = deps/solana url = https://github.com/solana-labs/solana - branch = v1.10.26 + branch = v1.11.10 diff --git a/Cargo.lock b/Cargo.lock index 84f4ea3..7aa91db 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -80,6 +80,21 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "250f629c0161ad8107cf89319e990051fae62832fd343083bea452d93e2205fd" +[[package]] +name = "alloc-no-stdlib" +version = "2.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc7bb162ec39d46ab1ca8c77bf72e890535becd1751bb45f64c597edb4c8c6b3" + +[[package]] +name = "alloc-stdlib" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94fb8275041c72129eb51b7d0322c29b8387a0386127718b096429201a5d6ece" +dependencies = [ + "alloc-no-stdlib", +] + [[package]] name = "alloc-traits" version = "0.1.1" @@ -295,12 +310,65 @@ version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eab1c04a571841102f5345a8fc0f6bb3d31c315dec879b5c6e42e40ce7ffa34e" +[[package]] +name = "asn1-rs" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf6690c370453db30743b373a60ba498fc0d6d83b11f4abfd87a84a075db5dd4" +dependencies = [ + "asn1-rs-derive", + "asn1-rs-impl", + "displaydoc", + "nom", + "num-traits", + "rusticata-macros", + "thiserror", + "time 0.3.14", +] + +[[package]] +name = "asn1-rs-derive" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "726535892e8eae7e70657b4c8ea93d26b8553afb1ce617caee529ef96d7dee6c" +dependencies = [ + "proc-macro2 1.0.43", + "quote 1.0.21", + "syn 1.0.99", + "synstructure", +] + +[[package]] +name = "asn1-rs-impl" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2777730b2039ac0f95f093556e61b6d26cebed5393ca6f152717777cec3a42ed" +dependencies = [ + "proc-macro2 1.0.43", + "quote 1.0.21", + "syn 1.0.99", +] + [[package]] name = "assert_matches" version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9" +[[package]] +name = "async-compression" +version = "0.3.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "345fd392ab01f746c717b1357165b76f0b67a60192007b234058c9045fdcf695" +dependencies = [ + "brotli", + "flate2", + "futures-core", + "memchr", + "pin-project-lite", + "tokio", +] + [[package]] name = "async-mutex" version = "1.4.0" @@ -359,6 +427,15 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +[[package]] +name = "autotools" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8138adefca3e5d2e73bfba83bd6eeaf904b26a7ac1b4a19892cfe16cc7e1701" +dependencies = [ + "cc", +] + [[package]] name = "axum" version = "0.5.15" @@ -422,12 +499,6 @@ dependencies = [ "tokio", ] -[[package]] -name = "base-x" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cbbc9d0964165b47557570cce6c952866c2678457aca742aafc9fb771d30270" - [[package]] name = "base64" version = "0.12.3" @@ -457,9 +528,9 @@ dependencies = [ [[package]] name = "bindgen" -version = "0.59.2" +version = "0.60.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bd2a9a458e8f4304c52c43ebb0cfbd520289f8379a52e329a38afda99bf8eb8" +checksum = "062dddbc1ba4aca46de6338e2bf87771414c335f7b2f2036e8f3e9befebf88e6" dependencies = [ "bitflags", "cexpr", @@ -573,6 +644,27 @@ dependencies = [ "syn 1.0.99", ] +[[package]] +name = "brotli" +version = "3.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1a0b1dbcc8ae29329621f8d4f0d835787c1c38bb1401979b49d13b0b305ff68" +dependencies = [ + "alloc-no-stdlib", + "alloc-stdlib", + "brotli-decompressor", +] + +[[package]] +name = "brotli-decompressor" +version = "2.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59ad2d4653bf5ca36ae797b1f4bb4dbddb60ce49ca4aed8a2ce4829f60425b80" +dependencies = [ + "alloc-no-stdlib", + "alloc-stdlib", +] + [[package]] name = "bs58" version = "0.3.1" @@ -770,19 +862,35 @@ dependencies = [ "ansi_term", "atty", "bitflags", - "strsim", - "textwrap", + "strsim 0.8.0", + "textwrap 0.11.0", "unicode-width", "vec_map", ] [[package]] -name = "cmake" -version = "0.1.48" +name = "clap" +version = "3.2.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8ad8cef104ac57b68b89df3208164d228503abbdce70f6880ffa3d970e7443a" +checksum = "1ed5341b2301a26ab80be5cbdced622e80ed808483c52e45e3310a877d3b37d7" dependencies = [ - "cc", + "atty", + "bitflags", + "clap_lex", + "indexmap", + "once_cell", + "strsim 0.10.0", + "termcolor", + "textwrap 0.15.0", +] + +[[package]] +name = "clap_lex" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" +dependencies = [ + "os_str_bytes", ] [[package]] @@ -838,12 +946,6 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e4c78c047431fee22c1a7bb92e00ad095a02a983affe4d8a72e2a2c62c1b94f3" -[[package]] -name = "const_fn" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbdcdcb6d86f71c5e97409ad45898af11cbc995b4ee8112d59095a28d376c935" - [[package]] name = "constant_time_eq" version = "0.1.5" @@ -1035,6 +1137,12 @@ dependencies = [ "rayon", ] +[[package]] +name = "data-encoding" +version = "2.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ee2393c4a91429dffb4bedf19f4d6abf27d8a732c8ce4980305d782e5426d57" + [[package]] name = "der" version = "0.5.1" @@ -1044,6 +1152,20 @@ dependencies = [ "const-oid", ] +[[package]] +name = "der-parser" +version = "8.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42d4bc9b0db0a0df9ae64634ac5bdefb7afcb534e182275ca0beadbe486701c1" +dependencies = [ + "asn1-rs", + "displaydoc", + "nom", + "num-bigint 0.4.3", + "num-traits", + "rusticata-macros", +] + [[package]] name = "derivation-path" version = "0.2.0" @@ -1125,10 +1247,15 @@ dependencies = [ ] [[package]] -name = "discard" -version = "1.0.4" +name = "displaydoc" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0" +checksum = "3bf95dc3f046b9da4f2d51833c0d3547d8564ef6910f5c1ed130306a75b92886" +dependencies = [ + "proc-macro2 1.0.43", + "quote 1.0.21", + "syn 1.0.99", +] [[package]] name = "dlopen" @@ -1153,6 +1280,12 @@ dependencies = [ "syn 0.15.44", ] +[[package]] +name = "eager" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "abe71d579d1812060163dff96056261deb5bf6729b100fa2e36a68b9649ba3d3" + [[package]] name = "ed25519" version = "1.5.2" @@ -1223,18 +1356,18 @@ dependencies = [ [[package]] name = "enum-iterator" -version = "0.7.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eeac5c5edb79e4e39fe8439ef35207780a11f69c52cbe424ce3dfad4cb78de6" +checksum = "2953d1df47ac0eb70086ccabf0275aa8da8591a28bd358ee2b52bd9f9e3ff9e9" dependencies = [ "enum-iterator-derive", ] [[package]] name = "enum-iterator-derive" -version = "0.7.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c134c37760b27a871ba422106eedbb8247da973a09e82558bf26d619c882b159" +checksum = "8958699f9359f0b04e691a13850d48b7de329138023876d07cbd024c2c820598" dependencies = [ "proc-macro2 1.0.43", "quote 1.0.21", @@ -1247,7 +1380,7 @@ version = "3.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2170fc0efee383079a8bdd05d6ea2a184d2a0f07a1c1dcabdb2fd5e9f24bc36c" dependencies = [ - "num-bigint", + "num-bigint 0.4.3", "num-traits", "proc-macro2 1.0.43", "quote 1.0.21", @@ -1621,8 +1754,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6" dependencies = [ "cfg-if 1.0.0", + "js-sys", "libc", "wasi 0.11.0+wasi-snapshot-preview1", + "wasm-bindgen", ] [[package]] @@ -1646,9 +1781,9 @@ dependencies = [ [[package]] name = "goauth" -version = "0.11.1" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38f3d68c8343245dc047982651b5afb8bd659c9959ed72efe5a73bf22684e5fd" +checksum = "f8af59a261bcf42f45d1b261232847b9b850ba0a1419d6100698246fb66e9240" dependencies = [ "arc-swap", "futures 0.3.24", @@ -1665,9 +1800,9 @@ dependencies = [ [[package]] name = "goblin" -version = "0.4.3" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32401e89c6446dcd28185931a01b1093726d0356820ac744023e6850689bf926" +checksum = "a7666983ed0dd8d21a6f6576ee00053ca0926fb281a5522577a4dbd0f1b54143" dependencies = [ "log", "plain", @@ -1701,9 +1836,9 @@ checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" [[package]] name = "hash32" -version = "0.1.1" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4041af86e63ac4298ce40e5cca669066e75b6f1aa3390fe2561ffa5e1d9f4cc" +checksum = "b0c35f58762feb77d74ebe43bdbc3210f09be9fe6742234d573bacc26ed92b67" dependencies = [ "byteorder", ] @@ -1726,6 +1861,31 @@ dependencies = [ "ahash", ] +[[package]] +name = "headers" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3e372db8e5c0d213e0cd0b9be18be2aca3d44cf2fe30a9d46a65581cd454584" +dependencies = [ + "base64 0.13.0", + "bitflags", + "bytes", + "headers-core", + "http", + "httpdate", + "mime", + "sha1", +] + +[[package]] +name = "headers-core" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7f66481bfee273957b1f20485a4ff3362987f85b2c236580d81b4eb7a326429" +dependencies = [ + "http", +] + [[package]] name = "heck" version = "0.3.3" @@ -1856,6 +2016,24 @@ dependencies = [ "want", ] +[[package]] +name = "hyper-proxy" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca815a891b24fdfb243fa3239c86154392b0953ee584aa1a2a1f66d20cbe75cc" +dependencies = [ + "bytes", + "futures 0.3.24", + "headers", + "http", + "hyper", + "hyper-tls", + "native-tls", + "tokio", + "tokio-native-tls", + "tower-service", +] + [[package]] name = "hyper-rustls" version = "0.23.0" @@ -2218,9 +2396,9 @@ checksum = "292a948cd991e376cf75541fe5b97a1081d713c618b4f1b9500f8844e49eb565" [[package]] name = "librocksdb-sys" -version = "0.6.1+6.28.2" +version = "0.8.0+7.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81bc587013734dadb7cf23468e531aa120788b87243648be42e2d3a072186291" +checksum = "611804e4666a25136fcc5f8cf425ab4d26c7f74ea245ffe92ea23b85b6420b5d" dependencies = [ "bindgen", "bzip2-sys", @@ -2573,12 +2751,11 @@ dependencies = [ [[package]] name = "nix" -version = "0.23.1" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f866317acbd3a240710c63f065ffb1e4fd466259045ccb504130b7f668f35c6" +checksum = "195cdbc1741b8134346d515b3a56a1c94b0912758009cfd53f99ea0f57b065fc" dependencies = [ "bitflags", - "cc", "cfg-if 1.0.0", "libc", "memoffset", @@ -2603,6 +2780,31 @@ dependencies = [ "winapi 0.3.9", ] +[[package]] +name = "num" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8536030f9fea7127f841b45bb6243b27255787fb4eb83958aa1ef9d2fdc0c36" +dependencies = [ + "num-bigint 0.2.6", + "num-complex", + "num-integer", + "num-iter", + "num-rational", + "num-traits", +] + +[[package]] +name = "num-bigint" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "090c7f9998ee0ff65aa5b723e4009f7b217707f1fb5ea551329cc4d6231fb304" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + [[package]] name = "num-bigint" version = "0.4.3" @@ -2614,6 +2816,16 @@ dependencies = [ "num-traits", ] +[[package]] +name = "num-complex" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6b19411a9719e753aff12e5187b74d60d3dc449ec3f4dc21e3989c3f554bc95" +dependencies = [ + "autocfg", + "num-traits", +] + [[package]] name = "num-derive" version = "0.3.3" @@ -2635,6 +2847,29 @@ dependencies = [ "num-traits", ] +[[package]] +name = "num-iter" +version = "0.1.43" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-rational" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c000134b5dbf44adc5cb772486d335293351644b801551abe8f75c84cfa4aef" +dependencies = [ + "autocfg", + "num-bigint 0.2.6", + "num-integer", + "num-traits", +] + [[package]] name = "num-traits" version = "0.2.15" @@ -2690,6 +2925,15 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" +[[package]] +name = "oid-registry" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d4bda43fd1b844cbc6e6e54b5444e2b1bc7838bce59ad205902cccbb26d6761" +dependencies = [ + "asn1-rs", +] + [[package]] name = "once_cell" version = "1.13.1" @@ -2759,13 +3003,15 @@ dependencies = [ [[package]] name = "opentelemetry" -version = "0.16.0" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1cf9b1c4e9a6c4de793c632496fa490bdc0e1eea73f0c91394f7b6990935d22" +checksum = "6105e89802af13fdf48c49d7646d3b533a70e536d818aae7e78ba0433d01acb8" dependencies = [ "async-trait", "crossbeam-channel", - "futures 0.3.24", + "futures-channel", + "futures-executor", + "futures-util", "js-sys", "lazy_static", "percent-encoding 2.1.0", @@ -2775,21 +3021,26 @@ dependencies = [ ] [[package]] -name = "ouroboros" -version = "0.14.2" +name = "os_str_bytes" +version = "6.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71643f290d126e18ac2598876d01e1d57aed164afc78fdb6e2a0c6589a1f6662" +checksum = "9ff7415e9ae3fff1225851df9e0d9e4e5479f947619774677a63572e55e80eff" + +[[package]] +name = "ouroboros" +version = "0.15.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f56a2b0aa5fc88687aaf63e85a7974422790ce3419a2e1a15870f8a55227822" dependencies = [ "aliasable", "ouroboros_macro", - "stable_deref_trait", ] [[package]] name = "ouroboros_macro" -version = "0.14.2" +version = "0.15.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed9a247206016d424fe8497bc611e510887af5c261fbbf977877c4bb55ca4d82" +checksum = "6c40641e27d0eb38cae3dee081d920104d2db47a8e853c1a592ef68d33f5ebf4" dependencies = [ "Inflector", "proc-macro-error", @@ -2899,6 +3150,15 @@ dependencies = [ "digest 0.10.3", ] +[[package]] +name = "pbkdf2" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917" +dependencies = [ + "digest 0.10.3", +] + [[package]] name = "peeking_take_while" version = "0.1.2" @@ -2926,6 +3186,15 @@ version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" +[[package]] +name = "percentage" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2fd23b938276f14057220b707937bcb42fa76dda7560e57a2da30cb52d557937" +dependencies = [ + "num", +] + [[package]] name = "pest" version = "2.3.0" @@ -3053,6 +3322,12 @@ version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872" +[[package]] +name = "pretty-hex" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6fa0831dd7cc608c38a5e323422a0077678fa5744aa2be4ad91c4ece8eec8d5" + [[package]] name = "prettyplease" version = "0.1.19" @@ -3107,12 +3382,6 @@ dependencies = [ "version_check", ] -[[package]] -name = "proc-macro-hack" -version = "0.5.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" - [[package]] name = "proc-macro2" version = "0.4.30" @@ -3156,12 +3425,12 @@ dependencies = [ [[package]] name = "prost" -version = "0.10.4" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71adf41db68aa0daaefc69bb30bcd68ded9b9abaad5d1fbb6304c4fb390e083e" +checksum = "399c3c31cdec40583bb68f0b18403400d01ec4289c383aa047560439952c4dd7" dependencies = [ "bytes", - "prost-derive 0.10.1", + "prost-derive 0.11.0", ] [[package]] @@ -3186,21 +3455,19 @@ dependencies = [ [[package]] name = "prost-build" -version = "0.10.4" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ae5a4388762d5815a9fc0dea33c56b021cdc8dde0c55e0c9ca57197254b0cab" +checksum = "7f835c582e6bd972ba8347313300219fed5bfa52caf175298d860b61ff6069bb" dependencies = [ "bytes", - "cfg-if 1.0.0", - "cmake", "heck 0.4.0", "itertools 0.10.3", "lazy_static", "log", "multimap", "petgraph", - "prost 0.10.4", - "prost-types 0.10.1", + "prost 0.11.0", + "prost-types 0.11.1", "regex", "tempfile", "which", @@ -3221,9 +3488,9 @@ dependencies = [ [[package]] name = "prost-derive" -version = "0.10.1" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b670f45da57fb8542ebdbb6105a925fe571b67f9e7ed9f47a06a84e72b4e7cc" +checksum = "7345d5f0e08c0536d7ac7229952590239e77abf0a0100a1b1d890add6ea96364" dependencies = [ "anyhow", "itertools 0.10.3", @@ -3244,12 +3511,21 @@ dependencies = [ [[package]] name = "prost-types" -version = "0.10.1" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d0a014229361011dc8e69c8a1ec6c2e8d0f2af7c91e3ea3f5b2170298461e68" +checksum = "4dfaa718ad76a44b3415e6c4d53b17c8f99160dcb3a99b10470fce8ad43f6e3e" dependencies = [ "bytes", - "prost 0.10.4", + "prost 0.11.0", +] + +[[package]] +name = "protobuf-src" +version = "1.1.0+21.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7ac8852baeb3cc6fb83b93646fb93c0ffe5d14bf138c945ceb4b9948ee0e3c1" +dependencies = [ + "autotools", ] [[package]] @@ -3381,7 +3657,6 @@ dependencies = [ "rand_chacha 0.2.2", "rand_core 0.5.1", "rand_hc", - "rand_pcg", ] [[package]] @@ -3457,15 +3732,6 @@ dependencies = [ "rand_core 0.5.1", ] -[[package]] -name = "rand_pcg" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429" -dependencies = [ - "rand_core 0.5.1", -] - [[package]] name = "rand_xoshiro" version = "0.6.0" @@ -3598,6 +3864,7 @@ version = "0.11.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b75aa69a3f06bbcc66ede33af2af253c6f7a86b1ca0033f60c580a27074fbf92" dependencies = [ + "async-compression", "base64 0.13.0", "bytes", "encoding_rs", @@ -3625,6 +3892,7 @@ dependencies = [ "tokio", "tokio-native-tls", "tokio-rustls 0.23.4", + "tokio-util 0.7.2", "tower-service", "url 2.2.2", "wasm-bindgen", @@ -3634,12 +3902,6 @@ dependencies = [ "winreg", ] -[[package]] -name = "retain_mut" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4389f1d5789befaf6029ebd9f7dac4af7f7e3d61b69d4f30e2ac02b57e7712b0" - [[package]] name = "ring" version = "0.16.20" @@ -3657,9 +3919,9 @@ dependencies = [ [[package]] name = "rocksdb" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "620f4129485ff1a7128d184bc687470c21c7951b64779ebc9cfdad3dcd920290" +checksum = "7e9562ea1d70c0cc63a34a22d977753b50cca91cc6b6527750463bd5dd8697bc" dependencies = [ "libc", "librocksdb-sys", @@ -3710,15 +3972,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" -[[package]] -name = "rustc_version" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" -dependencies = [ - "semver 0.9.0", -] - [[package]] name = "rustc_version" version = "0.3.3" @@ -3737,6 +3990,15 @@ dependencies = [ "semver 1.0.13", ] +[[package]] +name = "rusticata-macros" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "faf0c4a6ece9950b9abdb62b1cfcf2a68b3b67a10ba445b3bb85be2a293d0632" +dependencies = [ + "nom", +] + [[package]] name = "rustls" version = "0.19.1" @@ -3837,18 +4099,18 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" [[package]] name = "scroll" -version = "0.10.2" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fda28d4b4830b807a8b43f7b0e6b5df875311b3e7621d84577188c175b6ec1ec" +checksum = "04c565b551bafbef4157586fa379538366e4385d42082f255bfd96e4fe8519da" dependencies = [ "scroll_derive", ] [[package]] name = "scroll_derive" -version = "0.10.5" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aaaae8f38bb311444cfb7f1979af0bc9240d95795f75f9ceddf6a59b79ceffa0" +checksum = "bdbda6ac5cd1321e724fa9cee216f3a61885889b896f073b8f82322789c5250e" dependencies = [ "proc-macro2 1.0.43", "quote 1.0.21", @@ -3898,22 +4160,13 @@ dependencies = [ "libc", ] -[[package]] -name = "semver" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" -dependencies = [ - "semver-parser 0.7.0", -] - [[package]] name = "semver" version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6" dependencies = [ - "semver-parser 0.10.2", + "semver-parser", ] [[package]] @@ -3922,12 +4175,6 @@ version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "93f6841e709003d68bb2deee8c343572bf446003ec20a583e76f7b15cebf3711" -[[package]] -name = "semver-parser" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" - [[package]] name = "semver-parser" version = "0.10.2" @@ -4074,19 +4321,15 @@ dependencies = [ [[package]] name = "sha1" -version = "0.6.1" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1da05c97445caa12d05e848c4a4fcbbea29e748ac28f7e80e9b010392063770" +checksum = "006769ba83e921b3085caa8334186b00cf92b4cb1a6cf4632fbccc8eff5c7549" dependencies = [ - "sha1_smol", + "cfg-if 1.0.0", + "cpufeatures", + "digest 0.10.3", ] -[[package]] -name = "sha1_smol" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012" - [[package]] name = "sha2" version = "0.9.9" @@ -4211,9 +4454,9 @@ checksum = "2fd0db749597d91ff862fd1d55ea87f7855a744a8425a64695b6fca237d1dad1" [[package]] name = "smpl_jwt" -version = "0.6.1" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4370044f8b20f944e05c35d77edd3518e6f21fc4de77e593919f287c6a3f428a" +checksum = "95b6ff8c21c74ce7744643a7cddbb02579a44f1f77e4316bff1ddb741aca8ac9" dependencies = [ "base64 0.13.0", "log", @@ -4222,7 +4465,7 @@ dependencies = [ "serde_derive", "serde_json", "simpl", - "time 0.2.27", + "time 0.3.14", ] [[package]] @@ -4252,7 +4495,7 @@ dependencies = [ [[package]] name = "solana-account-decoder" -version = "1.10.26" +version = "1.11.10" dependencies = [ "Inflector", "base64 0.13.0", @@ -4264,7 +4507,7 @@ dependencies = [ "serde_derive", "serde_json", "solana-config-program", - "solana-sdk 1.10.26", + "solana-sdk 1.11.10", "solana-vote-program", "spl-token", "spl-token-2022", @@ -4274,7 +4517,7 @@ dependencies = [ [[package]] name = "solana-address-lookup-table-program" -version = "1.10.26" +version = "1.11.10" dependencies = [ "bincode", "bytemuck", @@ -4283,23 +4526,23 @@ dependencies = [ "num-traits", "rustc_version 0.4.0", "serde", - "solana-frozen-abi 1.10.26", - "solana-frozen-abi-macro 1.10.26", - "solana-program 1.10.26", + "solana-frozen-abi 1.11.10", + "solana-frozen-abi-macro 1.11.10", + "solana-program 1.11.10", "solana-program-runtime", - "solana-sdk 1.10.26", + "solana-sdk 1.11.10", "thiserror", ] [[package]] name = "solana-banks-client" -version = "1.10.26" +version = "1.11.10" dependencies = [ "borsh", "futures 0.3.24", "solana-banks-interface", - "solana-program 1.10.26", - "solana-sdk 1.10.26", + "solana-program 1.11.10", + "solana-sdk 1.11.10", "tarpc", "thiserror", "tokio", @@ -4308,16 +4551,16 @@ dependencies = [ [[package]] name = "solana-banks-interface" -version = "1.10.26" +version = "1.11.10" dependencies = [ "serde", - "solana-sdk 1.10.26", + "solana-sdk 1.11.10", "tarpc", ] [[package]] name = "solana-banks-server" -version = "1.10.26" +version = "1.11.10" dependencies = [ "bincode", "crossbeam-channel", @@ -4325,7 +4568,7 @@ dependencies = [ "solana-banks-interface", "solana-client", "solana-runtime", - "solana-sdk 1.10.26", + "solana-sdk 1.11.10", "solana-send-transaction-service", "tarpc", "tokio", @@ -4339,7 +4582,7 @@ version = "1.10.26" dependencies = [ "borsh", "chrono", - "clap", + "clap 2.34.0", "crossbeam-channel", "csv", "fixed", @@ -4364,14 +4607,14 @@ dependencies = [ "solana-genesis", "solana-gossip", "solana-local-cluster", - "solana-logger 1.10.26", + "solana-logger 1.11.10", "solana-measure", "solana-metrics", "solana-net-utils", "solana-program 1.10.38", "solana-rpc", "solana-runtime", - "solana-sdk 1.10.26", + "solana-sdk 1.11.10", "solana-streamer", "solana-test-validator", "solana-transaction-status", @@ -4381,9 +4624,9 @@ dependencies = [ [[package]] name = "solana-bench-tps" -version = "1.10.26" +version = "1.11.10" dependencies = [ - "clap", + "clap 2.34.0", "crossbeam-channel", "log", "rayon", @@ -4396,13 +4639,13 @@ dependencies = [ "solana-faucet", "solana-genesis", "solana-gossip", - "solana-logger 1.10.26", + "solana-logger 1.11.10", "solana-measure", "solana-metrics", "solana-net-utils", "solana-rpc", "solana-runtime", - "solana-sdk 1.10.26", + "solana-sdk 1.11.10", "solana-streamer", "solana-version", "thiserror", @@ -4410,7 +4653,7 @@ dependencies = [ [[package]] name = "solana-bloom" -version = "1.10.26" +version = "1.11.10" dependencies = [ "bv", "fnv", @@ -4420,14 +4663,14 @@ dependencies = [ "rustc_version 0.4.0", "serde", "serde_derive", - "solana-frozen-abi 1.10.26", - "solana-frozen-abi-macro 1.10.26", - "solana-sdk 1.10.26", + "solana-frozen-abi 1.11.10", + "solana-frozen-abi-macro 1.11.10", + "solana-sdk 1.11.10", ] [[package]] name = "solana-bpf-loader-program" -version = "1.10.26" +version = "1.11.10" dependencies = [ "bincode", "byteorder", @@ -4436,35 +4679,35 @@ dependencies = [ "solana-measure", "solana-metrics", "solana-program-runtime", - "solana-sdk 1.10.26", - "solana-zk-token-sdk 1.10.26", + "solana-sdk 1.11.10", + "solana-zk-token-sdk 1.11.10", "solana_rbpf", "thiserror", ] [[package]] name = "solana-bucket-map" -version = "1.10.26" +version = "1.11.10" dependencies = [ "log", "memmap2", "modular-bitfield", "rand 0.7.3", "solana-measure", - "solana-sdk 1.10.26", + "solana-sdk 1.11.10", "tempfile", ] [[package]] name = "solana-clap-utils" -version = "1.10.26" +version = "1.11.10" dependencies = [ "chrono", - "clap", + "clap 2.34.0", "rpassword", "solana-perf", "solana-remote-wallet", - "solana-sdk 1.10.26", + "solana-sdk 1.11.10", "thiserror", "tiny-bip39", "uriparse", @@ -4473,7 +4716,7 @@ dependencies = [ [[package]] name = "solana-cli-config" -version = "1.10.26" +version = "1.11.10" dependencies = [ "dirs-next", "lazy_static", @@ -4481,21 +4724,22 @@ dependencies = [ "serde_derive", "serde_yaml", "solana-clap-utils", - "solana-sdk 1.10.26", + "solana-sdk 1.11.10", "url 2.2.2", ] [[package]] name = "solana-cli-output" -version = "1.10.26" +version = "1.11.10" dependencies = [ "Inflector", "base64 0.13.0", "chrono", - "clap", + "clap 2.34.0", "console", "humantime", "indicatif", + "pretty-hex", "semver 1.0.13", "serde", "serde_json", @@ -4503,7 +4747,7 @@ dependencies = [ "solana-clap-utils", "solana-cli-config", "solana-client", - "solana-sdk 1.10.26", + "solana-sdk 1.11.10", "solana-transaction-status", "solana-vote-program", "spl-memo", @@ -4511,7 +4755,7 @@ dependencies = [ [[package]] name = "solana-client" -version = "1.10.26" +version = "1.11.10" dependencies = [ "async-mutex", "async-trait", @@ -4519,7 +4763,7 @@ dependencies = [ "bincode", "bs58 0.4.0", "bytes", - "clap", + "clap 2.34.0", "crossbeam-channel", "enum_dispatch", "futures 0.3.24", @@ -4530,7 +4774,6 @@ dependencies = [ "jsonrpc-core", "lazy_static", "log", - "lru", "quinn", "quinn-proto", "rand 0.7.3", @@ -4548,11 +4791,12 @@ dependencies = [ "solana-measure", "solana-metrics", "solana-net-utils", - "solana-sdk 1.10.26", + "solana-sdk 1.11.10", "solana-streamer", "solana-transaction-status", "solana-version", "solana-vote-program", + "spl-token-2022", "thiserror", "tokio", "tokio-stream", @@ -4563,27 +4807,27 @@ dependencies = [ [[package]] name = "solana-compute-budget-program" -version = "1.10.26" +version = "1.11.10" dependencies = [ "solana-program-runtime", - "solana-sdk 1.10.26", + "solana-sdk 1.11.10", ] [[package]] name = "solana-config-program" -version = "1.10.26" +version = "1.11.10" dependencies = [ "bincode", "chrono", "serde", "serde_derive", "solana-program-runtime", - "solana-sdk 1.10.26", + "solana-sdk 1.11.10", ] [[package]] name = "solana-core" -version = "1.10.26" +version = "1.11.10" dependencies = [ "ahash", "base64 0.13.0", @@ -4592,17 +4836,18 @@ dependencies = [ "chrono", "crossbeam-channel", "dashmap", + "eager", "etcd-client", "fs_extra", "histogram", "itertools 0.10.3", + "lazy_static", "log", "lru", "min-max-heap", "rand 0.7.3", "rand_chacha 0.2.2", "rayon", - "retain_mut", "rustc_version 0.4.0", "serde", "serde_derive", @@ -4610,8 +4855,8 @@ dependencies = [ "solana-bloom", "solana-client", "solana-entry", - "solana-frozen-abi 1.10.26", - "solana-frozen-abi-macro 1.10.26", + "solana-frozen-abi 1.11.10", + "solana-frozen-abi-macro 1.11.10", "solana-geyser-plugin-manager", "solana-gossip", "solana-ledger", @@ -4622,10 +4867,9 @@ dependencies = [ "solana-poh", "solana-program-runtime", "solana-rayon-threadlimit", - "solana-replica-lib", "solana-rpc", "solana-runtime", - "solana-sdk 1.10.26", + "solana-sdk 1.11.10", "solana-send-transaction-service", "solana-streamer", "solana-transaction-status", @@ -4641,12 +4885,13 @@ dependencies = [ [[package]] name = "solana-entry" -version = "1.10.26" +version = "1.11.10" dependencies = [ "bincode", "crossbeam-channel", "dlopen", "dlopen_derive", + "lazy_static", "log", "rand 0.7.3", "rayon", @@ -4656,51 +4901,31 @@ dependencies = [ "solana-metrics", "solana-perf", "solana-rayon-threadlimit", - "solana-sdk 1.10.26", + "solana-sdk 1.11.10", ] [[package]] name = "solana-faucet" -version = "1.10.26" +version = "1.11.10" dependencies = [ "bincode", "byteorder", - "clap", + "clap 2.34.0", "crossbeam-channel", "log", "serde", "serde_derive", "solana-clap-utils", "solana-cli-config", - "solana-logger 1.10.26", + "solana-logger 1.11.10", "solana-metrics", - "solana-sdk 1.10.26", + "solana-sdk 1.11.10", "solana-version", "spl-memo", "thiserror", "tokio", ] -[[package]] -name = "solana-frozen-abi" -version = "1.10.26" -dependencies = [ - "bs58 0.4.0", - "bv", - "generic-array", - "im", - "lazy_static", - "log", - "memmap2", - "rustc_version 0.4.0", - "serde", - "serde_bytes", - "serde_derive", - "sha2 0.10.3", - "solana-frozen-abi-macro 1.10.26", - "thiserror", -] - [[package]] name = "solana-frozen-abi" version = "1.10.38" @@ -4724,13 +4949,35 @@ dependencies = [ ] [[package]] -name = "solana-frozen-abi-macro" -version = "1.10.26" +name = "solana-frozen-abi" +version = "1.11.10" dependencies = [ - "proc-macro2 1.0.43", - "quote 1.0.21", + "ahash", + "blake3", + "block-buffer 0.9.0", + "bs58 0.4.0", + "bv", + "byteorder", + "cc", + "either", + "generic-array", + "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", - "syn 1.0.99", + "serde", + "serde_bytes", + "serde_derive", + "serde_json", + "sha2 0.10.3", + "solana-frozen-abi-macro 1.11.10", + "subtle", + "thiserror", ] [[package]] @@ -4745,12 +4992,22 @@ dependencies = [ "syn 1.0.99", ] +[[package]] +name = "solana-frozen-abi-macro" +version = "1.11.10" +dependencies = [ + "proc-macro2 1.0.43", + "quote 1.0.21", + "rustc_version 0.4.0", + "syn 1.0.99", +] + [[package]] name = "solana-genesis" -version = "1.10.26" +version = "1.11.10" dependencies = [ "base64 0.13.0", - "clap", + "clap 2.34.0", "serde", "serde_json", "serde_yaml", @@ -4758,9 +5015,9 @@ dependencies = [ "solana-cli-config", "solana-entry", "solana-ledger", - "solana-logger 1.10.26", + "solana-logger 1.11.10", "solana-runtime", - "solana-sdk 1.10.26", + "solana-sdk 1.11.10", "solana-stake-program", "solana-version", "solana-vote-program", @@ -4769,17 +5026,17 @@ dependencies = [ [[package]] name = "solana-geyser-plugin-interface" -version = "1.10.26" +version = "1.11.10" dependencies = [ "log", - "solana-sdk 1.10.26", + "solana-sdk 1.11.10", "solana-transaction-status", "thiserror", ] [[package]] name = "solana-geyser-plugin-manager" -version = "1.10.26" +version = "1.11.10" dependencies = [ "bs58 0.4.0", "crossbeam-channel", @@ -4792,18 +5049,18 @@ dependencies = [ "solana-metrics", "solana-rpc", "solana-runtime", - "solana-sdk 1.10.26", + "solana-sdk 1.11.10", "solana-transaction-status", "thiserror", ] [[package]] name = "solana-gossip" -version = "1.10.26" +version = "1.11.10" dependencies = [ "bincode", "bv", - "clap", + "clap 2.34.0", "crossbeam-channel", "flate2", "indexmap", @@ -4823,17 +5080,17 @@ dependencies = [ "solana-clap-utils", "solana-client", "solana-entry", - "solana-frozen-abi 1.10.26", - "solana-frozen-abi-macro 1.10.26", + "solana-frozen-abi 1.11.10", + "solana-frozen-abi-macro 1.11.10", "solana-ledger", - "solana-logger 1.10.26", + "solana-logger 1.11.10", "solana-measure", "solana-metrics", "solana-net-utils", "solana-perf", "solana-rayon-threadlimit", "solana-runtime", - "solana-sdk 1.10.26", + "solana-sdk 1.11.10", "solana-streamer", "solana-version", "solana-vote-program", @@ -4842,7 +5099,7 @@ dependencies = [ [[package]] name = "solana-ledger" -version = "1.10.26" +version = "1.11.10" dependencies = [ "bincode", "bitflags", @@ -4850,6 +5107,7 @@ dependencies = [ "chrono", "chrono-humanize", "crossbeam-channel", + "dashmap", "fs_extra", "futures 0.3.24", "itertools 0.10.3", @@ -4859,7 +5117,7 @@ dependencies = [ "lru", "num_cpus", "num_enum", - "prost 0.10.4", + "prost 0.11.0", "rand 0.7.3", "rand_chacha 0.2.2", "rayon", @@ -4869,21 +5127,26 @@ dependencies = [ "serde", "serde_bytes", "sha2 0.10.3", + "solana-account-decoder", "solana-bpf-loader-program", "solana-entry", - "solana-frozen-abi 1.10.26", - "solana-frozen-abi-macro 1.10.26", + "solana-frozen-abi 1.11.10", + "solana-frozen-abi-macro 1.11.10", "solana-measure", "solana-metrics", "solana-perf", "solana-program-runtime", "solana-rayon-threadlimit", "solana-runtime", - "solana-sdk 1.10.26", + "solana-sdk 1.11.10", + "solana-stake-program", "solana-storage-bigtable", "solana-storage-proto", "solana-transaction-status", "solana-vote-program", + "spl-token", + "spl-token-2022", + "static_assertions", "tempfile", "thiserror", "tokio", @@ -4893,7 +5156,7 @@ dependencies = [ [[package]] name = "solana-local-cluster" -version = "1.10.26" +version = "1.11.10" dependencies = [ "crossbeam-channel", "fs_extra", @@ -4908,22 +5171,13 @@ dependencies = [ "solana-gossip", "solana-ledger", "solana-runtime", - "solana-sdk 1.10.26", + "solana-sdk 1.11.10", "solana-stake-program", "solana-streamer", "solana-vote-program", "tempfile", ] -[[package]] -name = "solana-logger" -version = "1.10.26" -dependencies = [ - "env_logger", - "lazy_static", - "log", -] - [[package]] name = "solana-logger" version = "1.10.38" @@ -4935,41 +5189,50 @@ dependencies = [ "log", ] +[[package]] +name = "solana-logger" +version = "1.11.10" +dependencies = [ + "env_logger", + "lazy_static", + "log", +] + [[package]] name = "solana-measure" -version = "1.10.26" +version = "1.11.10" dependencies = [ "log", - "solana-sdk 1.10.26", + "solana-sdk 1.11.10", ] [[package]] name = "solana-merkle-tree" -version = "1.10.26" +version = "1.11.10" dependencies = [ "fast-math", "matches", - "solana-program 1.10.26", + "solana-program 1.11.10", ] [[package]] name = "solana-metrics" -version = "1.10.26" +version = "1.11.10" dependencies = [ "crossbeam-channel", "gethostname", "lazy_static", "log", "reqwest", - "solana-sdk 1.10.26", + "solana-sdk 1.11.10", ] [[package]] name = "solana-net-utils" -version = "1.10.26" +version = "1.11.10" dependencies = [ "bincode", - "clap", + "clap 3.2.21", "crossbeam-channel", "log", "nix", @@ -4977,8 +5240,8 @@ dependencies = [ "serde", "serde_derive", "socket2", - "solana-logger 1.10.26", - "solana-sdk 1.10.26", + "solana-logger 1.11.10", + "solana-sdk 1.11.10", "solana-version", "tokio", "url 2.2.2", @@ -4986,7 +5249,7 @@ dependencies = [ [[package]] name = "solana-perf" -version = "1.10.26" +version = "1.11.10" dependencies = [ "ahash", "bincode", @@ -5005,13 +5268,13 @@ dependencies = [ "serde", "solana-metrics", "solana-rayon-threadlimit", - "solana-sdk 1.10.26", + "solana-sdk 1.11.10", "solana-vote-program", ] [[package]] name = "solana-poh" -version = "1.10.26" +version = "1.11.10" dependencies = [ "core_affinity", "crossbeam-channel", @@ -5021,51 +5284,11 @@ dependencies = [ "solana-measure", "solana-metrics", "solana-runtime", - "solana-sdk 1.10.26", + "solana-sdk 1.11.10", "solana-sys-tuner", "thiserror", ] -[[package]] -name = "solana-program" -version = "1.10.26" -dependencies = [ - "base64 0.13.0", - "bincode", - "bitflags", - "blake3", - "borsh", - "borsh-derive", - "bs58 0.4.0", - "bv", - "bytemuck", - "console_error_panic_hook", - "console_log", - "curve25519-dalek", - "getrandom 0.1.16", - "itertools 0.10.3", - "js-sys", - "lazy_static", - "libsecp256k1", - "log", - "num-derive", - "num-traits", - "parking_lot 0.12.1", - "rand 0.7.3", - "rustc_version 0.4.0", - "rustversion", - "serde", - "serde_bytes", - "serde_derive", - "sha2 0.10.3", - "sha3 0.10.2", - "solana-frozen-abi 1.10.26", - "solana-frozen-abi-macro 1.10.26", - "solana-sdk-macro 1.10.26", - "thiserror", - "wasm-bindgen", -] - [[package]] name = "solana-program" version = "1.10.38" @@ -5109,11 +5332,59 @@ dependencies = [ ] [[package]] -name = "solana-program-runtime" -version = "1.10.26" +name = "solana-program" +version = "1.11.10" dependencies = [ "base64 0.13.0", "bincode", + "bitflags", + "blake3", + "borsh", + "borsh-derive", + "bs58 0.4.0", + "bv", + "bytemuck", + "cc", + "console_error_panic_hook", + "console_log", + "curve25519-dalek", + "getrandom 0.2.7", + "itertools 0.10.3", + "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.3", + "sha3 0.10.2", + "solana-frozen-abi 1.11.10", + "solana-frozen-abi-macro 1.11.10", + "solana-sdk-macro 1.11.10", + "thiserror", + "tiny-bip39", + "wasm-bindgen", + "zeroize", +] + +[[package]] +name = "solana-program-runtime" +version = "1.11.10" +dependencies = [ + "base64 0.13.0", + "bincode", + "eager", "enum-iterator", "itertools 0.10.3", "libc", @@ -5123,17 +5394,19 @@ dependencies = [ "num-traits", "rustc_version 0.4.0", "serde", - "solana-frozen-abi 1.10.26", - "solana-frozen-abi-macro 1.10.26", + "solana-frozen-abi 1.11.10", + "solana-frozen-abi-macro 1.11.10", "solana-measure", - "solana-sdk 1.10.26", + "solana-metrics", + "solana-sdk 1.11.10", "thiserror", ] [[package]] name = "solana-program-test" -version = "1.10.26" +version = "1.11.10" dependencies = [ + "assert_matches", "async-trait", "base64 0.13.0", "bincode", @@ -5143,10 +5416,10 @@ dependencies = [ "solana-banks-client", "solana-banks-server", "solana-bpf-loader-program", - "solana-logger 1.10.26", + "solana-logger 1.11.10", "solana-program-runtime", "solana-runtime", - "solana-sdk 1.10.26", + "solana-sdk 1.11.10", "solana-vote-program", "thiserror", "tokio", @@ -5154,7 +5427,7 @@ dependencies = [ [[package]] name = "solana-rayon-threadlimit" -version = "1.10.26" +version = "1.11.10" dependencies = [ "lazy_static", "num_cpus", @@ -5162,7 +5435,7 @@ dependencies = [ [[package]] name = "solana-remote-wallet" -version = "1.10.26" +version = "1.11.10" dependencies = [ "console", "dialoguer", @@ -5172,30 +5445,14 @@ dependencies = [ "parking_lot 0.12.1", "qstring", "semver 1.0.13", - "solana-sdk 1.10.26", + "solana-sdk 1.11.10", "thiserror", "uriparse", ] -[[package]] -name = "solana-replica-lib" -version = "1.10.26" -dependencies = [ - "crossbeam-channel", - "futures-util", - "log", - "prost 0.10.4", - "solana-rpc", - "solana-runtime", - "solana-sdk 1.10.26", - "tokio", - "tonic 0.7.2", - "tonic-build 0.7.2", -] - [[package]] name = "solana-rpc" -version = "1.10.26" +version = "1.11.10" dependencies = [ "base64 0.13.0", "bincode", @@ -5228,14 +5485,16 @@ dependencies = [ "solana-poh", "solana-rayon-threadlimit", "solana-runtime", - "solana-sdk 1.10.26", + "solana-sdk 1.11.10", "solana-send-transaction-service", + "solana-stake-program", "solana-storage-bigtable", "solana-streamer", "solana-transaction-status", "solana-version", "solana-vote-program", "spl-token", + "spl-token-2022", "stream-cancel", "thiserror", "tokio", @@ -5244,7 +5503,7 @@ dependencies = [ [[package]] name = "solana-runtime" -version = "1.10.26" +version = "1.11.10" dependencies = [ "arrayref", "bincode", @@ -5268,6 +5527,7 @@ dependencies = [ "num-derive", "num-traits", "num_cpus", + "once_cell", "ouroboros", "rand 0.7.3", "rayon", @@ -5279,17 +5539,17 @@ dependencies = [ "solana-bucket-map", "solana-compute-budget-program", "solana-config-program", - "solana-frozen-abi 1.10.26", - "solana-frozen-abi-macro 1.10.26", + "solana-frozen-abi 1.11.10", + "solana-frozen-abi-macro 1.11.10", "solana-measure", "solana-metrics", "solana-program-runtime", "solana-rayon-threadlimit", - "solana-sdk 1.10.26", + "solana-sdk 1.11.10", "solana-stake-program", "solana-vote-program", "solana-zk-token-proof-program", - "solana-zk-token-sdk 1.10.26", + "solana-zk-token-sdk 1.11.10", "strum", "strum_macros", "symlink", @@ -5299,55 +5559,6 @@ dependencies = [ "zstd", ] -[[package]] -name = "solana-sdk" -version = "1.10.26" -dependencies = [ - "assert_matches", - "base64 0.13.0", - "bincode", - "bitflags", - "borsh", - "bs58 0.4.0", - "bytemuck", - "byteorder", - "chrono", - "derivation-path", - "digest 0.10.3", - "ed25519-dalek", - "ed25519-dalek-bip32", - "generic-array", - "hmac 0.12.1", - "itertools 0.10.3", - "js-sys", - "lazy_static", - "libsecp256k1", - "log", - "memmap2", - "num-derive", - "num-traits", - "pbkdf2 0.10.1", - "qstring", - "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.3", - "sha3 0.10.2", - "solana-frozen-abi 1.10.26", - "solana-frozen-abi-macro 1.10.26", - "solana-logger 1.10.26", - "solana-program 1.10.26", - "solana-sdk-macro 1.10.26", - "thiserror", - "uriparse", - "wasm-bindgen", -] - [[package]] name = "solana-sdk" version = "1.10.38" @@ -5400,14 +5611,52 @@ dependencies = [ ] [[package]] -name = "solana-sdk-macro" -version = "1.10.26" +name = "solana-sdk" +version = "1.11.10" dependencies = [ + "assert_matches", + "base64 0.13.0", + "bincode", + "bitflags", + "borsh", "bs58 0.4.0", - "proc-macro2 1.0.43", - "quote 1.0.21", + "bytemuck", + "byteorder", + "chrono", + "derivation-path", + "digest 0.10.3", + "ed25519-dalek", + "ed25519-dalek-bip32", + "generic-array", + "hmac 0.12.1", + "itertools 0.10.3", + "js-sys", + "lazy_static", + "libsecp256k1", + "log", + "memmap2", + "num-derive", + "num-traits", + "pbkdf2 0.11.0", + "qstring", + "rand 0.7.3", + "rand_chacha 0.2.2", + "rustc_version 0.4.0", "rustversion", - "syn 1.0.99", + "serde", + "serde_bytes", + "serde_derive", + "serde_json", + "sha2 0.10.3", + "sha3 0.10.2", + "solana-frozen-abi 1.11.10", + "solana-frozen-abi-macro 1.11.10", + "solana-logger 1.11.10", + "solana-program 1.11.10", + "solana-sdk-macro 1.11.10", + "thiserror", + "uriparse", + "wasm-bindgen", ] [[package]] @@ -5423,9 +5672,20 @@ dependencies = [ "syn 1.0.99", ] +[[package]] +name = "solana-sdk-macro" +version = "1.11.10" +dependencies = [ + "bs58 0.4.0", + "proc-macro2 1.0.43", + "quote 1.0.21", + "rustversion", + "syn 1.0.99", +] + [[package]] name = "solana-send-transaction-service" -version = "1.10.26" +version = "1.11.10" dependencies = [ "crossbeam-channel", "log", @@ -5433,12 +5693,12 @@ dependencies = [ "solana-measure", "solana-metrics", "solana-runtime", - "solana-sdk 1.10.26", + "solana-sdk 1.11.10", ] [[package]] name = "solana-stake-program" -version = "1.10.26" +version = "1.11.10" dependencies = [ "bincode", "log", @@ -5448,69 +5708,76 @@ dependencies = [ "serde", "serde_derive", "solana-config-program", - "solana-frozen-abi 1.10.26", - "solana-frozen-abi-macro 1.10.26", + "solana-frozen-abi 1.11.10", + "solana-frozen-abi-macro 1.11.10", "solana-metrics", "solana-program-runtime", - "solana-sdk 1.10.26", + "solana-sdk 1.11.10", "solana-vote-program", "thiserror", ] [[package]] name = "solana-storage-bigtable" -version = "1.10.26" +version = "1.11.10" dependencies = [ "backoff", "bincode", + "bytes", "bzip2", "enum-iterator", "flate2", "futures 0.3.24", "goauth", + "http", + "hyper", + "hyper-proxy", "log", "openssl", - "prost 0.10.4", - "prost-types 0.10.1", + "prost 0.11.0", + "prost-types 0.11.1", "serde", "serde_derive", "smpl_jwt", "solana-metrics", - "solana-sdk 1.10.26", + "solana-sdk 1.11.10", "solana-storage-proto", "solana-transaction-status", "thiserror", "tokio", - "tonic 0.7.2", + "tonic 0.8.1", "zstd", ] [[package]] name = "solana-storage-proto" -version = "1.10.26" +version = "1.11.10" dependencies = [ "bincode", "bs58 0.4.0", - "prost 0.10.4", + "prost 0.11.0", + "protobuf-src", "serde", "solana-account-decoder", - "solana-sdk 1.10.26", + "solana-sdk 1.11.10", "solana-transaction-status", - "tonic-build 0.7.2", + "tonic-build 0.8.0", ] [[package]] name = "solana-streamer" -version = "1.10.26" +version = "1.11.10" dependencies = [ "crossbeam-channel", "futures-util", "histogram", + "indexmap", "itertools 0.10.3", "libc", "log", "nix", "pem", + "percentage", "pkcs8", "quinn", "rand 0.7.3", @@ -5518,20 +5785,21 @@ dependencies = [ "rustls 0.20.6", "solana-metrics", "solana-perf", - "solana-sdk 1.10.26", + "solana-sdk 1.11.10", "thiserror", "tokio", + "x509-parser", ] [[package]] name = "solana-sys-tuner" -version = "1.10.26" +version = "1.11.10" dependencies = [ - "clap", + "clap 2.34.0", "libc", "log", "nix", - "solana-logger 1.10.26", + "solana-logger 1.11.10", "solana-version", "sysctl", "unix_socket2", @@ -5540,7 +5808,7 @@ dependencies = [ [[package]] name = "solana-test-validator" -version = "1.10.26" +version = "1.11.10" dependencies = [ "base64 0.13.0", "log", @@ -5551,19 +5819,20 @@ dependencies = [ "solana-core", "solana-gossip", "solana-ledger", - "solana-logger 1.10.26", + "solana-logger 1.11.10", "solana-net-utils", + "solana-program-runtime", "solana-program-test", "solana-rpc", "solana-runtime", - "solana-sdk 1.10.26", + "solana-sdk 1.11.10", "solana-streamer", "tokio", ] [[package]] name = "solana-transaction-status" -version = "1.10.26" +version = "1.11.10" dependencies = [ "Inflector", "base64 0.13.0", @@ -5578,8 +5847,7 @@ dependencies = [ "solana-account-decoder", "solana-measure", "solana-metrics", - "solana-runtime", - "solana-sdk 1.10.26", + "solana-sdk 1.11.10", "solana-vote-program", "spl-associated-token-account", "spl-memo", @@ -5590,21 +5858,21 @@ dependencies = [ [[package]] name = "solana-version" -version = "1.10.26" +version = "1.11.10" dependencies = [ "log", "rustc_version 0.4.0", "semver 1.0.13", "serde", "serde_derive", - "solana-frozen-abi 1.10.26", - "solana-frozen-abi-macro 1.10.26", - "solana-sdk 1.10.26", + "solana-frozen-abi 1.11.10", + "solana-frozen-abi-macro 1.11.10", + "solana-sdk 1.11.10", ] [[package]] name = "solana-vote-program" -version = "1.10.26" +version = "1.11.10" dependencies = [ "bincode", "log", @@ -5613,32 +5881,32 @@ dependencies = [ "rustc_version 0.4.0", "serde", "serde_derive", - "solana-frozen-abi 1.10.26", - "solana-frozen-abi-macro 1.10.26", + "solana-frozen-abi 1.11.10", + "solana-frozen-abi-macro 1.11.10", "solana-metrics", "solana-program-runtime", - "solana-sdk 1.10.26", + "solana-sdk 1.11.10", "thiserror", ] [[package]] name = "solana-zk-token-proof-program" -version = "1.10.26" +version = "1.11.10" dependencies = [ "bytemuck", "getrandom 0.1.16", "num-derive", "num-traits", "solana-program-runtime", - "solana-sdk 1.10.26", - "solana-zk-token-sdk 1.10.26", + "solana-sdk 1.11.10", + "solana-zk-token-sdk 1.11.10", ] [[package]] name = "solana-zk-token-sdk" -version = "0.8.1" +version = "1.10.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74b149253f9ed1afb68b3161b53b62b637d0dd7a3b328dffdc8bb5878d48358e" +checksum = "9b02dd5d4c8f4658a94c4120802f52f13a1085ff9d30bdded407a35e9c147493" dependencies = [ "aes-gcm-siv", "arrayref", @@ -5646,7 +5914,7 @@ dependencies = [ "bincode", "bytemuck", "byteorder", - "cipher 0.3.0", + "cipher 0.4.3", "curve25519-dalek", "getrandom 0.1.16", "lazy_static", @@ -5666,7 +5934,7 @@ dependencies = [ [[package]] name = "solana-zk-token-sdk" -version = "1.10.26" +version = "1.11.10" dependencies = [ "aes-gcm-siv", "arrayref", @@ -5685,8 +5953,8 @@ dependencies = [ "serde", "serde_json", "sha3 0.9.1", - "solana-program 1.10.26", - "solana-sdk 1.10.26", + "solana-program 1.11.10", + "solana-sdk 1.11.10", "subtle", "thiserror", "zeroize", @@ -5694,9 +5962,9 @@ dependencies = [ [[package]] name = "solana_rbpf" -version = "0.2.24" +version = "0.2.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41e138f6d6d4eb6a65f8e9f01ca620bc9907d79648d5038a69dd3f07b6ed3f1f" +checksum = "80a28c5dfe7e8af38daa39d6561c8e8b9ed7a2f900951ebe7362ad6348d36c73" dependencies = [ "byteorder", "combine", @@ -5704,11 +5972,10 @@ dependencies = [ "hash32", "libc", "log", - "rand 0.7.3", + "rand 0.8.5", "rustc-demangle", "scroll", "thiserror", - "time 0.1.44", ] [[package]] @@ -5735,13 +6002,18 @@ dependencies = [ [[package]] name = "spl-associated-token-account" -version = "1.0.5" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b013067447a1396303ddfc294f36e3d260a32f8a16c501c295bcdc7de39b490" +checksum = "16a33ecc83137583902c3e13c02f34151c8b2f2b74120f9c2b3ff841953e083d" dependencies = [ + "assert_matches", "borsh", + "num-derive", + "num-traits", "solana-program 1.10.38", "spl-token", + "spl-token-2022", + "thiserror", ] [[package]] @@ -5755,11 +6027,12 @@ dependencies = [ [[package]] name = "spl-token" -version = "3.3.0" +version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0cc67166ef99d10c18cb5e9c208901e6d8255c6513bb1f877977eba48e6cc4fb" +checksum = "8e85e168a785e82564160dcb87b2a8e04cee9bfd1f4d488c729d53d6a4bd300d" dependencies = [ "arrayref", + "bytemuck", "num-derive", "num-traits", "num_enum", @@ -5769,9 +6042,9 @@ dependencies = [ [[package]] name = "spl-token-2022" -version = "0.2.0" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fce48c69350134e8678de5c0956a531b7de586b28eebdddc03211ceec0660983" +checksum = "f0a97cbf60b91b610c846ccf8eecca96d92a24a19ffbf9fe06cd0c84e76ec45e" dependencies = [ "arrayref", "bytemuck", @@ -5779,82 +6052,18 @@ dependencies = [ "num-traits", "num_enum", "solana-program 1.10.38", - "solana-zk-token-sdk 0.8.1", + "solana-zk-token-sdk 1.10.38", "spl-memo", "spl-token", "thiserror", ] -[[package]] -name = "stable_deref_trait" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" - -[[package]] -name = "standback" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e113fb6f3de07a243d434a56ec6f186dfd51cb08448239fe7bcae73f87ff28ff" -dependencies = [ - "version_check", -] - [[package]] name = "static_assertions" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" -[[package]] -name = "stdweb" -version = "0.4.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d022496b16281348b52d0e30ae99e01a73d737b2f45d38fed4edf79f9325a1d5" -dependencies = [ - "discard", - "rustc_version 0.2.3", - "stdweb-derive", - "stdweb-internal-macros", - "stdweb-internal-runtime", - "wasm-bindgen", -] - -[[package]] -name = "stdweb-derive" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef" -dependencies = [ - "proc-macro2 1.0.43", - "quote 1.0.21", - "serde", - "serde_derive", - "syn 1.0.99", -] - -[[package]] -name = "stdweb-internal-macros" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58fa5ff6ad0d98d1ffa8cb115892b6e69d67799f6763e162a1c9db421dc22e11" -dependencies = [ - "base-x", - "proc-macro2 1.0.43", - "quote 1.0.21", - "serde", - "serde_derive", - "serde_json", - "sha1", - "syn 1.0.99", -] - -[[package]] -name = "stdweb-internal-runtime" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213701ba3370744dcd1a12960caa4843b3d68b4d1c0a5d575e0d65b2ee9d16c0" - [[package]] name = "stream-cancel" version = "0.8.1" @@ -5872,6 +6081,12 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + [[package]] name = "strum" version = "0.24.1" @@ -6027,9 +6242,9 @@ dependencies = [ [[package]] name = "tarpc" -version = "0.27.2" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b85d0a9369a919ba0db919b142a2b704cd207dfc676f7a43c2d105d0bc225487" +checksum = "1c38a012bed6fb9681d3bf71ffaa4f88f3b4b9ed3198cda6e4c8462d24d4bb80" dependencies = [ "anyhow", "fnv", @@ -6102,6 +6317,12 @@ dependencies = [ "unicode-width", ] +[[package]] +name = "textwrap" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1141d4d61095b28419e22cb0bbf02755f5e54e0526f97f1e3d1d160e60885fb" + [[package]] name = "thiserror" version = "1.0.33" @@ -6153,53 +6374,23 @@ dependencies = [ "winapi 0.3.9", ] -[[package]] -name = "time" -version = "0.2.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4752a97f8eebd6854ff91f1c1824cd6160626ac4bd44287f7f4ea2035a02a242" -dependencies = [ - "const_fn", - "libc", - "standback", - "stdweb", - "time-macros", - "version_check", - "winapi 0.3.9", -] - [[package]] name = "time" version = "0.3.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c3f9a28b618c3a6b9251b6908e9c99e04b9e5c02e6581ccbb67d59c34ef7f9b" dependencies = [ + "itoa 1.0.3", "libc", "num_threads", + "time-macros", ] [[package]] name = "time-macros" -version = "0.1.1" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "957e9c6e26f12cb6d0dd7fc776bb67a706312e7299aed74c8dd5b17ebb27e2f1" -dependencies = [ - "proc-macro-hack", - "time-macros-impl", -] - -[[package]] -name = "time-macros-impl" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd3c141a1b43194f3f56a1411225df8646c55781d5f26db825b3d98507eb482f" -dependencies = [ - "proc-macro-hack", - "proc-macro2 1.0.43", - "quote 1.0.21", - "standback", - "syn 1.0.99", -] +checksum = "42657b1a6f4d817cda8e7a0ace261fe0cc946cf3a80314390b22cc61ae080792" [[package]] name = "tiny-bip39" @@ -6424,9 +6615,9 @@ dependencies = [ [[package]] name = "tonic" -version = "0.7.2" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5be9d60db39854b30b835107500cf0aca0b0d14d6e1c3de124217c23a29c2ddb" +checksum = "11cd56bdb54ef93935a6a79dbd1d91f1ebd4c64150fd61654031fd6b8b775c91" dependencies = [ "async-stream", "async-trait", @@ -6442,8 +6633,8 @@ dependencies = [ "hyper-timeout", "percent-encoding 2.1.0", "pin-project", - "prost 0.10.4", - "prost-derive 0.10.1", + "prost 0.11.0", + "prost-derive 0.11.0", "rustls-pemfile 1.0.1", "tokio", "tokio-rustls 0.23.4", @@ -6470,13 +6661,13 @@ dependencies = [ [[package]] name = "tonic-build" -version = "0.7.2" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9263bf4c9bfaae7317c1c2faf7f18491d2fe476f70c414b73bf5d445b00ffa1" +checksum = "2fbcd2800e34e743b9ae795867d5f77b535d3a3be69fd731e39145719752df8c" dependencies = [ "prettyplease", "proc-macro2 1.0.43", - "prost-build 0.10.4", + "prost-build 0.11.1", "quote 1.0.21", "syn 1.0.99", ] @@ -6578,10 +6769,11 @@ dependencies = [ [[package]] name = "tracing-opentelemetry" -version = "0.15.0" +version = "0.17.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "599f388ecb26b28d9c1b2e4437ae019a7b336018b45ed911458cd9ebf91129f6" +checksum = "fbbe89715c1dbbb790059e2565353978564924ee85017b5fff365c872ff6721f" dependencies = [ + "once_cell", "opentelemetry", "tracing", "tracing-core", @@ -6590,9 +6782,9 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.2.25" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e0d2eaa99c3c2e41547cfa109e910a68ea03823cccad4a0525dcbc9b01e8c71" +checksum = "60db860322da191b40952ad9affe65ea23e7dd6a5c442c2c42865810c6ab8e6b" dependencies = [ "sharded-slab", "thread_local", @@ -7071,6 +7263,24 @@ dependencies = [ "alloc-traits", ] +[[package]] +name = "x509-parser" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0ecbeb7b67ce215e40e3cc7f2ff902f94a223acf44995934763467e7b1febc8" +dependencies = [ + "asn1-rs", + "base64 0.13.0", + "data-encoding", + "der-parser", + "lazy_static", + "nom", + "oid-registry", + "rusticata-macros", + "thiserror", + "time 0.3.14", +] + [[package]] name = "xattr" version = "0.2.3" diff --git a/src/cli.rs b/src/cli.rs index 150a44b..a2be512 100644 --- a/src/cli.rs +++ b/src/cli.rs @@ -17,6 +17,8 @@ pub struct Config { pub account_keys: String, pub mango_keys: String, pub transaction_save_file: String, + pub block_data_save_file: String, + pub airdrop_accounts: bool, } impl Default for Config { @@ -31,6 +33,8 @@ impl Default for Config { account_keys: String::new(), mango_keys: String::new(), transaction_save_file : String::new(), + block_data_save_file : String::new(), + airdrop_accounts : false, } } } @@ -137,6 +141,23 @@ pub fn build_args<'a, 'b>(version: &'b str) -> App<'a, 'b> { .required(false) .help("To save details of all transactions during a run") ) + .arg( + Arg::with_name("block_data_save_file") + .short("bdsf") + .long("block_data_save_file") + .value_name("FILENAME") + .takes_value(true) + .required(false) + .help("To save details of all block containing mm transactions") + ) + .arg( + Arg::with_name("airdrop_accounts") + .long("airdrop_accounts") + .value_name("BOOL") + .takes_value(false) + .required(false) + .help("Airdrop all MM accounts before stating") + ) } /// Parses a clap `ArgMatches` structure into a `Config` @@ -200,6 +221,12 @@ pub fn extract_args(matches: &ArgMatches) -> Config { Some(x) => x.to_string(), None => String::new(), }; - + args.block_data_save_file = match matches.value_of("block_data_save_file") { + Some(x) => x.to_string(), + None => String::new(), + }; + + args.airdrop_accounts = matches.is_present("airdrop_accounts"); args + } diff --git a/src/main.rs b/src/main.rs index 2b7dfa8..70a9774 100644 --- a/src/main.rs +++ b/src/main.rs @@ -21,6 +21,7 @@ use solana_client::{ connection_cache::ConnectionCache, rpc_client::RpcClient, rpc_config::RpcBlockConfig, tpu_client::TpuClient, }; +use solana_program::native_token::LAMPORTS_PER_SOL; use solana_runtime::bank::RewardType; use solana_sdk::{ clock::{Slot, DEFAULT_MS_PER_SLOT}, @@ -487,10 +488,11 @@ fn confirmation_by_querying_rpc( } } +#[derive(Clone, Serialize)] struct BlockData { - pub block_hash: Pubkey, + pub block_hash: String, pub block_slot: Slot, - pub block_leader: Pubkey, + pub block_leader: String, pub total_transactions: u64, pub number_of_mm_transactions: u64, pub block_time: u64, @@ -672,8 +674,8 @@ fn confirmations_by_blocks( { let mut blockstats_writer = tx_block_data.write().unwrap(); blockstats_writer.push(BlockData { - block_hash: Pubkey::from_str(block.blockhash.as_str()).unwrap(), - block_leader: Pubkey::from_str(slot_leader.as_str()).unwrap(), + block_hash: block.blockhash, + block_leader: slot_leader, block_slot: slot, block_time: if let Some(time) = block.block_time { time as u64 @@ -739,6 +741,24 @@ fn write_transaction_data_into_csv( writer.flush().unwrap(); } + +fn write_block_data_into_csv( + block_data_csv: String, + tx_block_data: Arc>>, +) { + if block_data_csv.is_empty() { + return; + } + let mut writer = csv::Writer::from_path(block_data_csv).unwrap(); + let data = tx_block_data.read().unwrap(); + + for d in data.iter().filter(|x| x.number_of_mm_transactions > 0) { + writer.serialize(d).unwrap(); + } + writer.flush().unwrap(); +} + + fn main() { solana_logger::setup_with_default("solana=info"); solana_metrics::set_panic_hook("bench-mango", /*version:*/ None); @@ -755,10 +775,14 @@ fn main() { duration, quotes_per_second, transaction_save_file, + block_data_save_file, + airdrop_accounts, .. } = &cli_config; let transaction_save_file = transaction_save_file.clone(); + let block_data_save_file = block_data_save_file.clone(); + let airdrop_accounts = *airdrop_accounts; info!("Connecting to the cluster"); @@ -902,6 +926,21 @@ fn main() { let mango_account_signer = Keypair::from_bytes(account_keys.secret_key.as_slice()).unwrap(); + if airdrop_accounts { + println!("Transfering 1 SOL to {}", mango_account_signer.pubkey()); + let inx = solana_sdk::system_instruction::transfer( &id.pubkey(), &mango_account_signer.pubkey(), LAMPORTS_PER_SOL); + + let mut tx = Transaction::new_unsigned(Message::new( + &[inx], + Some(&id.pubkey()), + )); + + if let Ok(recent_blockhash) = blockhash.read() { + tx.sign(&[id], *recent_blockhash); + } + rpc_client.send_and_confirm_transaction_with_spinner(&tx).unwrap(); + } + info!( "wallet:{:?} https://testnet.mango.markets/account?pubkey={:?}", mango_account_signer.pubkey(), @@ -1026,6 +1065,11 @@ fn main() { tx_confirm_records, tx_timeout_records, ); + + write_block_data_into_csv( + block_data_save_file, + tx_block_data + ); }) .unwrap();