From f18de912d8c51b815a2f26fa59e2ee76e51fdb54 Mon Sep 17 00:00:00 2001 From: Godmode Galactus Date: Mon, 23 Oct 2023 12:05:42 +0200 Subject: [PATCH] Updating grpc version --- Cargo.lock | 640 ++++++++++++++++++++++++++++++++++++++++------------ Cargo.toml | 4 +- src/main.rs | 2 + 3 files changed, 499 insertions(+), 147 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 7fb88dc..bc8e385 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -76,14 +76,15 @@ dependencies = [ [[package]] name = "ahash" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" +checksum = "72832d73be48bac96a5d7944568f305d829ed55b0ce3b483647089dfaf6cf704" dependencies = [ "cfg-if", "getrandom 0.2.10", "once_cell", "version_check", + "zerocopy", ] [[package]] @@ -202,7 +203,7 @@ dependencies = [ "ark-std", "derivative", "hashbrown 0.13.2", - "itertools", + "itertools 0.10.5", "num-traits", "zeroize", ] @@ -219,7 +220,7 @@ dependencies = [ "ark-std", "derivative", "digest 0.10.7", - "itertools", + "itertools 0.10.5", "num-bigint 0.4.4", "num-traits", "paste", @@ -491,6 +492,9 @@ name = "bitflags" version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +dependencies = [ + "serde", +] [[package]] name = "bitmaps" @@ -881,9 +885,9 @@ checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" [[package]] name = "cpufeatures" -version = "0.2.9" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" +checksum = "3fbc60abd742b35f2492f808e1abbb83d45f72db402e14c55057edc9c7b1e9e4" dependencies = [ "libc", ] @@ -1422,7 +1426,7 @@ dependencies = [ "const_env", "dashmap", "futures", - "itertools", + "itertools 0.10.5", "lazy_static", "log", "native-tls", @@ -1433,8 +1437,8 @@ dependencies = [ "serde_json", "solana-rpc-client", "solana-rpc-client-api", - "solana-sdk", - "solana-transaction-status", + "solana-sdk 1.16.18", + "solana-transaction-status 1.16.18", "thiserror", "tokio", "tokio-postgres", @@ -1491,7 +1495,7 @@ version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" dependencies = [ - "ahash 0.8.3", + "ahash 0.8.4", ] [[package]] @@ -1617,7 +1621,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2 0.4.9", + "socket2 0.4.10", "tokio", "tower-service", "tracing", @@ -1749,9 +1753,9 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.8.0" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6" +checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" [[package]] name = "itertools" @@ -1762,6 +1766,15 @@ dependencies = [ "either", ] +[[package]] +name = "itertools" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" +dependencies = [ + "either", +] + [[package]] name = "itoa" version = "1.0.9" @@ -1870,6 +1883,17 @@ dependencies = [ "libsecp256k1-core", ] +[[package]] +name = "light-poseidon" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "949bdd22e4ed93481d45e9a6badb34b99132bcad0c8a8d4f05c42f7dcc7b90bc" +dependencies = [ + "ark-bn254", + "ark-ff", + "thiserror", +] + [[package]] name = "linux-raw-sys" version = "0.4.10" @@ -2430,12 +2454,12 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "prettyplease" -version = "0.1.25" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8646e95016a7a6c4adea95bafa8a16baab64b583356217f2c85db4a39d9a86" +checksum = "ae005bd773ab59b4725093fd7df83fd7892f7d8eafb48dbd7de6e024e4215f9d" dependencies = [ "proc-macro2", - "syn 1.0.109", + "syn 2.0.38", ] [[package]] @@ -2483,9 +2507,9 @@ dependencies = [ [[package]] name = "prost" -version = "0.11.9" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd" +checksum = "f4fdd22f3b9c31b53c060df4a0613a1c7f062d4115a2b984dd15b1858f7e340d" dependencies = [ "bytes", "prost-derive", @@ -2493,44 +2517,44 @@ dependencies = [ [[package]] name = "prost-build" -version = "0.11.9" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "119533552c9a7ffacc21e099c24a0ac8bb19c2a2a3f363de84cd9b844feab270" +checksum = "8bdf592881d821b83d471f8af290226c8d51402259e9bb5be7f9f8bdebbb11ac" dependencies = [ "bytes", "heck", - "itertools", - "lazy_static", + "itertools 0.11.0", "log", "multimap", + "once_cell", "petgraph", "prettyplease", "prost", "prost-types", "regex", - "syn 1.0.109", + "syn 2.0.38", "tempfile", "which", ] [[package]] name = "prost-derive" -version = "0.11.9" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4" +checksum = "265baba7fabd416cf5078179f7d2cbeca4ce7a9041111900675ea7c4cb8a4c32" dependencies = [ "anyhow", - "itertools", + "itertools 0.11.0", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.38", ] [[package]] name = "prost-types" -version = "0.11.9" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213622a1460818959ac1181aaeb2dc9c7f63df720db7d788b3e24eacd1983e13" +checksum = "e081b29f63d83a4bc75cfc9f3fe424f9156cf92d8a4f0c9407cce9a1b67327cf" dependencies = [ "prost", ] @@ -2559,6 +2583,17 @@ dependencies = [ "percent-encoding", ] +[[package]] +name = "qualifier_attr" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e2e25ee72f5b24d773cae88422baddefff7714f97aab68d96fe2b6fc4a28fb2" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + [[package]] name = "quote" version = "1.0.33" @@ -3128,9 +3163,9 @@ checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" [[package]] name = "socket2" -version = "0.4.9" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" +checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" dependencies = [ "libc", "winapi", @@ -3138,9 +3173,9 @@ dependencies = [ [[package]] name = "socket2" -version = "0.5.4" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4031e820eb552adee9295814c0ced9e5cf38ddf1e8b7d566d6de8e2538ea989e" +checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" dependencies = [ "libc", "windows-sys 0.48.0", @@ -3148,9 +3183,9 @@ dependencies = [ [[package]] name = "solana-account-decoder" -version = "1.16.17" +version = "1.16.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "121e55656c2094950f374247e1303dd09517f1ed49c91bf60bf114760b286eb4" +checksum = "83da6908b4865a9680c4fcb5e77d319467fdc5ab96a6ccc8361e7110ebcd206e" dependencies = [ "Inflector", "base64 0.21.4", @@ -3162,8 +3197,31 @@ dependencies = [ "serde_derive", "serde_json", "solana-address-lookup-table-program", - "solana-config-program", - "solana-sdk", + "solana-config-program 1.16.18", + "solana-sdk 1.16.18", + "spl-token", + "spl-token-2022", + "spl-token-metadata-interface", + "thiserror", + "zstd", +] + +[[package]] +name = "solana-account-decoder" +version = "1.18.0" +source = "git+https://github.com/blockworks-foundation/solana.git?branch=geyser_send_transaction_results_master#17079124dc869274470e4688cd1e18d9669cb549" +dependencies = [ + "Inflector", + "base64 0.21.4", + "bincode", + "bs58", + "bv", + "lazy_static", + "serde", + "serde_derive", + "serde_json", + "solana-config-program 1.18.0", + "solana-sdk 1.18.0", "spl-token", "spl-token-2022", "spl-token-metadata-interface", @@ -3173,9 +3231,9 @@ dependencies = [ [[package]] name = "solana-address-lookup-table-program" -version = "1.16.17" +version = "1.16.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ccb31f7f14d5876acd9ec38f5bf6097bfb4b350141d81c7ff2bf684db3ca815" +checksum = "9102429e980b8e58f05e39a2aceb799fc1fd7b81e440bc70322854e0debb21dc" dependencies = [ "bincode", "bytemuck", @@ -3184,35 +3242,48 @@ dependencies = [ "num-traits", "rustc_version", "serde", - "solana-frozen-abi", - "solana-frozen-abi-macro", - "solana-program", - "solana-program-runtime", - "solana-sdk", + "solana-frozen-abi 1.16.18", + "solana-frozen-abi-macro 1.16.18", + "solana-program 1.16.18", + "solana-program-runtime 1.16.18", + "solana-sdk 1.16.18", "thiserror", ] [[package]] name = "solana-config-program" -version = "1.16.17" +version = "1.16.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94dc0f4463daf1c6155f20eac948ea4ced705e5f5520546aef4e11e746a6d95d" +checksum = "b8c2804d121a6d87f4b0cb861dc26e677e76953f4888a43292e34c5e6c5f2852" dependencies = [ "bincode", "chrono", "serde", "serde_derive", - "solana-program-runtime", - "solana-sdk", + "solana-program-runtime 1.16.18", + "solana-sdk 1.16.18", +] + +[[package]] +name = "solana-config-program" +version = "1.18.0" +source = "git+https://github.com/blockworks-foundation/solana.git?branch=geyser_send_transaction_results_master#17079124dc869274470e4688cd1e18d9669cb549" +dependencies = [ + "bincode", + "chrono", + "serde", + "serde_derive", + "solana-program-runtime 1.18.0", + "solana-sdk 1.18.0", ] [[package]] name = "solana-frozen-abi" -version = "1.16.17" +version = "1.16.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d266bf0311bb403d31206aa2904b8741f57c7f5e27580b6810ad5e22fc7c3282" +checksum = "8a63aebf4beac713a1949216ae180355c044df9cc3db9a58ca153bb10bb5843b" dependencies = [ - "ahash 0.8.3", + "ahash 0.8.4", "blake3", "block-buffer 0.10.4", "bs58", @@ -3234,16 +3305,51 @@ dependencies = [ "serde_derive", "serde_json", "sha2 0.10.8", - "solana-frozen-abi-macro", + "solana-frozen-abi-macro 1.16.18", + "subtle", + "thiserror", +] + +[[package]] +name = "solana-frozen-abi" +version = "1.18.0" +source = "git+https://github.com/blockworks-foundation/solana.git?branch=geyser_send_transaction_results_master#17079124dc869274470e4688cd1e18d9669cb549" +dependencies = [ + "block-buffer 0.10.4", + "bs58", + "bv", + "either", + "generic-array", + "im", + "lazy_static", + "log", + "memmap2", + "rustc_version", + "serde", + "serde_bytes", + "serde_derive", + "sha2 0.10.8", + "solana-frozen-abi-macro 1.18.0", "subtle", "thiserror", ] [[package]] name = "solana-frozen-abi-macro" -version = "1.16.17" +version = "1.16.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6dfe18c5155015dcb494c6de84a03b725fcf90ec2006a047769018b94c2cf0de" +checksum = "bced1b3c0421605312fd7eae7ceb6850d3b1d2e939da349c928e6d46a945c829" +dependencies = [ + "proc-macro2", + "quote", + "rustc_version", + "syn 2.0.38", +] + +[[package]] +name = "solana-frozen-abi-macro" +version = "1.18.0" +source = "git+https://github.com/blockworks-foundation/solana.git?branch=geyser_send_transaction_results_master#17079124dc869274470e4688cd1e18d9669cb549" dependencies = [ "proc-macro2", "quote", @@ -3253,9 +3359,19 @@ dependencies = [ [[package]] name = "solana-logger" -version = "1.16.17" +version = "1.16.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f76fe25c2d06dcf621befd1e8d5655143e8a059c7e20fcb71736bc80ed779d6" +checksum = "c95311f23906f0fa4a6d995f3c39593db18e4d943e4d3fbf082a510d0881d7af" +dependencies = [ + "env_logger", + "lazy_static", + "log", +] + +[[package]] +name = "solana-logger" +version = "1.18.0" +source = "git+https://github.com/blockworks-foundation/solana.git?branch=geyser_send_transaction_results_master#17079124dc869274470e4688cd1e18d9669cb549" dependencies = [ "env_logger", "lazy_static", @@ -3264,33 +3380,56 @@ dependencies = [ [[package]] name = "solana-measure" -version = "1.16.17" +version = "1.16.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db165b8a7f5d840abef011c78a18ffe63cad9192d676b07d94f469b6b5dc6cf6" +checksum = "944244553c62855c57d05ac049140762f1e095188a0e5b973b859947ac1d00bf" dependencies = [ "log", - "solana-sdk", + "solana-sdk 1.16.18", +] + +[[package]] +name = "solana-measure" +version = "1.18.0" +source = "git+https://github.com/blockworks-foundation/solana.git?branch=geyser_send_transaction_results_master#17079124dc869274470e4688cd1e18d9669cb549" +dependencies = [ + "log", + "solana-sdk 1.18.0", ] [[package]] name = "solana-metrics" -version = "1.16.17" +version = "1.16.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa01731bb3952904962d49a1ea1205db54e93f3a56f4006d32e02a7c85d60546" +checksum = "f02b2244ee93fd282f057146ce779987a96cdeba5615d43dc0b6347b96134772" dependencies = [ "crossbeam-channel", "gethostname", "lazy_static", "log", "reqwest", - "solana-sdk", + "solana-sdk 1.16.18", +] + +[[package]] +name = "solana-metrics" +version = "1.18.0" +source = "git+https://github.com/blockworks-foundation/solana.git?branch=geyser_send_transaction_results_master#17079124dc869274470e4688cd1e18d9669cb549" +dependencies = [ + "crossbeam-channel", + "gethostname", + "lazy_static", + "log", + "reqwest", + "solana-sdk 1.18.0", + "thiserror", ] [[package]] name = "solana-program" -version = "1.16.17" +version = "1.16.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bb16998986492de307eef503ce47e84503d35baa92dc60832b22476948b1c16" +checksum = "e1f5c12cb15108734adae20be5e922c2db09d9623099541dcc61790703c6271c" dependencies = [ "ark-bn254", "ark-ec", @@ -3311,7 +3450,7 @@ dependencies = [ "console_log", "curve25519-dalek", "getrandom 0.2.10", - "itertools", + "itertools 0.10.5", "js-sys", "lazy_static", "libc", @@ -3332,9 +3471,62 @@ dependencies = [ "serde_json", "sha2 0.10.8", "sha3 0.10.8", - "solana-frozen-abi", - "solana-frozen-abi-macro", - "solana-sdk-macro", + "solana-frozen-abi 1.16.18", + "solana-frozen-abi-macro 1.16.18", + "solana-sdk-macro 1.16.18", + "thiserror", + "tiny-bip39", + "wasm-bindgen", + "zeroize", +] + +[[package]] +name = "solana-program" +version = "1.18.0" +source = "git+https://github.com/blockworks-foundation/solana.git?branch=geyser_send_transaction_results_master#17079124dc869274470e4688cd1e18d9669cb549" +dependencies = [ + "ark-bn254", + "ark-ec", + "ark-ff", + "ark-serialize", + "base64 0.21.4", + "bincode", + "bitflags 2.4.1", + "blake3", + "borsh 0.10.3", + "borsh 0.9.3", + "bs58", + "bv", + "bytemuck", + "cc", + "console_error_panic_hook", + "console_log", + "curve25519-dalek", + "getrandom 0.2.10", + "itertools 0.10.5", + "js-sys", + "lazy_static", + "libc", + "libsecp256k1", + "light-poseidon", + "log", + "memoffset", + "num-bigint 0.4.4", + "num-derive 0.4.1", + "num-traits", + "parking_lot", + "rand 0.8.5", + "rustc_version", + "rustversion", + "serde", + "serde_bytes", + "serde_derive", + "serde_json", + "sha2 0.10.8", + "sha3 0.10.8", + "solana-frozen-abi 1.18.0", + "solana-frozen-abi-macro 1.18.0", + "solana-sdk-macro 1.18.0", "thiserror", "tiny-bip39", "wasm-bindgen", @@ -3343,15 +3535,15 @@ dependencies = [ [[package]] name = "solana-program-runtime" -version = "1.16.17" +version = "1.16.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "036d6ecf67a3a7c6dc74d4f7fa6ab321e7ce8feccb7c9dff8384a41d0a12345b" +checksum = "eb7d1b8df43a93c410456be7d41c0dca9e2c460530a075243a98f556391d2bf9" dependencies = [ "base64 0.21.4", "bincode", "eager", "enum-iterator", - "itertools", + "itertools 0.10.5", "libc", "log", "num-derive 0.3.3", @@ -3360,20 +3552,47 @@ dependencies = [ "rand 0.7.3", "rustc_version", "serde", - "solana-frozen-abi", - "solana-frozen-abi-macro", - "solana-measure", - "solana-metrics", - "solana-sdk", - "solana_rbpf", + "solana-frozen-abi 1.16.18", + "solana-frozen-abi-macro 1.16.18", + "solana-measure 1.16.18", + "solana-metrics 1.16.18", + "solana-sdk 1.16.18", + "solana_rbpf 0.6.1", + "thiserror", +] + +[[package]] +name = "solana-program-runtime" +version = "1.18.0" +source = "git+https://github.com/blockworks-foundation/solana.git?branch=geyser_send_transaction_results_master#17079124dc869274470e4688cd1e18d9669cb549" +dependencies = [ + "base64 0.21.4", + "bincode", + "eager", + "enum-iterator", + "itertools 0.10.5", + "libc", + "log", + "num-derive 0.4.1", + "num-traits", + "percentage", + "rand 0.8.5", + "rustc_version", + "serde", + "solana-frozen-abi 1.18.0", + "solana-frozen-abi-macro 1.18.0", + "solana-measure 1.18.0", + "solana-metrics 1.18.0", + "solana-sdk 1.18.0", + "solana_rbpf 0.8.0", "thiserror", ] [[package]] name = "solana-rpc-client" -version = "1.16.17" +version = "1.16.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc51a85c6ff03bb4a3e1fde1e36dcb553b990f2b3e66aed941a31a6a7c20fa33" +checksum = "1301ef82a9e87afb28bfccab1b3ebf8f10d6d2ee42c5b1d793ab989d70f83e27" dependencies = [ "async-trait", "base64 0.21.4", @@ -3386,10 +3605,10 @@ dependencies = [ "serde", "serde_derive", "serde_json", - "solana-account-decoder", + "solana-account-decoder 1.16.18", "solana-rpc-client-api", - "solana-sdk", - "solana-transaction-status", + "solana-sdk 1.16.18", + "solana-transaction-status 1.16.18", "solana-version", "solana-vote-program", "tokio", @@ -3397,9 +3616,9 @@ dependencies = [ [[package]] name = "solana-rpc-client-api" -version = "1.16.17" +version = "1.16.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6756a1f89f509154644a958869c7cc6c70cc622f44faddf9b94612d8d2d8eed5" +checksum = "9ffdfe666315851d1a5c3d426a688dccfd2af19b46667140ea59b9ddf3988038" dependencies = [ "base64 0.21.4", "bs58", @@ -3409,9 +3628,9 @@ dependencies = [ "serde", "serde_derive", "serde_json", - "solana-account-decoder", - "solana-sdk", - "solana-transaction-status", + "solana-account-decoder 1.16.18", + "solana-sdk 1.16.18", + "solana-transaction-status 1.16.18", "solana-version", "spl-token-2022", "thiserror", @@ -3419,9 +3638,9 @@ dependencies = [ [[package]] name = "solana-sdk" -version = "1.16.17" +version = "1.16.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4106cda3d10833ba957dbd25fb841b50aeca7480ccf8f54859294716f54bcd4b" +checksum = "051b93dc7737a7fb530c1e74f135a652bb69f5554c8804b2ebf55d6fb6a30f26" dependencies = [ "assert_matches", "base64 0.21.4", @@ -3438,7 +3657,7 @@ dependencies = [ "ed25519-dalek-bip32", "generic-array", "hmac 0.12.1", - "itertools", + "itertools 0.10.5", "js-sys", "lazy_static", "libsecp256k1", @@ -3460,11 +3679,64 @@ dependencies = [ "serde_with", "sha2 0.10.8", "sha3 0.10.8", - "solana-frozen-abi", - "solana-frozen-abi-macro", - "solana-logger", - "solana-program", - "solana-sdk-macro", + "solana-frozen-abi 1.16.18", + "solana-frozen-abi-macro 1.16.18", + "solana-logger 1.16.18", + "solana-program 1.16.18", + "solana-sdk-macro 1.16.18", + "thiserror", + "uriparse", + "wasm-bindgen", +] + +[[package]] +name = "solana-sdk" +version = "1.18.0" +source = "git+https://github.com/blockworks-foundation/solana.git?branch=geyser_send_transaction_results_master#17079124dc869274470e4688cd1e18d9669cb549" +dependencies = [ + "assert_matches", + "base64 0.21.4", + "bincode", + "bitflags 2.4.1", + "borsh 0.10.3", + "bs58", + "bytemuck", + "byteorder", + "chrono", + "derivation-path", + "digest 0.10.7", + "ed25519-dalek", + "ed25519-dalek-bip32", + "generic-array", + "hmac 0.12.1", + "itertools 0.10.5", + "js-sys", + "lazy_static", + "libsecp256k1", + "log", + "memmap2", + "num-derive 0.4.1", + "num-traits", + "num_enum 0.7.0", + "pbkdf2 0.11.0", + "qstring", + "qualifier_attr", + "rand 0.7.3", + "rand 0.8.5", + "rustc_version", + "rustversion", + "serde", + "serde_bytes", + "serde_derive", + "serde_json", + "serde_with", + "sha2 0.10.8", + "sha3 0.10.8", + "solana-frozen-abi 1.18.0", + "solana-frozen-abi-macro 1.18.0", + "solana-logger 1.18.0", + "solana-program 1.18.0", + "solana-sdk-macro 1.18.0", "thiserror", "uriparse", "wasm-bindgen", @@ -3472,9 +3744,21 @@ dependencies = [ [[package]] name = "solana-sdk-macro" -version = "1.16.17" +version = "1.16.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e560806a3859717eb2220b26e2cd68bb757b63affa3e79c3f1d8d853b5ee78f" +checksum = "a1fae2d1f62d655f88280a39711db401973d1bbe54fec9f795be80b9d76837ae" +dependencies = [ + "bs58", + "proc-macro2", + "quote", + "rustversion", + "syn 2.0.38", +] + +[[package]] +name = "solana-sdk-macro" +version = "1.18.0" +source = "git+https://github.com/blockworks-foundation/solana.git?branch=geyser_send_transaction_results_master#17079124dc869274470e4688cd1e18d9669cb549" dependencies = [ "bs58", "proc-macro2", @@ -3485,9 +3769,9 @@ dependencies = [ [[package]] name = "solana-transaction-status" -version = "1.16.17" +version = "1.16.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "236dd4e43b8a7402bce250228e04c0c68d9493a3e19c71b377ccc7c4390fd969" +checksum = "bdad82a1e22d7c3fc1e009eeec4e8841697f6cce1902b7a1d5b73baf2bcca2e5" dependencies = [ "Inflector", "base64 0.21.4", @@ -3499,9 +3783,33 @@ dependencies = [ "serde", "serde_derive", "serde_json", - "solana-account-decoder", + "solana-account-decoder 1.16.18", "solana-address-lookup-table-program", - "solana-sdk", + "solana-sdk 1.16.18", + "spl-associated-token-account", + "spl-memo", + "spl-token", + "spl-token-2022", + "thiserror", +] + +[[package]] +name = "solana-transaction-status" +version = "1.18.0" +source = "git+https://github.com/blockworks-foundation/solana.git?branch=geyser_send_transaction_results_master#17079124dc869274470e4688cd1e18d9669cb549" +dependencies = [ + "Inflector", + "base64 0.21.4", + "bincode", + "borsh 0.10.3", + "bs58", + "lazy_static", + "log", + "serde", + "serde_derive", + "serde_json", + "solana-account-decoder 1.18.0", + "solana-sdk 1.18.0", "spl-associated-token-account", "spl-memo", "spl-token", @@ -3511,25 +3819,25 @@ dependencies = [ [[package]] name = "solana-version" -version = "1.16.17" +version = "1.16.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62847d7ef409e3b410f65e726bf7816d8f8d0330918e78537e940bdf1ca061ae" +checksum = "de7e99eb16bdc91861829bf0a6e361dd87ab898673b3708ebacf4ba27ca4d242" dependencies = [ "log", "rustc_version", "semver", "serde", "serde_derive", - "solana-frozen-abi", - "solana-frozen-abi-macro", - "solana-sdk", + "solana-frozen-abi 1.16.18", + "solana-frozen-abi-macro 1.16.18", + "solana-sdk 1.16.18", ] [[package]] name = "solana-vote-program" -version = "1.16.17" +version = "1.16.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb0c3e5ee7bd03b249c6b80eead5620af62bc7ef1af8ea4f499b8054b00e9c7d" +checksum = "22b1a3a2d9807a4141f0a550fdb3fa61a4aac4b4e7ea31694739509a43b9fa23" dependencies = [ "bincode", "log", @@ -3538,20 +3846,20 @@ dependencies = [ "rustc_version", "serde", "serde_derive", - "solana-frozen-abi", - "solana-frozen-abi-macro", - "solana-metrics", - "solana-program", - "solana-program-runtime", - "solana-sdk", + "solana-frozen-abi 1.16.18", + "solana-frozen-abi-macro 1.16.18", + "solana-metrics 1.16.18", + "solana-program 1.16.18", + "solana-program-runtime 1.16.18", + "solana-sdk 1.16.18", "thiserror", ] [[package]] name = "solana-zk-token-sdk" -version = "1.16.17" +version = "1.16.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "278c08e13bc04b6940997602909052524a375154b00cf0bfa934359a3bb7e6f0" +checksum = "ad3cc2b931a39510b1c90dc876a93ae315b9712a8338296e4b60519d09e57be9" dependencies = [ "aes-gcm-siv", "base64 0.21.4", @@ -3560,7 +3868,7 @@ dependencies = [ "byteorder", "curve25519-dalek", "getrandom 0.1.16", - "itertools", + "itertools 0.10.5", "lazy_static", "merlin", "num-derive 0.3.3", @@ -3569,8 +3877,8 @@ dependencies = [ "serde", "serde_json", "sha3 0.9.1", - "solana-program", - "solana-sdk", + "solana-program 1.16.18", + "solana-sdk 1.16.18", "subtle", "thiserror", "zeroize", @@ -3595,6 +3903,25 @@ dependencies = [ "winapi", ] +[[package]] +name = "solana_rbpf" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d457cc2ba742c120492a64b7fa60e22c575e891f6b55039f4d736568fb112a3" +dependencies = [ + "byteorder", + "combine", + "goblin", + "hash32", + "libc", + "log", + "rand 0.8.5", + "rustc-demangle", + "scroll", + "thiserror", + "winapi", +] + [[package]] name = "spin" version = "0.5.2" @@ -3617,7 +3944,7 @@ dependencies = [ "borsh 0.10.3", "num-derive 0.4.1", "num-traits", - "solana-program", + "solana-program 1.16.18", "spl-token", "spl-token-2022", "thiserror", @@ -3630,7 +3957,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cce5d563b58ef1bb2cdbbfe0dfb9ffdc24903b10ae6a4df2d8f425ece375033f" dependencies = [ "bytemuck", - "solana-program", + "solana-program 1.16.18", "spl-discriminator-derive", ] @@ -3664,7 +3991,7 @@ version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0f180b03318c3dbab3ef4e1e4d46d5211ae3c780940dd0a28695aba4b59a75a" dependencies = [ - "solana-program", + "solana-program 1.16.18", ] [[package]] @@ -3675,7 +4002,7 @@ checksum = "2881dddfca792737c0706fa0175345ab282b1b0879c7d877bad129645737c079" dependencies = [ "borsh 0.10.3", "bytemuck", - "solana-program", + "solana-program 1.16.18", "solana-zk-token-sdk", "spl-program-error", ] @@ -3688,7 +4015,7 @@ checksum = "249e0318493b6bcf27ae9902600566c689b7dfba9f1bdff5893e92253374e78c" dependencies = [ "num-derive 0.4.1", "num-traits", - "solana-program", + "solana-program 1.16.18", "spl-program-error-derive", "thiserror", ] @@ -3712,7 +4039,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "062e148d3eab7b165582757453632ffeef490c02c86a48bfdb4988f63eefb3b9" dependencies = [ "bytemuck", - "solana-program", + "solana-program 1.16.18", "spl-discriminator", "spl-pod", "spl-program-error", @@ -3730,7 +4057,7 @@ dependencies = [ "num-derive 0.3.3", "num-traits", "num_enum 0.6.1", - "solana-program", + "solana-program 1.16.18", "thiserror", ] @@ -3745,7 +4072,7 @@ dependencies = [ "num-derive 0.4.1", "num-traits", "num_enum 0.7.0", - "solana-program", + "solana-program 1.16.18", "solana-zk-token-sdk", "spl-memo", "spl-pod", @@ -3763,7 +4090,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c16ce3ba6979645fb7627aa1e435576172dd63088dc7848cb09aa331fa1fe4f" dependencies = [ "borsh 0.10.3", - "solana-program", + "solana-program 1.16.18", "spl-discriminator", "spl-pod", "spl-program-error", @@ -3778,7 +4105,7 @@ checksum = "051d31803f873cabe71aec3c1b849f35248beae5d19a347d93a5c9cccc5d5a9b" dependencies = [ "arrayref", "bytemuck", - "solana-program", + "solana-program 1.16.18", "spl-discriminator", "spl-pod", "spl-program-error", @@ -3793,7 +4120,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a468e6f6371f9c69aae760186ea9f1a01c2908351b06a5e0026d21cfc4d7ecac" dependencies = [ "bytemuck", - "solana-program", + "solana-program 1.16.18", "spl-discriminator", "spl-pod", "spl-program-error", @@ -3961,7 +4288,7 @@ dependencies = [ "parking_lot", "pin-project-lite", "signal-hook-registry", - "socket2 0.5.4", + "socket2 0.5.5", "tokio-macros", "windows-sys 0.48.0", ] @@ -4017,7 +4344,7 @@ dependencies = [ "postgres-protocol", "postgres-types", "rand 0.8.5", - "socket2 0.5.4", + "socket2 0.5.5", "tokio", "tokio-util", "whoami", @@ -4086,9 +4413,9 @@ dependencies = [ [[package]] name = "tonic" -version = "0.9.2" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3082666a3a6433f7f511c7192923fa1fe07c69332d3c6a2e6bb040b569199d5a" +checksum = "d560933a0de61cf715926b9cac824d4c883c2c43142f787595e48280c40a1d0e" dependencies = [ "async-stream", "async-trait", @@ -4096,8 +4423,6 @@ dependencies = [ "base64 0.21.4", "bytes", "flate2", - "futures-core", - "futures-util", "h2", "http", "http-body", @@ -4106,6 +4431,7 @@ dependencies = [ "percent-encoding", "pin-project", "prost", + "rustls 0.21.7", "rustls-native-certs", "rustls-pemfile", "tokio", @@ -4119,22 +4445,22 @@ dependencies = [ [[package]] name = "tonic-build" -version = "0.9.2" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6fdaae4c2c638bb70fe42803a26fbd6fc6ac8c72f5c59f67ecc2a2dcabf4b07" +checksum = "9d021fc044c18582b9a2408cd0dd05b1596e3ecdb5c4df822bb0183545683889" dependencies = [ "prettyplease", "proc-macro2", "prost-build", "quote", - "syn 1.0.109", + "syn 2.0.38", ] [[package]] name = "tonic-health" -version = "0.9.2" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "080964d45894b90273d2b1dd755fdd114560db8636bb41cea615213c45043c4d" +checksum = "f80db390246dfb46553481f6024f0082ba00178ea495dbb99e70ba9a4fafb5e1" dependencies = [ "async-stream", "prost", @@ -4649,8 +4975,8 @@ dependencies = [ [[package]] name = "yellowstone-grpc-client" -version = "1.9.0+solana.1.16.13" -source = "git+https://github.com/blockworks-foundation/yellowstone-grpc.git?branch=geyser_get_banking_transaction_results#5982a25c9cc791ee1da28c306ba630fe2fb74d7d" +version = "1.11.1+solana.1.17.1" +source = "git+https://github.com/blockworks-foundation/yellowstone-grpc.git?branch=geyser_get_banking_transaction_results_master#06f06ee7579394bf59eaaad3e36bb6a842472950" dependencies = [ "bytes", "futures", @@ -4663,16 +4989,40 @@ dependencies = [ [[package]] name = "yellowstone-grpc-proto" -version = "1.9.0+solana.1.16.13" -source = "git+https://github.com/blockworks-foundation/yellowstone-grpc.git?branch=geyser_get_banking_transaction_results#5982a25c9cc791ee1da28c306ba630fe2fb74d7d" +version = "1.10.0+solana.1.17.1" +source = "git+https://github.com/blockworks-foundation/yellowstone-grpc.git?branch=geyser_get_banking_transaction_results_master#06f06ee7579394bf59eaaad3e36bb6a842472950" dependencies = [ "anyhow", + "bincode", "prost", "protobuf-src", + "solana-account-decoder 1.18.0", + "solana-sdk 1.18.0", + "solana-transaction-status 1.18.0", "tonic", "tonic-build", ] +[[package]] +name = "zerocopy" +version = "0.7.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c19fae0c8a9efc6a8281f2e623db8af1db9e57852e04cde3e754dd2dc29340f" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc56589e9ddd1f1c28d4b4b5c773ce232910a6bb67a70133d61c9e347585efe9" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + [[package]] name = "zeroize" version = "1.3.0" diff --git a/Cargo.toml b/Cargo.toml index 2137b19..89844f5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -33,5 +33,5 @@ tokio-postgres = { version = "0.7.10", features = ["with-chrono-0_4"] } rustls = { version = "=0.20.8", default-features = false } tokio = { version = "1.32.0", features = ["rt-multi-thread", "macros", "time"] } -yellowstone-grpc-client = {git = "https://github.com/blockworks-foundation/yellowstone-grpc.git", branch = "geyser_get_banking_transaction_results"} -yellowstone-grpc-proto = {git = "https://github.com/blockworks-foundation/yellowstone-grpc.git", branch = "geyser_get_banking_transaction_results"} \ No newline at end of file +yellowstone-grpc-client = {git = "https://github.com/blockworks-foundation/yellowstone-grpc.git", branch = "geyser_get_banking_transaction_results_master"} +yellowstone-grpc-proto = {git = "https://github.com/blockworks-foundation/yellowstone-grpc.git", branch = "geyser_get_banking_transaction_results_master"} \ No newline at end of file diff --git a/src/main.rs b/src/main.rs index 822b508..33c04aa 100644 --- a/src/main.rs +++ b/src/main.rs @@ -68,6 +68,7 @@ async fn main() { match update { UpdateOneof::BankingTransactionErrors(transaction) => { + log::info!("got banking stage transaction erros"); if transaction.error.is_none() { continue; } @@ -84,6 +85,7 @@ async fn main() { } } UpdateOneof::Block(block) => { + log::info!("got block"); slot.store(block.slot, std::sync::atomic::Ordering::Relaxed); for transaction in &block.transactions { let Some(tx) = &transaction.transaction else {