diff --git a/Cargo.lock b/Cargo.lock index f468727..a9188de 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -12,6 +12,15 @@ dependencies = [ "regex", ] +[[package]] +name = "addr2line" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +dependencies = [ + "gimli", +] + [[package]] name = "adler" version = "1.0.2" @@ -34,7 +43,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8" dependencies = [ "cfg-if", - "cipher 0.3.0", + "cipher", "cpufeatures", "opaque-debug", ] @@ -47,7 +56,7 @@ checksum = "589c637f0e68c877bbd59a4599bbe849cac8e5f3e4b5a3ebae8f528cd218dcdc" dependencies = [ "aead", "aes", - "cipher 0.3.0", + "cipher", "ctr", "polyval", "subtle", @@ -60,7 +69,19 @@ version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" dependencies = [ - "getrandom 0.2.9", + "getrandom 0.2.10", + "once_cell", + "version_check", +] + +[[package]] +name = "ahash" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" +dependencies = [ + "cfg-if", + "getrandom 0.2.10", "once_cell", "version_check", ] @@ -90,169 +111,196 @@ dependencies = [ ] [[package]] -name = "anchor-attribute-access-control" -version = "0.24.2" -source = "git+https://github.com/jito-foundation/jito-solana.git?tag=v1.14.17-jito#dc940579be6079352b97b24454ad370d3bd5cc4e" +name = "allocator-api2" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" + +[[package]] +name = "android-tzdata" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" + +[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" dependencies = [ - "anchor-syn", - "anyhow", - "proc-macro2", - "quote", - "regex", - "syn 1.0.109", + "libc", ] [[package]] -name = "anchor-attribute-account" -version = "0.24.2" -source = "git+https://github.com/jito-foundation/jito-solana.git?tag=v1.14.17-jito#dc940579be6079352b97b24454ad370d3bd5cc4e" +name = "anstream" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44" dependencies = [ - "anchor-syn", - "anyhow", - "bs58 0.4.0", - "proc-macro2", - "quote", - "rustversion", - "syn 1.0.109", + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "utf8parse", ] [[package]] -name = "anchor-attribute-constant" -version = "0.24.2" -source = "git+https://github.com/jito-foundation/jito-solana.git?tag=v1.14.17-jito#dc940579be6079352b97b24454ad370d3bd5cc4e" +name = "anstyle" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" + +[[package]] +name = "anstyle-parse" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "317b9a89c1868f5ea6ff1d9539a69f45dffc21ce321ac1fd1160dfa48c8e2140" dependencies = [ - "anchor-syn", - "proc-macro2", - "syn 1.0.109", + "utf8parse", ] [[package]] -name = "anchor-attribute-error" -version = "0.24.2" -source = "git+https://github.com/jito-foundation/jito-solana.git?tag=v1.14.17-jito#dc940579be6079352b97b24454ad370d3bd5cc4e" +name = "anstyle-query" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" dependencies = [ - "anchor-syn", - "proc-macro2", - "quote", - "syn 1.0.109", + "windows-sys 0.48.0", ] [[package]] -name = "anchor-attribute-event" -version = "0.24.2" -source = "git+https://github.com/jito-foundation/jito-solana.git?tag=v1.14.17-jito#dc940579be6079352b97b24454ad370d3bd5cc4e" +name = "anstyle-wincon" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628" dependencies = [ - "anchor-syn", - "anyhow", - "proc-macro2", - "quote", - "syn 1.0.109", + "anstyle", + "windows-sys 0.48.0", +] + +[[package]] +name = "anyhow" +version = "1.0.71" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8" + +[[package]] +name = "ark-bn254" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a22f4561524cd949590d78d7d4c5df8f592430d221f7f3c9497bbafd8972120f" +dependencies = [ + "ark-ec", + "ark-ff", + "ark-std", ] [[package]] -name = "anchor-attribute-interface" -version = "0.24.2" -source = "git+https://github.com/jito-foundation/jito-solana.git?tag=v1.14.17-jito#dc940579be6079352b97b24454ad370d3bd5cc4e" +name = "ark-ec" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "defd9a439d56ac24968cca0571f598a61bc8c55f71d50a89cda591cb750670ba" dependencies = [ - "anchor-syn", - "anyhow", - "heck 0.3.3", - "proc-macro2", - "quote", - "syn 1.0.109", + "ark-ff", + "ark-poly", + "ark-serialize", + "ark-std", + "derivative", + "hashbrown 0.13.2", + "itertools", + "num-traits", + "zeroize", ] [[package]] -name = "anchor-attribute-program" -version = "0.24.2" -source = "git+https://github.com/jito-foundation/jito-solana.git?tag=v1.14.17-jito#dc940579be6079352b97b24454ad370d3bd5cc4e" +name = "ark-ff" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec847af850f44ad29048935519032c33da8aa03340876d351dfab5660d2966ba" dependencies = [ - "anchor-syn", - "anyhow", - "proc-macro2", - "quote", - "syn 1.0.109", + "ark-ff-asm", + "ark-ff-macros", + "ark-serialize", + "ark-std", + "derivative", + "digest 0.10.7", + "itertools", + "num-bigint 0.4.4", + "num-traits", + "paste", + "rustc_version", + "zeroize", ] [[package]] -name = "anchor-attribute-state" -version = "0.24.2" -source = "git+https://github.com/jito-foundation/jito-solana.git?tag=v1.14.17-jito#dc940579be6079352b97b24454ad370d3bd5cc4e" +name = "ark-ff-asm" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ed4aa4fe255d0bc6d79373f7e31d2ea147bcf486cba1be5ba7ea85abdb92348" dependencies = [ - "anchor-syn", - "anyhow", - "proc-macro2", "quote", "syn 1.0.109", ] [[package]] -name = "anchor-derive-accounts" -version = "0.24.2" -source = "git+https://github.com/jito-foundation/jito-solana.git?tag=v1.14.17-jito#dc940579be6079352b97b24454ad370d3bd5cc4e" +name = "ark-ff-macros" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7abe79b0e4288889c4574159ab790824d0033b9fdcb2a112a3182fac2e514565" dependencies = [ - "anchor-syn", - "anyhow", + "num-bigint 0.4.4", + "num-traits", "proc-macro2", "quote", "syn 1.0.109", ] [[package]] -name = "anchor-lang" -version = "0.24.2" -source = "git+https://github.com/jito-foundation/jito-solana.git?tag=v1.14.17-jito#dc940579be6079352b97b24454ad370d3bd5cc4e" +name = "ark-poly" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d320bfc44ee185d899ccbadfa8bc31aab923ce1558716e1997a1e74057fe86bf" dependencies = [ - "anchor-attribute-access-control", - "anchor-attribute-account", - "anchor-attribute-constant", - "anchor-attribute-error", - "anchor-attribute-event", - "anchor-attribute-interface", - "anchor-attribute-program", - "anchor-attribute-state", - "anchor-derive-accounts", - "arrayref", - "base64 0.13.1", - "bincode", - "borsh", - "bytemuck", - "solana-program 1.14.17 (git+https://github.com/jito-foundation/jito-solana.git?tag=v1.14.17-jito)", - "thiserror", + "ark-ff", + "ark-serialize", + "ark-std", + "derivative", + "hashbrown 0.13.2", ] [[package]] -name = "anchor-syn" -version = "0.24.2" -source = "git+https://github.com/jito-foundation/jito-solana.git?tag=v1.14.17-jito#dc940579be6079352b97b24454ad370d3bd5cc4e" +name = "ark-serialize" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adb7b85a02b83d2f22f89bd5cac66c9c89474240cb6207cb1efc16d098e822a5" dependencies = [ - "anyhow", - "bs58 0.3.1", - "heck 0.3.3", - "proc-macro2", - "proc-macro2-diagnostics", - "quote", - "serde", - "serde_json", - "sha2 0.9.9", - "syn 1.0.109", - "thiserror", + "ark-serialize-derive", + "ark-std", + "digest 0.10.7", + "num-bigint 0.4.4", ] [[package]] -name = "android_system_properties" -version = "0.1.5" +name = "ark-serialize-derive" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +checksum = "ae3281bc6d0fd7e549af32b52511e1302185bd688fd3359fa36423346ff682ea" dependencies = [ - "libc", + "proc-macro2", + "quote", + "syn 1.0.109", ] [[package]] -name = "anyhow" -version = "1.0.71" +name = "ark-std" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8" +checksum = "94893f1e0c6eeab764ade8dc4c0db24caf4fe7cbbaafc0eba0a9030f447b5185" +dependencies = [ + "num-traits", + "rand 0.8.5", +] [[package]] name = "arrayref" @@ -262,9 +310,15 @@ checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" [[package]] name = "arrayvec" -version = "0.7.2" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" +checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" + +[[package]] +name = "ascii" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eab1c04a571841102f5345a8fc0f6bb3d31c315dec879b5c6e42e40ce7ffa34e" [[package]] name = "assert_matches" @@ -274,9 +328,9 @@ checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9" [[package]] name = "async-compression" -version = "0.3.15" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "942c7cd7ae39e91bde4820d74132e9862e62c2f386c3aa90ccf55949f5bad63a" +checksum = "bb42b2197bf15ccb092b62c74515dbd8b86d0effd934795f6687c93b6e679a2c" dependencies = [ "brotli", "flate2", @@ -305,7 +359,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.38", ] [[package]] @@ -316,7 +370,7 @@ checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.38", ] [[package]] @@ -344,7 +398,7 @@ checksum = "f8175979259124331c1d7bf6586ee7e0da434155e4b2d48ec2c8386281d8df39" dependencies = [ "async-trait", "axum-core", - "bitflags", + "bitflags 1.3.2", "bytes", "futures-util", "http", @@ -382,22 +436,31 @@ dependencies = [ ] [[package]] -name = "base64" -version = "0.12.3" +name = "backtrace" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff" +checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] [[package]] name = "base64" -version = "0.13.1" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" +checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff" [[package]] name = "base64" -version = "0.21.0" +version = "0.21.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a" +checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2" [[package]] name = "bincode" @@ -414,6 +477,15 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +[[package]] +name = "bitflags" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" +dependencies = [ + "serde", +] + [[package]] name = "bitmaps" version = "2.1.0" @@ -425,16 +497,16 @@ dependencies = [ [[package]] name = "blake3" -version = "1.3.3" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42ae2468a89544a466886840aa467a25b766499f4f04bf7d9fcd10ecee9fccef" +checksum = "0231f06152bf547e9c2b5194f247cd97aacf6dcd8b15d8e5ec0663f64580da87" dependencies = [ "arrayref", "arrayvec", "cc", "cfg-if", "constant_time_eq", - "digest 0.10.6", + "digest 0.10.7", ] [[package]] @@ -468,18 +540,41 @@ version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "15bf3650200d8bffa99015595e10f1fbd17de07abbc25bb067da79e769939bfa" dependencies = [ - "borsh-derive", + "borsh-derive 0.9.3", "hashbrown 0.11.2", ] +[[package]] +name = "borsh" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4114279215a005bc675e386011e594e1d9b800918cea18fcadadcce864a2046b" +dependencies = [ + "borsh-derive 0.10.3", + "hashbrown 0.13.2", +] + [[package]] name = "borsh-derive" version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6441c552f230375d18e3cc377677914d2ca2b0d36e52129fe15450a2dce46775" dependencies = [ - "borsh-derive-internal", - "borsh-schema-derive-internal", + "borsh-derive-internal 0.9.3", + "borsh-schema-derive-internal 0.9.3", + "proc-macro-crate 0.1.5", + "proc-macro2", + "syn 1.0.109", +] + +[[package]] +name = "borsh-derive" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0754613691538d51f329cce9af41d7b7ca150bc973056f1156611489475f54f7" +dependencies = [ + "borsh-derive-internal 0.10.3", + "borsh-schema-derive-internal 0.10.3", "proc-macro-crate 0.1.5", "proc-macro2", "syn 1.0.109", @@ -496,6 +591,17 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "borsh-derive-internal" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "afb438156919598d2c7bad7e1c0adf3d26ed3840dbc010db1a882a65583ca2fb" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + [[package]] name = "borsh-schema-derive-internal" version = "0.9.3" @@ -507,6 +613,17 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "borsh-schema-derive-internal" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "634205cc43f74a1b9046ef87c4540ebda95696ec0f315024860cad7c5b0f5ccd" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + [[package]] name = "brotli" version = "3.3.4" @@ -530,15 +647,18 @@ dependencies = [ [[package]] name = "bs58" -version = "0.3.1" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "476e9cd489f9e121e02ffa6014a8ef220ecb15c05ed23fc34cca13925dc283fb" +checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3" [[package]] name = "bs58" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3" +checksum = "f5353f36341f7451062466f0b755b96ac3a9547e4d7f6b70d603fc721a7d7896" +dependencies = [ + "tinyvec", +] [[package]] name = "bumpalo" @@ -558,9 +678,9 @@ dependencies = [ [[package]] name = "bytemuck" -version = "1.13.1" +version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea" +checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" dependencies = [ "bytemuck_derive", ] @@ -573,7 +693,7 @@ checksum = "fdde5c9cd29ebd706ce1b35600920a33550e402fc998a2e53ad3b42c3c47a192" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.38", ] [[package]] @@ -590,11 +710,12 @@ checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" [[package]] name = "cc" -version = "1.0.79" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" dependencies = [ "jobserver", + "libc", ] [[package]] @@ -605,18 +726,17 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.24" +version = "0.4.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e3c5919066adf22df73762e50cffcde3a758f2a848b113b586d1f86728b673b" +checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" dependencies = [ + "android-tzdata", "iana-time-zone", "js-sys", - "num-integer", "num-traits", "serde", - "time", "wasm-bindgen", - "winapi", + "windows-targets 0.48.0", ] [[package]] @@ -629,50 +749,62 @@ dependencies = [ ] [[package]] -name = "cipher" -version = "0.4.4" +name = "clap" +version = "4.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" +checksum = "d04704f56c2cde07f43e8e2c154b43f216dc5c92fc98ada720177362f953b956" dependencies = [ - "crypto-common", - "inout", + "clap_builder", + "clap_derive", ] [[package]] -name = "clap" -version = "4.0.32" +name = "clap_builder" +version = "4.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7db700bc935f9e43e88d00b0850dae18a63773cfbec6d8e070fccf7fef89a39" +checksum = "0e231faeaca65ebd1ea3c737966bf858971cd38c3849107aa3ea7de90a804e45" dependencies = [ - "bitflags", - "clap_derive", + "anstream", + "anstyle", "clap_lex", - "is-terminal", - "once_cell", "strsim", - "termcolor", ] [[package]] name = "clap_derive" -version = "4.0.21" +version = "4.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0177313f9f02afc995627906bbd8967e2be069f5261954222dac78290c2b9014" +checksum = "0862016ff20d69b84ef8247369fabf5c008a7417002411897d40ee1f4532b873" dependencies = [ - "heck 0.4.1", - "proc-macro-error", + "heck", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.38", ] [[package]] name = "clap_lex" -version = "0.3.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d4198f73e42b4936b35b5bb248d81d2b595ecb170da0bac7655c54eedfa8da8" +checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961" + +[[package]] +name = "colorchoice" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" + +[[package]] +name = "combine" +version = "3.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da3da6baa321ec19e1cc41d31bf599f00c783d0517095cdaf0332e3fe8d20680" dependencies = [ - "os_str_bytes", + "ascii", + "byteorder", + "either", + "memchr", + "unreachable", ] [[package]] @@ -697,9 +829,9 @@ dependencies = [ [[package]] name = "constant_time_eq" -version = "0.2.5" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13418e745008f7349ec7e449155f419a61b92b58a99cc3616942b926825ec76b" +checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" [[package]] name = "core-foundation" @@ -810,7 +942,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "049bb91fb4aaf0e3c7efa6cd5ef877dbbbd15b39dad06d9948de4ec8a75761ea" dependencies = [ - "cipher 0.3.0", + "cipher", ] [[package]] @@ -828,35 +960,81 @@ dependencies = [ ] [[package]] -name = "derivation-path" -version = "0.2.0" +name = "darling" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e5c37193a1db1d8ed868c03ec7b152175f26160a5b740e5e484143877e0adf0" +checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e" +dependencies = [ + "darling_core", + "darling_macro", +] [[package]] -name = "digest" -version = "0.9.0" +name = "darling_core" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" +checksum = "177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621" dependencies = [ - "generic-array", + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim", + "syn 2.0.38", ] [[package]] -name = "digest" -version = "0.10.6" +name = "darling_macro" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" +checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" dependencies = [ - "block-buffer 0.10.4", - "crypto-common", - "subtle", + "darling_core", + "quote", + "syn 2.0.38", ] [[package]] -name = "eager" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" +name = "derivation-path" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e5c37193a1db1d8ed868c03ec7b152175f26160a5b740e5e484143877e0adf0" + +[[package]] +name = "derivative" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "digest" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" +dependencies = [ + "generic-array", +] + +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer 0.10.4", + "crypto-common", + "subtle", +] + +[[package]] +name = "eager" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "abe71d579d1812060163dff96056261deb5bf6729b100fa2e36a68b9649ba3d3" [[package]] @@ -891,14 +1069,14 @@ dependencies = [ "derivation-path", "ed25519-dalek", "hmac 0.12.1", - "sha2 0.10.6", + "sha2 0.10.8", ] [[package]] name = "either" -version = "1.8.1" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" [[package]] name = "encoding_rs" @@ -911,29 +1089,29 @@ dependencies = [ [[package]] name = "enum-iterator" -version = "0.8.1" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2953d1df47ac0eb70086ccabf0275aa8da8591a28bd358ee2b52bd9f9e3ff9e9" +checksum = "7add3873b5dd076766ee79c8e406ad1a472c385476b9e38849f8eec24f1be689" dependencies = [ "enum-iterator-derive", ] [[package]] name = "enum-iterator-derive" -version = "0.8.1" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8958699f9359f0b04e691a13850d48b7de329138023876d07cbd024c2c820598" +checksum = "eecf8589574ce9b895052fa12d69af7a233f99e6107f5cb8dd1044f2a17bfdcb" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.38", ] [[package]] name = "env_logger" -version = "0.9.0" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b2cf0344971ee6c64c31be0d530793fba457d322dfec2810c453d0ef228f9c3" +checksum = "a12e6657c4c97ebab115a42dcee77225f7f482cdd841cf7088c657a42e9e00e7" dependencies = [ "atty", "humantime", @@ -1038,7 +1216,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.38", ] [[package]] @@ -1105,9 +1283,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.9" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4" +checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" dependencies = [ "cfg-if", "js-sys", @@ -1118,7 +1296,7 @@ dependencies = [ [[package]] name = "geyser-grpc-plugin-client" -version = "0.1.0" +version = "1.17.1" dependencies = [ "jito-geyser-protos", "log", @@ -1128,8 +1306,7 @@ dependencies = [ "rand 0.8.5", "serde", "serde_json", - "solana-sdk 1.14.17 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-sdk 1.14.17 (git+https://github.com/jito-foundation/jito-solana.git?tag=v1.14.17-jito)", + "solana-sdk", "thiserror", "tokio", "tonic", @@ -1138,9 +1315,9 @@ dependencies = [ [[package]] name = "geyser-grpc-plugin-server" -version = "0.1.0" +version = "1.17.1" dependencies = [ - "bs58 0.4.0", + "bs58 0.5.0", "crossbeam-channel", "futures-util", "jito-geyser-protos", @@ -1151,19 +1328,13 @@ dependencies = [ "serde", "serde_derive", "serde_json", - "solana-geyser-plugin-interface 1.14.17 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-geyser-plugin-interface 1.14.17 (git+https://github.com/jito-foundation/jito-solana.git?tag=v1.14.17-jito)", - "solana-logger 1.14.17 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-logger 1.14.17 (git+https://github.com/jito-foundation/jito-solana.git?tag=v1.14.17-jito)", - "solana-metrics 1.14.17 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-metrics 1.14.17 (git+https://github.com/jito-foundation/jito-solana.git?tag=v1.14.17-jito)", - "solana-program 1.14.17 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-program 1.14.17 (git+https://github.com/jito-foundation/jito-solana.git?tag=v1.14.17-jito)", - "solana-sdk 1.14.17 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-sdk 1.14.17 (git+https://github.com/jito-foundation/jito-solana.git?tag=v1.14.17-jito)", - "solana-transaction-status 1.14.17 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-vote-program 1.14.17 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-vote-program 1.14.17 (git+https://github.com/jito-foundation/jito-solana.git?tag=v1.14.17-jito)", + "solana-geyser-plugin-interface", + "solana-logger", + "solana-metrics", + "solana-program", + "solana-sdk", + "solana-transaction-status", + "solana-vote-program", "thiserror", "tokio", "tokio-stream", @@ -1172,6 +1343,23 @@ dependencies = [ "uuid", ] +[[package]] +name = "gimli" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" + +[[package]] +name = "goblin" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7666983ed0dd8d21a6f6576ee00053ca0926fb281a5522577a4dbd0f1b54143" +dependencies = [ + "log", + "plain", + "scroll", +] + [[package]] name = "h2" version = "0.3.19" @@ -1191,13 +1379,22 @@ dependencies = [ "tracing", ] +[[package]] +name = "hash32" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0c35f58762feb77d74ebe43bdbc3210f09be9fe6742234d573bacc26ed92b67" +dependencies = [ + "byteorder", +] + [[package]] name = "hashbrown" version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" dependencies = [ - "ahash", + "ahash 0.7.6", ] [[package]] @@ -1205,17 +1402,24 @@ name = "hashbrown" version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + +[[package]] +name = "hashbrown" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" dependencies = [ - "ahash", + "ahash 0.8.3", ] [[package]] -name = "heck" -version = "0.3.3" +name = "hashbrown" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" +checksum = "7dfda62a12f55daeae5015f81b0baea145391cb4520f86c248fc615d72640d12" dependencies = [ - "unicode-segmentation", + "ahash 0.8.3", + "allocator-api2", ] [[package]] @@ -1264,7 +1468,7 @@ version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" dependencies = [ - "digest 0.10.6", + "digest 0.10.7", ] [[package]] @@ -1335,7 +1539,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2", + "socket2 0.4.9", "tokio", "tower-service", "tracing", @@ -1344,15 +1548,16 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.23.2" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1788965e61b367cd03a62950836d5cd41560c3577d90e40e0819373194d1661c" +checksum = "8d78e1e73ec14cf7375674f74d7dde185c8206fd9dea6fb6295e8a98098aaa97" dependencies = [ + "futures-util", "http", "hyper", - "rustls 0.20.8", + "rustls", "tokio", - "tokio-rustls 0.23.4", + "tokio-rustls", ] [[package]] @@ -1390,6 +1595,12 @@ dependencies = [ "cc", ] +[[package]] +name = "ident_case" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + [[package]] name = "idna" version = "0.3.0" @@ -1426,15 +1637,6 @@ dependencies = [ "hashbrown 0.12.3", ] -[[package]] -name = "inout" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" -dependencies = [ - "generic-array", -] - [[package]] name = "instant" version = "0.1.12" @@ -1461,18 +1663,6 @@ version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "12b6ee2129af8d4fb011108c73d99a1b83a85977f23b82460c0ae2e25bb4b57f" -[[package]] -name = "is-terminal" -version = "0.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f" -dependencies = [ - "hermit-abi 0.3.1", - "io-lifetimes", - "rustix", - "windows-sys 0.48.0", -] - [[package]] name = "itertools" version = "0.10.5" @@ -1490,7 +1680,7 @@ checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" [[package]] name = "jito-geyser-cli" -version = "0.0.1" +version = "1.17.1" dependencies = [ "clap", "clap_lex", @@ -1498,7 +1688,7 @@ dependencies = [ "geyser-grpc-plugin-client", "jito-geyser-protos", "prost-types", - "solana-sdk 1.14.17 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-sdk", "tokio", "toml_datetime", "tonic", @@ -1507,18 +1697,15 @@ dependencies = [ [[package]] name = "jito-geyser-protos" -version = "0.0.2" +version = "1.17.1" dependencies = [ "bincode", "prost", "prost-types", "serde", - "solana-account-decoder 1.14.17 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-account-decoder 1.14.17 (git+https://github.com/jito-foundation/jito-solana.git?tag=v1.14.17-jito)", - "solana-sdk 1.14.17 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-sdk 1.14.17 (git+https://github.com/jito-foundation/jito-solana.git?tag=v1.14.17-jito)", - "solana-transaction-status 1.14.17 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-transaction-status 1.14.17 (git+https://github.com/jito-foundation/jito-solana.git?tag=v1.14.17-jito)", + "solana-account-decoder", + "solana-sdk", + "solana-transaction-status", "tonic", "tonic-build", ] @@ -1534,9 +1721,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.63" +version = "0.3.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f37a4a5928311ac501dee68b3c7613a1037d0edb30c8e5427bd832d55d1b790" +checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" dependencies = [ "wasm-bindgen", ] @@ -1558,19 +1745,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.144" +version = "0.2.149" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b00cc1c228a6782d0f076e7b232802e0c5689d41bb5df366f2a6b6621cfdfe1" - -[[package]] -name = "libloading" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" -dependencies = [ - "cfg-if", - "winapi", -] +checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" [[package]] name = "libsecp256k1" @@ -1620,6 +1797,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.3.7" @@ -1638,20 +1826,17 @@ dependencies = [ [[package]] name = "log" -version = "0.4.17" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" -dependencies = [ - "cfg-if", -] +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] name = "lru" -version = "0.8.1" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6e8aaa3f231bb4bd57b84b2d5dc3ae7f350265df8aa96492e0bc394a1571909" +checksum = "1efa59af2ddfad1854ae27d75009d538d0998b4b2fd47083e743ac1a10e46c60" dependencies = [ - "hashbrown 0.12.3", + "hashbrown 0.14.1", ] [[package]] @@ -1677,18 +1862,18 @@ dependencies = [ [[package]] name = "memoffset" -version = "0.6.5" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" +checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" dependencies = [ "autocfg", ] [[package]] name = "memoffset" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" dependencies = [ "autocfg", ] @@ -1722,24 +1907,13 @@ dependencies = [ [[package]] name = "mio" -version = "0.7.14" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8067b404fe97c70829f082dec8bcf4f71225d7eaea1d8645349cb76fa06205cc" +checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" dependencies = [ "libc", - "log", - "miow", - "ntapi", - "winapi", -] - -[[package]] -name = "miow" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21" -dependencies = [ - "winapi", + "wasi 0.11.0+wasi-snapshot-preview1", + "windows-sys 0.48.0", ] [[package]] @@ -1758,12 +1932,49 @@ dependencies = [ ] [[package]] -name = "ntapi" -version = "0.3.7" +name = "num" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c28774a7fd2fbb4f0babd8237ce554b73af68021b5f695a3cebd6c59bac0980f" +checksum = "b8536030f9fea7127f841b45bb6243b27255787fb4eb83958aa1ef9d2fdc0c36" dependencies = [ - "winapi", + "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.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" +dependencies = [ + "autocfg", + "num-integer", + "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]] @@ -1777,6 +1988,17 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "num-derive" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfb77679af88f8b125209d354a202862602672222e7f2313fdd6dc349bad4712" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + [[package]] name = "num-integer" version = "0.1.45" @@ -1787,11 +2009,34 @@ 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" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" dependencies = [ "autocfg", ] @@ -1808,48 +2053,66 @@ dependencies = [ [[package]] name = "num_enum" -version = "0.5.11" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a015b430d3c108a207fd776d2e2196aaf8b1cf8cf93253e3a097ff3085076a1" +dependencies = [ + "num_enum_derive 0.6.1", +] + +[[package]] +name = "num_enum" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9" +checksum = "70bf6736f74634d299d00086f02986875b3c2d924781a6a2cb6c201e73da0ceb" dependencies = [ - "num_enum_derive", + "num_enum_derive 0.7.0", ] [[package]] name = "num_enum_derive" -version = "0.5.11" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799" +checksum = "96667db765a921f7b295ffee8b60472b686a51d4f21c2ee4ffdb94c7013b65a6" dependencies = [ "proc-macro-crate 1.3.1", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.38", ] [[package]] -name = "once_cell" -version = "1.17.1" +name = "num_enum_derive" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" +checksum = "56ea360eafe1022f7cc56cd7b869ed57330fb2453d0c7831d99b74c65d2f5597" +dependencies = [ + "proc-macro-crate 1.3.1", + "proc-macro2", + "quote", + "syn 2.0.38", +] [[package]] -name = "opaque-debug" -version = "0.3.0" +name = "object" +version = "0.32.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" +checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" +dependencies = [ + "memchr", +] [[package]] -name = "openssl-probe" -version = "0.1.5" +name = "once_cell" +version = "1.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" +checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" [[package]] -name = "os_str_bytes" -version = "6.5.0" +name = "opaque-debug" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ceedf44fb00f2d1984b0bc98102627ce622e083e49a5bacdb3e514fa4238e267" +checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "parking_lot" @@ -1874,6 +2137,12 @@ dependencies = [ "windows-sys 0.45.0", ] +[[package]] +name = "paste" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" + [[package]] name = "pbkdf2" version = "0.4.0" @@ -1889,7 +2158,7 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917" dependencies = [ - "digest 0.10.6", + "digest 0.10.7", ] [[package]] @@ -1898,6 +2167,15 @@ version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" +[[package]] +name = "percentage" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2fd23b938276f14057220b707937bcb42fa76dda7560e57a2da30cb52d557937" +dependencies = [ + "num", +] + [[package]] name = "petgraph" version = "0.6.3" @@ -1925,14 +2203,14 @@ checksum = "39407670928234ebc5e6e580247dd567ad73a3578460c5990f9503df207e8f07" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.38", ] [[package]] name = "pin-project-lite" -version = "0.2.9" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" [[package]] name = "pin-utils" @@ -1946,6 +2224,12 @@ version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" +[[package]] +name = "plain" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6" + [[package]] name = "polyval" version = "0.5.3" @@ -1966,12 +2250,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]] @@ -1994,101 +2278,64 @@ dependencies = [ ] [[package]] -name = "proc-macro-error" -version = "1.0.4" +name = "proc-macro2" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" dependencies = [ - "proc-macro-error-attr", - "proc-macro2", - "quote", - "syn 1.0.109", - "version_check", + "unicode-ident", ] [[package]] -name = "proc-macro-error-attr" -version = "1.0.4" +name = "prost" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +checksum = "f4fdd22f3b9c31b53c060df4a0613a1c7f062d4115a2b984dd15b1858f7e340d" dependencies = [ - "proc-macro2", - "quote", - "version_check", -] - -[[package]] -name = "proc-macro2" -version = "1.0.58" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa1fb82fc0c281dd9671101b66b771ebbe1eaf967b96ac8740dcba4b70005ca8" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "proc-macro2-diagnostics" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bf29726d67464d49fa6224a1d07936a8c08bb3fba727c7493f6cf1616fdaada" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", - "version_check", - "yansi", -] - -[[package]] -name = "prost" -version = "0.11.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd" -dependencies = [ - "bytes", - "prost-derive", + "bytes", + "prost-derive", ] [[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 0.4.1", + "heck", "itertools", - "lazy_static", "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", "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", ] @@ -2102,11 +2349,22 @@ 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.27" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f4f29d145265ec1c483c7c654450edde0bfe043d3938d6972630663356d9500" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" dependencies = [ "proc-macro2", ] @@ -2170,7 +2428,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.9", + "getrandom 0.2.10", ] [[package]] @@ -2219,7 +2477,7 @@ version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] @@ -2228,7 +2486,7 @@ version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] @@ -2250,12 +2508,12 @@ checksum = "a5996294f19bd3aae0453a862ad728f60e6600695733dd5df01da90c54363a3c" [[package]] name = "reqwest" -version = "0.11.17" +version = "0.11.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13293b639a097af28fc8a90f22add145a9c954e49d77da06263d58cf44d5fb91" +checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b" dependencies = [ "async-compression", - "base64 0.21.0", + "base64 0.21.4", "bytes", "encoding_rs", "futures-core", @@ -2272,20 +2530,21 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", - "rustls 0.20.8", + "rustls", "rustls-pemfile", "serde", "serde_json", "serde_urlencoded", + "system-configuration", "tokio", - "tokio-rustls 0.23.4", + "tokio-rustls", "tokio-util", "tower-service", "url", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "webpki-roots 0.22.6", + "webpki-roots", "winreg", ] @@ -2304,6 +2563,12 @@ dependencies = [ "winapi", ] +[[package]] +name = "rustc-demangle" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" + [[package]] name = "rustc-hash" version = "1.1.0" @@ -2325,7 +2590,7 @@ version = "0.37.19" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "acf8729d8542766f1b2cf77eb034d52f40d375bb8b615d0b147089946e16613d" dependencies = [ - "bitflags", + "bitflags 1.3.2", "errno", "io-lifetimes", "libc", @@ -2335,21 +2600,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.20.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f" -dependencies = [ - "log", - "ring", - "sct", - "webpki", -] - -[[package]] -name = "rustls" -version = "0.21.1" +version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c911ba11bc8433e811ce56fde130ccf32f5127cab0e0194e9c68c5a5b671791e" +checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8" dependencies = [ "log", "ring", @@ -2357,32 +2610,20 @@ dependencies = [ "sct", ] -[[package]] -name = "rustls-native-certs" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0167bac7a9f490495f3c33013e7722b53cb087ecbe082fb0c6387c96f634ea50" -dependencies = [ - "openssl-probe", - "rustls-pemfile", - "schannel", - "security-framework", -] - [[package]] name = "rustls-pemfile" version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d194b56d58803a43635bdc398cd17e383d6f71f9182b9a192c127ca42494a59b" dependencies = [ - "base64 0.21.0", + "base64 0.21.4", ] [[package]] name = "rustls-webpki" -version = "0.100.1" +version = "0.101.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6207cd5ed3d8dca7816f8f3725513a34609c0c765bf652b8c3cb4cfd87db46b" +checksum = "3c7d5dece342910d9ba34d259310cae3e0154b873b35408b787b59bce53d34fe" dependencies = [ "ring", "untrusted", @@ -2390,9 +2631,9 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.12" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06" +checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" [[package]] name = "ryu" @@ -2400,15 +2641,6 @@ version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" -[[package]] -name = "schannel" -version = "0.1.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3" -dependencies = [ - "windows-sys 0.42.0", -] - [[package]] name = "scopeguard" version = "1.1.0" @@ -2416,36 +2648,33 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" [[package]] -name = "sct" -version = "0.7.0" +name = "scroll" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" +checksum = "04c565b551bafbef4157586fa379538366e4385d42082f255bfd96e4fe8519da" dependencies = [ - "ring", - "untrusted", + "scroll_derive", ] [[package]] -name = "security-framework" -version = "2.9.0" +name = "scroll_derive" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2855b3715770894e67cbfa3df957790aa0c9edc3bf06efa1a84d77fa0839d1" +checksum = "1db149f81d46d2deba7cd3c50772474707729550221e69588478ebf9ada425ae" dependencies = [ - "bitflags", - "core-foundation", - "core-foundation-sys", - "libc", - "security-framework-sys", + "proc-macro2", + "quote", + "syn 2.0.38", ] [[package]] -name = "security-framework-sys" -version = "2.9.0" +name = "sct" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f51d0c0d83bec45f16480d0ce0058397a69e48fcdc52d1dc8855fb68acbd31a7" +checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" dependencies = [ - "core-foundation-sys", - "libc", + "ring", + "untrusted", ] [[package]] @@ -2456,38 +2685,38 @@ checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" [[package]] name = "serde" -version = "1.0.163" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2" +checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" dependencies = [ "serde_derive", ] [[package]] name = "serde_bytes" -version = "0.11.9" +version = "0.11.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "416bda436f9aab92e02c8e10d49a15ddd339cea90b6e340fe51ed97abb548294" +checksum = "ab33ec92f677585af6d88c65593ae2375adde54efdbf16d597f2cbc7a6d368ff" dependencies = [ "serde", ] [[package]] name = "serde_derive" -version = "1.0.163" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e" +checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.38", ] [[package]] name = "serde_json" -version = "1.0.96" +version = "1.0.107" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1" +checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" dependencies = [ "itoa", "ryu", @@ -2506,6 +2735,28 @@ dependencies = [ "serde", ] +[[package]] +name = "serde_with" +version = "2.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07ff71d2c147a7b57362cead5e22f772cd52f6ab31cfcd9edcd7f6aeb2a0afbe" +dependencies = [ + "serde", + "serde_with_macros", +] + +[[package]] +name = "serde_with_macros" +version = "2.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "881b6f881b17d13214e5d494c939ebab463d01264ce1811e9d4ac3a882e7695f" +dependencies = [ + "darling", + "proc-macro2", + "quote", + "syn 2.0.38", +] + [[package]] name = "sha2" version = "0.9.9" @@ -2521,13 +2772,13 @@ dependencies = [ [[package]] name = "sha2" -version = "0.10.6" +version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" dependencies = [ "cfg-if", "cpufeatures", - "digest 0.10.6", + "digest 0.10.7", ] [[package]] @@ -2548,7 +2799,7 @@ version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "75872d278a8f37ef87fa0ddbda7802605cb18344497949862c0d4dcb291eba60" dependencies = [ - "digest 0.10.6", + "digest 0.10.7", "keccak", ] @@ -2594,37 +2845,23 @@ dependencies = [ ] [[package]] -name = "solana-account-decoder" -version = "1.14.17" +name = "socket2" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd1d1d16c04e7867408f2e0383a863e272dba2eda2c4b7095c70aa1a7ad4ff36" +checksum = "4031e820eb552adee9295814c0ced9e5cf38ddf1e8b7d566d6de8e2538ea989e" dependencies = [ - "Inflector", - "base64 0.13.1", - "bincode", - "bs58 0.4.0", - "bv", - "lazy_static", - "serde", - "serde_derive", - "serde_json", - "solana-address-lookup-table-program 1.14.17 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-config-program 1.14.17 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-sdk 1.14.17 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-vote-program 1.14.17 (registry+https://github.com/rust-lang/crates.io-index)", - "spl-token", - "spl-token-2022 0.6.0", - "thiserror", - "zstd", + "libc", + "windows-sys 0.48.0", ] [[package]] name = "solana-account-decoder" -version = "1.14.17" -source = "git+https://github.com/jito-foundation/jito-solana.git?tag=v1.14.17-jito#dc940579be6079352b97b24454ad370d3bd5cc4e" +version = "1.17.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1475958be84fa0156c17a4de0bfd67108e164ea4c892d7d2418abeefce7d014c" dependencies = [ "Inflector", - "base64 0.13.1", + "base64 0.21.4", "bincode", "bs58 0.4.0", "bv", @@ -2632,212 +2869,88 @@ dependencies = [ "serde", "serde_derive", "serde_json", - "solana-address-lookup-table-program 1.14.17 (git+https://github.com/jito-foundation/jito-solana.git?tag=v1.14.17-jito)", - "solana-config-program 1.14.17 (git+https://github.com/jito-foundation/jito-solana.git?tag=v1.14.17-jito)", - "solana-sdk 1.14.17 (git+https://github.com/jito-foundation/jito-solana.git?tag=v1.14.17-jito)", - "solana-vote-program 1.14.17 (git+https://github.com/jito-foundation/jito-solana.git?tag=v1.14.17-jito)", + "solana-config-program", + "solana-sdk", "spl-token", - "spl-token-2022 0.6.0", + "spl-token-2022", + "spl-token-metadata-interface", "thiserror", "zstd", ] -[[package]] -name = "solana-address-lookup-table-program" -version = "1.14.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de353d486f6e4a20cd163fc0c8391d01ff52e0ce504dbce7a45433362218b6d7" -dependencies = [ - "bincode", - "bytemuck", - "log", - "num-derive", - "num-traits", - "rustc_version", - "serde", - "solana-frozen-abi 1.14.17 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-frozen-abi-macro 1.14.17 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-program 1.14.17 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-program-runtime 1.14.17 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-sdk 1.14.17 (registry+https://github.com/rust-lang/crates.io-index)", - "thiserror", -] - -[[package]] -name = "solana-address-lookup-table-program" -version = "1.14.17" -source = "git+https://github.com/jito-foundation/jito-solana.git?tag=v1.14.17-jito#dc940579be6079352b97b24454ad370d3bd5cc4e" -dependencies = [ - "bincode", - "bytemuck", - "log", - "num-derive", - "num-traits", - "rustc_version", - "serde", - "solana-frozen-abi 1.14.17 (git+https://github.com/jito-foundation/jito-solana.git?tag=v1.14.17-jito)", - "solana-frozen-abi-macro 1.14.17 (git+https://github.com/jito-foundation/jito-solana.git?tag=v1.14.17-jito)", - "solana-program 1.14.17 (git+https://github.com/jito-foundation/jito-solana.git?tag=v1.14.17-jito)", - "solana-program-runtime 1.14.17 (git+https://github.com/jito-foundation/jito-solana.git?tag=v1.14.17-jito)", - "solana-sdk 1.14.17 (git+https://github.com/jito-foundation/jito-solana.git?tag=v1.14.17-jito)", - "thiserror", -] - [[package]] name = "solana-config-program" -version = "1.14.17" +version = "1.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "877de8a7d14e47e948f969277396b759e5361de662fa404980df9fd69d562964" -dependencies = [ - "bincode", - "chrono", - "serde", - "serde_derive", - "solana-program-runtime 1.14.17 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-sdk 1.14.17 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "solana-config-program" -version = "1.14.17" -source = "git+https://github.com/jito-foundation/jito-solana.git?tag=v1.14.17-jito#dc940579be6079352b97b24454ad370d3bd5cc4e" +checksum = "55f80f9c0a31ca22ddc2f1cb3e304de0922e7abea3b96e075dbcc9745854ddc5" dependencies = [ "bincode", "chrono", "serde", "serde_derive", - "solana-program-runtime 1.14.17 (git+https://github.com/jito-foundation/jito-solana.git?tag=v1.14.17-jito)", - "solana-sdk 1.14.17 (git+https://github.com/jito-foundation/jito-solana.git?tag=v1.14.17-jito)", + "solana-program-runtime", + "solana-sdk", ] [[package]] name = "solana-frozen-abi" -version = "1.14.17" +version = "1.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f53e63c8f2aac07bc21167e7ede9b9d010ae25523fff5c01b171d9bab9a5a394" -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.4", - "rustc_version", - "serde", - "serde_bytes", - "serde_derive", - "serde_json", - "sha2 0.10.6", - "solana-frozen-abi-macro 1.14.17 (registry+https://github.com/rust-lang/crates.io-index)", - "subtle", - "thiserror", -] - -[[package]] -name = "solana-frozen-abi" -version = "1.14.17" -source = "git+https://github.com/jito-foundation/jito-solana.git?tag=v1.14.17-jito#dc940579be6079352b97b24454ad370d3bd5cc4e" +checksum = "c9c2657cb455b25192ad08f8536cacc8276d10a135ba81fb4fb3059f5c3c49a9" dependencies = [ - "ahash", + "ahash 0.8.3", "blake3", - "block-buffer 0.9.0", + "block-buffer 0.10.4", "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.4", "rustc_version", "serde", "serde_bytes", "serde_derive", "serde_json", - "sha2 0.10.6", - "solana-frozen-abi-macro 1.14.17 (git+https://github.com/jito-foundation/jito-solana.git?tag=v1.14.17-jito)", + "sha2 0.10.8", + "solana-frozen-abi-macro", "subtle", "thiserror", ] [[package]] name = "solana-frozen-abi-macro" -version = "1.14.17" +version = "1.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "daeaaa2713c06a2fe4bcdcfe7e1af55ee8a89c4d6693860b4041997af667207a" +checksum = "7db74b08897ff67d5e3d0d9592fabb304f891736d280ac1eecb4baa198cabaa0" dependencies = [ "proc-macro2", "quote", "rustc_version", - "syn 1.0.109", -] - -[[package]] -name = "solana-frozen-abi-macro" -version = "1.14.17" -source = "git+https://github.com/jito-foundation/jito-solana.git?tag=v1.14.17-jito#dc940579be6079352b97b24454ad370d3bd5cc4e" -dependencies = [ - "proc-macro2", - "quote", - "rustc_version", - "syn 1.0.109", + "syn 2.0.38", ] [[package]] name = "solana-geyser-plugin-interface" -version = "1.14.17" +version = "1.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6338570d1a7b06e85037ec15291da57d6ca82c0a897633c505198b82c723775" -dependencies = [ - "log", - "solana-sdk 1.14.17 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-transaction-status 1.14.17 (registry+https://github.com/rust-lang/crates.io-index)", - "thiserror", -] - -[[package]] -name = "solana-geyser-plugin-interface" -version = "1.14.17" -source = "git+https://github.com/jito-foundation/jito-solana.git?tag=v1.14.17-jito#dc940579be6079352b97b24454ad370d3bd5cc4e" +checksum = "84641415deefbb22b60da076fc7f2587c3c77fce770e30ea27e8f93f90e9ffd1" dependencies = [ "log", - "solana-sdk 1.14.17 (git+https://github.com/jito-foundation/jito-solana.git?tag=v1.14.17-jito)", - "solana-transaction-status 1.14.17 (git+https://github.com/jito-foundation/jito-solana.git?tag=v1.14.17-jito)", + "solana-sdk", + "solana-transaction-status", "thiserror", ] [[package]] name = "solana-logger" -version = "1.14.17" +version = "1.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b502866be84a799633c0744e1d72b819a256337149e9fb6c7eee4db84ec63f5" -dependencies = [ - "env_logger", - "lazy_static", - "log", -] - -[[package]] -name = "solana-logger" -version = "1.14.17" -source = "git+https://github.com/jito-foundation/jito-solana.git?tag=v1.14.17-jito#dc940579be6079352b97b24454ad370d3bd5cc4e" +checksum = "d5d880d87752d95ce8d1b2f141535e60054455954a651db65b52c64978f9b637" dependencies = [ "env_logger", "lazy_static", @@ -2846,110 +2959,45 @@ dependencies = [ [[package]] name = "solana-measure" -version = "1.14.17" +version = "1.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "098178fabb0f0be17ed45ca52aea2754e49d4c41a443be5f98e1bce99b5c12bb" +checksum = "84ec20b62a31b5e568004a2c28e7dc0f985aa6b89a151f06142a518fd13d8d1f" dependencies = [ "log", - "solana-sdk 1.14.17 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "solana-measure" -version = "1.14.17" -source = "git+https://github.com/jito-foundation/jito-solana.git?tag=v1.14.17-jito#dc940579be6079352b97b24454ad370d3bd5cc4e" -dependencies = [ - "log", - "solana-sdk 1.14.17 (git+https://github.com/jito-foundation/jito-solana.git?tag=v1.14.17-jito)", + "solana-sdk", ] [[package]] name = "solana-metrics" -version = "1.14.17" +version = "1.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01dcd00c029063c09f15a1e2632570f5a549052cb3647db3bb06c2062e8351c4" +checksum = "ff82c026dded469e68dd1d48fe73260dfc6a17d9437764026bd6e2dce6f95fa2" dependencies = [ "crossbeam-channel", "gethostname", "lazy_static", "log", "reqwest", - "solana-sdk 1.14.17 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "solana-metrics" -version = "1.14.17" -source = "git+https://github.com/jito-foundation/jito-solana.git?tag=v1.14.17-jito#dc940579be6079352b97b24454ad370d3bd5cc4e" -dependencies = [ - "crossbeam-channel", - "gethostname", - "lazy_static", - "log", - "reqwest", - "solana-sdk 1.14.17 (git+https://github.com/jito-foundation/jito-solana.git?tag=v1.14.17-jito)", -] - -[[package]] -name = "solana-program" -version = "1.14.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d66c02ad6002fbe7903ec96edd16352fe7964d3ee43b02053112f5304529849f" -dependencies = [ - "base64 0.13.1", - "bincode", - "bitflags", - "blake3", - "borsh", - "borsh-derive", - "bs58 0.4.0", - "bv", - "bytemuck", - "cc", - "console_error_panic_hook", - "console_log", - "curve25519-dalek", - "getrandom 0.2.9", - "itertools", - "js-sys", - "lazy_static", - "libc", - "libsecp256k1", - "log", - "memoffset 0.6.5", - "num-derive", - "num-traits", - "parking_lot", - "rand 0.7.3", - "rand_chacha 0.2.2", - "rustc_version", - "rustversion", - "serde", - "serde_bytes", - "serde_derive", - "serde_json", - "sha2 0.10.6", - "sha3 0.10.8", - "solana-frozen-abi 1.14.17 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-frozen-abi-macro 1.14.17 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-sdk-macro 1.14.17 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-sdk", "thiserror", - "tiny-bip39", - "wasm-bindgen", - "zeroize", ] [[package]] name = "solana-program" -version = "1.14.17" -source = "git+https://github.com/jito-foundation/jito-solana.git?tag=v1.14.17-jito#dc940579be6079352b97b24454ad370d3bd5cc4e" +version = "1.17.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c491670a24d87af75a7b7771fc5961126dd838c5fb7f7657ec2662b1597c0cb" dependencies = [ - "base64 0.13.1", + "ark-bn254", + "ark-ec", + "ark-ff", + "ark-serialize", + "base64 0.21.4", "bincode", - "bitflags", + "bitflags 2.4.0", "blake3", - "borsh", - "borsh-derive", + "borsh 0.10.3", + "borsh 0.9.3", "bs58 0.4.0", "bv", "bytemuck", @@ -2957,30 +3005,31 @@ dependencies = [ "console_error_panic_hook", "console_log", "curve25519-dalek", - "getrandom 0.2.9", + "getrandom 0.2.10", "itertools", "js-sys", "lazy_static", "libc", "libsecp256k1", + "light-poseidon", "log", - "memoffset 0.6.5", - "num-derive", + "memoffset 0.9.0", + "num-bigint 0.4.4", + "num-derive 0.3.3", "num-traits", "parking_lot", - "rand 0.7.3", - "rand_chacha 0.2.2", + "rand 0.8.5", "rustc_version", "rustversion", "serde", "serde_bytes", "serde_derive", "serde_json", - "sha2 0.10.6", + "sha2 0.10.8", "sha3 0.10.8", - "solana-frozen-abi 1.14.17 (git+https://github.com/jito-foundation/jito-solana.git?tag=v1.14.17-jito)", - "solana-frozen-abi-macro 1.14.17 (git+https://github.com/jito-foundation/jito-solana.git?tag=v1.14.17-jito)", - "solana-sdk-macro 1.14.17 (git+https://github.com/jito-foundation/jito-solana.git?tag=v1.14.17-jito)", + "solana-frozen-abi", + "solana-frozen-abi-macro", + "solana-sdk-macro", "thiserror", "tiny-bip39", "wasm-bindgen", @@ -2989,125 +3038,49 @@ dependencies = [ [[package]] name = "solana-program-runtime" -version = "1.14.17" +version = "1.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d57bc75db0cbfb8e0620cef48b4de3388ed1ea5fbdcc68769da0c2b1ccf69bc" +checksum = "371ddaf68685fa6a25502d71dd61a742de2e78e2843a4a42000b1d818987ff4e" dependencies = [ - "base64 0.13.1", + "base64 0.21.4", "bincode", "eager", - "enum-iterator", - "itertools", - "libc", - "libloading", - "log", - "num-derive", - "num-traits", - "rand 0.7.3", - "rustc_version", - "serde", - "solana-frozen-abi 1.14.17 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-frozen-abi-macro 1.14.17 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-measure 1.14.17 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-metrics 1.14.17 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-sdk 1.14.17 (registry+https://github.com/rust-lang/crates.io-index)", - "thiserror", -] - -[[package]] -name = "solana-program-runtime" -version = "1.14.17" -source = "git+https://github.com/jito-foundation/jito-solana.git?tag=v1.14.17-jito#dc940579be6079352b97b24454ad370d3bd5cc4e" -dependencies = [ - "base64 0.13.1", - "bincode", - "eager", - "enum-iterator", - "itertools", - "libc", - "libloading", - "log", - "num-derive", - "num-traits", - "rand 0.7.3", - "rustc_version", - "serde", - "solana-frozen-abi 1.14.17 (git+https://github.com/jito-foundation/jito-solana.git?tag=v1.14.17-jito)", - "solana-frozen-abi-macro 1.14.17 (git+https://github.com/jito-foundation/jito-solana.git?tag=v1.14.17-jito)", - "solana-measure 1.14.17 (git+https://github.com/jito-foundation/jito-solana.git?tag=v1.14.17-jito)", - "solana-metrics 1.14.17 (git+https://github.com/jito-foundation/jito-solana.git?tag=v1.14.17-jito)", - "solana-sdk 1.14.17 (git+https://github.com/jito-foundation/jito-solana.git?tag=v1.14.17-jito)", - "thiserror", -] - -[[package]] -name = "solana-sdk" -version = "1.14.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60cbad77fa09d23fa5e05029dec6c88e4b784be76cf6ae390f82cc04b8089e73" -dependencies = [ - "assert_matches", - "base64 0.13.1", - "bincode", - "bitflags", - "borsh", - "bs58 0.4.0", - "bytemuck", - "byteorder", - "chrono", - "derivation-path", - "digest 0.10.6", - "ed25519-dalek", - "ed25519-dalek-bip32", - "generic-array", - "hmac 0.12.1", + "enum-iterator", "itertools", - "js-sys", - "lazy_static", - "libsecp256k1", + "libc", "log", - "memmap2", - "num-derive", + "num-derive 0.3.3", "num-traits", - "pbkdf2 0.11.0", - "qstring", - "rand 0.7.3", - "rand_chacha 0.2.2", + "percentage", + "rand 0.8.5", "rustc_version", - "rustversion", "serde", - "serde_bytes", - "serde_derive", - "serde_json", - "sha2 0.10.6", - "sha3 0.10.8", - "solana-frozen-abi 1.14.17 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-frozen-abi-macro 1.14.17 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-logger 1.14.17 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-program 1.14.17 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-sdk-macro 1.14.17 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-frozen-abi", + "solana-frozen-abi-macro", + "solana-measure", + "solana-metrics", + "solana-sdk", + "solana_rbpf", "thiserror", - "uriparse", - "wasm-bindgen", ] [[package]] name = "solana-sdk" -version = "1.14.17" -source = "git+https://github.com/jito-foundation/jito-solana.git?tag=v1.14.17-jito#dc940579be6079352b97b24454ad370d3bd5cc4e" +version = "1.17.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b7d1f01c53520b2eaa59360e068ea3bdd52c59151b334e6f1e26638751e5986" dependencies = [ - "anchor-lang", "assert_matches", - "base64 0.13.1", + "base64 0.21.4", "bincode", - "bitflags", - "borsh", + "bitflags 2.4.0", + "borsh 0.10.3", "bs58 0.4.0", "bytemuck", "byteorder", "chrono", "derivation-path", - "digest 0.10.6", + "digest 0.10.7", "ed25519-dalek", "ed25519-dalek-bip32", "generic-array", @@ -3118,185 +3091,141 @@ dependencies = [ "libsecp256k1", "log", "memmap2", - "num-derive", + "num-derive 0.3.3", "num-traits", + "num_enum 0.6.1", "pbkdf2 0.11.0", "qstring", + "qualifier_attr", "rand 0.7.3", - "rand_chacha 0.2.2", + "rand 0.8.5", "rustc_version", "rustversion", "serde", "serde_bytes", "serde_derive", "serde_json", - "sha2 0.10.6", + "serde_with", + "sha2 0.10.8", "sha3 0.10.8", - "solana-frozen-abi 1.14.17 (git+https://github.com/jito-foundation/jito-solana.git?tag=v1.14.17-jito)", - "solana-frozen-abi-macro 1.14.17 (git+https://github.com/jito-foundation/jito-solana.git?tag=v1.14.17-jito)", - "solana-logger 1.14.17 (git+https://github.com/jito-foundation/jito-solana.git?tag=v1.14.17-jito)", - "solana-program 1.14.17 (git+https://github.com/jito-foundation/jito-solana.git?tag=v1.14.17-jito)", - "solana-sdk-macro 1.14.17 (git+https://github.com/jito-foundation/jito-solana.git?tag=v1.14.17-jito)", + "solana-frozen-abi", + "solana-frozen-abi-macro", + "solana-logger", + "solana-program", + "solana-sdk-macro", "thiserror", "uriparse", - "uuid", "wasm-bindgen", ] [[package]] name = "solana-sdk-macro" -version = "1.14.17" +version = "1.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b73f54502e7d537472bf393ffce0c252c55b534f16797029a1614d79ec0209c9" -dependencies = [ - "bs58 0.4.0", - "proc-macro2", - "quote", - "rustversion", - "syn 1.0.109", -] - -[[package]] -name = "solana-sdk-macro" -version = "1.14.17" -source = "git+https://github.com/jito-foundation/jito-solana.git?tag=v1.14.17-jito#dc940579be6079352b97b24454ad370d3bd5cc4e" +checksum = "8dd1223f92124c255c9db21672fb050c64ae351d6c6baf168f14da632b41c195" dependencies = [ "bs58 0.4.0", "proc-macro2", "quote", "rustversion", - "syn 1.0.109", + "syn 2.0.38", ] [[package]] name = "solana-transaction-status" -version = "1.14.17" +version = "1.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "feacea79beaefa2aec4ea02bd56573845bcf2a480858f7d666077138928fc259" -dependencies = [ - "Inflector", - "base64 0.13.1", - "bincode", - "borsh", - "bs58 0.4.0", - "lazy_static", - "log", - "serde", - "serde_derive", - "serde_json", - "solana-account-decoder 1.14.17 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-address-lookup-table-program 1.14.17 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-measure 1.14.17 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-metrics 1.14.17 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-sdk 1.14.17 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-vote-program 1.14.17 (registry+https://github.com/rust-lang/crates.io-index)", - "spl-associated-token-account", - "spl-memo", - "spl-token", - "spl-token-2022 0.6.0", - "thiserror", -] - -[[package]] -name = "solana-transaction-status" -version = "1.14.17" -source = "git+https://github.com/jito-foundation/jito-solana.git?tag=v1.14.17-jito#dc940579be6079352b97b24454ad370d3bd5cc4e" +checksum = "db437597c99bd57a30f4ea97737eb8066bcea709fe3413d0e7fe9dad2ae084f5" dependencies = [ "Inflector", - "base64 0.13.1", + "base64 0.21.4", "bincode", - "borsh", + "borsh 0.10.3", "bs58 0.4.0", "lazy_static", "log", "serde", "serde_derive", "serde_json", - "solana-account-decoder 1.14.17 (git+https://github.com/jito-foundation/jito-solana.git?tag=v1.14.17-jito)", - "solana-address-lookup-table-program 1.14.17 (git+https://github.com/jito-foundation/jito-solana.git?tag=v1.14.17-jito)", - "solana-measure 1.14.17 (git+https://github.com/jito-foundation/jito-solana.git?tag=v1.14.17-jito)", - "solana-metrics 1.14.17 (git+https://github.com/jito-foundation/jito-solana.git?tag=v1.14.17-jito)", - "solana-sdk 1.14.17 (git+https://github.com/jito-foundation/jito-solana.git?tag=v1.14.17-jito)", - "solana-vote-program 1.14.17 (git+https://github.com/jito-foundation/jito-solana.git?tag=v1.14.17-jito)", + "solana-account-decoder", + "solana-sdk", "spl-associated-token-account", "spl-memo", "spl-token", - "spl-token-2022 0.6.0", + "spl-token-2022", "thiserror", ] [[package]] name = "solana-vote-program" -version = "1.14.17" +version = "1.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa94c3c98a33f9825c83ea3d68db39fcbfa94b66772d9a8eb9e16e711966b453" -dependencies = [ - "bincode", - "log", - "num-derive", - "num-traits", - "rustc_version", - "serde", - "serde_derive", - "solana-frozen-abi 1.14.17 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-frozen-abi-macro 1.14.17 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-metrics 1.14.17 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-program-runtime 1.14.17 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-sdk 1.14.17 (registry+https://github.com/rust-lang/crates.io-index)", - "thiserror", -] - -[[package]] -name = "solana-vote-program" -version = "1.14.17" -source = "git+https://github.com/jito-foundation/jito-solana.git?tag=v1.14.17-jito#dc940579be6079352b97b24454ad370d3bd5cc4e" +checksum = "a3e49236cb02d2d54006895b9ca02e19b91c2e162d0b31e97a5e4cc6444eb28e" dependencies = [ "bincode", "log", - "num-derive", + "num-derive 0.3.3", "num-traits", "rustc_version", "serde", "serde_derive", - "solana-frozen-abi 1.14.17 (git+https://github.com/jito-foundation/jito-solana.git?tag=v1.14.17-jito)", - "solana-frozen-abi-macro 1.14.17 (git+https://github.com/jito-foundation/jito-solana.git?tag=v1.14.17-jito)", - "solana-metrics 1.14.17 (git+https://github.com/jito-foundation/jito-solana.git?tag=v1.14.17-jito)", - "solana-program-runtime 1.14.17 (git+https://github.com/jito-foundation/jito-solana.git?tag=v1.14.17-jito)", - "solana-sdk 1.14.17 (git+https://github.com/jito-foundation/jito-solana.git?tag=v1.14.17-jito)", + "solana-frozen-abi", + "solana-frozen-abi-macro", + "solana-metrics", + "solana-program", + "solana-program-runtime", + "solana-sdk", "thiserror", ] [[package]] name = "solana-zk-token-sdk" -version = "1.14.17" +version = "1.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b28c5ec36aa1393174f7ea18c0cb809af82c10977bc5b2e1240a6b4b048b8f24" +checksum = "afb5d7d29b4566242b0bf5bb7d2ba941ddb18558a121555ec682bf6eae88e041" dependencies = [ "aes-gcm-siv", - "arrayref", - "base64 0.13.1", + "base64 0.21.4", "bincode", "bytemuck", "byteorder", - "cipher 0.4.4", "curve25519-dalek", "getrandom 0.1.16", "itertools", "lazy_static", "merlin", - "num-derive", + "num-derive 0.3.3", "num-traits", "rand 0.7.3", "serde", "serde_json", "sha3 0.9.1", - "solana-program 1.14.17 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-sdk 1.14.17 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-program", + "solana-sdk", "subtle", "thiserror", "zeroize", ] +[[package]] +name = "solana_rbpf" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "103318aa365ff7caa8cf534f2246b5eb7e5b34668736d52b1266b143f7a21196" +dependencies = [ + "byteorder", + "combine", + "goblin", + "hash32", + "libc", + "log", + "rand 0.8.5", + "rustc-demangle", + "scroll", + "thiserror", + "winapi", +] + [[package]] name = "spin" version = "0.5.2" @@ -3305,80 +3234,196 @@ checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" [[package]] name = "spl-associated-token-account" -version = "1.1.2" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbc000f0fdf1f12f99d77d398137c1751345b18c88258ce0f99b7872cf6c9bd6" +checksum = "385e31c29981488f2820b2022d8e731aae3b02e6e18e2fd854e4c9a94dc44fc3" dependencies = [ "assert_matches", - "borsh", - "num-derive", + "borsh 0.10.3", + "num-derive 0.4.1", "num-traits", - "solana-program 1.14.17 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-program", "spl-token", - "spl-token-2022 0.5.0", + "spl-token-2022", + "thiserror", +] + +[[package]] +name = "spl-discriminator" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cce5d563b58ef1bb2cdbbfe0dfb9ffdc24903b10ae6a4df2d8f425ece375033f" +dependencies = [ + "bytemuck", + "solana-program", + "spl-discriminator-derive", +] + +[[package]] +name = "spl-discriminator-derive" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fadbefec4f3c678215ca72bd71862697bb06b41fd77c0088902dd3203354387b" +dependencies = [ + "quote", + "spl-discriminator-syn", + "syn 2.0.38", +] + +[[package]] +name = "spl-discriminator-syn" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e5f2044ca42c8938d54d1255ce599c79a1ffd86b677dfab695caa20f9ffc3f2" +dependencies = [ + "proc-macro2", + "quote", + "sha2 0.10.8", + "syn 2.0.38", "thiserror", ] [[package]] name = "spl-memo" -version = "3.0.1" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd0dc6f70db6bacea7ff25870b016a65ba1d1b6013536f08e4fd79a8f9005325" +checksum = "f0f180b03318c3dbab3ef4e1e4d46d5211ae3c780940dd0a28695aba4b59a75a" dependencies = [ - "solana-program 1.14.17 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-program", ] [[package]] -name = "spl-token" -version = "3.5.0" +name = "spl-pod" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e85e168a785e82564160dcb87b2a8e04cee9bfd1f4d488c729d53d6a4bd300d" +checksum = "2881dddfca792737c0706fa0175345ab282b1b0879c7d877bad129645737c079" dependencies = [ - "arrayref", + "borsh 0.10.3", "bytemuck", - "num-derive", + "solana-program", + "solana-zk-token-sdk", + "spl-program-error", +] + +[[package]] +name = "spl-program-error" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "249e0318493b6bcf27ae9902600566c689b7dfba9f1bdff5893e92253374e78c" +dependencies = [ + "num-derive 0.4.1", "num-traits", - "num_enum", - "solana-program 1.14.17 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-program", + "spl-program-error-derive", "thiserror", ] [[package]] -name = "spl-token-2022" -version = "0.5.0" +name = "spl-program-error-derive" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab5269c8e868da17b6552ef35a51355a017bd8e0eae269c201fef830d35fa52c" +dependencies = [ + "proc-macro2", + "quote", + "sha2 0.10.8", + "syn 2.0.38", +] + +[[package]] +name = "spl-tlv-account-resolution" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "062e148d3eab7b165582757453632ffeef490c02c86a48bfdb4988f63eefb3b9" +dependencies = [ + "bytemuck", + "solana-program", + "spl-discriminator", + "spl-pod", + "spl-program-error", + "spl-type-length-value", +] + +[[package]] +name = "spl-token" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0edb869dbe159b018f17fb9bfa67118c30f232d7f54a73742bc96794dff77ed8" +checksum = "08459ba1b8f7c1020b4582c4edf0f5c7511a5e099a7a97570c9698d4f2337060" dependencies = [ "arrayref", "bytemuck", - "num-derive", + "num-derive 0.3.3", "num-traits", - "num_enum", - "solana-program 1.14.17 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-zk-token-sdk", - "spl-memo", - "spl-token", + "num_enum 0.6.1", + "solana-program", "thiserror", ] [[package]] name = "spl-token-2022" -version = "0.6.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67fcd758e8d22c5fce17315015f5ff319604d1a6e57a73c72795639dba898890" +checksum = "e4abf34a65ba420584a0c35f3903f8d727d1f13ababbdc3f714c6b065a686e86" dependencies = [ "arrayref", "bytemuck", - "num-derive", + "num-derive 0.4.1", "num-traits", - "num_enum", - "solana-program 1.14.17 (registry+https://github.com/rust-lang/crates.io-index)", + "num_enum 0.7.0", + "solana-program", "solana-zk-token-sdk", "spl-memo", + "spl-pod", "spl-token", + "spl-token-metadata-interface", + "spl-transfer-hook-interface", + "spl-type-length-value", "thiserror", ] +[[package]] +name = "spl-token-metadata-interface" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c16ce3ba6979645fb7627aa1e435576172dd63088dc7848cb09aa331fa1fe4f" +dependencies = [ + "borsh 0.10.3", + "solana-program", + "spl-discriminator", + "spl-pod", + "spl-program-error", + "spl-type-length-value", +] + +[[package]] +name = "spl-transfer-hook-interface" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "051d31803f873cabe71aec3c1b849f35248beae5d19a347d93a5c9cccc5d5a9b" +dependencies = [ + "arrayref", + "bytemuck", + "solana-program", + "spl-discriminator", + "spl-pod", + "spl-program-error", + "spl-tlv-account-resolution", + "spl-type-length-value", +] + +[[package]] +name = "spl-type-length-value" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a468e6f6371f9c69aae760186ea9f1a01c2908351b06a5e0026d21cfc4d7ecac" +dependencies = [ + "bytemuck", + "solana-program", + "spl-discriminator", + "spl-pod", + "spl-program-error", +] + [[package]] name = "strsim" version = "0.10.0" @@ -3404,9 +3449,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.16" +version = "2.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6f671d4b5ffdb8eadec19c0ae67fe2639df8684bd7bc4b83d986b8db549cf01" +checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" dependencies = [ "proc-macro2", "quote", @@ -3419,6 +3464,27 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" +[[package]] +name = "system-configuration" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "system-configuration-sys", +] + +[[package]] +name = "system-configuration-sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" +dependencies = [ + "core-foundation-sys", + "libc", +] + [[package]] name = "tempfile" version = "3.5.0" @@ -3443,33 +3509,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.40" +version = "1.0.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" +checksum = "1177e8c6d7ede7afde3585fd2513e611227efd6481bd78d2e82ba1ce16557ed4" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.40" +version = "1.0.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" +checksum = "10712f02019e9288794769fba95cd6847df9874d49d871d062172f9dd41bc4cc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", -] - -[[package]] -name = "time" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a" -dependencies = [ - "libc", - "wasi 0.10.0+wasi-snapshot-preview1", - "winapi", + "syn 2.0.38", ] [[package]] @@ -3508,19 +3563,19 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.14.1" +version = "1.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9d0183f6f6001549ab68f8c7585093bb732beefbcf6d23a10b9b95c73a1dd49" +checksum = "4f38200e3ef7995e5ef13baec2f432a6da0aa9ac495b2c0e8f3b7eec2c92d653" dependencies = [ - "autocfg", + "backtrace", "bytes", "libc", - "memchr", "mio", "num_cpus", "pin-project-lite", + "socket2 0.5.4", "tokio-macros", - "winapi", + "windows-sys 0.48.0", ] [[package]] @@ -3535,33 +3590,22 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "1.8.2" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8" +checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", -] - -[[package]] -name = "tokio-rustls" -version = "0.23.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" -dependencies = [ - "rustls 0.20.8", - "tokio", - "webpki", + "syn 2.0.38", ] [[package]] name = "tokio-rustls" -version = "0.24.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0d409377ff5b1e3ca6437aa86c1eb7d40c134bfec254e44c830defa92669db5" +checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" dependencies = [ - "rustls 0.21.1", + "rustls", "tokio", ] @@ -3618,17 +3662,15 @@ 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", "axum", - "base64 0.21.0", + "base64 0.21.4", "bytes", - "futures-core", - "futures-util", "h2", "http", "http-body", @@ -3637,29 +3679,28 @@ dependencies = [ "percent-encoding", "pin-project", "prost", - "rustls-native-certs", + "rustls", "rustls-pemfile", "tokio", - "tokio-rustls 0.24.0", + "tokio-rustls", "tokio-stream", "tower", "tower-layer", "tower-service", "tracing", - "webpki-roots 0.23.0", ] [[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]] @@ -3714,7 +3755,7 @@ checksum = "0f57e3ca2a01450b1a921183a9c9cbfda207fd822cef4ccb00a65402cbba7a74" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.38", ] [[package]] @@ -3759,12 +3800,6 @@ dependencies = [ "tinyvec", ] -[[package]] -name = "unicode-segmentation" -version = "1.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" - [[package]] name = "universal-hash" version = "0.4.1" @@ -3775,6 +3810,15 @@ dependencies = [ "subtle", ] +[[package]] +name = "unreachable" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "382810877fe448991dfc7f0dd6e3ae5d58088fd0ea5e35189655f84e6814fa56" +dependencies = [ + "void", +] + [[package]] name = "untrusted" version = "0.7.1" @@ -3802,13 +3846,19 @@ dependencies = [ "percent-encoding", ] +[[package]] +name = "utf8parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" + [[package]] name = "uuid" version = "1.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "345444e32442451b267fc254ae85a209c64be56d2890e601a0c37ff0c3c5ecd2" dependencies = [ - "getrandom 0.2.9", + "getrandom 0.2.10", "rand 0.8.5", ] @@ -3818,6 +3868,12 @@ version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +[[package]] +name = "void" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" + [[package]] name = "want" version = "0.3.0" @@ -3834,12 +3890,6 @@ version = "0.9.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" -[[package]] -name = "wasi" -version = "0.10.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" - [[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" @@ -3848,9 +3898,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.86" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bba0e8cb82ba49ff4e229459ff22a191bbe9a1cb3a341610c9c33efc27ddf73" +checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -3858,16 +3908,16 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.86" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b04bc93f9d6bdee709f6bd2118f57dd6679cf1176a1af464fca3ab0d66d8fb" +checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.38", "wasm-bindgen-shared", ] @@ -3885,9 +3935,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.86" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14d6b024f1a526bb0234f52840389927257beb670610081360e5a03c5df9c258" +checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -3895,22 +3945,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.86" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e128beba882dd1eb6200e1dc92ae6c5dbaa4311aa7bb211ca035779e5efc39f8" +checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.38", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.86" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed9d5b4305409d1fc9482fee2d7f9bcbf24b3972bf59817ef757e23982242a93" +checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" [[package]] name = "web-sys" @@ -3922,33 +3972,11 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "webpki" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] -name = "webpki-roots" -version = "0.22.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87" -dependencies = [ - "webpki", -] - [[package]] name = "webpki-roots" -version = "0.23.0" +version = "0.25.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa54963694b65584e170cf5dc46aeb4dcaa5584e652ff5f3952e56d66aff0125" -dependencies = [ - "rustls-webpki", -] +checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc" [[package]] name = "which" @@ -4001,21 +4029,6 @@ dependencies = [ "windows-targets 0.48.0", ] -[[package]] -name = "windows-sys" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" -dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", -] - [[package]] name = "windows-sys" version = "0.45.0" @@ -4150,19 +4163,14 @@ checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" [[package]] name = "winreg" -version = "0.10.1" +version = "0.50.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" +checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" dependencies = [ - "winapi", + "cfg-if", + "windows-sys 0.48.0", ] -[[package]] -name = "yansi" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" - [[package]] name = "zeroize" version = "1.3.0" @@ -4180,7 +4188,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.38", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 67cd7cf..fea6f47 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -5,3 +5,48 @@ members = [ "proto", "server" ] + +# This prevents a Travis CI error when building for Windows. +resolver = "2" + +[workspace.package] +version = "1.17.1" +license = "Apache-2.0" +authors = ["Jito Foundation "] +edition = "2021" +repository = "https://github.com/jito-foundation/geyser-grpc-plugin" +homepage = "https://jito.network/" + +[workspace.dependencies] +bincode = "1.3.3" +bs58 = "0.5.0" +clap = { version = "4.4.6", features = ["derive", "env"] } +clap_lex = "0.5.1" +crossbeam-channel = "0.5.8" +futures-util = "0.3.28" +geyser-grpc-plugin-client = { path = "client" } +jito-geyser-protos = { path = "proto" } +log = "0.4.17" +lru = "0.12.0" +once_cell = "1.17.1" +prost = "0.12.1" +prost-types = "0.12.1" +rand = "0.8" +serde = "1.0.160" +serde_derive = "1.0.160" +serde_json = "1.0.96" +solana-account-decoder = "1.17.1" +solana-geyser-plugin-interface = "1.17.1" +solana-logger = "1.17.1" +solana-metrics = "1.17.1" +solana-program = "1.17.1" +solana-sdk = "1.17.1" +solana-transaction-status = "1.17.1" +solana-vote-program = "1.17.1" +thiserror = "1.0.40" +tokio = { version = "1.29.1", features = ["rt-multi-thread"] } +tokio-stream = "0.1" +toml_datetime = "=0.6.0" # manual dep override for clap. +tonic = { version = "0.10.2", features = ["tls"] } +tonic-build = "0.10.2" +uuid = { version = "1.3.1", features = ["v4", "fast-rng"] } diff --git a/cli/Cargo.toml b/cli/Cargo.toml index e3b8c23..403c595 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -1,20 +1,19 @@ [package] name = "jito-geyser-cli" -version = "0.0.1" -authors = ["Jito Labs"] -description = "Geyser testing" -edition = "2021" -publish = false +version = { workspace = true } +license = { workspace = true } +authors = { workspace = true } +edition = { workspace = true } [dependencies] -clap = { version = "=4.0.32", features = ["derive", "env"] } # keep old clap. newer version needs rustc 1.64+ -clap_lex = "=0.3.0" # manual dep override for clap. -futures-util = "0.3.28" -geyser-grpc-plugin-client = { path = "../client" } -jito-geyser-protos = { path = "../proto" } -prost-types = "0.11.9" -solana-sdk = "~1.14" -tokio = { version = "~1.14.1", features = ["rt-multi-thread"] } -toml_datetime = "=0.6.0" # manual dep override for clap. -tonic = { version = "0.9.2", features = ["tls", "tls-roots", "tls-webpki-roots"] } -uuid = { version = "1.3.1", features = ["v4"] } +clap = { workspace = true } +clap_lex = { workspace = true } +futures-util = { workspace = true } +geyser-grpc-plugin-client = { workspace = true } +jito-geyser-protos = { workspace = true } +prost-types = { workspace = true } +solana-sdk = { workspace = true } +tokio = { workspace = true } +toml_datetime = { workspace = true } +tonic = { workspace = true } +uuid = { workspace = true } diff --git a/cli/src/main.rs b/cli/src/main.rs index 250ef84..8747973 100644 --- a/cli/src/main.rs +++ b/cli/src/main.rs @@ -104,7 +104,7 @@ async fn main() { "slot: {} parent: {:?} status: {:?}", slot_update.slot, slot_update.parent_slot, - SlotUpdateStatus::from_i32(slot_update.status) + SlotUpdateStatus::try_from(slot_update.status).unwrap() ); } Err(e) => { diff --git a/client/Cargo.toml b/client/Cargo.toml index 1bfa8eb..8deb353 100644 --- a/client/Cargo.toml +++ b/client/Cargo.toml @@ -1,29 +1,23 @@ [package] name = "geyser-grpc-plugin-client" -version = "0.1.0" -authors = ["Jito Foundation "] -license = "Apache-2.0" -edition = "2021" +version = { workspace = true } +license = { workspace = true } +authors = { workspace = true } +edition = { workspace = true } [dependencies] -jito-geyser-protos = { path = "../proto" } -jito-solana-sdk = { git = "https://github.com/jito-foundation/jito-solana.git", tag = "v1.14.17-jito", package = "solana-sdk", optional = true } -log = "0.4" -lru = "0.8" # keep old version due to MSRV of 1.60 -prost = "0.11.9" -prost-types = "0.11.9" -rand = "0.8" -serde = "1.0.160" -serde_json = "1.0.96" - -solana-sdk = "~1.14" - -thiserror = "1.0.40" -tokio = { version = "1", features = ["rt-multi-thread"] } -tonic = { version = "0.9.2", features = ["tls"] } +jito-geyser-protos = { workspace = true } +log = { workspace = true } +lru = { workspace = true } +prost = { workspace = true } +prost-types = { workspace = true } +rand = { workspace = true } +serde = { workspace = true } +serde_json = { workspace = true } +solana-sdk = { workspace = true } +thiserror = { workspace = true } +tokio = { workspace = true } +tonic = { workspace = true } [build-dependencies] -tonic-build = "0.9.2" - -[features] -jito-solana = ["jito-solana-sdk"] +tonic-build = { workspace = true } diff --git a/client/src/types.rs b/client/src/types.rs index c3ec1cf..3dd670f 100644 --- a/client/src/types.rs +++ b/client/src/types.rs @@ -128,7 +128,7 @@ pub struct SlotUpdate { impl From for SlotUpdate { fn from(proto: geyser::SlotUpdate) -> Self { - let status = geyser::SlotUpdateStatus::from_i32(proto.status).unwrap(); + let status = geyser::SlotUpdateStatus::try_from(proto.status).unwrap(); Self { parent_slot: proto.parent_slot, slot: proto.slot, diff --git a/proto/Cargo.toml b/proto/Cargo.toml index ee81fe4..32387ac 100644 --- a/proto/Cargo.toml +++ b/proto/Cargo.toml @@ -1,26 +1,20 @@ [package] name = "jito-geyser-protos" -version = "0.0.2" -authors = ["Jito Foundation "] -license = "Apache-2.0" -edition = "2021" +version = { workspace = true } +license = { workspace = true } +authors = { workspace = true } +edition = { workspace = true } description = "Jito's Solana geyser protobufs and helper libraries" [dependencies] -bincode = "1.3.3" -jito-solana-account-decoder = { git = "https://github.com/jito-foundation/jito-solana.git", tag = "v1.14.17-jito", package = "solana-account-decoder", optional = true } -jito-solana-sdk = { git = "https://github.com/jito-foundation/jito-solana.git", tag = "v1.14.17-jito", package = "solana-sdk", optional = true } -jito-solana-transaction-status = { git = "https://github.com/jito-foundation/jito-solana.git", tag = "v1.14.17-jito", package = "solana-transaction-status", optional = true } -prost = "0.11.9" -prost-types = "0.11.9" -serde = "1.0.160" -solana-account-decoder = "~1.14" -solana-sdk = "~1.14" -solana-transaction-status = "~1.14" -tonic = "0.9.2" +bincode = { workspace = true } +prost = { workspace = true } +prost-types = { workspace = true } +serde = { workspace = true } +solana-account-decoder = { workspace = true } +solana-sdk = { workspace = true } +solana-transaction-status = { workspace = true } +tonic = { workspace = true } [build-dependencies] -tonic-build = "0.9.2" - -[features] -jito-solana = ["jito-solana-account-decoder", "jito-solana-sdk", "jito-solana-transaction-status"] +tonic-build = { workspace = true } diff --git a/proto/proto/confirmed_block.proto b/proto/proto/confirmed_block.proto index f378125..edba0ed 100644 --- a/proto/proto/confirmed_block.proto +++ b/proto/proto/confirmed_block.proto @@ -72,7 +72,18 @@ message TransactionError { message InnerInstructions { uint32 index = 1; - repeated CompiledInstruction instructions = 2; + repeated InnerInstruction instructions = 2; +} + +message InnerInstruction { + uint32 program_id_index = 1; + bytes accounts = 2; + bytes data = 3; + + // Invocation stack height of an inner instruction. + // Available since Solana v1.14.6 + // Set to `None` for txs executed on earlier versions. + optional uint32 stack_height = 4; } message CompiledInstruction { diff --git a/proto/proto/geyser.proto b/proto/proto/geyser.proto index 0e1cda4..0287a2e 100644 --- a/proto/proto/geyser.proto +++ b/proto/proto/geyser.proto @@ -113,6 +113,8 @@ message BlockUpdate { repeated storage.ConfirmedBlock.Reward rewards = 3; google.protobuf.Timestamp block_time = 4; optional uint64 block_height = 5; + optional uint64 executed_transaction_count = 6; + optional uint64 entry_count = 7; } message TimestampedBlockUpdate { diff --git a/proto/proto/transaction_by_addr.proto b/proto/proto/transaction_by_addr.proto index 3169fe6..7c0966a 100644 --- a/proto/proto/transaction_by_addr.proto +++ b/proto/proto/transaction_by_addr.proto @@ -57,8 +57,11 @@ enum TransactionErrorType { WOULD_EXCEED_ACCOUNT_DATA_TOTAL_LIMIT = 29; DUPLICATE_INSTRUCTION = 30; INSUFFICIENT_FUNDS_FOR_RENT = 31; - BUNDLE_NOT_CONTINUOUS = 32; // TODO (LB): this needs to be removed from here in jito-solana - SKIPPED_EXECUTION = 33; // TODO (LB): this needs to be removed from here in jito-solana + MAX_LOADED_ACCOUNTS_DATA_SIZE_EXCEEDED = 32; + INVALID_LOADED_ACCOUNTS_DATA_SIZE_LIMIT = 33; + RESANITIZATION_NEEDED = 34; + PROGRAM_EXECUTION_TEMPORARILY_RESTRICTED = 35; + UNBALANCED_TRANSACTION = 36; } message InstructionError { @@ -122,8 +125,10 @@ enum InstructionErrorType { ARITHMETIC_OVERFLOW = 47; UNSUPPORTED_SYSVAR = 48; ILLEGAL_OWNER = 49; - MAX_ACCOUNTS_DATA_SIZE_EXCEEDED = 50; + MAX_ACCOUNTS_DATA_ALLOCATIONS_EXCEEDED = 50; MAX_ACCOUNTS_EXCEEDED = 51; + MAX_INSTRUCTION_TRACE_LENGTH_EXCEEDED = 52; + BUILTIN_PROGRAMS_MUST_CONSUME_COMPUTE_UNITS = 53; } message UnixTimestamp { diff --git a/proto/src/convert.rs b/proto/src/convert.rs index 4291bcf..1b71ae1 100644 --- a/proto/src/convert.rs +++ b/proto/src/convert.rs @@ -4,13 +4,6 @@ use std::{ str::FromStr, }; -#[cfg(feature = "jito-solana")] -extern crate jito_solana_account_decoder as solana_account_decoder; -#[cfg(feature = "jito-solana")] -extern crate jito_solana_sdk as solana_sdk; -#[cfg(feature = "jito-solana")] -extern crate jito_solana_transaction_status as solana_transaction_status; - use solana_account_decoder::parse_token::{real_number_string_trimmed, UiTokenAmount}; use solana_sdk::{ hash::Hash, @@ -26,7 +19,7 @@ use solana_sdk::{ transaction_context::TransactionReturnData, }; use solana_transaction_status::{ - ConfirmedBlock, InnerInstructions, Reward, RewardType, TransactionByAddrInfo, + ConfirmedBlock, InnerInstruction, InnerInstructions, Reward, RewardType, TransactionByAddrInfo, TransactionStatusMeta, TransactionTokenBalance, TransactionWithStatusMeta, VersionedConfirmedBlock, VersionedTransactionWithStatusMeta, }; @@ -242,8 +235,9 @@ impl From for VersionedTransaction { signatures: value .signatures .into_iter() - .map(|x| Signature::new(&x)) - .collect(), + .map(Signature::try_from) + .collect::>() + .unwrap(), message: value.message.expect("message is required").into(), } } @@ -304,7 +298,7 @@ impl From for VersionedMessage { let account_keys = value .account_keys .into_iter() - .map(|key| Pubkey::try_from(key).expect("Failed to parse Pubkey")) + .map(|key| Pubkey::try_from(key).unwrap()) .collect(); let recent_blockhash = Hash::new(&value.recent_blockhash); let instructions = value.instructions.into_iter().map(|ix| ix.into()).collect(); @@ -498,12 +492,20 @@ impl TryFrom for TransactionStatusMeta { let loaded_addresses = LoadedAddresses { writable: loaded_writable_addresses .into_iter() - .map(|key| Pubkey::try_from(key).expect("Failed to parse Pubkey")) - .collect(), + .map(Pubkey::try_from) + .collect::>() + .map_err(|err| { + let err = format!("Invalid writable address: {err:?}"); + Self::Error::new(bincode::ErrorKind::Custom(err)) + })?, readonly: loaded_readonly_addresses .into_iter() - .map(|key| Pubkey::try_from(key).expect("Failed to parse Pubkey")) - .collect(), + .map(Pubkey::try_from) + .collect::>() + .map_err(|err| { + let err = format!("Invalid readonly address: {err:?}"); + Self::Error::new(bincode::ErrorKind::Custom(err)) + })?, }; let return_data = if return_data_none { None @@ -604,7 +606,7 @@ impl From for confirmed_block::MessageAddressTableLoo impl From for MessageAddressTableLookup { fn from(value: confirmed_block::MessageAddressTableLookup) -> Self { Self { - account_key: Pubkey::try_from(value.account_key).expect("Failed to parse Pubkey"), + account_key: Pubkey::try_from(value.account_key).unwrap(), writable_indexes: value.writable_indexes, readonly_indexes: value.readonly_indexes, } @@ -623,7 +625,7 @@ impl From for confirmed_block::ReturnData { impl From for TransactionReturnData { fn from(value: confirmed_block::ReturnData) -> Self { Self { - program_id: Pubkey::try_from(value.program_id).expect("Failed to parse Pubkey"), + program_id: Pubkey::try_from(value.program_id).unwrap(), data: value.data, } } @@ -649,6 +651,30 @@ impl From for CompiledInstruction { } } +impl From for confirmed_block::InnerInstruction { + fn from(value: InnerInstruction) -> Self { + Self { + program_id_index: value.instruction.program_id_index as u32, + accounts: value.instruction.accounts, + data: value.instruction.data, + stack_height: value.stack_height, + } + } +} + +impl From for InnerInstruction { + fn from(value: confirmed_block::InnerInstruction) -> Self { + Self { + instruction: CompiledInstruction { + program_id_index: value.program_id_index as u8, + accounts: value.accounts, + data: value.data, + }, + stack_height: value.stack_height, + } + } +} + impl TryFrom for TransactionError { type Error = &'static str; @@ -712,8 +738,10 @@ impl TryFrom for TransactionError { 47 => InstructionError::ArithmeticOverflow, 48 => InstructionError::UnsupportedSysvar, 49 => InstructionError::IllegalOwner, - 50 => InstructionError::MaxAccountsDataSizeExceeded, + 50 => InstructionError::MaxAccountsDataAllocationsExceeded, 51 => InstructionError::MaxAccountsExceeded, + 52 => InstructionError::MaxInstructionTraceLengthExceeded, + 53 => InstructionError::BuiltinProgramsMustConsumeComputeUnits, _ => return Err("Invalid InstructionError"), }; @@ -736,6 +764,12 @@ impl TryFrom for TransactionError { account_index: transaction_details.index as u8, }); } + + 35 => { + return Ok(TransactionError::ProgramExecutionTemporarilyRestricted { + account_index: transaction_details.index as u8, + }); + } _ => {} } } @@ -770,8 +804,10 @@ impl TryFrom for TransactionError { 27 => TransactionError::InvalidRentPayingAccount, 28 => TransactionError::WouldExceedMaxVoteCostLimit, 29 => TransactionError::WouldExceedAccountDataTotalLimit, - // 32 => TransactionError::BundleNotContinuous, - // 33 => TransactionError::SkippedExecution, + 32 => TransactionError::MaxLoadedAccountsDataSizeExceeded, + 33 => TransactionError::InvalidLoadedAccountsDataSizeLimit, + 34 => TransactionError::ResanitizationNeeded, + 36 => TransactionError::UnbalancedTransaction, _ => return Err("Invalid TransactionError"), }) } @@ -875,13 +911,20 @@ impl From for tx_by_addr::TransactionError { TransactionError::InsufficientFundsForRent { .. } => { tx_by_addr::TransactionErrorType::InsufficientFundsForRent } - #[cfg(feature = "jito-solana")] - TransactionError::BundleNotContinuous => { - tx_by_addr::TransactionErrorType::BundleNotContinuous + TransactionError::MaxLoadedAccountsDataSizeExceeded => { + tx_by_addr::TransactionErrorType::MaxLoadedAccountsDataSizeExceeded } - #[cfg(feature = "jito-solana")] - TransactionError::SkippedExecution => { - tx_by_addr::TransactionErrorType::SkippedExecution + TransactionError::InvalidLoadedAccountsDataSizeLimit => { + tx_by_addr::TransactionErrorType::InvalidLoadedAccountsDataSizeLimit + } + TransactionError::ResanitizationNeeded => { + tx_by_addr::TransactionErrorType::ResanitizationNeeded + } + TransactionError::ProgramExecutionTemporarilyRestricted { .. } => { + tx_by_addr::TransactionErrorType::ProgramExecutionTemporarilyRestricted + } + TransactionError::UnbalancedTransaction => { + tx_by_addr::TransactionErrorType::UnbalancedTransaction } } as i32, instruction_error: match transaction_error { @@ -1037,12 +1080,18 @@ impl From for tx_by_addr::TransactionError { InstructionError::IllegalOwner => { tx_by_addr::InstructionErrorType::IllegalOwner } - InstructionError::MaxAccountsDataSizeExceeded => { - tx_by_addr::InstructionErrorType::MaxAccountsDataSizeExceeded + InstructionError::MaxAccountsDataAllocationsExceeded => { + tx_by_addr::InstructionErrorType::MaxAccountsDataAllocationsExceeded } InstructionError::MaxAccountsExceeded => { tx_by_addr::InstructionErrorType::MaxAccountsExceeded } + InstructionError::MaxInstructionTraceLengthExceeded => { + tx_by_addr::InstructionErrorType::MaxInstructionTraceLengthExceeded + } + InstructionError::BuiltinProgramsMustConsumeComputeUnits => { + tx_by_addr::InstructionErrorType::BuiltinProgramsMustConsumeComputeUnits + } } as i32, custom: match instruction_error { InstructionError::Custom(custom) => { @@ -1065,6 +1114,12 @@ impl From for tx_by_addr::TransactionError { index: account_index as u32, }) } + TransactionError::ProgramExecutionTemporarilyRestricted { account_index } => { + Some(tx_by_addr::TransactionDetails { + index: account_index as u32, + }) + } + _ => None, }, } @@ -1103,7 +1158,8 @@ impl TryFrom for TransactionByAddrInfo { .transpose()?; Ok(Self { - signature: Signature::new(&transaction_by_addr.signature), + signature: Signature::try_from(transaction_by_addr.signature) + .map_err(|_| "Invalid Signature")?, err, index: transaction_by_addr.index, memo: transaction_by_addr @@ -1130,7 +1186,7 @@ impl TryFrom for Vec { #[cfg(test)] mod test { - use solana_sdk::bs58; + use enum_iterator::all; use super::*; @@ -1166,7 +1222,11 @@ mod test { #[test] fn test_transaction_by_addr_encode() { let info = TransactionByAddrInfo { - signature: Signature::new(&bs58::decode("Nfo6rgemG1KLbk1xuNwfrQTsdxaGfLuWURHNRy9LYnDrubG7LFQZaA5obPNas9LQ6DdorJqxh2LxA3PsnWdkSrL").into_vec().unwrap()), + signature: bs58::decode("Nfo6rgemG1KLbk1xuNwfrQTsdxaGfLuWURHNRy9LYnDrubG7LFQZaA5obPNas9LQ6DdorJqxh2LxA3PsnWdkSrL") + .into_vec() + .map(Signature::try_from) + .unwrap() + .unwrap(), err: None, index: 5, memo: Some("string".to_string()), @@ -1752,24 +1812,25 @@ mod test { transaction_error, tx_by_addr_transaction_error.try_into().unwrap() ); + + let transaction_error = TransactionError::UnbalancedTransaction; + let tx_by_addr_transaction_error: tx_by_addr::TransactionError = + transaction_error.clone().into(); + assert_eq!( + transaction_error, + tx_by_addr_transaction_error.try_into().unwrap() + ); } #[test] fn test_error_enums() { let ix_index = 1; let custom_error = 42; - let transaction_error_types = - (0..32) // ignore BundleNotContinuous and SkippedExecution - .filter_map(tx_by_addr::TransactionErrorType::from_i32) - .collect::>(); - let instruction_error_types = (0..256) - .filter_map(tx_by_addr::InstructionErrorType::from_i32) - .collect::>(); - - for error in transaction_error_types { + for error in all::() { match error { tx_by_addr::TransactionErrorType::DuplicateInstruction - | tx_by_addr::TransactionErrorType::InsufficientFundsForRent => { + | tx_by_addr::TransactionErrorType::InsufficientFundsForRent + | tx_by_addr::TransactionErrorType::ProgramExecutionTemporarilyRestricted => { let tx_by_addr_error = tx_by_addr::TransactionError { transaction_error: error as i32, instruction_error: None, @@ -1780,11 +1841,11 @@ mod test { let transaction_error: TransactionError = tx_by_addr_error .clone() .try_into() - .unwrap_or_else(|_| panic!("{:?} conversion implemented?", error)); + .unwrap_or_else(|_| panic!("{error:?} conversion implemented?")); assert_eq!(tx_by_addr_error, transaction_error.into()); } tx_by_addr::TransactionErrorType::InstructionError => { - for ix_error in instruction_error_types.clone() { + for ix_error in all::() { if ix_error != tx_by_addr::InstructionErrorType::Custom { let tx_by_addr_error = tx_by_addr::TransactionError { transaction_error: error as i32, @@ -1795,10 +1856,10 @@ mod test { }), transaction_details: None, }; - let transaction_error: TransactionError = - tx_by_addr_error.clone().try_into().unwrap_or_else(|_| { - panic!("{:?} conversion implemented?", ix_error) - }); + let transaction_error: TransactionError = tx_by_addr_error + .clone() + .try_into() + .unwrap_or_else(|_| panic!("{ix_error:?} conversion implemented?")); assert_eq!(tx_by_addr_error, transaction_error.into()); } else { let tx_by_addr_error = tx_by_addr::TransactionError { @@ -1827,7 +1888,7 @@ mod test { let transaction_error: TransactionError = tx_by_addr_error .clone() .try_into() - .unwrap_or_else(|_| panic!("{:?} conversion implemented?", error)); + .unwrap_or_else(|_| panic!("{error:?} conversion implemented?")); assert_eq!(tx_by_addr_error, transaction_error.into()); } } diff --git a/proto/src/lib.rs b/proto/src/lib.rs index 3a74137..729bd6c 100644 --- a/proto/src/lib.rs +++ b/proto/src/lib.rs @@ -13,13 +13,6 @@ use solana_transaction_status::{ InnerInstructions, Reward, RewardType, TransactionStatusMeta, TransactionTokenBalance, }; -#[cfg(feature = "jito-solana")] -extern crate jito_solana_account_decoder as solana_account_decoder; -#[cfg(feature = "jito-solana")] -extern crate jito_solana_sdk as solana_sdk; -#[cfg(feature = "jito-solana")] -extern crate jito_solana_transaction_status as solana_transaction_status; - pub mod convert; // NOTE: Jito Labs added diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 367415d..fb780c6 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,3 +1,3 @@ [toolchain] -channel = "1.60.0" +channel = "1.73.0" components = [ "rustfmt", "rustc-dev", "clippy", "cargo" ] diff --git a/server/Cargo.toml b/server/Cargo.toml index 2a112e1..93083ce 100644 --- a/server/Cargo.toml +++ b/server/Cargo.toml @@ -1,52 +1,40 @@ [package] name = "geyser-grpc-plugin-server" -version = "0.1.0" -license = "Apache-2.0" -authors = ["Jito Foundation "] -edition = "2021" +version = { workspace = true } +license = { workspace = true } +authors = { workspace = true } +edition = { workspace = true } [lib] crate-type = ["cdylib", "rlib"] [dependencies] -bs58 = "0.4.0" -crossbeam-channel = "0.5.8" -futures-util = "0.3.28" -jito-geyser-protos = { path = "../proto" } - -jito-solana-geyser-plugin-interface = { git = "https://github.com/jito-foundation/jito-solana.git", tag = "v1.14.17-jito", package = "solana-geyser-plugin-interface", optional = true } -jito-solana-logger = { git = "https://github.com/jito-foundation/jito-solana.git", tag = "v1.14.17-jito", package = "solana-logger", optional = true } -jito-solana-metrics = { git = "https://github.com/jito-foundation/jito-solana.git", tag = "v1.14.17-jito", package = "solana-metrics", optional = true } -jito-solana-program = { git = "https://github.com/jito-foundation/jito-solana.git", tag = "v1.14.17-jito", package = "solana-program", optional = true } -jito-solana-sdk = { git = "https://github.com/jito-foundation/jito-solana.git", tag = "v1.14.17-jito", package = "solana-sdk", optional = true } -jito-solana-vote-program = { git = "https://github.com/jito-foundation/jito-solana.git", tag = "v1.14.17-jito", package = "solana-vote-program", optional = true } -log = "0.4.17" -once_cell = "1.17.1" -prost = "0.11.9" -prost-types = "0.11.9" -serde = "1.0.160" -serde_derive = "1.0.160" -serde_json = "1.0.96" - -solana-geyser-plugin-interface = "~1.14" -solana-logger = "~1.14" -solana-metrics = "~1.14" -solana-program = "~1.14" -solana-sdk = "~1.14" -solana-transaction-status = "~1.14" -solana-vote-program = "~1.14" - -thiserror = "1.0.40" -tokio = { version = "~1.14.1", features = ["rt-multi-thread"] } -tokio-stream = "0.1" -tonic = "0.9.2" -uuid = { version = "1.3.1", features = ["v4", "fast-rng"] } - -[features] -jito-solana = ["jito-solana-geyser-plugin-interface", "jito-solana-logger", "jito-solana-metrics", "jito-solana-program", "jito-solana-sdk", "jito-solana-vote-program"] +bs58 = { workspace = true } +crossbeam-channel = { workspace = true } +futures-util = { workspace = true } +jito-geyser-protos = { workspace = true } +log = { workspace = true } +once_cell = { workspace = true } +prost = { workspace = true } +prost-types = { workspace = true } +serde = { workspace = true } +serde_derive = { workspace = true } +serde_json = { workspace = true } +solana-geyser-plugin-interface = { workspace = true } +solana-logger = { workspace = true } +solana-metrics = { workspace = true } +solana-program = { workspace = true } +solana-sdk = { workspace = true } +solana-transaction-status = { workspace = true } +solana-vote-program = { workspace = true } +thiserror = { workspace = true } +tokio = { workspace = true } +tokio-stream = { workspace = true } +tonic = { workspace = true } +uuid = { workspace = true } [build-dependencies] -tonic-build = "0.9.2" +tonic-build = { workspace = true } [package.metadata.docs.rs] targets = ["x86_64-unknown-linux-gnu"] diff --git a/server/src/geyser_grpc_plugin.rs b/server/src/geyser_grpc_plugin.rs index 690f09e..09b08a4 100644 --- a/server/src/geyser_grpc_plugin.rs +++ b/server/src/geyser_grpc_plugin.rs @@ -151,7 +151,7 @@ impl GeyserPlugin for GeyserGrpcPlugin { } fn update_account( - &mut self, + &self, account: ReplicaAccountInfoVersions, slot: u64, is_startup: bool, @@ -193,6 +193,22 @@ impl GeyserPlugin for GeyserGrpcPlugin { }), } } + ReplicaAccountInfoVersions::V0_0_3(account) => TimestampedAccountUpdate { + ts: Some(prost_types::Timestamp::from(SystemTime::now())), + account_update: Some(AccountUpdate { + slot, + pubkey: account.pubkey.to_vec(), + lamports: account.lamports, + owner: account.owner.to_vec(), + is_executable: account.executable, + rent_epoch: account.rent_epoch, + data: account.data.to_vec(), + seq: account.write_version, + is_startup, + tx_signature: account.txn.map(|tx| tx.signature().to_string()), + replica_version: 2, + }), + }, }; let pubkey = &account_update.account_update.as_ref().unwrap().pubkey; @@ -238,12 +254,12 @@ impl GeyserPlugin for GeyserGrpcPlugin { } } - fn notify_end_of_startup(&mut self) -> PluginResult<()> { + fn notify_end_of_startup(&self) -> PluginResult<()> { Ok(()) } fn update_slot_status( - &mut self, + &self, slot: u64, parent_slot: Option, status: SlotStatus, @@ -280,7 +296,7 @@ impl GeyserPlugin for GeyserGrpcPlugin { } fn notify_transaction( - &mut self, + &self, transaction: ReplicaTransactionInfoVersions, slot: u64, ) -> PluginResult<()> { @@ -329,7 +345,7 @@ impl GeyserPlugin for GeyserGrpcPlugin { } } - fn notify_block_metadata(&mut self, block_info: ReplicaBlockInfoVersions) -> PluginResult<()> { + fn notify_block_metadata(&self, block_info: ReplicaBlockInfoVersions) -> PluginResult<()> { let data = self.data.as_ref().expect("plugin must be initialized"); let block = match block_info { @@ -344,6 +360,38 @@ impl GeyserPlugin for GeyserGrpcPlugin { nanos: 0, }), block_height: block.block_height, + executed_transaction_count: None, + entry_count: None, + }), + }, + ReplicaBlockInfoVersions::V0_0_2(block) => TimestampedBlockUpdate { + ts: Some(prost_types::Timestamp::from(SystemTime::now())), + block_update: Some(BlockUpdate { + slot: block.slot, + blockhash: block.blockhash.to_string(), + rewards: block.rewards.iter().map(|r| (*r).clone().into()).collect(), + block_time: block.block_time.map(|t| prost_types::Timestamp { + seconds: t, + nanos: 0, + }), + block_height: block.block_height, + executed_transaction_count: Some(block.executed_transaction_count), + entry_count: None, + }), + }, + ReplicaBlockInfoVersions::V0_0_3(block) => TimestampedBlockUpdate { + ts: Some(prost_types::Timestamp::from(SystemTime::now())), + block_update: Some(BlockUpdate { + slot: block.slot, + blockhash: block.blockhash.to_string(), + rewards: block.rewards.iter().map(|r| (*r).clone().into()).collect(), + block_time: block.block_time.map(|t| prost_types::Timestamp { + seconds: t, + nanos: 0, + }), + block_height: block.block_height, + executed_transaction_count: Some(block.executed_transaction_count), + entry_count: Some(block.entry_count), }), }, };