diff --git a/Cargo.lock b/Cargo.lock index 4c8c1be1..49b4dd38 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -76,9 +76,9 @@ dependencies = [ [[package]] name = "ahash" -version = "0.8.5" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd7d5a2cecb58716e47d67d5703a249964b14c7be1ec3cad3affc295b2d1c35d" +checksum = "72832d73be48bac96a5d7944568f305d829ed55b0ce3b483647089dfaf6cf704" dependencies = [ "cfg-if", "getrandom 0.2.12", @@ -89,9 +89,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" dependencies = [ "memchr", ] @@ -185,9 +185,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.80" +version = "1.0.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ad32ce52e4161730f7098c077cd2ed6229b5804ccf99e5366be1ab72a98b4e1" +checksum = "0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247" [[package]] name = "ark-bn254" @@ -431,18 +431,18 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.53", ] [[package]] name = "async-trait" -version = "0.1.77" +version = "0.1.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" +checksum = "461abc97219de0eaaf81fe3ef974a540158f3d079c2ab200f891f1a2ef201e85" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.53", ] [[package]] @@ -518,9 +518,9 @@ dependencies = [ [[package]] name = "backtrace" -version = "0.3.69" +version = "0.3.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +checksum = "95d8e92cac0961e91dbd517496b00f7e9b92363dbe6d42c3198268323798860c" dependencies = [ "addr2line", "cc", @@ -570,7 +570,7 @@ version = "0.2.4" dependencies = [ "anyhow", "bincode", - "clap 4.5.2", + "clap 4.5.3", "csv", "dashmap 5.5.3", "dirs", @@ -606,9 +606,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.2" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" +checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" dependencies = [ "serde", ] @@ -624,9 +624,9 @@ dependencies = [ [[package]] name = "blake3" -version = "1.5.0" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0231f06152bf547e9c2b5194f247cd97aacf6dcd8b15d8e5ec0663f64580da87" +checksum = "30cca6d3674597c30ddf2c587bf8d9d65c9a84d2326d941cc79c9842dfe0ef52" dependencies = [ "arrayref", "arrayvec", @@ -753,9 +753,9 @@ dependencies = [ [[package]] name = "brotli" -version = "3.4.0" +version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "516074a47ef4bce09577a3b379392300159ce5b1ba2e501ff1c819950066100f" +checksum = "d640d25bc63c50fb1f0b545ffd80207d2e10a4c965530809b40ba3386825c391" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -806,22 +806,22 @@ dependencies = [ [[package]] name = "bytemuck" -version = "1.14.3" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2ef034f05691a48569bd920a96c81b9d91bbad1ab5ac7c4616c1f6ef36cb79f" +checksum = "5d6d68c57235a3a081186990eca2867354726650f42f7516ca50c28d6281fd15" dependencies = [ "bytemuck_derive", ] [[package]] name = "bytemuck_derive" -version = "1.5.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "965ab7eb5f8f97d2a083c799f3a1b994fc397b2fe2da5d1da1626ce15a39f2b1" +checksum = "4da9a32f3fed317401fa3c862968128267c3106685286e15d5aaa3d7389c2f60" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.53", ] [[package]] @@ -919,9 +919,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.2" +version = "4.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b230ab84b0ffdf890d5a10abdbc8b83ae1c4918275daea1ab8801f71536b2651" +checksum = "949626d00e063efc93b6dca932419ceb5432f99769911c0b995f7e884c778813" dependencies = [ "clap_builder", "clap_derive", @@ -941,14 +941,14 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.0" +version = "4.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "307bc0538d5f0f83b8248db3087aa92fe504e4691294d0c96c0eabc33f47ba47" +checksum = "90239a040c80f5e14809ca132ddc4176ab33d5e17e49691793296e3fcb34d72f" dependencies = [ - "heck", + "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.53", ] [[package]] @@ -1233,7 +1233,7 @@ dependencies = [ "proc-macro2", "quote", "strsim 0.10.0", - "syn 2.0.52", + "syn 2.0.53", ] [[package]] @@ -1244,7 +1244,7 @@ checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" dependencies = [ "darling_core", "quote", - "syn 2.0.52", + "syn 2.0.53", ] [[package]] @@ -1399,7 +1399,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.53", ] [[package]] @@ -1422,7 +1422,7 @@ checksum = "a6cbae11b3de8fce2a456e8ea3dada226b35fe791f0dc1d360c0941f0bb681f3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.53", ] [[package]] @@ -1510,7 +1510,7 @@ checksum = "03cdc46ec28bd728e67540c528013c6a10eb69a02eb31078a1bda695438cbfb8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.53", ] [[package]] @@ -1674,7 +1674,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.53", ] [[package]] @@ -1766,8 +1766,8 @@ dependencies = [ [[package]] name = "geyser-grpc-connector" -version = "0.10.1+yellowstone.1.12" -source = "git+https://github.com/blockworks-foundation/geyser-grpc-connector.git?branch=v1.13.0+solana.1.17.25#74c6cb759874ffc8efb3eddb144a8b02e28a3fae" +version = "0.7.1+yellowstone.1.11" +source = "git+https://github.com/blockworks-foundation/geyser-grpc-connector.git?tag=v1.17.15#4d737e7c2e8a7bb85b1580da094370dafba3eb8e" dependencies = [ "anyhow", "async-stream", @@ -1863,9 +1863,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.24" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb2c4422095b67ee78da96fbb51a4cc413b3b25883c7717ff7ca1ab31022c9c9" +checksum = "4fbd2820c5e49886948654ab546d0688ff24530286bdcf8fca3cefb16d4618eb" dependencies = [ "bytes", "fnv", @@ -1910,7 +1910,7 @@ version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" dependencies = [ - "ahash 0.8.5", + "ahash 0.8.4", ] [[package]] @@ -1925,6 +1925,12 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + [[package]] name = "hermit-abi" version = "0.1.19" @@ -2329,7 +2335,7 @@ version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d814a21d9a819f8de1a41b819a263ffd68e4bb5f043d936db1c49b54684bde0a" dependencies = [ - "heck", + "heck 0.4.1", "proc-macro-crate 1.3.1", "proc-macro2", "quote", @@ -2420,7 +2426,7 @@ version = "0.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "libc", "redox_syscall", ] @@ -2504,7 +2510,7 @@ dependencies = [ "bs58", "bytes", "chrono", - "clap 4.5.2", + "clap 4.5.3", "const_env", "dashmap 5.5.3", "dotenv", @@ -2791,7 +2797,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.53", ] [[package]] @@ -2881,7 +2887,7 @@ dependencies = [ "proc-macro-crate 1.3.1", "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.53", ] [[package]] @@ -2893,7 +2899,7 @@ dependencies = [ "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.53", ] [[package]] @@ -2938,7 +2944,7 @@ version = "0.10.64" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "cfg-if", "foreign-types", "libc", @@ -2955,7 +2961,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.53", ] [[package]] @@ -3110,7 +3116,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.53", ] [[package]] @@ -3228,7 +3234,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a41cf62165e97c7f814d2221421dbb9afcbcdb0a88068e5ea206e19951c2cbb5" dependencies = [ "proc-macro2", - "syn 2.0.52", + "syn 2.0.53", ] [[package]] @@ -3261,9 +3267,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.78" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" +checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" dependencies = [ "unicode-ident", ] @@ -3300,7 +3306,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c55e02e35260070b6f716a2423c2ff1c3bb1642ddca6f99e1f26d06268a0e2d2" dependencies = [ "bytes", - "heck", + "heck 0.4.1", "itertools 0.11.0", "log", "multimap", @@ -3310,7 +3316,7 @@ dependencies = [ "prost", "prost-types", "regex", - "syn 2.0.52", + "syn 2.0.53", "tempfile", "which", ] @@ -3325,7 +3331,7 @@ dependencies = [ "itertools 0.11.0", "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.53", ] [[package]] @@ -3369,7 +3375,7 @@ checksum = "9e2e25ee72f5b24d773cae88422baddefff7714f97aab68d96fe2b6fc4a28fb2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.53", ] [[package]] @@ -3625,9 +3631,9 @@ checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "reqwest" -version = "0.11.24" +version = "0.11.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6920094eb85afde5e4a138be3f2de8bbdf28000f0029e72c45025a56b042251" +checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62" dependencies = [ "async-compression", "base64 0.21.7", @@ -3749,11 +3755,11 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.31" +version = "0.38.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" +checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "errno", "libc", "linux-raw-sys", @@ -3857,7 +3863,7 @@ checksum = "1db149f81d46d2deba7cd3c50772474707729550221e69588478ebf9ada425ae" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.53", ] [[package]] @@ -3931,7 +3937,7 @@ checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.53", ] [[package]] @@ -3976,7 +3982,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.53", ] [[package]] @@ -4106,9 +4112,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.13.1" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "socket2" @@ -4138,9 +4144,9 @@ dependencies = [ [[package]] name = "solana-account-decoder" -version = "1.17.25" +version = "1.17.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "942b6faa78521915895cbe52f62c5ba29e0962fff976271ec983a68a6e6b9f6a" +checksum = "22ea4bedfcc8686ae6d01a3d8288f5b9746cd00ec63f0ce9a6415849d35add50" dependencies = [ "Inflector", "base64 0.21.7", @@ -4163,9 +4169,9 @@ dependencies = [ [[package]] name = "solana-clap-utils" -version = "1.17.25" +version = "1.17.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4b76f277d3c922d15ffcb30e0aab0919fe5691017278038a5d0935481607fc9" +checksum = "eba77d79b1202853954c7a8cc4261bc50b39f99872d09fd6bbd22373df161171" dependencies = [ "chrono", "clap 2.34.0", @@ -4180,9 +4186,9 @@ dependencies = [ [[package]] name = "solana-client" -version = "1.17.25" +version = "1.17.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab357a45351eeab99539eed5af638af9d577a32fdefa25baf2504fccfb97cab9" +checksum = "6948f1741ea197c04a989510b6810e1593a694848d54f9a128dc15a840484c1f" dependencies = [ "async-trait", "bincode", @@ -4213,9 +4219,9 @@ dependencies = [ [[package]] name = "solana-config-program" -version = "1.17.25" +version = "1.17.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677b61fe38df5db47589d6d09085baf8792006a268447b8fe0542b462a127f2f" +checksum = "8de23cd0dd8673f4590e90bfa47ff19eb629f4b7dc15a3fb173a62d932801d07" dependencies = [ "bincode", "chrono", @@ -4227,9 +4233,9 @@ dependencies = [ [[package]] name = "solana-connection-cache" -version = "1.17.25" +version = "1.17.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a3f6a921263f29e0a7f808fe9659a3fc7e6dfbd42ce4811ca95436a95aee89b" +checksum = "9300b6a51c990fdd16918a522258c384582ad63e2fadcfb9ad1574e4b315e937" dependencies = [ "async-trait", "bincode", @@ -4249,11 +4255,11 @@ dependencies = [ [[package]] name = "solana-frozen-abi" -version = "1.17.25" +version = "1.17.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de577bb681dfc3afeda6247dbc381f8c74a31eeed141883e6a9a36e93fdcf784" +checksum = "4090f2ac64149ce1fbabd5277f41e278edc1f38121927fe8f6355e67ead3e199" dependencies = [ - "ahash 0.8.5", + "ahash 0.8.4", "blake3", "block-buffer 0.10.4", "bs58", @@ -4279,14 +4285,14 @@ dependencies = [ [[package]] name = "solana-frozen-abi-macro" -version = "1.17.25" +version = "1.17.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6373184605334be54d85564b657e7b4d88bdf4e3c011abccce4fd2712c96caf" +checksum = "765bcdc1ecc31ea5d3d7ddb680ffa6645809c122b4ffdc223b161850e6ba352b" dependencies = [ "proc-macro2", "quote", "rustc_version", - "syn 2.0.52", + "syn 2.0.53", ] [[package]] @@ -4428,7 +4434,7 @@ dependencies = [ "bs58", "bytes", "chrono", - "clap 4.5.2", + "clap 4.5.3", "dashmap 5.5.3", "dotenv", "futures", @@ -4466,7 +4472,7 @@ dependencies = [ "bs58", "bytes", "chrono", - "clap 4.5.2", + "clap 4.5.3", "countmap", "crossbeam-channel", "dashmap 5.5.3", @@ -4536,9 +4542,9 @@ dependencies = [ [[package]] name = "solana-logger" -version = "1.17.25" +version = "1.17.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6959774302d4407c77d5fbdd4d5e31c2696f5ac1c74bf0cdcac704b474bc6fd" +checksum = "9c7f3cad088bc5f00569cb5b4c3aaba8d935f8f7cc25c91cc0c55a8a7de2b137" dependencies = [ "env_logger", "lazy_static", @@ -4547,9 +4553,9 @@ dependencies = [ [[package]] name = "solana-measure" -version = "1.17.25" +version = "1.17.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9327e70f9cb17094077531449f7487677c4d380bd99b9494dca85af5ea5f5e19" +checksum = "2de5041d16120852c0deea047c024e1fad8819e49041491f0cca6c91c243fd5d" dependencies = [ "log", "solana-sdk", @@ -4557,9 +4563,9 @@ dependencies = [ [[package]] name = "solana-metrics" -version = "1.17.25" +version = "1.17.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca5e3931823a9bdaee5d65d27195804127911578abddaddda3025f6af6647c08" +checksum = "2fd6f25f0076b6eb873f7e2a85e53191ac2affe6782131be1a2867d057307e20" dependencies = [ "crossbeam-channel", "gethostname", @@ -4572,9 +4578,9 @@ dependencies = [ [[package]] name = "solana-net-utils" -version = "1.17.25" +version = "1.17.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fed17001119742b35ce06b18823b4901313860c5dd495e32bccf070424b2947" +checksum = "12ff6114e678f321b3d421288dc12311e6e5ca5b72eadd962d4239276b3d66d2" dependencies = [ "bincode", "clap 3.2.25", @@ -4594,11 +4600,11 @@ dependencies = [ [[package]] name = "solana-perf" -version = "1.17.25" +version = "1.17.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c2a6d77ead9c96aa2a84afd0662d01c55abec61b514d8c9e2dc5627a1d74c7b" +checksum = "34b28f2db62b93cb04b56d610ac8736ee4fb89b4a030c55935b646b7212b6556" dependencies = [ - "ahash 0.8.5", + "ahash 0.8.4", "bincode", "bv", "caps", @@ -4623,9 +4629,9 @@ dependencies = [ [[package]] name = "solana-program" -version = "1.17.25" +version = "1.17.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9dd3bcc37b433d7e8d45236a0f5aa68df462c4d5c6a709a6efd916988ce3ac08" +checksum = "c1141d1dffbe68852128f7bbcc3c43a5d2cb715ecffeeb64eb81bb93cbaf80bb" dependencies = [ "ark-bn254", "ark-ec", @@ -4633,7 +4639,7 @@ dependencies = [ "ark-serialize", "base64 0.21.7", "bincode", - "bitflags 2.4.2", + "bitflags 2.5.0", "blake3", "borsh 0.10.3", "borsh 0.9.3", @@ -4677,9 +4683,9 @@ dependencies = [ [[package]] name = "solana-program-runtime" -version = "1.17.25" +version = "1.17.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "618fb4dc2238daa2737805659c4ad380fb61dd27a40cfd14e63d890d1e4335b0" +checksum = "942de577a2865cec28fc174575c9bd6cf7af815832af67fe40ca856075550998" dependencies = [ "base64 0.21.7", "bincode", @@ -4705,9 +4711,9 @@ dependencies = [ [[package]] name = "solana-pubsub-client" -version = "1.17.25" +version = "1.17.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0daf3d4daa67ef7550fe1a4b88dad32164263c9b7b7f0477caacae6b0220ceb5" +checksum = "a7ba8af6bfcb21abdde0a9fc2bade99e5e7c8fadab7f113ac7bceb408296ae26" dependencies = [ "crossbeam-channel", "futures-util", @@ -4730,9 +4736,9 @@ dependencies = [ [[package]] name = "solana-quic-client" -version = "1.17.25" +version = "1.17.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39f1c28340a1845d18ab85f96c57f283a588745f4f334a77a0cc7a13a6f2eae4" +checksum = "460b3265aec34d9a746bec2b64e2fb2890d7af694c81a494aceddeb9fb77182c" dependencies = [ "async-mutex", "async-trait", @@ -4757,9 +4763,9 @@ dependencies = [ [[package]] name = "solana-rayon-threadlimit" -version = "1.17.25" +version = "1.17.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c8f657c79b681bd49b4106242890225ba0df190cc83109394a1fcc8e3c54819" +checksum = "dda21485597afb5edb4080b854d0e2a7d2d6a8e05b0f1f0abf8cb855b44b9b6c" dependencies = [ "lazy_static", "num_cpus", @@ -4767,9 +4773,9 @@ dependencies = [ [[package]] name = "solana-remote-wallet" -version = "1.17.25" +version = "1.17.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8d8bc9c75495fcf301a85bda5c921213dbff9dc8d6e7708c74eaa9d06e8e395" +checksum = "b2b32421f5ce524405db85b3227e57386a245ac75fbf7e0a2407b2e35c789968" dependencies = [ "console", "dialoguer", @@ -4786,9 +4792,9 @@ dependencies = [ [[package]] name = "solana-rpc-client" -version = "1.17.25" +version = "1.17.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f050027aff888d96c5a659dc164998d6ec25aadde649f1474d2cbb73b2a72de8" +checksum = "09220386ed831960f32119e6b87100588269712e764e4838e01f78dc11b1ec1d" dependencies = [ "async-trait", "base64 0.21.7", @@ -4812,9 +4818,9 @@ dependencies = [ [[package]] name = "solana-rpc-client-api" -version = "1.17.25" +version = "1.17.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a273e98835985e15e3774267af94a0631b1e27ae187b242e7fbacf1c1fad29fb" +checksum = "b2ef8ffa33755c1e648be2c7433404a275a34b951787770970b77bc682ff12c5" dependencies = [ "base64 0.21.7", "bs58", @@ -4834,9 +4840,9 @@ dependencies = [ [[package]] name = "solana-rpc-client-nonce-utils" -version = "1.17.25" +version = "1.17.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "458fc8f9d14e42d397e7867288fdff47de6ca9f949b1f11217e807a65bf17c43" +checksum = "f46040b32f0e8b8e215caa7d43e2b879e1c1e2cade205bc3edfb3dcfa0632ac5" dependencies = [ "clap 2.34.0", "solana-clap-utils", @@ -4847,14 +4853,14 @@ dependencies = [ [[package]] name = "solana-sdk" -version = "1.17.25" +version = "1.17.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1de78b8c4fa09e4b90d720b2aa3ef3c80c4b956aa3d14616261a7f4bdf64c04" +checksum = "278a95acb99377dd4585599fdbec23d0a6fcb94ec78285283723fdd365fe885e" dependencies = [ "assert_matches", "base64 0.21.7", "bincode", - "bitflags 2.4.2", + "bitflags 2.5.0", "borsh 0.10.3", "bs58", "bytemuck", @@ -4901,15 +4907,15 @@ dependencies = [ [[package]] name = "solana-sdk-macro" -version = "1.17.25" +version = "1.17.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b5055c4b785cf3e5f2f52d687bdd1a795755105fe4365182396bc8b6bb41cd5" +checksum = "92dbaf563210f61828800f2a3d8c188fa2afede91920d364982e280318db2eb5" dependencies = [ "bs58", "proc-macro2", "quote", "rustversion", - "syn 2.0.52", + "syn 2.0.53", ] [[package]] @@ -4920,9 +4926,9 @@ checksum = "468aa43b7edb1f9b7b7b686d5c3aeb6630dc1708e86e31343499dd5c4d775183" [[package]] name = "solana-streamer" -version = "1.17.25" +version = "1.17.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05a31fb5a63f80318a5b03148d9132e3bb1f2125e0bebe9bedfc095d1b16753c" +checksum = "c8315b493d109f89842dcc9df02b4444beb182b810e3256f69a777c6f2a8147e" dependencies = [ "async-channel", "bytes", @@ -4952,9 +4958,9 @@ dependencies = [ [[package]] name = "solana-thin-client" -version = "1.17.25" +version = "1.17.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b19c4e6d850b0b8598f84513b4b5cdcc36d095df1b99725704c087d4df7e9eb" +checksum = "3db2f09ad842ede0c354a2e870ed8d7660aa9d85eabbff2ced6fc7b8ba409a90" dependencies = [ "bincode", "log", @@ -4967,9 +4973,9 @@ dependencies = [ [[package]] name = "solana-tpu-client" -version = "1.17.25" +version = "1.17.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91e6cb310a96dad1a34e7cacd9344800206df21c5f891459240621c96e13c6ee" +checksum = "9263b1c6647258a5c36a54b8d79e1c366180b1eda65150b0cafb7b469c68f5e1" dependencies = [ "async-trait", "bincode", @@ -4991,9 +4997,9 @@ dependencies = [ [[package]] name = "solana-transaction-status" -version = "1.17.25" +version = "1.17.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd87fd7b4164cb7cbe047e6376e9585668923ed8072ea32b7e878f25c90fd056" +checksum = "5e2031070cba17802f7108b53f6db01b82cdfb0360b0a8b9d51c584f2e9dd9e4" dependencies = [ "Inflector", "base64 0.21.7", @@ -5016,9 +5022,9 @@ dependencies = [ [[package]] name = "solana-udp-client" -version = "1.17.25" +version = "1.17.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4886959ef4094af0d9ceda93dc468fa7088f46b22cc7d0c8c18086389e8d63e7" +checksum = "829c54d9706b8da0fe81b5b79c4291c4a7d366c16b3e19bcfb44125e1cc4741b" dependencies = [ "async-trait", "solana-connection-cache", @@ -5031,9 +5037,9 @@ dependencies = [ [[package]] name = "solana-version" -version = "1.17.25" +version = "1.17.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "310500e993127ea009a2c41daf2e004d436d3041cdee6673112804c574a41eda" +checksum = "c1dff08def0cc14d1ab26916ffdc11a1456620d6590c43c569c08a98fac91f7d" dependencies = [ "log", "rustc_version", @@ -5047,9 +5053,9 @@ dependencies = [ [[package]] name = "solana-vote-program" -version = "1.17.25" +version = "1.17.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04079fab6e48794ec194c9bb44422672fa66594b9979dfc97d62c1556434ee7a" +checksum = "c144aee890e2e62bcfab7079d0a5c5795b84c5cd4cbe904c64b8cd868b131a05" dependencies = [ "bincode", "log", @@ -5069,9 +5075,9 @@ dependencies = [ [[package]] name = "solana-zk-token-sdk" -version = "1.17.25" +version = "1.17.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9e0b222c3aad3df370ae87e993b32419906f00827a1677b7c814c65c9682909" +checksum = "ef26fb44734aa940e6648bbbeead677edc68c7e1ec09128e5f16a8924c389a38" dependencies = [ "aes-gcm-siv", "base64 0.21.7", @@ -5172,7 +5178,7 @@ checksum = "07fd7858fc4ff8fb0e34090e41d7eb06a823e1057945c26d480bfc21d2338a93" dependencies = [ "quote", "spl-discriminator-syn", - "syn 2.0.52", + "syn 2.0.53", ] [[package]] @@ -5184,7 +5190,7 @@ dependencies = [ "proc-macro2", "quote", "sha2 0.10.8", - "syn 2.0.52", + "syn 2.0.53", "thiserror", ] @@ -5241,7 +5247,7 @@ dependencies = [ "proc-macro2", "quote", "sha2 0.10.8", - "syn 2.0.52", + "syn 2.0.53", ] [[package]] @@ -5401,9 +5407,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.52" +version = "2.0.53" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b699d15b36d1f02c3e7c69f8ffef53de37aefae075d8488d4ba1a7788d574a07" +checksum = "7383cd0e49fff4b6b90ca5670bfd3e9d6a733b3f90c686605aa7eec8c4996032" dependencies = [ "proc-macro2", "quote", @@ -5487,22 +5493,22 @@ checksum = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9" [[package]] name = "thiserror" -version = "1.0.57" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b" +checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.57" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81" +checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.53", ] [[package]] @@ -5617,7 +5623,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.53", ] [[package]] @@ -5668,9 +5674,9 @@ dependencies = [ [[package]] name = "tokio-stream" -version = "0.1.14" +version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" +checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af" dependencies = [ "futures-core", "pin-project-lite", @@ -5785,7 +5791,7 @@ dependencies = [ "proc-macro2", "prost-build", "quote", - "syn 2.0.52", + "syn 2.0.53", ] [[package]] @@ -5853,7 +5859,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.53", ] [[package]] @@ -6103,7 +6109,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.53", "wasm-bindgen-shared", ] @@ -6137,7 +6143,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.53", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -6196,9 +6202,9 @@ dependencies = [ [[package]] name = "whoami" -version = "1.5.0" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fec781d48b41f8163426ed18e8fc2864c12937df9ce54c88ede7bd47270893e" +checksum = "a44ab49fad634e88f55bf8f9bb3abd2f27d7204172a112c7c9987e01c1c94ea9" dependencies = [ "redox_syscall", "wasite", @@ -6425,8 +6431,8 @@ dependencies = [ [[package]] name = "yellowstone-grpc-client" -version = "1.14.0+solana.1.17.25" -source = "git+https://github.com/rpcpool/yellowstone-grpc.git?tag=v1.13.0+solana.1.17.25#50ac737dd9dd2f288e3bbed662dcfd310c44591c" +version = "1.13.0+solana.1.17.15" +source = "git+https://github.com/rpcpool/yellowstone-grpc.git?tag=v1.12.0+solana.1.17.15#c7b72cc8781c2dc48e4a7c94e411f95df495cf2f" dependencies = [ "bytes", "futures", @@ -6439,8 +6445,8 @@ dependencies = [ [[package]] name = "yellowstone-grpc-proto" -version = "1.13.0+solana.1.17.25" -source = "git+https://github.com/rpcpool/yellowstone-grpc.git?tag=v1.13.0+solana.1.17.25#50ac737dd9dd2f288e3bbed662dcfd310c44591c" +version = "1.12.0+solana.1.17.15" +source = "git+https://github.com/rpcpool/yellowstone-grpc.git?tag=v1.12.0+solana.1.17.15#c7b72cc8781c2dc48e4a7c94e411f95df495cf2f" dependencies = [ "anyhow", "bincode", @@ -6470,7 +6476,7 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.53", ] [[package]] @@ -6490,7 +6496,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.53", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index a6075dd5..948e4596 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -21,18 +21,18 @@ license = "AGPL" edition = "2021" [workspace.dependencies] -solana-sdk = "~1.17.25" -solana-rpc-client = "~1.17.25" -solana-rpc-client-api = "~1.17.25" -solana-transaction-status = "~1.17.25" -solana-version = "~1.17.25" -solana-client = "~1.17.25" -solana-net-utils = "~1.17.25" -solana-pubsub-client = "~1.17.25" -solana-streamer = "~1.17.25" -solana-account-decoder = "~1.17.25" -solana-ledger = "~1.17.25" -solana-program = "~1.17.25" +solana-sdk = "~1.17.15" +solana-rpc-client = "~1.17.15" +solana-rpc-client-api = "~1.17.15" +solana-transaction-status = "~1.17.15" +solana-version = "~1.17.15" +solana-client = "~1.17.15" +solana-net-utils = "~1.17.15" +solana-pubsub-client = "~1.17.15" +solana-streamer = "~1.17.15" +solana-account-decoder = "~1.17.15" +solana-ledger = "~1.17.15" +solana-program = "~1.17.15" itertools = "0.10.5" rangetools = "0.1.4" serde = { version = "1.0.160", features = ["derive"] } @@ -73,5 +73,5 @@ solana-lite-rpc-stakevote = {path = "stake_vote", version="0.2.4"} solana-lite-rpc-block-priofees = {path = "block_priofees", version="0.2.4"} async-trait = "0.1.68" -yellowstone-grpc-client = { git = "https://github.com/rpcpool/yellowstone-grpc.git", tag = "v1.13.0+solana.1.17.25" } -yellowstone-grpc-proto = { git = "https://github.com/rpcpool/yellowstone-grpc.git", tag = "v1.13.0+solana.1.17.25" } +yellowstone-grpc-client = { git = "https://github.com/rpcpool/yellowstone-grpc.git", tag = "v1.12.0+solana.1.17.15" } +yellowstone-grpc-proto = { git = "https://github.com/rpcpool/yellowstone-grpc.git", tag = "v1.12.0+solana.1.17.15" } diff --git a/cluster-endpoints/Cargo.toml b/cluster-endpoints/Cargo.toml index cbf13aa9..a6259687 100644 --- a/cluster-endpoints/Cargo.toml +++ b/cluster-endpoints/Cargo.toml @@ -9,7 +9,7 @@ license = "AGPL" [dependencies] #geyser-grpc-connector = { path = "../../geyser-grpc-connector" } -geyser-grpc-connector = { git = "https://github.com/blockworks-foundation/geyser-grpc-connector.git", branch = "v1.13.0+solana.1.17.25" } +geyser-grpc-connector = { tag = "v1.17.15", git = "https://github.com/blockworks-foundation/geyser-grpc-connector.git" } solana-sdk = { workspace = true } solana-rpc-client-api = { workspace = true } diff --git a/cluster-endpoints/src/grpc_multiplex.rs b/cluster-endpoints/src/grpc_multiplex.rs index 1026926f..c24e8d14 100644 --- a/cluster-endpoints/src/grpc_multiplex.rs +++ b/cluster-endpoints/src/grpc_multiplex.rs @@ -3,11 +3,13 @@ use crate::grpc_subscription::{ }; use anyhow::Context; use futures::{Stream, StreamExt}; -use geyser_grpc_connector::grpc_subscription_autoreconnect_streams::create_geyser_reconnecting_stream; +use geyser_grpc_connector::grpc_subscription_autoreconnect::{ + create_geyser_reconnecting_stream, GeyserFilter, GrpcSourceConfig, +}; use geyser_grpc_connector::grpcmultiplex_fastestwins::{ create_multiplexed_stream, FromYellowstoneExtractor, }; -use geyser_grpc_connector::{GeyserFilter, GrpcSourceConfig}; + use log::{debug, info, trace, warn}; use solana_lite_rpc_core::structures::produced_block::ProducedBlock; use solana_lite_rpc_core::structures::slot_notification::SlotNotification; diff --git a/cluster-endpoints/src/grpc_subscription.rs b/cluster-endpoints/src/grpc_subscription.rs index ec4120cd..8c56ac09 100644 --- a/cluster-endpoints/src/grpc_subscription.rs +++ b/cluster-endpoints/src/grpc_subscription.rs @@ -7,7 +7,7 @@ use crate::{ }; use anyhow::Context; use futures::StreamExt; -use geyser_grpc_connector::GrpcSourceConfig; +use geyser_grpc_connector::grpc_subscription_autoreconnect::GrpcSourceConfig; use itertools::Itertools; use solana_client::nonblocking::rpc_client::RpcClient; use solana_lite_rpc_core::{ diff --git a/lite-rpc/src/main.rs b/lite-rpc/src/main.rs index 15769f4d..4cffed86 100644 --- a/lite-rpc/src/main.rs +++ b/lite-rpc/src/main.rs @@ -10,7 +10,8 @@ use lite_rpc::service_spawner::ServiceSpawner; use lite_rpc::DEFAULT_MAX_NUMBER_OF_TXS_IN_QUEUE; use log::{debug, info}; use solana_lite_rpc_cluster_endpoints::endpoint_stremers::EndpointStreaming; -use solana_lite_rpc_cluster_endpoints::geyser_grpc_connector::{ + +use solana_lite_rpc_cluster_endpoints::geyser_grpc_connector::grpc_subscription_autoreconnect::{ GrpcConnectionTimeouts, GrpcSourceConfig, }; use solana_lite_rpc_cluster_endpoints::grpc_subscription::create_grpc_subscription; @@ -135,7 +136,6 @@ pub async fn start_lite_rpc(args: Config, rpc_client: Arc) -> anyhow: connect_timeout: Duration::from_secs(5), request_timeout: Duration::from_secs(5), subscribe_timeout: Duration::from_secs(5), - receive_timeout: Duration::from_secs(5), }; create_grpc_subscription(