From cb2e32db9e76ac312eeb7567d349b00f94a85e7d Mon Sep 17 00:00:00 2001 From: godmode galactus Date: Fri, 9 Sep 2022 11:19:40 +0200 Subject: [PATCH] creating csv file with transaction details --- Cargo.lock | 1512 ++++++++++++++++++---------------------------- bench_tps_run.sh | 2 +- src/main.rs | 125 ++-- 3 files changed, 665 insertions(+), 974 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 68affa1..84f4ea3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -80,21 +80,6 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "250f629c0161ad8107cf89319e990051fae62832fd343083bea452d93e2205fd" -[[package]] -name = "alloc-no-stdlib" -version = "2.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35ef4730490ad1c4eae5c4325b2a95f521d023e5c885853ff7aca0a6a1631db3" - -[[package]] -name = "alloc-stdlib" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "697ed7edc0f1711de49ce108c541623a0af97c6c60b2f6e2b65229847ac843c2" -dependencies = [ - "alloc-no-stdlib", -] - [[package]] name = "alloc-traits" version = "0.1.1" @@ -310,65 +295,12 @@ 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" @@ -427,15 +359,6 @@ 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" @@ -499,6 +422,12 @@ 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" @@ -528,9 +457,9 @@ dependencies = [ [[package]] name = "bindgen" -version = "0.60.1" +version = "0.59.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "062dddbc1ba4aca46de6338e2bf87771414c335f7b2f2036e8f3e9befebf88e6" +checksum = "2bd2a9a458e8f4304c52c43ebb0cfbd520289f8379a52e329a38afda99bf8eb8" dependencies = [ "bitflags", "cexpr", @@ -644,27 +573,6 @@ 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" @@ -862,35 +770,19 @@ dependencies = [ "ansi_term", "atty", "bitflags", - "strsim 0.8.0", - "textwrap 0.11.0", + "strsim", + "textwrap", "unicode-width", "vec_map", ] [[package]] -name = "clap" -version = "3.2.20" +name = "cmake" +version = "0.1.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b71c3ce99b7611011217b366d923f1d0a7e07a92bb2dbf1e84508c673ca3bd" +checksum = "e8ad8cef104ac57b68b89df3208164d228503abbdce70f6880ffa3d970e7443a" dependencies = [ - "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", + "cc", ] [[package]] @@ -946,6 +838,12 @@ 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" @@ -1137,12 +1035,6 @@ 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" @@ -1152,20 +1044,6 @@ 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" @@ -1247,15 +1125,10 @@ dependencies = [ ] [[package]] -name = "displaydoc" -version = "0.2.3" +name = "discard" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bf95dc3f046b9da4f2d51833c0d3547d8564ef6910f5c1ed130306a75b92886" -dependencies = [ - "proc-macro2 1.0.43", - "quote 1.0.21", - "syn 1.0.99", -] +checksum = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0" [[package]] name = "dlopen" @@ -1280,12 +1153,6 @@ 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" @@ -1356,18 +1223,18 @@ dependencies = [ [[package]] name = "enum-iterator" -version = "1.2.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91a4ec26efacf4aeff80887a175a419493cb6f8b5480d26387eb0bd038976187" +checksum = "4eeac5c5edb79e4e39fe8439ef35207780a11f69c52cbe424ce3dfad4cb78de6" dependencies = [ "enum-iterator-derive", ] [[package]] name = "enum-iterator-derive" -version = "1.1.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "828de45d0ca18782232dfb8f3ea9cc428e8ced380eb26a520baaacfc70de39ce" +checksum = "c134c37760b27a871ba422106eedbb8247da973a09e82558bf26d619c882b159" dependencies = [ "proc-macro2 1.0.43", "quote 1.0.21", @@ -1380,7 +1247,7 @@ version = "3.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2170fc0efee383079a8bdd05d6ea2a184d2a0f07a1c1dcabdb2fd5e9f24bc36c" dependencies = [ - "num-bigint 0.4.3", + "num-bigint", "num-traits", "proc-macro2 1.0.43", "quote 1.0.21", @@ -1754,10 +1621,8 @@ 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]] @@ -1781,9 +1646,9 @@ dependencies = [ [[package]] name = "goauth" -version = "0.13.1" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8af59a261bcf42f45d1b261232847b9b850ba0a1419d6100698246fb66e9240" +checksum = "38f3d68c8343245dc047982651b5afb8bd659c9959ed72efe5a73bf22684e5fd" dependencies = [ "arc-swap", "futures 0.3.24", @@ -1800,9 +1665,9 @@ dependencies = [ [[package]] name = "goblin" -version = "0.5.4" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7666983ed0dd8d21a6f6576ee00053ca0926fb281a5522577a4dbd0f1b54143" +checksum = "32401e89c6446dcd28185931a01b1093726d0356820ac744023e6850689bf926" dependencies = [ "log", "plain", @@ -1836,9 +1701,9 @@ checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" [[package]] name = "hash32" -version = "0.2.1" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0c35f58762feb77d74ebe43bdbc3210f09be9fe6742234d573bacc26ed92b67" +checksum = "d4041af86e63ac4298ce40e5cca669066e75b6f1aa3390fe2561ffa5e1d9f4cc" dependencies = [ "byteorder", ] @@ -1861,31 +1726,6 @@ 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" @@ -2016,24 +1856,6 @@ 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" @@ -2149,13 +1971,14 @@ dependencies = [ [[package]] name = "indicatif" -version = "0.17.0" +version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcc42b206e70d86ec03285b123e65a5458c92027d1fb2ae3555878b8113b3ddf" +checksum = "2d207dc617c7a380ab07ff572a6e52fa202a2a8f355860ac9c38e23f8196be1b" dependencies = [ "console", + "lazy_static", "number_prefix", - "unicode-width", + "regex", ] [[package]] @@ -2395,9 +2218,9 @@ checksum = "292a948cd991e376cf75541fe5b97a1081d713c618b4f1b9500f8844e49eb565" [[package]] name = "librocksdb-sys" -version = "0.8.0+7.4.4" +version = "0.6.1+6.28.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "611804e4666a25136fcc5f8cf425ab4d26c7f74ea245ffe92ea23b85b6420b5d" +checksum = "81bc587013734dadb7cf23468e531aa120788b87243648be42e2d3a072186291" dependencies = [ "bindgen", "bzip2-sys", @@ -2750,16 +2573,15 @@ dependencies = [ [[package]] name = "nix" -version = "0.25.0" +version = "0.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e322c04a9e3440c327fca7b6c8a63e6890a32fa2ad689db972425f07e0d22abb" +checksum = "9f866317acbd3a240710c63f065ffb1e4fd466259045ccb504130b7f668f35c6" dependencies = [ - "autocfg", "bitflags", + "cc", "cfg-if 1.0.0", "libc", "memoffset", - "pin-utils", ] [[package]] @@ -2781,31 +2603,6 @@ 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" @@ -2817,16 +2614,6 @@ 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" @@ -2848,29 +2635,6 @@ 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" @@ -2926,15 +2690,6 @@ 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" @@ -3004,15 +2759,13 @@ dependencies = [ [[package]] name = "opentelemetry" -version = "0.17.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6105e89802af13fdf48c49d7646d3b533a70e536d818aae7e78ba0433d01acb8" +checksum = "e1cf9b1c4e9a6c4de793c632496fa490bdc0e1eea73f0c91394f7b6990935d22" dependencies = [ "async-trait", "crossbeam-channel", - "futures-channel", - "futures-executor", - "futures-util", + "futures 0.3.24", "js-sys", "lazy_static", "percent-encoding 2.1.0", @@ -3021,27 +2774,22 @@ dependencies = [ "thiserror", ] -[[package]] -name = "os_str_bytes" -version = "6.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ff7415e9ae3fff1225851df9e0d9e4e5479f947619774677a63572e55e80eff" - [[package]] name = "ouroboros" -version = "0.15.4" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f56a2b0aa5fc88687aaf63e85a7974422790ce3419a2e1a15870f8a55227822" +checksum = "71643f290d126e18ac2598876d01e1d57aed164afc78fdb6e2a0c6589a1f6662" dependencies = [ "aliasable", "ouroboros_macro", + "stable_deref_trait", ] [[package]] name = "ouroboros_macro" -version = "0.15.4" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c40641e27d0eb38cae3dee081d920104d2db47a8e853c1a592ef68d33f5ebf4" +checksum = "ed9a247206016d424fe8497bc611e510887af5c261fbbf977877c4bb55ca4d82" dependencies = [ "Inflector", "proc-macro-error", @@ -3151,15 +2899,6 @@ 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" @@ -3187,15 +2926,6 @@ 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" @@ -3323,12 +3053,6 @@ 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" @@ -3383,6 +3107,12 @@ 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" @@ -3426,12 +3156,12 @@ dependencies = [ [[package]] name = "prost" -version = "0.11.0" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "399c3c31cdec40583bb68f0b18403400d01ec4289c383aa047560439952c4dd7" +checksum = "71adf41db68aa0daaefc69bb30bcd68ded9b9abaad5d1fbb6304c4fb390e083e" dependencies = [ "bytes", - "prost-derive 0.11.0", + "prost-derive 0.10.1", ] [[package]] @@ -3456,19 +3186,21 @@ dependencies = [ [[package]] name = "prost-build" -version = "0.11.1" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f835c582e6bd972ba8347313300219fed5bfa52caf175298d860b61ff6069bb" +checksum = "8ae5a4388762d5815a9fc0dea33c56b021cdc8dde0c55e0c9ca57197254b0cab" dependencies = [ "bytes", + "cfg-if 1.0.0", + "cmake", "heck 0.4.0", "itertools 0.10.3", "lazy_static", "log", "multimap", "petgraph", - "prost 0.11.0", - "prost-types 0.11.1", + "prost 0.10.4", + "prost-types 0.10.1", "regex", "tempfile", "which", @@ -3489,9 +3221,9 @@ dependencies = [ [[package]] name = "prost-derive" -version = "0.11.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7345d5f0e08c0536d7ac7229952590239e77abf0a0100a1b1d890add6ea96364" +checksum = "7b670f45da57fb8542ebdbb6105a925fe571b67f9e7ed9f47a06a84e72b4e7cc" dependencies = [ "anyhow", "itertools 0.10.3", @@ -3512,21 +3244,12 @@ dependencies = [ [[package]] name = "prost-types" -version = "0.11.1" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dfaa718ad76a44b3415e6c4d53b17c8f99160dcb3a99b10470fce8ad43f6e3e" +checksum = "2d0a014229361011dc8e69c8a1ec6c2e8d0f2af7c91e3ea3f5b2170298461e68" dependencies = [ "bytes", - "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", + "prost 0.10.4", ] [[package]] @@ -3658,6 +3381,7 @@ dependencies = [ "rand_chacha 0.2.2", "rand_core 0.5.1", "rand_hc", + "rand_pcg", ] [[package]] @@ -3733,6 +3457,15 @@ 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" @@ -3865,7 +3598,6 @@ 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", @@ -3893,7 +3625,6 @@ dependencies = [ "tokio", "tokio-native-tls", "tokio-rustls 0.23.4", - "tokio-util 0.7.2", "tower-service", "url 2.2.2", "wasm-bindgen", @@ -3903,6 +3634,12 @@ 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" @@ -3920,9 +3657,9 @@ dependencies = [ [[package]] name = "rocksdb" -version = "0.19.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e9562ea1d70c0cc63a34a22d977753b50cca91cc6b6527750463bd5dd8697bc" +checksum = "620f4129485ff1a7128d184bc687470c21c7951b64779ebc9cfdad3dcd920290" dependencies = [ "libc", "librocksdb-sys", @@ -3973,6 +3710,15 @@ 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" @@ -3991,15 +3737,6 @@ 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" @@ -4100,18 +3837,18 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" [[package]] name = "scroll" -version = "0.11.0" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04c565b551bafbef4157586fa379538366e4385d42082f255bfd96e4fe8519da" +checksum = "fda28d4b4830b807a8b43f7b0e6b5df875311b3e7621d84577188c175b6ec1ec" dependencies = [ "scroll_derive", ] [[package]] name = "scroll_derive" -version = "0.11.0" +version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdbda6ac5cd1321e724fa9cee216f3a61885889b896f073b8f82322789c5250e" +checksum = "aaaae8f38bb311444cfb7f1979af0bc9240d95795f75f9ceddf6a59b79ceffa0" dependencies = [ "proc-macro2 1.0.43", "quote 1.0.21", @@ -4161,13 +3898,22 @@ 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", + "semver-parser 0.10.2", ] [[package]] @@ -4176,6 +3922,12 @@ 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" @@ -4322,15 +4074,19 @@ dependencies = [ [[package]] name = "sha1" -version = "0.10.4" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "006769ba83e921b3085caa8334186b00cf92b4cb1a6cf4632fbccc8eff5c7549" +checksum = "c1da05c97445caa12d05e848c4a4fcbbea29e748ac28f7e80e9b010392063770" dependencies = [ - "cfg-if 1.0.0", - "cpufeatures", - "digest 0.10.3", + "sha1_smol", ] +[[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" @@ -4455,9 +4211,9 @@ checksum = "2fd0db749597d91ff862fd1d55ea87f7855a744a8425a64695b6fca237d1dad1" [[package]] name = "smpl_jwt" -version = "0.7.1" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95b6ff8c21c74ce7744643a7cddbb02579a44f1f77e4316bff1ddb741aca8ac9" +checksum = "4370044f8b20f944e05c35d77edd3518e6f21fc4de77e593919f287c6a3f428a" dependencies = [ "base64 0.13.0", "log", @@ -4466,7 +4222,7 @@ dependencies = [ "serde_derive", "serde_json", "simpl", - "time 0.3.14", + "time 0.2.27", ] [[package]] @@ -4496,7 +4252,7 @@ dependencies = [ [[package]] name = "solana-account-decoder" -version = "1.12.0" +version = "1.10.26" dependencies = [ "Inflector", "base64 0.13.0", @@ -4507,9 +4263,8 @@ dependencies = [ "serde", "serde_derive", "serde_json", - "solana-address-lookup-table-program", "solana-config-program", - "solana-sdk 1.12.0", + "solana-sdk 1.10.26", "solana-vote-program", "spl-token", "spl-token-2022", @@ -4519,7 +4274,7 @@ dependencies = [ [[package]] name = "solana-address-lookup-table-program" -version = "1.12.0" +version = "1.10.26" dependencies = [ "bincode", "bytemuck", @@ -4528,23 +4283,23 @@ dependencies = [ "num-traits", "rustc_version 0.4.0", "serde", - "solana-frozen-abi 1.12.0", - "solana-frozen-abi-macro 1.12.0", - "solana-program 1.12.0", + "solana-frozen-abi 1.10.26", + "solana-frozen-abi-macro 1.10.26", + "solana-program 1.10.26", "solana-program-runtime", - "solana-sdk 1.12.0", + "solana-sdk 1.10.26", "thiserror", ] [[package]] name = "solana-banks-client" -version = "1.12.0" +version = "1.10.26" dependencies = [ "borsh", "futures 0.3.24", "solana-banks-interface", - "solana-program 1.12.0", - "solana-sdk 1.12.0", + "solana-program 1.10.26", + "solana-sdk 1.10.26", "tarpc", "thiserror", "tokio", @@ -4553,16 +4308,16 @@ dependencies = [ [[package]] name = "solana-banks-interface" -version = "1.12.0" +version = "1.10.26" dependencies = [ "serde", - "solana-sdk 1.12.0", + "solana-sdk 1.10.26", "tarpc", ] [[package]] name = "solana-banks-server" -version = "1.12.0" +version = "1.10.26" dependencies = [ "bincode", "crossbeam-channel", @@ -4570,9 +4325,8 @@ dependencies = [ "solana-banks-interface", "solana-client", "solana-runtime", - "solana-sdk 1.12.0", + "solana-sdk 1.10.26", "solana-send-transaction-service", - "solana-tpu-client", "tarpc", "tokio", "tokio-serde", @@ -4585,7 +4339,7 @@ version = "1.10.26" dependencies = [ "borsh", "chrono", - "clap 2.34.0", + "clap", "crossbeam-channel", "csv", "fixed", @@ -4610,14 +4364,14 @@ dependencies = [ "solana-genesis", "solana-gossip", "solana-local-cluster", - "solana-logger 1.12.0", + "solana-logger 1.10.26", "solana-measure", "solana-metrics", "solana-net-utils", "solana-program 1.10.38", "solana-rpc", "solana-runtime", - "solana-sdk 1.12.0", + "solana-sdk 1.10.26", "solana-streamer", "solana-test-validator", "solana-transaction-status", @@ -4627,12 +4381,11 @@ dependencies = [ [[package]] name = "solana-bench-tps" -version = "1.12.0" +version = "1.10.26" dependencies = [ - "clap 2.34.0", + "clap", "crossbeam-channel", "log", - "rand 0.7.3", "rayon", "serde_json", "serde_yaml", @@ -4643,26 +4396,21 @@ dependencies = [ "solana-faucet", "solana-genesis", "solana-gossip", - "solana-logger 1.12.0", + "solana-logger 1.10.26", "solana-measure", "solana-metrics", "solana-net-utils", "solana-rpc", - "solana-rpc-client", - "solana-rpc-client-api", - "solana-rpc-client-nonce-utils", "solana-runtime", - "solana-sdk 1.12.0", + "solana-sdk 1.10.26", "solana-streamer", - "solana-thin-client", - "solana-tpu-client", "solana-version", "thiserror", ] [[package]] name = "solana-bloom" -version = "1.12.0" +version = "1.10.26" dependencies = [ "bv", "fnv", @@ -4672,14 +4420,14 @@ dependencies = [ "rustc_version 0.4.0", "serde", "serde_derive", - "solana-frozen-abi 1.12.0", - "solana-frozen-abi-macro 1.12.0", - "solana-sdk 1.12.0", + "solana-frozen-abi 1.10.26", + "solana-frozen-abi-macro 1.10.26", + "solana-sdk 1.10.26", ] [[package]] name = "solana-bpf-loader-program" -version = "1.12.0" +version = "1.10.26" dependencies = [ "bincode", "byteorder", @@ -4688,35 +4436,35 @@ dependencies = [ "solana-measure", "solana-metrics", "solana-program-runtime", - "solana-sdk 1.12.0", - "solana-zk-token-sdk 1.12.0", + "solana-sdk 1.10.26", + "solana-zk-token-sdk 1.10.26", "solana_rbpf", "thiserror", ] [[package]] name = "solana-bucket-map" -version = "1.12.0" +version = "1.10.26" dependencies = [ "log", "memmap2", "modular-bitfield", "rand 0.7.3", "solana-measure", - "solana-sdk 1.12.0", + "solana-sdk 1.10.26", "tempfile", ] [[package]] name = "solana-clap-utils" -version = "1.12.0" +version = "1.10.26" dependencies = [ "chrono", - "clap 2.34.0", + "clap", "rpassword", "solana-perf", "solana-remote-wallet", - "solana-sdk 1.12.0", + "solana-sdk 1.10.26", "thiserror", "tiny-bip39", "uriparse", @@ -4725,7 +4473,7 @@ dependencies = [ [[package]] name = "solana-cli-config" -version = "1.12.0" +version = "1.10.26" dependencies = [ "dirs-next", "lazy_static", @@ -4733,30 +4481,29 @@ dependencies = [ "serde_derive", "serde_yaml", "solana-clap-utils", - "solana-sdk 1.12.0", + "solana-sdk 1.10.26", "url 2.2.2", ] [[package]] name = "solana-cli-output" -version = "1.12.0" +version = "1.10.26" dependencies = [ "Inflector", "base64 0.13.0", "chrono", - "clap 2.34.0", + "clap", "console", "humantime", "indicatif", - "pretty-hex", "semver 1.0.13", "serde", "serde_json", "solana-account-decoder", "solana-clap-utils", "solana-cli-config", - "solana-rpc-client-api", - "solana-sdk 1.12.0", + "solana-client", + "solana-sdk 1.10.26", "solana-transaction-status", "solana-vote-program", "spl-memo", @@ -4764,42 +4511,79 @@ dependencies = [ [[package]] name = "solana-client" -version = "1.12.0" +version = "1.10.26" dependencies = [ + "async-mutex", + "async-trait", + "base64 0.13.0", + "bincode", + "bs58 0.4.0", + "bytes", + "clap", + "crossbeam-channel", + "enum_dispatch", + "futures 0.3.24", + "futures-util", + "indexmap", + "indicatif", + "itertools 0.10.3", + "jsonrpc-core", + "lazy_static", "log", + "lru", + "quinn", + "quinn-proto", + "rand 0.7.3", + "rand_chacha 0.2.2", + "rayon", + "reqwest", + "rustls 0.20.6", + "semver 1.0.13", + "serde", + "serde_derive", + "serde_json", + "solana-account-decoder", + "solana-clap-utils", + "solana-faucet", "solana-measure", - "solana-pubsub-client", - "solana-rpc-client", - "solana-rpc-client-api", - "solana-rpc-client-nonce-utils", - "solana-sdk 1.12.0", - "solana-thin-client", - "solana-tpu-client", + "solana-metrics", + "solana-net-utils", + "solana-sdk 1.10.26", + "solana-streamer", + "solana-transaction-status", + "solana-version", + "solana-vote-program", + "thiserror", + "tokio", + "tokio-stream", + "tokio-tungstenite", + "tungstenite", + "url 2.2.2", ] [[package]] name = "solana-compute-budget-program" -version = "1.12.0" +version = "1.10.26" dependencies = [ "solana-program-runtime", - "solana-sdk 1.12.0", + "solana-sdk 1.10.26", ] [[package]] name = "solana-config-program" -version = "1.12.0" +version = "1.10.26" dependencies = [ "bincode", "chrono", "serde", "serde_derive", "solana-program-runtime", - "solana-sdk 1.12.0", + "solana-sdk 1.10.26", ] [[package]] name = "solana-core" -version = "1.12.0" +version = "1.10.26" dependencies = [ "ahash", "base64 0.13.0", @@ -4808,26 +4592,26 @@ 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", "solana-address-lookup-table-program", "solana-bloom", + "solana-client", "solana-entry", - "solana-frozen-abi 1.12.0", - "solana-frozen-abi-macro 1.12.0", + "solana-frozen-abi 1.10.26", + "solana-frozen-abi-macro 1.10.26", "solana-geyser-plugin-manager", "solana-gossip", "solana-ledger", @@ -4838,13 +4622,12 @@ dependencies = [ "solana-poh", "solana-program-runtime", "solana-rayon-threadlimit", + "solana-replica-lib", "solana-rpc", - "solana-rpc-client-api", "solana-runtime", - "solana-sdk 1.12.0", + "solana-sdk 1.10.26", "solana-send-transaction-service", "solana-streamer", - "solana-tpu-client", "solana-transaction-status", "solana-version", "solana-vote-program", @@ -4858,13 +4641,12 @@ dependencies = [ [[package]] name = "solana-entry" -version = "1.12.0" +version = "1.10.26" dependencies = [ "bincode", "crossbeam-channel", "dlopen", "dlopen_derive", - "lazy_static", "log", "rand 0.7.3", "rayon", @@ -4874,31 +4656,51 @@ dependencies = [ "solana-metrics", "solana-perf", "solana-rayon-threadlimit", - "solana-sdk 1.12.0", + "solana-sdk 1.10.26", ] [[package]] name = "solana-faucet" -version = "1.12.0" +version = "1.10.26" dependencies = [ "bincode", "byteorder", - "clap 2.34.0", + "clap", "crossbeam-channel", "log", "serde", "serde_derive", "solana-clap-utils", "solana-cli-config", - "solana-logger 1.12.0", + "solana-logger 1.10.26", "solana-metrics", - "solana-sdk 1.12.0", + "solana-sdk 1.10.26", "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" @@ -4922,35 +4724,13 @@ dependencies = [ ] [[package]] -name = "solana-frozen-abi" -version = "1.12.0" +name = "solana-frozen-abi-macro" +version = "1.10.26" dependencies = [ - "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", + "proc-macro2 1.0.43", + "quote 1.0.21", "rustc_version 0.4.0", - "serde", - "serde_bytes", - "serde_derive", - "serde_json", - "sha2 0.10.3", - "solana-frozen-abi-macro 1.12.0", - "subtle", - "thiserror", + "syn 1.0.99", ] [[package]] @@ -4965,22 +4745,12 @@ dependencies = [ "syn 1.0.99", ] -[[package]] -name = "solana-frozen-abi-macro" -version = "1.12.0" -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.12.0" +version = "1.10.26" dependencies = [ "base64 0.13.0", - "clap 2.34.0", + "clap", "serde", "serde_json", "serde_yaml", @@ -4988,9 +4758,9 @@ dependencies = [ "solana-cli-config", "solana-entry", "solana-ledger", - "solana-logger 1.12.0", + "solana-logger 1.10.26", "solana-runtime", - "solana-sdk 1.12.0", + "solana-sdk 1.10.26", "solana-stake-program", "solana-version", "solana-vote-program", @@ -4999,17 +4769,17 @@ dependencies = [ [[package]] name = "solana-geyser-plugin-interface" -version = "1.12.0" +version = "1.10.26" dependencies = [ "log", - "solana-sdk 1.12.0", + "solana-sdk 1.10.26", "solana-transaction-status", "thiserror", ] [[package]] name = "solana-geyser-plugin-manager" -version = "1.12.0" +version = "1.10.26" dependencies = [ "bs58 0.4.0", "crossbeam-channel", @@ -5022,18 +4792,18 @@ dependencies = [ "solana-metrics", "solana-rpc", "solana-runtime", - "solana-sdk 1.12.0", + "solana-sdk 1.10.26", "solana-transaction-status", "thiserror", ] [[package]] name = "solana-gossip" -version = "1.12.0" +version = "1.10.26" dependencies = [ "bincode", "bv", - "clap 2.34.0", + "clap", "crossbeam-channel", "flate2", "indexmap", @@ -5051,21 +4821,20 @@ dependencies = [ "serde_derive", "solana-bloom", "solana-clap-utils", + "solana-client", "solana-entry", - "solana-frozen-abi 1.12.0", - "solana-frozen-abi-macro 1.12.0", + "solana-frozen-abi 1.10.26", + "solana-frozen-abi-macro 1.10.26", "solana-ledger", - "solana-logger 1.12.0", + "solana-logger 1.10.26", "solana-measure", "solana-metrics", "solana-net-utils", "solana-perf", "solana-rayon-threadlimit", "solana-runtime", - "solana-sdk 1.12.0", + "solana-sdk 1.10.26", "solana-streamer", - "solana-thin-client", - "solana-tpu-client", "solana-version", "solana-vote-program", "thiserror", @@ -5073,7 +4842,7 @@ dependencies = [ [[package]] name = "solana-ledger" -version = "1.12.0" +version = "1.10.26" dependencies = [ "bincode", "bitflags", @@ -5081,7 +4850,6 @@ dependencies = [ "chrono", "chrono-humanize", "crossbeam-channel", - "dashmap", "fs_extra", "futures 0.3.24", "itertools 0.10.3", @@ -5091,7 +4859,7 @@ dependencies = [ "lru", "num_cpus", "num_enum", - "prost 0.11.0", + "prost 0.10.4", "rand 0.7.3", "rand_chacha 0.2.2", "rayon", @@ -5101,26 +4869,21 @@ dependencies = [ "serde", "serde_bytes", "sha2 0.10.3", - "solana-account-decoder", "solana-bpf-loader-program", "solana-entry", - "solana-frozen-abi 1.12.0", - "solana-frozen-abi-macro 1.12.0", + "solana-frozen-abi 1.10.26", + "solana-frozen-abi-macro 1.10.26", "solana-measure", "solana-metrics", "solana-perf", "solana-program-runtime", "solana-rayon-threadlimit", "solana-runtime", - "solana-sdk 1.12.0", - "solana-stake-program", + "solana-sdk 1.10.26", "solana-storage-bigtable", "solana-storage-proto", "solana-transaction-status", "solana-vote-program", - "spl-token", - "spl-token-2022", - "static_assertions", "tempfile", "thiserror", "tokio", @@ -5130,7 +4893,7 @@ dependencies = [ [[package]] name = "solana-local-cluster" -version = "1.12.0" +version = "1.10.26" dependencies = [ "crossbeam-channel", "fs_extra", @@ -5138,24 +4901,29 @@ dependencies = [ "log", "rand 0.7.3", "rayon", + "solana-client", "solana-config-program", "solana-core", "solana-entry", "solana-gossip", "solana-ledger", - "solana-pubsub-client", - "solana-rpc-client", - "solana-rpc-client-api", "solana-runtime", - "solana-sdk 1.12.0", + "solana-sdk 1.10.26", "solana-stake-program", "solana-streamer", - "solana-thin-client", - "solana-tpu-client", "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" @@ -5167,50 +4935,41 @@ dependencies = [ "log", ] -[[package]] -name = "solana-logger" -version = "1.12.0" -dependencies = [ - "env_logger", - "lazy_static", - "log", -] - [[package]] name = "solana-measure" -version = "1.12.0" +version = "1.10.26" dependencies = [ "log", - "solana-sdk 1.12.0", + "solana-sdk 1.10.26", ] [[package]] name = "solana-merkle-tree" -version = "1.12.0" +version = "1.10.26" dependencies = [ "fast-math", "matches", - "solana-program 1.12.0", + "solana-program 1.10.26", ] [[package]] name = "solana-metrics" -version = "1.12.0" +version = "1.10.26" dependencies = [ "crossbeam-channel", "gethostname", "lazy_static", "log", "reqwest", - "solana-sdk 1.12.0", + "solana-sdk 1.10.26", ] [[package]] name = "solana-net-utils" -version = "1.12.0" +version = "1.10.26" dependencies = [ "bincode", - "clap 3.2.20", + "clap", "crossbeam-channel", "log", "nix", @@ -5218,8 +4977,8 @@ dependencies = [ "serde", "serde_derive", "socket2", - "solana-logger 1.12.0", - "solana-sdk 1.12.0", + "solana-logger 1.10.26", + "solana-sdk 1.10.26", "solana-version", "tokio", "url 2.2.2", @@ -5227,7 +4986,7 @@ dependencies = [ [[package]] name = "solana-perf" -version = "1.12.0" +version = "1.10.26" dependencies = [ "ahash", "bincode", @@ -5246,13 +5005,13 @@ dependencies = [ "serde", "solana-metrics", "solana-rayon-threadlimit", - "solana-sdk 1.12.0", + "solana-sdk 1.10.26", "solana-vote-program", ] [[package]] name = "solana-poh" -version = "1.12.0" +version = "1.10.26" dependencies = [ "core_affinity", "crossbeam-channel", @@ -5262,11 +5021,51 @@ dependencies = [ "solana-measure", "solana-metrics", "solana-runtime", - "solana-sdk 1.12.0", + "solana-sdk 1.10.26", "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" @@ -5309,60 +5108,12 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "solana-program" -version = "1.12.0" -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.12.0", - "solana-frozen-abi-macro 1.12.0", - "solana-sdk-macro 1.12.0", - "thiserror", - "tiny-bip39", - "wasm-bindgen", - "zeroize", -] - [[package]] name = "solana-program-runtime" -version = "1.12.0" +version = "1.10.26" dependencies = [ "base64 0.13.0", "bincode", - "eager", "enum-iterator", "itertools 0.10.3", "libc", @@ -5372,19 +5123,17 @@ dependencies = [ "num-traits", "rustc_version 0.4.0", "serde", - "solana-frozen-abi 1.12.0", - "solana-frozen-abi-macro 1.12.0", + "solana-frozen-abi 1.10.26", + "solana-frozen-abi-macro 1.10.26", "solana-measure", - "solana-metrics", - "solana-sdk 1.12.0", + "solana-sdk 1.10.26", "thiserror", ] [[package]] name = "solana-program-test" -version = "1.12.0" +version = "1.10.26" dependencies = [ - "assert_matches", "async-trait", "base64 0.13.0", "bincode", @@ -5394,41 +5143,18 @@ dependencies = [ "solana-banks-client", "solana-banks-server", "solana-bpf-loader-program", - "solana-logger 1.12.0", + "solana-logger 1.10.26", "solana-program-runtime", "solana-runtime", - "solana-sdk 1.12.0", + "solana-sdk 1.10.26", "solana-vote-program", "thiserror", "tokio", ] -[[package]] -name = "solana-pubsub-client" -version = "1.12.0" -dependencies = [ - "crossbeam-channel", - "futures-util", - "log", - "reqwest", - "semver 1.0.13", - "serde", - "serde_derive", - "serde_json", - "solana-account-decoder", - "solana-rpc-client-api", - "solana-sdk 1.12.0", - "thiserror", - "tokio", - "tokio-stream", - "tokio-tungstenite", - "tungstenite", - "url 2.2.2", -] - [[package]] name = "solana-rayon-threadlimit" -version = "1.12.0" +version = "1.10.26" dependencies = [ "lazy_static", "num_cpus", @@ -5436,7 +5162,7 @@ dependencies = [ [[package]] name = "solana-remote-wallet" -version = "1.12.0" +version = "1.10.26" dependencies = [ "console", "dialoguer", @@ -5446,14 +5172,30 @@ dependencies = [ "parking_lot 0.12.1", "qstring", "semver 1.0.13", - "solana-sdk 1.12.0", + "solana-sdk 1.10.26", "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.12.0" +version = "1.10.26" dependencies = [ "base64 0.13.0", "bincode", @@ -5475,6 +5217,7 @@ dependencies = [ "serde_json", "soketto", "solana-account-decoder", + "solana-client", "solana-entry", "solana-faucet", "solana-gossip", @@ -5484,83 +5227,24 @@ dependencies = [ "solana-perf", "solana-poh", "solana-rayon-threadlimit", - "solana-rpc-client-api", "solana-runtime", - "solana-sdk 1.12.0", + "solana-sdk 1.10.26", "solana-send-transaction-service", - "solana-stake-program", "solana-storage-bigtable", "solana-streamer", - "solana-tpu-client", "solana-transaction-status", "solana-version", "solana-vote-program", "spl-token", - "spl-token-2022", "stream-cancel", "thiserror", "tokio", "tokio-util 0.6.10", ] -[[package]] -name = "solana-rpc-client" -version = "1.12.0" -dependencies = [ - "async-trait", - "base64 0.13.0", - "bincode", - "bs58 0.4.0", - "indicatif", - "log", - "reqwest", - "semver 1.0.13", - "serde", - "serde_derive", - "serde_json", - "solana-account-decoder", - "solana-rpc-client-api", - "solana-sdk 1.12.0", - "solana-transaction-status", - "solana-version", - "solana-vote-program", - "tokio", -] - -[[package]] -name = "solana-rpc-client-api" -version = "1.12.0" -dependencies = [ - "base64 0.13.0", - "bs58 0.4.0", - "jsonrpc-core", - "reqwest", - "semver 1.0.13", - "serde", - "serde_derive", - "serde_json", - "solana-account-decoder", - "solana-sdk 1.12.0", - "solana-transaction-status", - "solana-version", - "spl-token-2022", - "thiserror", -] - -[[package]] -name = "solana-rpc-client-nonce-utils" -version = "1.12.0" -dependencies = [ - "clap 2.34.0", - "solana-clap-utils", - "solana-rpc-client", - "solana-sdk 1.12.0", - "thiserror", -] - [[package]] name = "solana-runtime" -version = "1.12.0" +version = "1.10.26" dependencies = [ "arrayref", "bincode", @@ -5579,13 +5263,11 @@ dependencies = [ "itertools 0.10.3", "lazy_static", "log", - "lru", "lz4", "memmap2", "num-derive", "num-traits", "num_cpus", - "once_cell", "ouroboros", "rand 0.7.3", "rayon", @@ -5597,17 +5279,17 @@ dependencies = [ "solana-bucket-map", "solana-compute-budget-program", "solana-config-program", - "solana-frozen-abi 1.12.0", - "solana-frozen-abi-macro 1.12.0", + "solana-frozen-abi 1.10.26", + "solana-frozen-abi-macro 1.10.26", "solana-measure", "solana-metrics", "solana-program-runtime", "solana-rayon-threadlimit", - "solana-sdk 1.12.0", + "solana-sdk 1.10.26", "solana-stake-program", "solana-vote-program", "solana-zk-token-proof-program", - "solana-zk-token-sdk 1.12.0", + "solana-zk-token-sdk 1.10.26", "strum", "strum_macros", "symlink", @@ -5617,6 +5299,55 @@ 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" @@ -5669,52 +5400,14 @@ dependencies = [ ] [[package]] -name = "solana-sdk" -version = "1.12.0" +name = "solana-sdk-macro" +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.11.0", - "qstring", - "rand 0.7.3", - "rand_chacha 0.2.2", - "rustc_version 0.4.0", + "proc-macro2 1.0.43", + "quote 1.0.21", "rustversion", - "serde", - "serde_bytes", - "serde_derive", - "serde_json", - "sha2 0.10.3", - "sha3 0.10.2", - "solana-frozen-abi 1.12.0", - "solana-frozen-abi-macro 1.12.0", - "solana-logger 1.12.0", - "solana-program 1.12.0", - "solana-sdk-macro 1.12.0", - "thiserror", - "uriparse", - "wasm-bindgen", + "syn 1.0.99", ] [[package]] @@ -5730,33 +5423,22 @@ dependencies = [ "syn 1.0.99", ] -[[package]] -name = "solana-sdk-macro" -version = "1.12.0" -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.12.0" +version = "1.10.26" dependencies = [ "crossbeam-channel", "log", + "solana-client", "solana-measure", "solana-metrics", "solana-runtime", - "solana-sdk 1.12.0", - "solana-tpu-client", + "solana-sdk 1.10.26", ] [[package]] name = "solana-stake-program" -version = "1.12.0" +version = "1.10.26" dependencies = [ "bincode", "log", @@ -5766,100 +5448,90 @@ dependencies = [ "serde", "serde_derive", "solana-config-program", - "solana-frozen-abi 1.12.0", - "solana-frozen-abi-macro 1.12.0", + "solana-frozen-abi 1.10.26", + "solana-frozen-abi-macro 1.10.26", "solana-metrics", "solana-program-runtime", - "solana-sdk 1.12.0", + "solana-sdk 1.10.26", "solana-vote-program", "thiserror", ] [[package]] name = "solana-storage-bigtable" -version = "1.12.0" +version = "1.10.26" dependencies = [ "backoff", "bincode", - "bytes", "bzip2", "enum-iterator", "flate2", "futures 0.3.24", "goauth", - "http", - "hyper", - "hyper-proxy", "log", "openssl", - "prost 0.11.0", - "prost-types 0.11.1", + "prost 0.10.4", + "prost-types 0.10.1", "serde", "serde_derive", "smpl_jwt", "solana-metrics", - "solana-sdk 1.12.0", + "solana-sdk 1.10.26", "solana-storage-proto", "solana-transaction-status", "thiserror", "tokio", - "tonic 0.8.1", + "tonic 0.7.2", "zstd", ] [[package]] name = "solana-storage-proto" -version = "1.12.0" +version = "1.10.26" dependencies = [ "bincode", "bs58 0.4.0", - "prost 0.11.0", - "protobuf-src", + "prost 0.10.4", "serde", "solana-account-decoder", - "solana-sdk 1.12.0", + "solana-sdk 1.10.26", "solana-transaction-status", - "tonic-build 0.8.0", + "tonic-build 0.7.2", ] [[package]] name = "solana-streamer" -version = "1.12.0" +version = "1.10.26" dependencies = [ "crossbeam-channel", "futures-util", "histogram", - "indexmap", "itertools 0.10.3", "libc", "log", "nix", "pem", - "percentage", "pkcs8", "quinn", - "quinn-proto", - "quinn-udp", "rand 0.7.3", "rcgen", "rustls 0.20.6", "solana-metrics", "solana-perf", - "solana-sdk 1.12.0", + "solana-sdk 1.10.26", "thiserror", "tokio", - "x509-parser", ] [[package]] name = "solana-sys-tuner" -version = "1.12.0" +version = "1.10.26" dependencies = [ - "clap 2.34.0", + "clap", "libc", "log", "nix", - "solana-logger 1.12.0", + "solana-logger 1.10.26", "solana-version", "sysctl", "unix_socket2", @@ -5868,7 +5540,7 @@ dependencies = [ [[package]] name = "solana-test-validator" -version = "1.12.0" +version = "1.10.26" dependencies = [ "base64 0.13.0", "log", @@ -5879,67 +5551,19 @@ dependencies = [ "solana-core", "solana-gossip", "solana-ledger", - "solana-logger 1.12.0", + "solana-logger 1.10.26", "solana-net-utils", - "solana-program-runtime", "solana-program-test", "solana-rpc", - "solana-rpc-client", "solana-runtime", - "solana-sdk 1.12.0", + "solana-sdk 1.10.26", "solana-streamer", - "solana-tpu-client", - "tokio", -] - -[[package]] -name = "solana-thin-client" -version = "1.12.0" -dependencies = [ - "bincode", - "log", - "solana-rpc-client", - "solana-rpc-client-api", - "solana-sdk 1.12.0", - "solana-tpu-client", -] - -[[package]] -name = "solana-tpu-client" -version = "1.12.0" -dependencies = [ - "async-mutex", - "async-trait", - "bincode", - "enum_dispatch", - "futures 0.3.24", - "futures-util", - "indexmap", - "indicatif", - "itertools 0.10.3", - "lazy_static", - "log", - "quinn", - "quinn-proto", - "quinn-udp", - "rand 0.7.3", - "rayon", - "rustls 0.20.6", - "solana-measure", - "solana-metrics", - "solana-net-utils", - "solana-pubsub-client", - "solana-rpc-client", - "solana-rpc-client-api", - "solana-sdk 1.12.0", - "solana-streamer", - "thiserror", "tokio", ] [[package]] name = "solana-transaction-status" -version = "1.12.0" +version = "1.10.26" dependencies = [ "Inflector", "base64 0.13.0", @@ -5952,10 +5576,10 @@ dependencies = [ "serde_derive", "serde_json", "solana-account-decoder", - "solana-address-lookup-table-program", "solana-measure", "solana-metrics", - "solana-sdk 1.12.0", + "solana-runtime", + "solana-sdk 1.10.26", "solana-vote-program", "spl-associated-token-account", "spl-memo", @@ -5966,21 +5590,21 @@ dependencies = [ [[package]] name = "solana-version" -version = "1.12.0" +version = "1.10.26" dependencies = [ "log", "rustc_version 0.4.0", "semver 1.0.13", "serde", "serde_derive", - "solana-frozen-abi 1.12.0", - "solana-frozen-abi-macro 1.12.0", - "solana-sdk 1.12.0", + "solana-frozen-abi 1.10.26", + "solana-frozen-abi-macro 1.10.26", + "solana-sdk 1.10.26", ] [[package]] name = "solana-vote-program" -version = "1.12.0" +version = "1.10.26" dependencies = [ "bincode", "log", @@ -5989,33 +5613,32 @@ dependencies = [ "rustc_version 0.4.0", "serde", "serde_derive", - "solana-frozen-abi 1.12.0", - "solana-frozen-abi-macro 1.12.0", + "solana-frozen-abi 1.10.26", + "solana-frozen-abi-macro 1.10.26", "solana-metrics", - "solana-program 1.12.0", "solana-program-runtime", - "solana-sdk 1.12.0", + "solana-sdk 1.10.26", "thiserror", ] [[package]] name = "solana-zk-token-proof-program" -version = "1.12.0" +version = "1.10.26" dependencies = [ "bytemuck", "getrandom 0.1.16", "num-derive", "num-traits", "solana-program-runtime", - "solana-sdk 1.12.0", - "solana-zk-token-sdk 1.12.0", + "solana-sdk 1.10.26", + "solana-zk-token-sdk 1.10.26", ] [[package]] name = "solana-zk-token-sdk" -version = "1.10.38" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b02dd5d4c8f4658a94c4120802f52f13a1085ff9d30bdded407a35e9c147493" +checksum = "74b149253f9ed1afb68b3161b53b62b637d0dd7a3b328dffdc8bb5878d48358e" dependencies = [ "aes-gcm-siv", "arrayref", @@ -6023,7 +5646,7 @@ dependencies = [ "bincode", "bytemuck", "byteorder", - "cipher 0.4.3", + "cipher 0.3.0", "curve25519-dalek", "getrandom 0.1.16", "lazy_static", @@ -6043,7 +5666,7 @@ dependencies = [ [[package]] name = "solana-zk-token-sdk" -version = "1.12.0" +version = "1.10.26" dependencies = [ "aes-gcm-siv", "arrayref", @@ -6054,7 +5677,6 @@ dependencies = [ "cipher 0.4.3", "curve25519-dalek", "getrandom 0.1.16", - "itertools 0.10.3", "lazy_static", "merlin", "num-derive", @@ -6063,8 +5685,8 @@ dependencies = [ "serde", "serde_json", "sha3 0.9.1", - "solana-program 1.12.0", - "solana-sdk 1.12.0", + "solana-program 1.10.26", + "solana-sdk 1.10.26", "subtle", "thiserror", "zeroize", @@ -6072,9 +5694,9 @@ dependencies = [ [[package]] name = "solana_rbpf" -version = "0.2.32" +version = "0.2.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe055100805e9069715acf73529ec563ad987a4d042da9defe9b7554560f2df4" +checksum = "41e138f6d6d4eb6a65f8e9f01ca620bc9907d79648d5038a69dd3f07b6ed3f1f" dependencies = [ "byteorder", "combine", @@ -6082,10 +5704,11 @@ dependencies = [ "hash32", "libc", "log", - "rand 0.8.5", + "rand 0.7.3", "rustc-demangle", "scroll", "thiserror", + "time 0.1.44", ] [[package]] @@ -6112,18 +5735,13 @@ dependencies = [ [[package]] name = "spl-associated-token-account" -version = "1.1.1" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16a33ecc83137583902c3e13c02f34151c8b2f2b74120f9c2b3ff841953e083d" +checksum = "2b013067447a1396303ddfc294f36e3d260a32f8a16c501c295bcdc7de39b490" dependencies = [ - "assert_matches", "borsh", - "num-derive", - "num-traits", "solana-program 1.10.38", "spl-token", - "spl-token-2022", - "thiserror", ] [[package]] @@ -6137,12 +5755,11 @@ dependencies = [ [[package]] name = "spl-token" -version = "3.5.0" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e85e168a785e82564160dcb87b2a8e04cee9bfd1f4d488c729d53d6a4bd300d" +checksum = "0cc67166ef99d10c18cb5e9c208901e6d8255c6513bb1f877977eba48e6cc4fb" dependencies = [ "arrayref", - "bytemuck", "num-derive", "num-traits", "num_enum", @@ -6152,9 +5769,9 @@ dependencies = [ [[package]] name = "spl-token-2022" -version = "0.4.3" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4c0ebca4740cc4c892aa31e07d0b4dc1a24cac4748376d4b34f8eb0fee9ff46" +checksum = "fce48c69350134e8678de5c0956a531b7de586b28eebdddc03211ceec0660983" dependencies = [ "arrayref", "bytemuck", @@ -6162,18 +5779,82 @@ dependencies = [ "num-traits", "num_enum", "solana-program 1.10.38", - "solana-zk-token-sdk 1.10.38", + "solana-zk-token-sdk 0.8.1", "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" @@ -6191,12 +5872,6 @@ 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" @@ -6352,9 +6027,9 @@ dependencies = [ [[package]] name = "tarpc" -version = "0.29.0" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c38a012bed6fb9681d3bf71ffaa4f88f3b4b9ed3198cda6e4c8462d24d4bb80" +checksum = "b85d0a9369a919ba0db919b142a2b704cd207dfc676f7a43c2d105d0bc225487" dependencies = [ "anyhow", "fnv", @@ -6427,12 +6102,6 @@ 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" @@ -6484,23 +6153,53 @@ 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.2.4" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42657b1a6f4d817cda8e7a0ace261fe0cc946cf3a80314390b22cc61ae080792" +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", +] [[package]] name = "tiny-bip39" @@ -6725,9 +6424,9 @@ dependencies = [ [[package]] name = "tonic" -version = "0.8.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11cd56bdb54ef93935a6a79dbd1d91f1ebd4c64150fd61654031fd6b8b775c91" +checksum = "5be9d60db39854b30b835107500cf0aca0b0d14d6e1c3de124217c23a29c2ddb" dependencies = [ "async-stream", "async-trait", @@ -6743,8 +6442,8 @@ dependencies = [ "hyper-timeout", "percent-encoding 2.1.0", "pin-project", - "prost 0.11.0", - "prost-derive 0.11.0", + "prost 0.10.4", + "prost-derive 0.10.1", "rustls-pemfile 1.0.1", "tokio", "tokio-rustls 0.23.4", @@ -6771,13 +6470,13 @@ dependencies = [ [[package]] name = "tonic-build" -version = "0.8.0" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fbcd2800e34e743b9ae795867d5f77b535d3a3be69fd731e39145719752df8c" +checksum = "d9263bf4c9bfaae7317c1c2faf7f18491d2fe476f70c414b73bf5d445b00ffa1" dependencies = [ "prettyplease", "proc-macro2 1.0.43", - "prost-build 0.11.1", + "prost-build 0.10.4", "quote 1.0.21", "syn 1.0.99", ] @@ -6879,11 +6578,10 @@ dependencies = [ [[package]] name = "tracing-opentelemetry" -version = "0.17.4" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbbe89715c1dbbb790059e2565353978564924ee85017b5fff365c872ff6721f" +checksum = "599f388ecb26b28d9c1b2e4437ae019a7b336018b45ed911458cd9ebf91129f6" dependencies = [ - "once_cell", "opentelemetry", "tracing", "tracing-core", @@ -6892,9 +6590,9 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.3.15" +version = "0.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60db860322da191b40952ad9affe65ea23e7dd6a5c442c2c42865810c6ab8e6b" +checksum = "0e0d2eaa99c3c2e41547cfa109e910a68ea03823cccad4a0525dcbc9b01e8c71" dependencies = [ "sharded-slab", "thread_local", @@ -7373,24 +7071,6 @@ 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/bench_tps_run.sh b/bench_tps_run.sh index 707affe..8e08b4f 100644 --- a/bench_tps_run.sh +++ b/bench_tps_run.sh @@ -3,4 +3,4 @@ cargo run \ -- -u https://api.testnet.rpcpool.com/dfeb84a5-7fe8-4783-baf9-60cca0babbc7 \ --identity ~/devnet.json \ --accounts ~/accounts20.json \ ---mango ~/ids.json --duration 10 -q 2 \ No newline at end of file +--mango ~/ids.json --duration 10 -q 2 --transaction_save_file tlog.txt diff --git a/src/main.rs b/src/main.rs index 99d6a07..dffa99d 100644 --- a/src/main.rs +++ b/src/main.rs @@ -99,18 +99,19 @@ struct TransactionSendRecord { #[derive(Clone, Serialize)] struct TransactionConfirmRecord { - pub signature: Signature, + pub signature: String, pub sent_slot: Slot, - pub sent_at: DateTime, + pub sent_at: String, pub confirmed_slot: Slot, - pub confirmed_at: DateTime, + pub confirmed_at: String, pub successful: bool, - pub slot_leader: Pubkey, - pub error: Option, - pub market_maker: Pubkey, - pub market: Pubkey, - pub block_hash: Pubkey, + pub slot_leader: String, + pub error: String, + pub market_maker: String, + pub market: String, + pub block_hash: String, pub slot_processed: Slot, + pub timed_out: bool, } #[derive(Clone)] @@ -333,25 +334,22 @@ fn process_signature_confirmation_batch( } else { let mut lock = confirmed.write().unwrap(); (*lock).push(TransactionConfirmRecord { - signature: tx_record.signature, + signature: tx_record.signature.to_string(), sent_slot: tx_record.sent_slot, - sent_at: tx_record.sent_at, - confirmed_at: Utc::now(), + sent_at: tx_record.sent_at.to_string(), + confirmed_at: Utc::now().to_string(), confirmed_slot: s.slot, successful: s.err.is_none(), - error: s.err.as_ref().map(|e| { - let err_msg = e.to_string(); - debug!( - "tx {} returned an error {}", - tx_record.signature, err_msg, - ); - err_msg - }), - block_hash: Pubkey::default(), - slot_leader: Pubkey::default(), - market: tx_record.market, - market_maker: tx_record.market_maker, + error: match &s.err { + Some(e) => e.to_string(), + None=> "".to_string(), + }, + block_hash: Pubkey::default().to_string(), + slot_leader: Pubkey::default().to_string(), + market: tx_record.market.to_string(), + market_maker: tx_record.market_maker.to_string(), slot_processed: tx_record.sent_slot, + timed_out: false, }); debug!( @@ -583,15 +581,12 @@ fn confirmations_by_blocks( .unwrap(); let mut mm_transaction_count: u64 = 0; let rewards = &block.rewards.unwrap(); - let slot_leader = Pubkey::from_str( - rewards + let slot_leader = rewards .iter() .find(|r| r.reward_type == Some(RewardType::Fee)) .unwrap() .pubkey - .as_str(), - ) - .unwrap(); + .to_string(); if let Some(transactions) = block.transactions { let nb_transactions = transactions.len(); @@ -626,10 +621,10 @@ fn confirmations_by_blocks( mm_transaction_count += 1; (*lock).push(TransactionConfirmRecord { - signature: transaction_record.signature, + signature: transaction_record.signature.to_string(), confirmed_slot: slot, // TODO: should be changed to correct slot - confirmed_at: Utc::now(), - sent_at: transaction_record.sent_at, + confirmed_at: Utc::now().to_string(), + sent_at: transaction_record.sent_at.to_string(), sent_slot: transaction_record.sent_slot, successful: if let Some(meta) = &meta { meta.status.is_ok() @@ -638,18 +633,18 @@ fn confirmations_by_blocks( }, error: if let Some(meta) = &meta { match &meta.err { - Some(x) => Some(x.to_string()), - None => None, + Some(x) => x.to_string(), + None => "".to_string(), } } else { - None + "".to_string() }, - block_hash: Pubkey::from_str(block.blockhash.as_str()) - .unwrap(), - market: transaction_record.market, - market_maker: transaction_record.market_maker, + block_hash: block.blockhash.clone(), + market: transaction_record.market.to_string(), + market_maker: transaction_record.market_maker.to_string(), slot_processed: slot, - slot_leader: slot_leader, + slot_leader: slot_leader.clone(), + timed_out: false, }) } @@ -662,7 +657,7 @@ 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: slot_leader, + block_leader: Pubkey::from_str(slot_leader.as_str()).unwrap(), block_slot: slot, block_time: if let Some(time) = block.block_time { time as u64 @@ -706,7 +701,23 @@ fn write_transaction_data_into_csv( let timeout_lk = tx_timeout_records.read().unwrap(); for timeout_record in timeout_lk.iter() { - writer.serialize(timeout_record).unwrap(); + writer.serialize( + TransactionConfirmRecord{ + block_hash: "".to_string(), + confirmed_at: "".to_string(), + confirmed_slot: 0, + error: "Timeout".to_string(), + market: timeout_record.market.to_string(), + market_maker: timeout_record.market_maker.to_string(), + sent_at: timeout_record.sent_at.to_string(), + sent_slot: timeout_record.sent_slot, + signature: timeout_record.signature.to_string(), + slot_leader: "".to_string(), + slot_processed: 0, + successful: false, + timed_out: true, + } + ).unwrap(); } } writer.flush().unwrap(); @@ -961,7 +972,7 @@ fn main() { total_signed, (confirmed.len() * 100) / total_signed ); - let error_count = confirmed.iter().filter(|tx| tx.error.is_some()).count(); + let error_count = confirmed.iter().filter(|tx| !tx.error.is_empty()).count(); info!( "errors counted {} rate {}%", error_count, @@ -978,21 +989,21 @@ fn main() { (timeouts.len() * 100) / total_signed ); - let mut confirmation_times = confirmed - .iter() - .map(|r| { - r.confirmed_at - .signed_duration_since(r.sent_at) - .num_milliseconds() - }) - .collect::>(); - confirmation_times.sort(); - info!( - "confirmation times min={} max={} median={}", - confirmation_times.first().unwrap(), - confirmation_times.last().unwrap(), - confirmation_times[confirmation_times.len() / 2] - ); + // let mut confirmation_times = confirmed + // .iter() + // .map(|r| { + // r.confirmed_at + // .signed_duration_since(r.sent_at) + // .num_milliseconds() + // }) + // .collect::>(); + // confirmation_times.sort(); + // info!( + // "confirmation times min={} max={} median={}", + // confirmation_times.first().unwrap(), + // confirmation_times.last().unwrap(), + // confirmation_times[confirmation_times.len() / 2] + // ); write_transaction_data_into_csv( transaction_save_file,