diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 4e18584..bab62d5 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -36,7 +36,7 @@ jobs: - name: Set rust version run: | RUST_VERSION="$(grep -oP 'channel = "\K\d\.\d+\.\d+(?=")' rust-toolchain.toml)" - echo "RUST_VERSION=$RUST_VERSION" >> "$GITHUB_ENV" + echo "RUST_STABLE_VERSION=$RUST_VERSION" >> "$GITHUB_ENV" - name: Set env vars run: | @@ -97,7 +97,7 @@ jobs: body: | ${{ env.GEYSER_PLUGIN_NAME }} ${{ env.CI_TAG }} solana ${{ env.SOLANA_VERSION }} - rust ${{ env.RUST_VERSION }} + rust ${{ env.RUST_STABLE_VERSION }} files: | ${{ env.GEYSER_PLUGIN_NAME }}-release* target/release/config* diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b1136df..2e25d38 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -29,7 +29,7 @@ jobs: - name: Set rust version run: | RUST_VERSION="$(grep -oP 'channel = "\K\d\.\d+\.\d+(?=")' rust-toolchain.toml)" - echo "RUST_VERSION=$RUST_VERSION" >> "$GITHUB_ENV" + echo "RUST_STABLE_VERSION=$RUST_VERSION" >> "$GITHUB_ENV" - name: Set env vars run: | @@ -61,7 +61,7 @@ jobs: - uses: dtolnay/rust-toolchain@stable with: - toolchain: ${{ env.RUST_VERSION }} + toolchain: ${{ env.RUST_STABLE_VERSION }} components: clippy - name: cargo tree diff --git a/Cargo.lock b/Cargo.lock index 5236039..86d6b9f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -65,9 +65,9 @@ dependencies = [ [[package]] name = "agave-geyser-plugin-interface" -version = "2.0.13" +version = "2.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14e315bd6da6774dc6a628acd72c6378f9f1051339ce7aa44d825a07583b7abc" +checksum = "5beb5f9555d007439d578562cce2466ba85ef35e9046dbb6651526ec57a9bca4" dependencies = [ "log", "solana-sdk", @@ -361,7 +361,7 @@ checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.98", ] [[package]] @@ -450,20 +450,11 @@ dependencies = [ "serde", ] -[[package]] -name = "bitmaps" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "031043d04099746d8db04daf1fa424b2bc8bd69d92b25962dcde24da39ab64a2" -dependencies = [ - "typenum", -] - [[package]] name = "blake3" -version = "1.5.1" +version = "1.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30cca6d3674597c30ddf2c587bf8d9d65c9a84d2326d941cc79c9842dfe0ef52" +checksum = "b8ee0c1824c4dea5b5f81736aff91bae041d2c07ee1192bec91054e10e3e601e" dependencies = [ "arrayref", "arrayvec", @@ -479,7 +470,6 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" dependencies = [ - "block-padding", "generic-array", ] @@ -492,12 +482,6 @@ dependencies = [ "generic-array", ] -[[package]] -name = "block-padding" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae" - [[package]] name = "borsh" version = "0.9.3" @@ -564,7 +548,7 @@ dependencies = [ "proc-macro-crate 3.2.0", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.98", "syn_derive", ] @@ -681,7 +665,7 @@ checksum = "bcfcc3cd946cb52f0bbfdbbcfa2f4e24f75ebb6c0e1002f7c25904fada18b9ec" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.98", ] [[package]] @@ -731,6 +715,17 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" +[[package]] +name = "cfg_eval" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45565fc9416b9896014f5732ac776f810ee53a66730c17e4020c3ec064a8f88f" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.98", +] + [[package]] name = "chrono" version = "0.4.38" @@ -787,7 +782,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.98", ] [[package]] @@ -898,25 +893,6 @@ dependencies = [ "crossbeam-utils", ] -[[package]] -name = "crossbeam-deque" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" -dependencies = [ - "crossbeam-epoch", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-epoch" -version = "0.9.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" -dependencies = [ - "crossbeam-utils", -] - [[package]] name = "crossbeam-utils" version = "0.8.20" @@ -971,18 +947,46 @@ dependencies = [ [[package]] name = "curve25519-dalek" -version = "3.2.1" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90f9d052967f590a76e62eb387bd0bbb1b000182c3cefe5364db6b7211651bc0" +checksum = "0b9fdf9972b2bd6af2d913799d9ebc165ea4d2e65878e329d9c6b372c4491b61" dependencies = [ "byteorder", "digest 0.9.0", "rand_core 0.5.1", + "subtle", + "zeroize", +] + +[[package]] +name = "curve25519-dalek" +version = "4.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97fb8b7c4503de7d6ae7b42ab72a5a59857b4c937ec27a3d4539dba95b5ab2be" +dependencies = [ + "cfg-if", + "cpufeatures", + "curve25519-dalek-derive", + "digest 0.10.7", + "fiat-crypto", + "rand_core 0.6.4", + "rustc_version", "serde", "subtle", "zeroize", ] +[[package]] +name = "curve25519-dalek-derive" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.98", +] + [[package]] name = "darling" version = "0.20.10" @@ -1004,7 +1008,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.79", + "syn 2.0.98", ] [[package]] @@ -1015,7 +1019,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core", "quote", - "syn 2.0.79", + "syn 2.0.98", ] [[package]] @@ -1062,7 +1066,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.98", ] [[package]] @@ -1072,7 +1076,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab63b0e2bf4d5928aff72e83a7dace85d7bba5fe12dcc3c5a572d78caffd3f3c" dependencies = [ "derive_builder_core", - "syn 2.0.79", + "syn 2.0.98", ] [[package]] @@ -1137,7 +1141,7 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c762bae6dcaf24c4c84667b8579785430908723d5c889f469d76a41d59cc7a9d" dependencies = [ - "curve25519-dalek", + "curve25519-dalek 3.2.0", "ed25519", "rand 0.7.3", "serde", @@ -1189,7 +1193,7 @@ checksum = "a1ab991c1362ac86c61ab6f556cff143daa22e5a15e4e189df818b2fd19fe65b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.98", ] [[package]] @@ -1253,6 +1257,12 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "835a3dc7d1ec9e75e2b5fb4ba75396837112d2060b03f7d43bc1897c7f7211da" +[[package]] +name = "fiat-crypto" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d" + [[package]] name = "field-offset" version = "0.3.6" @@ -1263,6 +1273,21 @@ dependencies = [ "rustc_version", ] +[[package]] +name = "five8_const" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b4f62f0f8ca357f93ae90c8c2dd1041a1f665fde2f889ea9b1787903829015" +dependencies = [ + "five8_core", +] + +[[package]] +name = "five8_core" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94474d15a76982be62ca8a39570dccce148d98c238ebb7408b0a21b2c4bdddc4" + [[package]] name = "flate2" version = "1.0.34" @@ -1359,7 +1384,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.98", ] [[package]] @@ -1462,18 +1487,7 @@ checksum = "53010ccb100b96a67bc32c0175f0ed1426b31b655d562898e57325f81c023ac0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", -] - -[[package]] -name = "goblin" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7666983ed0dd8d21a6f6576ee00053ca0926fb281a5522577a4dbd0f1b54143" -dependencies = [ - "log", - "plain", - "scroll", + "syn 2.0.98", ] [[package]] @@ -1813,22 +1827,6 @@ dependencies = [ "unicode-normalization", ] -[[package]] -name = "im" -version = "15.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0acd33ff0285af998aaf9b57342af478078f53492322fafc47450e09397e0e9" -dependencies = [ - "bitmaps", - "rand_core 0.6.4", - "rand_xoshiro", - "rayon", - "serde", - "sized-chunks", - "typenum", - "version_check", -] - [[package]] name = "indexmap" version = "2.6.0" @@ -1928,9 +1926,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "libc" -version = "0.2.159" +version = "0.2.169" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5" +checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a" [[package]] name = "libredox" @@ -1990,18 +1988,6 @@ dependencies = [ "libsecp256k1-core", ] -[[package]] -name = "light-poseidon" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c9a85a9752c549ceb7578064b4ed891179d20acd85f27318573b64d2d7ee7ee" -dependencies = [ - "ark-bn254", - "ark-ff", - "num-bigint 0.4.6", - "thiserror", -] - [[package]] name = "linux-raw-sys" version = "0.4.14" @@ -2195,7 +2181,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.98", ] [[package]] @@ -2278,7 +2264,7 @@ dependencies = [ "proc-macro-crate 3.2.0", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.98", ] [[package]] @@ -2334,7 +2320,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.98", ] [[package]] @@ -2384,15 +2370,6 @@ version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" -[[package]] -name = "pbkdf2" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "216eaa586a190f0a738f2f918511eecfa90f13295abec0e457cdebcceda80cbd" -dependencies = [ - "crypto-mac 0.8.0", -] - [[package]] name = "pbkdf2" version = "0.11.0" @@ -2434,7 +2411,7 @@ checksum = "a4502d8515ca9f32f1fb543d987f63d95a14934883db45bdb48060b6b69257f8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.98", ] [[package]] @@ -2455,12 +2432,6 @@ version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" -[[package]] -name = "plain" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6" - [[package]] name = "polyval" version = "0.6.2" @@ -2541,9 +2512,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.87" +version = "1.0.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3e4daa0dcf6feba26f985457cdf104d4b4256fc5a09547140f3631bb076b19a" +checksum = "60946a68e5f9d28b0dc1c21bb8a97ee7d018a8b322fa57838ba31cc878e22d99" dependencies = [ "unicode-ident", ] @@ -2658,35 +2629,6 @@ dependencies = [ "rand_core 0.5.1", ] -[[package]] -name = "rand_xoshiro" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f97cdb2a36ed4183de61b2f824cc45c9f1037f28afe0a322e9fff4c108b5aaa" -dependencies = [ - "rand_core 0.6.4", -] - -[[package]] -name = "rayon" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" -dependencies = [ - "either", - "rayon-core", -] - -[[package]] -name = "rayon-core" -version = "1.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" -dependencies = [ - "crossbeam-deque", - "crossbeam-utils", -] - [[package]] name = "redis" version = "0.21.7" @@ -2918,12 +2860,6 @@ version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" -[[package]] -name = "rustc-hash" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" - [[package]] name = "rustc_version" version = "0.4.1" @@ -3015,20 +2951,6 @@ name = "scroll" version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "04c565b551bafbef4157586fa379538366e4385d42082f255bfd96e4fe8519da" -dependencies = [ - "scroll_derive", -] - -[[package]] -name = "scroll_derive" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1db149f81d46d2deba7cd3c50772474707729550221e69588478ebf9ada425ae" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.79", -] [[package]] name = "sct" @@ -3074,9 +2996,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.210" +version = "1.0.217" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" +checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70" dependencies = [ "serde_derive", ] @@ -3092,20 +3014,20 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.210" +version = "1.0.217" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" +checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.98", ] [[package]] name = "serde_json" -version = "1.0.128" +version = "1.0.138" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" +checksum = "d434192e7da787e94a6ea7e9670b26a036d0ca41e0b7efb2676dd32bae872949" dependencies = [ "itoa", "memchr", @@ -3136,24 +3058,25 @@ dependencies = [ [[package]] name = "serde_with" -version = "2.3.3" +version = "3.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07ff71d2c147a7b57362cead5e22f772cd52f6ab31cfcd9edcd7f6aeb2a0afbe" +checksum = "d6b6f7f2fcb69f747921f79f3926bd1e203fce4fef62c268dd3abfb6d86029aa" dependencies = [ "serde", + "serde_derive", "serde_with_macros", ] [[package]] name = "serde_with_macros" -version = "2.3.3" +version = "3.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "881b6f881b17d13214e5d494c939ebab463d01264ce1811e9d4ac3a882e7695f" +checksum = "8d00caa5193a3c8362ac2b73be6b9e768aa5a4b2f721d8f4b339600c3cb51f8e" dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.98", ] [[package]] @@ -3173,8 +3096,8 @@ dependencies = [ "num_enum 0.5.11", "safe-transmute", "serde", - "solana-program 1.18.26", - "spl-token 3.5.0", + "solana-program 1.10.0", + "spl-token 3.3.0", "static_assertions", "thiserror", "without-alloc", @@ -3219,18 +3142,6 @@ dependencies = [ "digest 0.10.7", ] -[[package]] -name = "sha3" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f81199417d4e5de3f04b1e871023acea7389672c4135918f05aa9cbf2f2fa809" -dependencies = [ - "block-buffer 0.9.0", - "digest 0.9.0", - "keccak", - "opaque-debug", -] - [[package]] name = "sha3" version = "0.10.8" @@ -3268,16 +3179,6 @@ version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" -[[package]] -name = "sized-chunks" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16d69225bde7a69b235da73377861095455d298f2b970996eec25ddbb42b3d1e" -dependencies = [ - "bitmaps", - "typenum", -] - [[package]] name = "slab" version = "0.4.9" @@ -3303,11 +3204,25 @@ dependencies = [ "windows-sys 0.52.0", ] +[[package]] +name = "solana-account" +version = "2.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2197f7b15bc6041fa833974025a6006a111977cd4fd35848b743757c1a409f5" +dependencies = [ + "bincode", + "serde", + "serde_bytes", + "serde_derive", + "solana-instruction", + "solana-program 2.1.13", +] + [[package]] name = "solana-account-decoder" -version = "2.0.13" +version = "2.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41d87c6ef8c13eb759fa8d887e12c67afd851799050b6afd501a27726551f52e" +checksum = "fd87b663fb20629017104e7428894dbd020e362a51a117cc5edf5e46a81f7f40" dependencies = [ "Inflector", "base64 0.22.1", @@ -3318,6 +3233,7 @@ dependencies = [ "serde", "serde_derive", "serde_json", + "solana-account-decoder-client-types", "solana-config-program", "solana-sdk", "spl-token 6.0.0", @@ -3325,86 +3241,244 @@ dependencies = [ "spl-token-group-interface", "spl-token-metadata-interface", "thiserror", - "zstd 0.11.2+zstd.1.5.2", + "zstd 0.13.2", +] + +[[package]] +name = "solana-account-decoder-client-types" +version = "2.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "508a03567b2b5421f9e0f01518f77eb1d0131d1c48f5f22223fe626d6902b622" +dependencies = [ + "base64 0.22.1", + "bs58 0.5.1", + "serde", + "serde_derive", + "serde_json", + "solana-account", + "solana-pubkey", + "zstd 0.13.2", +] + +[[package]] +name = "solana-account-info" +version = "2.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a67b02d022266e0979a3033f58f83c6e4d45f7e7cc85e6beeaf90b32ef5ede8" +dependencies = [ + "bincode", + "serde", + "solana-program-error", + "solana-program-memory", + "solana-pubkey", +] + +[[package]] +name = "solana-atomic-u64" +version = "2.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2453e9e0f5e948d83d1ea5ceef6a0488b39cb57f21e19d73d5dc57f27464ec8d" +dependencies = [ + "parking_lot", +] + +[[package]] +name = "solana-bincode" +version = "2.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b235339197024a4f5c80b2ab5961f616c3ee2aa4542af082a0cc9c84c82b3c09" +dependencies = [ + "bincode", + "serde", + "solana-instruction", +] + +[[package]] +name = "solana-bn254" +version = "2.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f1b3e79f6ad47ffeb75be02d69828c00926af536083dadc6db8282ef1f0774e" +dependencies = [ + "ark-bn254", + "ark-ec", + "ark-ff", + "ark-serialize", + "bytemuck", + "solana-program 2.1.13", + "thiserror", +] + +[[package]] +name = "solana-borsh" +version = "2.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3950d83165c85ac9cb92be986a76c7a543c5c14c1e98982d6dfad3d98e6b2353" +dependencies = [ + "borsh 0.10.4", + "borsh 1.5.1", +] + +[[package]] +name = "solana-clock" +version = "2.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bfdce9a9f46965ffb6e1e7cc0e52efeb834c89dc67d7399770a9d4447498fdb" +dependencies = [ + "serde", + "serde_derive", + "solana-sdk-macro 2.1.13", + "solana-sysvar-id", ] [[package]] name = "solana-compute-budget" -version = "2.0.13" +version = "2.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5acde49a883ca3e099a8050ad8321ea56b02041995dadcf84b0dab14561cc34a" +checksum = "6989b3fa34b7190243346bee5c4c208b7d24da189c6c3cbd329227d5ab0d6b8b" dependencies = [ - "rustc_version", "solana-sdk", ] [[package]] name = "solana-config-program" -version = "2.0.13" +version = "2.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f638e44fb308bdc1ce99eb0fee194b2cb212917b258999cdb4a8b056d48973d4" +checksum = "26640009743713f9a5dfa195e511cc817aa5d793e0068415cab80dc03474bca0" dependencies = [ "bincode", "chrono", "serde", "serde_derive", + "solana-log-collector", "solana-program-runtime", "solana-sdk", + "solana-short-vec", +] + +[[package]] +name = "solana-cpi" +version = "2.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd452db5b927c0abbbd47ccc9f233a480754ecc7d07a9c5826c4d1f09168b6e1" +dependencies = [ + "solana-account-info", + "solana-define-syscall", + "solana-instruction", + "solana-program-error", + "solana-pubkey", + "solana-stable-layout", ] [[package]] name = "solana-curve25519" -version = "2.0.13" +version = "2.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44b61d8eda3319deca3627e3eb3970ce2ad179ad39c106d6c003d06c90e3031d" +checksum = "af29b27893aa7bc5082f30ef653c9319b36ac2b2d0f5c44688a5e80c42fcd892" dependencies = [ "bytemuck", "bytemuck_derive", - "curve25519-dalek", - "solana-program 2.0.13", + "curve25519-dalek 4.1.3", + "solana-program 2.1.13", "thiserror", ] [[package]] -name = "solana-frozen-abi" -version = "1.18.26" +name = "solana-decode-error" +version = "2.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03ab2c30c15311b511c0d1151e4ab6bc9a3e080a37e7c6e7c2d96f5784cf9434" +checksum = "4a1d529c1056b4d461609224fa1bf2a6584eafddf435c6394697b0f5de8c812c" dependencies = [ - "block-buffer 0.10.4", - "bs58 0.4.0", - "bv", - "either", - "generic-array", - "im", - "lazy_static", - "log", - "memmap2", - "rustc_version", - "serde", - "serde_bytes", - "serde_derive", - "sha2 0.10.8", - "solana-frozen-abi-macro", - "subtle", - "thiserror", + "num-traits", ] [[package]] -name = "solana-frozen-abi-macro" -version = "1.18.26" +name = "solana-define-syscall" +version = "2.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c142f779c3633ac83c84d04ff06c70e1f558c876f13358bed77ba629c7417932" -dependencies = [ - "proc-macro2", - "quote", - "rustc_version", - "syn 2.0.79", -] +checksum = "3c012a5bdc1122a74880faf6684b32286a9fae0086ff0a3efb16d7f3681fca90" [[package]] -name = "solana-geyser-sqs" -version = "0.3.2" +name = "solana-derivation-path" +version = "2.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0803b6ea9c3b9f3c3f540535d6a9d32e6fa6a2ae368a3a93eb4a61c3a216c65d" +dependencies = [ + "derivation-path", + "qstring", + "uriparse", +] + +[[package]] +name = "solana-epoch-schedule" +version = "2.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc5bd1733a0099c803b5e63be64ef6be1041b52010481f12a7d81124615e030d" +dependencies = [ + "serde", + "serde_derive", + "solana-sdk-macro 2.1.13", + "solana-sysvar-id", +] + +[[package]] +name = "solana-feature-set" +version = "2.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d7034fc05eae9180a5ae63f87a2e9985f8e0ae3c1269973c523d1028a78ffe3" +dependencies = [ + "lazy_static", + "solana-clock", + "solana-epoch-schedule", + "solana-hash", + "solana-pubkey", + "solana-sha256-hasher", +] + +[[package]] +name = "solana-fee-calculator" +version = "2.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6337eace41da19d476fe80c86a8a2f5cad76125c2aa672788ec7f2814a62478a" +dependencies = [ + "log", + "serde", + "serde_derive", +] + +[[package]] +name = "solana-frozen-abi" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f704637b29f1d58b819601efede8eff0998ec10381cb96796dacfe4cfea5581" +dependencies = [ + "bs58 0.4.0", + "bv", + "generic-array", + "log", + "memmap2", + "rustc_version", + "serde", + "serde_derive", + "sha2 0.10.8", + "solana-frozen-abi-macro", + "thiserror", +] + +[[package]] +name = "solana-frozen-abi-macro" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96bf045e938c042c59739ba3a77bf1d25cb7cf073bbf3690cc2d56c7cff27ba2" +dependencies = [ + "proc-macro2", + "quote", + "rustc_version", + "syn 1.0.109", +] + +[[package]] +name = "solana-geyser-sqs" +version = "0.3.2" dependencies = [ "agave-geyser-plugin-interface", "anyhow", @@ -3415,7 +3489,6 @@ dependencies = [ "cargo-lock", "chrono", "clap", - "derivative", "enumflags2", "flate2", "futures", @@ -3453,11 +3526,78 @@ dependencies = [ "zstd 0.12.4", ] +[[package]] +name = "solana-hash" +version = "2.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36647a50db4d401721e55d6bc1d259a8cea7bc333ab41c6358d2f5b344a1ab4e" +dependencies = [ + "borsh 1.5.1", + "bs58 0.5.1", + "bytemuck", + "bytemuck_derive", + "js-sys", + "serde", + "serde_derive", + "solana-atomic-u64", + "solana-sanitize", + "wasm-bindgen", +] + +[[package]] +name = "solana-inflation" +version = "2.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c2ea0e34ad32c6a1a026f284716c9c21cd1c3dc496a595640f76ef4bf364f1d" +dependencies = [ + "serde", + "serde_derive", +] + +[[package]] +name = "solana-instruction" +version = "2.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7a99a1276782510f3f9d8dac058b9fccadfc62ff4fd5b7c6d462dbf46632181" +dependencies = [ + "bincode", + "borsh 1.5.1", + "getrandom 0.2.15", + "js-sys", + "num-traits", + "serde", + "serde_derive", + "solana-define-syscall", + "solana-pubkey", + "wasm-bindgen", +] + +[[package]] +name = "solana-last-restart-slot" +version = "2.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55a1090667f03719f886b86f90a333b0741df8692fb7076529ae2ab066e2f4b4" +dependencies = [ + "serde", + "serde_derive", + "solana-sdk-macro 2.1.13", + "solana-sysvar-id", +] + +[[package]] +name = "solana-log-collector" +version = "2.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "606f71865c0889b7dbdccd2a75586ec028461d648901708f2bb5f5c6bee5693d" +dependencies = [ + "log", +] + [[package]] name = "solana-logger" -version = "2.0.13" +version = "2.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6b996befdb2bdbd816524fc7afe0e158fced33ff61c36ab29ae803c0462455d" +checksum = "2a04631dad2f0969dfa5e79e6ba2e693ed7264a013935f2c264b3352e7a09613" dependencies = [ "env_logger", "lazy_static", @@ -3466,19 +3606,15 @@ dependencies = [ [[package]] name = "solana-measure" -version = "2.0.13" +version = "2.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79d44cdbcf9e1489564cdae1cd92b8806b0ee89d05d36a58fef8c0d293ea7c2a" -dependencies = [ - "log", - "solana-sdk", -] +checksum = "04cd58f210630986a5c3f0344da347bb75fc2a90f2fe287438a81cd2c6ffcc8b" [[package]] name = "solana-metrics" -version = "2.0.13" +version = "2.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68979964a3a004f1af4f1571814817e7e050ef4c1b2a1bdaa3ff35e980072d69" +checksum = "58eec7006fe02032aa28f0ff49f3b378d64f16597d725af2887febc0f4ba3e9c" dependencies = [ "crossbeam-channel", "gethostname", @@ -3490,70 +3626,92 @@ dependencies = [ ] [[package]] -name = "solana-program" -version = "1.18.26" +name = "solana-msg" +version = "2.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c10f4588cefd716b24a1a40dd32c278e43a560ab8ce4de6b5805c9d113afdfa1" +checksum = "59b84934c69aa9799b661f87aa1c47f8d358c3912fe5843571a5d047a222a0e6" +dependencies = [ + "solana-define-syscall", +] + +[[package]] +name = "solana-native-token" +version = "2.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e628d59c4f2ca1e5765a99bf7a1f5fb87e6c834ad2992d84024141be32f21c8" + +[[package]] +name = "solana-packet" +version = "2.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf27339d38ffc14b456e93f59a998cdd79079bec6776bef364a8aa1ee2ceed69" dependencies = [ - "ark-bn254", - "ark-ec", - "ark-ff", - "ark-serialize", - "base64 0.21.7", "bincode", "bitflags 2.6.0", + "cfg_eval", + "serde", + "serde_derive", + "serde_with", +] + +[[package]] +name = "solana-precompile-error" +version = "2.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c439844f1c18ec47ab13b5ed229cb0d9eacd75a7fafb8f150004b9a5ee11445e" +dependencies = [ + "num-traits", + "solana-decode-error", +] + +[[package]] +name = "solana-program" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "888f50c71dc45a528cb63df960e657601fe6fa3d643159d93ebff1dd1cc00b63" +dependencies = [ + "base64 0.13.1", + "bincode", + "bitflags 1.3.2", "blake3", - "borsh 0.10.4", "borsh 0.9.3", - "borsh 1.5.1", + "borsh-derive 0.9.3", "bs58 0.4.0", "bv", "bytemuck", - "cc", "console_error_panic_hook", "console_log", - "curve25519-dalek", - "getrandom 0.2.15", + "curve25519-dalek 3.2.0", + "getrandom 0.1.16", "itertools 0.10.5", "js-sys", "lazy_static", - "libc", "libsecp256k1", - "light-poseidon", "log", - "memoffset", - "num-bigint 0.4.6", - "num-derive 0.4.2", + "num-derive 0.3.3", "num-traits", "parking_lot", - "rand 0.8.5", + "rand 0.7.3", "rustc_version", "rustversion", "serde", "serde_bytes", "serde_derive", - "serde_json", "sha2 0.10.8", - "sha3 0.10.8", + "sha3", "solana-frozen-abi", "solana-frozen-abi-macro", - "solana-sdk-macro 1.18.26", + "solana-sdk-macro 1.10.0", "thiserror", - "tiny-bip39", "wasm-bindgen", - "zeroize", ] [[package]] name = "solana-program" -version = "2.0.13" +version = "2.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29249ce5b5c7bd018013adbb97439b0b1b986f16bb07c54db28f82e97baaa2f1" +checksum = "5b23f3bdb67fec4edc60ce12b5583c5425aab96dbb029636d400cd3f36242412" dependencies = [ - "ark-bn254", - "ark-ec", - "ark-ff", - "ark-serialize", "base64 0.22.1", "bincode", "bitflags 2.6.0", @@ -3566,11 +3724,11 @@ dependencies = [ "bytemuck_derive", "console_error_panic_hook", "console_log", - "curve25519-dalek", + "curve25519-dalek 4.1.3", + "five8_const", "getrandom 0.2.15", "js-sys", "lazy_static", - "libsecp256k1", "log", "memoffset", "num-bigint 0.4.6", @@ -3578,27 +3736,110 @@ dependencies = [ "num-traits", "parking_lot", "rand 0.8.5", - "rustc_version", - "rustversion", "serde", "serde_bytes", "serde_derive", "sha2 0.10.8", - "sha3 0.10.8", - "solana-sdk-macro 2.0.13", + "sha3", + "solana-account-info", + "solana-atomic-u64", + "solana-bincode", + "solana-borsh", + "solana-clock", + "solana-cpi", + "solana-decode-error", + "solana-define-syscall", + "solana-epoch-schedule", + "solana-fee-calculator", + "solana-hash", + "solana-instruction", + "solana-last-restart-slot", + "solana-msg", + "solana-native-token", + "solana-program-entrypoint", + "solana-program-error", + "solana-program-memory", + "solana-program-option", + "solana-program-pack", + "solana-pubkey", + "solana-rent", + "solana-sanitize", + "solana-sdk-macro 2.1.13", + "solana-secp256k1-recover", + "solana-serde-varint", + "solana-serialize-utils", + "solana-sha256-hasher", + "solana-short-vec", + "solana-slot-hashes", + "solana-slot-history", + "solana-stable-layout", + "solana-sysvar-id", + "solana-transaction-error", "thiserror", "wasm-bindgen", ] +[[package]] +name = "solana-program-entrypoint" +version = "2.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc27bbb6ff7f346b93173cacd14a44873e24a1702a07ebbe4a9295bf53eed3cb" +dependencies = [ + "solana-account-info", + "solana-msg", + "solana-program-error", + "solana-pubkey", +] + +[[package]] +name = "solana-program-error" +version = "2.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f5f48931e21e648410a17a1a42b3ace669e1b6c55516357f40ac6b91d4f81ef1" +dependencies = [ + "borsh 1.5.1", + "num-traits", + "serde", + "serde_derive", + "solana-decode-error", + "solana-instruction", + "solana-msg", + "solana-pubkey", +] + +[[package]] +name = "solana-program-memory" +version = "2.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "783ed2a707f3e875480ab0beda89951e8807cb0f76e30c19f82dd305b9169ab3" +dependencies = [ + "num-traits", + "solana-define-syscall", +] + +[[package]] +name = "solana-program-option" +version = "2.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af0be45a0148239936e931a0ae95052a66e0b8f257205c9304af39bf2211a8de" + +[[package]] +name = "solana-program-pack" +version = "2.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02d992004feb5e4b8bec891470f38b029fa8a304ce762ca835ffcc67cc6bf385" +dependencies = [ + "solana-program-error", +] + [[package]] name = "solana-program-runtime" -version = "2.0.13" +version = "2.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "948bfeb10ba38b55a8b2db2de8ccfa8f57b44b6d73c98e8e0de8b10f10ce043b" +checksum = "09ed4dedcffb93dcf823dd0db043bb142ecc839d354c15347e75a370585b7c71" dependencies = [ "base64 0.22.1", "bincode", - "eager", "enum-iterator", "itertools 0.12.1", "libc", @@ -3607,23 +3848,70 @@ dependencies = [ "num-traits", "percentage", "rand 0.8.5", - "rustc_version", "serde", "solana-compute-budget", + "solana-feature-set", + "solana-log-collector", "solana-measure", "solana-metrics", "solana-sdk", + "solana-timings", "solana-type-overrides", "solana-vote", "solana_rbpf", "thiserror", ] +[[package]] +name = "solana-pubkey" +version = "2.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d4cb0f3b71f466fe8e11bef05dc562060b5c8f526e969ecd150ce5bedc6e3eb" +dependencies = [ + "borsh 0.10.4", + "borsh 1.5.1", + "bs58 0.5.1", + "bytemuck", + "bytemuck_derive", + "curve25519-dalek 4.1.3", + "five8_const", + "getrandom 0.2.15", + "js-sys", + "num-traits", + "rand 0.8.5", + "serde", + "serde_derive", + "solana-atomic-u64", + "solana-decode-error", + "solana-define-syscall", + "solana-sanitize", + "solana-sha256-hasher", + "wasm-bindgen", +] + +[[package]] +name = "solana-rent" +version = "2.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cb62c792559733d5f5d2ee42383e8d3b336e5168472ebdaaf157fd6f1949973" +dependencies = [ + "serde", + "serde_derive", + "solana-sdk-macro 2.1.13", + "solana-sysvar-id", +] + +[[package]] +name = "solana-sanitize" +version = "2.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e956e49e563eb8a9aa09425d676180a0a0509038be4457f230bb6e1dfa036053" + [[package]] name = "solana-sdk" -version = "2.0.13" +version = "2.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24dae5bda29858add4df3a6c5eaf71c0d2042ca3317a9fd81d7e9f436278a1fe" +checksum = "a2625a64d46eccd46452df612f4266f24d266eb43ccac2a566ec41ee2ec76262" dependencies = [ "bincode", "bitflags 2.6.0", @@ -3633,11 +3921,9 @@ dependencies = [ "bytemuck_derive", "byteorder", "chrono", - "derivation-path", "digest 0.10.7", "ed25519-dalek", "ed25519-dalek-bip32", - "generic-array", "getrandom 0.1.16", "hmac 0.12.1", "itertools 0.12.1", @@ -3646,52 +3932,94 @@ dependencies = [ "libsecp256k1", "log", "memmap2", + "num-derive 0.4.2", + "num-traits", "num_enum 0.7.3", - "pbkdf2 0.11.0", - "qstring", + "pbkdf2", "rand 0.7.3", "rand 0.8.5", - "rustc_version", - "rustversion", "serde", "serde_bytes", "serde_derive", "serde_json", "serde_with", "sha2 0.10.8", - "sha3 0.10.8", + "sha3", "siphasher", - "solana-program 2.0.13", - "solana-sdk-macro 2.0.13", + "solana-account", + "solana-bn254", + "solana-decode-error", + "solana-derivation-path", + "solana-feature-set", + "solana-inflation", + "solana-instruction", + "solana-native-token", + "solana-packet", + "solana-precompile-error", + "solana-program 2.1.13", + "solana-program-memory", + "solana-pubkey", + "solana-sanitize", + "solana-sdk-macro 2.1.13", + "solana-secp256k1-recover", + "solana-secp256r1-program", + "solana-serde-varint", + "solana-short-vec", + "solana-signature", + "solana-transaction-error", "thiserror", - "uriparse", "wasm-bindgen", ] [[package]] name = "solana-sdk-macro" -version = "1.18.26" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b75d0f193a27719257af19144fdaebec0415d1c9e9226ae4bd29b791be5e9bd" +checksum = "2388e9b1690e83413393f3e20d98551cbebae9d9385397600d25ae9992873736" dependencies = [ "bs58 0.4.0", "proc-macro2", "quote", "rustversion", - "syn 2.0.79", + "syn 1.0.109", ] [[package]] name = "solana-sdk-macro" -version = "2.0.13" +version = "2.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "704c9cacc61a5b9b6f717773cf4b3b45a4239dc7fa8c585258fceaf9b8e1cb94" +checksum = "6102303ef82f601e178970388256cd2841618d0789246c087c164760bd976b2f" dependencies = [ "bs58 0.5.1", "proc-macro2", "quote", - "rustversion", - "syn 2.0.79", + "syn 2.0.98", +] + +[[package]] +name = "solana-secp256k1-recover" +version = "2.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5658cf3a6792df8bc40da3c6cd8ff2d96ad494f3102a6c70ee41774647b0b0e" +dependencies = [ + "borsh 1.5.1", + "libsecp256k1", + "solana-define-syscall", + "thiserror", +] + +[[package]] +name = "solana-secp256r1-program" +version = "2.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f1acf1413825581b79339a3b8427466f0a3b677c85cafe5d0827a3a6f7a6680" +dependencies = [ + "bytemuck", + "openssl", + "solana-feature-set", + "solana-instruction", + "solana-precompile-error", + "solana-pubkey", ] [[package]] @@ -3700,11 +4028,132 @@ version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "468aa43b7edb1f9b7b7b686d5c3aeb6630dc1708e86e31343499dd5c4d775183" +[[package]] +name = "solana-serde-varint" +version = "2.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "591ff7fba3f641998d613f6934bd89222cf45b0393225dc3c4af09b2b8f94d33" +dependencies = [ + "serde", +] + +[[package]] +name = "solana-serialize-utils" +version = "2.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "304f0afa82feddfdab31a97148717bf33a0e1cd67261aa1fce55835eff0a5a90" +dependencies = [ + "solana-instruction", + "solana-pubkey", + "solana-sanitize", +] + +[[package]] +name = "solana-sha256-hasher" +version = "2.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de0e647536438a92f1b02424d94c703534566aa9b1d8aae87f3b181d2dc5787c" +dependencies = [ + "sha2 0.10.8", + "solana-define-syscall", + "solana-hash", +] + +[[package]] +name = "solana-short-vec" +version = "2.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8cfbe01016ac7c0ac992fae610f46607b7d8cadba5c526f2b8701123bc28e5ce" +dependencies = [ + "serde", +] + +[[package]] +name = "solana-signature" +version = "2.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a515db8b6bbce5a603e09cda69e459ec8d5964a8711e40689ae596da0d9907a" +dependencies = [ + "bs58 0.5.1", + "ed25519-dalek", + "generic-array", + "rand 0.8.5", + "serde", + "serde_derive", + "solana-sanitize", +] + +[[package]] +name = "solana-slot-hashes" +version = "2.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "327614604f49be7b292e4fefeca60da6b16720ef2edf35458b1923f0a34b0e2e" +dependencies = [ + "serde", + "serde_derive", + "solana-hash", + "solana-sysvar-id", +] + +[[package]] +name = "solana-slot-history" +version = "2.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfd9d02ec3cdf702027aaee2faac215aa0d8825f6b399b205236f349bd6c8e79" +dependencies = [ + "bv", + "serde", + "serde_derive", + "solana-sysvar-id", +] + +[[package]] +name = "solana-stable-layout" +version = "2.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ee6374e06b1373c4d526e87f02a5ee165093d341c0c5ab548fc79f6ff18e331" +dependencies = [ + "solana-instruction", + "solana-pubkey", +] + +[[package]] +name = "solana-sysvar-id" +version = "2.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d11cdbc013ed4f65a636762b9a62cb878dd530062804e6a6be0faa76f5902914" +dependencies = [ + "solana-pubkey", +] + +[[package]] +name = "solana-timings" +version = "2.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "629d606363f36eed6c79a1a96083050380733e5785ba05e52321ff593e806efe" +dependencies = [ + "eager", + "enum-iterator", + "solana-sdk", +] + +[[package]] +name = "solana-transaction-error" +version = "2.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "589ed4a290547a8ad581f4ede34cb9c164953203aa23b415c761cfb8b06cac89" +dependencies = [ + "serde", + "serde_derive", + "solana-instruction", + "solana-sanitize", +] + [[package]] name = "solana-transaction-status" -version = "2.0.13" +version = "2.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d51d9d4a6004708f9563a29aa87fdf9960c1e7420b69dd82e8b817cf8f02430b" +checksum = "aba18ead34f69642fc0bda6440a79b905feb4f7c22ace8e922e79d44eaa401fa" dependencies = [ "Inflector", "base64 0.22.1", @@ -3718,6 +4167,7 @@ dependencies = [ "serde_json", "solana-account-decoder", "solana-sdk", + "solana-transaction-status-client-types", "spl-associated-token-account", "spl-memo", "spl-token 6.0.0", @@ -3727,11 +4177,29 @@ dependencies = [ "thiserror", ] +[[package]] +name = "solana-transaction-status-client-types" +version = "2.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d699c9fb614eb6c5e85ad5992c7ce13cfa8fcc107e3d44c3767386c1c3d96b96" +dependencies = [ + "base64 0.22.1", + "bincode", + "bs58 0.5.1", + "serde", + "serde_derive", + "serde_json", + "solana-account-decoder-client-types", + "solana-sdk", + "solana-signature", + "thiserror", +] + [[package]] name = "solana-type-overrides" -version = "2.0.13" +version = "2.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ab21276d6296965dc7181d785075b20e97b6789c76e8376cf363b3e2f7439b6" +checksum = "21ac99386eaec9b90c55a22dee445d88b04398e31023bd1749dd58dff150385e" dependencies = [ "lazy_static", "rand 0.8.5", @@ -3739,13 +4207,12 @@ dependencies = [ [[package]] name = "solana-vote" -version = "2.0.13" +version = "2.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fa1401a42023379f14af9165954f44ad02888a327dfd2a4abce0f18fa7cfab9" +checksum = "3d7917e3041555c37ba15028415ec424ff7833acc4f62941ce077ad5c6661198" dependencies = [ "itertools 0.12.1", "log", - "rustc_version", "serde", "serde_derive", "solana-sdk", @@ -3754,9 +4221,9 @@ dependencies = [ [[package]] name = "solana-zk-token-sdk" -version = "2.0.13" +version = "2.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1dd7a8d6843cb3de4c13c2cfec1994519735ea4110b7f36b80b41d57bea1c07" +checksum = "69b8b882464177ef5621d2b91124d3a0d8f7d6b107eca8a58f76e6c84c642104" dependencies = [ "aes-gcm-siv", "base64 0.22.1", @@ -3764,19 +4231,20 @@ dependencies = [ "bytemuck", "bytemuck_derive", "byteorder", - "curve25519-dalek", + "curve25519-dalek 4.1.3", "itertools 0.12.1", "lazy_static", "merlin", "num-derive 0.4.2", "num-traits", - "rand 0.7.3", + "rand 0.8.5", "serde", "serde_derive", "serde_json", - "sha3 0.9.1", + "sha3", "solana-curve25519", - "solana-program 2.0.13", + "solana-derivation-path", + "solana-program 2.1.13", "solana-sdk", "subtle", "thiserror", @@ -3785,13 +4253,12 @@ dependencies = [ [[package]] name = "solana_rbpf" -version = "0.8.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff08afd63f70a1ba712fb0017be41e93b017f7e874785b54bb5ec9aa8949781d" +checksum = "1c1941b5ef0c3ce8f2ac5dd984d0fb1a97423c4ff2a02eec81e3913f02e2ac2b" dependencies = [ "byteorder", "combine 3.8.1", - "goblin", "hash32", "libc", "log", @@ -3818,7 +4285,7 @@ dependencies = [ "borsh 1.5.1", "num-derive 0.4.2", "num-traits", - "solana-program 2.0.13", + "solana-program 2.1.13", "spl-token 6.0.0", "spl-token-2022", "thiserror", @@ -3831,7 +4298,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a38ea8b6dedb7065887f12d62ed62c1743aa70749e8558f963609793f6fb12bc" dependencies = [ "bytemuck", - "solana-program 2.0.13", + "solana-program 2.1.13", "spl-discriminator-derive", ] @@ -3843,7 +4310,7 @@ checksum = "d9e8418ea6269dcfb01c712f0444d2c75542c04448b480e87de59d2865edc750" dependencies = [ "quote", "spl-discriminator-syn", - "syn 2.0.79", + "syn 2.0.98", ] [[package]] @@ -3855,7 +4322,7 @@ dependencies = [ "proc-macro2", "quote", "sha2 0.10.8", - "syn 2.0.79", + "syn 2.0.98", "thiserror", ] @@ -3865,7 +4332,7 @@ version = "5.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a0dba2f2bb6419523405d21c301a32c9f9568354d4742552e7972af801f4bdb3" dependencies = [ - "solana-program 2.0.13", + "solana-program 2.1.13", ] [[package]] @@ -3877,7 +4344,7 @@ dependencies = [ "borsh 1.5.1", "bytemuck", "bytemuck_derive", - "solana-program 2.0.13", + "solana-program 2.1.13", "solana-zk-token-sdk", "spl-program-error", ] @@ -3890,7 +4357,7 @@ checksum = "d7b28bed65356558133751cc32b48a7a5ddfc59ac4e941314630bbed1ac10532" dependencies = [ "num-derive 0.4.2", "num-traits", - "solana-program 2.0.13", + "solana-program 2.1.13", "spl-program-error-derive", "thiserror", ] @@ -3904,7 +4371,7 @@ dependencies = [ "proc-macro2", "quote", "sha2 0.10.8", - "syn 2.0.79", + "syn 2.0.98", ] [[package]] @@ -3914,7 +4381,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "37a75a5f0fcc58126693ed78a17042e9dc53f07e357d6be91789f7d62aff61a4" dependencies = [ "bytemuck", - "solana-program 2.0.13", + "solana-program 2.1.13", "spl-discriminator", "spl-pod", "spl-program-error", @@ -3923,16 +4390,15 @@ dependencies = [ [[package]] name = "spl-token" -version = "3.5.0" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e85e168a785e82564160dcb87b2a8e04cee9bfd1f4d488c729d53d6a4bd300d" +checksum = "0cc67166ef99d10c18cb5e9c208901e6d8255c6513bb1f877977eba48e6cc4fb" dependencies = [ "arrayref", - "bytemuck", "num-derive 0.3.3", "num-traits", "num_enum 0.5.11", - "solana-program 1.18.26", + "solana-program 1.10.0", "thiserror", ] @@ -3947,7 +4413,7 @@ dependencies = [ "num-derive 0.4.2", "num-traits", "num_enum 0.7.3", - "solana-program 2.0.13", + "solana-program 2.1.13", "thiserror", ] @@ -3962,7 +4428,7 @@ dependencies = [ "num-derive 0.4.2", "num-traits", "num_enum 0.7.3", - "solana-program 2.0.13", + "solana-program 2.1.13", "solana-security-txt", "solana-zk-token-sdk", "spl-memo", @@ -3982,7 +4448,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df8752b85a5ecc1d9f3a43bce3dd9a6a053673aacf5deb513d1cbb88d3534ffd" dependencies = [ "bytemuck", - "solana-program 2.0.13", + "solana-program 2.1.13", "spl-discriminator", "spl-pod", "spl-program-error", @@ -3995,7 +4461,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c6c2318ddff97e006ed9b1291ebec0750a78547f870f62a69c56fe3b46a5d8fc" dependencies = [ "borsh 1.5.1", - "solana-program 2.0.13", + "solana-program 2.1.13", "spl-discriminator", "spl-pod", "spl-program-error", @@ -4010,7 +4476,7 @@ checksum = "a110f33d941275d9f868b96daaa993f1e73b6806cc8836e43075b4d3ad8338a7" dependencies = [ "arrayref", "bytemuck", - "solana-program 2.0.13", + "solana-program 2.1.13", "spl-discriminator", "spl-pod", "spl-program-error", @@ -4025,7 +4491,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bdcd73ec187bc409464c60759232e309f83b52a18a9c5610bf281c9c6432918c" dependencies = [ "bytemuck", - "solana-program 2.0.13", + "solana-program 2.1.13", "spl-discriminator", "spl-pod", "spl-program-error", @@ -4062,9 +4528,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.79" +version = "2.0.98" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590" +checksum = "36147f1a48ae0ec2b5b3bc5b537d267457555a10dc06f3dbc8cb11ba3006d3b1" dependencies = [ "proc-macro2", "quote", @@ -4080,7 +4546,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.98", ] [[package]] @@ -4134,22 +4600,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.64" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84" +checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.64" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3" +checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.98", ] [[package]] @@ -4185,25 +4651,6 @@ dependencies = [ "time-core", ] -[[package]] -name = "tiny-bip39" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffc59cb9dfc85bb312c3a78fd6aa8a8582e310b0fa885d5bb877f6dcc601839d" -dependencies = [ - "anyhow", - "hmac 0.8.1", - "once_cell", - "pbkdf2 0.4.0", - "rand 0.7.3", - "rustc-hash", - "sha2 0.9.9", - "thiserror", - "unicode-normalization", - "wasm-bindgen", - "zeroize", -] - [[package]] name = "tinyvec" version = "1.8.0" @@ -4244,7 +4691,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.98", ] [[package]] @@ -4539,7 +4986,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.98", "wasm-bindgen-shared", ] @@ -4573,7 +5020,7 @@ checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.98", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -4850,14 +5297,14 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.98", ] [[package]] name = "zeroize" -version = "1.3.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4756f7db3f7b5574938c3eb1c117038b8e07f95ee6718c0efad4ac21508f1efd" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" dependencies = [ "zeroize_derive", ] @@ -4870,32 +5317,32 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.98", ] [[package]] name = "zstd" -version = "0.11.2+zstd.1.5.2" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4" +checksum = "1a27595e173641171fc74a1232b7b1c7a7cb6e18222c11e9dfb9888fa424c53c" dependencies = [ - "zstd-safe 5.0.2+zstd.1.5.2", + "zstd-safe 6.0.6", ] [[package]] name = "zstd" -version = "0.12.4" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a27595e173641171fc74a1232b7b1c7a7cb6e18222c11e9dfb9888fa424c53c" +checksum = "fcf2b778a664581e31e389454a7072dab1647606d44f7feea22cd5abb9c9f3f9" dependencies = [ - "zstd-safe 6.0.6", + "zstd-safe 7.2.1", ] [[package]] name = "zstd-safe" -version = "5.0.2+zstd.1.5.2" +version = "6.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2a5585e04f9eea4b2a3d1eca508c4dee9592a89ef6f450c11719da0726f4db" +checksum = "ee98ffd0b48ee95e6c5168188e44a54550b1564d9d530ee21d5f0eaed1069581" dependencies = [ "libc", "zstd-sys", @@ -4903,11 +5350,10 @@ dependencies = [ [[package]] name = "zstd-safe" -version = "6.0.6" +version = "7.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee98ffd0b48ee95e6c5168188e44a54550b1564d9d530ee21d5f0eaed1069581" +checksum = "54a3ab4db68cea366acc5c897c7b4d4d1b8994a9cd6e6f841f8964566a419059" dependencies = [ - "libc", "zstd-sys", ] diff --git a/Cargo.toml b/Cargo.toml index ed8ca83..3c674f1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -8,7 +8,7 @@ publish = false crate-type = ["cdylib", "rlib"] [dependencies] -agave-geyser-plugin-interface = "~2.0.13" +agave-geyser-plugin-interface = "~2.1.11" anyhow = "1.0.44" arrayref = "0.3.6" async-trait = "0.1.73" @@ -16,7 +16,6 @@ base64 = "0.22.0" bincode = "1.3.0" chrono = "0.4.31" clap = { version = "4.3.0", features = ["cargo", "derive"] } -derivative = "2.2.0" enumflags2 = "0.6.4" flate2 = "1.0.27" futures = "0.3.28" @@ -43,9 +42,9 @@ safe-transmute = "0.11.2" serde = { version = "1.0.132", features = ["derive"] } serde_json = "1.0.73" serum_dex = "0.5.4" -solana-logger = "~2.0.13" -solana-sdk = "~2.0.13" -solana-transaction-status = "~2.0.13" +solana-logger = "~2.1.11" +solana-sdk = "~2.1.11" +solana-transaction-status = "~2.1.11" spl-token = { version = "6.0.0", features = ["no-entrypoint"] } thiserror = "1.0.30" tokio = { version = "1.32.0", features = ["rt-multi-thread", "time", "macros", "io-util"] } diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 4cf46d8..071ff5b 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,5 +1,5 @@ [toolchain] -channel = "1.78.0" +channel = "1.81.0" components = ["clippy", "rustfmt"] targets = [] profile = "minimal" diff --git a/src/admin.rs b/src/admin.rs index f9fe481..173b414 100644 --- a/src/admin.rs +++ b/src/admin.rs @@ -116,7 +116,7 @@ impl ConfigMgmt { let mut pipe = redis::pipe(); config.save_pubkeys(&mut pipe)?; pipe.set(&self.config.config, serde_json::to_string(config)?); - Self::with_timeout(pipe.query_async(&mut connection)).await?; + Self::with_timeout(pipe.query_async::<_, ()>(&mut connection)).await?; Ok(()) } diff --git a/src/aws.rs b/src/aws.rs index 12e7497..3049705 100644 --- a/src/aws.rs +++ b/src/aws.rs @@ -24,6 +24,7 @@ use { serde::de::{self, Deserialize, Deserializer}, std::{ collections::HashMap, + fmt, path::{Path, PathBuf}, sync::Arc, time::Duration, @@ -147,15 +148,22 @@ impl SqsClientQueueUrl { } } -#[derive(derivative::Derivative)] -#[derivative(Debug, Clone)] +#[derive(Clone)] pub struct SqsClient { - #[derivative(Debug = "ignore")] pub client: RusotoSqsClient, pub queue_url: SqsClientQueueUrl, attributes: SqsMessageAttributes, } +impl fmt::Debug for SqsClient { + fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { + f.debug_struct("SqsClient") + .field("queue_url", &self.queue_url) + .field("attributes", &self.attributes) + .finish() + } +} + impl SqsClient { // The maximum allowed individual message size and the maximum total payload size (the sum of the // individual lengths of all of the batched messages) are both 256 KB (262,144 bytes). @@ -282,16 +290,24 @@ impl SqsClient { } } -#[derive(derivative::Derivative)] -#[derivative(Debug, Clone)] +#[derive(Clone)] pub struct S3Client { - #[derivative(Debug = "ignore")] pub client: RusotoS3Client, pub bucket: String, pub prefix: PathBuf, pub permits: Arc, } +impl fmt::Debug for S3Client { + fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { + f.debug_struct("S3Client") + .field("bucket", &self.bucket) + .field("prefix", &self.prefix) + .field("permits", &self.permits) + .finish() + } +} + impl S3Client { pub fn new(config: ConfigAwsS3) -> AwsResult { let client = aws_create_client(config.auth)?; diff --git a/src/bin/config.rs b/src/bin/config.rs index b27d522..0ccf98d 100644 --- a/src/bin/config.rs +++ b/src/bin/config.rs @@ -214,6 +214,7 @@ pub enum ArgsActionSendSignal { } #[tokio::main] +#[allow(dependency_on_unit_never_type_fallback)] async fn main() -> Result<()> { let args = Args::parse(); diff --git a/src/config.rs b/src/config.rs index b9551b6..793c7ab 100644 --- a/src/config.rs +++ b/src/config.rs @@ -229,11 +229,10 @@ where } } -#[derive(Debug, Clone, Copy, Deserialize, derivative::Derivative)] -#[derivative(Default)] +#[derive(Debug, Default, Clone, Copy, Deserialize)] #[serde(deny_unknown_fields, rename_all = "lowercase", tag = "algo")] pub enum AccountsDataCompression { - #[derivative(Default)] + #[default] None, Zstd { #[serde(default = "AccountsDataCompression::zstd_default_level")] diff --git a/src/plugin.rs b/src/plugin.rs index ff4b6d4..eda3c69 100644 --- a/src/plugin.rs +++ b/src/plugin.rs @@ -105,9 +105,9 @@ impl GeyserPlugin for Plugin { &self, slot: u64, _parent: Option, - status: SlotStatus, + status: &SlotStatus, ) -> PluginResult<()> { - self.with_client(|sqs| sqs.update_slot(slot, status)) + self.with_client(|sqs| sqs.update_slot(slot, status.into())) } fn notify_transaction( diff --git a/src/sqs.rs b/src/sqs.rs index 9894fe1..e476c86 100644 --- a/src/sqs.rs +++ b/src/sqs.rs @@ -51,14 +51,17 @@ use { }, }; -#[derive(Debug, Clone, Copy, PartialEq, Deserialize, Serialize, derivative::Derivative)] -#[derivative(Default)] +#[derive(Debug, Default, Clone, Copy, PartialEq, Deserialize, Serialize)] #[serde(rename_all = "lowercase")] pub enum SlotStatus { Processed, Confirmed, - #[derivative(Default)] + #[default] Finalized, + FirstShredReceived, + Completed, + CreatedBank, + Dead, } impl SlotStatus { @@ -67,16 +70,24 @@ impl SlotStatus { Self::Processed => "processed", Self::Confirmed => "confirmed", Self::Finalized => "finalized", + Self::FirstShredReceived => "firstShredReceived", + Self::Completed => "completed", + Self::CreatedBank => "createdBank", + Self::Dead => "Dead", } } } -impl From for SlotStatus { - fn from(status: GeyserSlotStatus) -> Self { +impl From<&GeyserSlotStatus> for SlotStatus { + fn from(status: &GeyserSlotStatus) -> Self { match status { GeyserSlotStatus::Processed => Self::Processed, GeyserSlotStatus::Confirmed => Self::Confirmed, GeyserSlotStatus::Rooted => Self::Finalized, + GeyserSlotStatus::FirstShredReceived => Self::FirstShredReceived, + GeyserSlotStatus::Completed => Self::Completed, + GeyserSlotStatus::CreatedBank => Self::CreatedBank, + GeyserSlotStatus::Dead(_s) => Self::Dead, } } } @@ -494,8 +505,8 @@ impl AwsSqsClient { Ok(()) } - pub fn update_slot(&self, slot: u64, status: GeyserSlotStatus) -> SqsClientResult { - self.send_message(Message::UpdateSlot((status.into(), slot))) + pub fn update_slot(&self, slot: u64, status: SlotStatus) -> SqsClientResult { + self.send_message(Message::UpdateSlot((status, slot))) } pub fn update_account(