From 4f7a425ccf4f74e5f06cb687c2c29e9fab562896 Mon Sep 17 00:00:00 2001 From: ananas Date: Fri, 31 Oct 2025 15:37:04 +0000 Subject: [PATCH 01/10] chore: remove anchor dep --- Cargo.lock | 842 +++++++----------- Cargo.toml | 1 - .../method/get_multiple_new_address_proofs.rs | 2 +- src/common/typedefs/serializable_pubkey.rs | 4 +- src/common/typedefs/token_data.rs | 8 +- src/common/typedefs/unsigned_integer.rs | 4 +- src/ingester/parser/indexer_events.rs | 32 +- src/ingester/parser/tx_event_parser.rs | 2 +- 8 files changed, 329 insertions(+), 566 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0464237f..3b49ef0e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -19,7 +19,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0133fd66fc7bc5f78e566ce55e507f4b66a63ae18a719de86628c1986c80bca8" dependencies = [ "aligned-sized", - "anchor-lang 0.31.1", + "anchor-lang", "bytemuck", "light-account-checks 0.3.0", "light-batched-merkle-tree 0.3.0", @@ -37,15 +37,6 @@ dependencies = [ "zerocopy", ] -[[package]] -name = "addr2line" -version = "0.25.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5d307320b3181d6d7954e663bd7c774a838b8220fe0593c86d9fb09f498b4b" -dependencies = [ - "gimli", -] - [[package]] name = "adler2" version = "2.0.1" @@ -106,7 +97,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a15f179cd60c4584b8a8c596927aadc462e27f2ca70c04e0071964a73ba7a75" dependencies = [ "cfg-if", - "getrandom 0.3.3", + "getrandom 0.3.4", "once_cell", "version_check", "zerocopy", @@ -114,9 +105,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.1.3" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +checksum = "ddd31a130427c27518df266943a5308ed92d4b226cc639f5a8f1002816174301" dependencies = [ "memchr", ] @@ -135,7 +126,7 @@ checksum = "48a526ec4434d531d488af59fe866f36b310fe8906691c75dffa664450a3800a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.108", ] [[package]] @@ -159,38 +150,13 @@ version = "0.2.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923" -[[package]] -name = "anchor-attribute-access-control" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5f619f1d04f53621925ba8a2e633ba5a6081f2ae14758cbb67f38fd823e0a3e" -dependencies = [ - "anchor-syn 0.29.0", - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "anchor-attribute-access-control" version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f70fd141a4d18adf11253026b32504f885447048c7494faf5fa83b01af9c0cf" dependencies = [ - "anchor-syn 0.31.1", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "anchor-attribute-account" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7f2a3e1df4685f18d12a943a9f2a7456305401af21a07c9fe076ef9ecd6e400" -dependencies = [ - "anchor-syn 0.29.0", - "bs58 0.5.1", + "anchor-syn", "proc-macro2", "quote", "syn 1.0.109", @@ -202,42 +168,20 @@ version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "715a261c57c7679581e06f07a74fa2af874ac30f86bd8ea07cca4a7e5388a064" dependencies = [ - "anchor-syn 0.31.1", + "anchor-syn", "bs58 0.5.1", "proc-macro2", "quote", "syn 1.0.109", ] -[[package]] -name = "anchor-attribute-constant" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9423945cb55627f0b30903288e78baf6f62c6c8ab28fb344b6b25f1ffee3dca7" -dependencies = [ - "anchor-syn 0.29.0", - "quote", - "syn 1.0.109", -] - [[package]] name = "anchor-attribute-constant" version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "730d6df8ae120321c5c25e0779e61789e4b70dc8297102248902022f286102e4" dependencies = [ - "anchor-syn 0.31.1", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "anchor-attribute-error" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93ed12720033cc3c3bf3cfa293349c2275cd5ab99936e33dd4bf283aaad3e241" -dependencies = [ - "anchor-syn 0.29.0", + "anchor-syn", "quote", "syn 1.0.109", ] @@ -248,19 +192,7 @@ version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "27e6e449cc3a37b2880b74dcafb8e5a17b954c0e58e376432d7adc646fb333ef" dependencies = [ - "anchor-syn 0.31.1", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "anchor-attribute-event" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eef4dc0371eba2d8c8b54794b0b0eb786a234a559b77593d6f80825b6d2c77a2" -dependencies = [ - "anchor-syn 0.29.0", - "proc-macro2", + "anchor-syn", "quote", "syn 1.0.109", ] @@ -271,23 +203,12 @@ version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d7710e4c54adf485affcd9be9adec5ef8846d9c71d7f31e16ba86ff9fc1dd49f" dependencies = [ - "anchor-syn 0.31.1", + "anchor-syn", "proc-macro2", "quote", "syn 1.0.109", ] -[[package]] -name = "anchor-attribute-program" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b18c4f191331e078d4a6a080954d1576241c29c56638783322a18d308ab27e4f" -dependencies = [ - "anchor-syn 0.29.0", - "quote", - "syn 1.0.109", -] - [[package]] name = "anchor-attribute-program" version = "0.31.1" @@ -295,7 +216,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "05ecfd49b2aeadeb32f35262230db402abed76ce87e27562b34f61318b2ec83c" dependencies = [ "anchor-lang-idl", - "anchor-syn 0.31.1", + "anchor-syn", "anyhow", "bs58 0.5.1", "heck 0.3.3", @@ -305,37 +226,13 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "anchor-derive-accounts" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de10d6e9620d3bcea56c56151cad83c5992f50d5960b3a9bebc4a50390ddc3c" -dependencies = [ - "anchor-syn 0.29.0", - "quote", - "syn 1.0.109", -] - [[package]] name = "anchor-derive-accounts" version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be89d160793a88495af462a7010b3978e48e30a630c91de47ce2c1d3cb7a6149" dependencies = [ - "anchor-syn 0.31.1", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "anchor-derive-serde" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4e2e5be518ec6053d90a2a7f26843dbee607583c779e6c8395951b9739bdfbe" -dependencies = [ - "anchor-syn 0.29.0", - "borsh-derive-internal 0.10.4", - "proc-macro2", + "anchor-syn", "quote", "syn 1.0.109", ] @@ -346,24 +243,13 @@ version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "abc6ee78acb7bfe0c2dd2abc677aaa4789c0281a0c0ef01dbf6fe85e0fd9e6e4" dependencies = [ - "anchor-syn 0.31.1", + "anchor-syn", "borsh-derive-internal 0.10.4", "proc-macro2", "quote", "syn 1.0.109", ] -[[package]] -name = "anchor-derive-space" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ecc31d19fa54840e74b7a979d44bcea49d70459de846088a1d71e87ba53c419" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "anchor-derive-space" version = "0.31.1" @@ -375,46 +261,21 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "anchor-lang" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35da4785497388af0553586d55ebdc08054a8b1724720ef2749d313494f2b8ad" -dependencies = [ - "anchor-attribute-access-control 0.29.0", - "anchor-attribute-account 0.29.0", - "anchor-attribute-constant 0.29.0", - "anchor-attribute-error 0.29.0", - "anchor-attribute-event 0.29.0", - "anchor-attribute-program 0.29.0", - "anchor-derive-accounts 0.29.0", - "anchor-derive-serde 0.29.0", - "anchor-derive-space 0.29.0", - "arrayref", - "base64 0.13.1", - "bincode", - "borsh 0.10.4", - "bytemuck", - "getrandom 0.2.16", - "solana-program 1.18.26", - "thiserror 1.0.69", -] - [[package]] name = "anchor-lang" version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6bab117055905e930f762c196e08f861f8dfe7241b92cee46677a3b15561a0a" dependencies = [ - "anchor-attribute-access-control 0.31.1", - "anchor-attribute-account 0.31.1", - "anchor-attribute-constant 0.31.1", - "anchor-attribute-error 0.31.1", - "anchor-attribute-event 0.31.1", - "anchor-attribute-program 0.31.1", - "anchor-derive-accounts 0.31.1", - "anchor-derive-serde 0.31.1", - "anchor-derive-space 0.31.1", + "anchor-attribute-access-control", + "anchor-attribute-account", + "anchor-attribute-constant", + "anchor-attribute-error", + "anchor-attribute-event", + "anchor-attribute-program", + "anchor-derive-accounts", + "anchor-derive-serde", + "anchor-derive-space", "anchor-lang-idl", "base64 0.21.7", "bincode", @@ -449,24 +310,6 @@ dependencies = [ "serde", ] -[[package]] -name = "anchor-syn" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9101b84702fed2ea57bd22992f75065da5648017135b844283a2f6d74f27825" -dependencies = [ - "anyhow", - "bs58 0.5.1", - "heck 0.3.3", - "proc-macro2", - "quote", - "serde", - "serde_json", - "sha2 0.10.9", - "syn 1.0.109", - "thiserror 1.0.69", -] - [[package]] name = "anchor-syn" version = "0.31.1" @@ -677,7 +520,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "62945a2f7e6de02a31fe400aa489f0e0f5b2502e69f95f853adb82a96c7a6b60" dependencies = [ "quote", - "syn 2.0.106", + "syn 2.0.108", ] [[package]] @@ -703,7 +546,7 @@ dependencies = [ "num-traits", "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.108", ] [[package]] @@ -778,7 +621,7 @@ checksum = "213888f660fddcca0d257e88e54ac05bca01885f258ccdf695bafd77031bb69d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.108", ] [[package]] @@ -1038,7 +881,7 @@ checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.108", ] [[package]] @@ -1055,7 +898,7 @@ checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.108", ] [[package]] @@ -1184,21 +1027,6 @@ dependencies = [ "tower-service", ] -[[package]] -name = "backtrace" -version = "0.3.76" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb531853791a215d7c62a30daf0dde835f381ab5de4589cfe7c649d2cbe92bd6" -dependencies = [ - "addr2line", - "cfg-if", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", - "windows-link 0.2.1", -] - [[package]] name = "bae" version = "0.1.7" @@ -1268,11 +1096,11 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.9.4" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2261d10cca569e4643e526d8dc2e62e433cc8aba21ab764233731f8d369bf394" +checksum = "812e12b5285cc515a9c72a5c1d3b6d46a19dac5acfef5265968c166106e31dd3" dependencies = [ - "serde", + "serde_core", ] [[package]] @@ -1414,7 +1242,7 @@ dependencies = [ "proc-macro-crate 3.4.0", "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.108", ] [[package]] @@ -1520,9 +1348,9 @@ dependencies = [ [[package]] name = "bstr" -version = "1.12.0" +version = "1.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "234113d19d0d7d613b40e86fb654acf958910802bcceab913a4f9e7cda03b1a4" +checksum = "63044e1ae8e69f3b5a92c736ca6269b8d12fa7efe39bf34ddb06d102cf0e2cab" dependencies = [ "memchr", "serde", @@ -1583,7 +1411,7 @@ checksum = "f9abbd1bc6865053c427f7198e6af43bfdedc55ab791faed4fbd361d789575ff" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.108", ] [[package]] @@ -1618,12 +1446,11 @@ dependencies = [ [[package]] name = "caps" -version = "0.5.5" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "190baaad529bcfbde9e1a19022c42781bdb6ff9de25721abdb8fd98c0807730b" +checksum = "fd1ddba47aba30b6a889298ad0109c3b8dcb0e8fc993b459daa7067d46f865e0" dependencies = [ "libc", - "thiserror 1.0.69", ] [[package]] @@ -1638,9 +1465,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.2.40" +version = "1.2.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1d05d92f4b1fd76aad469d46cdd858ca761576082cd37df81416691e50199fb" +checksum = "37521ac7aabe3d13122dc382493e20c9416f299d2ccd5b3a5340a2570cdeb0f3" dependencies = [ "find-msvc-tools", "jobserver", @@ -1650,9 +1477,9 @@ dependencies = [ [[package]] name = "cfg-if" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fd1289c04a9ea8cb22300a459a72a385d7c73d3259e2ed7dcb2af674838cfa9" +checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801" [[package]] name = "cfg_aliases" @@ -1668,7 +1495,7 @@ checksum = "45565fc9416b9896014f5732ac776f810ee53a66730c17e4020c3ec064a8f88f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.108", ] [[package]] @@ -1682,7 +1509,7 @@ dependencies = [ "num-traits", "serde", "wasm-bindgen", - "windows-link 0.2.1", + "windows-link", ] [[package]] @@ -1728,23 +1555,23 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.48" +version = "4.5.51" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2134bb3ea021b78629caa971416385309e0131b351b25e01dc16fb54e1b5fae" +checksum = "4c26d721170e0295f191a69bd9a1f93efcdb0aff38684b61ab5750468972e5f5" dependencies = [ "clap_builder", - "clap_derive 4.5.47", + "clap_derive 4.5.49", ] [[package]] name = "clap_builder" -version = "4.5.48" +version = "4.5.51" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2ba64afa3c0a6df7fa517765e31314e983f51dda798ffba27b988194fb65dc9" +checksum = "75835f0c7bf681bfd05abe44e965760fea999a5286c6eb2d59883634fd02011a" dependencies = [ "anstream", "anstyle", - "clap_lex 0.7.5", + "clap_lex 0.7.6", "strsim 0.11.1", ] @@ -1763,14 +1590,14 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.47" +version = "4.5.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbfd7eae0b0f1a6e63d4b13c9c478de77c2eb546fba158ad50b4203dc24b9f9c" +checksum = "2a0b5487afeab2deb2ff4e03a807ad1a03ac532ff5a2cee5d86884440c7f7671" dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.108", ] [[package]] @@ -1784,9 +1611,9 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.7.5" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b94f61472cee1439c0b966b47e3aca9ae07e45d070759512cd390ea2bebc6675" +checksum = "a1d728cc89cf3aee9ff92b05e62b19ee65a02b5702cff7d5a377e32c6ae29d8d" [[package]] name = "cloud-storage" @@ -2088,7 +1915,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.108", ] [[package]] @@ -2122,7 +1949,7 @@ dependencies = [ "proc-macro2", "quote", "strsim 0.11.1", - "syn 2.0.106", + "syn 2.0.108", ] [[package]] @@ -2136,7 +1963,7 @@ dependencies = [ "proc-macro2", "quote", "strsim 0.11.1", - "syn 2.0.106", + "syn 2.0.108", ] [[package]] @@ -2147,7 +1974,7 @@ checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead" dependencies = [ "darling_core 0.20.11", "quote", - "syn 2.0.106", + "syn 2.0.108", ] [[package]] @@ -2158,7 +1985,7 @@ checksum = "d38308df82d1080de0afee5d069fa14b0326a88c14f15c5ccda35b4a6c414c81" dependencies = [ "darling_core 0.21.3", "quote", - "syn 2.0.106", + "syn 2.0.108", ] [[package]] @@ -2205,9 +2032,9 @@ dependencies = [ [[package]] name = "deranged" -version = "0.5.4" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a41953f86f8a05768a6cda24def994fd2f424b04ec5c719cf89989779f199071" +checksum = "ececcb659e7ba858fb4f10388c250a7252eb0a27373f1a72b8748afdd248e587" dependencies = [ "powerfmt", "serde_core", @@ -2311,7 +2138,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.108", ] [[package]] @@ -2334,7 +2161,7 @@ checksum = "a6cbae11b3de8fce2a456e8ea3dada226b35fe791f0dc1d360c0941f0bb681f3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.108", ] [[package]] @@ -2408,7 +2235,7 @@ dependencies = [ "enum-ordinalize", "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.108", ] [[package]] @@ -2452,27 +2279,27 @@ checksum = "685adfa4d6f3d765a26bc5dbc936577de9abf756c1feeb3089b01dd395034842" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.108", ] [[package]] name = "enum-ordinalize" -version = "4.3.0" +version = "4.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fea0dcfa4e54eeb516fe454635a95753ddd39acda650ce703031c6973e315dd5" +checksum = "4a1091a7bb1f8f2c4b28f1fe2cef4980ca2d410a3d727d67ecc3178c9b0800f0" dependencies = [ "enum-ordinalize-derive", ] [[package]] name = "enum-ordinalize-derive" -version = "4.3.1" +version = "4.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d28318a75d4aead5c4db25382e8ef717932d0346600cacae6357eb5941bc5ff" +checksum = "8ca9601fb2d62598ee17836250842873a413586e5d7ed88b356e38ddbb0ec631" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.108", ] [[package]] @@ -2501,7 +2328,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -2551,9 +2378,9 @@ checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d" [[package]] name = "find-msvc-tools" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0399f9d26e5191ce32c498bebd31e7a3ceabc2745f0ac54af3f335126c3f24b3" +checksum = "52051878f80a721bb68ebfbc930e07b65ba72f2da88968ea5c06fd6ca3d3a127" [[package]] name = "five8" @@ -2587,9 +2414,9 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flate2" -version = "1.1.4" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc5a4e564e38c699f2880d3fda590bedc2e69f3f84cd48b457bd892ce61d0aa9" +checksum = "bfe33edd8e85a12a67454e37f8c75e730830d83e313556ab9ebf9ee7fbeb3bfb" dependencies = [ "crc32fast", "miniz_oxide", @@ -2738,7 +2565,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.108", ] [[package]] @@ -2779,9 +2606,9 @@ dependencies = [ [[package]] name = "generic-array" -version = "0.14.7" +version = "0.14.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +checksum = "4bb6743198531e02858aeaea5398fcc883e71851fcbcb5a2f773e2fb6cb1edf2" dependencies = [ "serde", "typenum", @@ -2826,22 +2653,16 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.3.3" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4" +checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd" dependencies = [ "cfg-if", "libc", "r-efi", - "wasi 0.14.7+wasi-0.2.4", + "wasip2", ] -[[package]] -name = "gimli" -version = "0.32.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e629b9b98ef3dd8afe6ca2bd0f89306cec16d43d907889945bc5d6687f2f13c7" - [[package]] name = "glob" version = "0.3.3" @@ -2850,9 +2671,9 @@ checksum = "0cc23270f6e1808e30a928bdc84dea0b9b4136a8bc82338574f23baf47bbd280" [[package]] name = "globset" -version = "0.4.16" +version = "0.4.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54a1028dfc5f5df5da8a56a73e6c153c9a9708ec57232470703592a3f18e49f5" +checksum = "52dfc19153a48bde0cbd630453615c8151bce3a5adfac7a0aebfbf0a1e1f57e3" dependencies = [ "aho-corasick", "bstr", @@ -2911,7 +2732,7 @@ dependencies = [ "futures-sink", "futures-util", "http 0.2.12", - "indexmap 2.11.4", + "indexmap 2.12.0", "slab", "tokio", "tokio-util", @@ -2930,7 +2751,7 @@ dependencies = [ "futures-core", "futures-sink", "http 1.3.1", - "indexmap 2.11.4", + "indexmap 2.12.0", "slab", "tokio", "tokio-util", @@ -3109,11 +2930,11 @@ dependencies = [ [[package]] name = "home" -version = "0.5.11" +version = "0.5.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "589533453244b0995c858700322199b2becb13b627df2851f64a2775d024abcf" +checksum = "cc627f471c528ff0c4a49e1d5e60450c8f6461dd6d10ba9dcd3a61d3dff7728d" dependencies = [ - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -3312,7 +3133,7 @@ dependencies = [ "hyper 1.7.0", "libc", "pin-project-lite", - "socket2 0.6.0", + "socket2 0.6.1", "tokio", "tower-service", "tracing", @@ -3344,9 +3165,9 @@ dependencies = [ [[package]] name = "icu_collections" -version = "2.0.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "200072f5d0e3614556f94a9930d5dc3e0662a652823904c3a75dc3b0af7fee47" +checksum = "4c6b649701667bbe825c3b7e6388cb521c23d88644678e83c0c4d0a621a34b43" dependencies = [ "displaydoc", "potential_utf", @@ -3357,9 +3178,9 @@ dependencies = [ [[package]] name = "icu_locale_core" -version = "2.0.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0cde2700ccaed3872079a65fb1a78f6c0a36c91570f28755dda67bc8f7d9f00a" +checksum = "edba7861004dd3714265b4db54a3c390e880ab658fec5f7db895fae2046b5bb6" dependencies = [ "displaydoc", "litemap", @@ -3370,11 +3191,10 @@ dependencies = [ [[package]] name = "icu_normalizer" -version = "2.0.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "436880e8e18df4d7bbc06d58432329d6458cc84531f7ac5f024e93deadb37979" +checksum = "5f6c8828b67bf8908d82127b2054ea1b4427ff0230ee9141c54251934ab1b599" dependencies = [ - "displaydoc", "icu_collections", "icu_normalizer_data", "icu_properties", @@ -3385,42 +3205,38 @@ dependencies = [ [[package]] name = "icu_normalizer_data" -version = "2.0.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00210d6893afc98edb752b664b8890f0ef174c8adbb8d0be9710fa66fbbf72d3" +checksum = "7aedcccd01fc5fe81e6b489c15b247b8b0690feb23304303a9e560f37efc560a" [[package]] name = "icu_properties" -version = "2.0.1" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "016c619c1eeb94efb86809b015c58f479963de65bdb6253345c1a1276f22e32b" +checksum = "e93fcd3157766c0c8da2f8cff6ce651a31f0810eaa1c51ec363ef790bbb5fb99" dependencies = [ - "displaydoc", "icu_collections", "icu_locale_core", "icu_properties_data", "icu_provider", - "potential_utf", "zerotrie", "zerovec", ] [[package]] name = "icu_properties_data" -version = "2.0.1" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "298459143998310acd25ffe6810ed544932242d3f07083eee1084d83a71bd632" +checksum = "02845b3647bb045f1100ecd6480ff52f34c35f82d9880e029d329c21d1054899" [[package]] name = "icu_provider" -version = "2.0.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03c80da27b5f4187909049ee2d72f276f0d9f99a42c306bd0131ecfe04d8e5af" +checksum = "85962cf0ce02e1e0a629cc34e7ca3e373ce20dda4c4d7294bbd0bf1fdb59e614" dependencies = [ "displaydoc", "icu_locale_core", - "stable_deref_trait", - "tinystr", "writeable", "yoke", "zerofrom", @@ -3483,9 +3299,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.11.4" +version = "2.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b0f83760fb341a774ed326568e19f5a863af4a952def8c39f9ab92fd95b88e5" +checksum = "6717a8d2a5a929a1a2eb43a12812498ed141a0bcfb7e8f7844fbdbe4303bba9f" dependencies = [ "equivalent", "hashbrown 0.16.0", @@ -3527,17 +3343,6 @@ dependencies = [ "cfg-if", ] -[[package]] -name = "io-uring" -version = "0.7.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "046fa2d4d00aea763528b4950358d0ead425372445dc8ff86312b3c69ff7727b" -dependencies = [ - "bitflags 2.9.4", - "cfg-if", - "libc", -] - [[package]] name = "ipnet" version = "2.11.0" @@ -3555,9 +3360,9 @@ dependencies = [ [[package]] name = "is_terminal_polyfill" -version = "1.70.1" +version = "1.70.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" +checksum = "a6cb138bb79a146c1bd460005623e142ef0181e3d0219cb493e02f7d08a35695" [[package]] name = "itertools" @@ -3598,15 +3403,15 @@ version = "0.1.34" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9afb3de4395d6b3e67a780b6de64b51c978ecf11cb9a462c66be7d4ca9039d33" dependencies = [ - "getrandom 0.3.3", + "getrandom 0.3.4", "libc", ] [[package]] name = "js-sys" -version = "0.3.81" +version = "0.3.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec48937a97411dcb524a265206ccd4c90bb711fca92b2792c407f268825b9305" +checksum = "b011eec8cc36da2aab2d5cff675ec18454fad408585853910a202391cf9f8e65" dependencies = [ "once_cell", "wasm-bindgen", @@ -3755,9 +3560,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "libc" -version = "0.2.176" +version = "0.2.177" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58f929b4d672ea937a23a1ab494143d968337a5f47e56d0815df1e0890ddf174" +checksum = "2874a2af47a2325c2001a6e6fad9b16a53b802102b528163885171cf92b15976" [[package]] name = "libredox" @@ -3765,7 +3570,7 @@ version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "416f7e718bdb06000964960ffa43b4335ad4012ae8b99060261aa4a8088d5ccb" dependencies = [ - "bitflags 2.9.4", + "bitflags 2.10.0", "libc", "redox_syscall 0.5.18", ] @@ -3950,7 +3755,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4f15113babaca9efb592631ec1e7e78c1c83413818a6e1e4248b7df53d88fe65" dependencies = [ - "anchor-lang 0.31.1", + "anchor-lang", "borsh 0.10.4", "bytemuck", "light-hasher 3.1.0", @@ -3968,7 +3773,7 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0985921012ffc149596eac90d1170399bb70dbebfa2212bb72b2da30a558ec6" dependencies = [ - "anchor-lang 0.31.1", + "anchor-lang", "borsh 0.10.4", "bytemuck", "light-hasher 4.0.0", @@ -4121,14 +3926,15 @@ dependencies = [ [[package]] name = "light-macros" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "861c0817697c1201c2235cd831fcbaa2564a5f778e5229e9f5cc21035e97c273" +checksum = "179ac51cadc1d0ca047b4d6265a7cc245ca3affc16a20a2749585aa6464d39c2" dependencies = [ "bs58 0.5.1", "proc-macro2", "quote", - "syn 2.0.106", + "solana-pubkey", + "syn 2.0.108", ] [[package]] @@ -4137,7 +3943,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "544048fa95ea95fc1e952a2b9b1d6f09340c8decaffd1ad239fe1f6eb905ae76" dependencies = [ - "anchor-lang 0.31.1", + "anchor-lang", "borsh 0.10.4", "bytemuck", "light-compressed-account 0.3.0", @@ -4222,7 +4028,7 @@ checksum = "0a8be18fe4de58a6f754caa74a3fbc6d8a758a26f1f3c24d5b0f5b55df5f5408" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.108", ] [[package]] @@ -4287,7 +4093,7 @@ dependencies = [ "lazy_static", "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.108", ] [[package]] @@ -4298,9 +4104,9 @@ checksum = "df1d3c3b53da64cf5760482273a98e575c651a67eec7f77df96b5b642de8f039" [[package]] name = "litemap" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "241eaef5fd12c88705a01fc1066c48c4b36e0dd4377dcdc7ec3942cea7a69956" +checksum = "6373607a59f0be73a39b6fe456b8192fcc3585f602af20751600e974dd455e77" [[package]] name = "lock_api" @@ -4343,7 +4149,7 @@ checksum = "5cf92c10c7e361d6b99666ec1c6f9805b0bea2c3bd8c78dc6fe98ac5bd78db11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.108", ] [[package]] @@ -4450,13 +4256,13 @@ dependencies = [ [[package]] name = "mio" -version = "1.0.4" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78bed444cc8a2160f01cbcf811ef18cac863ad68ae8ca62092e8db51d51c761c" +checksum = "69d83b0086dc8ecf3ce9ae2874b2d1290252e2a30720bea58a5c6639b0092873" dependencies = [ "libc", "wasi 0.11.1+wasi-snapshot-preview1", - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -4507,11 +4313,11 @@ dependencies = [ [[package]] name = "nu-ansi-term" -version = "0.50.1" +version = "0.50.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4a28e057d01f97e61255210fcff094d74ed0466038633e95017f5beb68e4399" +checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] @@ -4584,7 +4390,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.108", ] [[package]] @@ -4649,11 +4455,11 @@ dependencies = [ [[package]] name = "num_enum" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a973b4e44ce6cad84ce69d797acf9a044532e4184c4f267913d1b546a0727b7a" +checksum = "b1207a7e20ad57b847bbddc6776b968420d38292bbfe2089accff5e19e82454c" dependencies = [ - "num_enum_derive 0.7.4", + "num_enum_derive 0.7.5", "rustversion", ] @@ -4666,19 +4472,19 @@ dependencies = [ "proc-macro-crate 1.3.1", "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.108", ] [[package]] name = "num_enum_derive" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77e878c846a8abae00dd069496dbe8751b16ac1c3d6bd2a7283a938e8228f90d" +checksum = "ff32365de1b6743cb203b710788263c44a03de03802daf96092f2da4fe6ba4d7" dependencies = [ "proc-macro-crate 3.4.0", "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.108", ] [[package]] @@ -4687,15 +4493,6 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" -[[package]] -name = "object" -version = "0.37.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff76201f031d8863c38aa7f905eca4f53abbfa15f609db4277d44cd8938f33fe" -dependencies = [ - "memchr", -] - [[package]] name = "oid-registry" version = "0.6.1" @@ -4713,9 +4510,9 @@ checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" [[package]] name = "once_cell_polyfill" -version = "1.70.1" +version = "1.70.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4895175b425cb1f87721b59f0f286c2092bd4af812243672510e1ac53e2e0ad" +checksum = "384b8ab6d37215f3c5301a95a4accb5d64aa607f1fcb26a11b5303878451b4fe" [[package]] name = "opaque-debug" @@ -4725,11 +4522,11 @@ checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" [[package]] name = "openssl" -version = "0.10.73" +version = "0.10.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8505734d46c8ab1e19a1dce3aef597ad87dcb4c37e7188231769bd6bd51cebf8" +checksum = "24ad14dd45412269e1a30f52ad8f0664f0f4f4a89ee8fe28c3b3527021ebb654" dependencies = [ - "bitflags 2.9.4", + "bitflags 2.10.0", "cfg-if", "foreign-types", "libc", @@ -4746,7 +4543,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.108", ] [[package]] @@ -4757,9 +4554,9 @@ checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e" [[package]] name = "openssl-sys" -version = "0.9.109" +version = "0.9.110" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90096e2e47630d78b7d1c20952dc621f957103f8bc2c8359ec81290d75238571" +checksum = "0a9f0075ba3c21b09f8e8b2026584b1d18d49388648f2fbbf3c97ea8deced8e2" dependencies = [ "cc", "libc", @@ -4863,7 +4660,7 @@ dependencies = [ "libc", "redox_syscall 0.5.18", "smallvec", - "windows-link 0.2.1", + "windows-link", ] [[package]] @@ -4932,7 +4729,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" dependencies = [ "fixedbitset", - "indexmap 2.11.4", + "indexmap 2.12.0", ] [[package]] @@ -4940,7 +4737,6 @@ name = "photon-indexer" version = "0.51.0" dependencies = [ "account-compression", - "anchor-lang 0.29.0", "anyhow", "ark-bn254 0.5.0", "ark-serialize 0.5.0", @@ -4955,7 +4751,7 @@ dependencies = [ "bytes", "cadence", "cadence-macros", - "clap 4.5.48", + "clap 4.5.51", "cloud-storage", "dirs 5.0.1", "function_name", @@ -4979,7 +4775,7 @@ dependencies = [ "log", "num-bigint 0.4.6", "num-traits", - "num_enum 0.7.4", + "num_enum 0.7.5", "once_cell", "rand 0.8.5", "reqwest 0.12.4", @@ -5024,7 +4820,7 @@ checksum = "6e918e4ff8c4549eb882f14b3a4bc8c8bc93de829416eacf579f1207a8fbf861" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.108", ] [[package]] @@ -5107,9 +4903,9 @@ checksum = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483" [[package]] name = "potential_utf" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84df19adbe5b5a0782edcab45899906947ab039ccf4573713735ee7de1e6b08a" +checksum = "b73949432f5e2a09657003c25bca5e19a0e9c84f8058ca374f49e0ebe605af77" dependencies = [ "zerovec", ] @@ -5136,7 +4932,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b" dependencies = [ "proc-macro2", - "syn 2.0.106", + "syn 2.0.108", ] [[package]] @@ -5164,7 +4960,7 @@ version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "219cb19e96be00ab2e37d6e299658a0cfa83e52429179969b0f0121b4ac46983" dependencies = [ - "toml_edit 0.23.6", + "toml_edit 0.23.7", ] [[package]] @@ -5193,9 +4989,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.101" +version = "1.0.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89ae43fd86e4158d6db51ad8e2b80f313af9cc74f5c0e03ccb87de09998732de" +checksum = "5ee95bc4ef87b8d5ba32e8b7714ccc834865276eab0aed5c9958d00ec45f49e8" dependencies = [ "unicode-ident", ] @@ -5227,7 +5023,7 @@ dependencies = [ "prost", "prost-types", "regex", - "syn 2.0.106", + "syn 2.0.108", "tempfile", ] @@ -5241,7 +5037,7 @@ dependencies = [ "itertools 0.12.1", "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.108", ] [[package]] @@ -5299,7 +5095,7 @@ checksum = "9e2e25ee72f5b24d773cae88422baddefff7714f97aab68d96fe2b6fc4a28fb2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.108", ] [[package]] @@ -5508,7 +5304,7 @@ version = "0.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d" dependencies = [ - "bitflags 2.9.4", + "bitflags 2.10.0", ] [[package]] @@ -5524,9 +5320,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.11.3" +version = "1.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b5288124840bee7b386bc413c487869b360b2b4ec421ea56425128692f2a82c" +checksum = "843bc0191f75f3e22651ae5f1e72939ab2f72a4bc30fa80a066bd66edefc24d4" dependencies = [ "aho-corasick", "memchr", @@ -5536,9 +5332,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.11" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "833eb9ce86d40ef33cb1306d8accf7bc8ec2bfea4355cbdebb3df68b40925cad" +checksum = "5276caf25ac86c8d810222b3dbb938e512c55c6831a10f3e6ed1c93b84041f1c" dependencies = [ "aho-corasick", "memchr", @@ -5547,9 +5343,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.6" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "caf4aa5b0f434c91fe5c7f1ecb6a5ece2130b02ad2a590589dda5146df959001" +checksum = "7a2d987857b319362043e95f5353c0535c1f58eec5336fdfcf626430af7def58" [[package]] name = "relative-path" @@ -5751,7 +5547,7 @@ dependencies = [ "regex", "relative-path", "rustc_version", - "syn 2.0.106", + "syn 2.0.108", "unicode-ident", ] @@ -5814,9 +5610,9 @@ dependencies = [ [[package]] name = "rust_decimal" -version = "1.38.0" +version = "1.39.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8975fc98059f365204d635119cf9c5a60ae67b841ed49b5422a9a7e56cdfac0" +checksum = "35affe401787a9bd846712274d97654355d21b2a2c092a3139aabe31e9022282" dependencies = [ "arrayvec", "borsh 1.5.7", @@ -5864,11 +5660,11 @@ version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cd15f8a2c5551a84d56efdc1cd049089e409ac19a3072d5037a17fd70719ff3e" dependencies = [ - "bitflags 2.9.4", + "bitflags 2.10.0", "errno", "libc", "linux-raw-sys", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -5927,9 +5723,9 @@ dependencies = [ [[package]] name = "rustls-pki-types" -version = "1.12.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "229a4a4c221013e7e1f1a043678c5cc39fe5171437c88fb47151a21e6f5b5c79" +checksum = "94182ad936a0c91c324cd46c6511b9510ed16af436d7b5bab34beab0afd55f7a" dependencies = [ "zeroize", ] @@ -6005,7 +5801,7 @@ checksum = "1db149f81d46d2deba7cd3c50772474707729550221e69588478ebf9ada425ae" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.108", ] [[package]] @@ -6190,7 +5986,7 @@ version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" dependencies = [ - "bitflags 2.9.4", + "bitflags 2.10.0", "core-foundation", "core-foundation-sys", "libc", @@ -6259,7 +6055,7 @@ checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.108", ] [[package]] @@ -6308,12 +6104,12 @@ dependencies = [ [[package]] name = "serde_with" -version = "3.15.0" +version = "3.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6093cd8c01b25262b84927e0f7151692158fab02d961e04c979d3903eba7ecc5" +checksum = "aa66c845eee442168b2c8134fec70ac50dc20e760769c8ba0ad1319ca1959b04" dependencies = [ "serde_core", - "serde_with_macros 3.15.0", + "serde_with_macros 3.15.1", ] [[package]] @@ -6325,19 +6121,19 @@ dependencies = [ "darling 0.20.11", "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.108", ] [[package]] name = "serde_with_macros" -version = "3.15.0" +version = "3.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7e6c180db0816026a61afa1cff5344fb7ebded7e4d3062772179f2501481c27" +checksum = "b91a903660542fced4e99881aa481bdbaec1634568ee02e0b8bd57c64cb38955" dependencies = [ "darling 0.21.3", "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.108", ] [[package]] @@ -6346,7 +6142,7 @@ version = "0.9.34+deprecated" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" dependencies = [ - "indexmap 2.11.4", + "indexmap 2.12.0", "itoa", "ryu", "serde", @@ -6375,7 +6171,7 @@ checksum = "91d129178576168c589c9ec973feedf7d3126c01ac2bf08795109aa35b69fb8f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.108", ] [[package]] @@ -6574,12 +6370,12 @@ dependencies = [ [[package]] name = "socket2" -version = "0.6.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "233504af464074f9d066d7b5416c5f9b894a5862a6506e306f7b816cdd6f1807" +checksum = "17129e116933cf371d018bb80ae557e889637989d8638274fb25622827b03881" dependencies = [ "libc", - "windows-sys 0.59.0", + "windows-sys 0.60.2", ] [[package]] @@ -6767,7 +6563,7 @@ dependencies = [ "dashmap", "futures", "futures-util", - "indexmap 2.11.4", + "indexmap 2.12.0", "indicatif", "log", "quinn", @@ -6881,7 +6677,7 @@ dependencies = [ "bincode", "crossbeam-channel", "futures-util", - "indexmap 2.11.4", + "indexmap 2.12.0", "log", "rand 0.8.5", "rayon", @@ -7107,7 +6903,7 @@ dependencies = [ "proc-macro2", "quote", "rustc_version", - "syn 2.0.106", + "syn 2.0.108", ] [[package]] @@ -7180,9 +6976,9 @@ dependencies = [ [[package]] name = "solana-instruction" -version = "2.3.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47298e2ce82876b64f71e9d13a46bc4b9056194e7f9937ad3084385befa50885" +checksum = "c54769c7e58fc7653658c49b39b935ff6673260cba4ae033b21580a79ca73c90" dependencies = [ "bincode", "borsh 1.5.7", @@ -7191,6 +6987,7 @@ dependencies = [ "num-traits", "serde", "serde_derive", + "serde_json", "solana-define-syscall", "solana-pubkey", "wasm-bindgen", @@ -7202,7 +6999,7 @@ version = "2.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e0e85a6fad5c2d0c4f5b91d34b8ca47118fc593af706e523cdbedf846a954f57" dependencies = [ - "bitflags 2.9.4", + "bitflags 2.10.0", "solana-account-info", "solana-instruction", "solana-program-error", @@ -7451,7 +7248,7 @@ version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b526398ade5dea37f1f147ce55dae49aa017a5d7326606359b0445ca8d946581" dependencies = [ - "num_enum 0.7.4", + "num_enum 0.7.5", "solana-hash", "solana-packet", "solana-pubkey", @@ -7468,11 +7265,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "004f2d2daf407b3ec1a1ca5ec34b3ccdfd6866dd2d3c7d0715004a96e4b6d127" dependencies = [ "bincode", - "bitflags 2.9.4", + "bitflags 2.10.0", "cfg_eval", "serde", "serde_derive", - "serde_with 3.15.0", + "serde_with 3.15.1", ] [[package]] @@ -7564,7 +7361,7 @@ dependencies = [ "ark-serialize 0.4.2", "base64 0.21.7", "bincode", - "bitflags 2.9.4", + "bitflags 2.10.0", "blake3", "borsh 0.10.4", "borsh 0.9.3", @@ -8022,7 +7819,7 @@ dependencies = [ "assert_matches", "base64 0.21.7", "bincode", - "bitflags 2.9.4", + "bitflags 2.10.0", "borsh 1.5.7", "bs58 0.4.0", "bytemuck", @@ -8042,7 +7839,7 @@ dependencies = [ "memmap2", "num-derive 0.4.2", "num-traits", - "num_enum 0.7.4", + "num_enum 0.7.5", "pbkdf2 0.11.0", "qstring", "qualifier_attr", @@ -8158,7 +7955,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.106", + "syn 2.0.108", ] [[package]] @@ -8170,7 +7967,7 @@ dependencies = [ "bs58 0.5.1", "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.108", ] [[package]] @@ -8398,7 +8195,7 @@ dependencies = [ "crossbeam-channel", "futures-util", "histogram", - "indexmap 2.11.4", + "indexmap 2.12.0", "itertools 0.10.5", "libc", "log", @@ -8528,7 +8325,7 @@ dependencies = [ "async-trait", "bincode", "futures-util", - "indexmap 2.11.4", + "indexmap 2.12.0", "indicatif", "log", "rayon", @@ -8572,9 +8369,9 @@ dependencies = [ [[package]] name = "solana-transaction-context" -version = "2.3.12" +version = "2.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99b02e4d84d75dc196689f0256234b31a11e3cc97abc22ac71c945e930d1fea1" +checksum = "54a312304361987a85b2ef2293920558e6612876a639dd1309daf6d0d59ef2fe" dependencies = [ "bincode", "serde", @@ -8815,7 +8612,7 @@ checksum = "07fd7858fc4ff8fb0e34090e41d7eb06a823e1057945c26d480bfc21d2338a93" dependencies = [ "quote", "spl-discriminator-syn", - "syn 2.0.106", + "syn 2.0.108", ] [[package]] @@ -8827,7 +8624,7 @@ dependencies = [ "proc-macro2", "quote", "sha2 0.10.9", - "syn 2.0.106", + "syn 2.0.108", "thiserror 1.0.69", ] @@ -8875,7 +8672,7 @@ dependencies = [ "proc-macro2", "quote", "sha2 0.10.9", - "syn 2.0.106", + "syn 2.0.108", ] [[package]] @@ -8917,7 +8714,7 @@ dependencies = [ "bytemuck", "num-derive 0.4.2", "num-traits", - "num_enum 0.7.4", + "num_enum 0.7.5", "solana-program 1.18.26", "solana-security-txt", "solana-zk-token-sdk", @@ -9103,9 +8900,9 @@ dependencies = [ [[package]] name = "stable_deref_trait" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" +checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596" [[package]] name = "static_assertions" @@ -9161,9 +8958,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.106" +version = "2.0.108" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ede7c438028d4436d71104916910f5bb611972c5cfd7f89b8300a8186e6fada6" +checksum = "da58917d35242480a05c2897064da0a80589a2a0476c9a3f2fdc83b53502e917" dependencies = [ "proc-macro2", "quote", @@ -9196,7 +8993,7 @@ checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.108", ] [[package]] @@ -9233,10 +9030,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2d31c77bdf42a745371d260a26ca7163f1e0924b64afa0b688e61b5a9fa02f16" dependencies = [ "fastrand", - "getrandom 0.3.3", + "getrandom 0.3.4", "once_cell", "rustix", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -9289,7 +9086,7 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.108", ] [[package]] @@ -9300,7 +9097,7 @@ checksum = "3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c7a517c913" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.108", ] [[package]] @@ -9373,9 +9170,9 @@ dependencies = [ [[package]] name = "tinystr" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d4f6d1145dcb577acf783d4e601bc1d76a13337bb54e6233add580b07344c8b" +checksum = "42d3e9c45c09de15d06dd8acf5f4e0e399e85927b7f00711024eb7ae10fa4869" dependencies = [ "displaydoc", "zerovec", @@ -9398,22 +9195,19 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.47.1" +version = "1.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89e49afdadebb872d3145a5638b59eb0691ea23e46ca484037cfab3b76b95038" +checksum = "ff360e02eab121e0bc37a2d3b4d4dc622e6eda3a8e5253d5435ecf5bd4c68408" dependencies = [ - "backtrace", "bytes", - "io-uring", "libc", "mio", "parking_lot 0.12.5", "pin-project-lite", "signal-hook-registry", - "slab", - "socket2 0.6.0", + "socket2 0.6.1", "tokio-macros", - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -9428,13 +9222,13 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8" +checksum = "af407857209536a95c8e56f8231ef2c2e2aff839b22e07a1ffcbc617e9db9fa5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.108", ] [[package]] @@ -9540,9 +9334,9 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32f1085dec27c2b6632b04c80b3bb1b4300d6495d1e129693bdda7d91e72eec1" +checksum = "f2cdb639ebbc97961c51720f858597f7f24c4fc295327923af55b74c3c724533" dependencies = [ "serde_core", ] @@ -9553,7 +9347,7 @@ version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.11.4", + "indexmap 2.12.0", "toml_datetime 0.6.11", "winnow 0.5.40", ] @@ -9564,7 +9358,7 @@ version = "0.22.27" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a" dependencies = [ - "indexmap 2.11.4", + "indexmap 2.12.0", "serde", "serde_spanned", "toml_datetime 0.6.11", @@ -9574,21 +9368,21 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.23.6" +version = "0.23.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3effe7c0e86fdff4f69cdd2ccc1b96f933e24811c5441d44904e8683e27184b" +checksum = "6485ef6d0d9b5d0ec17244ff7eb05310113c3f316f2d14200d4de56b3cb98f8d" dependencies = [ - "indexmap 2.11.4", - "toml_datetime 0.7.2", + "indexmap 2.12.0", + "toml_datetime 0.7.3", "toml_parser", "winnow 0.7.13", ] [[package]] name = "toml_parser" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cf893c33be71572e0e9aa6dd15e6677937abd686b066eac3f8cd3531688a627" +checksum = "c0cbe268d35bdb4bb5a56a2de88d0ad0eb70af5384a99d648cd4b3d04039800e" dependencies = [ "winnow 0.7.13", ] @@ -9640,7 +9434,7 @@ dependencies = [ "proc-macro2", "prost-build", "quote", - "syn 2.0.106", + "syn 2.0.108", ] [[package]] @@ -9739,7 +9533,7 @@ checksum = "81383ab64e72a7a8b8e13130c49e3dab29def6d0c7d76a03087b3cf71c5c6903" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.108", ] [[package]] @@ -9841,24 +9635,24 @@ checksum = "5c1cb5db39152898a79168971543b1cb5020dff7fe43c8dc468b0885f5e29df5" [[package]] name = "unicode-ident" -version = "1.0.19" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f63a545481291138910575129486daeaf8ac54aee4387fe7906919f7830c7d9d" +checksum = "9312f7c4f6ff9069b165498234ce8be658059c6728633667c526e27dc2cf1df5" [[package]] name = "unicode-normalization" -version = "0.1.24" +version = "0.1.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956" +checksum = "5fd4f6878c9cb28d874b009da9e8d183b5abc80117c40bbd187a1fde336be6e8" dependencies = [ "tinyvec", ] [[package]] name = "unicode-properties" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e70f2a8b45122e719eb623c01822704c4e0907e7e426a05927e1a1cfff5b75d0" +checksum = "7df058c713841ad818f1dc5d3fd88063241cc61f49f5fbea4b951e8cf5a8d71d" [[package]] name = "unicode-segmentation" @@ -9973,7 +9767,7 @@ version = "4.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c5afb1a60e207dca502682537fefcfd9921e71d0b83e9576060f09abc6efab23" dependencies = [ - "indexmap 2.11.4", + "indexmap 2.12.0", "serde", "serde_json", "serde_yaml", @@ -9989,7 +9783,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.108", ] [[package]] @@ -9998,7 +9792,7 @@ version = "1.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2f87b8aa10b915a06587d0dec516c282ff295b475d94abf425d62b57710070a2" dependencies = [ - "getrandom 0.3.3", + "getrandom 0.3.4", "js-sys", "serde", "wasm-bindgen", @@ -10061,15 +9855,6 @@ version = "0.11.1+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b" -[[package]] -name = "wasi" -version = "0.14.7+wasi-0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "883478de20367e224c0090af9cf5f9fa85bed63a95c1abf3afc5c083ebc06e8c" -dependencies = [ - "wasip2", -] - [[package]] name = "wasip2" version = "1.0.1+wasi-0.2.4" @@ -10087,9 +9872,9 @@ checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b" [[package]] name = "wasm-bindgen" -version = "0.2.104" +version = "0.2.105" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1da10c01ae9f1ae40cbfac0bac3b1e724b320abfcf52229f80b547c0d250e2d" +checksum = "da95793dfc411fbbd93f5be7715b0578ec61fe87cb1a42b12eb625caa5c5ea60" dependencies = [ "cfg-if", "once_cell", @@ -10098,25 +9883,11 @@ dependencies = [ "wasm-bindgen-shared", ] -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.104" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "671c9a5a66f49d8a47345ab942e2cb93c7d1d0339065d4f8139c486121b43b19" -dependencies = [ - "bumpalo", - "log", - "proc-macro2", - "quote", - "syn 2.0.106", - "wasm-bindgen-shared", -] - [[package]] name = "wasm-bindgen-futures" -version = "0.4.54" +version = "0.4.55" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e038d41e478cc73bae0ff9b36c60cff1c98b8f38f8d7e8061e79ee63608ac5c" +checksum = "551f88106c6d5e7ccc7cd9a16f312dd3b5d36ea8b4954304657d5dfba115d4a0" dependencies = [ "cfg-if", "js-sys", @@ -10127,9 +9898,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.104" +version = "0.2.105" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ca60477e4c59f5f2986c50191cd972e3a50d8a95603bc9434501cf156a9a119" +checksum = "04264334509e04a7bf8690f2384ef5265f05143a4bff3889ab7a3269adab59c2" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -10137,22 +9908,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.104" +version = "0.2.105" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f07d2f20d4da7b26400c9f4a0511e6e0345b040694e8a75bd41d578fa4421d7" +checksum = "420bc339d9f322e562942d52e115d57e950d12d88983a14c79b86859ee6c7ebc" dependencies = [ + "bumpalo", "proc-macro2", "quote", - "syn 2.0.106", - "wasm-bindgen-backend", + "syn 2.0.108", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.104" +version = "0.2.105" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bad67dc8b2a1a6e5448428adec4c3e84c43e561d8c9ee8a9e5aabeb193ec41d1" +checksum = "76f218a38c84bcb33c25ec7059b07847d465ce0e0a76b995e134a45adcb6af76" dependencies = [ "unicode-ident", ] @@ -10172,9 +9943,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.81" +version = "0.3.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9367c417a924a74cae129e6a2ae3b47fabb1f8995595ab474029da749a8be120" +checksum = "3a1f95c0d03a47f4ae1f7a64643a6bb97465d9b740f0fa8f90ea33915c99a9a1" dependencies = [ "js-sys", "wasm-bindgen", @@ -10257,7 +10028,7 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" dependencies = [ - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -10268,45 +10039,39 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows-core" -version = "0.61.2" +version = "0.62.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0fdd3ddb90610c7638aa2b3a3ab2904fb9e5cdbecc643ddb3647212781c4ae3" +checksum = "b8e83a14d34d0623b51dce9581199302a221863196a1dde71a7663a4c2be9deb" dependencies = [ "windows-implement", "windows-interface", - "windows-link 0.1.3", + "windows-link", "windows-result", "windows-strings", ] [[package]] name = "windows-implement" -version = "0.60.0" +version = "0.60.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a47fddd13af08290e67f4acabf4b459f647552718f683a7b415d290ac744a836" +checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.108", ] [[package]] name = "windows-interface" -version = "0.59.1" +version = "0.59.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd9211b69f8dcdfa817bfd14bf1c97c9188afa36f4750130fcdf3f400eca9fa8" +checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.108", ] -[[package]] -name = "windows-link" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a" - [[package]] name = "windows-link" version = "0.2.1" @@ -10315,20 +10080,20 @@ checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5" [[package]] name = "windows-result" -version = "0.3.4" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56f42bd332cc6c8eac5af113fc0c1fd6a8fd2aa08a0119358686e5160d0586c6" +checksum = "7781fa89eaf60850ac3d2da7af8e5242a5ea78d1a11c49bf2910bb5a73853eb5" dependencies = [ - "windows-link 0.1.3", + "windows-link", ] [[package]] name = "windows-strings" -version = "0.4.2" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56e6c93f3a0c3b36176cb1327a4958a0353d5d166c2a35cb268ace15e91d3b57" +checksum = "7837d08f69c77cf6b07689544538e017c1bfcf57e34b4c0ff58e6c2cd3b37091" dependencies = [ - "windows-link 0.1.3", + "windows-link", ] [[package]] @@ -10364,7 +10129,7 @@ version = "0.60.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb" dependencies = [ - "windows-targets 0.53.3", + "windows-targets 0.53.5", ] [[package]] @@ -10373,7 +10138,7 @@ version = "0.61.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc" dependencies = [ - "windows-link 0.2.1", + "windows-link", ] [[package]] @@ -10409,11 +10174,11 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.53.3" +version = "0.53.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5fe6031c4041849d7c496a8ded650796e7b6ecc19df1a431c1a363342e5dc91" +checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3" dependencies = [ - "windows-link 0.1.3", + "windows-link", "windows_aarch64_gnullvm 0.53.1", "windows_aarch64_msvc 0.53.1", "windows_i686_gnu 0.53.1", @@ -10608,9 +10373,9 @@ checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59" [[package]] name = "writeable" -version = "0.6.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea2f10b9bb0928dfb1b42b65e1f9e36f7f54dbdf08457afefb38afcdec4fa2bb" +checksum = "9edde0db4769d2dc68579893f2306b26c6ecfbe0ef499b013d731b7b9247e0b9" [[package]] name = "wyz" @@ -10681,11 +10446,10 @@ dependencies = [ [[package]] name = "yoke" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f41bb01b8226ef4bfd589436a297c53d118f65921786300e427be8d487695cc" +checksum = "72d6e5c6afb84d73944e5cedb052c4680d5657337201555f9f2a16b7406d4954" dependencies = [ - "serde", "stable_deref_trait", "yoke-derive", "zerofrom", @@ -10693,13 +10457,13 @@ dependencies = [ [[package]] name = "yoke-derive" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38da3c9736e16c5d3c8c597a9aaa5d1fa565d0532ae05e27c24aa62fb32c0ab6" +checksum = "b659052874eb698efe5b9e8cf382204678a0086ebf46982b79d6ca3182927e5d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.108", "synstructure 0.13.2", ] @@ -10720,7 +10484,7 @@ checksum = "88d2b8d9c68ad2b9e4340d7832716a4d21a22a1154777ad56ea55c51a9cf3831" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.108", ] [[package]] @@ -10740,7 +10504,7 @@ checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.108", "synstructure 0.13.2", ] @@ -10761,14 +10525,14 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.108", ] [[package]] name = "zerotrie" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36f0bbd478583f79edad978b407914f61b2972f5af6fa089686016be8f9af595" +checksum = "2a59c17a5562d507e4b54960e8569ebee33bee890c70aa3fe7b97e85a9fd7851" dependencies = [ "displaydoc", "yoke", @@ -10777,9 +10541,9 @@ dependencies = [ [[package]] name = "zerovec" -version = "0.11.4" +version = "0.11.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7aa2bd55086f1ab526693ecbe444205da57e25f4489879da80635a46d90e73b" +checksum = "6c28719294829477f525be0186d13efa9a3c602f7ec202ca9e353d310fb9a002" dependencies = [ "yoke", "zerofrom", @@ -10788,13 +10552,13 @@ dependencies = [ [[package]] name = "zerovec-derive" -version = "0.11.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b96237efa0c878c64bd89c436f661be4e46b2f3eff1ebb976f7ef2321d2f58f" +checksum = "eadce39539ca5cb3985590102671f2567e659fca9666581ad3411d59207951f3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.108", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index f984fd5e..2be879c9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -37,7 +37,6 @@ path = "src/tools/tree_validator/main.rs" ark-serialize = "0.5" ark-bn254 = "0.5" -anchor-lang = "0.29.0" anyhow = "1.0.79" async-std = { version = "1", features = ["attributes", "tokio1"] } async-trait = "0.1.85" diff --git a/src/api/method/get_multiple_new_address_proofs.rs b/src/api/method/get_multiple_new_address_proofs.rs index 7127ca9d..a28c1935 100644 --- a/src/api/method/get_multiple_new_address_proofs.rs +++ b/src/api/method/get_multiple_new_address_proofs.rs @@ -122,7 +122,7 @@ pub async fn get_multiple_new_address_proofs_helper( let queued_address = SerializablePubkey::try_from(queued_address)?; return Err(PhotonApiError::ValidationError(format!( "Address {} already exists", - address + queued_address ))); } } diff --git a/src/common/typedefs/serializable_pubkey.rs b/src/common/typedefs/serializable_pubkey.rs index bee80535..30855209 100644 --- a/src/common/typedefs/serializable_pubkey.rs +++ b/src/common/typedefs/serializable_pubkey.rs @@ -29,7 +29,7 @@ impl SerializablePubkey { } } -impl anchor_lang::AnchorDeserialize for SerializablePubkey { +impl BorshDeserialize for SerializablePubkey { fn deserialize(buf: &mut &[u8]) -> Result { ::deserialize(buf).map(SerializablePubkey) } @@ -41,7 +41,7 @@ impl anchor_lang::AnchorDeserialize for SerializablePubkey { } } -impl anchor_lang::AnchorSerialize for SerializablePubkey { +impl borsh::BorshSerialize for SerializablePubkey { fn serialize(&self, writer: &mut W) -> Result<(), std::io::Error> { writer.write_all(&self.0.to_bytes()) } diff --git a/src/common/typedefs/token_data.rs b/src/common/typedefs/token_data.rs index e7ad01b3..05456a36 100644 --- a/src/common/typedefs/token_data.rs +++ b/src/common/typedefs/token_data.rs @@ -1,4 +1,4 @@ -use anchor_lang::{AnchorDeserialize, AnchorSerialize}; +use borsh::{BorshDeserialize, BorshSerialize}; use num_enum::TryFromPrimitive; use serde::Serialize; use utoipa::ToSchema; @@ -14,8 +14,8 @@ use super::{ Debug, PartialEq, Eq, - AnchorSerialize, - AnchorDeserialize, + BorshSerialize, + BorshDeserialize, TryFromPrimitive, ToSchema, Serialize, @@ -31,7 +31,7 @@ pub enum AccountState { } #[derive( - Debug, PartialEq, Eq, AnchorDeserialize, AnchorSerialize, Clone, ToSchema, Serialize, Default, + Debug, PartialEq, Eq, BorshDeserialize, BorshSerialize, Clone, ToSchema, Serialize, Default, )] #[serde(rename_all = "camelCase")] pub struct TokenData { diff --git a/src/common/typedefs/unsigned_integer.rs b/src/common/typedefs/unsigned_integer.rs index 542fcd53..b8f971f6 100644 --- a/src/common/typedefs/unsigned_integer.rs +++ b/src/common/typedefs/unsigned_integer.rs @@ -63,7 +63,7 @@ impl<'de> Deserialize<'de> for UnsignedInteger { } } -impl anchor_lang::AnchorDeserialize for UnsignedInteger { +impl borsh::BorshDeserialize for UnsignedInteger { fn deserialize(buf: &mut &[u8]) -> Result { if buf.len() < 8 { return Err(std::io::Error::new( @@ -85,7 +85,7 @@ impl anchor_lang::AnchorDeserialize for UnsignedInteger { } } -impl anchor_lang::AnchorSerialize for UnsignedInteger { +impl borsh::BorshSerialize for UnsignedInteger { fn serialize(&self, writer: &mut W) -> Result<(), std::io::Error> { writer.write_all(&self.0.to_le_bytes()) } diff --git a/src/ingester/parser/indexer_events.rs b/src/ingester/parser/indexer_events.rs index fae6f9bc..522638a4 100644 --- a/src/ingester/parser/indexer_events.rs +++ b/src/ingester/parser/indexer_events.rs @@ -1,16 +1,16 @@ /// Copied from the Light repo. We copy them instead of importing from the Light repo in order /// to avoid having to import all of Light's dependencies. -use anchor_lang::prelude::*; +use borsh::{BorshDeserialize, BorshSerialize}; use light_compressed_account::indexer_event::event::{BatchNullifyContext, NewAddress}; use solana_pubkey::Pubkey; -#[derive(Debug, PartialEq, Eq, Default, Clone, AnchorSerialize, AnchorDeserialize)] +#[derive(Debug, PartialEq, Eq, Default, Clone, BorshSerialize, BorshDeserialize)] pub struct OutputCompressedAccountWithPackedContext { pub compressed_account: CompressedAccount, pub merkle_tree_index: u8, } -#[derive(Debug, Clone, AnchorSerialize, AnchorDeserialize, Default, Eq, PartialEq)] +#[derive(Debug, Clone, BorshSerialize, BorshDeserialize, Default, Eq, PartialEq)] pub struct MerkleTreeSequenceNumberV2 { pub tree_pubkey: Pubkey, pub queue_pubkey: Pubkey, @@ -18,13 +18,13 @@ pub struct MerkleTreeSequenceNumberV2 { pub seq: u64, } -#[derive(Debug, Clone, AnchorSerialize, AnchorDeserialize, Default, Eq, PartialEq)] +#[derive(Debug, Clone, BorshSerialize, BorshDeserialize, Default, Eq, PartialEq)] pub struct MerkleTreeSequenceNumberV1 { pub pubkey: Pubkey, pub seq: u64, } -#[derive(Debug, Clone, AnchorSerialize, AnchorDeserialize, Eq, PartialEq)] +#[derive(Debug, Clone, BorshSerialize, BorshDeserialize, Eq, PartialEq)] pub enum MerkleTreeSequenceNumber { V1(MerkleTreeSequenceNumberV1), V2(MerkleTreeSequenceNumberV2), @@ -45,7 +45,7 @@ impl MerkleTreeSequenceNumber { } } -#[derive(Debug, Clone, AnchorSerialize, AnchorDeserialize, Default, PartialEq, Eq)] +#[derive(Debug, Clone, BorshSerialize, BorshDeserialize, Default, PartialEq, Eq)] pub struct PublicTransactionEvent { pub input_compressed_account_hashes: Vec<[u8; 32]>, pub output_compressed_account_hashes: Vec<[u8; 32]>, @@ -70,7 +70,7 @@ pub struct BatchPublicTransactionEvent { pub batch_input_accounts: Vec, } -#[derive(Debug, PartialEq, Eq, Default, Clone, AnchorSerialize, AnchorDeserialize)] +#[derive(Debug, PartialEq, Eq, Default, Clone, BorshSerialize, BorshDeserialize)] pub struct CompressedAccount { pub owner: Pubkey, pub lamports: u64, @@ -78,7 +78,7 @@ pub struct CompressedAccount { pub data: Option, } -#[derive(Debug, PartialEq, Eq, Default, Clone, AnchorSerialize, AnchorDeserialize)] +#[derive(Debug, PartialEq, Eq, Default, Clone, BorshSerialize, BorshDeserialize)] pub struct CompressedAccountData { pub discriminator: [u8; 8], pub data: Vec, @@ -89,7 +89,7 @@ pub struct CompressedAccountData { /// [`StateMerkleTree`](light_merkle_tree_program::state::StateMerkleTree) /// change. Indexers can use this type of events to re-build a non-sparse /// version of the state Merkle tree. -#[derive(AnchorDeserialize, AnchorSerialize, Clone, Eq, PartialEq, Debug)] +#[derive(BorshDeserialize, BorshSerialize, Clone, Eq, PartialEq, Debug)] #[repr(C)] pub enum MerkleTreeEvent { V1(ChangelogEvent), @@ -102,14 +102,14 @@ pub enum MerkleTreeEvent { /// Node of the Merkle path with an index representing the position in a /// non-sparse Merkle tree. -#[derive(AnchorDeserialize, AnchorSerialize, Clone, Debug, Eq, PartialEq)] +#[derive(BorshDeserialize, BorshSerialize, Clone, Debug, Eq, PartialEq)] pub struct PathNode { pub node: [u8; 32], pub index: u32, } /// Version 1 of the [`ChangelogEvent`](light_merkle_tree_program::state::ChangelogEvent). -#[derive(AnchorDeserialize, AnchorSerialize, PartialEq, Eq, Clone, Debug)] +#[derive(BorshDeserialize, BorshSerialize, PartialEq, Eq, Clone, Debug)] pub struct ChangelogEvent { /// Public key of the tree. pub id: [u8; 32], @@ -121,7 +121,7 @@ pub struct ChangelogEvent { pub index: u32, } -#[derive(AnchorSerialize, AnchorDeserialize, PartialEq, Eq, Clone, Debug)] +#[derive(BorshSerialize, BorshDeserialize, PartialEq, Eq, Clone, Debug)] pub struct NullifierEvent { /// Public key of the tree. pub id: [u8; 32], @@ -134,7 +134,7 @@ pub struct NullifierEvent { pub seq: u64, } -#[derive(Debug, Default, Clone, Copy, AnchorSerialize, AnchorDeserialize, Eq, PartialEq)] +#[derive(Debug, Default, Clone, Copy, BorshSerialize, BorshDeserialize, Eq, PartialEq)] pub struct RawIndexedElement { pub value: [u8; 32], pub next_index: usize, @@ -142,7 +142,7 @@ pub struct RawIndexedElement { pub index: usize, } -#[derive(AnchorDeserialize, AnchorSerialize, PartialEq, Eq, Debug, Clone)] +#[derive(BorshDeserialize, BorshSerialize, PartialEq, Eq, Debug, Clone)] pub struct IndexedMerkleTreeUpdate { pub new_low_element: RawIndexedElement, /// Leaf hash in new_low_element.index. @@ -153,7 +153,7 @@ pub struct IndexedMerkleTreeUpdate { pub new_high_element_hash: [u8; 32], } -#[derive(AnchorDeserialize, AnchorSerialize, Clone, PartialEq, Eq, Debug)] +#[derive(BorshDeserialize, BorshSerialize, Clone, PartialEq, Eq, Debug)] pub struct IndexedMerkleTreeEvent { /// Public key of the tree. pub id: [u8; 32], @@ -165,7 +165,7 @@ pub struct IndexedMerkleTreeEvent { } #[repr(C)] -#[derive(AnchorDeserialize, AnchorSerialize, Debug, PartialEq, Clone, Eq)] +#[derive(BorshDeserialize, BorshSerialize, Debug, PartialEq, Clone, Eq)] pub struct BatchEvent { pub merkle_tree_pubkey: [u8; 32], pub batch_index: u64, diff --git a/src/ingester/parser/tx_event_parser.rs b/src/ingester/parser/tx_event_parser.rs index c4093651..5d37d877 100644 --- a/src/ingester/parser/tx_event_parser.rs +++ b/src/ingester/parser/tx_event_parser.rs @@ -5,7 +5,7 @@ use crate::ingester::parser::state_update::{AccountTransaction, StateUpdate}; use crate::ingester::parser::tree_info::TreeInfo; use crate::ingester::parser::{get_compression_program_id, NOOP_PROGRAM_ID}; use crate::ingester::typedefs::block_info::{Instruction, TransactionInfo}; -use anchor_lang::AnchorDeserialize; +use borsh::BorshDeserialize; use light_compressed_account::TreeType; use log::info; use solana_sdk::signature::Signature; From 11f841a93f3228636462926dc42720ffca13cba4 Mon Sep 17 00:00:00 2001 From: ananas Date: Fri, 31 Oct 2025 15:45:11 +0000 Subject: [PATCH 02/10] remove solana features from light deps --- Cargo.lock | 1 - Cargo.toml | 12 +++++----- src/common/typedefs/serializable_pubkey.rs | 2 +- src/ingester/parser/tx_event_parser_v2.rs | 27 ++++++++++++++-------- 4 files changed, 25 insertions(+), 17 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3b49ef0e..94464ef7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3773,7 +3773,6 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0985921012ffc149596eac90d1170399bb70dbebfa2212bb72b2da30a558ec6" dependencies = [ - "anchor-lang", "borsh 0.10.4", "bytemuck", "light-hasher 4.0.0", diff --git a/Cargo.toml b/Cargo.toml index 2be879c9..66499e90 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -80,12 +80,12 @@ solana-pubkey = "2.3.0" solana-transaction-status = "1.18.0" -light-zero-copy = { version = "0.4.0", features = ["solana"] } -light-concurrent-merkle-tree = { version = "3.0.0", features = ["solana"] } -light-batched-merkle-tree = { version = "0.5.0", features = ["solana"] } -light-merkle-tree-metadata = { version = "0.5.0", features = ["solana"] } -light-compressed-account = { version = "0.5.0", features = ["anchor"] } -light-hasher = { version = "4.0.0", features = ["solana"] } +light-zero-copy = { version = "0.4.0" } +light-concurrent-merkle-tree = { version = "3.0.0" } +light-batched-merkle-tree = { version = "0.5.0" } +light-merkle-tree-metadata = { version = "0.5.0" } +light-compressed-account = { version = "0.5.0" } +light-hasher = { version = "4.0.0" } light-poseidon = "0.3.0" light-indexed-merkle-tree = "3.0.0" account-compression = "2.0.0" diff --git a/src/common/typedefs/serializable_pubkey.rs b/src/common/typedefs/serializable_pubkey.rs index 30855209..02d63642 100644 --- a/src/common/typedefs/serializable_pubkey.rs +++ b/src/common/typedefs/serializable_pubkey.rs @@ -109,7 +109,7 @@ impl From<[u8; 32]> for SerializablePubkey { impl From for SerializablePubkey { fn from(pubkey: LightPubkey) -> Self { - SerializablePubkey(pubkey.into()) + SerializablePubkey(SolanaPubkey::from(pubkey.to_bytes())) } } diff --git a/src/ingester/parser/tx_event_parser_v2.rs b/src/ingester/parser/tx_event_parser_v2.rs index 2d18d215..bf5fc5eb 100644 --- a/src/ingester/parser/tx_event_parser_v2.rs +++ b/src/ingester/parser/tx_event_parser_v2.rs @@ -15,15 +15,24 @@ use light_compressed_account::Pubkey as LightPubkey; use solana_pubkey::Pubkey; use solana_sdk::signature::Signature; +// Helper functions for pubkey conversions +fn to_light_pubkey(pubkey: &Pubkey) -> LightPubkey { + LightPubkey::from(pubkey.to_bytes()) +} + +fn to_solana_pubkey(pubkey: &LightPubkey) -> Pubkey { + Pubkey::from(pubkey.to_bytes()) +} + pub fn parse_public_transaction_event_v2( program_ids: &[Pubkey], instructions: &[Vec], accounts: Vec>, ) -> Option> { - let light_program_ids: Vec = program_ids.iter().map(|p| (*p).into()).collect(); + let light_program_ids: Vec = program_ids.iter().map(|p| to_light_pubkey(p)).collect(); let light_accounts: Vec> = accounts .into_iter() - .map(|acc_vec| acc_vec.into_iter().map(|acc| acc.into()).collect()) + .map(|acc_vec| acc_vec.into_iter().map(|acc| to_light_pubkey(&acc)).collect()) .collect(); let events = event_from_light_transaction(&light_program_ids, instructions, light_accounts).ok()?; @@ -44,7 +53,7 @@ pub fn parse_public_transaction_event_v2( .iter() .map(|x| OutputCompressedAccountWithPackedContext { compressed_account: CompressedAccount { - owner: x.compressed_account.owner.into(), + owner: to_solana_pubkey(&x.compressed_account.owner), lamports: x.compressed_account.lamports, address: x.compressed_account.address, data: x.compressed_account.data.as_ref().map(|d| { @@ -64,7 +73,7 @@ pub fn parse_public_transaction_event_v2( .sequence_numbers .iter() .map(|x| MerkleTreeSequenceNumberV1 { - pubkey: x.tree_pubkey.into(), + pubkey: to_solana_pubkey(&x.tree_pubkey), seq: x.seq, }) .collect(), @@ -77,7 +86,7 @@ pub fn parse_public_transaction_event_v2( .event .pubkey_array .into_iter() - .map(|p| p.into()) + .map(|p| to_solana_pubkey(&p)) .collect(), message: public_transaction_event.event.message, }; @@ -89,8 +98,8 @@ pub fn parse_public_transaction_event_v2( .input_sequence_numbers .iter() .map(|x| MerkleTreeSequenceNumberV2 { - tree_pubkey: x.tree_pubkey.into(), - queue_pubkey: x.queue_pubkey.into(), + tree_pubkey: to_solana_pubkey(&x.tree_pubkey), + queue_pubkey: to_solana_pubkey(&x.queue_pubkey), tree_type: x.tree_type, seq: x.seq, }) @@ -99,8 +108,8 @@ pub fn parse_public_transaction_event_v2( .address_sequence_numbers .iter() .map(|x| MerkleTreeSequenceNumberV2 { - tree_pubkey: x.tree_pubkey.into(), - queue_pubkey: x.queue_pubkey.into(), + tree_pubkey: to_solana_pubkey(&x.tree_pubkey), + queue_pubkey: to_solana_pubkey(&x.queue_pubkey), tree_type: x.tree_type, seq: x.seq, }) From ebd5f723243306dddbf1a101a4311b4841a255d6 Mon Sep 17 00:00:00 2001 From: ananas Date: Fri, 31 Oct 2025 16:07:21 +0000 Subject: [PATCH 03/10] remove account-compression dep --- Cargo.lock | 1792 ++------------------ Cargo.toml | 1 - src/common/typedefs/serializable_pubkey.rs | 11 +- src/ingester/parser/indexer_events.rs | 2 +- src/ingester/parser/tx_event_parser.rs | 7 +- src/ingester/parser/tx_event_parser_v2.rs | 23 +- src/monitor/mod.rs | 1 + src/monitor/tree_metadata_sync.rs | 43 +- src/monitor/v1_tree_accounts.rs | 67 + 9 files changed, 237 insertions(+), 1710 deletions(-) create mode 100644 src/monitor/v1_tree_accounts.rs diff --git a/Cargo.lock b/Cargo.lock index 94464ef7..4a29c745 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -12,31 +12,6 @@ dependencies = [ "regex", ] -[[package]] -name = "account-compression" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0133fd66fc7bc5f78e566ce55e507f4b66a63ae18a719de86628c1986c80bca8" -dependencies = [ - "aligned-sized", - "anchor-lang", - "bytemuck", - "light-account-checks 0.3.0", - "light-batched-merkle-tree 0.3.0", - "light-bounded-vec", - "light-compressed-account 0.3.0", - "light-concurrent-merkle-tree 2.1.0", - "light-hash-set", - "light-hasher 3.1.0", - "light-indexed-merkle-tree 2.1.0", - "light-merkle-tree-metadata 0.3.0", - "light-zero-copy 0.2.0", - "num-bigint 0.4.6", - "solana-sdk 2.3.1", - "solana-security-txt", - "zerocopy", -] - [[package]] name = "adler2" version = "2.0.1" @@ -150,185 +125,6 @@ version = "0.2.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923" -[[package]] -name = "anchor-attribute-access-control" -version = "0.31.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f70fd141a4d18adf11253026b32504f885447048c7494faf5fa83b01af9c0cf" -dependencies = [ - "anchor-syn", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "anchor-attribute-account" -version = "0.31.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "715a261c57c7679581e06f07a74fa2af874ac30f86bd8ea07cca4a7e5388a064" -dependencies = [ - "anchor-syn", - "bs58 0.5.1", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "anchor-attribute-constant" -version = "0.31.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "730d6df8ae120321c5c25e0779e61789e4b70dc8297102248902022f286102e4" -dependencies = [ - "anchor-syn", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "anchor-attribute-error" -version = "0.31.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27e6e449cc3a37b2880b74dcafb8e5a17b954c0e58e376432d7adc646fb333ef" -dependencies = [ - "anchor-syn", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "anchor-attribute-event" -version = "0.31.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7710e4c54adf485affcd9be9adec5ef8846d9c71d7f31e16ba86ff9fc1dd49f" -dependencies = [ - "anchor-syn", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "anchor-attribute-program" -version = "0.31.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05ecfd49b2aeadeb32f35262230db402abed76ce87e27562b34f61318b2ec83c" -dependencies = [ - "anchor-lang-idl", - "anchor-syn", - "anyhow", - "bs58 0.5.1", - "heck 0.3.3", - "proc-macro2", - "quote", - "serde_json", - "syn 1.0.109", -] - -[[package]] -name = "anchor-derive-accounts" -version = "0.31.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be89d160793a88495af462a7010b3978e48e30a630c91de47ce2c1d3cb7a6149" -dependencies = [ - "anchor-syn", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "anchor-derive-serde" -version = "0.31.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abc6ee78acb7bfe0c2dd2abc677aaa4789c0281a0c0ef01dbf6fe85e0fd9e6e4" -dependencies = [ - "anchor-syn", - "borsh-derive-internal 0.10.4", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "anchor-derive-space" -version = "0.31.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "134a01c0703f6fd355a0e472c033f6f3e41fac1ef6e370b20c50f4c8d022cea7" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "anchor-lang" -version = "0.31.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6bab117055905e930f762c196e08f861f8dfe7241b92cee46677a3b15561a0a" -dependencies = [ - "anchor-attribute-access-control", - "anchor-attribute-account", - "anchor-attribute-constant", - "anchor-attribute-error", - "anchor-attribute-event", - "anchor-attribute-program", - "anchor-derive-accounts", - "anchor-derive-serde", - "anchor-derive-space", - "anchor-lang-idl", - "base64 0.21.7", - "bincode", - "borsh 0.10.4", - "bytemuck", - "solana-program 2.3.0", - "thiserror 1.0.69", -] - -[[package]] -name = "anchor-lang-idl" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32e8599d21995f68e296265aa5ab0c3cef582fd58afec014d01bd0bce18a4418" -dependencies = [ - "anchor-lang-idl-spec", - "anyhow", - "heck 0.3.3", - "regex", - "serde", - "serde_json", - "sha2 0.10.9", -] - -[[package]] -name = "anchor-lang-idl-spec" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bdf143115440fe621bdac3a29a1f7472e09f6cd82b2aa569429a0c13f103838" -dependencies = [ - "anyhow", - "serde", -] - -[[package]] -name = "anchor-syn" -version = "0.31.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dc7a6d90cc643df0ed2744862cdf180587d1e5d28936538c18fc8908489ed67" -dependencies = [ - "anyhow", - "bs58 0.5.1", - "cargo_toml", - "heck 0.3.3", - "proc-macro2", - "quote", - "serde", - "serde_json", - "sha2 0.10.9", - "syn 1.0.109", - "thiserror 1.0.69", -] - [[package]] name = "android_system_properties" version = "0.1.5" @@ -1453,16 +1249,6 @@ dependencies = [ "libc", ] -[[package]] -name = "cargo_toml" -version = "0.19.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a98356df42a2eb1bd8f1793ae4ee4de48e384dd974ce5eac8eee802edb7492be" -dependencies = [ - "serde", - "toml 0.8.23", -] - [[package]] name = "cc" version = "1.2.44" @@ -1487,17 +1273,6 @@ 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.108", -] - [[package]] name = "chrono" version = "0.4.42" @@ -1924,18 +1699,8 @@ version = "0.20.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc7f46116c46ff9ab3eb1597a45688b6715c6e628b5c133e288e709a29bcb4ee" dependencies = [ - "darling_core 0.20.11", - "darling_macro 0.20.11", -] - -[[package]] -name = "darling" -version = "0.21.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cdf337090841a411e2a7f3deb9187445851f91b309c0c0a29e05f74a00a48c0" -dependencies = [ - "darling_core 0.21.3", - "darling_macro 0.21.3", + "darling_core", + "darling_macro", ] [[package]] @@ -1952,38 +1717,13 @@ dependencies = [ "syn 2.0.108", ] -[[package]] -name = "darling_core" -version = "0.21.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1247195ecd7e3c85f83c8d2a366e4210d588e802133e1e355180a9870b517ea4" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim 0.11.1", - "syn 2.0.108", -] - [[package]] name = "darling_macro" version = "0.20.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead" dependencies = [ - "darling_core 0.20.11", - "quote", - "syn 2.0.108", -] - -[[package]] -name = "darling_macro" -version = "0.21.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d38308df82d1080de0afee5d069fa14b0326a88c14f15c5ccda35b4a6c414c81" -dependencies = [ - "darling_core 0.21.3", + "darling_core", "quote", "syn 2.0.108", ] @@ -3634,19 +3374,6 @@ dependencies = [ "vcpkg", ] -[[package]] -name = "light-account-checks" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3fd000a2b8e0cc9d0b7b7712964870df51f2114f1693b9d8f0414f6f3ec16bd" -dependencies = [ - "solana-account-info", - "solana-program-error", - "solana-pubkey", - "solana-sysvar", - "thiserror 2.0.17", -] - [[package]] name = "light-account-checks" version = "0.4.0" @@ -3661,31 +3388,6 @@ dependencies = [ "thiserror 2.0.17", ] -[[package]] -name = "light-batched-merkle-tree" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81c7e179246468b09bf5c6882ef33043e178ff90eb6eab0c1c4c3623ef84b154" -dependencies = [ - "aligned-sized", - "borsh 0.10.4", - "light-account-checks 0.3.0", - "light-bloom-filter 0.3.0", - "light-compressed-account 0.3.0", - "light-hasher 3.1.0", - "light-macros", - "light-merkle-tree-metadata 0.3.0", - "light-verifier 2.1.0", - "light-zero-copy 0.2.0", - "solana-account-info", - "solana-msg", - "solana-program-error", - "solana-pubkey", - "solana-sysvar", - "thiserror 2.0.17", - "zerocopy", -] - [[package]] name = "light-batched-merkle-tree" version = "0.5.0" @@ -3694,14 +3396,14 @@ checksum = "28657736ca8ad2d71d32015dc9dd85a111c4ed75ba6133ba6ba8c632f63d26ff" dependencies = [ "aligned-sized", "borsh 0.10.4", - "light-account-checks 0.4.0", - "light-bloom-filter 0.4.0", - "light-compressed-account 0.5.0", - "light-hasher 4.0.0", + "light-account-checks", + "light-bloom-filter", + "light-compressed-account", + "light-hasher", "light-macros", - "light-merkle-tree-metadata 0.5.0", - "light-verifier 4.0.0", - "light-zero-copy 0.4.0", + "light-merkle-tree-metadata", + "light-verifier", + "light-zero-copy", "solana-account-info", "solana-msg", "solana-program-error", @@ -3711,19 +3413,6 @@ dependencies = [ "zerocopy", ] -[[package]] -name = "light-bloom-filter" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44abcb5554e1c15cefa9ac17e4ceda6f5afb039db25ab1fd777f012356d0f964" -dependencies = [ - "bitvec", - "num-bigint 0.4.6", - "solana-nostd-keccak", - "solana-program-error", - "thiserror 2.0.17", -] - [[package]] name = "light-bloom-filter" version = "0.4.0" @@ -3749,24 +3438,6 @@ dependencies = [ "thiserror 1.0.69", ] -[[package]] -name = "light-compressed-account" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f15113babaca9efb592631ec1e7e78c1c83413818a6e1e4248b7df53d88fe65" -dependencies = [ - "anchor-lang", - "borsh 0.10.4", - "bytemuck", - "light-hasher 3.1.0", - "light-macros", - "light-zero-copy 0.2.0", - "solana-program-error", - "solana-pubkey", - "thiserror 2.0.17", - "zerocopy", -] - [[package]] name = "light-compressed-account" version = "0.5.0" @@ -3775,10 +3446,10 @@ checksum = "c0985921012ffc149596eac90d1170399bb70dbebfa2212bb72b2da30a558ec6" dependencies = [ "borsh 0.10.4", "bytemuck", - "light-hasher 4.0.0", + "light-hasher", "light-macros", "light-program-profiler", - "light-zero-copy 0.4.0", + "light-zero-copy", "solana-msg", "solana-program-error", "solana-pubkey", @@ -3786,20 +3457,6 @@ dependencies = [ "zerocopy", ] -[[package]] -name = "light-concurrent-merkle-tree" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b4f878301620df78ba7e7758c5fd720f28040f5c157375f88d310f15ddb1746" -dependencies = [ - "borsh 0.10.4", - "light-bounded-vec", - "light-hasher 3.1.0", - "memoffset 0.9.1", - "solana-program-error", - "thiserror 2.0.17", -] - [[package]] name = "light-concurrent-merkle-tree" version = "3.0.0" @@ -3808,30 +3465,17 @@ checksum = "82d647f56701f1c634a70900484be6111cf661c8937785073471d489b05d868c" dependencies = [ "borsh 0.10.4", "light-bounded-vec", - "light-hasher 4.0.0", + "light-hasher", "memoffset 0.9.1", "solana-program-error", "thiserror 2.0.17", ] -[[package]] -name = "light-hash-set" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3893319277415f3ffbe9cfa3d1838d0d437b5539a69040fc0f161f29fb495673" -dependencies = [ - "light-hasher 3.1.0", - "num-bigint 0.4.6", - "num-traits", - "solana-program-error", - "thiserror 2.0.17", -] - [[package]] name = "light-hasher" -version = "3.1.0" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6445937ea244bebae0558e2aaec375791895d08c785b87cc45b62cd80d69139" +checksum = "a7b8b99f626dbfe0e9731a214e2b2e8990341f5fdb249744661ab7f3029d9859" dependencies = [ "ark-bn254 0.5.0", "ark-ff 0.5.0", @@ -3848,62 +3492,14 @@ dependencies = [ ] [[package]] -name = "light-hasher" -version = "4.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7b8b99f626dbfe0e9731a214e2b2e8990341f5fdb249744661ab7f3029d9859" -dependencies = [ - "ark-bn254 0.5.0", - "ark-ff 0.5.0", - "arrayvec", - "borsh 0.10.4", - "light-poseidon 0.3.0", - "num-bigint 0.4.6", - "sha2 0.10.9", - "sha3 0.10.8", - "solana-nostd-keccak", - "solana-program-error", - "solana-pubkey", - "thiserror 2.0.17", -] - -[[package]] -name = "light-indexed-array" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc786d8df68ef64493fea04914a7a7745f8122f2efbae043cd4ba4eaffa9e6db" -dependencies = [ - "light-hasher 3.1.0", - "num-bigint 0.4.6", - "num-traits", - "thiserror 2.0.17", -] - -[[package]] -name = "light-indexed-array" -version = "0.2.0" +name = "light-indexed-array" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "271ba5b246a77e0d4797d6f1752ec3ca627b2359a669189c198f5e104951d928" dependencies = [ - "light-hasher 4.0.0", - "num-bigint 0.4.6", - "num-traits", - "thiserror 2.0.17", -] - -[[package]] -name = "light-indexed-merkle-tree" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f38362948ad7b8ae1fd1626d38743bed5a15563336fb5d4148b9162186c8e55" -dependencies = [ - "light-bounded-vec", - "light-concurrent-merkle-tree 2.1.0", - "light-hasher 3.1.0", - "light-merkle-tree-reference 2.0.0", + "light-hasher", "num-bigint 0.4.6", "num-traits", - "solana-program-error", "thiserror 2.0.17", ] @@ -3914,9 +3510,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b2d75ca453b5f75de51384386cb719402609ba6225ca28d65ea5d071297a5138" dependencies = [ "light-bounded-vec", - "light-concurrent-merkle-tree 3.0.0", - "light-hasher 4.0.0", - "light-merkle-tree-reference 3.0.1", + "light-concurrent-merkle-tree", + "light-hasher", + "light-merkle-tree-reference", "num-bigint 0.4.6", "num-traits", "solana-program-error", @@ -3936,23 +3532,6 @@ dependencies = [ "syn 2.0.108", ] -[[package]] -name = "light-merkle-tree-metadata" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "544048fa95ea95fc1e952a2b9b1d6f09340c8decaffd1ad239fe1f6eb905ae76" -dependencies = [ - "anchor-lang", - "borsh 0.10.4", - "bytemuck", - "light-compressed-account 0.3.0", - "solana-msg", - "solana-program-error", - "solana-sysvar", - "thiserror 2.0.17", - "zerocopy", -] - [[package]] name = "light-merkle-tree-metadata" version = "0.5.0" @@ -3961,7 +3540,7 @@ checksum = "4cdc5dab70d1b821a3d77a7f6b074e83b8a5d966aa457487f49ab8b23cd84349" dependencies = [ "borsh 0.10.4", "bytemuck", - "light-compressed-account 0.5.0", + "light-compressed-account", "solana-msg", "solana-program-error", "solana-sysvar", @@ -3969,27 +3548,14 @@ dependencies = [ "zerocopy", ] -[[package]] -name = "light-merkle-tree-reference" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1650701feac958261b2c3ab4da361ad8548985ee3ee496a17e76db44d2d3c9e3" -dependencies = [ - "light-hasher 3.1.0", - "light-indexed-array 0.1.0", - "num-bigint 0.4.6", - "num-traits", - "thiserror 2.0.17", -] - [[package]] name = "light-merkle-tree-reference" version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "93b3c707e7d506c1c0f1d94520c5d8d93eb59eb599ead658a7eb22416c04a590" dependencies = [ - "light-hasher 4.0.0", - "light-indexed-array 0.2.0", + "light-hasher", + "light-indexed-array", "num-bigint 0.4.6", "num-traits", "thiserror 2.0.17", @@ -4039,17 +3605,6 @@ dependencies = [ "light-profiler-macro", ] -[[package]] -name = "light-verifier" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85fdf317ec3cfcd3a8e6556a5b5e7fbcc207a40264700f9a5271876838f26f58" -dependencies = [ - "groth16-solana", - "light-compressed-account 0.3.0", - "thiserror 2.0.17", -] - [[package]] name = "light-verifier" version = "4.0.0" @@ -4057,19 +3612,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "26398153a8c0fa61957a9ad046b3a433c401a37e0e0e9c8d42dee097fa76ce65" dependencies = [ "groth16-solana", - "light-compressed-account 0.5.0", - "thiserror 2.0.17", -] - -[[package]] -name = "light-zero-copy" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a34d759f65547a6540db7047f38f4cb2c3f01658deca95a1dd06f26b578de947" -dependencies = [ - "solana-program-error", + "light-compressed-account", "thiserror 2.0.17", - "zerocopy", ] [[package]] @@ -4735,7 +4279,6 @@ dependencies = [ name = "photon-indexer" version = "0.51.0" dependencies = [ - "account-compression", "anyhow", "ark-bn254 0.5.0", "ark-serialize 0.5.0", @@ -4762,15 +4305,15 @@ dependencies = [ "jsonrpsee", "jsonrpsee-core", "lazy_static", - "light-batched-merkle-tree 0.5.0", - "light-compressed-account 0.5.0", - "light-concurrent-merkle-tree 3.0.0", - "light-hasher 4.0.0", - "light-indexed-merkle-tree 3.0.0", - "light-merkle-tree-metadata 0.5.0", - "light-merkle-tree-reference 3.0.1", + "light-batched-merkle-tree", + "light-compressed-account", + "light-concurrent-merkle-tree", + "light-hasher", + "light-indexed-merkle-tree", + "light-merkle-tree-metadata", + "light-merkle-tree-reference", "light-poseidon 0.3.0", - "light-zero-copy 0.4.0", + "light-zero-copy", "log", "num-bigint 0.4.6", "num-traits", @@ -4786,9 +4329,9 @@ dependencies = [ "serde_json", "serial_test", "solana-client", - "solana-program 1.18.26", + "solana-program", "solana-pubkey", - "solana-sdk 1.18.26", + "solana-sdk", "solana-transaction-status", "sqlx", "thiserror 1.0.69", @@ -4940,7 +4483,7 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1d6ea3c4595b96363c13943497db34af4460fb474a95c43f4446ad341b8c9785" dependencies = [ - "toml 0.5.11", + "toml", ] [[package]] @@ -6018,15 +5561,6 @@ dependencies = [ "serde_derive", ] -[[package]] -name = "serde-big-array" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11fc7cc2c76d73e0f27ee52abbd64eec84d46f370c88371120433196934e4b7f" -dependencies = [ - "serde", -] - [[package]] name = "serde_bytes" version = "0.11.19" @@ -6070,15 +5604,6 @@ dependencies = [ "serde_core", ] -[[package]] -name = "serde_spanned" -version = "0.6.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf41e0cfaf7226dca15e8197172c295a782857fcb97fad1808a166870dee75a3" -dependencies = [ - "serde", -] - [[package]] name = "serde_urlencoded" version = "0.7.1" @@ -6098,17 +5623,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "07ff71d2c147a7b57362cead5e22f772cd52f6ab31cfcd9edcd7f6aeb2a0afbe" dependencies = [ "serde", - "serde_with_macros 2.3.3", -] - -[[package]] -name = "serde_with" -version = "3.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa66c845eee442168b2c8134fec70ac50dc20e760769c8ba0ad1319ca1959b04" -dependencies = [ - "serde_core", - "serde_with_macros 3.15.1", + "serde_with_macros", ] [[package]] @@ -6117,19 +5632,7 @@ version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "881b6f881b17d13214e5d494c939ebab463d01264ce1811e9d4ac3a882e7695f" dependencies = [ - "darling 0.20.11", - "proc-macro2", - "quote", - "syn 2.0.108", -] - -[[package]] -name = "serde_with_macros" -version = "3.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b91a903660542fced4e99881aa481bdbaec1634568ee02e0b8bd57c64cb38955" -dependencies = [ - "darling 0.21.3", + "darling", "proc-macro2", "quote", "syn 2.0.108", @@ -6264,16 +5767,6 @@ version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" -[[package]] -name = "signal-hook" -version = "0.3.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d881a16cf4426aa584979d30bd82cb33429027e42122b169753d6ef1085ed6e2" -dependencies = [ - "libc", - "signal-hook-registry", -] - [[package]] name = "signal-hook-registry" version = "1.4.6" @@ -6393,24 +5886,6 @@ dependencies = [ "sha-1", ] -[[package]] -name = "solana-account" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f949fe4edaeaea78c844023bfc1c898e0b1f5a100f8a8d2d0f85d0a7b090258" -dependencies = [ - "bincode", - "serde", - "serde_bytes", - "serde_derive", - "solana-account-info", - "solana-clock", - "solana-instruction", - "solana-pubkey", - "solana-sdk-ids", - "solana-sysvar", -] - [[package]] name = "solana-account-decoder" version = "1.18.26" @@ -6427,7 +5902,7 @@ dependencies = [ "serde_derive", "serde_json", "solana-config-program", - "solana-sdk 1.18.26", + "solana-sdk", "spl-token", "spl-token-2022", "spl-token-group-interface", @@ -6442,30 +5917,11 @@ version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c8f5152a288ef1912300fc6efa6c2d1f9bb55d9398eb6c72326360b8063987da" dependencies = [ - "bincode", - "serde", "solana-program-error", "solana-program-memory", "solana-pubkey", ] -[[package]] -name = "solana-address-lookup-table-interface" -version = "2.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1673f67efe870b64a65cb39e6194be5b26527691ce5922909939961a6e6b395" -dependencies = [ - "bincode", - "bytemuck", - "serde", - "serde_derive", - "solana-clock", - "solana-instruction", - "solana-pubkey", - "solana-sdk-ids", - "solana-slot-hashes", -] - [[package]] name = "solana-atomic-u64" version = "2.2.1" @@ -6475,40 +5931,6 @@ dependencies = [ "parking_lot 0.12.5", ] -[[package]] -name = "solana-big-mod-exp" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75db7f2bbac3e62cfd139065d15bcda9e2428883ba61fc8d27ccb251081e7567" -dependencies = [ - "num-bigint 0.4.6", - "num-traits", - "solana-define-syscall", -] - -[[package]] -name = "solana-bincode" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19a3787b8cf9c9fe3dd360800e8b70982b9e5a8af9e11c354b6665dd4a003adc" -dependencies = [ - "bincode", - "serde", - "solana-instruction", -] - -[[package]] -name = "solana-blake3-hasher" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1a0801e25a1b31a14494fc80882a036be0ffd290efc4c2d640bfcca120a4672" -dependencies = [ - "blake3", - "solana-define-syscall", - "solana-hash", - "solana-sanitize", -] - [[package]] name = "solana-bn254" version = "2.2.2" @@ -6524,16 +5946,6 @@ dependencies = [ "thiserror 2.0.17", ] -[[package]] -name = "solana-borsh" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "718333bcd0a1a7aed6655aa66bef8d7fb047944922b2d3a18f49cbc13e73d004" -dependencies = [ - "borsh 0.10.4", - "borsh 1.5.7", -] - [[package]] name = "solana-clap-utils" version = "1.18.26" @@ -6544,7 +5956,7 @@ dependencies = [ "clap 2.34.0", "rpassword", "solana-remote-wallet", - "solana-sdk 1.18.26", + "solana-sdk", "thiserror 1.0.69", "tiny-bip39", "uriparse", @@ -6575,7 +5987,7 @@ dependencies = [ "solana-rpc-client", "solana-rpc-client-api", "solana-rpc-client-nonce-utils", - "solana-sdk 1.18.26", + "solana-sdk", "solana-streamer", "solana-thin-client", "solana-tpu-client", @@ -6584,27 +5996,6 @@ dependencies = [ "tokio", ] -[[package]] -name = "solana-client-traits" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83f0071874e629f29e0eb3dab8a863e98502ac7aba55b7e0df1803fc5cac72a7" -dependencies = [ - "solana-account", - "solana-commitment-config", - "solana-epoch-info", - "solana-hash", - "solana-instruction", - "solana-keypair", - "solana-message", - "solana-pubkey", - "solana-signature", - "solana-signer", - "solana-system-interface", - "solana-transaction", - "solana-transaction-error", -] - [[package]] name = "solana-clock" version = "2.2.2" @@ -6618,40 +6009,6 @@ dependencies = [ "solana-sysvar-id", ] -[[package]] -name = "solana-cluster-type" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ace9fea2daa28354d107ea879cff107181d85cd4e0f78a2bedb10e1a428c97e" -dependencies = [ - "serde", - "serde_derive", - "solana-hash", -] - -[[package]] -name = "solana-commitment-config" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac49c4dde3edfa832de1697e9bcdb7c3b3f7cb7a1981b7c62526c8bb6700fb73" -dependencies = [ - "serde", - "serde_derive", -] - -[[package]] -name = "solana-compute-budget-interface" -version = "2.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8432d2c4c22d0499aa06d62e4f7e333f81777b3d7c96050ae9e5cb71a8c3aee4" -dependencies = [ - "borsh 1.5.7", - "serde", - "serde_derive", - "solana-instruction", - "solana-sdk-ids", -] - [[package]] name = "solana-config-program" version = "1.18.26" @@ -6663,7 +6020,7 @@ dependencies = [ "serde", "serde_derive", "solana-program-runtime", - "solana-sdk 1.18.26", + "solana-sdk", ] [[package]] @@ -6683,7 +6040,7 @@ dependencies = [ "rcgen", "solana-measure", "solana-metrics", - "solana-sdk 1.18.26", + "solana-sdk", "thiserror 1.0.69", "tokio", ] @@ -6718,156 +6075,43 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2ae3e2abcf541c8122eafe9a625d4d194b4023c20adde1e251f94e056bb1aee2" [[package]] -name = "solana-derivation-path" +name = "solana-epoch-rewards" version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "939756d798b25c5ec3cca10e06212bdca3b1443cb9bb740a38124f58b258737b" +checksum = "86b575d3dd323b9ea10bb6fe89bf6bf93e249b215ba8ed7f68f1a3633f384db7" dependencies = [ - "derivation-path", - "qstring", - "uriparse", + "serde", + "serde_derive", + "solana-hash", + "solana-sdk-ids", + "solana-sdk-macro 2.2.1", + "solana-sysvar-id", ] [[package]] -name = "solana-ed25519-program" -version = "2.2.3" +name = "solana-epoch-schedule" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1feafa1691ea3ae588f99056f4bdd1293212c7ece28243d7da257c443e84753" +checksum = "3fce071fbddecc55d727b1d7ed16a629afe4f6e4c217bc8d00af3b785f6f67ed" dependencies = [ - "bytemuck", - "bytemuck_derive", - "ed25519-dalek", - "solana-feature-set", - "solana-instruction", - "solana-precompile-error", + "serde", + "serde_derive", "solana-sdk-ids", + "solana-sdk-macro 2.2.1", + "solana-sysvar-id", ] [[package]] -name = "solana-epoch-info" +name = "solana-fee-calculator" version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ef6f0b449290b0b9f32973eefd95af35b01c5c0c34c569f936c34c5b20d77b" +checksum = "d89bc408da0fb3812bc3008189d148b4d3e08252c79ad810b245482a3f70cd8d" dependencies = [ + "log", "serde", "serde_derive", ] -[[package]] -name = "solana-epoch-rewards" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b575d3dd323b9ea10bb6fe89bf6bf93e249b215ba8ed7f68f1a3633f384db7" -dependencies = [ - "serde", - "serde_derive", - "solana-hash", - "solana-sdk-ids", - "solana-sdk-macro 2.2.1", - "solana-sysvar-id", -] - -[[package]] -name = "solana-epoch-rewards-hasher" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96c5fd2662ae7574810904585fd443545ed2b568dbd304b25a31e79ccc76e81b" -dependencies = [ - "siphasher", - "solana-hash", - "solana-pubkey", -] - -[[package]] -name = "solana-epoch-schedule" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fce071fbddecc55d727b1d7ed16a629afe4f6e4c217bc8d00af3b785f6f67ed" -dependencies = [ - "serde", - "serde_derive", - "solana-sdk-ids", - "solana-sdk-macro 2.2.1", - "solana-sysvar-id", -] - -[[package]] -name = "solana-example-mocks" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84461d56cbb8bb8d539347151e0525b53910102e4bced875d49d5139708e39d3" -dependencies = [ - "serde", - "serde_derive", - "solana-address-lookup-table-interface", - "solana-clock", - "solana-hash", - "solana-instruction", - "solana-keccak-hasher", - "solana-message", - "solana-nonce", - "solana-pubkey", - "solana-sdk-ids", - "solana-system-interface", - "thiserror 2.0.17", -] - -[[package]] -name = "solana-feature-gate-interface" -version = "2.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43f5c5382b449e8e4e3016fb05e418c53d57782d8b5c30aa372fc265654b956d" -dependencies = [ - "bincode", - "serde", - "serde_derive", - "solana-account", - "solana-account-info", - "solana-instruction", - "solana-program-error", - "solana-pubkey", - "solana-rent", - "solana-sdk-ids", - "solana-system-interface", -] - -[[package]] -name = "solana-feature-set" -version = "2.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93b93971e289d6425f88e6e3cb6668c4b05df78b3c518c249be55ced8efd6b6d" -dependencies = [ - "ahash 0.8.12", - "lazy_static", - "solana-epoch-schedule", - "solana-hash", - "solana-pubkey", - "solana-sha256-hasher", -] - -[[package]] -name = "solana-fee-calculator" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d89bc408da0fb3812bc3008189d148b4d3e08252c79ad810b245482a3f70cd8d" -dependencies = [ - "log", - "serde", - "serde_derive", -] - -[[package]] -name = "solana-fee-structure" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33adf673581c38e810bf618f745bf31b683a0a4a4377682e6aaac5d9a058dd4e" -dependencies = [ - "serde", - "serde_derive", - "solana-message", - "solana-native-token", -] - [[package]] name = "solana-frozen-abi" version = "1.18.26" @@ -6905,53 +6149,12 @@ dependencies = [ "syn 2.0.108", ] -[[package]] -name = "solana-genesis-config" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3725085d47b96d37fef07a29d78d2787fc89a0b9004c66eed7753d1e554989f" -dependencies = [ - "bincode", - "chrono", - "memmap2", - "serde", - "serde_derive", - "solana-account", - "solana-clock", - "solana-cluster-type", - "solana-epoch-schedule", - "solana-fee-calculator", - "solana-hash", - "solana-inflation", - "solana-keypair", - "solana-logger 2.3.1", - "solana-poh-config", - "solana-pubkey", - "solana-rent", - "solana-sdk-ids", - "solana-sha256-hasher", - "solana-shred-version", - "solana-signer", - "solana-time-utils", -] - -[[package]] -name = "solana-hard-forks" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c28371f878e2ead55611d8ba1b5fb879847156d04edea13693700ad1a28baf" -dependencies = [ - "serde", - "serde_derive", -] - [[package]] name = "solana-hash" version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b5b96e9f0300fa287b545613f007dfe20043d7812bee255f418c1eb649c93b63" dependencies = [ - "borsh 1.5.7", "bytemuck", "bytemuck_derive", "five8", @@ -6963,16 +6166,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "solana-inflation" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23eef6a09eb8e568ce6839573e4966850e85e9ce71e6ae1a6c930c1c43947de3" -dependencies = [ - "serde", - "serde_derive", -] - [[package]] name = "solana-instruction" version = "2.3.1" @@ -6980,7 +6173,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c54769c7e58fc7653658c49b39b935ff6673260cba4ae033b21580a79ca73c90" dependencies = [ "bincode", - "borsh 1.5.7", "getrandom 0.2.16", "js-sys", "num-traits", @@ -7009,37 +6201,6 @@ dependencies = [ "solana-sysvar-id", ] -[[package]] -name = "solana-keccak-hasher" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7aeb957fbd42a451b99235df4942d96db7ef678e8d5061ef34c9b34cae12f79" -dependencies = [ - "sha3 0.10.8", - "solana-define-syscall", - "solana-hash", - "solana-sanitize", -] - -[[package]] -name = "solana-keypair" -version = "2.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd3f04aa1a05c535e93e121a95f66e7dcccf57e007282e8255535d24bf1e98bb" -dependencies = [ - "ed25519-dalek", - "ed25519-dalek-bip32", - "five8", - "rand 0.7.3", - "solana-derivation-path", - "solana-pubkey", - "solana-seed-derivable", - "solana-seed-phrase", - "solana-signature", - "solana-signer", - "wasm-bindgen", -] - [[package]] name = "solana-last-restart-slot" version = "2.2.1" @@ -7053,50 +6214,6 @@ dependencies = [ "solana-sysvar-id", ] -[[package]] -name = "solana-loader-v2-interface" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8ab08006dad78ae7cd30df8eea0539e207d08d91eaefb3e1d49a446e1c49654" -dependencies = [ - "serde", - "serde_bytes", - "serde_derive", - "solana-instruction", - "solana-pubkey", - "solana-sdk-ids", -] - -[[package]] -name = "solana-loader-v3-interface" -version = "5.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f7162a05b8b0773156b443bccd674ea78bb9aa406325b467ea78c06c99a63a2" -dependencies = [ - "serde", - "serde_bytes", - "serde_derive", - "solana-instruction", - "solana-pubkey", - "solana-sdk-ids", - "solana-system-interface", -] - -[[package]] -name = "solana-loader-v4-interface" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "706a777242f1f39a83e2a96a2a6cb034cb41169c6ecbee2cf09cb873d9659e7e" -dependencies = [ - "serde", - "serde_bytes", - "serde_derive", - "solana-instruction", - "solana-pubkey", - "solana-sdk-ids", - "solana-system-interface", -] - [[package]] name = "solana-logger" version = "1.18.26" @@ -7108,19 +6225,6 @@ dependencies = [ "log", ] -[[package]] -name = "solana-logger" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db8e777ec1afd733939b532a42492d888ec7c88d8b4127a5d867eb45c6eb5cd5" -dependencies = [ - "env_logger", - "lazy_static", - "libc", - "log", - "signal-hook", -] - [[package]] name = "solana-measure" version = "1.18.26" @@ -7128,30 +6232,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5c01a7f9cdc9d9d37a3d5651b2fe7ec9d433c2a3470b9f35897e373b421f0737" dependencies = [ "log", - "solana-sdk 1.18.26", -] - -[[package]] -name = "solana-message" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1796aabce376ff74bf89b78d268fa5e683d7d7a96a0a4e4813ec34de49d5314b" -dependencies = [ - "bincode", - "blake3", - "lazy_static", - "serde", - "serde_derive", - "solana-bincode", - "solana-hash", - "solana-instruction", - "solana-pubkey", - "solana-sanitize", - "solana-sdk-ids", - "solana-short-vec", - "solana-system-interface", - "solana-transaction-error", - "wasm-bindgen", + "solana-sdk", ] [[package]] @@ -7165,7 +6246,7 @@ dependencies = [ "lazy_static", "log", "reqwest 0.11.27", - "solana-sdk 1.18.26", + "solana-sdk", "thiserror 1.0.69", ] @@ -7178,12 +6259,6 @@ dependencies = [ "solana-define-syscall", ] -[[package]] -name = "solana-native-token" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61515b880c36974053dd499c0510066783f0cc6ac17def0c7ef2a244874cf4a9" - [[package]] name = "solana-net-utils" version = "1.18.26" @@ -7199,39 +6274,13 @@ dependencies = [ "serde", "serde_derive", "socket2 0.5.10", - "solana-logger 1.18.26", - "solana-sdk 1.18.26", + "solana-logger", + "solana-sdk", "solana-version", "tokio", "url", ] -[[package]] -name = "solana-nonce" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "703e22eb185537e06204a5bd9d509b948f0066f2d1d814a6f475dafb3ddf1325" -dependencies = [ - "serde", - "serde_derive", - "solana-fee-calculator", - "solana-hash", - "solana-pubkey", - "solana-sha256-hasher", -] - -[[package]] -name = "solana-nonce-account" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cde971a20b8dbf60144d6a84439dda86b5466e00e2843091fe731083cda614da" -dependencies = [ - "solana-account", - "solana-hash", - "solana-nonce", - "solana-sdk-ids", -] - [[package]] name = "solana-nostd-keccak" version = "0.1.3" @@ -7241,36 +6290,6 @@ dependencies = [ "sha3 0.10.8", ] -[[package]] -name = "solana-offchain-message" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b526398ade5dea37f1f147ce55dae49aa017a5d7326606359b0445ca8d946581" -dependencies = [ - "num_enum 0.7.5", - "solana-hash", - "solana-packet", - "solana-pubkey", - "solana-sanitize", - "solana-sha256-hasher", - "solana-signature", - "solana-signer", -] - -[[package]] -name = "solana-packet" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "004f2d2daf407b3ec1a1ca5ec34b3ccdfd6866dd2d3c7d0715004a96e4b6d127" -dependencies = [ - "bincode", - "bitflags 2.10.0", - "cfg_eval", - "serde", - "serde_derive", - "serde_with 3.15.1", -] - [[package]] name = "solana-perf" version = "1.18.26" @@ -7296,58 +6315,10 @@ dependencies = [ "solana-frozen-abi-macro", "solana-metrics", "solana-rayon-threadlimit", - "solana-sdk 1.18.26", + "solana-sdk", "solana-vote-program", ] -[[package]] -name = "solana-poh-config" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d650c3b4b9060082ac6b0efbbb66865089c58405bfb45de449f3f2b91eccee75" -dependencies = [ - "serde", - "serde_derive", -] - -[[package]] -name = "solana-precompile-error" -version = "2.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d87b2c1f5de77dfe2b175ee8dd318d196aaca4d0f66f02842f80c852811f9f8" -dependencies = [ - "num-traits", - "solana-decode-error", -] - -[[package]] -name = "solana-precompiles" -version = "2.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36e92768a57c652edb0f5d1b30a7d0bc64192139c517967c18600debe9ae3832" -dependencies = [ - "lazy_static", - "solana-ed25519-program", - "solana-feature-set", - "solana-message", - "solana-precompile-error", - "solana-pubkey", - "solana-sdk-ids", - "solana-secp256k1-program", - "solana-secp256r1-program", -] - -[[package]] -name = "solana-presigner" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81a57a24e6a4125fc69510b6774cd93402b943191b6cddad05de7281491c90fe" -dependencies = [ - "solana-pubkey", - "solana-signature", - "solana-signer", -] - [[package]] name = "solana-program" version = "1.18.26" @@ -7403,86 +6374,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "solana-program" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98eca145bd3545e2fbb07166e895370576e47a00a7d824e325390d33bf467210" -dependencies = [ - "bincode", - "blake3", - "borsh 0.10.4", - "borsh 1.5.7", - "bs58 0.5.1", - "bytemuck", - "console_error_panic_hook", - "console_log", - "getrandom 0.2.16", - "lazy_static", - "log", - "memoffset 0.9.1", - "num-bigint 0.4.6", - "num-derive 0.4.2", - "num-traits", - "rand 0.8.5", - "serde", - "serde_bytes", - "serde_derive", - "solana-account-info", - "solana-address-lookup-table-interface", - "solana-atomic-u64", - "solana-big-mod-exp", - "solana-bincode", - "solana-blake3-hasher", - "solana-borsh", - "solana-clock", - "solana-cpi", - "solana-decode-error", - "solana-define-syscall", - "solana-epoch-rewards", - "solana-epoch-schedule", - "solana-example-mocks", - "solana-feature-gate-interface", - "solana-fee-calculator", - "solana-hash", - "solana-instruction", - "solana-instructions-sysvar", - "solana-keccak-hasher", - "solana-last-restart-slot", - "solana-loader-v2-interface", - "solana-loader-v3-interface", - "solana-loader-v4-interface", - "solana-message", - "solana-msg", - "solana-native-token", - "solana-nonce", - "solana-program-entrypoint", - "solana-program-error", - "solana-program-memory", - "solana-program-option", - "solana-program-pack", - "solana-pubkey", - "solana-rent", - "solana-sanitize", - "solana-sdk-ids", - "solana-sdk-macro 2.2.1", - "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-stake-interface", - "solana-system-interface", - "solana-sysvar", - "solana-sysvar-id", - "solana-vote-interface", - "thiserror 2.0.17", - "wasm-bindgen", -] - [[package]] name = "solana-program-entrypoint" version = "2.3.0" @@ -7501,10 +6392,7 @@ version = "2.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ee2e0217d642e2ea4bee237f37bd61bb02aec60da3647c48ff88f6556ade775" dependencies = [ - "borsh 1.5.7", "num-traits", - "serde", - "serde_derive", "solana-decode-error", "solana-instruction", "solana-msg", @@ -7520,21 +6408,6 @@ dependencies = [ "solana-define-syscall", ] -[[package]] -name = "solana-program-option" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc677a2e9bc616eda6dbdab834d463372b92848b2bfe4a1ed4e4b4adba3397d0" - -[[package]] -name = "solana-program-pack" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "319f0ef15e6e12dc37c597faccb7d62525a509fec5f6975ecb9419efddeb277b" -dependencies = [ - "solana-program-error", -] - [[package]] name = "solana-program-runtime" version = "1.18.26" @@ -7558,7 +6431,7 @@ dependencies = [ "solana-frozen-abi-macro", "solana-measure", "solana-metrics", - "solana-sdk 1.18.26", + "solana-sdk", "solana_rbpf", "thiserror 1.0.69", ] @@ -7569,17 +6442,12 @@ version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b62adb9c3261a052ca1f999398c388f1daf558a1b492f60a6d9e64857db4ff1" dependencies = [ - "borsh 0.10.4", - "borsh 1.5.7", - "bytemuck", - "bytemuck_derive", "curve25519-dalek 4.1.3", "five8", "five8_const", "getrandom 0.2.16", "js-sys", "num-traits", - "rand 0.8.5", "serde", "serde_derive", "solana-atomic-u64", @@ -7606,7 +6474,7 @@ dependencies = [ "serde_json", "solana-account-decoder", "solana-rpc-client-api", - "solana-sdk 1.18.26", + "solana-sdk", "thiserror 1.0.69", "tokio", "tokio-stream", @@ -7633,113 +6501,55 @@ dependencies = [ "rustls 0.21.12", "solana-connection-cache", "solana-measure", - "solana-metrics", - "solana-net-utils", - "solana-rpc-client-api", - "solana-sdk 1.18.26", - "solana-streamer", - "thiserror 1.0.69", - "tokio", -] - -[[package]] -name = "solana-quic-definitions" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbf0d4d5b049eb1d0c35f7b18f305a27c8986fc5c0c9b383e97adaa35334379e" -dependencies = [ - "solana-keypair", -] - -[[package]] -name = "solana-rayon-threadlimit" -version = "1.18.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66468f9c014992167de10cc68aad6ac8919a8c8ff428dc88c0d2b4da8c02b8b7" -dependencies = [ - "lazy_static", - "num_cpus", -] - -[[package]] -name = "solana-remote-wallet" -version = "1.18.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c191019f4d4f84281a6d0dd9a43181146b33019627fc394e42e08ade8976b431" -dependencies = [ - "console", - "dialoguer", - "log", - "num-derive 0.4.2", - "num-traits", - "parking_lot 0.12.5", - "qstring", - "semver", - "solana-sdk 1.18.26", - "thiserror 1.0.69", - "uriparse", -] - -[[package]] -name = "solana-rent" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1aea8fdea9de98ca6e8c2da5827707fb3842833521b528a713810ca685d2480" -dependencies = [ - "serde", - "serde_derive", - "solana-sdk-ids", - "solana-sdk-macro 2.2.1", - "solana-sysvar-id", -] - -[[package]] -name = "solana-rent-collector" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "127e6dfa51e8c8ae3aa646d8b2672bc4ac901972a338a9e1cd249e030564fb9d" -dependencies = [ - "serde", - "serde_derive", - "solana-account", - "solana-clock", - "solana-epoch-schedule", - "solana-genesis-config", - "solana-pubkey", - "solana-rent", - "solana-sdk-ids", + "solana-metrics", + "solana-net-utils", + "solana-rpc-client-api", + "solana-sdk", + "solana-streamer", + "thiserror 1.0.69", + "tokio", ] [[package]] -name = "solana-rent-debits" -version = "2.2.1" +name = "solana-rayon-threadlimit" +version = "1.18.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f6f9113c6003492e74438d1288e30cffa8ccfdc2ef7b49b9e816d8034da18cd" +checksum = "66468f9c014992167de10cc68aad6ac8919a8c8ff428dc88c0d2b4da8c02b8b7" dependencies = [ - "solana-pubkey", - "solana-reward-info", + "lazy_static", + "num_cpus", ] [[package]] -name = "solana-reserved-account-keys" -version = "2.2.2" +name = "solana-remote-wallet" +version = "1.18.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4b22ea19ca2a3f28af7cd047c914abf833486bf7a7c4a10fc652fff09b385b1" +checksum = "c191019f4d4f84281a6d0dd9a43181146b33019627fc394e42e08ade8976b431" dependencies = [ - "lazy_static", - "solana-feature-set", - "solana-pubkey", - "solana-sdk-ids", + "console", + "dialoguer", + "log", + "num-derive 0.4.2", + "num-traits", + "parking_lot 0.12.5", + "qstring", + "semver", + "solana-sdk", + "thiserror 1.0.69", + "uriparse", ] [[package]] -name = "solana-reward-info" +name = "solana-rent" version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18205b69139b1ae0ab8f6e11cdcb627328c0814422ad2482000fa2ca54ae4a2f" +checksum = "d1aea8fdea9de98ca6e8c2da5827707fb3842833521b528a713810ca685d2480" dependencies = [ "serde", "serde_derive", + "solana-sdk-ids", + "solana-sdk-macro 2.2.1", + "solana-sysvar-id", ] [[package]] @@ -7761,7 +6571,7 @@ dependencies = [ "serde_json", "solana-account-decoder", "solana-rpc-client-api", - "solana-sdk 1.18.26", + "solana-sdk", "solana-transaction-status", "solana-version", "solana-vote-program", @@ -7783,7 +6593,7 @@ dependencies = [ "serde_derive", "serde_json", "solana-account-decoder", - "solana-sdk 1.18.26", + "solana-sdk", "solana-transaction-status", "solana-version", "spl-token-2022", @@ -7799,7 +6609,7 @@ dependencies = [ "clap 2.34.0", "solana-clap-utils", "solana-rpc-client", - "solana-sdk 1.18.26", + "solana-sdk", "thiserror 1.0.69", ] @@ -7850,91 +6660,20 @@ dependencies = [ "serde_bytes", "serde_derive", "serde_json", - "serde_with 2.3.3", + "serde_with", "sha2 0.10.9", "sha3 0.10.8", "siphasher", "solana-frozen-abi", "solana-frozen-abi-macro", - "solana-logger 1.18.26", - "solana-program 1.18.26", + "solana-logger", + "solana-program", "solana-sdk-macro 1.18.26", "thiserror 1.0.69", "uriparse", "wasm-bindgen", ] -[[package]] -name = "solana-sdk" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cc0e4a7635b902791c44b6581bfb82f3ada32c5bc0929a64f39fe4bb384c86a" -dependencies = [ - "bincode", - "bs58 0.5.1", - "getrandom 0.1.16", - "js-sys", - "serde", - "serde_json", - "solana-account", - "solana-bn254", - "solana-client-traits", - "solana-cluster-type", - "solana-commitment-config", - "solana-compute-budget-interface", - "solana-decode-error", - "solana-derivation-path", - "solana-ed25519-program", - "solana-epoch-info", - "solana-epoch-rewards-hasher", - "solana-feature-set", - "solana-fee-structure", - "solana-genesis-config", - "solana-hard-forks", - "solana-inflation", - "solana-instruction", - "solana-keypair", - "solana-message", - "solana-native-token", - "solana-nonce-account", - "solana-offchain-message", - "solana-packet", - "solana-poh-config", - "solana-precompile-error", - "solana-precompiles", - "solana-presigner", - "solana-program 2.3.0", - "solana-program-memory", - "solana-pubkey", - "solana-quic-definitions", - "solana-rent-collector", - "solana-rent-debits", - "solana-reserved-account-keys", - "solana-reward-info", - "solana-sanitize", - "solana-sdk-ids", - "solana-sdk-macro 2.2.1", - "solana-secp256k1-program", - "solana-secp256k1-recover", - "solana-secp256r1-program", - "solana-seed-derivable", - "solana-seed-phrase", - "solana-serde", - "solana-serde-varint", - "solana-short-vec", - "solana-shred-version", - "solana-signature", - "solana-signer", - "solana-system-transaction", - "solana-time-utils", - "solana-transaction", - "solana-transaction-context", - "solana-transaction-error", - "solana-validator-exit", - "thiserror 2.0.17", - "wasm-bindgen", -] - [[package]] name = "solana-sdk-ids" version = "2.2.1" @@ -7969,95 +6708,12 @@ dependencies = [ "syn 2.0.108", ] -[[package]] -name = "solana-secp256k1-program" -version = "2.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f19833e4bc21558fe9ec61f239553abe7d05224347b57d65c2218aeeb82d6149" -dependencies = [ - "bincode", - "digest 0.10.7", - "libsecp256k1", - "serde", - "serde_derive", - "sha3 0.10.8", - "solana-feature-set", - "solana-instruction", - "solana-precompile-error", - "solana-sdk-ids", - "solana-signature", -] - -[[package]] -name = "solana-secp256k1-recover" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baa3120b6cdaa270f39444f5093a90a7b03d296d362878f7a6991d6de3bbe496" -dependencies = [ - "borsh 1.5.7", - "libsecp256k1", - "solana-define-syscall", - "thiserror 2.0.17", -] - -[[package]] -name = "solana-secp256r1-program" -version = "2.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce0ae46da3071a900f02d367d99b2f3058fe2e90c5062ac50c4f20cfedad8f0f" -dependencies = [ - "bytemuck", - "openssl", - "solana-feature-set", - "solana-instruction", - "solana-precompile-error", - "solana-sdk-ids", -] - [[package]] name = "solana-security-txt" version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "468aa43b7edb1f9b7b7b686d5c3aeb6630dc1708e86e31343499dd5c4d775183" -[[package]] -name = "solana-seed-derivable" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3beb82b5adb266c6ea90e5cf3967235644848eac476c5a1f2f9283a143b7c97f" -dependencies = [ - "solana-derivation-path", -] - -[[package]] -name = "solana-seed-phrase" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36187af2324f079f65a675ec22b31c24919cb4ac22c79472e85d819db9bbbc15" -dependencies = [ - "hmac 0.12.1", - "pbkdf2 0.11.0", - "sha2 0.10.9", -] - -[[package]] -name = "solana-serde" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1931484a408af466e14171556a47adaa215953c7f48b24e5f6b0282763818b04" -dependencies = [ - "serde", -] - -[[package]] -name = "solana-serde-varint" -version = "2.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a7e155eba458ecfb0107b98236088c3764a09ddf0201ec29e52a0be40857113" -dependencies = [ - "serde", -] - [[package]] name = "solana-serialize-utils" version = "2.2.1" @@ -8080,52 +6736,6 @@ dependencies = [ "solana-hash", ] -[[package]] -name = "solana-short-vec" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c54c66f19b9766a56fa0057d060de8378676cb64987533fa088861858fc5a69" -dependencies = [ - "serde", -] - -[[package]] -name = "solana-shred-version" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afd3db0461089d1ad1a78d9ba3f15b563899ca2386351d38428faa5350c60a98" -dependencies = [ - "solana-hard-forks", - "solana-hash", - "solana-sha256-hasher", -] - -[[package]] -name = "solana-signature" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64c8ec8e657aecfc187522fc67495142c12f35e55ddeca8698edbb738b8dbd8c" -dependencies = [ - "ed25519-dalek", - "five8", - "rand 0.8.5", - "serde", - "serde-big-array", - "serde_derive", - "solana-sanitize", -] - -[[package]] -name = "solana-signer" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c41991508a4b02f021c1342ba00bcfa098630b213726ceadc7cb032e051975b" -dependencies = [ - "solana-pubkey", - "solana-signature", - "solana-transaction-error", -] - [[package]] name = "solana-slot-hashes" version = "2.2.1" @@ -8168,8 +6778,6 @@ version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5269e89fde216b4d7e1d1739cf5303f8398a1ff372a81232abbee80e554a838c" dependencies = [ - "borsh 0.10.4", - "borsh 1.5.7", "num-traits", "serde", "serde_derive", @@ -8210,7 +6818,7 @@ dependencies = [ "smallvec", "solana-metrics", "solana-perf", - "solana-sdk 1.18.26", + "solana-sdk", "thiserror 1.0.69", "tokio", "x509-parser", @@ -8232,21 +6840,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "solana-system-transaction" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bd98a25e5bcba8b6be8bcbb7b84b24c2a6a8178d7fb0e3077a916855ceba91a" -dependencies = [ - "solana-hash", - "solana-keypair", - "solana-message", - "solana-pubkey", - "solana-signer", - "solana-system-interface", - "solana-transaction", -] - [[package]] name = "solana-sysvar" version = "2.3.0" @@ -8255,8 +6848,6 @@ checksum = "b8c3595f95069f3d90f275bb9bd235a1973c4d059028b0a7f81baca2703815db" dependencies = [ "base64 0.22.1", "bincode", - "bytemuck", - "bytemuck_derive", "lazy_static", "serde", "serde_derive", @@ -8306,15 +6897,9 @@ dependencies = [ "solana-connection-cache", "solana-rpc-client", "solana-rpc-client-api", - "solana-sdk 1.18.26", + "solana-sdk", ] -[[package]] -name = "solana-time-utils" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6af261afb0e8c39252a04d026e3ea9c405342b08c871a2ad8aa5448e068c784c" - [[package]] name = "solana-tpu-client" version = "1.18.26" @@ -8334,67 +6919,11 @@ dependencies = [ "solana-pubsub-client", "solana-rpc-client", "solana-rpc-client-api", - "solana-sdk 1.18.26", + "solana-sdk", "thiserror 1.0.69", "tokio", ] -[[package]] -name = "solana-transaction" -version = "2.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80657d6088f721148f5d889c828ca60c7daeedac9a8679f9ec215e0c42bcbf41" -dependencies = [ - "bincode", - "serde", - "serde_derive", - "solana-bincode", - "solana-feature-set", - "solana-hash", - "solana-instruction", - "solana-keypair", - "solana-message", - "solana-precompiles", - "solana-pubkey", - "solana-sanitize", - "solana-sdk-ids", - "solana-short-vec", - "solana-signature", - "solana-signer", - "solana-system-interface", - "solana-transaction-error", - "wasm-bindgen", -] - -[[package]] -name = "solana-transaction-context" -version = "2.3.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54a312304361987a85b2ef2293920558e6612876a639dd1309daf6d0d59ef2fe" -dependencies = [ - "bincode", - "serde", - "serde_derive", - "solana-account", - "solana-instruction", - "solana-instructions-sysvar", - "solana-pubkey", - "solana-rent", - "solana-sdk-ids", -] - -[[package]] -name = "solana-transaction-error" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "222a9dc8fdb61c6088baab34fc3a8b8473a03a7a5fd404ed8dd502fa79b67cb1" -dependencies = [ - "serde", - "serde_derive", - "solana-instruction", - "solana-sanitize", -] - [[package]] name = "solana-transaction-status" version = "1.18.26" @@ -8412,7 +6941,7 @@ dependencies = [ "serde_derive", "serde_json", "solana-account-decoder", - "solana-sdk 1.18.26", + "solana-sdk", "spl-associated-token-account", "spl-memo", "spl-token", @@ -8429,18 +6958,12 @@ dependencies = [ "async-trait", "solana-connection-cache", "solana-net-utils", - "solana-sdk 1.18.26", + "solana-sdk", "solana-streamer", "thiserror 1.0.69", "tokio", ] -[[package]] -name = "solana-validator-exit" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bbf6d7a3c0b28dd5335c52c0e9eae49d0ae489a8f324917faf0ded65a812c1d" - [[package]] name = "solana-version" version = "1.18.26" @@ -8454,31 +6977,7 @@ dependencies = [ "serde_derive", "solana-frozen-abi", "solana-frozen-abi-macro", - "solana-sdk 1.18.26", -] - -[[package]] -name = "solana-vote-interface" -version = "2.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b80d57478d6599d30acc31cc5ae7f93ec2361a06aefe8ea79bc81739a08af4c3" -dependencies = [ - "bincode", - "num-derive 0.4.2", - "num-traits", - "serde", - "serde_derive", - "solana-clock", - "solana-decode-error", - "solana-hash", - "solana-instruction", - "solana-pubkey", - "solana-rent", - "solana-sdk-ids", - "solana-serde-varint", - "solana-serialize-utils", - "solana-short-vec", - "solana-system-interface", + "solana-sdk", ] [[package]] @@ -8497,9 +6996,9 @@ dependencies = [ "solana-frozen-abi", "solana-frozen-abi-macro", "solana-metrics", - "solana-program 1.18.26", + "solana-program", "solana-program-runtime", - "solana-sdk 1.18.26", + "solana-sdk", "thiserror 1.0.69", ] @@ -8525,8 +7024,8 @@ dependencies = [ "serde", "serde_json", "sha3 0.9.1", - "solana-program 1.18.26", - "solana-sdk 1.18.26", + "solana-program", + "solana-sdk", "subtle", "thiserror 1.0.69", "zeroize", @@ -8586,7 +7085,7 @@ dependencies = [ "borsh 0.10.4", "num-derive 0.4.2", "num-traits", - "solana-program 1.18.26", + "solana-program", "spl-token", "spl-token-2022", "thiserror 1.0.69", @@ -8599,7 +7098,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cce5d563b58ef1bb2cdbbfe0dfb9ffdc24903b10ae6a4df2d8f425ece375033f" dependencies = [ "bytemuck", - "solana-program 1.18.26", + "solana-program", "spl-discriminator-derive", ] @@ -8633,7 +7132,7 @@ version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0f180b03318c3dbab3ef4e1e4d46d5211ae3c780940dd0a28695aba4b59a75a" dependencies = [ - "solana-program 1.18.26", + "solana-program", ] [[package]] @@ -8644,7 +7143,7 @@ checksum = "2881dddfca792737c0706fa0175345ab282b1b0879c7d877bad129645737c079" dependencies = [ "borsh 0.10.4", "bytemuck", - "solana-program 1.18.26", + "solana-program", "solana-zk-token-sdk", "spl-program-error", ] @@ -8657,7 +7156,7 @@ checksum = "249e0318493b6bcf27ae9902600566c689b7dfba9f1bdff5893e92253374e78c" dependencies = [ "num-derive 0.4.2", "num-traits", - "solana-program 1.18.26", + "solana-program", "spl-program-error-derive", "thiserror 1.0.69", ] @@ -8681,7 +7180,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "615d381f48ddd2bb3c57c7f7fb207591a2a05054639b18a62e785117dd7a8683" dependencies = [ "bytemuck", - "solana-program 1.18.26", + "solana-program", "spl-discriminator", "spl-pod", "spl-program-error", @@ -8699,7 +7198,7 @@ dependencies = [ "num-derive 0.3.3", "num-traits", "num_enum 0.6.1", - "solana-program 1.18.26", + "solana-program", "thiserror 1.0.69", ] @@ -8714,7 +7213,7 @@ dependencies = [ "num-derive 0.4.2", "num-traits", "num_enum 0.7.5", - "solana-program 1.18.26", + "solana-program", "solana-security-txt", "solana-zk-token-sdk", "spl-memo", @@ -8734,7 +7233,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b889509d49fa74a4a033ca5dae6c2307e9e918122d97e58562f5c4ffa795c75d" dependencies = [ "bytemuck", - "solana-program 1.18.26", + "solana-program", "spl-discriminator", "spl-pod", "spl-program-error", @@ -8747,7 +7246,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c16ce3ba6979645fb7627aa1e435576172dd63088dc7848cb09aa331fa1fe4f" dependencies = [ "borsh 0.10.4", - "solana-program 1.18.26", + "solana-program", "spl-discriminator", "spl-pod", "spl-program-error", @@ -8762,7 +7261,7 @@ checksum = "7aabdb7c471566f6ddcee724beb8618449ea24b399e58d464d6b5bc7db550259" dependencies = [ "arrayref", "bytemuck", - "solana-program 1.18.26", + "solana-program", "spl-discriminator", "spl-pod", "spl-program-error", @@ -8777,7 +7276,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a468e6f6371f9c69aae760186ea9f1a01c2908351b06a5e0026d21cfc4d7ecac" dependencies = [ "bytemuck", - "solana-program 1.18.26", + "solana-program", "spl-discriminator", "spl-pod", "spl-program-error", @@ -9310,26 +7809,11 @@ dependencies = [ "serde", ] -[[package]] -name = "toml" -version = "0.8.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc1beb996b9d83529a9e75c17a1686767d148d70663143c7854d8b4a09ced362" -dependencies = [ - "serde", - "serde_spanned", - "toml_datetime 0.6.11", - "toml_edit 0.22.27", -] - [[package]] name = "toml_datetime" version = "0.6.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "22cddaf88f4fbc13c51aebbf5f8eceb5c7c5a9da2ac40a13519eb5b0a0e8f11c" -dependencies = [ - "serde", -] [[package]] name = "toml_datetime" @@ -9351,20 +7835,6 @@ dependencies = [ "winnow 0.5.40", ] -[[package]] -name = "toml_edit" -version = "0.22.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a" -dependencies = [ - "indexmap 2.12.0", - "serde", - "serde_spanned", - "toml_datetime 0.6.11", - "toml_write", - "winnow 0.7.13", -] - [[package]] name = "toml_edit" version = "0.23.7" @@ -9386,12 +7856,6 @@ dependencies = [ "winnow 0.7.13", ] -[[package]] -name = "toml_write" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d99f8c9a7727884afe522e9bd5edbfc91a3312b36a77b5fb8926e4c31a41801" - [[package]] name = "tonic" version = "0.10.2" @@ -10437,7 +8901,7 @@ dependencies = [ "prost", "protobuf-src", "solana-account-decoder", - "solana-sdk 1.18.26", + "solana-sdk", "solana-transaction-status", "tonic", "tonic-build", diff --git a/Cargo.toml b/Cargo.toml index 66499e90..fdf7eece 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -88,7 +88,6 @@ light-compressed-account = { version = "0.5.0" } light-hasher = { version = "4.0.0" } light-poseidon = "0.3.0" light-indexed-merkle-tree = "3.0.0" -account-compression = "2.0.0" sqlx = { version = "0.6.2", features = [ "macros", diff --git a/src/common/typedefs/serializable_pubkey.rs b/src/common/typedefs/serializable_pubkey.rs index 02d63642..6a818fc6 100644 --- a/src/common/typedefs/serializable_pubkey.rs +++ b/src/common/typedefs/serializable_pubkey.rs @@ -31,7 +31,16 @@ impl SerializablePubkey { impl BorshDeserialize for SerializablePubkey { fn deserialize(buf: &mut &[u8]) -> Result { - ::deserialize(buf).map(SerializablePubkey) + if buf.len() < 32 { + return Err(std::io::Error::new( + std::io::ErrorKind::UnexpectedEof, + "Buffer underflow", + )); + } + let (pubkey_bytes, rest) = buf.split_at(32); + *buf = rest; + let array: [u8; 32] = pubkey_bytes.try_into().expect("slice with incorrect length"); + Ok(SerializablePubkey(SolanaPubkey::new_from_array(array))) } fn deserialize_reader(reader: &mut R) -> Result { diff --git a/src/ingester/parser/indexer_events.rs b/src/ingester/parser/indexer_events.rs index 522638a4..3dd3e20f 100644 --- a/src/ingester/parser/indexer_events.rs +++ b/src/ingester/parser/indexer_events.rs @@ -2,7 +2,7 @@ /// to avoid having to import all of Light's dependencies. use borsh::{BorshDeserialize, BorshSerialize}; use light_compressed_account::indexer_event::event::{BatchNullifyContext, NewAddress}; -use solana_pubkey::Pubkey; +use light_compressed_account::Pubkey; #[derive(Debug, PartialEq, Eq, Default, Clone, BorshSerialize, BorshDeserialize)] pub struct OutputCompressedAccountWithPackedContext { diff --git a/src/ingester/parser/tx_event_parser.rs b/src/ingester/parser/tx_event_parser.rs index 5d37d877..12af9423 100644 --- a/src/ingester/parser/tx_event_parser.rs +++ b/src/ingester/parser/tx_event_parser.rs @@ -74,19 +74,20 @@ where .zip(transaction_event.output_leaf_indices.iter()) { let tree = transaction_event.pubkey_array[out_account.merkle_tree_index as usize]; - let tree_and_queue = match TreeInfo::get_by_pubkey(conn, &tree) + let tree_solana = solana_pubkey::Pubkey::new_from_array(tree.to_bytes()); + let tree_and_queue = match TreeInfo::get_by_pubkey(conn, &tree_solana) .await .map_err(|e| IngesterError::ParserError(format!("Failed to get tree info: {}", e)))? { Some(info) => info, None => { if super::SKIP_UNKNOWN_TREES { - log::warn!("Skipping unknown tree: {}", tree.to_string()); + log::warn!("Skipping unknown tree: {}", tree_solana); continue; } else { return Err(IngesterError::ParserError(format!( "Missing queue for tree: {}", - tree.to_string() + tree_solana ))); } } diff --git a/src/ingester/parser/tx_event_parser_v2.rs b/src/ingester/parser/tx_event_parser_v2.rs index bf5fc5eb..e7a5b293 100644 --- a/src/ingester/parser/tx_event_parser_v2.rs +++ b/src/ingester/parser/tx_event_parser_v2.rs @@ -15,15 +15,11 @@ use light_compressed_account::Pubkey as LightPubkey; use solana_pubkey::Pubkey; use solana_sdk::signature::Signature; -// Helper functions for pubkey conversions +// Helper function for pubkey conversion fn to_light_pubkey(pubkey: &Pubkey) -> LightPubkey { LightPubkey::from(pubkey.to_bytes()) } -fn to_solana_pubkey(pubkey: &LightPubkey) -> Pubkey { - Pubkey::from(pubkey.to_bytes()) -} - pub fn parse_public_transaction_event_v2( program_ids: &[Pubkey], instructions: &[Vec], @@ -53,7 +49,7 @@ pub fn parse_public_transaction_event_v2( .iter() .map(|x| OutputCompressedAccountWithPackedContext { compressed_account: CompressedAccount { - owner: to_solana_pubkey(&x.compressed_account.owner), + owner: x.compressed_account.owner, lamports: x.compressed_account.lamports, address: x.compressed_account.address, data: x.compressed_account.data.as_ref().map(|d| { @@ -73,7 +69,7 @@ pub fn parse_public_transaction_event_v2( .sequence_numbers .iter() .map(|x| MerkleTreeSequenceNumberV1 { - pubkey: to_solana_pubkey(&x.tree_pubkey), + pubkey: x.tree_pubkey, seq: x.seq, }) .collect(), @@ -84,10 +80,7 @@ pub fn parse_public_transaction_event_v2( .compress_or_decompress_lamports, pubkey_array: public_transaction_event .event - .pubkey_array - .into_iter() - .map(|p| to_solana_pubkey(&p)) - .collect(), + .pubkey_array, message: public_transaction_event.event.message, }; @@ -98,8 +91,8 @@ pub fn parse_public_transaction_event_v2( .input_sequence_numbers .iter() .map(|x| MerkleTreeSequenceNumberV2 { - tree_pubkey: to_solana_pubkey(&x.tree_pubkey), - queue_pubkey: to_solana_pubkey(&x.queue_pubkey), + tree_pubkey: x.tree_pubkey, + queue_pubkey: x.queue_pubkey, tree_type: x.tree_type, seq: x.seq, }) @@ -108,8 +101,8 @@ pub fn parse_public_transaction_event_v2( .address_sequence_numbers .iter() .map(|x| MerkleTreeSequenceNumberV2 { - tree_pubkey: to_solana_pubkey(&x.tree_pubkey), - queue_pubkey: to_solana_pubkey(&x.queue_pubkey), + tree_pubkey: x.tree_pubkey, + queue_pubkey: x.queue_pubkey, tree_type: x.tree_type, seq: x.seq, }) diff --git a/src/monitor/mod.rs b/src/monitor/mod.rs index 7a487b32..51af28fb 100644 --- a/src/monitor/mod.rs +++ b/src/monitor/mod.rs @@ -1,6 +1,7 @@ mod queue_hash_cache; mod queue_monitor; pub mod tree_metadata_sync; +pub mod v1_tree_accounts; use std::{ sync::{ diff --git a/src/monitor/tree_metadata_sync.rs b/src/monitor/tree_metadata_sync.rs index 59b02821..f0b8dca3 100644 --- a/src/monitor/tree_metadata_sync.rs +++ b/src/monitor/tree_metadata_sync.rs @@ -8,14 +8,12 @@ use solana_sdk::pubkey::Pubkey; use crate::api::error::PhotonApiError; use crate::dao::generated::{prelude::*, tree_metadata}; use crate::ingester::parser::{get_compression_program_id, EXPECTED_TREE_OWNER}; -use account_compression::utils::check_discriminator::check_discriminator; -use account_compression::{AddressMerkleTreeAccount, StateMerkleTreeAccount}; +use crate::monitor::v1_tree_accounts::{ + check_discriminator, AddressMerkleTreeAccount, StateMerkleTreeAccount, + ADDRESS_MERKLE_TREE_DISCRIMINATOR, STATE_MERKLE_TREE_DISCRIMINATOR, +}; use light_batched_merkle_tree::merkle_tree::BatchedMerkleTreeAccount; use light_compressed_account::TreeType; -use light_concurrent_merkle_tree::light_hasher::Poseidon; -use light_concurrent_merkle_tree::zero_copy::ConcurrentMerkleTreeZeroCopy; -use light_indexed_merkle_tree::zero_copy::IndexedMerkleTreeZeroCopy; -use std::mem; /// Tree account data extracted from on-chain account pub struct TreeAccountData { @@ -188,7 +186,7 @@ pub async fn process_tree_account( } fn process_v1_state_account(account: &Account) -> Result { - check_discriminator::(&account.data).map_err(|_| { + check_discriminator(&account.data, &STATE_MERKLE_TREE_DISCRIMINATOR).map_err(|_| { PhotonApiError::UnexpectedError("Invalid state merkle tree discriminator".to_string()) })?; @@ -200,14 +198,12 @@ fn process_v1_state_account(account: &Account) -> Result()..]; - let merkle_tree = ConcurrentMerkleTreeZeroCopy::::from_bytes_zero_copy(tree_data) - .map_err(|e| { - PhotonApiError::UnexpectedError(format!( - "Failed to parse concurrent merkle tree: {}", - e - )) - })?; + let merkle_tree = tree_account.tree().map_err(|e| { + PhotonApiError::UnexpectedError(format!( + "Failed to parse concurrent merkle tree: {}", + e + )) + })?; Ok(TreeAccountData { queue_pubkey: Pubkey::new_from_array(tree_account.metadata.associated_queue.to_bytes()), @@ -220,7 +216,7 @@ fn process_v1_state_account(account: &Account) -> Result Result { - check_discriminator::(&account.data).map_err(|_| { + check_discriminator(&account.data, &ADDRESS_MERKLE_TREE_DISCRIMINATOR).map_err(|_| { PhotonApiError::UnexpectedError("Invalid address merkle tree discriminator".to_string()) })?; @@ -232,15 +228,12 @@ fn process_v1_address_account(account: &Account) -> Result()..]; - let indexed_tree = - IndexedMerkleTreeZeroCopy::::from_bytes_zero_copy(tree_data) - .map_err(|e| { - PhotonApiError::UnexpectedError(format!( - "Failed to parse indexed merkle tree: {}", - e - )) - })?; + let indexed_tree = tree_account.tree().map_err(|e| { + PhotonApiError::UnexpectedError(format!( + "Failed to parse indexed merkle tree: {}", + e + )) + })?; Ok(TreeAccountData { queue_pubkey: Pubkey::new_from_array(tree_account.metadata.associated_queue.to_bytes()), diff --git a/src/monitor/v1_tree_accounts.rs b/src/monitor/v1_tree_accounts.rs new file mode 100644 index 00000000..239754f7 --- /dev/null +++ b/src/monitor/v1_tree_accounts.rs @@ -0,0 +1,67 @@ +//! V1 Tree Account structures for deserializing account-compression program accounts +//! These replace the dependency on the account-compression crate. + +use borsh::BorshDeserialize; +use light_concurrent_merkle_tree::zero_copy::ConcurrentMerkleTreeZeroCopy; +use light_hasher::Poseidon; +use light_indexed_merkle_tree::zero_copy::IndexedMerkleTreeZeroCopy; +use light_merkle_tree_metadata::merkle_tree::MerkleTreeMetadata; + +/// StateMerkleTreeAccount discriminator +pub const STATE_MERKLE_TREE_DISCRIMINATOR: [u8; 8] = [172, 43, 172, 186, 29, 73, 219, 84]; + +/// AddressMerkleTreeAccount discriminator +pub const ADDRESS_MERKLE_TREE_DISCRIMINATOR: [u8; 8] = [99, 100, 84, 45, 134, 159, 103, 73]; + +/// V1 State Merkle Tree Account structure (for deserialization) +/// The on-chain layout is: [8 byte discriminator][metadata][tree_bytes] +#[derive(Debug, BorshDeserialize)] +pub struct StateMerkleTreeAccount { + pub metadata: MerkleTreeMetadata, + /// Raw bytes containing the ConcurrentMerkleTree data + pub tree_bytes: Vec, +} + +impl StateMerkleTreeAccount { + /// Get a zero-copy view of the merkle tree + pub fn tree(&self) -> Result, std::io::Error> { + ConcurrentMerkleTreeZeroCopy::from_bytes_zero_copy(&self.tree_bytes) + .map_err(|e| std::io::Error::new(std::io::ErrorKind::InvalidData, e.to_string())) + } +} + +/// V1 Address Merkle Tree Account structure (for deserialization) +/// The on-chain layout is: [8 byte discriminator][metadata][tree_bytes] +#[derive(Debug, BorshDeserialize)] +pub struct AddressMerkleTreeAccount { + pub metadata: MerkleTreeMetadata, + /// Raw bytes containing the IndexedMerkleTree data + pub tree_bytes: Vec, +} + +impl AddressMerkleTreeAccount { + /// Get a zero-copy view of the indexed merkle tree + pub fn tree( + &self, + ) -> Result, std::io::Error> { + IndexedMerkleTreeZeroCopy::from_bytes_zero_copy(&self.tree_bytes) + .map_err(|e| std::io::Error::new(std::io::ErrorKind::InvalidData, e.to_string())) + } +} + +/// Check that account discriminator matches expected value +pub fn check_discriminator(data: &[u8], expected: &[u8; 8]) -> Result<(), std::io::Error> { + if data.len() < 8 { + return Err(std::io::Error::new( + std::io::ErrorKind::InvalidData, + "Account data too short for discriminator", + )); + } + if &data[..8] != expected { + return Err(std::io::Error::new( + std::io::ErrorKind::InvalidData, + "Invalid account discriminator", + )); + } + Ok(()) +} From eb26e819f37894e09d1feb9e8b8d7e9f7964e4e7 Mon Sep 17 00:00:00 2001 From: ananas Date: Fri, 31 Oct 2025 16:53:30 +0000 Subject: [PATCH 04/10] chore: light deps dont pull in solana deps --- Cargo.lock | 451 +++------------------- Cargo.toml | 19 +- src/ingester/parser/indexer_events.rs | 2 +- src/ingester/parser/state_update.rs | 2 +- src/ingester/parser/tx_event_parser_v2.rs | 2 +- src/ingester/persist/spend.rs | 2 +- src/monitor/tree_metadata_sync.rs | 10 +- src/monitor/v1_tree_accounts.rs | 1 - 8 files changed, 63 insertions(+), 426 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4a29c745..663d847c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -96,8 +96,7 @@ checksum = "250f629c0161ad8107cf89319e990051fae62832fd343083bea452d93e2205fd" [[package]] name = "aligned-sized" version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48a526ec4434d531d488af59fe866f36b310fe8906691c75dffa664450a3800a" +source = "git+https://github.com/Lightprotocol/light-protocol?rev=40736887082f6f879ee73c77005adabd36ead5b6#40736887082f6f879ee73c77005adabd36ead5b6" dependencies = [ "proc-macro2", "quote", @@ -3376,23 +3375,16 @@ dependencies = [ [[package]] name = "light-account-checks" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6024d5fe8d30f940dbdaf64b8de62a0c5ed4b6d7920179f84925085f85ca3f8f" +version = "0.5.0" +source = "git+https://github.com/Lightprotocol/light-protocol?rev=40736887082f6f879ee73c77005adabd36ead5b6#40736887082f6f879ee73c77005adabd36ead5b6" dependencies = [ - "solana-account-info", - "solana-msg", - "solana-program-error", - "solana-pubkey", - "solana-sysvar", "thiserror 2.0.17", ] [[package]] name = "light-batched-merkle-tree" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28657736ca8ad2d71d32015dc9dd85a111c4ed75ba6133ba6ba8c632f63d26ff" +version = "0.6.0" +source = "git+https://github.com/Lightprotocol/light-protocol?rev=40736887082f6f879ee73c77005adabd36ead5b6#40736887082f6f879ee73c77005adabd36ead5b6" dependencies = [ "aligned-sized", "borsh 0.10.4", @@ -3404,45 +3396,36 @@ dependencies = [ "light-merkle-tree-metadata", "light-verifier", "light-zero-copy", - "solana-account-info", - "solana-msg", - "solana-program-error", - "solana-pubkey", - "solana-sysvar", "thiserror 2.0.17", "zerocopy", ] [[package]] name = "light-bloom-filter" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd2f80682ff403477cfc6ee2f26b423e56e7f4d362543783825fe71bcf0f30cd" +version = "0.5.0" +source = "git+https://github.com/Lightprotocol/light-protocol?rev=40736887082f6f879ee73c77005adabd36ead5b6#40736887082f6f879ee73c77005adabd36ead5b6" dependencies = [ "bitvec", "num-bigint 0.4.6", "solana-nostd-keccak", - "solana-program-error", "thiserror 2.0.17", ] [[package]] name = "light-bounded-vec" -version = "2.0.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "233a69f003522990dadcf923b436094ffcb55326a2c3cef7f67acdbcb6e5b039" +checksum = "58cfa375d028164719e3ffef93d2e5c27855cc8a5bb5bf257b868d17c12a3e66" dependencies = [ "bytemuck", "memoffset 0.9.1", - "solana-program-error", "thiserror 1.0.69", ] [[package]] name = "light-compressed-account" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0985921012ffc149596eac90d1170399bb70dbebfa2212bb72b2da30a558ec6" +version = "0.6.1" +source = "git+https://github.com/Lightprotocol/light-protocol?rev=40736887082f6f879ee73c77005adabd36ead5b6#40736887082f6f879ee73c77005adabd36ead5b6" dependencies = [ "borsh 0.10.4", "bytemuck", @@ -3450,52 +3433,55 @@ dependencies = [ "light-macros", "light-program-profiler", "light-zero-copy", - "solana-msg", - "solana-program-error", - "solana-pubkey", "thiserror 2.0.17", + "tinyvec", "zerocopy", ] [[package]] name = "light-concurrent-merkle-tree" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82d647f56701f1c634a70900484be6111cf661c8937785073471d489b05d868c" +version = "4.0.0" +source = "git+https://github.com/Lightprotocol/light-protocol?rev=40736887082f6f879ee73c77005adabd36ead5b6#40736887082f6f879ee73c77005adabd36ead5b6" dependencies = [ "borsh 0.10.4", "light-bounded-vec", "light-hasher", "memoffset 0.9.1", - "solana-program-error", + "thiserror 2.0.17", +] + +[[package]] +name = "light-event" +version = "0.1.1" +source = "git+https://github.com/Lightprotocol/light-protocol?rev=40736887082f6f879ee73c77005adabd36ead5b6#40736887082f6f879ee73c77005adabd36ead5b6" +dependencies = [ + "borsh 0.10.4", + "light-compressed-account", + "light-hasher", + "light-zero-copy", "thiserror 2.0.17", ] [[package]] name = "light-hasher" -version = "4.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7b8b99f626dbfe0e9731a214e2b2e8990341f5fdb249744661ab7f3029d9859" +version = "5.0.0" +source = "git+https://github.com/Lightprotocol/light-protocol?rev=40736887082f6f879ee73c77005adabd36ead5b6#40736887082f6f879ee73c77005adabd36ead5b6" dependencies = [ "ark-bn254 0.5.0", "ark-ff 0.5.0", - "arrayvec", "borsh 0.10.4", "light-poseidon 0.3.0", "num-bigint 0.4.6", "sha2 0.10.9", "sha3 0.10.8", - "solana-nostd-keccak", - "solana-program-error", - "solana-pubkey", "thiserror 2.0.17", + "tinyvec", ] [[package]] name = "light-indexed-array" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "271ba5b246a77e0d4797d6f1752ec3ca627b2359a669189c198f5e104951d928" +version = "0.3.0" +source = "git+https://github.com/Lightprotocol/light-protocol?rev=40736887082f6f879ee73c77005adabd36ead5b6#40736887082f6f879ee73c77005adabd36ead5b6" dependencies = [ "light-hasher", "num-bigint 0.4.6", @@ -3505,9 +3491,8 @@ dependencies = [ [[package]] name = "light-indexed-merkle-tree" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2d75ca453b5f75de51384386cb719402609ba6225ca28d65ea5d071297a5138" +version = "4.0.1" +source = "git+https://github.com/Lightprotocol/light-protocol?rev=40736887082f6f879ee73c77005adabd36ead5b6#40736887082f6f879ee73c77005adabd36ead5b6" dependencies = [ "light-bounded-vec", "light-concurrent-merkle-tree", @@ -3515,15 +3500,13 @@ dependencies = [ "light-merkle-tree-reference", "num-bigint 0.4.6", "num-traits", - "solana-program-error", "thiserror 2.0.17", ] [[package]] name = "light-macros" version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "179ac51cadc1d0ca047b4d6265a7cc245ca3affc16a20a2749585aa6464d39c2" +source = "git+https://github.com/Lightprotocol/light-protocol?rev=40736887082f6f879ee73c77005adabd36ead5b6#40736887082f6f879ee73c77005adabd36ead5b6" dependencies = [ "bs58 0.5.1", "proc-macro2", @@ -3534,25 +3517,20 @@ dependencies = [ [[package]] name = "light-merkle-tree-metadata" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cdc5dab70d1b821a3d77a7f6b074e83b8a5d966aa457487f49ab8b23cd84349" +version = "0.6.0" +source = "git+https://github.com/Lightprotocol/light-protocol?rev=40736887082f6f879ee73c77005adabd36ead5b6#40736887082f6f879ee73c77005adabd36ead5b6" dependencies = [ "borsh 0.10.4", "bytemuck", "light-compressed-account", - "solana-msg", - "solana-program-error", - "solana-sysvar", "thiserror 2.0.17", "zerocopy", ] [[package]] name = "light-merkle-tree-reference" -version = "3.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93b3c707e7d506c1c0f1d94520c5d8d93eb59eb599ead658a7eb22416c04a590" +version = "4.0.0" +source = "git+https://github.com/Lightprotocol/light-protocol?rev=40736887082f6f879ee73c77005adabd36ead5b6#40736887082f6f879ee73c77005adabd36ead5b6" dependencies = [ "light-hasher", "light-indexed-array", @@ -3607,9 +3585,8 @@ dependencies = [ [[package]] name = "light-verifier" -version = "4.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26398153a8c0fa61957a9ad046b3a433c401a37e0e0e9c8d42dee097fa76ce65" +version = "5.0.0" +source = "git+https://github.com/Lightprotocol/light-protocol?rev=40736887082f6f879ee73c77005adabd36ead5b6#40736887082f6f879ee73c77005adabd36ead5b6" dependencies = [ "groth16-solana", "light-compressed-account", @@ -3618,20 +3595,17 @@ dependencies = [ [[package]] name = "light-zero-copy" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f4167c97f1291176414af783c01b647292d809ec14f991884c6d91b9ca2213e" +version = "0.5.0" +source = "git+https://github.com/Lightprotocol/light-protocol?rev=40736887082f6f879ee73c77005adabd36ead5b6#40736887082f6f879ee73c77005adabd36ead5b6" dependencies = [ "light-zero-copy-derive", - "solana-program-error", "zerocopy", ] [[package]] name = "light-zero-copy-derive" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "552463371ee2a6383882b17f7ed1a6803dbc9cb3c0188e0c74a014c2eb22f29e" +version = "0.5.0" +source = "git+https://github.com/Lightprotocol/light-protocol?rev=40736887082f6f879ee73c77005adabd36ead5b6#40736887082f6f879ee73c77005adabd36ead5b6" dependencies = [ "lazy_static", "proc-macro2", @@ -4308,6 +4282,7 @@ dependencies = [ "light-batched-merkle-tree", "light-compressed-account", "light-concurrent-merkle-tree", + "light-event", "light-hasher", "light-indexed-merkle-tree", "light-merkle-tree-metadata", @@ -5911,17 +5886,6 @@ dependencies = [ "zstd", ] -[[package]] -name = "solana-account-info" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8f5152a288ef1912300fc6efa6c2d1f9bb55d9398eb6c72326360b8063987da" -dependencies = [ - "solana-program-error", - "solana-program-memory", - "solana-pubkey", -] - [[package]] name = "solana-atomic-u64" version = "2.2.1" @@ -5996,19 +5960,6 @@ dependencies = [ "tokio", ] -[[package]] -name = "solana-clock" -version = "2.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bb482ab70fced82ad3d7d3d87be33d466a3498eb8aa856434ff3c0dfc2e2e31" -dependencies = [ - "serde", - "serde_derive", - "solana-sdk-ids", - "solana-sdk-macro 2.2.1", - "solana-sysvar-id", -] - [[package]] name = "solana-config-program" version = "1.18.26" @@ -6045,20 +5996,6 @@ dependencies = [ "tokio", ] -[[package]] -name = "solana-cpi" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8dc71126edddc2ba014622fc32d0f5e2e78ec6c5a1e0eb511b85618c09e9ea11" -dependencies = [ - "solana-account-info", - "solana-define-syscall", - "solana-instruction", - "solana-program-error", - "solana-pubkey", - "solana-stable-layout", -] - [[package]] name = "solana-decode-error" version = "2.3.0" @@ -6074,44 +6011,6 @@ version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2ae3e2abcf541c8122eafe9a625d4d194b4023c20adde1e251f94e056bb1aee2" -[[package]] -name = "solana-epoch-rewards" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b575d3dd323b9ea10bb6fe89bf6bf93e249b215ba8ed7f68f1a3633f384db7" -dependencies = [ - "serde", - "serde_derive", - "solana-hash", - "solana-sdk-ids", - "solana-sdk-macro 2.2.1", - "solana-sysvar-id", -] - -[[package]] -name = "solana-epoch-schedule" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fce071fbddecc55d727b1d7ed16a629afe4f6e4c217bc8d00af3b785f6f67ed" -dependencies = [ - "serde", - "serde_derive", - "solana-sdk-ids", - "solana-sdk-macro 2.2.1", - "solana-sysvar-id", -] - -[[package]] -name = "solana-fee-calculator" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d89bc408da0fb3812bc3008189d148b4d3e08252c79ad810b245482a3f70cd8d" -dependencies = [ - "log", - "serde", - "serde_derive", -] - [[package]] name = "solana-frozen-abi" version = "1.18.26" @@ -6155,65 +6054,13 @@ version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b5b96e9f0300fa287b545613f007dfe20043d7812bee255f418c1eb649c93b63" dependencies = [ - "bytemuck", - "bytemuck_derive", "five8", "js-sys", - "serde", - "serde_derive", "solana-atomic-u64", "solana-sanitize", "wasm-bindgen", ] -[[package]] -name = "solana-instruction" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c54769c7e58fc7653658c49b39b935ff6673260cba4ae033b21580a79ca73c90" -dependencies = [ - "bincode", - "getrandom 0.2.16", - "js-sys", - "num-traits", - "serde", - "serde_derive", - "serde_json", - "solana-define-syscall", - "solana-pubkey", - "wasm-bindgen", -] - -[[package]] -name = "solana-instructions-sysvar" -version = "2.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0e85a6fad5c2d0c4f5b91d34b8ca47118fc593af706e523cdbedf846a954f57" -dependencies = [ - "bitflags 2.10.0", - "solana-account-info", - "solana-instruction", - "solana-program-error", - "solana-pubkey", - "solana-sanitize", - "solana-sdk-ids", - "solana-serialize-utils", - "solana-sysvar-id", -] - -[[package]] -name = "solana-last-restart-slot" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a6360ac2fdc72e7463565cd256eedcf10d7ef0c28a1249d261ec168c1b55cdd" -dependencies = [ - "serde", - "serde_derive", - "solana-sdk-ids", - "solana-sdk-macro 2.2.1", - "solana-sysvar-id", -] - [[package]] name = "solana-logger" version = "1.18.26" @@ -6250,15 +6097,6 @@ dependencies = [ "thiserror 1.0.69", ] -[[package]] -name = "solana-msg" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f36a1a14399afaabc2781a1db09cb14ee4cc4ee5c7a5a3cfcc601811379a8092" -dependencies = [ - "solana-define-syscall", -] - [[package]] name = "solana-net-utils" version = "1.18.26" @@ -6367,47 +6205,13 @@ dependencies = [ "sha3 0.10.8", "solana-frozen-abi", "solana-frozen-abi-macro", - "solana-sdk-macro 1.18.26", + "solana-sdk-macro", "thiserror 1.0.69", "tiny-bip39", "wasm-bindgen", "zeroize", ] -[[package]] -name = "solana-program-entrypoint" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32ce041b1a0ed275290a5008ee1a4a6c48f5054c8a3d78d313c08958a06aedbd" -dependencies = [ - "solana-account-info", - "solana-msg", - "solana-program-error", - "solana-pubkey", -] - -[[package]] -name = "solana-program-error" -version = "2.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ee2e0217d642e2ea4bee237f37bd61bb02aec60da3647c48ff88f6556ade775" -dependencies = [ - "num-traits", - "solana-decode-error", - "solana-instruction", - "solana-msg", - "solana-pubkey", -] - -[[package]] -name = "solana-program-memory" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a5426090c6f3fd6cfdc10685322fede9ca8e5af43cd6a59e98bfe4e91671712" -dependencies = [ - "solana-define-syscall", -] - [[package]] name = "solana-program-runtime" version = "1.18.26" @@ -6539,19 +6343,6 @@ dependencies = [ "uriparse", ] -[[package]] -name = "solana-rent" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1aea8fdea9de98ca6e8c2da5827707fb3842833521b528a713810ca685d2480" -dependencies = [ - "serde", - "serde_derive", - "solana-sdk-ids", - "solana-sdk-macro 2.2.1", - "solana-sysvar-id", -] - [[package]] name = "solana-rpc-client" version = "1.18.26" @@ -6668,21 +6459,12 @@ dependencies = [ "solana-frozen-abi-macro", "solana-logger", "solana-program", - "solana-sdk-macro 1.18.26", + "solana-sdk-macro", "thiserror 1.0.69", "uriparse", "wasm-bindgen", ] -[[package]] -name = "solana-sdk-ids" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5d8b9cc68d5c88b062a33e23a6466722467dde0035152d8fb1afbcdf350a5f" -dependencies = [ - "solana-pubkey", -] - [[package]] name = "solana-sdk-macro" version = "1.18.26" @@ -6696,35 +6478,12 @@ dependencies = [ "syn 2.0.108", ] -[[package]] -name = "solana-sdk-macro" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86280da8b99d03560f6ab5aca9de2e38805681df34e0bb8f238e69b29433b9df" -dependencies = [ - "bs58 0.5.1", - "proc-macro2", - "quote", - "syn 2.0.108", -] - [[package]] name = "solana-security-txt" version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "468aa43b7edb1f9b7b7b686d5c3aeb6630dc1708e86e31343499dd5c4d775183" -[[package]] -name = "solana-serialize-utils" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "817a284b63197d2b27afdba829c5ab34231da4a9b4e763466a003c40ca4f535e" -dependencies = [ - "solana-instruction", - "solana-pubkey", - "solana-sanitize", -] - [[package]] name = "solana-sha256-hasher" version = "2.3.0" @@ -6736,61 +6495,6 @@ dependencies = [ "solana-hash", ] -[[package]] -name = "solana-slot-hashes" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c8691982114513763e88d04094c9caa0376b867a29577939011331134c301ce" -dependencies = [ - "serde", - "serde_derive", - "solana-hash", - "solana-sdk-ids", - "solana-sysvar-id", -] - -[[package]] -name = "solana-slot-history" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97ccc1b2067ca22754d5283afb2b0126d61eae734fc616d23871b0943b0d935e" -dependencies = [ - "bv", - "serde", - "serde_derive", - "solana-sdk-ids", - "solana-sysvar-id", -] - -[[package]] -name = "solana-stable-layout" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f14f7d02af8f2bc1b5efeeae71bc1c2b7f0f65cd75bcc7d8180f2c762a57f54" -dependencies = [ - "solana-instruction", - "solana-pubkey", -] - -[[package]] -name = "solana-stake-interface" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5269e89fde216b4d7e1d1739cf5303f8398a1ff372a81232abbee80e554a838c" -dependencies = [ - "num-traits", - "serde", - "serde_derive", - "solana-clock", - "solana-cpi", - "solana-decode-error", - "solana-instruction", - "solana-program-error", - "solana-pubkey", - "solana-system-interface", - "solana-sysvar-id", -] - [[package]] name = "solana-streamer" version = "1.18.26" @@ -6824,67 +6528,6 @@ dependencies = [ "x509-parser", ] -[[package]] -name = "solana-system-interface" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94d7c18cb1a91c6be5f5a8ac9276a1d7c737e39a21beba9ea710ab4b9c63bc90" -dependencies = [ - "js-sys", - "num-traits", - "serde", - "serde_derive", - "solana-decode-error", - "solana-instruction", - "solana-pubkey", - "wasm-bindgen", -] - -[[package]] -name = "solana-sysvar" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8c3595f95069f3d90f275bb9bd235a1973c4d059028b0a7f81baca2703815db" -dependencies = [ - "base64 0.22.1", - "bincode", - "lazy_static", - "serde", - "serde_derive", - "solana-account-info", - "solana-clock", - "solana-define-syscall", - "solana-epoch-rewards", - "solana-epoch-schedule", - "solana-fee-calculator", - "solana-hash", - "solana-instruction", - "solana-instructions-sysvar", - "solana-last-restart-slot", - "solana-program-entrypoint", - "solana-program-error", - "solana-program-memory", - "solana-pubkey", - "solana-rent", - "solana-sanitize", - "solana-sdk-ids", - "solana-sdk-macro 2.2.1", - "solana-slot-hashes", - "solana-slot-history", - "solana-stake-interface", - "solana-sysvar-id", -] - -[[package]] -name = "solana-sysvar-id" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5762b273d3325b047cfda250787f8d796d781746860d5d0a746ee29f3e8812c1" -dependencies = [ - "solana-pubkey", - "solana-sdk-ids", -] - [[package]] name = "solana-thin-client" version = "1.18.26" diff --git a/Cargo.toml b/Cargo.toml index fdf7eece..72f4fd0e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -76,18 +76,19 @@ serde_json = "1.0.82" solana-client = "1.18.0" solana-program = "1.18.0" solana-sdk = "1.18.0" -solana-pubkey = "2.3.0" +solana-pubkey ={ version = "2.3.0", features = ["serde"] } solana-transaction-status = "1.18.0" -light-zero-copy = { version = "0.4.0" } -light-concurrent-merkle-tree = { version = "3.0.0" } -light-batched-merkle-tree = { version = "0.5.0" } -light-merkle-tree-metadata = { version = "0.5.0" } -light-compressed-account = { version = "0.5.0" } -light-hasher = { version = "4.0.0" } +light-zero-copy = { git = "https://github.com/Lightprotocol/light-protocol", rev = "40736887082f6f879ee73c77005adabd36ead5b6", default-features = false} +light-concurrent-merkle-tree = { git = "https://github.com/Lightprotocol/light-protocol", rev = "40736887082f6f879ee73c77005adabd36ead5b6", default-features = false } +light-batched-merkle-tree = { git = "https://github.com/Lightprotocol/light-protocol", rev = "40736887082f6f879ee73c77005adabd36ead5b6", default-features = false} +light-merkle-tree-metadata = { git = "https://github.com/Lightprotocol/light-protocol", rev = "40736887082f6f879ee73c77005adabd36ead5b6", default-features = false } +light-compressed-account = { git = "https://github.com/Lightprotocol/light-protocol", rev = "40736887082f6f879ee73c77005adabd36ead5b6", default-features = false } +light-hasher = { git = "https://github.com/Lightprotocol/light-protocol", rev = "40736887082f6f879ee73c77005adabd36ead5b6", features = ["poseidon", "keccak", "sha256"], default-features = false} light-poseidon = "0.3.0" -light-indexed-merkle-tree = "3.0.0" +light-indexed-merkle-tree = { git = "https://github.com/Lightprotocol/light-protocol", rev = "40736887082f6f879ee73c77005adabd36ead5b6", default-features = false } +light-event = { git = "https://github.com/Lightprotocol/light-protocol", rev = "40736887082f6f879ee73c77005adabd36ead5b6", default-features = false } sqlx = { version = "0.6.2", features = [ "macros", @@ -132,7 +133,7 @@ cloud-storage = "0.11.1" [dev-dependencies] function_name = "0.3.0" serial_test = "2.0.0" -light-merkle-tree-reference = "3.0.0" +light-merkle-tree-reference = { git = "https://github.com/Lightprotocol/light-protocol", rev = "40736887082f6f879ee73c77005adabd36ead5b6" } [profile.dev] # Do not produce debug info for ~40% faster incremental compilation. diff --git a/src/ingester/parser/indexer_events.rs b/src/ingester/parser/indexer_events.rs index 3dd3e20f..0a2ed88b 100644 --- a/src/ingester/parser/indexer_events.rs +++ b/src/ingester/parser/indexer_events.rs @@ -1,7 +1,7 @@ /// Copied from the Light repo. We copy them instead of importing from the Light repo in order /// to avoid having to import all of Light's dependencies. use borsh::{BorshDeserialize, BorshSerialize}; -use light_compressed_account::indexer_event::event::{BatchNullifyContext, NewAddress}; +use light_event::event::{BatchNullifyContext, NewAddress}; use light_compressed_account::Pubkey; #[derive(Debug, PartialEq, Eq, Default, Clone, BorshSerialize, BorshDeserialize)] diff --git a/src/ingester/parser/state_update.rs b/src/ingester/parser/state_update.rs index 6c39e1bf..5bbca58f 100644 --- a/src/ingester/parser/state_update.rs +++ b/src/ingester/parser/state_update.rs @@ -6,7 +6,7 @@ use crate::common::typedefs::serializable_pubkey::SerializablePubkey; use crate::ingester::parser::tree_info::TreeInfo; use borsh::{BorshDeserialize, BorshSerialize}; use jsonrpsee_core::Serialize; -use light_compressed_account::indexer_event::event::{BatchNullifyContext, NewAddress}; +use light_event::event::{BatchNullifyContext, NewAddress}; use light_compressed_account::TreeType; use log::debug; use solana_pubkey::Pubkey; diff --git a/src/ingester/parser/tx_event_parser_v2.rs b/src/ingester/parser/tx_event_parser_v2.rs index e7a5b293..c6d1a766 100644 --- a/src/ingester/parser/tx_event_parser_v2.rs +++ b/src/ingester/parser/tx_event_parser_v2.rs @@ -10,7 +10,7 @@ use crate::ingester::parser::tx_event_parser::create_state_update_v1; use super::state_update::AddressQueueUpdate; use crate::common::typedefs::hash::Hash; -use light_compressed_account::indexer_event::parse::event_from_light_transaction; +use light_event::parse::event_from_light_transaction; use light_compressed_account::Pubkey as LightPubkey; use solana_pubkey::Pubkey; use solana_sdk::signature::Signature; diff --git a/src/ingester/persist/spend.rs b/src/ingester/persist/spend.rs index 5cf4e525..820443c3 100644 --- a/src/ingester/persist/spend.rs +++ b/src/ingester/persist/spend.rs @@ -5,7 +5,7 @@ use crate::ingester::persist::{ execute_account_update_query_and_update_balances, AccountType, ModificationType, }; use crate::migration::Expr; -use light_compressed_account::indexer_event::event::BatchNullifyContext; +use light_event::event::BatchNullifyContext; use sea_orm::QueryFilter; use sea_orm::{ColumnTrait, ConnectionTrait, DatabaseTransaction, EntityTrait, QueryTrait}; diff --git a/src/monitor/tree_metadata_sync.rs b/src/monitor/tree_metadata_sync.rs index f0b8dca3..b4dc2e0d 100644 --- a/src/monitor/tree_metadata_sync.rs +++ b/src/monitor/tree_metadata_sync.rs @@ -199,10 +199,7 @@ fn process_v1_state_account(account: &Account) -> Result Result Date: Fri, 31 Oct 2025 17:04:26 +0000 Subject: [PATCH 05/10] fix: v1 tree deserialization --- src/monitor/tree_metadata_sync.rs | 24 ++++-------------------- src/monitor/v1_tree_accounts.rs | 27 +++++++++++++++++++++++++-- 2 files changed, 29 insertions(+), 22 deletions(-) diff --git a/src/monitor/tree_metadata_sync.rs b/src/monitor/tree_metadata_sync.rs index b4dc2e0d..32edfe9d 100644 --- a/src/monitor/tree_metadata_sync.rs +++ b/src/monitor/tree_metadata_sync.rs @@ -1,4 +1,3 @@ -use borsh::BorshDeserialize; use log::{debug, info, warn}; use sea_orm::{ConnectionTrait, DatabaseConnection, EntityTrait, Set}; use solana_client::nonblocking::rpc_client::RpcClient; @@ -8,10 +7,7 @@ use solana_sdk::pubkey::Pubkey; use crate::api::error::PhotonApiError; use crate::dao::generated::{prelude::*, tree_metadata}; use crate::ingester::parser::{get_compression_program_id, EXPECTED_TREE_OWNER}; -use crate::monitor::v1_tree_accounts::{ - check_discriminator, AddressMerkleTreeAccount, StateMerkleTreeAccount, - ADDRESS_MERKLE_TREE_DISCRIMINATOR, STATE_MERKLE_TREE_DISCRIMINATOR, -}; +use crate::monitor::v1_tree_accounts::{AddressMerkleTreeAccount, StateMerkleTreeAccount}; use light_batched_merkle_tree::merkle_tree::BatchedMerkleTreeAccount; use light_compressed_account::TreeType; @@ -186,18 +182,10 @@ pub async fn process_tree_account( } fn process_v1_state_account(account: &Account) -> Result { - check_discriminator(&account.data, &STATE_MERKLE_TREE_DISCRIMINATOR).map_err(|_| { - PhotonApiError::UnexpectedError("Invalid state merkle tree discriminator".to_string()) + let tree_account = StateMerkleTreeAccount::from_account_bytes(&account.data).map_err(|e| { + PhotonApiError::UnexpectedError(format!("Failed to deserialize state tree account: {}", e)) })?; - let tree_account = - StateMerkleTreeAccount::deserialize(&mut &account.data[8..]).map_err(|e| { - PhotonApiError::UnexpectedError(format!( - "Failed to deserialize state tree account: {}", - e - )) - })?; - let merkle_tree = tree_account.tree().map_err(|e| { PhotonApiError::UnexpectedError(format!("Failed to parse concurrent merkle tree: {}", e)) })?; @@ -213,12 +201,8 @@ fn process_v1_state_account(account: &Account) -> Result Result { - check_discriminator(&account.data, &ADDRESS_MERKLE_TREE_DISCRIMINATOR).map_err(|_| { - PhotonApiError::UnexpectedError("Invalid address merkle tree discriminator".to_string()) - })?; - let tree_account = - AddressMerkleTreeAccount::deserialize(&mut &account.data[8..]).map_err(|e| { + AddressMerkleTreeAccount::from_account_bytes(&account.data).map_err(|e| { PhotonApiError::UnexpectedError(format!( "Failed to deserialize address tree account: {}", e diff --git a/src/monitor/v1_tree_accounts.rs b/src/monitor/v1_tree_accounts.rs index 8d9a989f..c932dddf 100644 --- a/src/monitor/v1_tree_accounts.rs +++ b/src/monitor/v1_tree_accounts.rs @@ -5,6 +5,7 @@ use light_concurrent_merkle_tree::zero_copy::ConcurrentMerkleTreeZeroCopy; use light_hasher::Poseidon; use light_indexed_merkle_tree::zero_copy::IndexedMerkleTreeZeroCopy; use light_merkle_tree_metadata::merkle_tree::MerkleTreeMetadata; +use std::mem::size_of; /// StateMerkleTreeAccount discriminator pub const STATE_MERKLE_TREE_DISCRIMINATOR: [u8; 8] = [172, 43, 172, 186, 29, 73, 219, 84]; @@ -14,7 +15,7 @@ pub const ADDRESS_MERKLE_TREE_DISCRIMINATOR: [u8; 8] = [99, 100, 84, 45, 134, 15 /// V1 State Merkle Tree Account structure (for deserialization) /// The on-chain layout is: [8 byte discriminator][metadata][tree_bytes] -#[derive(Debug, BorshDeserialize)] +#[derive(Debug)] pub struct StateMerkleTreeAccount { pub metadata: MerkleTreeMetadata, /// Raw bytes containing the ConcurrentMerkleTree data @@ -22,6 +23,17 @@ pub struct StateMerkleTreeAccount { } impl StateMerkleTreeAccount { + pub fn from_account_bytes(data: &[u8]) -> Result { + check_discriminator(data, &STATE_MERKLE_TREE_DISCRIMINATOR)?; + let mut cursor = &data[8..]; + let metadata = MerkleTreeMetadata::deserialize(&mut cursor) + .map_err(|e| std::io::Error::new(std::io::ErrorKind::InvalidData, e.to_string()))?; + Ok(Self { + metadata, + tree_bytes: cursor[size_of::()..].to_vec(), + }) + } + /// Get a zero-copy view of the merkle tree pub fn tree(&self) -> Result, std::io::Error> { ConcurrentMerkleTreeZeroCopy::from_bytes_zero_copy(&self.tree_bytes) @@ -31,7 +43,7 @@ impl StateMerkleTreeAccount { /// V1 Address Merkle Tree Account structure (for deserialization) /// The on-chain layout is: [8 byte discriminator][metadata][tree_bytes] -#[derive(Debug, BorshDeserialize)] +#[derive(Debug)] pub struct AddressMerkleTreeAccount { pub metadata: MerkleTreeMetadata, /// Raw bytes containing the IndexedMerkleTree data @@ -39,6 +51,17 @@ pub struct AddressMerkleTreeAccount { } impl AddressMerkleTreeAccount { + pub fn from_account_bytes(data: &[u8]) -> Result { + check_discriminator(data, &ADDRESS_MERKLE_TREE_DISCRIMINATOR)?; + let mut cursor = &data[8..]; + let metadata = MerkleTreeMetadata::deserialize(&mut cursor) + .map_err(|e| std::io::Error::new(std::io::ErrorKind::InvalidData, e.to_string()))?; + Ok(Self { + metadata, + tree_bytes: cursor[size_of::()..].to_vec(), + }) + } + /// Get a zero-copy view of the indexed merkle tree pub fn tree( &self, From 134fdeef3c03fa9aa6fcc8ed8b9f8a9c6c1fa27f Mon Sep 17 00:00:00 2001 From: ananas Date: Fri, 31 Oct 2025 17:16:54 +0000 Subject: [PATCH 06/10] bump solana crates to 3.0 --- Cargo.lock | 3829 +++++++++++------ Cargo.toml | 15 +- src/api/error.rs | 9 +- .../get_transaction_with_compression_info.rs | 3 +- .../method/get_validity_proof/prover/gnark.rs | 2 +- src/common/mod.rs | 2 +- src/ingester/fetchers/poller.rs | 4 +- .../custom/custom20250211_000002_solayer2.rs | 2 +- tests/integration_tests/utils.rs | 8 +- 9 files changed, 2509 insertions(+), 1365 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 663d847c..d96cada2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -20,30 +20,30 @@ checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa" [[package]] name = "aead" -version = "0.4.3" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b613b8e1e3cf911a086f53f03bf286f52fd7a7258e4fa606f0ef220d39d8877" +checksum = "d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0" dependencies = [ + "crypto-common", "generic-array", ] [[package]] name = "aes" -version = "0.7.5" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8" +checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" dependencies = [ "cfg-if", "cipher", "cpufeatures", - "opaque-debug", ] [[package]] name = "aes-gcm-siv" -version = "0.10.3" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "589c637f0e68c877bbd59a4599bbe849cac8e5f3e4b5a3ebae8f528cd218dcdc" +checksum = "ae0784134ba9375416d469ec31e7c5f9fa94405049cf08c5ce5b4698be673e0d" dependencies = [ "aead", "aes", @@ -54,6 +54,31 @@ dependencies = [ "zeroize", ] +[[package]] +name = "agave-feature-set" +version = "3.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29098b42572aa09c9fdb620b50774aa0b907e880aa41ff99fb1892417c9672cc" +dependencies = [ + "ahash 0.8.12", + "solana-epoch-schedule", + "solana-hash 3.0.0", + "solana-pubkey 3.0.0", + "solana-sha256-hasher 3.0.0", + "solana-svm-feature-set", +] + +[[package]] +name = "agave-reserved-account-keys" +version = "3.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9db52270156139b115e25087a4850e28097533f48e713cd73bfef570112514d" +dependencies = [ + "agave-feature-set", + "solana-pubkey 3.0.0", + "solana-sdk-ids", +] + [[package]] name = "ahash" version = "0.7.8" @@ -133,15 +158,6 @@ dependencies = [ "libc", ] -[[package]] -name = "ansi_term" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" -dependencies = [ - "winapi", -] - [[package]] name = "anstream" version = "0.6.21" @@ -198,6 +214,12 @@ version = "1.0.100" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a23eb6b1614318a8071c9b2521f36b424b2c83db5eb3a0fead4a6c0809af6e61" +[[package]] +name = "arc-swap" +version = "1.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457" + [[package]] name = "ark-bn254" version = "0.4.0" @@ -496,12 +518,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "assert_matches" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9" - [[package]] name = "async-attributes" version = "1.1.2" @@ -621,15 +637,6 @@ dependencies = [ "pin-project-lite", ] -[[package]] -name = "async-mutex" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73112ce9e1059d8604242af62c7ec8e5975ac58ac251686c8403b45e8a6fe778" -dependencies = [ - "event-listener 2.5.3", -] - [[package]] name = "async-std" version = "1.13.2" @@ -779,45 +786,43 @@ dependencies = [ [[package]] name = "axum" -version = "0.6.20" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf" +checksum = "8a18ed336352031311f4e0b4dd2ff392d4fbb370777c9d18d7fc9d7359f73871" dependencies = [ - "async-trait", "axum-core", - "bitflags 1.3.2", "bytes", "futures-util", - "http 0.2.12", - "http-body 0.4.6", - "hyper 0.14.32", + "http 1.3.1", + "http-body 1.0.1", + "http-body-util", "itoa", "matchit", "memchr", "mime", "percent-encoding", "pin-project-lite", - "rustversion", - "serde", - "sync_wrapper", - "tower", + "serde_core", + "sync_wrapper 1.0.2", + "tower 0.5.2", "tower-layer", "tower-service", ] [[package]] name = "axum-core" -version = "0.3.4" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "759fa577a247914fd3f7f76d62972792636412fbfd634cd452f6a385a74d2d2c" +checksum = "59446ce19cd142f8833f856eb31f3eb097812d1479ab224f54d72428ca21ea22" dependencies = [ - "async-trait", "bytes", - "futures-util", - "http 0.2.12", - "http-body 0.4.6", + "futures-core", + "http 1.3.1", + "http-body 1.0.1", + "http-body-util", "mime", - "rustversion", + "pin-project-lite", + "sync_wrapper 1.0.2", "tower-layer", "tower-service", ] @@ -835,6 +840,12 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "base16ct" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf" + [[package]] name = "base64" version = "0.12.3" @@ -898,15 +909,6 @@ dependencies = [ "serde_core", ] -[[package]] -name = "bitmaps" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "031043d04099746d8db04daf1fa424b2bc8bd69d92b25962dcde24da39ab64a2" -dependencies = [ - "typenum", -] - [[package]] name = "bitvec" version = "1.0.1" @@ -939,7 +941,6 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" dependencies = [ - "block-padding", "generic-array", ] @@ -952,12 +953,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 = "blocking" version = "1.6.2" @@ -971,16 +966,6 @@ dependencies = [ "piper", ] -[[package]] -name = "borsh" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15bf3650200d8bffa99015595e10f1fbd17de07abbc25bb067da79e769939bfa" -dependencies = [ - "borsh-derive 0.9.3", - "hashbrown 0.11.2", -] - [[package]] name = "borsh" version = "0.10.4" @@ -1001,27 +986,14 @@ dependencies = [ "cfg_aliases", ] -[[package]] -name = "borsh-derive" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6441c552f230375d18e3cc377677914d2ca2b0d36e52129fe15450a2dce46775" -dependencies = [ - "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.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "831213f80d9423998dd696e2c5345aba6be7a0bd8cd19e31c5243e13df1cef89" dependencies = [ - "borsh-derive-internal 0.10.4", - "borsh-schema-derive-internal 0.10.4", + "borsh-derive-internal", + "borsh-schema-derive-internal", "proc-macro-crate 0.1.5", "proc-macro2", "syn 1.0.109", @@ -1040,17 +1012,6 @@ dependencies = [ "syn 2.0.108", ] -[[package]] -name = "borsh-derive-internal" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5449c28a7b352f2d1e592a8a28bf139bc71afb0764a14f3c02500935d8c44065" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "borsh-derive-internal" version = "0.10.4" @@ -1062,17 +1023,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "borsh-schema-derive-internal" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdbd5696d8bfa21d53d9fe39a714a18538bad11492a42d066dbbc395fb1951c0" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "borsh-schema-derive-internal" version = "0.10.4" @@ -1220,6 +1170,9 @@ name = "bytes" version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a" +dependencies = [ + "serde", +] [[package]] name = "cadence" @@ -1260,6 +1213,12 @@ dependencies = [ "shlex", ] +[[package]] +name = "cesu8" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" + [[package]] name = "cfg-if" version = "1.0.4" @@ -1272,6 +1231,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.108", +] + [[package]] name = "chrono" version = "0.4.42" @@ -1283,31 +1253,17 @@ dependencies = [ "num-traits", "serde", "wasm-bindgen", - "windows-link", + "windows-link 0.2.1", ] [[package]] name = "cipher" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ee52072ec15386f770805afd189a01c8841be8696bed250fa2f13c4c0d6dfb7" -dependencies = [ - "generic-array", -] - -[[package]] -name = "clap" -version = "2.34.0" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" +checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" dependencies = [ - "ansi_term", - "atty", - "bitflags 1.3.2", - "strsim 0.8.0", - "textwrap 0.11.0", - "unicode-width 0.1.14", - "vec_map", + "crypto-common", + "inout", ] [[package]] @@ -1324,7 +1280,7 @@ dependencies = [ "once_cell", "strsim 0.10.0", "termcolor", - "textwrap 0.16.2", + "textwrap", ] [[package]] @@ -1431,6 +1387,16 @@ dependencies = [ "unreachable", ] +[[package]] +name = "combine" +version = "4.6.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd" +dependencies = [ + "bytes", + "memchr", +] + [[package]] name = "compression-codecs" version = "0.4.31" @@ -1467,35 +1433,27 @@ dependencies = [ "encode_unicode", "libc", "once_cell", - "unicode-width 0.2.2", "windows-sys 0.59.0", ] [[package]] -name = "console_error_panic_hook" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a06aeb73f470f66dcdbf7223caeebb85984942f22f1adb2a088cf9668146bbbc" -dependencies = [ - "cfg-if", - "wasm-bindgen", -] - -[[package]] -name = "console_log" -version = "0.2.2" +name = "console" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e89f72f65e8501878b8a004d5a1afb780987e2ce2b4532c562e367a72c57499f" +checksum = "b430743a6eb14e9764d4260d4c0d8123087d504eeb9c48f2b2a5e810dd369df4" dependencies = [ - "log", - "web-sys", + "encode_unicode", + "libc", + "once_cell", + "unicode-width", + "windows-sys 0.61.2", ] [[package]] name = "const-oid" -version = "0.7.1" +version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4c78c047431fee22c1a7bb92e00ad095a02a983affe4d8a72e2a2c62c1b94f3" +checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" [[package]] name = "const-random" @@ -1533,6 +1491,16 @@ dependencies = [ "libc", ] +[[package]] +name = "core-foundation" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2a6cd9ae233e7f62ba4e9353e81a88df7fc8a5987b8d445b4d90c879bd156f6" +dependencies = [ + "core-foundation-sys", + "libc", +] + [[package]] name = "core-foundation-sys" version = "0.8.7" @@ -1622,48 +1590,37 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5" [[package]] -name = "crypto-common" -version = "0.1.6" +name = "crypto-bigint" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76" dependencies = [ "generic-array", - "typenum", + "rand_core 0.6.4", + "subtle", + "zeroize", ] [[package]] -name = "crypto-mac" -version = "0.8.0" +name = "crypto-common" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b584a330336237c1eecd3e94266efb216c56ed91225d634cb2991c5f3fd1aeab" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" dependencies = [ "generic-array", - "subtle", + "rand_core 0.6.4", + "typenum", ] [[package]] name = "ctr" -version = "0.8.0" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "049bb91fb4aaf0e3c7efa6cd5ef877dbbbd15b39dad06d9948de4ec8a75761ea" +checksum = "0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835" dependencies = [ "cipher", ] -[[package]] -name = "curve25519-dalek" -version = "3.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90f9d052967f590a76e62eb387bd0bbb1b000182c3cefe5364db6b7211651bc0" -dependencies = [ - "byteorder", - "digest 0.9.0", - "rand_core 0.5.1", - "serde", - "subtle", - "zeroize", -] - [[package]] name = "curve25519-dalek" version = "4.1.3" @@ -1677,6 +1634,7 @@ dependencies = [ "fiat-crypto", "rand_core 0.6.4", "rustc_version", + "serde", "subtle", "zeroize", ] @@ -1694,9 +1652,9 @@ dependencies = [ [[package]] name = "darling" -version = "0.20.11" +version = "0.21.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc7f46116c46ff9ab3eb1597a45688b6715c6e628b5c133e288e709a29bcb4ee" +checksum = "9cdf337090841a411e2a7f3deb9187445851f91b309c0c0a29e05f74a00a48c0" dependencies = [ "darling_core", "darling_macro", @@ -1704,9 +1662,9 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.20.11" +version = "0.21.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d00b9596d185e565c2207a0b01f8bd1a135483d02d9b7b0a54b11da8d53412e" +checksum = "1247195ecd7e3c85f83c8d2a366e4210d588e802133e1e355180a9870b517ea4" dependencies = [ "fnv", "ident_case", @@ -1718,9 +1676,9 @@ dependencies = [ [[package]] name = "darling_macro" -version = "0.20.11" +version = "0.21.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead" +checksum = "d38308df82d1080de0afee5d069fa14b0326a88c14f15c5ccda35b4a6c414c81" dependencies = [ "darling_core", "quote", @@ -1748,11 +1706,12 @@ checksum = "2a2330da5de22e8a3cb63252ce2abb30116bf5265e89c0e01bc17015ce30a476" [[package]] name = "der" -version = "0.5.1" +version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6919815d73839e7ad218de758883aae3a257ba6759ce7a9992501efbb53d705c" +checksum = "e7c1832837b905bbfb5101e07cc24c8deddf52f93225eee6ead5f4d63d53ddcb" dependencies = [ "const-oid", + "zeroize", ] [[package]] @@ -1796,18 +1755,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "dialoguer" -version = "0.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59c6f2989294b9a498d3ad5491a79c6deb604617378e1cdc4bfc1c1361fe2f87" -dependencies = [ - "console", - "shell-words", - "tempfile", - "zeroize", -] - [[package]] name = "digest" version = "0.9.0" @@ -1824,6 +1771,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ "block-buffer 0.10.4", + "const-oid", "crypto-common", "subtle", ] @@ -1925,44 +1873,54 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b" [[package]] -name = "eager" -version = "0.1.0" +name = "ecdsa" +version = "0.16.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abe71d579d1812060163dff96056261deb5bf6729b100fa2e36a68b9649ba3d3" +checksum = "ee27f32b5c5292967d2d4a9d7f1e0b0aed2c15daded5a60300e4abb9d8020bca" +dependencies = [ + "der", + "digest 0.10.7", + "elliptic-curve", + "rfc6979", + "signature", + "spki", +] [[package]] name = "ed25519" -version = "1.5.3" +version = "2.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91cff35c70bba8a626e3185d8cd48cc11b5437e1a5bcd15b9b5fa3c64b6dfee7" +checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53" dependencies = [ + "pkcs8", "signature", ] [[package]] name = "ed25519-dalek" -version = "1.0.1" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c762bae6dcaf24c4c84667b8579785430908723d5c889f469d76a41d59cc7a9d" +checksum = "70e796c081cee67dc755e1a36a0a172b897fab85fc3f6bc48307991f64e4eca9" dependencies = [ - "curve25519-dalek 3.2.1", + "curve25519-dalek", "ed25519", - "rand 0.7.3", + "rand_core 0.6.4", "serde", - "sha2 0.9.9", + "sha2", + "subtle", "zeroize", ] [[package]] name = "ed25519-dalek-bip32" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d2be62a4061b872c8c0873ee4fc6f101ce7b889d039f019c5fa2af471a59908" +checksum = "6b49a684b133c4980d7ee783936af771516011c8cd15f429dbda77245e282f03" dependencies = [ "derivation-path", "ed25519-dalek", - "hmac 0.12.1", - "sha2 0.10.9", + "hmac", + "sha2", ] [[package]] @@ -1986,6 +1944,25 @@ dependencies = [ "serde", ] +[[package]] +name = "elliptic-curve" +version = "0.13.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5e6043086bf7973472e0c7dff2142ea0b680d30e18d9cc40f267efbf222bd47" +dependencies = [ + "base16ct", + "crypto-bigint", + "digest 0.10.7", + "ff", + "generic-array", + "group", + "pkcs8", + "rand_core 0.6.4", + "sec1", + "subtle", + "zeroize", +] + [[package]] name = "encode_unicode" version = "1.0.0" @@ -2001,26 +1978,6 @@ dependencies = [ "cfg-if", ] -[[package]] -name = "enum-iterator" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fd242f399be1da0a5354aa462d57b4ab2b4ee0683cc552f7c007d2d12d36e94" -dependencies = [ - "enum-iterator-derive", -] - -[[package]] -name = "enum-iterator-derive" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "685adfa4d6f3d765a26bc5dbc936577de9abf756c1feeb3089b01dd395034842" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.108", -] - [[package]] name = "enum-ordinalize" version = "4.3.2" @@ -2041,19 +1998,6 @@ dependencies = [ "syn 2.0.108", ] -[[package]] -name = "env_logger" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a12e6657c4c97ebab115a42dcee77225f7f482cdd841cf7088c657a42e9e00e7" -dependencies = [ - "atty", - "humantime", - "log", - "regex", - "termcolor", -] - [[package]] name = "equivalent" version = "1.0.2" @@ -2097,6 +2041,18 @@ dependencies = [ "pin-project-lite", ] +[[package]] +name = "fastbloom" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18c1ddb9231d8554c2d6bdf4cfaabf0c59251658c68b6c95cd52dd0c513a912a" +dependencies = [ + "getrandom 0.3.4", + "libm", + "rand 0.9.2", + "siphasher 1.0.1", +] + [[package]] name = "fastrand" version = "2.3.0" @@ -2109,6 +2065,16 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "835a3dc7d1ec9e75e2b5fb4ba75396837112d2060b03f7d43bc1897c7f7211da" +[[package]] +name = "ff" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0b50bfb653653f9ca9095b427bed08ab8d75a137839d9ad64eb11810d5b6393" +dependencies = [ + "rand_core 0.6.4", + "subtle", +] + [[package]] name = "fiat-crypto" version = "0.2.9" @@ -2349,9 +2315,9 @@ version = "0.14.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4bb6743198531e02858aeaea5398fcc883e71851fcbcb5a2f773e2fb6cb1edf2" dependencies = [ - "serde", "typenum", "version_check", + "zeroize", ] [[package]] @@ -2364,19 +2330,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "getrandom" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" -dependencies = [ - "cfg-if", - "js-sys", - "libc", - "wasi 0.9.0+wasi-snapshot-preview1", - "wasm-bindgen", -] - [[package]] name = "getrandom" version = "0.2.16" @@ -2386,7 +2339,7 @@ dependencies = [ "cfg-if", "js-sys", "libc", - "wasi 0.11.1+wasi-snapshot-preview1", + "wasi", "wasm-bindgen", ] @@ -2397,9 +2350,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd" dependencies = [ "cfg-if", + "js-sys", "libc", "r-efi", "wasip2", + "wasm-bindgen", ] [[package]] @@ -2434,14 +2389,23 @@ dependencies = [ ] [[package]] -name = "goblin" -version = "0.5.4" +name = "governor" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7666983ed0dd8d21a6f6576ee00053ca0926fb281a5522577a4dbd0f1b54143" +checksum = "68a7f542ee6b35af73b06abc0dad1c1bae89964e4e253bc4b587b91c9637867b" dependencies = [ - "log", - "plain", - "scroll", + "cfg-if", + "dashmap", + "futures", + "futures-timer", + "no-std-compat", + "nonzero_ext", + "parking_lot 0.12.5", + "portable-atomic", + "quanta", + "rand 0.8.5", + "smallvec", + "spinning_top", ] [[package]] @@ -2455,10 +2419,21 @@ dependencies = [ "ark-ff 0.5.0", "ark-serialize 0.5.0", "num-bigint 0.4.6", - "solana-bn254", + "solana-bn254 2.2.2", "thiserror 1.0.69", ] +[[package]] +name = "group" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63" +dependencies = [ + "ff", + "rand_core 0.6.4", + "subtle", +] + [[package]] name = "h2" version = "0.3.27" @@ -2499,22 +2474,13 @@ dependencies = [ [[package]] name = "hash32" -version = "0.2.1" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0c35f58762feb77d74ebe43bdbc3210f09be9fe6742234d573bacc26ed92b67" +checksum = "47d60b12902ba28e2730cd37e95b8c9223af2808df9e902d4df49588d1470606" dependencies = [ "byteorder", ] -[[package]] -name = "hashbrown" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" -dependencies = [ - "ahash 0.7.8", -] - [[package]] name = "hashbrown" version = "0.12.3" @@ -2634,17 +2600,7 @@ version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7" dependencies = [ - "hmac 0.12.1", -] - -[[package]] -name = "hmac" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "126888268dcc288495a26bf004b38c5fdbb31682f992c84ceb046a1f0fe38840" -dependencies = [ - "crypto-mac", - "digest 0.9.0", + "hmac", ] [[package]] @@ -2656,17 +2612,6 @@ dependencies = [ "digest 0.10.7", ] -[[package]] -name = "hmac-drbg" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17ea0a1394df5b6574da6e0c1ade9e78868c9fb0a4e5ef4428e32da4676b85b1" -dependencies = [ - "digest 0.9.0", - "generic-array", - "hmac 0.8.1", -] - [[package]] name = "home" version = "0.5.12" @@ -2750,12 +2695,6 @@ version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" -[[package]] -name = "humantime" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "135b12329e5e3ce057a9f972339ea52bc954fe1e9358ef27f95e89716fbc5424" - [[package]] name = "hyper" version = "0.14.32" @@ -2794,6 +2733,7 @@ dependencies = [ "http 1.3.1", "http-body 1.0.1", "httparse", + "httpdate", "itoa", "pin-project-lite", "pin-utils", @@ -2804,28 +2744,32 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.24.2" +version = "0.27.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" +checksum = "e3c93eb611681b207e1fe55d5a71ecf91572ec8a6705cdb6857f7d8d5242cf58" dependencies = [ - "futures-util", - "http 0.2.12", - "hyper 0.14.32", - "rustls 0.21.12", + "http 1.3.1", + "hyper 1.7.0", + "hyper-util", + "rustls 0.23.34", + "rustls-pki-types", "tokio", - "tokio-rustls 0.24.1", + "tokio-rustls 0.26.4", + "tower-service", + "webpki-roots 1.0.3", ] [[package]] name = "hyper-timeout" -version = "0.4.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1" +checksum = "2b90d566bffbce6a75bd8b09a05aa8c2cb1fabb6cb348f8840c9e4c90a0d83b0" dependencies = [ - "hyper 0.14.32", + "hyper 1.7.0", + "hyper-util", "pin-project-lite", "tokio", - "tokio-io-timeout", + "tower-service", ] [[package]] @@ -2863,6 +2807,7 @@ version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c6995591a8f1380fcb4ba966a252a4b29188d51d2b89e3a252f5305be65aea8" dependencies = [ + "base64 0.22.1", "bytes", "futures-channel", "futures-core", @@ -2870,12 +2815,16 @@ dependencies = [ "http 1.3.1", "http-body 1.0.1", "hyper 1.7.0", + "ipnet", "libc", + "percent-encoding", "pin-project-lite", "socket2 0.6.1", + "system-configuration 0.6.1", "tokio", "tower-service", "tracing", + "windows-registry", ] [[package]] @@ -3010,22 +2959,6 @@ dependencies = [ "icu_properties", ] -[[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 = "1.9.3" @@ -3050,24 +2983,33 @@ dependencies = [ [[package]] name = "indicatif" -version = "0.17.11" +version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "183b3088984b400f4cfac3620d5e076c84da5364016b4f49473de574b2586235" +checksum = "ade6dfcba0dfb62ad59e59e7241ec8912af34fd29e0e743e3db992bd278e8b65" dependencies = [ - "console", - "number_prefix", + "console 0.16.1", "portable-atomic", - "unicode-width 0.2.2", + "unicode-width", + "unit-prefix", "web-time", ] +[[package]] +name = "inout" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "879f10e63c20629ecabbb64a8010319738c66a5cd0c29b02d63d272b03751d01" +dependencies = [ + "generic-array", +] + [[package]] name = "insta" version = "1.43.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "46fdb647ebde000f43b5b53f773c30cf9b0cb4300453208713fa38b2c70935a0" dependencies = [ - "console", + "console 0.15.11", "once_cell", "serde", "similar", @@ -3097,6 +3039,16 @@ dependencies = [ "nom", ] +[[package]] +name = "iri-string" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbc5ebe9c3a1a7a5127f920a418f7585e9e758e911d0466ed004f393b0e380b2" +dependencies = [ + "memchr", + "serde", +] + [[package]] name = "is_terminal_polyfill" version = "1.70.2" @@ -3136,6 +3088,28 @@ version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c" +[[package]] +name = "jni" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97" +dependencies = [ + "cesu8", + "cfg-if", + "combine 4.6.7", + "jni-sys", + "log", + "thiserror 1.0.69", + "walkdir", + "windows-sys 0.45.0", +] + +[[package]] +name = "jni-sys" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" + [[package]] name = "jobserver" version = "0.1.34" @@ -3201,7 +3175,7 @@ dependencies = [ "jsonrpsee-types", "parking_lot 0.12.5", "rand 0.8.5", - "rustc-hash", + "rustc-hash 1.1.0", "serde", "serde_json", "soketto", @@ -3241,7 +3215,7 @@ dependencies = [ "tokio", "tokio-stream", "tokio-util", - "tower", + "tower 0.4.13", "tracing", ] @@ -3273,6 +3247,20 @@ dependencies = [ "simple_asn1", ] +[[package]] +name = "k256" +version = "0.13.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6e3919bbaa2945715f0bb6d3934a173d1e9a59ac23767fbaaef277265a7411b" +dependencies = [ + "cfg-if", + "ecdsa", + "elliptic-curve", + "once_cell", + "sha2", + "signature", +] + [[package]] name = "keccak" version = "0.1.5" @@ -3303,6 +3291,12 @@ version = "0.2.177" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2874a2af47a2325c2001a6e6fad9b16a53b802102b528163885171cf92b15976" +[[package]] +name = "libm" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9fbbcab51052fe104eb5e5d351cf728d30a5be1fe14d9be8a3b097481fb97de" + [[package]] name = "libredox" version = "0.1.10" @@ -3314,54 +3308,6 @@ dependencies = [ "redox_syscall 0.5.18", ] -[[package]] -name = "libsecp256k1" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9d220bc1feda2ac231cb78c3d26f27676b8cf82c96971f7aeef3d0cf2797c73" -dependencies = [ - "arrayref", - "base64 0.12.3", - "digest 0.9.0", - "hmac-drbg", - "libsecp256k1-core", - "libsecp256k1-gen-ecmult", - "libsecp256k1-gen-genmult", - "rand 0.7.3", - "serde", - "sha2 0.9.9", - "typenum", -] - -[[package]] -name = "libsecp256k1-core" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0f6ab710cec28cef759c5f18671a27dae2a5f952cdaaee1d8e2908cb2478a80" -dependencies = [ - "crunchy", - "digest 0.9.0", - "subtle", -] - -[[package]] -name = "libsecp256k1-gen-ecmult" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccab96b584d38fac86a83f07e659f0deafd0253dc096dab5a36d53efe653c5c3" -dependencies = [ - "libsecp256k1-core", -] - -[[package]] -name = "libsecp256k1-gen-genmult" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67abfe149395e3aa1c48a2beb32b068e2334402df8181f818d3aee2b304c4f5d" -dependencies = [ - "libsecp256k1-core", -] - [[package]] name = "libsqlite3-sys" version = "0.24.2" @@ -3418,7 +3364,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "58cfa375d028164719e3ffef93d2e5c27855cc8a5bb5bf257b868d17c12a3e66" dependencies = [ "bytemuck", - "memoffset 0.9.1", + "memoffset", "thiserror 1.0.69", ] @@ -3446,7 +3392,7 @@ dependencies = [ "borsh 0.10.4", "light-bounded-vec", "light-hasher", - "memoffset 0.9.1", + "memoffset", "thiserror 2.0.17", ] @@ -3470,10 +3416,10 @@ dependencies = [ "ark-bn254 0.5.0", "ark-ff 0.5.0", "borsh 0.10.4", - "light-poseidon 0.3.0", + "light-poseidon", "num-bigint 0.4.6", - "sha2 0.10.9", - "sha3 0.10.8", + "sha2", + "sha3", "thiserror 2.0.17", "tinyvec", ] @@ -3511,7 +3457,7 @@ dependencies = [ "bs58 0.5.1", "proc-macro2", "quote", - "solana-pubkey", + "solana-pubkey 2.4.0", "syn 2.0.108", ] @@ -3539,18 +3485,6 @@ dependencies = [ "thiserror 2.0.17", ] -[[package]] -name = "light-poseidon" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c9a85a9752c549ceb7578064b4ed891179d20acd85f27318573b64d2d7ee7ee" -dependencies = [ - "ark-bn254 0.4.0", - "ark-ff 0.4.2", - "num-bigint 0.4.6", - "thiserror 1.0.69", -] - [[package]] name = "light-poseidon" version = "0.3.0" @@ -3643,6 +3577,12 @@ dependencies = [ "value-bag", ] +[[package]] +name = "lru-slab" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "112b39cec0b298b6c1999fee3e31427f74f676e4cb9879ed1a121b43661a4154" + [[package]] name = "matchers" version = "0.2.0" @@ -3654,9 +3594,9 @@ dependencies = [ [[package]] name = "matchit" -version = "0.7.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" +checksum = "47e1ffaa40ddd1f3ed91f717a33c8c0ee23fff369e3aa8772b9605cc1d22f4c3" [[package]] name = "maybe-async" @@ -3691,24 +3631,6 @@ version = "2.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273" -[[package]] -name = "memmap2" -version = "0.5.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83faa42c0a078c393f6b29d5db232d8be22776a891f8f56e5284faee4a20b327" -dependencies = [ - "libc", -] - -[[package]] -name = "memoffset" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" -dependencies = [ - "autocfg", -] - [[package]] name = "memoffset" version = "0.9.1" @@ -3778,7 +3700,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "69d83b0086dc8ecf3ce9ae2874b2d1290252e2a30720bea58a5c6639b0092873" dependencies = [ "libc", - "wasi 0.11.1+wasi-snapshot-preview1", + "wasi", "windows-sys 0.61.2", ] @@ -3800,24 +3722,30 @@ dependencies = [ "openssl-probe", "openssl-sys", "schannel", - "security-framework", + "security-framework 2.11.1", "security-framework-sys", "tempfile", ] [[package]] name = "nix" -version = "0.26.4" +version = "0.30.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" +checksum = "74523f3a35e05aba87a1d978330aef40f67b0304ac79c1c00b294c9830543db6" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.10.0", "cfg-if", + "cfg_aliases", "libc", - "memoffset 0.7.1", - "pin-utils", + "memoffset", ] +[[package]] +name = "no-std-compat" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b93853da6d84c2e3c7d730d6473e8817692dd89be387eb01b94d7f108ecb5b8c" + [[package]] name = "nom" version = "7.1.3" @@ -3828,6 +3756,12 @@ dependencies = [ "minimal-lexical", ] +[[package]] +name = "nonzero_ext" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38bf9645c8b145698bb0b18a4637dcacbc421ea49bef2317e4fd8065a387cf21" + [[package]] name = "nu-ansi-term" version = "0.50.3" @@ -3888,17 +3822,6 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" -[[package]] -name = "num-derive" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "num-derive" version = "0.4.2" @@ -3961,40 +3884,19 @@ dependencies = [ "libc", ] -[[package]] -name = "num_enum" -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.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b1207a7e20ad57b847bbddc6776b968420d38292bbfe2089accff5e19e82454c" dependencies = [ - "num_enum_derive 0.7.5", + "num_enum_derive", "rustversion", ] [[package]] name = "num_enum_derive" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96667db765a921f7b295ffee8b60472b686a51d4f21c2ee4ffdb94c7013b65a6" -dependencies = [ - "proc-macro-crate 1.3.1", - "proc-macro2", - "quote", - "syn 2.0.108", -] - -[[package]] -name = "num_enum_derive" -version = "0.7.5" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff32365de1b6743cb203b710788263c44a03de03802daf96092f2da4fe6ba4d7" dependencies = [ @@ -4004,12 +3906,6 @@ dependencies = [ "syn 2.0.108", ] -[[package]] -name = "number_prefix" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" - [[package]] name = "oid-registry" version = "0.6.1" @@ -4177,7 +4073,7 @@ dependencies = [ "libc", "redox_syscall 0.5.18", "smallvec", - "windows-link", + "windows-link 0.2.1", ] [[package]] @@ -4186,15 +4082,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", -] - [[package]] name = "pbkdf2" version = "0.11.0" @@ -4287,15 +4174,15 @@ dependencies = [ "light-indexed-merkle-tree", "light-merkle-tree-metadata", "light-merkle-tree-reference", - "light-poseidon 0.3.0", + "light-poseidon", "light-zero-copy", "log", "num-bigint 0.4.6", "num-traits", - "num_enum 0.7.5", + "num_enum", "once_cell", "rand 0.8.5", - "reqwest 0.12.4", + "reqwest 0.12.24", "rstest", "rust-s3", "sea-orm", @@ -4303,16 +4190,17 @@ dependencies = [ "serde", "serde_json", "serial_test", + "solana-bn254 3.1.2", "solana-client", - "solana-program", - "solana-pubkey", + "solana-commitment-config", + "solana-pubkey 3.0.0", "solana-sdk", "solana-transaction-status", "sqlx", "thiserror 1.0.69", "tokio", - "tower", - "tower-http", + "tower 0.4.13", + "tower-http 0.3.5", "tracing", "tracing-subscriber", "utoipa", @@ -4365,13 +4253,12 @@ dependencies = [ [[package]] name = "pkcs8" -version = "0.8.0" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cabda3fb821068a9a4fab19a683eac3af12edf0f34b94a8be53c4972b8149d0" +checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" dependencies = [ "der", "spki", - "zeroize", ] [[package]] @@ -4380,12 +4267,6 @@ version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c" -[[package]] -name = "plain" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6" - [[package]] name = "polling" version = "3.11.0" @@ -4402,9 +4283,9 @@ dependencies = [ [[package]] name = "polyval" -version = "0.5.3" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8419d2b623c7c0896ff2d5d96e2cb4ede590fed28fcc34934f4c33c036e620a1" +checksum = "9d1fe60d06143b2430aa532c94cfe9e29783047f06c0d7fd359a9a51b729fa25" dependencies = [ "cfg-if", "cpufeatures", @@ -4515,9 +4396,9 @@ dependencies = [ [[package]] name = "prost" -version = "0.12.6" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "deb1435c188b76130da55f17a466d252ff7b1418b2ad3e037d127b94e3411f29" +checksum = "7231bd9b3d3d33c86b58adbac74b5ec0ad9f496b19d22801d773636feaa95f3d" dependencies = [ "bytes", "prost-derive", @@ -4525,13 +4406,12 @@ dependencies = [ [[package]] name = "prost-build" -version = "0.12.6" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22505a5c94da8e3b7c2996394d1c933236c4d743e81a410bcca4e6989fc066a4" +checksum = "ac6c3320f9abac597dcbc668774ef006702672474aad53c6d596b62e487b40b1" dependencies = [ - "bytes", "heck 0.5.0", - "itertools 0.12.1", + "itertools 0.13.0", "log", "multimap", "once_cell", @@ -4539,6 +4419,8 @@ dependencies = [ "prettyplease", "prost", "prost-types", + "pulldown-cmark", + "pulldown-cmark-to-cmark", "regex", "syn 2.0.108", "tempfile", @@ -4546,12 +4428,12 @@ dependencies = [ [[package]] name = "prost-derive" -version = "0.12.6" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81bddcdb20abf9501610992b6759a4c888aef7d1a7247ef75e2404275ac24af1" +checksum = "9120690fafc389a67ba3803df527d0ec9cbbc9cc45e4cc20b332996dfb672425" dependencies = [ "anyhow", - "itertools 0.12.1", + "itertools 0.13.0", "proc-macro2", "quote", "syn 2.0.108", @@ -4559,9 +4441,9 @@ dependencies = [ [[package]] name = "prost-types" -version = "0.12.6" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9091c90b0a32608e984ff2fa4091273cbdd755d54935c51d520887f4a1dbd5b0" +checksum = "b9b4db3d6da204ed77bb26ba83b6122a73aeb2e87e25fbf7ad2e84c4ccbf8f72" dependencies = [ "prost", ] @@ -4595,6 +4477,26 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "pulldown-cmark" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e8bbe1a966bd2f362681a44f6edce3c2310ac21e4d5067a6e7ec396297a6ea0" +dependencies = [ + "bitflags 2.10.0", + "memchr", + "unicase", +] + +[[package]] +name = "pulldown-cmark-to-cmark" +version = "21.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5b6a0769a491a08b31ea5c62494a8f144ee0987d86d670a8af4df1e1b7cde75" +dependencies = [ + "pulldown-cmark", +] + [[package]] name = "qstring" version = "0.7.2" @@ -4605,14 +4507,18 @@ dependencies = [ ] [[package]] -name = "qualifier_attr" -version = "0.2.2" +name = "quanta" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e2e25ee72f5b24d773cae88422baddefff7714f97aab68d96fe2b6fc4a28fb2" +checksum = "f3ab5a9d756f0d97bdc89019bd2e4ea098cf9cde50ee7564dde6b81ccc8f06c7" dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.108", + "crossbeam-utils", + "libc", + "once_cell", + "raw-cpuid", + "wasi", + "web-sys", + "winapi", ] [[package]] @@ -4627,50 +4533,59 @@ dependencies = [ [[package]] name = "quinn" -version = "0.10.2" +version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cc2c5017e4b43d5995dcea317bc46c1e09404c0a9664d2908f7f02dfe943d75" +checksum = "b9e20a958963c291dc322d98411f541009df2ced7b5a4f2bd52337638cfccf20" dependencies = [ "bytes", + "cfg_aliases", "pin-project-lite", "quinn-proto", "quinn-udp", - "rustc-hash", - "rustls 0.21.12", - "thiserror 1.0.69", + "rustc-hash 2.1.1", + "rustls 0.23.34", + "socket2 0.6.1", + "thiserror 2.0.17", "tokio", "tracing", + "web-time", ] [[package]] name = "quinn-proto" -version = "0.10.6" +version = "0.11.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "141bf7dfde2fbc246bfd3fe12f2455aa24b0fbd9af535d8c86c7bd1381ff2b1a" +checksum = "f1906b49b0c3bc04b5fe5d86a77925ae6524a19b816ae38ce1e426255f1d8a31" dependencies = [ "bytes", - "rand 0.8.5", - "ring 0.16.20", - "rustc-hash", - "rustls 0.21.12", - "rustls-native-certs", + "fastbloom", + "getrandom 0.3.4", + "lru-slab", + "rand 0.9.2", + "ring 0.17.14", + "rustc-hash 2.1.1", + "rustls 0.23.34", + "rustls-pki-types", + "rustls-platform-verifier", "slab", - "thiserror 1.0.69", + "thiserror 2.0.17", "tinyvec", "tracing", + "web-time", ] [[package]] name = "quinn-udp" -version = "0.4.1" +version = "0.5.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "055b4e778e8feb9f93c4e439f71dc2156ef13360b432b799e179a8c4cdf0b1d7" +checksum = "addec6a0dcad8a8d96a771f815f0eaf55f9d1805756410b39f5fa81332574cbd" dependencies = [ - "bytes", + "cfg_aliases", "libc", - "socket2 0.5.10", + "once_cell", + "socket2 0.6.1", "tracing", - "windows-sys 0.48.0", + "windows-sys 0.60.2", ] [[package]] @@ -4694,19 +4609,6 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" -[[package]] -name = "rand" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" -dependencies = [ - "getrandom 0.1.16", - "libc", - "rand_chacha 0.2.2", - "rand_core 0.5.1", - "rand_hc", -] - [[package]] name = "rand" version = "0.8.5" @@ -4719,13 +4621,13 @@ dependencies = [ ] [[package]] -name = "rand_chacha" -version = "0.2.2" +name = "rand" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" +checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1" dependencies = [ - "ppv-lite86", - "rand_core 0.5.1", + "rand_chacha 0.9.0", + "rand_core 0.9.3", ] [[package]] @@ -4739,12 +4641,13 @@ dependencies = [ ] [[package]] -name = "rand_core" -version = "0.5.1" +name = "rand_chacha" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" +checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb" dependencies = [ - "getrandom 0.1.16", + "ppv-lite86", + "rand_core 0.9.3", ] [[package]] @@ -4757,21 +4660,21 @@ dependencies = [ ] [[package]] -name = "rand_hc" -version = "0.2.0" +name = "rand_core" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" +checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38" dependencies = [ - "rand_core 0.5.1", + "getrandom 0.3.4", ] [[package]] -name = "rand_xoshiro" -version = "0.6.0" +name = "raw-cpuid" +version = "11.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f97cdb2a36ed4183de61b2f824cc45c9f1037f28afe0a322e9fff4c108b5aaa" +checksum = "498cd0dc59d73224351ee52a95fee0f1a617a2eae0e7d9d720cc622c73a54186" dependencies = [ - "rand_core 0.6.4", + "bitflags 2.10.0", ] [[package]] @@ -4794,18 +4697,6 @@ dependencies = [ "crossbeam-utils", ] -[[package]] -name = "rcgen" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffbe84efe2f38dea12e9bfc1f65377fdf03e53a18cb3b995faedf7934c7e785b" -dependencies = [ - "pem 1.1.1", - "ring 0.16.20", - "time", - "yasna", -] - [[package]] name = "redox_syscall" version = "0.2.16" @@ -4885,7 +4776,6 @@ version = "0.11.27" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62" dependencies = [ - "async-compression 0.4.32", "base64 0.21.7", "bytes", "encoding_rs", @@ -4895,7 +4785,6 @@ dependencies = [ "http 0.2.12", "http-body 0.4.6", "hyper 0.14.32", - "hyper-rustls", "hyper-tls 0.5.0", "ipnet", "js-sys", @@ -4905,16 +4794,14 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", - "rustls 0.21.12", - "rustls-pemfile 1.0.4", + "rustls-pemfile", "serde", "serde_json", "serde_urlencoded", - "sync_wrapper", - "system-configuration", + "sync_wrapper 0.1.2", + "system-configuration 0.5.1", "tokio", "tokio-native-tls", - "tokio-rustls 0.24.1", "tokio-util", "tower-service", "url", @@ -4922,19 +4809,20 @@ dependencies = [ "wasm-bindgen-futures", "wasm-streams", "web-sys", - "webpki-roots 0.25.4", - "winreg 0.50.0", + "winreg", ] [[package]] name = "reqwest" -version = "0.12.4" +version = "0.12.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "566cafdd92868e0939d3fb961bd0dc25fcfaaed179291093b3d43e6b3150ea10" +checksum = "9d0946410b9f7b082a427e4ef5c8ff541a88b357bc6c637c40db3a68ac70a36f" dependencies = [ + "async-compression 0.4.32", "base64 0.22.1", "bytes", "encoding_rs", + "futures-channel", "futures-core", "futures-util", "h2 0.4.12", @@ -4942,32 +4830,60 @@ dependencies = [ "http-body 1.0.1", "http-body-util", "hyper 1.7.0", + "hyper-rustls", "hyper-tls 0.6.0", "hyper-util", - "ipnet", "js-sys", "log", "mime", "native-tls", - "once_cell", "percent-encoding", "pin-project-lite", - "rustls-pemfile 2.2.0", + "quinn", + "rustls 0.23.34", + "rustls-pki-types", "serde", "serde_json", "serde_urlencoded", - "sync_wrapper", - "system-configuration", + "sync_wrapper 1.0.2", "tokio", "tokio-native-tls", + "tokio-rustls 0.26.4", "tokio-util", + "tower 0.5.2", + "tower-http 0.6.6", "tower-service", "url", "wasm-bindgen", "wasm-bindgen-futures", "wasm-streams", "web-sys", - "winreg 0.52.0", + "webpki-roots 1.0.3", +] + +[[package]] +name = "reqwest-middleware" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57f17d28a6e6acfe1733fe24bcd30774d13bffa4b8a22535b4c8c98423088d4e" +dependencies = [ + "anyhow", + "async-trait", + "http 1.3.1", + "reqwest 0.12.24", + "serde", + "thiserror 1.0.69", + "tower-service", +] + +[[package]] +name = "rfc6979" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2" +dependencies = [ + "hmac", + "subtle", ] [[package]] @@ -5028,17 +4944,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "rpassword" -version = "7.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66d4c8b64f049c6721ec8ccec37ddfc3d641c4a7fca57e8f2a89de509c73df39" -dependencies = [ - "libc", - "rtoolbox", - "windows-sys 0.59.0", -] - [[package]] name = "rstest" version = "0.18.2" @@ -5068,16 +4973,6 @@ dependencies = [ "unicode-ident", ] -[[package]] -name = "rtoolbox" -version = "0.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7cc970b249fbe527d6e02e0a227762c9108b2f49d81094fe357ffc6d14d7f6f" -dependencies = [ - "libc", - "windows-sys 0.52.0", -] - [[package]] name = "rust-ini" version = "0.19.0" @@ -5102,7 +4997,7 @@ dependencies = [ "cfg-if", "futures", "hex", - "hmac 0.12.1", + "hmac", "http 0.2.12", "hyper 0.14.32", "hyper-tls 0.5.0", @@ -5116,7 +5011,7 @@ dependencies = [ "serde", "serde_derive", "serde_json", - "sha2 0.10.9", + "sha2", "thiserror 1.0.69", "time", "tokio", @@ -5153,6 +5048,12 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" +[[package]] +name = "rustc-hash" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d" + [[package]] name = "rustc_version" version = "0.4.1" @@ -5204,20 +5105,35 @@ checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" dependencies = [ "log", "ring 0.17.14", - "rustls-webpki", + "rustls-webpki 0.101.7", "sct", ] +[[package]] +name = "rustls" +version = "0.23.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a9586e9ee2b4f8fab52a0048ca7334d7024eef48e2cb9407e3497bb7cab7fa7" +dependencies = [ + "log", + "once_cell", + "ring 0.17.14", + "rustls-pki-types", + "rustls-webpki 0.103.8", + "subtle", + "zeroize", +] + [[package]] name = "rustls-native-certs" -version = "0.6.3" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00" +checksum = "9980d917ebb0c0536119ba501e90834767bffc3d60641457fd84a1f3fd337923" dependencies = [ "openssl-probe", - "rustls-pemfile 1.0.4", + "rustls-pki-types", "schannel", - "security-framework", + "security-framework 3.5.1", ] [[package]] @@ -5230,23 +5146,42 @@ dependencies = [ ] [[package]] -name = "rustls-pemfile" -version = "2.2.0" +name = "rustls-pki-types" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50" +checksum = "94182ad936a0c91c324cd46c6511b9510ed16af436d7b5bab34beab0afd55f7a" dependencies = [ - "rustls-pki-types", + "web-time", + "zeroize", ] [[package]] -name = "rustls-pki-types" -version = "1.13.0" +name = "rustls-platform-verifier" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94182ad936a0c91c324cd46c6511b9510ed16af436d7b5bab34beab0afd55f7a" +checksum = "1d99feebc72bae7ab76ba994bb5e121b8d83d910ca40b36e0921f53becc41784" dependencies = [ - "zeroize", + "core-foundation 0.10.1", + "core-foundation-sys", + "jni", + "log", + "once_cell", + "rustls 0.23.34", + "rustls-native-certs", + "rustls-platform-verifier-android", + "rustls-webpki 0.103.8", + "security-framework 3.5.1", + "security-framework-sys", + "webpki-root-certs", + "windows-sys 0.61.2", ] +[[package]] +name = "rustls-platform-verifier-android" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f87165f0995f63a9fbeea62b64d10b4d9d8e78ec6d7d51fb2125fda7bb36788f" + [[package]] name = "rustls-webpki" version = "0.101.7" @@ -5257,6 +5192,17 @@ dependencies = [ "untrusted 0.9.0", ] +[[package]] +name = "rustls-webpki" +version = "0.103.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ffdfa2f5286e2247234e03f680868ac2815974dc39e00ea15adc445d0aafe52" +dependencies = [ + "ring 0.17.14", + "rustls-pki-types", + "untrusted 0.9.0", +] + [[package]] name = "rustversion" version = "1.0.22" @@ -5286,6 +5232,15 @@ version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f" +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + [[package]] name = "schannel" version = "0.1.28" @@ -5301,26 +5256,6 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" -[[package]] -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.108", -] - [[package]] name = "sct" version = "0.7.1" @@ -5497,6 +5432,20 @@ version = "4.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" +[[package]] +name = "sec1" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc" +dependencies = [ + "base16ct", + "der", + "generic-array", + "pkcs8", + "subtle", + "zeroize", +] + [[package]] name = "security-framework" version = "2.11.1" @@ -5504,15 +5453,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" dependencies = [ "bitflags 2.10.0", - "core-foundation", + "core-foundation 0.9.4", "core-foundation-sys", "libc", "security-framework-sys", ] [[package]] -name = "security-framework-sys" -version = "2.15.0" +name = "security-framework" +version = "3.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3297343eaf830f66ede390ea39da1d462b6b0c1b000f420d0a83f898bbbe6ef" +dependencies = [ + "bitflags 2.10.0", + "core-foundation 0.10.1", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" +version = "2.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cc1f0cbffaac4852523ce30d8bd3c5cdc873501d96ff467ca09b6767bb8cd5c0" dependencies = [ @@ -5536,6 +5498,15 @@ dependencies = [ "serde_derive", ] +[[package]] +name = "serde-big-array" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11fc7cc2c76d73e0f27ee52abbd64eec84d46f370c88371120433196934e4b7f" +dependencies = [ + "serde", +] + [[package]] name = "serde_bytes" version = "0.11.19" @@ -5593,19 +5564,19 @@ dependencies = [ [[package]] name = "serde_with" -version = "2.3.3" +version = "3.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07ff71d2c147a7b57362cead5e22f772cd52f6ab31cfcd9edcd7f6aeb2a0afbe" +checksum = "aa66c845eee442168b2c8134fec70ac50dc20e760769c8ba0ad1319ca1959b04" dependencies = [ - "serde", + "serde_core", "serde_with_macros", ] [[package]] name = "serde_with_macros" -version = "2.3.3" +version = "3.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "881b6f881b17d13214e5d494c939ebab463d01264ce1811e9d4ac3a882e7695f" +checksum = "b91a903660542fced4e99881aa481bdbaec1634568ee02e0b8bd57c64cb38955" dependencies = [ "darling", "proc-macro2", @@ -5675,19 +5646,6 @@ dependencies = [ "digest 0.10.7", ] -[[package]] -name = "sha2" -version = "0.9.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" -dependencies = [ - "block-buffer 0.9.0", - "cfg-if", - "cpufeatures", - "digest 0.9.0", - "opaque-debug", -] - [[package]] name = "sha2" version = "0.10.9" @@ -5699,18 +5657,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" @@ -5730,12 +5676,6 @@ dependencies = [ "lazy_static", ] -[[package]] -name = "shell-words" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde" - [[package]] name = "shlex" version = "1.3.0" @@ -5753,9 +5693,13 @@ dependencies = [ [[package]] name = "signature" -version = "1.6.4" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c" +checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" +dependencies = [ + "digest 0.10.7", + "rand_core 0.6.4", +] [[package]] name = "simd-adler32" @@ -5793,14 +5737,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" [[package]] -name = "sized-chunks" -version = "0.6.5" +name = "siphasher" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16d69225bde7a69b235da73377861095455d298f2b970996eec25ddbb42b3d1e" -dependencies = [ - "bitmaps", - "typenum", -] +checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d" [[package]] name = "slab" @@ -5861,31 +5801,136 @@ dependencies = [ "sha-1", ] +[[package]] +name = "solana-account" +version = "3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "014dcb9293341241dd153b35f89ea906e4170914f4a347a95e7fb07ade47cd6f" +dependencies = [ + "bincode", + "serde", + "serde_bytes", + "serde_derive", + "solana-account-info", + "solana-clock", + "solana-instruction-error", + "solana-pubkey 3.0.0", + "solana-sdk-ids", + "solana-sysvar", +] + [[package]] name = "solana-account-decoder" -version = "1.18.26" +version = "3.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b109fd3a106e079005167e5b0e6f6d2c88bbedec32530837b584791a8b5abf36" +checksum = "64285c3c7bbdaf775e72d8d42b0fa199e120a4633248e0c53caf05849d5e4fc7" dependencies = [ "Inflector", - "base64 0.21.7", + "base64 0.22.1", "bincode", - "bs58 0.4.0", + "bs58 0.5.1", "bv", - "lazy_static", "serde", "serde_derive", "serde_json", - "solana-config-program", - "solana-sdk", - "spl-token", - "spl-token-2022", + "solana-account", + "solana-account-decoder-client-types", + "solana-address-lookup-table-interface", + "solana-clock", + "solana-config-interface", + "solana-epoch-schedule", + "solana-fee-calculator", + "solana-instruction", + "solana-loader-v3-interface", + "solana-nonce", + "solana-program-option", + "solana-program-pack", + "solana-pubkey 3.0.0", + "solana-rent", + "solana-sdk-ids", + "solana-slot-hashes", + "solana-slot-history", + "solana-stake-interface", + "solana-sysvar", + "solana-vote-interface", + "spl-generic-token", + "spl-token-2022-interface", "spl-token-group-interface", + "spl-token-interface", "spl-token-metadata-interface", - "thiserror 1.0.69", + "thiserror 2.0.17", + "zstd", +] + +[[package]] +name = "solana-account-decoder-client-types" +version = "3.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bff10a635163974214065835c82462768f3fb2eaeef558d27edcbd54d1230ddc" +dependencies = [ + "base64 0.22.1", + "bs58 0.5.1", + "serde", + "serde_derive", + "serde_json", + "solana-account", + "solana-pubkey 3.0.0", "zstd", ] +[[package]] +name = "solana-account-info" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82f4691b69b172c687d218dd2f1f23fc7ea5e9aa79df9ac26dab3d8dd829ce48" +dependencies = [ + "bincode", + "serde", + "solana-program-error", + "solana-program-memory", + "solana-pubkey 3.0.0", +] + +[[package]] +name = "solana-address" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a7a457086457ea9db9a5199d719dc8734dc2d0342fad0d8f77633c31eb62f19" +dependencies = [ + "borsh 1.5.7", + "bytemuck", + "bytemuck_derive", + "curve25519-dalek", + "five8", + "five8_const", + "rand 0.8.5", + "serde", + "serde_derive", + "solana-atomic-u64 3.0.0", + "solana-define-syscall 3.0.0", + "solana-program-error", + "solana-sanitize 3.0.1", + "solana-sha256-hasher 3.0.0", +] + +[[package]] +name = "solana-address-lookup-table-interface" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2f56cac5e70517a2f27d05e5100b20de7182473ffd0035b23ea273307905987" +dependencies = [ + "bincode", + "bytemuck", + "serde", + "serde_derive", + "solana-clock", + "solana-instruction", + "solana-instruction-error", + "solana-pubkey 3.0.0", + "solana-sdk-ids", + "solana-slot-hashes", +] + [[package]] name = "solana-atomic-u64" version = "2.2.1" @@ -5895,6 +5940,37 @@ dependencies = [ "parking_lot 0.12.5", ] +[[package]] +name = "solana-atomic-u64" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a933ff1e50aff72d02173cfcd7511bd8540b027ee720b75f353f594f834216d0" +dependencies = [ + "parking_lot 0.12.5", +] + +[[package]] +name = "solana-big-mod-exp" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30c80fb6d791b3925d5ec4bf23a7c169ef5090c013059ec3ed7d0b2c04efa085" +dependencies = [ + "num-bigint 0.4.6", + "num-traits", + "solana-define-syscall 3.0.0", +] + +[[package]] +name = "solana-blake3-hasher" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffa2e3bdac3339c6d0423275e45dafc5ac25f4d43bf344d026a3cc9a85e244a6" +dependencies = [ + "blake3", + "solana-define-syscall 3.0.0", + "solana-hash 3.0.0", +] + [[package]] name = "solana-bn254" version = "2.2.2" @@ -5906,32 +5982,39 @@ dependencies = [ "ark-ff 0.4.2", "ark-serialize 0.4.2", "bytemuck", - "solana-define-syscall", + "solana-define-syscall 2.3.0", "thiserror 2.0.17", ] [[package]] -name = "solana-clap-utils" -version = "1.18.26" +name = "solana-bn254" +version = "3.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "074ef478856a45d5627270fbc6b331f91de9aae7128242d9e423931013fb8a2a" +checksum = "8d08583be08d2d5f19aa21efbb6fbdb968ba7fd0de74562441437a7d776772bf" dependencies = [ - "chrono", - "clap 2.34.0", - "rpassword", - "solana-remote-wallet", - "solana-sdk", - "thiserror 1.0.69", - "tiny-bip39", - "uriparse", - "url", + "ark-bn254 0.4.0", + "ark-ec 0.4.2", + "ark-ff 0.4.2", + "ark-serialize 0.4.2", + "bytemuck", + "solana-define-syscall 3.0.0", + "thiserror 2.0.17", +] + +[[package]] +name = "solana-borsh" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc402b16657abbfa9991cd5cbfac5a11d809f7e7d28d3bb291baeb088b39060e" +dependencies = [ + "borsh 1.5.7", ] [[package]] name = "solana-client" -version = "1.18.26" +version = "3.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24a9f32c42402c4b9484d5868ac74b7e0a746e3905d8bfd756e1203e50cbb87e" +checksum = "b78c92bb6a89fadf6a4aa70e44e8c59b7bc023d86b9443d740e026397a3cb0f7" dependencies = [ "async-trait", "bincode", @@ -5943,42 +6026,111 @@ dependencies = [ "log", "quinn", "rayon", + "solana-account", + "solana-client-traits", + "solana-commitment-config", "solana-connection-cache", + "solana-epoch-info", + "solana-hash 3.0.0", + "solana-instruction", + "solana-keypair", "solana-measure", - "solana-metrics", + "solana-message", + "solana-pubkey 3.0.0", "solana-pubsub-client", "solana-quic-client", + "solana-quic-definitions", "solana-rpc-client", "solana-rpc-client-api", "solana-rpc-client-nonce-utils", - "solana-sdk", + "solana-signature", + "solana-signer", "solana-streamer", - "solana-thin-client", + "solana-time-utils", "solana-tpu-client", + "solana-transaction", + "solana-transaction-error", + "solana-transaction-status-client-types", "solana-udp-client", - "thiserror 1.0.69", + "thiserror 2.0.17", "tokio", ] [[package]] -name = "solana-config-program" -version = "1.18.26" +name = "solana-client-traits" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08618ed587e128105510c54ae3e456b9a06d674d8640db75afe66dad65cb4e02" +dependencies = [ + "solana-account", + "solana-commitment-config", + "solana-epoch-info", + "solana-hash 3.0.0", + "solana-instruction", + "solana-keypair", + "solana-message", + "solana-pubkey 3.0.0", + "solana-signature", + "solana-signer", + "solana-system-interface", + "solana-transaction", + "solana-transaction-error", +] + +[[package]] +name = "solana-clock" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb62e9381182459a4520b5fe7fb22d423cae736239a6427fc398a88743d0ed59" +dependencies = [ + "serde", + "serde_derive", + "solana-sdk-ids", + "solana-sdk-macro", + "solana-sysvar-id", +] + +[[package]] +name = "solana-cluster-type" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb7692fa6bf10a1a86b450c4775526f56d7e0e2116a53313f2533b5694abea64" +dependencies = [ + "solana-hash 3.0.0", +] + +[[package]] +name = "solana-commitment-config" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5fa5933a62dadb7d3ed35e6329de5cebb0678acc8f9cfdf413269084eeccc63f" +dependencies = [ + "serde", + "serde_derive", +] + +[[package]] +name = "solana-config-interface" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d75b803860c0098e021a26f0624129007c15badd5b0bc2fbd9f0e1a73060d3b" +checksum = "63e401ae56aed512821cc7a0adaa412ff97fecd2dff4602be7b1330d2daec0c4" dependencies = [ "bincode", - "chrono", "serde", "serde_derive", - "solana-program-runtime", - "solana-sdk", + "solana-account", + "solana-instruction", + "solana-pubkey 3.0.0", + "solana-sdk-ids", + "solana-short-vec", + "solana-system-interface", ] [[package]] name = "solana-connection-cache" -version = "1.18.26" +version = "3.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9306ede13e8ceeab8a096bcf5fa7126731e44c201ca1721ea3c38d89bcd4111" +checksum = "b7ce2d2f1c270cfc06066799f3220c694ba4fdadbcae16f1138ba15f64924a4c" dependencies = [ "async-trait", "bincode", @@ -5988,14 +6140,43 @@ dependencies = [ "log", "rand 0.8.5", "rayon", - "rcgen", + "solana-keypair", "solana-measure", "solana-metrics", - "solana-sdk", - "thiserror 1.0.69", + "solana-time-utils", + "solana-transaction-error", + "thiserror 2.0.17", "tokio", ] +[[package]] +name = "solana-cpi" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16238feb63d1cbdf915fb287f29ef7a7ebf81469bd6214f8b72a53866b593f8f" +dependencies = [ + "solana-account-info", + "solana-define-syscall 3.0.0", + "solana-instruction", + "solana-program-error", + "solana-pubkey 3.0.0", + "solana-stable-layout", +] + +[[package]] +name = "solana-curve25519" +version = "2.3.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eae4261b9a8613d10e77ac831a8fa60b6fa52b9b103df46d641deff9f9812a23" +dependencies = [ + "bytemuck", + "bytemuck_derive", + "curve25519-dalek", + "solana-define-syscall 2.3.0", + "subtle", + "thiserror 2.0.17", +] + [[package]] name = "solana-decode-error" version = "2.3.0" @@ -6012,232 +6193,563 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2ae3e2abcf541c8122eafe9a625d4d194b4023c20adde1e251f94e056bb1aee2" [[package]] -name = "solana-frozen-abi" -version = "1.18.26" +name = "solana-define-syscall" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03ab2c30c15311b511c0d1151e4ab6bc9a3e080a37e7c6e7c2d96f5784cf9434" -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.9", - "solana-frozen-abi-macro", - "subtle", - "thiserror 1.0.69", -] +checksum = "f9697086a4e102d28a156b8d6b521730335d6951bd39a5e766512bbe09007cee" [[package]] -name = "solana-frozen-abi-macro" -version = "1.18.26" +name = "solana-derivation-path" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c142f779c3633ac83c84d04ff06c70e1f558c876f13358bed77ba629c7417932" +checksum = "ff71743072690fdbdfcdc37700ae1cb77485aaad49019473a81aee099b1e0b8c" dependencies = [ - "proc-macro2", - "quote", - "rustc_version", - "syn 2.0.108", + "derivation-path", + "qstring", + "uriparse", ] [[package]] -name = "solana-hash" -version = "2.3.0" +name = "solana-epoch-info" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5b96e9f0300fa287b545613f007dfe20043d7812bee255f418c1eb649c93b63" +checksum = "f8a6b69bd71386f61344f2bcf0f527f5fd6dd3b22add5880e2e1bf1dd1fa8059" dependencies = [ - "five8", - "js-sys", - "solana-atomic-u64", - "solana-sanitize", - "wasm-bindgen", + "serde", + "serde_derive", ] [[package]] -name = "solana-logger" -version = "1.18.26" +name = "solana-epoch-rewards" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "121d36ffb3c6b958763312cbc697fbccba46ee837d3a0aa4fc0e90fcb3b884f3" +checksum = "b319a4ed70390af911090c020571f0ff1f4ec432522d05ab89f5c08080381995" dependencies = [ - "env_logger", - "lazy_static", - "log", + "serde", + "serde_derive", + "solana-hash 3.0.0", + "solana-sdk-ids", + "solana-sdk-macro", + "solana-sysvar-id", ] [[package]] -name = "solana-measure" -version = "1.18.26" +name = "solana-epoch-rewards-hasher" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c01a7f9cdc9d9d37a3d5651b2fe7ec9d433c2a3470b9f35897e373b421f0737" +checksum = "e507099d0c2c5d7870c9b1848281ea67bbeee80d171ca85003ee5767994c9c38" +dependencies = [ + "siphasher 0.3.11", + "solana-hash 3.0.0", + "solana-pubkey 3.0.0", +] + +[[package]] +name = "solana-epoch-schedule" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e5481e72cc4d52c169db73e4c0cd16de8bc943078aac587ec4817a75cc6388f" +dependencies = [ + "serde", + "serde_derive", + "solana-sdk-ids", + "solana-sdk-macro", + "solana-sysvar-id", +] + +[[package]] +name = "solana-epoch-stake" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcc6693d0ea833b880514b9b88d95afb80b42762dca98b0712465d1fcbbcb89e" +dependencies = [ + "solana-define-syscall 3.0.0", + "solana-pubkey 3.0.0", +] + +[[package]] +name = "solana-example-mocks" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "978855d164845c1b0235d4b4d101cadc55373fffaf0b5b6cfa2194d25b2ed658" +dependencies = [ + "serde", + "serde_derive", + "solana-address-lookup-table-interface", + "solana-clock", + "solana-hash 3.0.0", + "solana-instruction", + "solana-keccak-hasher", + "solana-message", + "solana-nonce", + "solana-pubkey 3.0.0", + "solana-sdk-ids", + "solana-system-interface", + "thiserror 2.0.17", +] + +[[package]] +name = "solana-feature-gate-interface" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7347ab62e6d47a82e340c865133795b394feea7c2b2771d293f57691c6544c3f" +dependencies = [ + "serde", + "serde_derive", + "solana-program-error", + "solana-pubkey 3.0.0", + "solana-sdk-ids", +] + +[[package]] +name = "solana-fee-calculator" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a73cc03ca4bed871ca174558108835f8323e85917bb38b9c81c7af2ab853efe" dependencies = [ "log", - "solana-sdk", + "serde", + "serde_derive", +] + +[[package]] +name = "solana-fee-structure" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e2abdb1223eea8ec64136f39cb1ffcf257e00f915c957c35c0dd9e3f4e700b0" +dependencies = [ + "serde", + "serde_derive", +] + +[[package]] +name = "solana-hard-forks" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0abacc4b66ce471f135f48f22facf75cbbb0f8a252fbe2c1e0aa59d5b203f519" + +[[package]] +name = "solana-hash" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5b96e9f0300fa287b545613f007dfe20043d7812bee255f418c1eb649c93b63" +dependencies = [ + "five8", + "js-sys", + "solana-atomic-u64 2.2.1", + "solana-sanitize 2.2.1", + "wasm-bindgen", +] + +[[package]] +name = "solana-hash" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a063723b9e84c14d8c0d2cdf0268207dc7adecf546e31251f9e07c7b00b566c" +dependencies = [ + "borsh 1.5.7", + "bytemuck", + "bytemuck_derive", + "five8", + "serde", + "serde_derive", + "solana-atomic-u64 3.0.0", + "solana-sanitize 3.0.1", +] + +[[package]] +name = "solana-inflation" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e92f37a14e7c660628752833250dd3dcd8e95309876aee751d7f8769a27947c6" +dependencies = [ + "serde", + "serde_derive", +] + +[[package]] +name = "solana-instruction" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8df4e8fcba01d7efa647ed20a081c234475df5e11a93acb4393cc2c9a7b99bab" +dependencies = [ + "bincode", + "borsh 1.5.7", + "serde", + "serde_derive", + "solana-define-syscall 3.0.0", + "solana-instruction-error", + "solana-pubkey 3.0.0", +] + +[[package]] +name = "solana-instruction-error" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1f0d483b8ae387178d9210e0575b666b05cdd4bd0f2f188128249f6e454d39d" +dependencies = [ + "num-traits", + "serde", + "serde_derive", + "solana-program-error", +] + +[[package]] +name = "solana-instructions-sysvar" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ddf67876c541aa1e21ee1acae35c95c6fbc61119814bfef70579317a5e26955" +dependencies = [ + "bitflags 2.10.0", + "solana-account-info", + "solana-instruction", + "solana-instruction-error", + "solana-program-error", + "solana-pubkey 3.0.0", + "solana-sanitize 3.0.1", + "solana-sdk-ids", + "solana-serialize-utils", + "solana-sysvar-id", +] + +[[package]] +name = "solana-keccak-hasher" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57eebd3012946913c8c1b8b43cdf8a6249edb09c0b6be3604ae910332a3acd97" +dependencies = [ + "sha3", + "solana-define-syscall 3.0.0", + "solana-hash 3.0.0", +] + +[[package]] +name = "solana-keypair" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "952ed9074c12edd2060cb09c2a8c664303f4ab7f7056a407ac37dd1da7bdaa3e" +dependencies = [ + "ed25519-dalek", + "ed25519-dalek-bip32", + "five8", + "rand 0.8.5", + "solana-derivation-path", + "solana-pubkey 3.0.0", + "solana-seed-derivable", + "solana-seed-phrase", + "solana-signature", + "solana-signer", +] + +[[package]] +name = "solana-last-restart-slot" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcda154ec827f5fc1e4da0af3417951b7e9b8157540f81f936c4a8b1156134d0" +dependencies = [ + "serde", + "serde_derive", + "solana-sdk-ids", + "solana-sdk-macro", + "solana-sysvar-id", +] + +[[package]] +name = "solana-loader-v2-interface" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e4a6f0ad4fd9c30679bfee2ce3ea6a449cac38049f210480b751f65676dfe82" +dependencies = [ + "serde", + "serde_bytes", + "serde_derive", + "solana-instruction", + "solana-pubkey 3.0.0", + "solana-sdk-ids", +] + +[[package]] +name = "solana-loader-v3-interface" +version = "6.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dee44c9b1328c5c712c68966fb8de07b47f3e7bac006e74ddd1bb053d3e46e5d" +dependencies = [ + "serde", + "serde_bytes", + "serde_derive", + "solana-instruction", + "solana-pubkey 3.0.0", + "solana-sdk-ids", + "solana-system-interface", +] + +[[package]] +name = "solana-measure" +version = "3.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8dce9330421ef476f95c67f8210d734f9b6a38fc9fcd8abbd306ffbf23361067" + +[[package]] +name = "solana-message" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85666605c9fd727f865ed381665db0a8fc29f984a030ecc1e40f43bfb2541623" +dependencies = [ + "bincode", + "blake3", + "lazy_static", + "serde", + "serde_derive", + "solana-address", + "solana-hash 3.0.0", + "solana-instruction", + "solana-sanitize 3.0.1", + "solana-sdk-ids", + "solana-short-vec", + "solana-transaction-error", ] [[package]] name = "solana-metrics" -version = "1.18.26" +version = "3.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71e36052aff6be1536bdf6f737c6e69aca9dbb6a2f3f582e14ecb0ddc0cd66ce" +checksum = "214a6a27f28156e0a0bfc1e218a4ac30c5fb42e0d1c481cd8f90de0b98fa0984" dependencies = [ "crossbeam-channel", "gethostname", - "lazy_static", "log", - "reqwest 0.11.27", - "solana-sdk", - "thiserror 1.0.69", + "reqwest 0.12.24", + "solana-cluster-type", + "solana-sha256-hasher 3.0.0", + "solana-time-utils", + "thiserror 2.0.17", ] +[[package]] +name = "solana-msg" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "264275c556ea7e22b9d3f87d56305546a38d4eee8ec884f3b126236cb7dcbbb4" +dependencies = [ + "solana-define-syscall 3.0.0", +] + +[[package]] +name = "solana-native-token" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae8dd4c280dca9d046139eb5b7a5ac9ad10403fbd64964c7d7571214950d758f" + [[package]] name = "solana-net-utils" -version = "1.18.26" +version = "3.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a1f5c6be9c5b272866673741e1ebc64b2ea2118e5c6301babbce526fdfb15f4" +checksum = "2c465c3bca426bfca3548c41352b5b358a0401bdd22b1fcef45474ce94cc23a1" dependencies = [ + "anyhow", "bincode", - "clap 3.2.25", - "crossbeam-channel", + "bytes", + "itertools 0.12.1", "log", "nix", "rand 0.8.5", "serde", "serde_derive", - "socket2 0.5.10", - "solana-logger", - "solana-sdk", - "solana-version", + "socket2 0.6.1", + "solana-serde", "tokio", "url", ] +[[package]] +name = "solana-nonce" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "abbdc6c8caf1c08db9f36a50967539d0f72b9f1d4aea04fec5430f532e5afadc" +dependencies = [ + "serde", + "serde_derive", + "solana-fee-calculator", + "solana-hash 3.0.0", + "solana-pubkey 3.0.0", + "solana-sha256-hasher 3.0.0", +] + [[package]] name = "solana-nostd-keccak" version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d8ced70920435b1baa58f76e6f84bbc1110ddd1d6161ec76b6d731ae8431e9c4" dependencies = [ - "sha3 0.10.8", + "sha3", +] + +[[package]] +name = "solana-offchain-message" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6e2a1141a673f72a05cf406b99e4b2b8a457792b7c01afa07b3f00d4e2de393" +dependencies = [ + "num_enum", + "solana-hash 3.0.0", + "solana-packet", + "solana-pubkey 3.0.0", + "solana-sanitize 3.0.1", + "solana-sha256-hasher 3.0.0", + "solana-signature", + "solana-signer", +] + +[[package]] +name = "solana-packet" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6edf2f25743c95229ac0fdc32f8f5893ef738dbf332c669e9861d33ddb0f469d" +dependencies = [ + "bincode", + "bitflags 2.10.0", + "cfg_eval", + "serde", + "serde_derive", + "serde_with", ] [[package]] name = "solana-perf" -version = "1.18.26" +version = "3.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28acaf22477566a0fbddd67249ea5d859b39bacdb624aff3fadd3c5745e2643c" +checksum = "8a5096d12294fb0da9819fe198d0f003a111d29cfa3c0e49b9ed6380577396e5" dependencies = [ "ahash 0.8.12", "bincode", "bv", + "bytes", "caps", - "curve25519-dalek 3.2.1", + "curve25519-dalek", "dlopen2", "fnv", - "lazy_static", "libc", "log", "nix", "rand 0.8.5", "rayon", - "rustc_version", "serde", - "solana-frozen-abi", - "solana-frozen-abi-macro", + "solana-hash 3.0.0", + "solana-message", "solana-metrics", + "solana-packet", + "solana-pubkey 3.0.0", "solana-rayon-threadlimit", - "solana-sdk", - "solana-vote-program", + "solana-sdk-ids", + "solana-short-vec", + "solana-signature", + "solana-time-utils", +] + +[[package]] +name = "solana-presigner" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f704eaf825be3180832445b9e4983b875340696e8e7239bf2d535b0f86c14a2" +dependencies = [ + "solana-pubkey 3.0.0", + "solana-signature", + "solana-signer", ] [[package]] name = "solana-program" -version = "1.18.26" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91b12305dd81045d705f427acd0435a2e46444b65367d7179d7bdcfc3bc5f5eb" +dependencies = [ + "memoffset", + "solana-account-info", + "solana-big-mod-exp", + "solana-blake3-hasher", + "solana-borsh", + "solana-clock", + "solana-cpi", + "solana-define-syscall 3.0.0", + "solana-epoch-rewards", + "solana-epoch-schedule", + "solana-epoch-stake", + "solana-example-mocks", + "solana-fee-calculator", + "solana-hash 3.0.0", + "solana-instruction", + "solana-instruction-error", + "solana-instructions-sysvar", + "solana-keccak-hasher", + "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 3.0.0", + "solana-rent", + "solana-sdk-ids", + "solana-secp256k1-recover", + "solana-serde-varint", + "solana-serialize-utils", + "solana-sha256-hasher 3.0.0", + "solana-short-vec", + "solana-slot-hashes", + "solana-slot-history", + "solana-stable-layout", + "solana-sysvar", + "solana-sysvar-id", +] + +[[package]] +name = "solana-program-entrypoint" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6557cf5b5e91745d1667447438a1baa7823c6086e4ece67f8e6ebfa7a8f72660" +dependencies = [ + "solana-account-info", + "solana-define-syscall 3.0.0", + "solana-msg", + "solana-program-error", + "solana-pubkey 3.0.0", +] + +[[package]] +name = "solana-program-error" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c10f4588cefd716b24a1a40dd32c278e43a560ab8ce4de6b5805c9d113afdfa1" +checksum = "a1af32c995a7b692a915bb7414d5f8e838450cf7c70414e763d8abcae7b51f28" dependencies = [ - "ark-bn254 0.4.0", - "ark-ec 0.4.2", - "ark-ff 0.4.2", - "ark-serialize 0.4.2", - "base64 0.21.7", - "bincode", - "bitflags 2.10.0", - "blake3", - "borsh 0.10.4", - "borsh 0.9.3", "borsh 1.5.7", - "bs58 0.4.0", - "bv", - "bytemuck", - "cc", - "console_error_panic_hook", - "console_log", - "curve25519-dalek 3.2.1", - "getrandom 0.2.16", - "itertools 0.10.5", - "js-sys", - "lazy_static", - "libc", - "libsecp256k1", - "light-poseidon 0.2.0", - "log", - "memoffset 0.9.1", - "num-bigint 0.4.6", - "num-derive 0.4.2", - "num-traits", - "parking_lot 0.12.5", - "rand 0.8.5", - "rustc_version", - "rustversion", "serde", - "serde_bytes", "serde_derive", - "serde_json", - "sha2 0.10.9", - "sha3 0.10.8", - "solana-frozen-abi", - "solana-frozen-abi-macro", - "solana-sdk-macro", - "thiserror 1.0.69", - "tiny-bip39", - "wasm-bindgen", - "zeroize", ] [[package]] -name = "solana-program-runtime" -version = "1.18.26" +name = "solana-program-memory" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbf0c3eab2a80f514289af1f422c121defb030937643c43b117959d6f1932fb5" +checksum = "10e5660c60749c7bfb30b447542529758e4dbcecd31b1e8af1fdc92e2bdde90a" dependencies = [ - "base64 0.21.7", - "bincode", - "eager", - "enum-iterator", - "itertools 0.10.5", - "libc", - "log", - "num-derive 0.4.2", - "num-traits", - "percentage", - "rand 0.8.5", - "rustc_version", - "serde", - "solana-frozen-abi", - "solana-frozen-abi-macro", - "solana-measure", - "solana-metrics", - "solana-sdk", - "solana_rbpf", - "thiserror 1.0.69", + "solana-define-syscall 3.0.0", +] + +[[package]] +name = "solana-program-option" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e7b4ddb464f274deb4a497712664c3b612e3f5f82471d4e47710fc4ab1c3095" + +[[package]] +name = "solana-program-pack" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c169359de21f6034a63ebf96d6b380980307df17a8d371344ff04a883ec4e9d0" +dependencies = [ + "solana-program-error", ] [[package]] @@ -6246,40 +6758,50 @@ version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b62adb9c3261a052ca1f999398c388f1daf558a1b492f60a6d9e64857db4ff1" dependencies = [ - "curve25519-dalek 4.1.3", + "curve25519-dalek", "five8", "five8_const", "getrandom 0.2.16", "js-sys", "num-traits", - "serde", - "serde_derive", - "solana-atomic-u64", + "solana-atomic-u64 2.2.1", "solana-decode-error", - "solana-define-syscall", - "solana-sanitize", - "solana-sha256-hasher", + "solana-define-syscall 2.3.0", + "solana-sanitize 2.2.1", + "solana-sha256-hasher 2.3.0", "wasm-bindgen", ] +[[package]] +name = "solana-pubkey" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8909d399deb0851aa524420beeb5646b115fd253ef446e35fe4504c904da3941" +dependencies = [ + "rand 0.8.5", + "solana-address", +] + [[package]] name = "solana-pubsub-client" -version = "1.18.26" +version = "3.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b064e76909d33821b80fdd826e6757251934a52958220c92639f634bea90366d" +checksum = "38812207b0b1b66a7df0558df9a6d53eb7aa495d00ce0d8bef1628b3774a5f29" dependencies = [ "crossbeam-channel", "futures-util", + "http 0.2.12", "log", - "reqwest 0.11.27", "semver", "serde", "serde_derive", "serde_json", - "solana-account-decoder", - "solana-rpc-client-api", - "solana-sdk", - "thiserror 1.0.69", + "solana-account-decoder-client-types", + "solana-clock", + "solana-pubkey 3.0.0", + "solana-rpc-client-types", + "solana-signature", + "thiserror 2.0.17", "tokio", "tokio-stream", "tokio-tungstenite", @@ -6289,119 +6811,179 @@ dependencies = [ [[package]] name = "solana-quic-client" -version = "1.18.26" +version = "3.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a90e40ee593f6e9ddd722d296df56743514ae804975a76d47e7afed4e3da244" +checksum = "bff930459fa06e95cb2d020f5be1b3d47b9f3a0e22e68c67b50537dca908b3aa" dependencies = [ - "async-mutex", + "async-lock", "async-trait", "futures", - "itertools 0.10.5", - "lazy_static", + "itertools 0.12.1", "log", "quinn", "quinn-proto", - "rcgen", - "rustls 0.21.12", + "rustls 0.23.34", "solana-connection-cache", + "solana-keypair", "solana-measure", "solana-metrics", "solana-net-utils", + "solana-pubkey 3.0.0", + "solana-quic-definitions", "solana-rpc-client-api", - "solana-sdk", + "solana-signer", "solana-streamer", - "thiserror 1.0.69", + "solana-tls-utils", + "solana-transaction-error", + "thiserror 2.0.17", "tokio", ] +[[package]] +name = "solana-quic-definitions" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15319accf7d3afd845817aeffa6edd8cc185f135cefbc6b985df29cfd8c09609" +dependencies = [ + "solana-keypair", +] + [[package]] name = "solana-rayon-threadlimit" -version = "1.18.26" +version = "3.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66468f9c014992167de10cc68aad6ac8919a8c8ff428dc88c0d2b4da8c02b8b7" +checksum = "5034d175b90f0b5a5ff155eff5be091dfbc300ba162e1d35b8cd72be1a0d670b" dependencies = [ - "lazy_static", + "log", "num_cpus", ] [[package]] -name = "solana-remote-wallet" -version = "1.18.26" +name = "solana-rent" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b702d8c43711e3c8a9284a4f1bbc6a3de2553deb25b0c8142f9a44ef0ce5ddc1" +dependencies = [ + "serde", + "serde_derive", + "solana-sdk-ids", + "solana-sdk-macro", + "solana-sysvar-id", +] + +[[package]] +name = "solana-reward-info" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c191019f4d4f84281a6d0dd9a43181146b33019627fc394e42e08ade8976b431" +checksum = "82be7946105c2ee6be9f9ee7bd18a068b558389221d29efa92b906476102bfcc" dependencies = [ - "console", - "dialoguer", - "log", - "num-derive 0.4.2", - "num-traits", - "parking_lot 0.12.5", - "qstring", - "semver", - "solana-sdk", - "thiserror 1.0.69", - "uriparse", + "serde", + "serde_derive", ] [[package]] name = "solana-rpc-client" -version = "1.18.26" +version = "3.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36ed4628e338077c195ddbf790693d410123d17dec0a319b5accb4aaee3fb15c" +checksum = "f7e038dea8817f8a713e0077226cfe638b93c44cf861e3f9545ef40b8e71bc78" dependencies = [ "async-trait", - "base64 0.21.7", + "base64 0.22.1", "bincode", - "bs58 0.4.0", + "bs58 0.5.1", + "futures", "indicatif", "log", - "reqwest 0.11.27", + "reqwest 0.12.24", + "reqwest-middleware", "semver", "serde", "serde_derive", "serde_json", - "solana-account-decoder", + "solana-account", + "solana-account-decoder-client-types", + "solana-clock", + "solana-commitment-config", + "solana-epoch-info", + "solana-epoch-schedule", + "solana-feature-gate-interface", + "solana-hash 3.0.0", + "solana-instruction", + "solana-message", + "solana-pubkey 3.0.0", "solana-rpc-client-api", - "solana-sdk", - "solana-transaction-status", + "solana-signature", + "solana-transaction", + "solana-transaction-error", + "solana-transaction-status-client-types", "solana-version", - "solana-vote-program", + "solana-vote-interface", "tokio", ] [[package]] name = "solana-rpc-client-api" -version = "1.18.26" +version = "3.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83c913551faa4a1ae4bbfef6af19f3a5cf847285c05b4409e37c8993b3444229" +checksum = "4908dbe81349db6ae851d808bef3078e49937400ad687e1c4e78b79f796ff88c" dependencies = [ - "base64 0.21.7", - "bs58 0.4.0", + "anyhow", "jsonrpc-core", - "reqwest 0.11.27", - "semver", + "reqwest 0.12.24", + "reqwest-middleware", "serde", "serde_derive", "serde_json", - "solana-account-decoder", - "solana-sdk", - "solana-transaction-status", - "solana-version", - "spl-token-2022", - "thiserror 1.0.69", + "solana-account-decoder-client-types", + "solana-clock", + "solana-rpc-client-types", + "solana-signer", + "solana-transaction-error", + "solana-transaction-status-client-types", + "thiserror 2.0.17", ] [[package]] name = "solana-rpc-client-nonce-utils" -version = "1.18.26" +version = "3.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a47b6bb1834e6141a799db62bbdcf80d17a7d58d7bc1684c614e01a7293d7cf" +checksum = "f981ef4da0734f459f5b71d1e8dcd6807c17721681714099c90ff6848c7dbb4a" dependencies = [ - "clap 2.34.0", - "solana-clap-utils", + "solana-account", + "solana-commitment-config", + "solana-hash 3.0.0", + "solana-message", + "solana-nonce", + "solana-pubkey 3.0.0", "solana-rpc-client", - "solana-sdk", - "thiserror 1.0.69", + "solana-sdk-ids", + "thiserror 2.0.17", +] + +[[package]] +name = "solana-rpc-client-types" +version = "3.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0305c8cf8fca27a3f0385ad1d400b2cdde99d6cad2187370acdce117f93bd58f" +dependencies = [ + "base64 0.22.1", + "bs58 0.5.1", + "semver", + "serde", + "serde_derive", + "serde_json", + "solana-account", + "solana-account-decoder-client-types", + "solana-clock", + "solana-commitment-config", + "solana-fee-calculator", + "solana-inflation", + "solana-pubkey 3.0.0", + "solana-transaction-error", + "solana-transaction-status-client-types", + "solana-version", + "spl-generic-token", + "thiserror 2.0.17", ] [[package]] @@ -6411,78 +6993,143 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "61f1bc1357b8188d9c4a3af3fc55276e56987265eb7ad073ae6f8180ee54cecf" [[package]] -name = "solana-sdk" -version = "1.18.26" +name = "solana-sanitize" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcf09694a0fc14e5ffb18f9b7b7c0f15ecb6eac5b5610bf76a1853459d19daf9" + +[[package]] +name = "solana-sbpf" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "580ad66c2f7a4c3cb3244fe21440546bd500f5ecb955ad9826e92a78dded8009" +checksum = "0f224d906c14efc7ed7f42bc5fe9588f3f09db8cabe7f6023adda62a69678e1a" dependencies = [ - "assert_matches", - "base64 0.21.7", - "bincode", - "bitflags 2.10.0", - "borsh 1.5.7", - "bs58 0.4.0", - "bytemuck", "byteorder", - "chrono", - "derivation-path", - "digest 0.10.7", - "ed25519-dalek", - "ed25519-dalek-bip32", - "generic-array", - "hmac 0.12.1", - "itertools 0.10.5", - "js-sys", - "lazy_static", - "libsecp256k1", + "combine 3.8.1", + "hash32", "log", - "memmap2", - "num-derive 0.4.2", - "num-traits", - "num_enum 0.7.5", - "pbkdf2 0.11.0", - "qstring", - "qualifier_attr", - "rand 0.7.3", - "rand 0.8.5", - "rustc_version", - "rustversion", + "rustc-demangle", + "thiserror 2.0.17", +] + +[[package]] +name = "solana-sdk" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f03df7969f5e723ad31b6c9eadccc209037ac4caa34d8dc259316b05c11e82b" +dependencies = [ + "bincode", + "bs58 0.5.1", "serde", - "serde_bytes", - "serde_derive", - "serde_json", - "serde_with", - "sha2 0.10.9", - "sha3 0.10.8", - "siphasher", - "solana-frozen-abi", - "solana-frozen-abi-macro", - "solana-logger", + "solana-account", + "solana-epoch-info", + "solana-epoch-rewards-hasher", + "solana-fee-structure", + "solana-inflation", + "solana-keypair", + "solana-message", + "solana-offchain-message", + "solana-presigner", "solana-program", + "solana-program-memory", + "solana-pubkey 3.0.0", + "solana-sanitize 3.0.1", + "solana-sdk-ids", "solana-sdk-macro", - "thiserror 1.0.69", - "uriparse", - "wasm-bindgen", + "solana-seed-derivable", + "solana-seed-phrase", + "solana-serde", + "solana-serde-varint", + "solana-short-vec", + "solana-shred-version", + "solana-signature", + "solana-signer", + "solana-time-utils", + "solana-transaction", + "solana-transaction-error", + "thiserror 2.0.17", +] + +[[package]] +name = "solana-sdk-ids" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1b6d6aaf60669c592838d382266b173881c65fb1cdec83b37cb8ce7cb89f9ad" +dependencies = [ + "solana-pubkey 3.0.0", ] [[package]] name = "solana-sdk-macro" -version = "1.18.26" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b75d0f193a27719257af19144fdaebec0415d1c9e9226ae4bd29b791be5e9bd" +checksum = "d6430000e97083460b71d9fbadc52a2ab2f88f53b3a4c5e58c5ae3640a0e8c00" dependencies = [ - "bs58 0.4.0", + "bs58 0.5.1", "proc-macro2", "quote", - "rustversion", "syn 2.0.108", ] [[package]] -name = "solana-security-txt" -version = "1.1.1" +name = "solana-secp256k1-recover" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "394a4470477d66296af5217970a905b1c5569032a7732c367fb69e5666c8607e" +dependencies = [ + "k256", + "solana-define-syscall 3.0.0", + "thiserror 2.0.17", +] + +[[package]] +name = "solana-seed-derivable" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff7bdb72758e3bec33ed0e2658a920f1f35dfb9ed576b951d20d63cb61ecd95c" +dependencies = [ + "solana-derivation-path", +] + +[[package]] +name = "solana-seed-phrase" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc905b200a95f2ea9146e43f2a7181e3aeb55de6bc12afb36462d00a3c7310de" +dependencies = [ + "hmac", + "pbkdf2", + "sha2", +] + +[[package]] +name = "solana-serde" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "709a93cab694c70f40b279d497639788fc2ccbcf9b4aa32273d4b361322c02dd" +dependencies = [ + "serde", +] + +[[package]] +name = "solana-serde-varint" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e5174c57d5ff3c1995f274d17156964664566e2cde18a07bba1586d35a70d3b" +dependencies = [ + "serde", +] + +[[package]] +name = "solana-serialize-utils" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "468aa43b7edb1f9b7b7b686d5c3aeb6630dc1708e86e31343499dd5c4d775183" +checksum = "56e41dd8feea239516c623a02f0a81c2367f4b604d7965237fed0751aeec33ed" +dependencies = [ + "solana-instruction-error", + "solana-pubkey 3.0.0", + "solana-sanitize 3.0.1", +] [[package]] name = "solana-sha256-hasher" @@ -6490,64 +7137,261 @@ version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5aa3feb32c28765f6aa1ce8f3feac30936f16c5c3f7eb73d63a5b8f6f8ecdc44" dependencies = [ - "sha2 0.10.9", - "solana-define-syscall", - "solana-hash", + "sha2", + "solana-define-syscall 2.3.0", + "solana-hash 2.3.0", +] + +[[package]] +name = "solana-sha256-hasher" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9b912ba6f71cb202c0c3773ec77bf898fa9fe0c78691a2d6859b3b5b8954719" +dependencies = [ + "sha2", + "solana-define-syscall 3.0.0", + "solana-hash 3.0.0", +] + +[[package]] +name = "solana-short-vec" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b69d029da5428fc1c57f7d49101b2077c61f049d4112cd5fb8456567cc7d2638" +dependencies = [ + "serde", +] + +[[package]] +name = "solana-shred-version" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94953e22ca28fe4541a3447d6baeaf519cc4ddc063253bfa673b721f34c136bb" +dependencies = [ + "solana-hard-forks", + "solana-hash 3.0.0", + "solana-sha256-hasher 3.0.0", +] + +[[package]] +name = "solana-signature" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bb8057cc0e9f7b5e89883d49de6f407df655bb6f3a71d0b7baf9986a2218fd9" +dependencies = [ + "ed25519-dalek", + "five8", + "rand 0.8.5", + "serde", + "serde-big-array", + "serde_derive", + "solana-sanitize 3.0.1", +] + +[[package]] +name = "solana-signer" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5bfea97951fee8bae0d6038f39a5efcb6230ecdfe33425ac75196d1a1e3e3235" +dependencies = [ + "solana-pubkey 3.0.0", + "solana-signature", + "solana-transaction-error", +] + +[[package]] +name = "solana-slot-hashes" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80a293f952293281443c04f4d96afd9d547721923d596e92b4377ed2360f1746" +dependencies = [ + "serde", + "serde_derive", + "solana-hash 3.0.0", + "solana-sdk-ids", + "solana-sysvar-id", +] + +[[package]] +name = "solana-slot-history" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f914f6b108f5bba14a280b458d023e3621c9973f27f015a4d755b50e88d89e97" +dependencies = [ + "bv", + "serde", + "serde_derive", + "solana-sdk-ids", + "solana-sysvar-id", +] + +[[package]] +name = "solana-stable-layout" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1da74507795b6e8fb60b7c7306c0c36e2c315805d16eaaf479452661234685ac" +dependencies = [ + "solana-instruction", + "solana-pubkey 3.0.0", +] + +[[package]] +name = "solana-stake-interface" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6f912ae679b683365348dea482dbd9468d22ff258b554fd36e3d3683c2122e3" +dependencies = [ + "num-traits", + "serde", + "serde_derive", + "solana-clock", + "solana-cpi", + "solana-instruction", + "solana-program-error", + "solana-pubkey 3.0.0", + "solana-system-interface", + "solana-sysvar", + "solana-sysvar-id", ] [[package]] name = "solana-streamer" -version = "1.18.26" +version = "3.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8476e41ad94fe492e8c06697ee35912cf3080aae0c9e9ac6430835256ccf056" +checksum = "79c50b3b9e5f230f18ba729a266ec0e872926e317c1a8da0cfbc030c6f5a204c" dependencies = [ + "arc-swap", "async-channel 1.9.0", "bytes", "crossbeam-channel", + "dashmap", + "futures", "futures-util", + "governor", "histogram", "indexmap 2.12.0", - "itertools 0.10.5", + "itertools 0.12.1", "libc", "log", "nix", + "num_cpus", "pem 1.1.1", "percentage", - "pkcs8", "quinn", "quinn-proto", "rand 0.8.5", - "rcgen", - "rustls 0.21.12", + "rustls 0.23.34", "smallvec", + "socket2 0.6.1", + "solana-keypair", + "solana-measure", "solana-metrics", + "solana-net-utils", + "solana-packet", "solana-perf", - "solana-sdk", - "thiserror 1.0.69", + "solana-pubkey 3.0.0", + "solana-quic-definitions", + "solana-signature", + "solana-signer", + "solana-time-utils", + "solana-tls-utils", + "solana-transaction-error", + "solana-transaction-metrics-tracker", + "thiserror 2.0.17", "tokio", + "tokio-util", "x509-parser", ] [[package]] -name = "solana-thin-client" -version = "1.18.26" +name = "solana-svm-feature-set" +version = "3.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c67a4a533a53811f1e31829374d5ab0761e6b4180c7145d69b5c62ab4a9a24af" + +[[package]] +name = "solana-system-interface" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e1790547bfc3061f1ee68ea9d8dc6c973c02a163697b24263a8e9f2e6d4afa2" +dependencies = [ + "num-traits", + "serde", + "serde_derive", + "solana-instruction", + "solana-msg", + "solana-program-error", + "solana-pubkey 3.0.0", +] + +[[package]] +name = "solana-sysvar" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "63205e68d680bcc315337dec311b616ab32fea0a612db3b883ce4de02e0953f9" +dependencies = [ + "base64 0.22.1", + "bincode", + "bytemuck", + "bytemuck_derive", + "lazy_static", + "serde", + "serde_derive", + "solana-account-info", + "solana-clock", + "solana-define-syscall 3.0.0", + "solana-epoch-rewards", + "solana-epoch-schedule", + "solana-fee-calculator", + "solana-hash 3.0.0", + "solana-instruction", + "solana-last-restart-slot", + "solana-program-entrypoint", + "solana-program-error", + "solana-program-memory", + "solana-pubkey 3.0.0", + "solana-rent", + "solana-sdk-ids", + "solana-sdk-macro", + "solana-slot-hashes", + "solana-slot-history", + "solana-sysvar-id", +] + +[[package]] +name = "solana-sysvar-id" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5051bc1a16d5d96a96bc33b5b2ec707495c48fe978097bdaba68d3c47987eb32" +dependencies = [ + "solana-pubkey 3.0.0", + "solana-sdk-ids", +] + +[[package]] +name = "solana-time-utils" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ced92c60aa76ec4780a9d93f3bd64dfa916e1b998eacc6f1c110f3f444f02c9" + +[[package]] +name = "solana-tls-utils" +version = "3.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8c02245d0d232430e79dc0d624aa42d50006097c3aec99ac82ac299eaa3a73f" +checksum = "4b3cf5ccc8e890e2f22ca194402b8e2039c884605abe1c3a71ec85ccb8fecdec" dependencies = [ - "bincode", - "log", - "rayon", - "solana-connection-cache", - "solana-rpc-client", - "solana-rpc-client-api", - "solana-sdk", + "rustls 0.23.34", + "solana-keypair", + "solana-pubkey 3.0.0", + "solana-signer", + "x509-parser", ] [[package]] name = "solana-tpu-client" -version = "1.18.26" +version = "3.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67251506ed03de15f1347b46636b45c47da6be75015b4a13f0620b21beb00566" +checksum = "ca9ea8a8ad7be6c899cfcf4890379c8041e734e632f31175b9331f0964defb17" dependencies = [ "async-trait", "bincode", @@ -6556,143 +7400,258 @@ dependencies = [ "indicatif", "log", "rayon", + "solana-client-traits", + "solana-clock", + "solana-commitment-config", "solana-connection-cache", + "solana-epoch-schedule", "solana-measure", - "solana-metrics", + "solana-message", + "solana-net-utils", + "solana-pubkey 3.0.0", "solana-pubsub-client", + "solana-quic-definitions", "solana-rpc-client", "solana-rpc-client-api", - "solana-sdk", - "thiserror 1.0.69", + "solana-signature", + "solana-signer", + "solana-transaction", + "solana-transaction-error", + "thiserror 2.0.17", "tokio", ] +[[package]] +name = "solana-transaction" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64928e6af3058dcddd6da6680cbe08324b4e071ad73115738235bbaa9e9f72a5" +dependencies = [ + "bincode", + "serde", + "serde_derive", + "solana-address", + "solana-hash 3.0.0", + "solana-instruction", + "solana-instruction-error", + "solana-message", + "solana-sanitize 3.0.1", + "solana-sdk-ids", + "solana-short-vec", + "solana-signature", + "solana-signer", + "solana-transaction-error", +] + +[[package]] +name = "solana-transaction-context" +version = "3.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a81e203a134fb6de363aa5c8b5faf7e7b27719b9fb5711c7e91a28bdffbe58ed" +dependencies = [ + "bincode", + "serde", + "serde_derive", + "solana-account", + "solana-instruction", + "solana-instructions-sysvar", + "solana-pubkey 3.0.0", + "solana-rent", + "solana-sbpf", + "solana-sdk-ids", +] + +[[package]] +name = "solana-transaction-error" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4222065402340d7e6aec9dc3e54d22992ddcf923d91edcd815443c2bfca3144a" +dependencies = [ + "serde", + "serde_derive", + "solana-instruction-error", + "solana-sanitize 3.0.1", +] + +[[package]] +name = "solana-transaction-metrics-tracker" +version = "3.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "729db9e09657aec3922fb09fa7549912f7cb4de5845317ebb738caa4560369cd" +dependencies = [ + "base64 0.22.1", + "bincode", + "log", + "rand 0.8.5", + "solana-packet", + "solana-perf", + "solana-short-vec", + "solana-signature", +] + [[package]] name = "solana-transaction-status" -version = "1.18.26" +version = "3.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d3d36db1b2ab2801afd5482aad9fb15ed7959f774c81a77299fdd0ddcf839d4" +checksum = "22425e57cda6b78da1644230d4625bfb2a32c4fb12f011436fa3be441752d502" dependencies = [ "Inflector", - "base64 0.21.7", + "agave-reserved-account-keys", + "base64 0.22.1", "bincode", - "borsh 0.10.4", - "bs58 0.4.0", - "lazy_static", + "borsh 1.5.7", + "bs58 0.5.1", "log", "serde", "serde_derive", "serde_json", "solana-account-decoder", - "solana-sdk", - "spl-associated-token-account", - "spl-memo", - "spl-token", - "spl-token-2022", - "thiserror 1.0.69", + "solana-address-lookup-table-interface", + "solana-clock", + "solana-hash 3.0.0", + "solana-instruction", + "solana-loader-v2-interface", + "solana-loader-v3-interface", + "solana-message", + "solana-program-option", + "solana-pubkey 3.0.0", + "solana-reward-info", + "solana-sdk-ids", + "solana-signature", + "solana-stake-interface", + "solana-system-interface", + "solana-transaction", + "solana-transaction-error", + "solana-transaction-status-client-types", + "solana-vote-interface", + "spl-associated-token-account-interface", + "spl-memo-interface", + "spl-token-2022-interface", + "spl-token-group-interface", + "spl-token-interface", + "spl-token-metadata-interface", + "thiserror 2.0.17", +] + +[[package]] +name = "solana-transaction-status-client-types" +version = "3.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba6ccc4c0bad50ebd910936e113b4fb9872f33cb17c896c5b02c005f91caa131" +dependencies = [ + "base64 0.22.1", + "bincode", + "bs58 0.5.1", + "serde", + "serde_derive", + "serde_json", + "solana-account-decoder-client-types", + "solana-commitment-config", + "solana-instruction", + "solana-message", + "solana-pubkey 3.0.0", + "solana-reward-info", + "solana-signature", + "solana-transaction", + "solana-transaction-context", + "solana-transaction-error", + "thiserror 2.0.17", ] [[package]] name = "solana-udp-client" -version = "1.18.26" +version = "3.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a754a3c2265eb02e0c35aeaca96643951f03cee6b376afe12e0cf8860ffccd1" +checksum = "3acc1f343c1ebe61ca501ba6f3f413056f5a8ceddd5a6b6d729e5d421ba0976a" dependencies = [ "async-trait", "solana-connection-cache", + "solana-keypair", "solana-net-utils", - "solana-sdk", "solana-streamer", - "thiserror 1.0.69", + "solana-transaction-error", + "thiserror 2.0.17", "tokio", ] [[package]] name = "solana-version" -version = "1.18.26" +version = "3.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f44776bd685cc02e67ba264384acc12ef2931d01d1a9f851cb8cdbd3ce455b9e" +checksum = "3918648ecc0e8446c20a02aab2253b2e91ce8baf0af16f141292e6732778d4f1" dependencies = [ - "log", - "rustc_version", + "agave-feature-set", + "rand 0.8.5", "semver", "serde", "serde_derive", - "solana-frozen-abi", - "solana-frozen-abi-macro", - "solana-sdk", + "solana-sanitize 3.0.1", + "solana-serde-varint", ] [[package]] -name = "solana-vote-program" -version = "1.18.26" +name = "solana-vote-interface" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25810970c91feb579bd3f67dca215fce971522e42bfd59696af89c5dfebd997c" +checksum = "66631ddbe889dab5ec663294648cd1df395ec9df7a4476e7b3e095604cfdb539" dependencies = [ "bincode", - "log", - "num-derive 0.4.2", + "cfg_eval", + "num-derive", "num-traits", - "rustc_version", "serde", "serde_derive", - "solana-frozen-abi", - "solana-frozen-abi-macro", - "solana-metrics", - "solana-program", - "solana-program-runtime", - "solana-sdk", - "thiserror 1.0.69", + "serde_with", + "solana-clock", + "solana-hash 3.0.0", + "solana-instruction", + "solana-instruction-error", + "solana-pubkey 3.0.0", + "solana-rent", + "solana-sdk-ids", + "solana-serde-varint", + "solana-serialize-utils", + "solana-short-vec", + "solana-system-interface", ] [[package]] -name = "solana-zk-token-sdk" -version = "1.18.26" +name = "solana-zk-sdk" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cbdf4249b6dfcbba7d84e2b53313698043f60f8e22ce48286e6fbe8a17c8d16" +checksum = "9602bcb1f7af15caef92b91132ec2347e1c51a72ecdbefdaefa3eac4b8711475" dependencies = [ "aes-gcm-siv", - "base64 0.21.7", + "base64 0.22.1", "bincode", "bytemuck", - "byteorder", - "curve25519-dalek 3.2.1", - "getrandom 0.1.16", - "itertools 0.10.5", - "lazy_static", + "bytemuck_derive", + "curve25519-dalek", + "getrandom 0.2.16", + "itertools 0.12.1", + "js-sys", "merlin", - "num-derive 0.4.2", + "num-derive", "num-traits", - "rand 0.7.3", + "rand 0.8.5", "serde", + "serde_derive", "serde_json", - "sha3 0.9.1", - "solana-program", - "solana-sdk", + "sha3", + "solana-derivation-path", + "solana-instruction", + "solana-pubkey 3.0.0", + "solana-sdk-ids", + "solana-seed-derivable", + "solana-seed-phrase", + "solana-signature", + "solana-signer", "subtle", - "thiserror 1.0.69", + "thiserror 2.0.17", + "wasm-bindgen", "zeroize", ] -[[package]] -name = "solana_rbpf" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da5d083187e3b3f453e140f292c09186881da8a02a7b5e27f645ee26de3d9cc5" -dependencies = [ - "byteorder", - "combine", - "goblin", - "hash32", - "libc", - "log", - "rand 0.8.5", - "rustc-demangle", - "scroll", - "thiserror 1.0.69", - "winapi", -] - [[package]] name = "spin" version = "0.5.2" @@ -6708,48 +7667,53 @@ dependencies = [ "lock_api", ] +[[package]] +name = "spinning_top" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d96d2d1d716fb500937168cc09353ffdc7a012be8475ac7308e1bdf0e3923300" +dependencies = [ + "lock_api", +] + [[package]] name = "spki" -version = "0.5.4" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d01ac02a6ccf3e07db148d2be087da624fea0221a16152ed01f0496a6b0a27" +checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" dependencies = [ "base64ct", "der", ] [[package]] -name = "spl-associated-token-account" -version = "2.3.0" +name = "spl-associated-token-account-interface" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "992d9c64c2564cc8f63a4b508bf3ebcdf2254b0429b13cd1d31adb6162432a5f" +checksum = "e6433917b60441d68d99a17e121d9db0ea15a9a69c0e5afa34649cf5ba12612f" dependencies = [ - "assert_matches", - "borsh 0.10.4", - "num-derive 0.4.2", - "num-traits", - "solana-program", - "spl-token", - "spl-token-2022", - "thiserror 1.0.69", + "borsh 1.5.7", + "solana-instruction", + "solana-pubkey 3.0.0", ] [[package]] name = "spl-discriminator" -version = "0.1.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cce5d563b58ef1bb2cdbbfe0dfb9ffdc24903b10ae6a4df2d8f425ece375033f" +checksum = "d48cc11459e265d5b501534144266620289720b4c44522a47bc6b63cd295d2f3" dependencies = [ "bytemuck", - "solana-program", + "solana-program-error", + "solana-sha256-hasher 3.0.0", "spl-discriminator-derive", ] [[package]] name = "spl-discriminator-derive" -version = "0.1.2" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07fd7858fc4ff8fb0e34090e41d7eb06a823e1057945c26d480bfc21d2338a93" +checksum = "d9e8418ea6269dcfb01c712f0444d2c75542c04448b480e87de59d2865edc750" dependencies = [ "quote", "spl-discriminator-syn", @@ -6758,171 +7722,188 @@ dependencies = [ [[package]] name = "spl-discriminator-syn" -version = "0.1.2" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18fea7be851bd98d10721782ea958097c03a0c2a07d8d4997041d0ece6319a63" +checksum = "5d1dbc82ab91422345b6df40a79e2b78c7bce1ebb366da323572dd60b7076b67" dependencies = [ "proc-macro2", "quote", - "sha2 0.10.9", + "sha2", "syn 2.0.108", "thiserror 1.0.69", ] [[package]] -name = "spl-memo" -version = "4.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0f180b03318c3dbab3ef4e1e4d46d5211ae3c780940dd0a28695aba4b59a75a" -dependencies = [ - "solana-program", -] - -[[package]] -name = "spl-pod" -version = "0.1.0" +name = "spl-generic-token" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2881dddfca792737c0706fa0175345ab282b1b0879c7d877bad129645737c079" +checksum = "233df81b75ab99b42f002b5cdd6e65a7505ffa930624f7096a7580a56765e9cf" dependencies = [ - "borsh 0.10.4", "bytemuck", - "solana-program", - "solana-zk-token-sdk", - "spl-program-error", + "solana-pubkey 3.0.0", ] [[package]] -name = "spl-program-error" -version = "0.3.0" +name = "spl-memo-interface" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "249e0318493b6bcf27ae9902600566c689b7dfba9f1bdff5893e92253374e78c" +checksum = "3d4e2aedd58f858337fa609af5ad7100d4a243fdaf6a40d6eb4c28c5f19505d3" dependencies = [ - "num-derive 0.4.2", - "num-traits", - "solana-program", - "spl-program-error-derive", - "thiserror 1.0.69", + "solana-instruction", + "solana-pubkey 3.0.0", ] [[package]] -name = "spl-program-error-derive" -version = "0.3.2" +name = "spl-pod" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1845dfe71fd68f70382232742e758557afe973ae19e6c06807b2c30f5d5cb474" +checksum = "b1233fdecd7461611d69bb87bc2e95af742df47291975d21232a0be8217da9de" dependencies = [ - "proc-macro2", - "quote", - "sha2 0.10.9", - "syn 2.0.108", + "borsh 1.5.7", + "bytemuck", + "bytemuck_derive", + "num-derive", + "num-traits", + "num_enum", + "solana-program-error", + "solana-program-option", + "solana-pubkey 3.0.0", + "solana-zk-sdk", + "thiserror 2.0.17", ] [[package]] -name = "spl-tlv-account-resolution" -version = "0.5.1" +name = "spl-token-2022-interface" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "615d381f48ddd2bb3c57c7f7fb207591a2a05054639b18a62e785117dd7a8683" +checksum = "0888304af6b3d839e435712e6c84025e09513017425ff62045b6b8c41feb77d9" dependencies = [ + "arrayref", "bytemuck", - "solana-program", - "spl-discriminator", + "num-derive", + "num-traits", + "num_enum", + "solana-account-info", + "solana-instruction", + "solana-program-error", + "solana-program-option", + "solana-program-pack", + "solana-pubkey 3.0.0", + "solana-sdk-ids", + "solana-zk-sdk", "spl-pod", - "spl-program-error", + "spl-token-confidential-transfer-proof-extraction", + "spl-token-confidential-transfer-proof-generation", + "spl-token-group-interface", + "spl-token-metadata-interface", "spl-type-length-value", + "thiserror 2.0.17", ] [[package]] -name = "spl-token" -version = "4.0.0" +name = "spl-token-confidential-transfer-proof-extraction" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08459ba1b8f7c1020b4582c4edf0f5c7511a5e099a7a97570c9698d4f2337060" +checksum = "7a22217af69b7a61ca813f47c018afb0b00b02a74a4c70ff099cd4287740bc3d" dependencies = [ - "arrayref", "bytemuck", - "num-derive 0.3.3", - "num-traits", - "num_enum 0.6.1", - "solana-program", - "thiserror 1.0.69", + "solana-account-info", + "solana-curve25519", + "solana-instruction", + "solana-instructions-sysvar", + "solana-msg", + "solana-program-error", + "solana-pubkey 3.0.0", + "solana-sdk-ids", + "solana-zk-sdk", + "spl-pod", + "thiserror 2.0.17", ] [[package]] -name = "spl-token-2022" -version = "1.0.0" +name = "spl-token-confidential-transfer-proof-generation" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d697fac19fd74ff472dfcc13f0b442dd71403178ce1de7b5d16f83a33561c059" +checksum = "f63a2b41095945dc15274b924b21ccae9b3ec9dc2fdd43dbc08de8c33bbcd915" dependencies = [ - "arrayref", - "bytemuck", - "num-derive 0.4.2", - "num-traits", - "num_enum 0.7.5", - "solana-program", - "solana-security-txt", - "solana-zk-token-sdk", - "spl-memo", - "spl-pod", - "spl-token", - "spl-token-group-interface", - "spl-token-metadata-interface", - "spl-transfer-hook-interface", - "spl-type-length-value", - "thiserror 1.0.69", + "curve25519-dalek", + "solana-zk-sdk", + "thiserror 2.0.17", ] [[package]] name = "spl-token-group-interface" -version = "0.1.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b889509d49fa74a4a033ca5dae6c2307e9e918122d97e58562f5c4ffa795c75d" +checksum = "452d0f758af20caaa10d9a6f7608232e000d4c74462f248540b3d2ddfa419776" dependencies = [ "bytemuck", - "solana-program", + "num-derive", + "num-traits", + "num_enum", + "solana-instruction", + "solana-program-error", + "solana-pubkey 3.0.0", "spl-discriminator", "spl-pod", - "spl-program-error", + "thiserror 2.0.17", ] [[package]] -name = "spl-token-metadata-interface" -version = "0.2.0" +name = "spl-token-interface" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c16ce3ba6979645fb7627aa1e435576172dd63088dc7848cb09aa331fa1fe4f" +checksum = "8c564ac05a7c8d8b12e988a37d82695b5ba4db376d07ea98bc4882c81f96c7f3" dependencies = [ - "borsh 0.10.4", - "solana-program", - "spl-discriminator", - "spl-pod", - "spl-program-error", - "spl-type-length-value", + "arrayref", + "bytemuck", + "num-derive", + "num-traits", + "num_enum", + "solana-instruction", + "solana-program-error", + "solana-program-option", + "solana-program-pack", + "solana-pubkey 3.0.0", + "solana-sdk-ids", + "thiserror 2.0.17", ] [[package]] -name = "spl-transfer-hook-interface" -version = "0.4.1" +name = "spl-token-metadata-interface" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7aabdb7c471566f6ddcee724beb8618449ea24b399e58d464d6b5bc7db550259" +checksum = "9c467c7c3bd056f8fe60119e7ec34ddd6f23052c2fa8f1f51999098063b72676" dependencies = [ - "arrayref", - "bytemuck", - "solana-program", + "borsh 1.5.7", + "num-derive", + "num-traits", + "solana-borsh", + "solana-instruction", + "solana-program-error", + "solana-pubkey 3.0.0", "spl-discriminator", "spl-pod", - "spl-program-error", - "spl-tlv-account-resolution", "spl-type-length-value", + "thiserror 2.0.17", ] [[package]] name = "spl-type-length-value" -version = "0.3.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a468e6f6371f9c69aae760186ea9f1a01c2908351b06a5e0026d21cfc4d7ecac" +checksum = "ca20a1a19f4507a98ca4b28ff5ed54cac9b9d34ed27863e2bde50a3238f9a6ac" dependencies = [ "bytemuck", - "solana-program", + "num-derive", + "num-traits", + "num_enum", + "solana-account-info", + "solana-msg", + "solana-program-error", "spl-discriminator", "spl-pod", - "spl-program-error", + "thiserror 2.0.17", ] [[package]] @@ -6973,7 +7954,7 @@ dependencies = [ "hashlink", "hex", "hkdf", - "hmac 0.12.1", + "hmac", "indexmap 1.9.3", "itoa", "libc", @@ -6988,11 +7969,11 @@ dependencies = [ "rand 0.8.5", "rust_decimal", "rustls 0.20.9", - "rustls-pemfile 1.0.4", + "rustls-pemfile", "serde", "serde_json", "sha1", - "sha2 0.10.9", + "sha2", "smallvec", "sqlformat", "sqlx-rt", @@ -7021,7 +8002,7 @@ dependencies = [ "quote", "serde", "serde_json", - "sha2 0.10.9", + "sha2", "sqlx-core", "sqlx-rt", "syn 1.0.109", @@ -7062,12 +8043,6 @@ dependencies = [ "unicode-properties", ] -[[package]] -name = "strsim" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" - [[package]] name = "strsim" version = "0.10.0" @@ -7082,9 +8057,9 @@ checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "subtle" -version = "2.4.1" +version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "syn" @@ -7114,6 +8089,15 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" +[[package]] +name = "sync_wrapper" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263" +dependencies = [ + "futures-core", +] + [[package]] name = "synstructure" version = "0.12.6" @@ -7139,13 +8123,24 @@ dependencies = [ [[package]] name = "system-configuration" -version = "0.5.1" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" +dependencies = [ + "bitflags 1.3.2", + "core-foundation 0.9.4", + "system-configuration-sys 0.5.0", +] + +[[package]] +name = "system-configuration" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" +checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b" dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "system-configuration-sys", + "bitflags 2.10.0", + "core-foundation 0.9.4", + "system-configuration-sys 0.6.0", ] [[package]] @@ -7158,6 +8153,16 @@ dependencies = [ "libc", ] +[[package]] +name = "system-configuration-sys" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e1d1b10ced5ca923a1fcb8d03e96b8d3268065d724548c0211415ff6ac6bac4" +dependencies = [ + "core-foundation-sys", + "libc", +] + [[package]] name = "tap" version = "1.0.1" @@ -7186,15 +8191,6 @@ dependencies = [ "winapi-util", ] -[[package]] -name = "textwrap" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -dependencies = [ - "unicode-width 0.1.14", -] - [[package]] name = "textwrap" version = "0.16.2" @@ -7281,25 +8277,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 1.0.69", - "unicode-normalization", - "wasm-bindgen", - "zeroize", -] - [[package]] name = "tiny-keccak" version = "2.0.2" @@ -7351,16 +8328,6 @@ dependencies = [ "windows-sys 0.61.2", ] -[[package]] -name = "tokio-io-timeout" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bd86198d9ee903fedd2f9a2e72014287c0d9167e4ae43b5853007205dda1b76" -dependencies = [ - "pin-project-lite", - "tokio", -] - [[package]] name = "tokio-macros" version = "2.6.0" @@ -7403,6 +8370,16 @@ dependencies = [ "tokio", ] +[[package]] +name = "tokio-rustls" +version = "0.26.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1729aa945f29d91ba541258c8df89027d5792d85a8841fb65e8bf0f4ede4ef61" +dependencies = [ + "rustls 0.23.34", + "tokio", +] + [[package]] name = "tokio-stream" version = "0.1.17" @@ -7412,6 +8389,7 @@ dependencies = [ "futures-core", "pin-project-lite", "tokio", + "tokio-util", ] [[package]] @@ -7501,59 +8479,87 @@ dependencies = [ [[package]] name = "tonic" -version = "0.10.2" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d560933a0de61cf715926b9cac824d4c883c2c43142f787595e48280c40a1d0e" +checksum = "eb7613188ce9f7df5bfe185db26c5814347d110db17920415cf2fbcad85e7203" dependencies = [ - "async-stream", "async-trait", "axum", - "base64 0.21.7", + "base64 0.22.1", "bytes", - "h2 0.3.27", - "http 0.2.12", - "http-body 0.4.6", - "hyper 0.14.32", + "flate2", + "h2 0.4.12", + "http 1.3.1", + "http-body 1.0.1", + "http-body-util", + "hyper 1.7.0", "hyper-timeout", + "hyper-util", "percent-encoding", "pin-project", - "prost", - "rustls 0.21.12", "rustls-native-certs", - "rustls-pemfile 1.0.4", + "socket2 0.6.1", + "sync_wrapper 1.0.2", "tokio", - "tokio-rustls 0.24.1", + "tokio-rustls 0.26.4", "tokio-stream", - "tower", + "tower 0.5.2", "tower-layer", "tower-service", "tracing", + "zstd", ] [[package]] name = "tonic-build" -version = "0.10.2" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d021fc044c18582b9a2408cd0dd05b1596e3ecdb5c4df822bb0183545683889" +checksum = "4c40aaccc9f9eccf2cd82ebc111adc13030d23e887244bc9cfa5d1d636049de3" dependencies = [ "prettyplease", "proc-macro2", - "prost-build", "quote", "syn 2.0.108", ] [[package]] name = "tonic-health" -version = "0.10.2" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f80db390246dfb46553481f6024f0082ba00178ea495dbb99e70ba9a4fafb5e1" +checksum = "2a82868bf299e0a1d2e8dce0dc33a46c02d6f045b2c1f1d6cc8dc3d0bf1812ef" dependencies = [ - "async-stream", "prost", "tokio", "tokio-stream", "tonic", + "tonic-prost", +] + +[[package]] +name = "tonic-prost" +version = "0.14.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "66bd50ad6ce1252d87ef024b3d64fe4c3cf54a86fb9ef4c631fdd0ded7aeaa67" +dependencies = [ + "bytes", + "prost", + "tonic", +] + +[[package]] +name = "tonic-prost-build" +version = "0.14.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4a16cba4043dc3ff43fcb3f96b4c5c154c64cbd18ca8dce2ab2c6a451d058a2" +dependencies = [ + "prettyplease", + "proc-macro2", + "prost-build", + "prost-types", + "quote", + "syn 2.0.108", + "tempfile", + "tonic-build", ] [[package]] @@ -7577,6 +8583,25 @@ dependencies = [ "tracing", ] +[[package]] +name = "tower" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9" +dependencies = [ + "futures-core", + "futures-util", + "indexmap 2.12.0", + "pin-project-lite", + "slab", + "sync_wrapper 1.0.2", + "tokio", + "tokio-util", + "tower-layer", + "tower-service", + "tracing", +] + [[package]] name = "tower-http" version = "0.3.5" @@ -7593,20 +8618,38 @@ dependencies = [ "http-body 0.4.6", "http-range-header", "httpdate", - "iri-string", + "iri-string 0.4.1", "mime", "mime_guess", "percent-encoding", "pin-project-lite", "tokio", "tokio-util", - "tower", + "tower 0.4.13", "tower-layer", "tower-service", "tracing", "uuid", ] +[[package]] +name = "tower-http" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adc82fd73de2a9722ac5da747f12383d2bfdb93591ee6c58486e0097890f05f2" +dependencies = [ + "bitflags 2.10.0", + "bytes", + "futures-util", + "http 1.3.1", + "http-body 1.0.1", + "iri-string 0.7.8", + "pin-project-lite", + "tower 0.5.2", + "tower-layer", + "tower-service", +] + [[package]] name = "tower-layer" version = "0.3.3" @@ -7766,12 +8809,6 @@ version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" -[[package]] -name = "unicode-width" -version = "0.1.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" - [[package]] name = "unicode-width" version = "0.2.2" @@ -7790,13 +8827,19 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e" +[[package]] +name = "unit-prefix" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "323402cff2dd658f39ca17c789b502021b3f18707c91cdf22e3838e1b4023817" + [[package]] name = "universal-hash" -version = "0.4.1" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f214e8f697e925001e66ec2c6e37a4ef93f0f78c2eed7814394e10c62025b05" +checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea" dependencies = [ - "generic-array", + "crypto-common", "subtle", ] @@ -7922,12 +8965,6 @@ version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" -[[package]] -name = "vec_map" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" - [[package]] name = "version_check" version = "0.9.5" @@ -7940,6 +8977,16 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" +[[package]] +name = "walkdir" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" +dependencies = [ + "same-file", + "winapi-util", +] + [[package]] name = "want" version = "0.3.1" @@ -7949,12 +8996,6 @@ dependencies = [ "try-lock", ] -[[package]] -name = "wasi" -version = "0.9.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" - [[package]] name = "wasi" version = "0.11.1+wasi-snapshot-preview1" @@ -8077,6 +9118,15 @@ dependencies = [ "untrusted 0.9.0", ] +[[package]] +name = "webpki-root-certs" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05d651ec480de84b762e7be71e6efa7461699c19d9e2c272c8d93455f567786e" +dependencies = [ + "rustls-pki-types", +] + [[package]] name = "webpki-roots" version = "0.22.6" @@ -8092,7 +9142,7 @@ version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b291546d5d9d1eab74f069c77749f2cb8504a12caa20f0f2de93ddbf6f411888" dependencies = [ - "rustls-webpki", + "rustls-webpki 0.101.7", ] [[package]] @@ -8101,6 +9151,15 @@ version = "0.25.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" +[[package]] +name = "webpki-roots" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32b130c0d2d49f8b6889abc456e795e82525204f27c42cf767cf0d7734e089b8" +dependencies = [ + "rustls-pki-types", +] + [[package]] name = "whoami" version = "1.6.1" @@ -8151,9 +9210,9 @@ checksum = "b8e83a14d34d0623b51dce9581199302a221863196a1dde71a7663a4c2be9deb" dependencies = [ "windows-implement", "windows-interface", - "windows-link", - "windows-result", - "windows-strings", + "windows-link 0.2.1", + "windows-result 0.4.1", + "windows-strings 0.5.1", ] [[package]] @@ -8178,19 +9237,54 @@ dependencies = [ "syn 2.0.108", ] +[[package]] +name = "windows-link" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a" + [[package]] name = "windows-link" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5" +[[package]] +name = "windows-registry" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b8a9ed28765efc97bbc954883f4e6796c33a06546ebafacbabee9696967499e" +dependencies = [ + "windows-link 0.1.3", + "windows-result 0.3.4", + "windows-strings 0.4.2", +] + +[[package]] +name = "windows-result" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56f42bd332cc6c8eac5af113fc0c1fd6a8fd2aa08a0119358686e5160d0586c6" +dependencies = [ + "windows-link 0.1.3", +] + [[package]] name = "windows-result" version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7781fa89eaf60850ac3d2da7af8e5242a5ea78d1a11c49bf2910bb5a73853eb5" dependencies = [ - "windows-link", + "windows-link 0.2.1", +] + +[[package]] +name = "windows-strings" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56e6c93f3a0c3b36176cb1327a4958a0353d5d166c2a35cb268ace15e91d3b57" +dependencies = [ + "windows-link 0.1.3", ] [[package]] @@ -8199,7 +9293,16 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7837d08f69c77cf6b07689544538e017c1bfcf57e34b4c0ff58e6c2cd3b37091" dependencies = [ - "windows-link", + "windows-link 0.2.1", +] + +[[package]] +name = "windows-sys" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +dependencies = [ + "windows-targets 0.42.2", ] [[package]] @@ -8244,7 +9347,22 @@ version = "0.61.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc" dependencies = [ - "windows-link", + "windows-link 0.2.1", +] + +[[package]] +name = "windows-targets" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +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]] @@ -8284,7 +9402,7 @@ version = "0.53.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3" dependencies = [ - "windows-link", + "windows-link 0.2.1", "windows_aarch64_gnullvm 0.53.1", "windows_aarch64_msvc 0.53.1", "windows_i686_gnu 0.53.1", @@ -8295,6 +9413,12 @@ dependencies = [ "windows_x86_64_msvc 0.53.1", ] +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" + [[package]] name = "windows_aarch64_gnullvm" version = "0.48.5" @@ -8313,6 +9437,12 @@ version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53" +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" + [[package]] name = "windows_aarch64_msvc" version = "0.48.5" @@ -8331,6 +9461,12 @@ version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006" +[[package]] +name = "windows_i686_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" + [[package]] name = "windows_i686_gnu" version = "0.48.5" @@ -8361,6 +9497,12 @@ version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c" +[[package]] +name = "windows_i686_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" + [[package]] name = "windows_i686_msvc" version = "0.48.5" @@ -8379,6 +9521,12 @@ version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2" +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" + [[package]] name = "windows_x86_64_gnu" version = "0.48.5" @@ -8397,6 +9545,12 @@ version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499" +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" + [[package]] name = "windows_x86_64_gnullvm" version = "0.48.5" @@ -8415,6 +9569,12 @@ version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1" +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" + [[package]] name = "windows_x86_64_msvc" version = "0.48.5" @@ -8461,16 +9621,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "winreg" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5" -dependencies = [ - "cfg-if", - "windows-sys 0.48.0", -] - [[package]] name = "wit-bindgen" version = "0.46.0" @@ -8510,24 +9660,15 @@ dependencies = [ "time", ] -[[package]] -name = "yasna" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e17bb3549cc1321ae1296b9cdc2698e2b6cb1992adfa19a8c72e5b7a738f44cd" -dependencies = [ - "time", -] - [[package]] name = "yellowstone-grpc-client" -version = "1.15.4" +version = "10.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7945d9c2fee7b5bb2da9d472223f693c68448f56183b25cc80b746e9562a81c" +checksum = "a79834bb0660b17e27c32c84778d661fb406f9fe382670ea628f01062b26ae1a" dependencies = [ "bytes", "futures", - "thiserror 1.0.69", + "thiserror 2.0.17", "tonic", "tonic-health", "yellowstone-grpc-proto", @@ -8535,19 +9676,30 @@ dependencies = [ [[package]] name = "yellowstone-grpc-proto" -version = "1.14.2" +version = "10.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4646f98268c421e97e6242b2f3a513b7e886a8fa368d48be015c65c4b6d58de8" +checksum = "9b515077c7db0e9e0dcc506bc6e7bbd6906fcdc3d4978d7039a23a415af4390b" dependencies = [ "anyhow", "bincode", "prost", + "prost-types", "protobuf-src", + "solana-account", "solana-account-decoder", - "solana-sdk", + "solana-clock", + "solana-hash 3.0.0", + "solana-message", + "solana-pubkey 3.0.0", + "solana-signature", + "solana-transaction", + "solana-transaction-context", + "solana-transaction-error", "solana-transaction-status", "tonic", "tonic-build", + "tonic-prost", + "tonic-prost-build", ] [[package]] @@ -8616,9 +9768,9 @@ dependencies = [ [[package]] name = "zeroize" -version = "1.3.0" +version = "1.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4756f7db3f7b5574938c3eb1c117038b8e07f95ee6718c0efad4ac21508f1efd" +checksum = "b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0" dependencies = [ "zeroize_derive", ] @@ -8669,20 +9821,19 @@ dependencies = [ [[package]] name = "zstd" -version = "0.11.2+zstd.1.5.2" +version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4" +checksum = "e91ee311a569c327171651566e07972200e76fcfe2242a4fa446149a3881c08a" dependencies = [ "zstd-safe", ] [[package]] name = "zstd-safe" -version = "5.0.2+zstd.1.5.2" +version = "7.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2a5585e04f9eea4b2a3d1eca508c4dee9592a89ef6f450c11719da0726f4db" +checksum = "8f49c4d5f0abb602a93fb8736af2a4f4dd9512e36f7f570d66e65ff867ed3b9d" dependencies = [ - "libc", "zstd-sys", ] diff --git a/Cargo.toml b/Cargo.toml index 72f4fd0e..d80ea6d7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -73,12 +73,13 @@ sea-orm-migration = { version = "0.10.6", features = [ serde = { version = "1.0.217", features = ["derive"] } serde_json = "1.0.82" -solana-client = "1.18.0" -solana-program = "1.18.0" -solana-sdk = "1.18.0" -solana-pubkey ={ version = "2.3.0", features = ["serde"] } +solana-client = "3.0.8" +solana-sdk = "3.0.0" +solana-pubkey ={ version = "3.0.0", features = ["serde"] } +solana-bn254 = "3.1.2" +solana-commitment-config = "3.0.0" -solana-transaction-status = "1.18.0" +solana-transaction-status = "3.0.8" light-zero-copy = { git = "https://github.com/Lightprotocol/light-protocol", rev = "40736887082f6f879ee73c77005adabd36ead5b6", default-features = false} light-concurrent-merkle-tree = { git = "https://github.com/Lightprotocol/light-protocol", rev = "40736887082f6f879ee73c77005adabd36ead5b6", default-features = false } @@ -120,8 +121,8 @@ utoipa = { version = "4.2.0", features = [ "chrono", "non_strict_integers", ] } -yellowstone-grpc-client = "1.15.0" -yellowstone-grpc-proto = "1.14.0" +yellowstone-grpc-client = "10.1.1" +yellowstone-grpc-proto = "10.1.1" cadence = "1.4.0" async-stream = "0.3.5" rand = "0.8.5" diff --git a/src/api/error.rs b/src/api/error.rs index dd2670b9..1627713a 100644 --- a/src/api/error.rs +++ b/src/api/error.rs @@ -4,8 +4,7 @@ use cadence_macros::statsd_count; use jsonrpsee::core::Error as RpcError; use jsonrpsee::types::error::CallError; use log::error; -use solana_pubkey::ParsePubkeyError as SolanaPubkeyParseError; -use solana_sdk::pubkey::ParsePubkeyError; +use solana_pubkey::ParsePubkeyError; use thiserror::Error; #[derive(Error, Debug, PartialEq, Eq)] @@ -85,12 +84,6 @@ impl From for PhotonApiError { } } -impl From for PhotonApiError { - fn from(_error: SolanaPubkeyParseError) -> Self { - PhotonApiError::UnexpectedError("Invalid public key in database".to_string()) - } -} - fn invalid_request(e: PhotonApiError) -> RpcError { RpcError::Call(CallError::from_std_error(e)) } diff --git a/src/api/method/get_transaction_with_compression_info.rs b/src/api/method/get_transaction_with_compression_info.rs index 8193ca53..3507446c 100644 --- a/src/api/method/get_transaction_with_compression_info.rs +++ b/src/api/method/get_transaction_with_compression_info.rs @@ -14,7 +14,8 @@ use serde::{Deserialize, Serialize}; use solana_client::nonblocking::rpc_client::RpcClient; use solana_client::rpc_config::RpcTransactionConfig; use solana_client::rpc_request::RpcRequest; -use solana_sdk::commitment_config::{CommitmentConfig, CommitmentLevel}; +use solana_commitment_config::CommitmentConfig; +use solana_commitment_config::CommitmentLevel; use solana_transaction_status::{EncodedConfirmedTransactionWithStatusMeta, UiTransactionEncoding}; use std::convert::TryFrom; use utoipa::{ diff --git a/src/api/method/get_validity_proof/prover/gnark.rs b/src/api/method/get_validity_proof/prover/gnark.rs index ed35122d..e15dd53a 100644 --- a/src/api/method/get_validity_proof/prover/gnark.rs +++ b/src/api/method/get_validity_proof/prover/gnark.rs @@ -1,7 +1,7 @@ use crate::api::error::PhotonApiError; use crate::api::method::get_validity_proof::prover::structs::{CompressedProof, ProofABC}; use ark_serialize::{CanonicalDeserialize, CanonicalSerialize, Compress, Validate}; -use solana_program::alt_bn128::compression::prelude::{ +use solana_bn254::compression::prelude::{ alt_bn128_g1_compress, alt_bn128_g2_compress, convert_endianness, }; use std::ops::Neg; diff --git a/src/common/mod.rs b/src/common/mod.rs index ac9942ae..a25b22cd 100644 --- a/src/common/mod.rs +++ b/src/common/mod.rs @@ -6,7 +6,7 @@ use cadence_macros::set_global_default; use clap::{Parser, ValueEnum}; use sea_orm::{DatabaseBackend, DatabaseConnection, SqlxPostgresConnector}; use solana_client::{nonblocking::rpc_client::RpcClient, rpc_config::RpcBlockConfig}; -use solana_sdk::commitment_config::CommitmentConfig; +use solana_commitment_config::CommitmentConfig; use solana_transaction_status::{TransactionDetails, UiTransactionEncoding}; use sqlx::{ postgres::{PgConnectOptions, PgPoolOptions}, diff --git a/src/ingester/fetchers/poller.rs b/src/ingester/fetchers/poller.rs index 729d20e5..171eb67c 100644 --- a/src/ingester/fetchers/poller.rs +++ b/src/ingester/fetchers/poller.rs @@ -10,7 +10,7 @@ use solana_client::{ nonblocking::rpc_client::RpcClient, rpc_config::RpcBlockConfig, rpc_request::RpcError, }; -use solana_sdk::commitment_config::CommitmentConfig; +use solana_commitment_config::CommitmentConfig; use solana_transaction_status::{TransactionDetails, UiTransactionEncoding}; use crate::{ @@ -123,7 +123,7 @@ pub async fn fetch_block_with_infinite_retries( Err(e) => { if let solana_client::client_error::ClientErrorKind::RpcError( RpcError::RpcResponseError { code, .. }, - ) = e.kind + ) = *e.kind { if SKIPPED_BLOCK_ERRORS.contains(&code) { metric! { diff --git a/src/migration/migrations/custom/custom20250211_000002_solayer2.rs b/src/migration/migrations/custom/custom20250211_000002_solayer2.rs index f4840c9c..f66725da 100644 --- a/src/migration/migrations/custom/custom20250211_000002_solayer2.rs +++ b/src/migration/migrations/custom/custom20250211_000002_solayer2.rs @@ -1,6 +1,6 @@ use sea_orm_migration::prelude::*; use sea_orm_migration::sea_orm::{ConnectionTrait, DatabaseBackend, Statement}; -use solana_program::pubkey::Pubkey; +use solana_pubkey::Pubkey; use std::str::FromStr; use crate::migration::model::table::Accounts; diff --git a/tests/integration_tests/utils.rs b/tests/integration_tests/utils.rs index 73273f1a..19c24e29 100644 --- a/tests/integration_tests/utils.rs +++ b/tests/integration_tests/utils.rs @@ -34,13 +34,11 @@ pub use rstest::rstest; use solana_client::{ nonblocking::rpc_client::RpcClient, rpc_config::RpcTransactionConfig, rpc_request::RpcRequest, }; +use solana_commitment_config::CommitmentConfig; +use solana_commitment_config::CommitmentLevel; use solana_sdk::account::Account as SolanaAccount; use solana_sdk::pubkey::Pubkey; -use solana_sdk::{ - clock::Slot, - commitment_config::{CommitmentConfig, CommitmentLevel}, - signature::Signature, -}; +use solana_sdk::{clock::Slot, signature::Signature}; use solana_transaction_status::{ EncodedConfirmedTransactionWithStatusMeta, UiConfirmedBlock, UiTransactionEncoding, }; From 2a96aee9f2106025f51551d7d65b125d7c294b04 Mon Sep 17 00:00:00 2001 From: ananas Date: Fri, 31 Oct 2025 17:22:38 +0000 Subject: [PATCH 07/10] chore: bump solana crate versions to 3.*, replace solana sdk and program imports with direct imports --- Cargo.lock | 408 +----------------- Cargo.toml | 7 +- src/api/method/utils.rs | 2 +- src/common/typedefs/hash.rs | 2 +- src/common/typedefs/serializable_signature.rs | 2 +- src/ingester/fetchers/grpc.rs | 4 +- .../parser/merkle_tree_events_parser.rs | 2 +- src/ingester/parser/state_update.rs | 4 +- src/ingester/parser/tree_info.rs | 2 +- src/ingester/parser/tx_event_parser.rs | 2 +- src/ingester/parser/tx_event_parser_v2.rs | 2 +- src/ingester/persist/mod.rs | 2 +- .../persist/persisted_indexed_merkle_tree.rs | 2 +- src/ingester/typedefs/block_info.rs | 10 +- .../custom/custom20252201_000001_init.rs | 2 +- src/monitor/mod.rs | 4 +- src/monitor/queue_hash_cache.rs | 2 +- src/monitor/queue_monitor.rs | 2 +- src/monitor/tree_metadata_sync.rs | 4 +- .../batched_state_tree_tests.rs | 2 +- tests/integration_tests/e2e_tests.rs | 2 +- tests/integration_tests/monitor_tests.rs | 2 +- tests/integration_tests/utils.rs | 7 +- 23 files changed, 56 insertions(+), 422 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d96cada2..2aee0051 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -840,12 +840,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "base16ct" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf" - [[package]] name = "base64" version = "0.12.3" @@ -1589,18 +1583,6 @@ version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5" -[[package]] -name = "crypto-bigint" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76" -dependencies = [ - "generic-array", - "rand_core 0.6.4", - "subtle", - "zeroize", -] - [[package]] name = "crypto-common" version = "0.1.6" @@ -1771,7 +1753,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ "block-buffer 0.10.4", - "const-oid", "crypto-common", "subtle", ] @@ -1872,20 +1853,6 @@ version = "0.15.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b" -[[package]] -name = "ecdsa" -version = "0.16.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee27f32b5c5292967d2d4a9d7f1e0b0aed2c15daded5a60300e4abb9d8020bca" -dependencies = [ - "der", - "digest 0.10.7", - "elliptic-curve", - "rfc6979", - "signature", - "spki", -] - [[package]] name = "ed25519" version = "2.2.3" @@ -1911,18 +1878,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "ed25519-dalek-bip32" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b49a684b133c4980d7ee783936af771516011c8cd15f429dbda77245e282f03" -dependencies = [ - "derivation-path", - "ed25519-dalek", - "hmac", - "sha2", -] - [[package]] name = "educe" version = "0.6.0" @@ -1944,25 +1899,6 @@ dependencies = [ "serde", ] -[[package]] -name = "elliptic-curve" -version = "0.13.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6043086bf7973472e0c7dff2142ea0b680d30e18d9cc40f267efbf222bd47" -dependencies = [ - "base16ct", - "crypto-bigint", - "digest 0.10.7", - "ff", - "generic-array", - "group", - "pkcs8", - "rand_core 0.6.4", - "sec1", - "subtle", - "zeroize", -] - [[package]] name = "encode_unicode" version = "1.0.0" @@ -2050,7 +1986,7 @@ dependencies = [ "getrandom 0.3.4", "libm", "rand 0.9.2", - "siphasher 1.0.1", + "siphasher", ] [[package]] @@ -2065,16 +2001,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "835a3dc7d1ec9e75e2b5fb4ba75396837112d2060b03f7d43bc1897c7f7211da" -[[package]] -name = "ff" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0b50bfb653653f9ca9095b427bed08ab8d75a137839d9ad64eb11810d5b6393" -dependencies = [ - "rand_core 0.6.4", - "subtle", -] - [[package]] name = "fiat-crypto" version = "0.2.9" @@ -2113,9 +2039,9 @@ checksum = "2551bf44bc5f776c15044b9b94153a00198be06743e262afaaa61f11ac7523a5" [[package]] name = "fixedbitset" -version = "0.4.2" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" +checksum = "1d674e81391d1e1ab681a28d99df07927c6d4aa5b027d7da16ba32d1d21ecd99" [[package]] name = "flate2" @@ -2317,7 +2243,6 @@ checksum = "4bb6743198531e02858aeaea5398fcc883e71851fcbcb5a2f773e2fb6cb1edf2" dependencies = [ "typenum", "version_check", - "zeroize", ] [[package]] @@ -2423,17 +2348,6 @@ dependencies = [ "thiserror 1.0.69", ] -[[package]] -name = "group" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63" -dependencies = [ - "ff", - "rand_core 0.6.4", - "subtle", -] - [[package]] name = "h2" version = "0.3.27" @@ -3082,6 +2996,15 @@ dependencies = [ "either", ] +[[package]] +name = "itertools" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285" +dependencies = [ + "either", +] + [[package]] name = "itoa" version = "1.0.15" @@ -3247,20 +3170,6 @@ dependencies = [ "simple_asn1", ] -[[package]] -name = "k256" -version = "0.13.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6e3919bbaa2945715f0bb6d3934a173d1e9a59ac23767fbaaef277265a7411b" -dependencies = [ - "cfg-if", - "ecdsa", - "elliptic-curve", - "once_cell", - "sha2", - "signature", -] - [[package]] name = "keccak" version = "0.1.5" @@ -4128,9 +4037,9 @@ dependencies = [ [[package]] name = "petgraph" -version = "0.6.5" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" +checksum = "3672b37090dbd86368a4145bc067582552b29c27377cad4e0a306c97f9bd7772" dependencies = [ "fixedbitset", "indexmap 2.12.0", @@ -4190,11 +4099,14 @@ dependencies = [ "serde", "serde_json", "serial_test", + "solana-account", "solana-bn254 3.1.2", "solana-client", + "solana-clock", "solana-commitment-config", "solana-pubkey 3.0.0", - "solana-sdk", + "solana-signature", + "solana-transaction", "solana-transaction-status", "sqlx", "thiserror 1.0.69", @@ -4411,7 +4323,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ac6c3320f9abac597dcbc668774ef006702672474aad53c6d596b62e487b40b1" dependencies = [ "heck 0.5.0", - "itertools 0.13.0", + "itertools 0.14.0", "log", "multimap", "once_cell", @@ -4433,7 +4345,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9120690fafc389a67ba3803df527d0ec9cbbc9cc45e4cc20b332996dfb672425" dependencies = [ "anyhow", - "itertools 0.13.0", + "itertools 0.14.0", "proc-macro2", "quote", "syn 2.0.108", @@ -4876,16 +4788,6 @@ dependencies = [ "tower-service", ] -[[package]] -name = "rfc6979" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2" -dependencies = [ - "hmac", - "subtle", -] - [[package]] name = "ring" version = "0.16.20" @@ -5432,20 +5334,6 @@ version = "4.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" -[[package]] -name = "sec1" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc" -dependencies = [ - "base16ct", - "der", - "generic-array", - "pkcs8", - "subtle", - "zeroize", -] - [[package]] name = "security-framework" version = "2.11.1" @@ -5697,7 +5585,6 @@ version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" dependencies = [ - "digest 0.10.7", "rand_core 0.6.4", ] @@ -5730,12 +5617,6 @@ dependencies = [ "num-traits", ] -[[package]] -name = "siphasher" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" - [[package]] name = "siphasher" version = "1.0.1" @@ -5884,8 +5765,6 @@ version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "82f4691b69b172c687d218dd2f1f23fc7ea5e9aa79df9ac26dab3d8dd829ce48" dependencies = [ - "bincode", - "serde", "solana-program-error", "solana-program-memory", "solana-pubkey 3.0.0", @@ -5903,7 +5782,6 @@ dependencies = [ "curve25519-dalek", "five8", "five8_const", - "rand 0.8.5", "serde", "serde_derive", "solana-atomic-u64 3.0.0", @@ -5949,28 +5827,6 @@ dependencies = [ "parking_lot 0.12.5", ] -[[package]] -name = "solana-big-mod-exp" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30c80fb6d791b3925d5ec4bf23a7c169ef5090c013059ec3ed7d0b2c04efa085" -dependencies = [ - "num-bigint 0.4.6", - "num-traits", - "solana-define-syscall 3.0.0", -] - -[[package]] -name = "solana-blake3-hasher" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffa2e3bdac3339c6d0423275e45dafc5ac25f4d43bf344d026a3cc9a85e244a6" -dependencies = [ - "blake3", - "solana-define-syscall 3.0.0", - "solana-hash 3.0.0", -] - [[package]] name = "solana-bn254" version = "2.2.2" @@ -6233,17 +6089,6 @@ dependencies = [ "solana-sysvar-id", ] -[[package]] -name = "solana-epoch-rewards-hasher" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e507099d0c2c5d7870c9b1848281ea67bbeee80d171ca85003ee5767994c9c38" -dependencies = [ - "siphasher 0.3.11", - "solana-hash 3.0.0", - "solana-pubkey 3.0.0", -] - [[package]] name = "solana-epoch-schedule" version = "3.0.0" @@ -6257,37 +6102,6 @@ dependencies = [ "solana-sysvar-id", ] -[[package]] -name = "solana-epoch-stake" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcc6693d0ea833b880514b9b88d95afb80b42762dca98b0712465d1fcbbcb89e" -dependencies = [ - "solana-define-syscall 3.0.0", - "solana-pubkey 3.0.0", -] - -[[package]] -name = "solana-example-mocks" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978855d164845c1b0235d4b4d101cadc55373fffaf0b5b6cfa2194d25b2ed658" -dependencies = [ - "serde", - "serde_derive", - "solana-address-lookup-table-interface", - "solana-clock", - "solana-hash 3.0.0", - "solana-instruction", - "solana-keccak-hasher", - "solana-message", - "solana-nonce", - "solana-pubkey 3.0.0", - "solana-sdk-ids", - "solana-system-interface", - "thiserror 2.0.17", -] - [[package]] name = "solana-feature-gate-interface" version = "3.0.0" @@ -6312,22 +6126,6 @@ dependencies = [ "serde_derive", ] -[[package]] -name = "solana-fee-structure" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e2abdb1223eea8ec64136f39cb1ffcf257e00f915c957c35c0dd9e3f4e700b0" -dependencies = [ - "serde", - "serde_derive", -] - -[[package]] -name = "solana-hard-forks" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0abacc4b66ce471f135f48f22facf75cbbb0f8a252fbe2c1e0aa59d5b203f519" - [[package]] name = "solana-hash" version = "2.3.0" @@ -6347,7 +6145,6 @@ version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a063723b9e84c14d8c0d2cdf0268207dc7adecf546e31251f9e07c7b00b566c" dependencies = [ - "borsh 1.5.7", "bytemuck", "bytemuck_derive", "five8", @@ -6362,10 +6159,6 @@ name = "solana-inflation" version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e92f37a14e7c660628752833250dd3dcd8e95309876aee751d7f8769a27947c6" -dependencies = [ - "serde", - "serde_derive", -] [[package]] name = "solana-instruction" @@ -6374,7 +6167,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8df4e8fcba01d7efa647ed20a081c234475df5e11a93acb4393cc2c9a7b99bab" dependencies = [ "bincode", - "borsh 1.5.7", "serde", "serde_derive", "solana-define-syscall 3.0.0", @@ -6412,17 +6204,6 @@ dependencies = [ "solana-sysvar-id", ] -[[package]] -name = "solana-keccak-hasher" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57eebd3012946913c8c1b8b43cdf8a6249edb09c0b6be3604ae910332a3acd97" -dependencies = [ - "sha3", - "solana-define-syscall 3.0.0", - "solana-hash 3.0.0", -] - [[package]] name = "solana-keypair" version = "3.0.1" @@ -6430,12 +6211,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "952ed9074c12edd2060cb09c2a8c664303f4ab7f7056a407ac37dd1da7bdaa3e" dependencies = [ "ed25519-dalek", - "ed25519-dalek-bip32", "five8", "rand 0.8.5", - "solana-derivation-path", "solana-pubkey 3.0.0", - "solana-seed-derivable", "solana-seed-phrase", "solana-signature", "solana-signer", @@ -6534,12 +6312,6 @@ dependencies = [ "solana-define-syscall 3.0.0", ] -[[package]] -name = "solana-native-token" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae8dd4c280dca9d046139eb5b7a5ac9ad10403fbd64964c7d7571214950d758f" - [[package]] name = "solana-net-utils" version = "3.0.8" @@ -6584,22 +6356,6 @@ dependencies = [ "sha3", ] -[[package]] -name = "solana-offchain-message" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6e2a1141a673f72a05cf406b99e4b2b8a457792b7c01afa07b3f00d4e2de393" -dependencies = [ - "num_enum", - "solana-hash 3.0.0", - "solana-packet", - "solana-pubkey 3.0.0", - "solana-sanitize 3.0.1", - "solana-sha256-hasher 3.0.0", - "solana-signature", - "solana-signer", -] - [[package]] name = "solana-packet" version = "3.0.0" @@ -6646,64 +6402,6 @@ dependencies = [ "solana-time-utils", ] -[[package]] -name = "solana-presigner" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f704eaf825be3180832445b9e4983b875340696e8e7239bf2d535b0f86c14a2" -dependencies = [ - "solana-pubkey 3.0.0", - "solana-signature", - "solana-signer", -] - -[[package]] -name = "solana-program" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91b12305dd81045d705f427acd0435a2e46444b65367d7179d7bdcfc3bc5f5eb" -dependencies = [ - "memoffset", - "solana-account-info", - "solana-big-mod-exp", - "solana-blake3-hasher", - "solana-borsh", - "solana-clock", - "solana-cpi", - "solana-define-syscall 3.0.0", - "solana-epoch-rewards", - "solana-epoch-schedule", - "solana-epoch-stake", - "solana-example-mocks", - "solana-fee-calculator", - "solana-hash 3.0.0", - "solana-instruction", - "solana-instruction-error", - "solana-instructions-sysvar", - "solana-keccak-hasher", - "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 3.0.0", - "solana-rent", - "solana-sdk-ids", - "solana-secp256k1-recover", - "solana-serde-varint", - "solana-serialize-utils", - "solana-sha256-hasher 3.0.0", - "solana-short-vec", - "solana-slot-hashes", - "solana-slot-history", - "solana-stable-layout", - "solana-sysvar", - "solana-sysvar-id", -] - [[package]] name = "solana-program-entrypoint" version = "3.1.0" @@ -6724,8 +6422,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1af32c995a7b692a915bb7414d5f8e838450cf7c70414e763d8abcae7b51f28" dependencies = [ "borsh 1.5.7", - "serde", - "serde_derive", ] [[package]] @@ -6778,7 +6474,6 @@ version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8909d399deb0851aa524420beeb5646b115fd253ef446e35fe4504c904da3941" dependencies = [ - "rand 0.8.5", "solana-address", ] @@ -7012,44 +6707,6 @@ dependencies = [ "thiserror 2.0.17", ] -[[package]] -name = "solana-sdk" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f03df7969f5e723ad31b6c9eadccc209037ac4caa34d8dc259316b05c11e82b" -dependencies = [ - "bincode", - "bs58 0.5.1", - "serde", - "solana-account", - "solana-epoch-info", - "solana-epoch-rewards-hasher", - "solana-fee-structure", - "solana-inflation", - "solana-keypair", - "solana-message", - "solana-offchain-message", - "solana-presigner", - "solana-program", - "solana-program-memory", - "solana-pubkey 3.0.0", - "solana-sanitize 3.0.1", - "solana-sdk-ids", - "solana-sdk-macro", - "solana-seed-derivable", - "solana-seed-phrase", - "solana-serde", - "solana-serde-varint", - "solana-short-vec", - "solana-shred-version", - "solana-signature", - "solana-signer", - "solana-time-utils", - "solana-transaction", - "solana-transaction-error", - "thiserror 2.0.17", -] - [[package]] name = "solana-sdk-ids" version = "3.0.0" @@ -7071,17 +6728,6 @@ dependencies = [ "syn 2.0.108", ] -[[package]] -name = "solana-secp256k1-recover" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "394a4470477d66296af5217970a905b1c5569032a7732c367fb69e5666c8607e" -dependencies = [ - "k256", - "solana-define-syscall 3.0.0", - "thiserror 2.0.17", -] - [[package]] name = "solana-seed-derivable" version = "3.0.0" @@ -7162,17 +6808,6 @@ dependencies = [ "serde", ] -[[package]] -name = "solana-shred-version" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94953e22ca28fe4541a3447d6baeaf519cc4ddc063253bfa673b721f34c136bb" -dependencies = [ - "solana-hard-forks", - "solana-hash 3.0.0", - "solana-sha256-hasher 3.0.0", -] - [[package]] name = "solana-signature" version = "3.1.0" @@ -7181,7 +6816,6 @@ checksum = "4bb8057cc0e9f7b5e89883d49de6f407df655bb6f3a71d0b7baf9986a2218fd9" dependencies = [ "ed25519-dalek", "five8", - "rand 0.8.5", "serde", "serde-big-array", "serde_derive", @@ -7332,8 +6966,6 @@ checksum = "63205e68d680bcc315337dec311b616ab32fea0a612db3b883ce4de02e0953f9" dependencies = [ "base64 0.22.1", "bincode", - "bytemuck", - "bytemuck_derive", "lazy_static", "serde", "serde_derive", diff --git a/Cargo.toml b/Cargo.toml index d80ea6d7..aee235af 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -74,8 +74,11 @@ serde = { version = "1.0.217", features = ["derive"] } serde_json = "1.0.82" solana-client = "3.0.8" -solana-sdk = "3.0.0" -solana-pubkey ={ version = "3.0.0", features = ["serde"] } +solana-pubkey = { version = "3.0.0", features = ["serde"] } +solana-signature = "3.1.0" +solana-account = "3.2.0" +solana-clock = "3.0.0" +solana-transaction = "3.0.1" solana-bn254 = "3.1.2" solana-commitment-config = "3.0.0" diff --git a/src/api/method/utils.rs b/src/api/method/utils.rs index bf8f5373..1cf78467 100644 --- a/src/api/method/utils.rs +++ b/src/api/method/utils.rs @@ -14,7 +14,7 @@ use sea_orm::{ QueryOrder, QuerySelect, Statement, Value, }; use serde::{Deserialize, Serialize}; -use solana_sdk::signature::Signature; +use solana_signature::Signature; use crate::common::typedefs::context::Context; use crate::common::typedefs::hash::Hash; diff --git a/src/common/typedefs/hash.rs b/src/common/typedefs/hash.rs index 7fa5b1fb..8d1f674a 100644 --- a/src/common/typedefs/hash.rs +++ b/src/common/typedefs/hash.rs @@ -9,7 +9,7 @@ use serde::de::{self, Visitor}; use serde::ser::Serializer; use serde::Deserializer; #[allow(unused_imports)] -use solana_sdk::pubkey::Pubkey; +use solana_pubkey::Pubkey; use thiserror::Error; // Maximum length of a 32 byte base58 encoded hash diff --git a/src/common/typedefs/serializable_signature.rs b/src/common/typedefs/serializable_signature.rs index 95aeee23..368907d9 100644 --- a/src/common/typedefs/serializable_signature.rs +++ b/src/common/typedefs/serializable_signature.rs @@ -4,7 +4,7 @@ use serde::{ de::{self, Visitor}, Deserialize, Deserializer, Serialize, Serializer, }; -use solana_sdk::signature::Signature; +use solana_signature::Signature; use utoipa::{ openapi::{ObjectBuilder, RefOr, Schema, SchemaType}, ToSchema, diff --git a/src/ingester/fetchers/grpc.rs b/src/ingester/fetchers/grpc.rs index 5a4a6764..41c9e507 100644 --- a/src/ingester/fetchers/grpc.rs +++ b/src/ingester/fetchers/grpc.rs @@ -13,8 +13,8 @@ use rand::distributions::Alphanumeric; use rand::Rng; use solana_client::nonblocking::rpc_client::RpcClient; use solana_pubkey::Pubkey; -use solana_sdk::pubkey::Pubkey as SdkPubkey; -use solana_sdk::signature::Signature; +use solana_pubkey::Pubkey as SdkPubkey; +use solana_signature::Signature; use tokio::time::sleep; use tracing::error; use yellowstone_grpc_client::{GeyserGrpcBuilderResult, GeyserGrpcClient, Interceptor}; diff --git a/src/ingester/parser/merkle_tree_events_parser.rs b/src/ingester/parser/merkle_tree_events_parser.rs index d02d4f41..8ef8dbc8 100644 --- a/src/ingester/parser/merkle_tree_events_parser.rs +++ b/src/ingester/parser/merkle_tree_events_parser.rs @@ -12,7 +12,7 @@ use crate::ingester::typedefs::block_info::{Instruction, TransactionInfo}; use borsh::BorshDeserialize; use light_compressed_account::TreeType; use solana_pubkey::Pubkey; -use solana_sdk::signature::Signature; +use solana_signature::Signature; /// A map of merkle tree events and sequence numbers by merkle tree pubkey. /// We keep sequence number to order the events. diff --git a/src/ingester/parser/state_update.rs b/src/ingester/parser/state_update.rs index 5bbca58f..b1510b64 100644 --- a/src/ingester/parser/state_update.rs +++ b/src/ingester/parser/state_update.rs @@ -10,7 +10,7 @@ use light_event::event::{BatchNullifyContext, NewAddress}; use light_compressed_account::TreeType; use log::debug; use solana_pubkey::Pubkey; -use solana_sdk::signature::Signature; +use solana_signature::Signature; use std::collections::{HashMap, HashSet}; use utoipa::ToSchema; @@ -341,7 +341,7 @@ mod tests { use light_compressed_account::TreeType; use sea_orm::DatabaseConnection; use sea_orm_migration::MigratorTrait; - use solana_sdk::pubkey::Pubkey as SdkPubkey; + use solana_pubkey::Pubkey as SdkPubkey; async fn setup_test_db() -> DatabaseConnection { let db = sea_orm::Database::connect("sqlite::memory:").await.unwrap(); diff --git a/src/ingester/parser/tree_info.rs b/src/ingester/parser/tree_info.rs index 87c3a195..fbae8143 100644 --- a/src/ingester/parser/tree_info.rs +++ b/src/ingester/parser/tree_info.rs @@ -167,7 +167,7 @@ impl TreeInfo { pub async fn get_by_sdk_pubkey( conn: &T, - pubkey: &solana_sdk::pubkey::Pubkey, + pubkey: &Pubkey, ) -> Result, crate::ingester::error::IngesterError> where T: ConnectionTrait + TransactionTrait, diff --git a/src/ingester/parser/tx_event_parser.rs b/src/ingester/parser/tx_event_parser.rs index 12af9423..c7c7662b 100644 --- a/src/ingester/parser/tx_event_parser.rs +++ b/src/ingester/parser/tx_event_parser.rs @@ -8,7 +8,7 @@ use crate::ingester::typedefs::block_info::{Instruction, TransactionInfo}; use borsh::BorshDeserialize; use light_compressed_account::TreeType; use log::info; -use solana_sdk::signature::Signature; +use solana_signature::Signature; use std::collections::HashMap; pub async fn parse_public_transaction_event_v1( diff --git a/src/ingester/parser/tx_event_parser_v2.rs b/src/ingester/parser/tx_event_parser_v2.rs index c6d1a766..2aa5bb4a 100644 --- a/src/ingester/parser/tx_event_parser_v2.rs +++ b/src/ingester/parser/tx_event_parser_v2.rs @@ -13,7 +13,7 @@ use crate::common::typedefs::hash::Hash; use light_event::parse::event_from_light_transaction; use light_compressed_account::Pubkey as LightPubkey; use solana_pubkey::Pubkey; -use solana_sdk::signature::Signature; +use solana_signature::Signature; // Helper function for pubkey conversion fn to_light_pubkey(pubkey: &Pubkey) -> LightPubkey { diff --git a/src/ingester/persist/mod.rs b/src/ingester/persist/mod.rs index e6b6912c..0f7db46a 100644 --- a/src/ingester/persist/mod.rs +++ b/src/ingester/persist/mod.rs @@ -28,7 +28,7 @@ use sea_orm::{ EntityTrait, Order, QueryFilter, QueryOrder, QuerySelect, QueryTrait, Set, Statement, }; use solana_pubkey::{pubkey, Pubkey}; -use solana_sdk::signature::Signature; +use solana_signature::Signature; use sqlx::types::Decimal; use std::{cmp::max, collections::HashMap}; diff --git a/src/ingester/persist/persisted_indexed_merkle_tree.rs b/src/ingester/persist/persisted_indexed_merkle_tree.rs index 4cb2d134..b5dff27e 100644 --- a/src/ingester/persist/persisted_indexed_merkle_tree.rs +++ b/src/ingester/persist/persisted_indexed_merkle_tree.rs @@ -24,7 +24,7 @@ use sea_orm::{ EntityTrait, QueryFilter, QueryTrait, Set, Statement, }; use solana_pubkey::Pubkey; -use solana_sdk::signature::Signature; +use solana_signature::Signature; /// Ensures the zeroeth element (leaf_index 0) exists if not already present fn ensure_zeroeth_element_exists( diff --git a/src/ingester/typedefs/block_info.rs b/src/ingester/typedefs/block_info.rs index 980e12c7..c2faf6c5 100644 --- a/src/ingester/typedefs/block_info.rs +++ b/src/ingester/typedefs/block_info.rs @@ -1,10 +1,8 @@ use serde::{Deserialize, Serialize}; +use solana_clock::{Slot, UnixTimestamp}; use solana_pubkey::Pubkey; -use solana_sdk::{ - clock::{Slot, UnixTimestamp}, - signature::Signature, - transaction::VersionedTransaction, -}; +use solana_signature::Signature; +use solana_transaction::versioned::VersionedTransaction; use solana_transaction_status::{ option_serializer::OptionSerializer, EncodedConfirmedTransactionWithStatusMeta, EncodedTransactionWithStatusMeta, UiConfirmedBlock, UiInstruction, UiTransactionStatusMeta, @@ -189,7 +187,7 @@ pub fn parse_instruction_groups( .iter() .chain(loaded_addresses.readonly.iter()) { - let sdk_pubkey = solana_sdk::pubkey::Pubkey::from_str(address) + let sdk_pubkey = Pubkey::from_str(address) .map_err(|e| IngesterError::ParserError(e.to_string()))?; sdk_accounts.push(sdk_pubkey); } diff --git a/src/migration/migrations/custom/custom20252201_000001_init.rs b/src/migration/migrations/custom/custom20252201_000001_init.rs index 1ccb603f..d09d7859 100644 --- a/src/migration/migrations/custom/custom20252201_000001_init.rs +++ b/src/migration/migrations/custom/custom20252201_000001_init.rs @@ -2,7 +2,7 @@ use std::str::FromStr; use sea_orm_migration::prelude::*; use sea_orm_migration::sea_orm::{ConnectionTrait, DatabaseBackend, Statement}; -use solana_sdk::pubkey::Pubkey; +use solana_pubkey::Pubkey; use crate::migration::model::table::Accounts; diff --git a/src/monitor/mod.rs b/src/monitor/mod.rs index 51af28fb..e6fad6ae 100644 --- a/src/monitor/mod.rs +++ b/src/monitor/mod.rs @@ -31,12 +31,12 @@ use light_merkle_tree_metadata::merkle_tree::MerkleTreeMetadata; use crate::common::typedefs::hash::Hash; -use solana_sdk::account::Account as SolanaAccount; +use solana_account::Account as SolanaAccount; use crate::common::typedefs::context::Context; use light_batched_merkle_tree::merkle_tree::BatchedMerkleTreeAccount; -use solana_sdk::pubkey::Pubkey; +use solana_pubkey::Pubkey; use std::mem; const CHUNK_SIZE: usize = 100; diff --git a/src/monitor/queue_hash_cache.rs b/src/monitor/queue_hash_cache.rs index b35b2b7c..753bcbd5 100644 --- a/src/monitor/queue_hash_cache.rs +++ b/src/monitor/queue_hash_cache.rs @@ -1,7 +1,7 @@ use light_compressed_account::QueueType; use log::debug; use sea_orm::{ColumnTrait, DatabaseConnection, DbErr, EntityTrait, QueryFilter, Set}; -use solana_sdk::pubkey::Pubkey; +use solana_pubkey::Pubkey; use crate::dao::generated::{prelude::QueueHashChains, queue_hash_chains}; diff --git a/src/monitor/queue_monitor.rs b/src/monitor/queue_monitor.rs index d1e67101..339a55dc 100644 --- a/src/monitor/queue_monitor.rs +++ b/src/monitor/queue_monitor.rs @@ -8,7 +8,7 @@ use light_zero_copy::vec::ZeroCopyVecU64; use log::{debug, error, trace, warn}; use sea_orm::{ColumnTrait, DatabaseConnection, EntityTrait, QueryFilter, QueryOrder}; use solana_client::nonblocking::rpc_client::RpcClient; -use solana_sdk::pubkey::Pubkey; +use solana_pubkey::Pubkey; use crate::dao::generated::{accounts, address_queues}; diff --git a/src/monitor/tree_metadata_sync.rs b/src/monitor/tree_metadata_sync.rs index 32edfe9d..a0e2d0e7 100644 --- a/src/monitor/tree_metadata_sync.rs +++ b/src/monitor/tree_metadata_sync.rs @@ -1,8 +1,8 @@ use log::{debug, info, warn}; use sea_orm::{ConnectionTrait, DatabaseConnection, EntityTrait, Set}; +use solana_account::Account; use solana_client::nonblocking::rpc_client::RpcClient; -use solana_sdk::account::Account; -use solana_sdk::pubkey::Pubkey; +use solana_pubkey::Pubkey; use crate::api::error::PhotonApiError; use crate::dao::generated::{prelude::*, tree_metadata}; diff --git a/tests/integration_tests/batched_state_tree_tests.rs b/tests/integration_tests/batched_state_tree_tests.rs index bbf39560..96494ad9 100644 --- a/tests/integration_tests/batched_state_tree_tests.rs +++ b/tests/integration_tests/batched_state_tree_tests.rs @@ -22,7 +22,7 @@ use photon_indexer::common::typedefs::unsigned_integer::UnsignedInteger; use photon_indexer::ingester::persist::COMPRESSED_TOKEN_PROGRAM; use serial_test::serial; use solana_pubkey::Pubkey; -use solana_sdk::signature::Signature; +use solana_signature::Signature; use solana_transaction_status::EncodedConfirmedTransactionWithStatusMeta; use std::str::FromStr; diff --git a/tests/integration_tests/e2e_tests.rs b/tests/integration_tests/e2e_tests.rs index 1ce98ccd..479c646f 100644 --- a/tests/integration_tests/e2e_tests.rs +++ b/tests/integration_tests/e2e_tests.rs @@ -40,7 +40,7 @@ use photon_indexer::{ }, common::typedefs::serializable_signature::SerializableSignature, }; -use solana_sdk::signature::Signature; +use solana_signature::Signature; // Photon does not support out-of-order transactions, but it does reprocessing previous transactions. fn all_valid_permutations(txns: &[&str]) -> Vec> { diff --git a/tests/integration_tests/monitor_tests.rs b/tests/integration_tests/monitor_tests.rs index 3e009a67..1c0a3ae0 100644 --- a/tests/integration_tests/monitor_tests.rs +++ b/tests/integration_tests/monitor_tests.rs @@ -5,7 +5,7 @@ use photon_indexer::ingester::parser::EXPECTED_TREE_OWNER; use photon_indexer::monitor::tree_metadata_sync::{upsert_tree_metadata, TreeAccountData}; use sea_orm::{ColumnTrait, DatabaseBackend, EntityTrait, QueryFilter}; use solana_pubkey::Pubkey; -use solana_sdk::pubkey::Pubkey as SdkPubkey; +use solana_pubkey::Pubkey as SdkPubkey; use crate::utils::*; use light_compressed_account::TreeType; diff --git a/tests/integration_tests/utils.rs b/tests/integration_tests/utils.rs index 19c24e29..3b44e791 100644 --- a/tests/integration_tests/utils.rs +++ b/tests/integration_tests/utils.rs @@ -34,11 +34,12 @@ pub use rstest::rstest; use solana_client::{ nonblocking::rpc_client::RpcClient, rpc_config::RpcTransactionConfig, rpc_request::RpcRequest, }; +use solana_account::Account as SolanaAccount; +use solana_clock::Slot; use solana_commitment_config::CommitmentConfig; use solana_commitment_config::CommitmentLevel; -use solana_sdk::account::Account as SolanaAccount; -use solana_sdk::pubkey::Pubkey; -use solana_sdk::{clock::Slot, signature::Signature}; +use solana_pubkey::Pubkey; +use solana_signature::Signature; use solana_transaction_status::{ EncodedConfirmedTransactionWithStatusMeta, UiConfirmedBlock, UiTransactionEncoding, }; From 1f2a137cecfff1ceadbd9789309ed57ffc8f9ff3 Mon Sep 17 00:00:00 2001 From: ananas Date: Fri, 31 Oct 2025 17:30:16 +0000 Subject: [PATCH 08/10] refactor: manual borsh impl --- Cargo.lock | 1 + Cargo.toml | 3 ++- src/common/typedefs/serializable_pubkey.rs | 17 ++++------------- 3 files changed, 7 insertions(+), 14 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2aee0051..80245935 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4058,6 +4058,7 @@ dependencies = [ "base64 0.21.7", "bincode", "borsh 0.10.4", + "borsh 1.5.7", "bs58 0.4.0", "byteorder", "bytes", diff --git a/Cargo.toml b/Cargo.toml index aee235af..987ff7ae 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -42,6 +42,7 @@ async-std = { version = "1", features = ["attributes", "tokio1"] } async-trait = "0.1.85" base64 = "0.21.0" borsh = "0.10.3" +borsh1 = { package = "borsh", version = "1.5" } bs58 = "0.4.0" byteorder = "1.5.0" cadence-macros = "1.2.0" @@ -74,7 +75,7 @@ serde = { version = "1.0.217", features = ["derive"] } serde_json = "1.0.82" solana-client = "3.0.8" -solana-pubkey = { version = "3.0.0", features = ["serde"] } +solana-pubkey = { version = "3.0.0", features = ["serde", "borsh"] } solana-signature = "3.1.0" solana-account = "3.2.0" solana-clock = "3.0.0" diff --git a/src/common/typedefs/serializable_pubkey.rs b/src/common/typedefs/serializable_pubkey.rs index 6a818fc6..9f77cf1a 100644 --- a/src/common/typedefs/serializable_pubkey.rs +++ b/src/common/typedefs/serializable_pubkey.rs @@ -31,22 +31,13 @@ impl SerializablePubkey { impl BorshDeserialize for SerializablePubkey { fn deserialize(buf: &mut &[u8]) -> Result { - if buf.len() < 32 { - return Err(std::io::Error::new( - std::io::ErrorKind::UnexpectedEof, - "Buffer underflow", - )); - } - let (pubkey_bytes, rest) = buf.split_at(32); - *buf = rest; - let array: [u8; 32] = pubkey_bytes.try_into().expect("slice with incorrect length"); - Ok(SerializablePubkey(SolanaPubkey::new_from_array(array))) + use borsh1::BorshDeserialize as BorshDeserialize1; + ::deserialize(buf).map(SerializablePubkey) } fn deserialize_reader(reader: &mut R) -> Result { - let mut buffer = [0u8; 32]; // SolanaPubkey is 32 bytes - reader.read_exact(&mut buffer)?; - Ok(SerializablePubkey(SolanaPubkey::new_from_array(buffer))) + use borsh1::BorshDeserialize as BorshDeserialize1; + ::deserialize_reader(reader).map(SerializablePubkey) } } From 44699db1352717ec5692ded93488debabbdbe1a8 Mon Sep 17 00:00:00 2001 From: ananas Date: Fri, 31 Oct 2025 17:52:15 +0000 Subject: [PATCH 09/10] test: v1 tree deserialization --- src/monitor/v1_tree_accounts.rs | 6 +- tests/integration_tests/main.rs | 1 + .../merkle_tree_deserialization.rs | 87 +++++++++++++++++++ 3 files changed, 91 insertions(+), 3 deletions(-) create mode 100644 tests/integration_tests/merkle_tree_deserialization.rs diff --git a/src/monitor/v1_tree_accounts.rs b/src/monitor/v1_tree_accounts.rs index c932dddf..51ef53bc 100644 --- a/src/monitor/v1_tree_accounts.rs +++ b/src/monitor/v1_tree_accounts.rs @@ -11,7 +11,7 @@ use std::mem::size_of; pub const STATE_MERKLE_TREE_DISCRIMINATOR: [u8; 8] = [172, 43, 172, 186, 29, 73, 219, 84]; /// AddressMerkleTreeAccount discriminator -pub const ADDRESS_MERKLE_TREE_DISCRIMINATOR: [u8; 8] = [99, 100, 84, 45, 134, 159, 103, 73]; +pub const ADDRESS_MERKLE_TREE_DISCRIMINATOR: [u8; 8] = [11, 161, 175, 9, 212, 229, 73, 73]; /// V1 State Merkle Tree Account structure (for deserialization) /// The on-chain layout is: [8 byte discriminator][metadata][tree_bytes] @@ -30,7 +30,7 @@ impl StateMerkleTreeAccount { .map_err(|e| std::io::Error::new(std::io::ErrorKind::InvalidData, e.to_string()))?; Ok(Self { metadata, - tree_bytes: cursor[size_of::()..].to_vec(), + tree_bytes: data[8 + size_of::()..].to_vec(), }) } @@ -58,7 +58,7 @@ impl AddressMerkleTreeAccount { .map_err(|e| std::io::Error::new(std::io::ErrorKind::InvalidData, e.to_string()))?; Ok(Self { metadata, - tree_bytes: cursor[size_of::()..].to_vec(), + tree_bytes: data[8 + size_of::()..].to_vec(), }) } diff --git a/tests/integration_tests/main.rs b/tests/integration_tests/main.rs index b7313993..78bad68e 100644 --- a/tests/integration_tests/main.rs +++ b/tests/integration_tests/main.rs @@ -6,6 +6,7 @@ mod batch_append_nullified_test; mod batched_address_tree_tests; mod batched_state_tree_tests; mod e2e_tests; +mod merkle_tree_deserialization; mod mock_tests; mod monitor_tests; mod open_api_tests; diff --git a/tests/integration_tests/merkle_tree_deserialization.rs b/tests/integration_tests/merkle_tree_deserialization.rs new file mode 100644 index 00000000..27c0ced9 --- /dev/null +++ b/tests/integration_tests/merkle_tree_deserialization.rs @@ -0,0 +1,87 @@ +use function_name::named; +use photon_indexer::monitor::v1_tree_accounts::{AddressMerkleTreeAccount, StateMerkleTreeAccount}; +use serial_test::serial; +use solana_pubkey::Pubkey; +use std::env; +use std::str::FromStr; + +use crate::utils::*; + +const STATE_MERKLE_TREE_V1: &str = "smt1NamzXdq4AMqS2fS2F1i5KTYPZRhoHgWx38d8WsT"; +const ADDRESS_MERKLE_TREE_V1: &str = "amt1Ayt45jfbdw5YSo7iz6WZxUmnZsQTYXy82hVwyC2"; + +#[named] +#[rstest] +#[tokio::test] +#[serial] +async fn test_v1_state_tree_deserialization_from_devnet( + #[values(DatabaseBackend::Sqlite)] db_backend: DatabaseBackend, +) { + if env::var("DEVNET_RPC_URL").is_err() { + return; + } + + let name = trim_test_name(function_name!()); + let setup = setup_with_options( + name.clone(), + TestSetupOptions { + network: Network::Devnet, + db_backend, + }, + ) + .await; + + let tree_pubkey = Pubkey::from_str(STATE_MERKLE_TREE_V1).unwrap(); + let account = setup.client.get_account(&tree_pubkey).await.unwrap(); + + let tree_account = StateMerkleTreeAccount::from_account_bytes(&account.data).unwrap(); + let merkle_tree = tree_account.tree().unwrap(); + + assert_eq!(merkle_tree.height, 26); + assert_eq!(merkle_tree.roots.capacity(), 2400); + assert_eq!( + tree_account.metadata.access_metadata.owner, + [ + 15, 216, 212, 71, 211, 163, 62, 85, 44, 152, 241, 31, 23, 118, 174, 50, 226, 14, 194, + 135, 20, 8, 57, 68, 15, 93, 48, 198, 231, 87, 72, 216 + ] + ); +} + +#[named] +#[rstest] +#[tokio::test] +#[serial] +async fn test_v1_address_tree_deserialization_from_devnet( + #[values(DatabaseBackend::Sqlite)] db_backend: DatabaseBackend, +) { + if env::var("DEVNET_RPC_URL").is_err() { + return; + } + + let name = trim_test_name(function_name!()); + let setup = setup_with_options( + name.clone(), + TestSetupOptions { + network: Network::Devnet, + db_backend, + }, + ) + .await; + + let tree_pubkey = Pubkey::from_str(ADDRESS_MERKLE_TREE_V1).unwrap(); + let account = setup.client.get_account(&tree_pubkey).await.unwrap(); + + let tree_account = AddressMerkleTreeAccount::from_account_bytes(&account.data).unwrap(); + let indexed_tree = tree_account.tree().unwrap(); + + assert_eq!(indexed_tree.merkle_tree.height, 26); + assert_eq!(indexed_tree.merkle_tree.roots.capacity(), 2400); + assert_eq!( + tree_account.metadata.access_metadata.owner, + [ + 15, 216, 212, 71, 211, 163, 62, 85, 44, 152, 241, 31, 23, 118, 174, 50, 226, 14, 194, + 135, 20, 8, 57, 68, 15, 93, 48, 198, 231, 87, 72, 216 + ] + ); +} From 88fb1aff6f83018b1aae73b43571be7691e778fd Mon Sep 17 00:00:00 2001 From: ananas Date: Fri, 31 Oct 2025 18:46:26 +0000 Subject: [PATCH 10/10] chore: replace git deps --- Cargo.lock | 56 +++++++++++++++++++++++++++++++++++------------------- Cargo.toml | 18 +++++++++--------- 2 files changed, 45 insertions(+), 29 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 80245935..8e483cee 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -121,7 +121,8 @@ checksum = "250f629c0161ad8107cf89319e990051fae62832fd343083bea452d93e2205fd" [[package]] name = "aligned-sized" version = "1.1.0" -source = "git+https://github.com/Lightprotocol/light-protocol?rev=40736887082f6f879ee73c77005adabd36ead5b6#40736887082f6f879ee73c77005adabd36ead5b6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48a526ec4434d531d488af59fe866f36b310fe8906691c75dffa664450a3800a" dependencies = [ "proc-macro2", "quote", @@ -3230,16 +3231,18 @@ dependencies = [ [[package]] name = "light-account-checks" -version = "0.5.0" -source = "git+https://github.com/Lightprotocol/light-protocol?rev=40736887082f6f879ee73c77005adabd36ead5b6#40736887082f6f879ee73c77005adabd36ead5b6" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e70bd1a384bff312860d4b60a0ccd814c36b88ce91966192dd88a35e595f7a2" dependencies = [ "thiserror 2.0.17", ] [[package]] name = "light-batched-merkle-tree" -version = "0.6.0" -source = "git+https://github.com/Lightprotocol/light-protocol?rev=40736887082f6f879ee73c77005adabd36ead5b6#40736887082f6f879ee73c77005adabd36ead5b6" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "421977e990b1edb39a0973ed0d0e919313517585e5dcb0e8faded1396c7cce12" dependencies = [ "aligned-sized", "borsh 0.10.4", @@ -3258,7 +3261,8 @@ dependencies = [ [[package]] name = "light-bloom-filter" version = "0.5.0" -source = "git+https://github.com/Lightprotocol/light-protocol?rev=40736887082f6f879ee73c77005adabd36ead5b6#40736887082f6f879ee73c77005adabd36ead5b6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8a609e3c9179f0ae8488cc70c5413c86dfd97dad7ad85fee2ad8da2d0a11e61" dependencies = [ "bitvec", "num-bigint 0.4.6", @@ -3279,8 +3283,9 @@ dependencies = [ [[package]] name = "light-compressed-account" -version = "0.6.1" -source = "git+https://github.com/Lightprotocol/light-protocol?rev=40736887082f6f879ee73c77005adabd36ead5b6#40736887082f6f879ee73c77005adabd36ead5b6" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a9cecda1680283ecba0f8ef64073d36998f057ac5aa96569dc8e74d6a37a3a2" dependencies = [ "borsh 0.10.4", "bytemuck", @@ -3295,8 +3300,9 @@ dependencies = [ [[package]] name = "light-concurrent-merkle-tree" -version = "4.0.0" -source = "git+https://github.com/Lightprotocol/light-protocol?rev=40736887082f6f879ee73c77005adabd36ead5b6#40736887082f6f879ee73c77005adabd36ead5b6" +version = "4.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0123e37a6796ca82cca864f00f160cf73652deac17a3e625007f184f7e95e62b" dependencies = [ "borsh 0.10.4", "light-bounded-vec", @@ -3308,7 +3314,8 @@ dependencies = [ [[package]] name = "light-event" version = "0.1.1" -source = "git+https://github.com/Lightprotocol/light-protocol?rev=40736887082f6f879ee73c77005adabd36ead5b6#40736887082f6f879ee73c77005adabd36ead5b6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "554228ce821d9c3b789f1c675f79663fe3872c77a3527e1e20e5f2f268eeb02d" dependencies = [ "borsh 0.10.4", "light-compressed-account", @@ -3320,7 +3327,8 @@ dependencies = [ [[package]] name = "light-hasher" version = "5.0.0" -source = "git+https://github.com/Lightprotocol/light-protocol?rev=40736887082f6f879ee73c77005adabd36ead5b6#40736887082f6f879ee73c77005adabd36ead5b6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c822662e6e109bac0e132a43fd52a4ef684811245a794e048cf9cda001e934c8" dependencies = [ "ark-bn254 0.5.0", "ark-ff 0.5.0", @@ -3336,7 +3344,8 @@ dependencies = [ [[package]] name = "light-indexed-array" version = "0.3.0" -source = "git+https://github.com/Lightprotocol/light-protocol?rev=40736887082f6f879ee73c77005adabd36ead5b6#40736887082f6f879ee73c77005adabd36ead5b6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f14f984030d86b6f07bd8f5ae04e2c40fcd0c3bdfcc7a291fff1ed59c9e6554" dependencies = [ "light-hasher", "num-bigint 0.4.6", @@ -3347,7 +3356,8 @@ dependencies = [ [[package]] name = "light-indexed-merkle-tree" version = "4.0.1" -source = "git+https://github.com/Lightprotocol/light-protocol?rev=40736887082f6f879ee73c77005adabd36ead5b6#40736887082f6f879ee73c77005adabd36ead5b6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b717eb0e72d96490c294f05fa9fbcc9a83253a1a0f8932de2fcad1aaae0502c" dependencies = [ "light-bounded-vec", "light-concurrent-merkle-tree", @@ -3361,7 +3371,8 @@ dependencies = [ [[package]] name = "light-macros" version = "2.2.0" -source = "git+https://github.com/Lightprotocol/light-protocol?rev=40736887082f6f879ee73c77005adabd36ead5b6#40736887082f6f879ee73c77005adabd36ead5b6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "179ac51cadc1d0ca047b4d6265a7cc245ca3affc16a20a2749585aa6464d39c2" dependencies = [ "bs58 0.5.1", "proc-macro2", @@ -3373,7 +3384,8 @@ dependencies = [ [[package]] name = "light-merkle-tree-metadata" version = "0.6.0" -source = "git+https://github.com/Lightprotocol/light-protocol?rev=40736887082f6f879ee73c77005adabd36ead5b6#40736887082f6f879ee73c77005adabd36ead5b6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6474045d3358e952f11a6cec44b9280ae127446a2b8246b3fdb29b83fda4e6b7" dependencies = [ "borsh 0.10.4", "bytemuck", @@ -3385,7 +3397,8 @@ dependencies = [ [[package]] name = "light-merkle-tree-reference" version = "4.0.0" -source = "git+https://github.com/Lightprotocol/light-protocol?rev=40736887082f6f879ee73c77005adabd36ead5b6#40736887082f6f879ee73c77005adabd36ead5b6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8d480f62ca32b38a6231bbc5310d693f91d6b5bdcc18bb13c2d9aab7a1c90e8" dependencies = [ "light-hasher", "light-indexed-array", @@ -3429,7 +3442,8 @@ dependencies = [ [[package]] name = "light-verifier" version = "5.0.0" -source = "git+https://github.com/Lightprotocol/light-protocol?rev=40736887082f6f879ee73c77005adabd36ead5b6#40736887082f6f879ee73c77005adabd36ead5b6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da621c1996c02f10a263eb5a26f03ad34c074f3f07abf566318985f53f5a26d9" dependencies = [ "groth16-solana", "light-compressed-account", @@ -3439,7 +3453,8 @@ dependencies = [ [[package]] name = "light-zero-copy" version = "0.5.0" -source = "git+https://github.com/Lightprotocol/light-protocol?rev=40736887082f6f879ee73c77005adabd36ead5b6#40736887082f6f879ee73c77005adabd36ead5b6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a8862f463792fd60ae8f5dc418150c16213e302e19d54fba0694cf8515be5ff" dependencies = [ "light-zero-copy-derive", "zerocopy", @@ -3448,7 +3463,8 @@ dependencies = [ [[package]] name = "light-zero-copy-derive" version = "0.5.0" -source = "git+https://github.com/Lightprotocol/light-protocol?rev=40736887082f6f879ee73c77005adabd36ead5b6#40736887082f6f879ee73c77005adabd36ead5b6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8af086d52100b3cab1f2993b146adc7a69fa6aaa878ae4c19514c77c50304379" dependencies = [ "lazy_static", "proc-macro2", diff --git a/Cargo.toml b/Cargo.toml index 987ff7ae..0c6f08a2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -85,15 +85,15 @@ solana-commitment-config = "3.0.0" solana-transaction-status = "3.0.8" -light-zero-copy = { git = "https://github.com/Lightprotocol/light-protocol", rev = "40736887082f6f879ee73c77005adabd36ead5b6", default-features = false} -light-concurrent-merkle-tree = { git = "https://github.com/Lightprotocol/light-protocol", rev = "40736887082f6f879ee73c77005adabd36ead5b6", default-features = false } -light-batched-merkle-tree = { git = "https://github.com/Lightprotocol/light-protocol", rev = "40736887082f6f879ee73c77005adabd36ead5b6", default-features = false} -light-merkle-tree-metadata = { git = "https://github.com/Lightprotocol/light-protocol", rev = "40736887082f6f879ee73c77005adabd36ead5b6", default-features = false } -light-compressed-account = { git = "https://github.com/Lightprotocol/light-protocol", rev = "40736887082f6f879ee73c77005adabd36ead5b6", default-features = false } -light-hasher = { git = "https://github.com/Lightprotocol/light-protocol", rev = "40736887082f6f879ee73c77005adabd36ead5b6", features = ["poseidon", "keccak", "sha256"], default-features = false} +light-zero-copy = { version = "0.5",default-features = false} +light-concurrent-merkle-tree = {version = "4", default-features = false } +light-batched-merkle-tree = { version = "0.6", default-features = false} +light-merkle-tree-metadata = { version = "0.6", default-features = false } +light-compressed-account = { version = "0.6", default-features = false } +light-hasher = { version = "5", features = ["poseidon", "keccak", "sha256"], default-features = false} light-poseidon = "0.3.0" -light-indexed-merkle-tree = { git = "https://github.com/Lightprotocol/light-protocol", rev = "40736887082f6f879ee73c77005adabd36ead5b6", default-features = false } -light-event = { git = "https://github.com/Lightprotocol/light-protocol", rev = "40736887082f6f879ee73c77005adabd36ead5b6", default-features = false } +light-indexed-merkle-tree = { version = "4", default-features = false } +light-event = "0.1" sqlx = { version = "0.6.2", features = [ "macros", @@ -138,7 +138,7 @@ cloud-storage = "0.11.1" [dev-dependencies] function_name = "0.3.0" serial_test = "2.0.0" -light-merkle-tree-reference = { git = "https://github.com/Lightprotocol/light-protocol", rev = "40736887082f6f879ee73c77005adabd36ead5b6" } +light-merkle-tree-reference = "4" [profile.dev] # Do not produce debug info for ~40% faster incremental compilation.