From 03273f92f85f957e019d409df647acb3651b5604 Mon Sep 17 00:00:00 2001 From: Joe Caulfield Date: Fri, 27 Jun 2025 04:07:21 +0000 Subject: [PATCH 1/2] dev: local setup --- Cargo.lock | 2667 ++++++++++++++++++++++++---------------------------- Cargo.toml | 95 ++ 2 files changed, 1315 insertions(+), 1447 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index dcc4281fcdf5a7..76be3e91304054 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -14,18 +14,18 @@ dependencies = [ [[package]] name = "addr2line" -version = "0.20.0" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3" +checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1" dependencies = [ "gimli", ] [[package]] -name = "adler" -version = "1.0.2" +name = "adler2" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa" [[package]] name = "aead" @@ -34,7 +34,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0" dependencies = [ "crypto-common", - "generic-array 0.14.7", + "generic-array", ] [[package]] @@ -79,10 +79,10 @@ dependencies = [ name = "agave-accounts-hash-cache-tool" version = "3.0.0" dependencies = [ - "ahash 0.8.11", + "ahash 0.8.12", "anyhow", "bytemuck", - "clap 2.33.3", + "clap 2.34.0", "memmap2 0.9.5", "rayon", "solana-accounts-db", @@ -103,7 +103,7 @@ dependencies = [ name = "agave-cargo-registry" version = "3.0.0" dependencies = [ - "clap 2.33.3", + "clap 2.34.0", "flate2", "hex", "hyper 0.14.32", @@ -117,7 +117,7 @@ dependencies = [ "solana-cli-config", "solana-cli-output", "solana-commitment-config", - "solana-keypair", + "solana-keypair 2.2.3", "solana-logger", "solana-pubkey", "solana-remote-wallet", @@ -128,14 +128,14 @@ dependencies = [ "tar", "tempfile", "tokio", - "toml 0.8.12", + "toml 0.8.23", ] [[package]] name = "agave-feature-set" version = "3.0.0" dependencies = [ - "ahash 0.8.11", + "ahash 0.8.12", "solana-epoch-schedule", "solana-frozen-abi", "solana-frozen-abi-macro", @@ -166,7 +166,7 @@ dependencies = [ "bincode", "bzip2", "chrono", - "clap 2.33.3", + "clap 2.34.0", "console", "crossbeam-channel", "ctrlc", @@ -175,7 +175,7 @@ dependencies = [ "nix", "reqwest 0.12.20", "scopeguard", - "semver 1.0.26", + "semver", "serde", "serde_derive", "serde_yaml 0.8.26", @@ -184,7 +184,7 @@ dependencies = [ "solana-config-interface", "solana-config-program-client", "solana-hash", - "solana-keypair", + "solana-keypair 2.2.1", "solana-logger", "solana-message", "solana-pubkey", @@ -221,7 +221,7 @@ dependencies = [ "assert_cmd", "bs58", "chrono", - "clap 2.33.3", + "clap 2.34.0", "crossbeam-channel", "csv", "dashmap", @@ -256,14 +256,14 @@ dependencies = [ "solana-hash", "solana-inflation", "solana-instruction", - "solana-keypair", + "solana-keypair 2.2.3", "solana-ledger", "solana-loader-v3-interface", "solana-log-collector", "solana-logger", "solana-measure", "solana-message", - "solana-native-token", + "solana-native-token 2.3.0", "solana-program-runtime", "solana-pubkey", "solana-rent", @@ -337,7 +337,7 @@ dependencies = [ name = "agave-store-histogram" version = "3.0.0" dependencies = [ - "clap 2.33.3", + "clap 2.34.0", "solana-version", ] @@ -345,8 +345,8 @@ dependencies = [ name = "agave-store-tool" version = "3.0.0" dependencies = [ - "ahash 0.8.11", - "clap 2.33.3", + "ahash 0.8.12", + "clap 2.34.0", "rayon", "solana-account", "solana-accounts-db", @@ -374,7 +374,7 @@ dependencies = [ "solana-metrics", "thread-priority", "tokio", - "toml 0.8.12", + "toml 0.8.23", "tower 0.5.2", ] @@ -387,7 +387,7 @@ dependencies = [ "criterion", "solana-hash", "solana-instruction", - "solana-keypair", + "solana-keypair 2.2.3", "solana-message", "solana-packet", "solana-pubkey", @@ -407,7 +407,7 @@ dependencies = [ "agave-geyser-plugin-interface", "assert_cmd", "chrono", - "clap 2.33.3", + "clap 2.34.0", "console", "core_affinity", "crossbeam-channel", @@ -422,7 +422,7 @@ dependencies = [ "libloading", "log", "num_cpus", - "predicates", + "predicates 2.1.5", "rand 0.8.5", "rayon", "serde", @@ -446,11 +446,11 @@ dependencies = [ "solana-geyser-plugin-manager", "solana-gossip", "solana-hash", - "solana-keypair", + "solana-keypair 2.2.3", "solana-ledger", "solana-logger", "solana-metrics", - "solana-native-token", + "solana-native-token 2.3.0", "solana-net-utils", "solana-perf", "solana-poh", @@ -501,7 +501,7 @@ dependencies = [ name = "agave-watchtower" version = "3.0.0" dependencies = [ - "clap 2.33.3", + "clap 2.34.0", "humantime", "log", "solana-clap-utils", @@ -510,7 +510,7 @@ dependencies = [ "solana-hash", "solana-logger", "solana-metrics", - "solana-native-token", + "solana-native-token 2.2.2", "solana-notifier", "solana-pubkey", "solana-rpc-client", @@ -536,62 +536,53 @@ version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9" dependencies = [ - "getrandom 0.2.15", + "getrandom 0.2.16", "once_cell", "version_check", ] [[package]] name = "ahash" -version = "0.8.11" +version = "0.8.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" +checksum = "5a15f179cd60c4584b8a8c596927aadc462e27f2ca70c04e0071964a73ba7a75" dependencies = [ "cfg-if 1.0.1", - "getrandom 0.2.15", + "getrandom 0.3.3", "once_cell", "version_check", - "zerocopy 0.7.31", -] - -[[package]] -name = "aho-corasick" -version = "0.7.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f" -dependencies = [ - "memchr", + "zerocopy", ] [[package]] name = "aho-corasick" -version = "1.0.1" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67fc08ce920c31afb70f013dcce1bfc3a3195de6a228474e45e1f145b36f8d04" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" dependencies = [ "memchr", ] [[package]] name = "alloc-no-stdlib" -version = "2.0.3" +version = "2.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35ef4730490ad1c4eae5c4325b2a95f521d023e5c885853ff7aca0a6a1631db3" +checksum = "cc7bb162ec39d46ab1ca8c77bf72e890535becd1751bb45f64c597edb4c8c6b3" [[package]] name = "alloc-stdlib" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "697ed7edc0f1711de49ce108c541623a0af97c6c60b2f6e2b65229847ac843c2" +checksum = "94fb8275041c72129eb51b7d0322c29b8387a0386127718b096429201a5d6ece" dependencies = [ "alloc-no-stdlib", ] [[package]] name = "allocator-api2" -version = "0.2.16" +version = "0.2.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" +checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923" [[package]] name = "android-tzdata" @@ -601,9 +592,9 @@ checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" [[package]] name = "android_system_properties" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7ed72e1635e121ca3e79420540282af22da58be50de153d36f81ddc6b83aa9e" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" dependencies = [ "libc", ] @@ -616,18 +607,18 @@ checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" [[package]] name = "ansi_term" -version = "0.11.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" +checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" dependencies = [ "winapi 0.3.9", ] [[package]] name = "anstream" -version = "0.6.18" +version = "0.6.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b" +checksum = "301af1932e46185686725e0fad2f8f2aa7da69dd70bf6ecc44d6b703844a3933" dependencies = [ "anstyle", "anstyle-parse", @@ -640,35 +631,36 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.10" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9" +checksum = "862ed96ca487e809f1c8e5a8447f6ee2cf102f846893800b20cebdf541fc6bbd" [[package]] name = "anstyle-parse" -version = "0.2.6" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9" +checksum = "4e7644824f0aa2c7b9384579234ef10eb7efb6a0deb83f9630a49594dd9c15c2" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c" +checksum = "6c8bdeb6047d8983be085bab0ba1472e6dc604e7041dbf6fcd5e71523014fae9" dependencies = [ "windows-sys 0.59.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.6" +version = "3.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2109dbce0e72be3ec00bed26e6a7479ca384ad226efdd66db8fa2e3a38c83125" +checksum = "403f75924867bb1033c59fbf0797484329750cfbe3c4325cd33127941fabc882" dependencies = [ "anstyle", + "once_cell_polyfill", "windows-sys 0.59.0", ] @@ -751,7 +743,7 @@ dependencies = [ "num-bigint 0.4.6", "num-traits", "paste", - "rustc_version 0.4.1", + "rustc_version", "zeroize", ] @@ -844,9 +836,9 @@ checksum = "eab1c04a571841102f5345a8fc0f6bb3d31c315dec879b5c6e42e40ce7ffa34e" [[package]] name = "asn1-rs" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf6690c370453db30743b373a60ba498fc0d6d83b11f4abfd87a84a075db5dd4" +checksum = "7f6fd5ddaf0351dff5b8da21b2fb4ff8e08ddd02857f0bf69c47639106c0fff0" dependencies = [ "asn1-rs-derive", "asn1-rs-impl", @@ -883,13 +875,15 @@ dependencies = [ [[package]] name = "assert_cmd" -version = "2.0.8" +version = "2.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9834fcc22e0874394a010230586367d4a3e9f11b560f469262678547e1d2575e" +checksum = "2bd389a4b2970a01282ee455294913c0a43724daedcd1a24c3eb0ec1c1320b66" dependencies = [ - "bstr 1.4.0", + "anstyle", + "bstr", "doc-comment", - "predicates", + "libc", + "predicates 3.1.3", "predicates-core", "predicates-tree", "wait-timeout", @@ -914,15 +908,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" dependencies = [ "concurrent-queue", - "event-listener 2.5.2", + "event-listener 2.5.3", "futures-core", ] [[package]] name = "async-compression" -version = "0.4.1" +version = "0.4.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b74f44609f0f91493e3082d3734d98497e094777144380ea4db9f9905dd5b6" +checksum = "40f6024f3f856663b45fd0c9b6f2024034a702f453549449e0d84a305900dad4" dependencies = [ "brotli", "flate2", @@ -938,30 +932,31 @@ version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18" dependencies = [ - "event-listener 5.3.1", + "event-listener 5.4.0", "event-listener-strategy", "pin-project-lite", ] [[package]] name = "async-stream" -version = "0.3.2" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "171374e7e3b2504e0e5236e3b59260560f9fe94bfe9ac39ba5e4e929c5590625" +checksum = "0b5a71a6f37880a80d1d7f19efd781e4b5de42c88f0722cc13bcb6cc2cfe8476" dependencies = [ "async-stream-impl", "futures-core", + "pin-project-lite", ] [[package]] name = "async-stream-impl" -version = "0.3.2" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "648ed8c8d2ce5409ccd57453d9d1b214b342a0d69376a6feda1fd6cae3299308" +checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.104", ] [[package]] @@ -988,15 +983,15 @@ dependencies = [ [[package]] name = "autocfg" -version = "1.1.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" [[package]] name = "autotools" -version = "0.2.5" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8138adefca3e5d2e73bfba83bd6eeaf904b26a7ac1b4a19892cfe16cc7e1701" +checksum = "ef941527c41b0fc0dd48511a8154cd5fc7e29200a0ff8b7203c5d777dbc795cf" dependencies = [ "cc", ] @@ -1013,7 +1008,7 @@ dependencies = [ "bytes", "futures-util", "http 0.2.12", - "http-body 0.4.5", + "http-body 0.4.6", "hyper 0.14.32", "itoa", "matchit", @@ -1039,7 +1034,7 @@ dependencies = [ "axum-core 0.4.5", "bytes", "futures-util", - "http 1.1.0", + "http 1.3.1", "http-body 1.0.1", "http-body-util", "hyper 1.6.0", @@ -1073,7 +1068,7 @@ dependencies = [ "bytes", "futures-util", "http 0.2.12", - "http-body 0.4.5", + "http-body 0.4.6", "mime", "rustversion", "tower-layer", @@ -1089,7 +1084,7 @@ dependencies = [ "async-trait", "bytes", "futures-util", - "http 1.1.0", + "http 1.3.1", "http-body 1.0.1", "http-body-util", "mime", @@ -1113,7 +1108,7 @@ dependencies = [ "bytes", "libc", "log", - "object 0.36.7", + "object", "once_cell", "thiserror 1.0.69", ] @@ -1126,9 +1121,9 @@ checksum = "c51b96c5a8ed8705b40d655273bc4212cbbf38d4e3be2788f36306f154523ec7" dependencies = [ "bytes", "core-error", - "hashbrown 0.15.1", + "hashbrown 0.15.4", "log", - "object 0.36.7", + "object", "thiserror 1.0.69", ] @@ -1139,7 +1134,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b62ddb9cb1ec0a098ad4bbf9344d0713fa193ae1a80af55febcff2627b6a00c1" dependencies = [ "futures-core", - "getrandom 0.2.15", + "getrandom 0.2.16", "instant", "pin-project-lite", "rand 0.8.5", @@ -1148,17 +1143,17 @@ dependencies = [ [[package]] name = "backtrace" -version = "0.3.68" +version = "0.3.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12" +checksum = "6806a6321ec58106fea15becdad98371e28d92ccbc7c8f1b3b6dd724fe8f1002" dependencies = [ "addr2line", - "cc", "cfg-if 1.0.1", "libc", "miniz_oxide", - "object 0.31.1", + "object", "rustc-demangle", + "windows-targets 0.52.6", ] [[package]] @@ -1196,9 +1191,9 @@ dependencies = [ [[package]] name = "bindgen" -version = "0.69.4" +version = "0.69.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" +checksum = "271383c67ccabffb7381723dea0672a673f292304fcb45c01cc648c7a8d58088" dependencies = [ "bitflags 2.9.1", "cexpr", @@ -1279,25 +1274,13 @@ dependencies = [ "digest 0.10.7", ] -[[package]] -name = "block-buffer" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b" -dependencies = [ - "block-padding", - "byte-tools", - "byteorder", - "generic-array 0.12.4", -] - [[package]] name = "block-buffer" version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" dependencies = [ - "generic-array 0.14.7", + "generic-array", ] [[package]] @@ -1306,25 +1289,16 @@ version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" dependencies = [ - "generic-array 0.14.7", -] - -[[package]] -name = "block-padding" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa79dedbb091f449f1f39e53edf88d5dbe95f895dae6135a8d7b881fb5af73f5" -dependencies = [ - "byte-tools", + "generic-array", ] [[package]] name = "borsh" -version = "0.10.3" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4114279215a005bc675e386011e594e1d9b800918cea18fcadadcce864a2046b" +checksum = "115e54d64eb62cdebad391c19efc9dce4981c690c85a33a12199d99bb9546fee" dependencies = [ - "borsh-derive 0.10.3", + "borsh-derive 0.10.4", "hashbrown 0.13.2", ] @@ -1340,9 +1314,9 @@ dependencies = [ [[package]] name = "borsh-derive" -version = "0.10.3" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0754613691538d51f329cce9af41d7b7ca150bc973056f1156611489475f54f7" +checksum = "831213f80d9423998dd696e2c5345aba6be7a0bd8cd19e31c5243e13df1cef89" dependencies = [ "borsh-derive-internal", "borsh-schema-derive-internal", @@ -1358,7 +1332,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fdd1d3c0c2f5833f22386f252fe8ed005c7f59fdcddeef025c01b4c3b9fd9ac3" dependencies = [ "once_cell", - "proc-macro-crate 3.1.0", + "proc-macro-crate 3.3.0", "proc-macro2", "quote", "syn 2.0.104", @@ -1366,9 +1340,9 @@ dependencies = [ [[package]] name = "borsh-derive-internal" -version = "0.10.3" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afb438156919598d2c7bad7e1c0adf3d26ed3840dbc010db1a882a65583ca2fb" +checksum = "65d6ba50644c98714aa2a70d13d7df3cd75cd2b523a2b452bf010443800976b3" dependencies = [ "proc-macro2", "quote", @@ -1377,9 +1351,9 @@ dependencies = [ [[package]] name = "borsh-schema-derive-internal" -version = "0.10.3" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "634205cc43f74a1b9046ef87c4540ebda95696ec0f315024860cad7c5b0f5ccd" +checksum = "276691d96f063427be83e6692b86148e488ebba9f48f77788724ca027ba3b6d4" dependencies = [ "proc-macro2", "quote", @@ -1388,15 +1362,15 @@ dependencies = [ [[package]] name = "boxcar" -version = "0.2.12" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66bb12751a83493ef4b8da1120451a262554e216a247f14b48cb5e8fe7ed8bdf" +checksum = "26c4925bc979b677330a8c7fe7a8c94af2dbb4a2d37b4a20a80d884400f46baa" [[package]] name = "brotli" -version = "3.3.4" +version = "8.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1a0b1dbcc8ae29329621f8d4f0d835787c1c38bb1401979b49d13b0b305ff68" +checksum = "9991eea70ea4f293524138648e41ee89b0b2b12ddef3b255effa43c8056e0e0d" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -1405,9 +1379,9 @@ dependencies = [ [[package]] name = "brotli-decompressor" -version = "2.3.2" +version = "5.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59ad2d4653bf5ca36ae797b1f4bb4dbddb60ce49ca4aed8a2ce4829f60425b80" +checksum = "874bb8112abecc98cbd6d81ea4fa7e94fb9449648c93cc89aa40c81c24d7de03" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -1424,30 +1398,20 @@ dependencies = [ [[package]] name = "bstr" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223" -dependencies = [ - "memchr", -] - -[[package]] -name = "bstr" -version = "1.4.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3d4260bcc2e8fc9df1eac4919a720effeb63a3f0952f5bf4944adfa18897f09" +checksum = "234113d19d0d7d613b40e86fb654acf958910802bcceab913a4f9e7cda03b1a4" dependencies = [ "memchr", - "once_cell", - "regex-automata 0.1.10", + "regex-automata", "serde", ] [[package]] name = "bumpalo" -version = "3.12.0" +version = "3.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" +checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43" [[package]] name = "bv" @@ -1459,12 +1423,6 @@ dependencies = [ "serde", ] -[[package]] -name = "byte-tools" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" - [[package]] name = "byte-unit" version = "4.0.19" @@ -1521,9 +1479,9 @@ dependencies = [ [[package]] name = "bytesize" -version = "1.1.0" +version = "1.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c58ec36aac5066d5ca17df51b3e70279f5670a72102f5752cb7e7c856adfc70" +checksum = "2e93abca9e28e0a1b9877922aacb20576e05d4679ffa78c3d6dc22a26a216659" [[package]] name = "bzip2" @@ -1537,20 +1495,19 @@ dependencies = [ [[package]] name = "bzip2-sys" -version = "0.1.11+1.0.8" +version = "0.1.13+1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc" +checksum = "225bff33b2141874fe80d71e07d6eec4f85c5c216453dd96388240f96e1acc14" dependencies = [ "cc", - "libc", "pkg-config", ] [[package]] name = "camino" -version = "1.0.9" +version = "1.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "869119e97797867fd90f5e22af7d0bd274bd4635ebb9eb68c04f3f513ae6c412" +checksum = "0da45bc31171d8d6960122e222a67740df867c1dd53b4d51caa297084c185cab" dependencies = [ "serde", ] @@ -1567,9 +1524,9 @@ dependencies = [ [[package]] name = "cargo-platform" -version = "0.1.2" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbdb825da8a5df079a43676dbe042702f1707b1109f713a01420fbb4cc71fa27" +checksum = "e35af189006b9c0f00a064685c727031e3ed2d8020f7ba284d78cc2671bd36ea" dependencies = [ "serde", ] @@ -1582,7 +1539,7 @@ checksum = "eee4243f1f26fc7a42710e7439c149e2b10b05472f88090acce52632f231a73a" dependencies = [ "camino", "cargo-platform", - "semver 1.0.26", + "semver", "serde", "serde_json", "thiserror 1.0.69", @@ -1594,7 +1551,7 @@ version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c24dab4283a142afa2fdca129b80ad2c6284e073930f964c3a1293c225ee39a" dependencies = [ - "rustc_version 0.4.1", + "rustc_version", ] [[package]] @@ -1605,9 +1562,9 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" [[package]] name = "cc" -version = "1.2.16" +version = "1.2.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be714c154be609ec7f5dad223a33bf1482fff90472de28f7362806e6d4832b8c" +checksum = "d487aa071b5f64da6f19a3e848e3578944b726ee5a4854b82172f02aa876bfdc" dependencies = [ "jobserver", "libc", @@ -1684,9 +1641,9 @@ dependencies = [ [[package]] name = "ciborium" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "effd91f6c78e5a4ace8a5d3c0b6bfaec9e2baaef55f3efc00e45fb2e477ee926" +checksum = "42e69ffd6f0917f5c029256a24d0161db17cea3997d185db0d35926308770f0e" dependencies = [ "ciborium-io", "ciborium-ll", @@ -1695,15 +1652,15 @@ dependencies = [ [[package]] name = "ciborium-io" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdf919175532b369853f5d5e20b26b43112613fd6fe7aee757e35f7a44642656" +checksum = "05afea1e0a06c9be33d539b876f1ce3692f4afea2cb41f740e7743225ed1c757" [[package]] name = "ciborium-ll" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "defaa24ecc093c77630e6c15e17c51f5e187bf35ee514f4e2d67baaa96dae22b" +checksum = "57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9" dependencies = [ "ciborium-io", "half", @@ -1721,9 +1678,9 @@ dependencies = [ [[package]] name = "clang-sys" -version = "1.2.2" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10612c0ec0e0a1ff0e97980647cb058a6e7aedb913d01d009c406b8b7d0b26ee" +checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4" dependencies = [ "glob", "libc", @@ -1731,65 +1688,65 @@ dependencies = [ [[package]] name = "clap" -version = "2.33.3" +version = "2.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002" +checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" dependencies = [ "ansi_term", "atty", "bitflags 1.3.2", "strsim 0.8.0", "textwrap 0.11.0", - "unicode-width 0.1.9", + "unicode-width 0.1.14", "vec_map", ] [[package]] name = "clap" -version = "3.2.23" +version = "3.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71655c45cb9845d3270c9d6df84ebe72b4dad3c2ba3f7023ad47c144e4e473a5" +checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123" dependencies = [ "atty", "bitflags 1.3.2", - "clap_derive 3.2.18", + "clap_derive 3.2.25", "clap_lex 0.2.4", "indexmap 1.9.3", "once_cell", "strsim 0.10.0", "termcolor", - "textwrap 0.16.0", + "textwrap 0.16.2", ] [[package]] name = "clap" -version = "4.5.31" +version = "4.5.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "027bb0d98429ae334a8698531da7077bdf906419543a35a55c2cb1b66437d767" +checksum = "40b6887a1d8685cebccf115538db5c0efe625ccac9696ad45c409d96566e910f" dependencies = [ "clap_builder", - "clap_derive 4.5.28", + "clap_derive 4.5.40", ] [[package]] name = "clap_builder" -version = "4.5.31" +version = "4.5.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5589e0cba072e0f3d23791efac0fd8627b49c829c196a492e88168e6a669d863" +checksum = "e0c66c08ce9f0c698cbce5c0279d0bb6ac936d8674174fe48f736533b964f59e" dependencies = [ "anstream", "anstyle", - "clap_lex 0.7.4", + "clap_lex 0.7.5", "strsim 0.11.1", ] [[package]] name = "clap_derive" -version = "3.2.18" +version = "3.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea0c8bce528c4be4da13ea6fead8965e95b6073585a2f05204bd8f4119f82a65" +checksum = "ae6371b8bdc8b7d3959e9cf7b22d4435ef3e79e138688421ec654acf8c81b008" dependencies = [ - "heck 0.4.0", + "heck 0.4.1", "proc-macro-error", "proc-macro2", "quote", @@ -1798,9 +1755,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.28" +version = "4.5.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf4ced95c6f4a675af3da73304b9ac4ed991640c36374e4b46795c49e17cf1ed" +checksum = "d2c7947ae4cc3d851207c1adb5b5e260ff0cca11446b1d6d1423788e442257ce" dependencies = [ "heck 0.5.0", "proc-macro2", @@ -1819,15 +1776,15 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6" +checksum = "b94f61472cee1439c0b966b47e3aca9ae07e45d070759512cd390ea2bebc6675" [[package]] name = "colorchoice" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990" +checksum = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75" [[package]] name = "combine" @@ -1876,30 +1833,10 @@ dependencies = [ "encode_unicode", "libc", "once_cell", - "unicode-width 0.2.0", + "unicode-width 0.2.1", "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 1.0.1", - "wasm-bindgen", -] - -[[package]] -name = "console_log" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e89f72f65e8501878b8a004d5a1afb780987e2ce2b4532c562e367a72c57499f" -dependencies = [ - "log", - "web-sys", -] - [[package]] name = "const_format" version = "0.2.34" @@ -1962,9 +1899,9 @@ dependencies = [ [[package]] name = "core-foundation" -version = "0.10.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b55271e5c8c478ad3f38ad24ef34923091e0548492a266d19b3c0b4d82574c63" +checksum = "b2a6cd9ae233e7f62ba4e9353e81a88df7fc8a5987b8d445b4d90c879bd156f6" dependencies = [ "core-foundation-sys", "libc", @@ -1990,18 +1927,18 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.7" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e4c1eaa2012c47becbbad2ab175484c2a84d1185b566fb2cc5b8707343dfe58" +checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280" dependencies = [ "libc", ] [[package]] name = "crc32fast" -version = "1.2.1" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81156fece84ab6a9f2afdb109ce3ae577e42b1228441eded99bd77f627953b1a" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" dependencies = [ "cfg-if 1.0.1", ] @@ -2015,7 +1952,7 @@ dependencies = [ "anes", "cast 0.3.0", "ciborium", - "clap 4.5.31", + "clap 4.5.40", "criterion-plot", "is-terminal", "itertools 0.10.5", @@ -2066,41 +2003,34 @@ dependencies = [ [[package]] name = "crossbeam-deque" -version = "0.8.1" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e" +checksum = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51" dependencies = [ - "cfg-if 1.0.1", "crossbeam-epoch", "crossbeam-utils", ] [[package]] name = "crossbeam-epoch" -version = "0.9.5" -source = "git+https://github.com/anza-xyz/crossbeam?rev=fd279d707025f0e60951e429bf778b4813d1b6bf#fd279d707025f0e60951e429bf778b4813d1b6bf" +version = "0.9.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" dependencies = [ - "cfg-if 1.0.1", "crossbeam-utils", - "lazy_static", - "memoffset 0.6.4", - "scopeguard", ] [[package]] name = "crossbeam-utils" -version = "0.8.18" +version = "0.8.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3a430a770ebd84726f584a90ee7f020d28db52c6d02138900f22341f866d39c" -dependencies = [ - "cfg-if 1.0.1", -] +checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" [[package]] name = "crunchy" -version = "0.2.2" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" +checksum = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5" [[package]] name = "crypto-common" @@ -2108,7 +2038,7 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" dependencies = [ - "generic-array 0.14.7", + "generic-array", "rand_core 0.6.4", "typenum", ] @@ -2119,7 +2049,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b584a330336237c1eecd3e94266efb216c56ed91225d634cb2991c5f3fd1aeab" dependencies = [ - "generic-array 0.14.7", + "generic-array", "subtle", ] @@ -2137,9 +2067,9 @@ dependencies = [ [[package]] name = "csv-core" -version = "0.1.11" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5efa2b3d7902f4b634a20cae3c9c4e6209dc4779feb6863329607560143efa70" +checksum = "7d02f3b0da4c6504f86e9cd789d8dbafab48c2321be74e9987593de5a894d93d" dependencies = [ "memchr", ] @@ -2188,7 +2118,7 @@ dependencies = [ "digest 0.10.7", "fiat-crypto", "rand_core 0.6.4", - "rustc_version 0.4.1", + "rustc_version", "serde", "subtle", "zeroize", @@ -2207,9 +2137,9 @@ dependencies = [ [[package]] name = "darling" -version = "0.20.1" +version = "0.20.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0558d22a7b463ed0241e993f76f09f30b126687447751a8638587b864e4b3944" +checksum = "fc7f46116c46ff9ab3eb1597a45688b6715c6e628b5c133e288e709a29bcb4ee" dependencies = [ "darling_core", "darling_macro", @@ -2217,23 +2147,23 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.20.1" +version = "0.20.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab8bfa2e259f8ee1ce5e97824a3c55ec4404a0d772ca7fa96bf19f0752a046eb" +checksum = "0d00b9596d185e565c2207a0b01f8bd1a135483d02d9b7b0a54b11da8d53412e" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", - "strsim 0.10.0", + "strsim 0.11.1", "syn 2.0.104", ] [[package]] name = "darling_macro" -version = "0.20.1" +version = "0.20.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29a358ff9f12ec09c3e61fef9b5a9902623a695a46a917b07f269bff1445611a" +checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead" dependencies = [ "darling_core", "quote", @@ -2247,25 +2177,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ "cfg-if 1.0.1", - "hashbrown 0.14.3", + "hashbrown 0.14.5", "lock_api", "once_cell", - "parking_lot_core 0.9.8", + "parking_lot_core 0.9.11", "rayon", "serde", ] [[package]] name = "data-encoding" -version = "2.3.2" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ee2393c4a91429dffb4bedf19f4d6abf27d8a732c8ce4980305d782e5426d57" +checksum = "2a2330da5de22e8a3cb63252ce2abb30116bf5265e89c0e01bc17015ce30a476" [[package]] name = "der-parser" -version = "8.1.0" +version = "8.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42d4bc9b0db0a0df9ae64634ac5bdefb7afcb534e182275ca0beadbe486701c1" +checksum = "dbd676fbbab537128ef0278adb5576cf363cff6aa22a7b24effe97347cfab61e" dependencies = [ "asn1-rs", "displaydoc", @@ -2275,6 +2205,15 @@ dependencies = [ "rusticata-macros", ] +[[package]] +name = "deranged" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c9e6a11ca8224451684bc0d7d5a7adbf8f2fd6887261a1cfc3c0432f9d4068e" +dependencies = [ + "powerfmt", +] + [[package]] name = "derivation-path" version = "0.2.0" @@ -2327,15 +2266,15 @@ dependencies = [ [[package]] name = "derive_more" -version = "0.99.16" +version = "0.99.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40eebddd2156ce1bb37b20bbe5151340a31828b1f2d22ba4141f3531710e38df" +checksum = "6edb4b64a43d977b8e99788fe3a04d483834fba1215a7e02caa415b626497f7f" dependencies = [ "convert_case 0.4.0", "proc-macro2", "quote", - "rustc_version 0.3.3", - "syn 1.0.109", + "rustc_version", + "syn 2.0.104", ] [[package]] @@ -2378,22 +2317,13 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8" -[[package]] -name = "digest" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5" -dependencies = [ - "generic-array 0.12.4", -] - [[package]] name = "digest" version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" dependencies = [ - "generic-array 0.14.7", + "generic-array", ] [[package]] @@ -2439,13 +2369,13 @@ dependencies = [ [[package]] name = "displaydoc" -version = "0.2.3" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bf95dc3f046b9da4f2d51833c0d3547d8564ef6910f5c1ed130306a75b92886" +checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.104", ] [[package]] @@ -2497,9 +2427,9 @@ checksum = "abe71d579d1812060163dff96056261deb5bf6729b100fa2e36a68b9649ba3d3" [[package]] name = "ed25519" -version = "1.2.0" +version = "1.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4620d40f6d2601794401d6dd95a5cf69b6c157852539470eeda433a99b3c0efc" +checksum = "91cff35c70bba8a626e3185d8cd48cc11b5437e1a5bcd15b9b5fa3c64b6dfee7" dependencies = [ "signature", ] @@ -2532,9 +2462,9 @@ dependencies = [ [[package]] name = "educe" -version = "0.4.18" +version = "0.4.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f86b50932a01e7ec5c06160492ab660fb19b6bb2a7878030dd6cd68d21df9d4d" +checksum = "0f0042ff8246a363dbe77d2ceedb073339e85a804b9a47636c6e016a9a32c05f" dependencies = [ "enum-ordinalize", "proc-macro2", @@ -2544,9 +2474,9 @@ dependencies = [ [[package]] name = "either" -version = "1.11.0" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2" +checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719" [[package]] name = "encode_unicode" @@ -2556,9 +2486,9 @@ checksum = "34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0" [[package]] name = "encoding_rs" -version = "0.8.29" +version = "0.8.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a74ea89a0a1b98f6332de42c95baff457ada66d1cb4030f9ff151b2041a1c746" +checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3" dependencies = [ "cfg-if 1.0.1", ] @@ -2574,9 +2504,9 @@ dependencies = [ [[package]] name = "enum-iterator-derive" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03cdc46ec28bd728e67540c528013c6a10eb69a02eb31078a1bda695438cbfb8" +checksum = "a1ab991c1362ac86c61ab6f556cff143daa22e5a15e4e189df818b2fd19fe65b" dependencies = [ "proc-macro2", "quote", @@ -2585,15 +2515,15 @@ dependencies = [ [[package]] name = "enum-ordinalize" -version = "3.1.10" +version = "3.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b166c9e378360dd5a6666a9604bb4f54ae0cac39023ffbac425e917a2a04fef" +checksum = "1bf1fa3f06bbff1ea5b1a9c7b14aa992a39657db60a2759457328d7e058f49ee" dependencies = [ "num-bigint 0.4.6", "num-traits", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.104", ] [[package]] @@ -2611,18 +2541,18 @@ dependencies = [ [[package]] name = "equivalent" -version = "1.0.0" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88bffebc5d80432c9b140ee17875ff173a8ab62faad5b257da912bd2f6c1c0a1" +checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f" [[package]] name = "errno" -version = "0.3.10" +version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d" +checksum = "778e2ac28f6c47af28e4907f13ffd1e1ddbd400980a9abd7c8df189bf578a5ad" dependencies = [ "libc", - "windows-sys 0.59.0", + "windows-sys 0.60.2", ] [[package]] @@ -2643,15 +2573,15 @@ dependencies = [ [[package]] name = "event-listener" -version = "2.5.2" +version = "2.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77f3309417938f28bf8228fcff79a4a37103981e3e186d2ccd19c74b38f4eb71" +checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] name = "event-listener" -version = "5.3.1" +version = "5.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba" +checksum = "3492acde4c3fc54c845eaab3eed8bd00c7a7d881f78bfc801e43a93dec1331ae" dependencies = [ "concurrent-queue", "parking", @@ -2660,20 +2590,14 @@ dependencies = [ [[package]] name = "event-listener-strategy" -version = "0.5.2" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" +checksum = "8be9f3dfaaffdae2972880079a491a1a8bb7cbed0b8dd7a347f668b4150a3b93" dependencies = [ - "event-listener 5.3.1", + "event-listener 5.4.0", "pin-project-lite", ] -[[package]] -name = "fake-simd" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed" - [[package]] name = "fast-math" version = "0.1.1" @@ -2690,16 +2614,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "27cea6e7f512d43b098939ff4d5a5d6fe3db07971e1d05176fe26c642d33f5b8" dependencies = [ "getrandom 0.3.3", - "rand 0.9.0", + "rand 0.9.1", "siphasher 1.0.1", "wide", ] [[package]] name = "fastrand" -version = "2.1.1" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" +checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" [[package]] name = "fd-lock" @@ -2708,7 +2632,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ef033ed5e9bad94e55838ca0ca906db0e043f517adda0c8b79c7a8c66c93c1b5" dependencies = [ "cfg-if 1.0.1", - "rustix 0.38.39", + "rustix 0.38.44", "windows-sys 0.48.0", ] @@ -2726,9 +2650,9 @@ checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d" [[package]] name = "filedescriptor" -version = "0.8.1" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ed3d8a5e20435ff00469e51a0d82049bae66504b5c429920dadf9bb54d47b3f" +checksum = "e40758ed24c9b2eeb76c35fb0aebc66c626084edd827e07e1552279814c6682d" dependencies = [ "libc", "thiserror 1.0.69", @@ -2737,14 +2661,14 @@ dependencies = [ [[package]] name = "filetime" -version = "0.2.15" +version = "0.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "975ccf83d8d9d0d84682850a38c8169027be83368805971cc4f238c2b245bc98" +checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586" dependencies = [ "cfg-if 1.0.1", "libc", - "redox_syscall 0.2.10", - "winapi 0.3.9", + "libredox", + "windows-sys 0.59.0", ] [[package]] @@ -2773,15 +2697,15 @@ checksum = "2551bf44bc5f776c15044b9b94153a00198be06743e262afaaa61f11ac7523a5" [[package]] name = "fixedbitset" -version = "0.4.0" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "398ea4fabe40b9b0d885340a2a991a44c8a645624075ad966d21f88688e2b69e" +checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flate2" -version = "1.0.31" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f211bbe8e69bbd0cfdea405084f128ae8b4aaa6b0b522fc8f2b009084797920" +checksum = "4a3d7db9596fecd151c5f638c0ee5d5bd487b6e0ea232e5dc96d5250f6f94b1d" dependencies = [ "crc32fast", "miniz_oxide", @@ -2834,9 +2758,9 @@ dependencies = [ [[package]] name = "fragile" -version = "2.0.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa" +checksum = "28dd6caf6059519a65843af8fe2a3ae298b14b80179855aeb4adc2c1934ee619" [[package]] name = "fs_extra" @@ -2971,9 +2895,9 @@ dependencies = [ [[package]] name = "gdbstub" -version = "0.6.3" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32c95766e0414f8bfc1d07055574c621b67739466d6ba516c4fef8e99d30d2e6" +checksum = "f4e02bf1b1a624d96925c608f1b268d82a76cbc587ce9e59f7c755e9ea11c75c" dependencies = [ "bitflags 1.3.2", "cfg-if 1.0.1", @@ -3000,9 +2924,9 @@ dependencies = [ [[package]] name = "generator" -version = "0.8.1" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "186014d53bc231d0090ef8d6f03e0920c54d85a5ed22f4f2f74315ec56cf83fb" +checksum = "d18470a76cb7f8ff746cf1f7470914f900252ec36bbc40b569d74b1258446827" dependencies = [ "cc", "cfg-if 1.0.1", @@ -3012,15 +2936,6 @@ dependencies = [ "windows", ] -[[package]] -name = "generic-array" -version = "0.12.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffdf9f34f1447443d37393cc6c2b8313aebddcd96906caf34e54c68d8e57d7bd" -dependencies = [ - "typenum", -] - [[package]] name = "generic-array" version = "0.14.7" @@ -3056,14 +2971,14 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" +checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592" dependencies = [ "cfg-if 1.0.1", "js-sys", "libc", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi 0.11.1+wasi-snapshot-preview1", "wasm-bindgen", ] @@ -3083,27 +2998,27 @@ dependencies = [ [[package]] name = "gimli" -version = "0.27.3" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" +checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" [[package]] name = "glob" -version = "0.3.0" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" +checksum = "a8d1add55171497b4705a648c6b583acafb01d58050a51727785f0b2c8e0a2b2" [[package]] name = "globset" -version = "0.4.8" +version = "0.4.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10463d9ff00a2a068db14231982f5132edebad0d7660cd956a1c30292dbcbfbd" +checksum = "54a1028dfc5f5df5da8a56a73e6c153c9a9708ec57232470703592a3f18e49f5" dependencies = [ - "aho-corasick 0.7.18", - "bstr 0.2.17", - "fnv", + "aho-corasick", + "bstr", "log", - "regex", + "regex-automata", + "regex-syntax", ] [[package]] @@ -3137,7 +3052,7 @@ dependencies = [ "futures-timer", "no-std-compat", "nonzero_ext", - "parking_lot 0.12.3", + "parking_lot 0.12.4", "portable-atomic", "quanta", "rand 0.8.5", @@ -3157,7 +3072,7 @@ dependencies = [ "futures-sink", "futures-util", "http 0.2.12", - "indexmap 2.9.0", + "indexmap 2.10.0", "slab", "tokio", "tokio-util 0.7.15", @@ -3166,9 +3081,13 @@ dependencies = [ [[package]] name = "half" -version = "1.8.2" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" +checksum = "459196ed295495a68f7d7fe1d84f6c4b7ff0e21fe3017b2f283c6fac3ad803c9" +dependencies = [ + "cfg-if 1.0.1", + "crunchy", +] [[package]] name = "hash32" @@ -3194,24 +3113,20 @@ version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" dependencies = [ - "ahash 0.8.11", + "ahash 0.8.12", ] [[package]] name = "hashbrown" -version = "0.14.3" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" -dependencies = [ - "ahash 0.8.11", - "allocator-api2", -] +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" [[package]] name = "hashbrown" -version = "0.15.1" +version = "0.15.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a9bfc1af68b1726ea47d3d5109de126281def866b33970e10fbab11b5dafab3" +checksum = "5971ac85611da7067dbfcabef3c70ebb5606018acd9e2a3903a0da507521e0d5" dependencies = [ "allocator-api2", "equivalent", @@ -3220,18 +3135,17 @@ dependencies = [ [[package]] name = "headers" -version = "0.3.7" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cff78e5788be1e0ab65b04d306b2ed5092c815ec97ec70f4ebd5aee158aa55d" +checksum = "06683b93020a07e3dbcf5f8c0f6d40080d725bea7936fc01ad345c01b97dc270" dependencies = [ - "base64 0.13.1", - "bitflags 1.3.2", + "base64 0.21.7", "bytes", "headers-core", "http 0.2.12", "httpdate", "mime", - "sha-1 0.10.0", + "sha1", ] [[package]] @@ -3245,9 +3159,9 @@ dependencies = [ [[package]] name = "heck" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "heck" @@ -3266,15 +3180,9 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" - -[[package]] -name = "hermit-abi" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f154ce46856750ed433c8649605bf7ed2de3bc35fd9d2a9f30cddd873c80cb08" +checksum = "fc0fef456e4baa96da950455cd02c081ca953b141298e41db3fc7e36b1da849c" [[package]] name = "hex" @@ -3327,10 +3235,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "17ea0a1394df5b6574da6e0c1ade9e78868c9fb0a4e5ef4428e32da4676b85b1" dependencies = [ "digest 0.9.0", - "generic-array 0.14.7", + "generic-array", "hmac 0.8.1", ] +[[package]] +name = "home" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "589533453244b0995c858700322199b2becb13b627df2851f64a2775d024abcf" +dependencies = [ + "windows-sys 0.59.0", +] + [[package]] name = "http" version = "0.2.12" @@ -3344,9 +3261,9 @@ dependencies = [ [[package]] name = "http" -version = "1.1.0" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" +checksum = "f4a85d31aea989eead29a3aaf9e1115a180df8282431156e533de47660892565" dependencies = [ "bytes", "fnv", @@ -3355,9 +3272,9 @@ dependencies = [ [[package]] name = "http-body" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" +checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" dependencies = [ "bytes", "http 0.2.12", @@ -3371,18 +3288,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" dependencies = [ "bytes", - "http 1.1.0", + "http 1.3.1", ] [[package]] name = "http-body-util" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" +checksum = "b021d93e26becf5dc7e1b75b1bed1fd93124b374ceb73f43d4d4eafec896a64a" dependencies = [ "bytes", - "futures-util", - "http 1.1.0", + "futures-core", + "http 1.3.1", "http-body 1.0.1", "pin-project-lite", ] @@ -3395,9 +3312,9 @@ checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87" [[package]] name = "httpdate" -version = "1.0.1" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6456b8a6c8f33fee7d958fcd1b60d55b11940a79e63ae87013e6d22e26034440" +checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "humantime" @@ -3423,7 +3340,7 @@ dependencies = [ "futures-util", "h2", "http 0.2.12", - "http-body 0.4.5", + "http-body 0.4.6", "httparse", "httpdate", "itoa", @@ -3444,7 +3361,7 @@ dependencies = [ "bytes", "futures-channel", "futures-util", - "http 1.1.0", + "http 1.3.1", "http-body 1.0.1", "httparse", "httpdate", @@ -3475,9 +3392,9 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.24.1" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d78e1e73ec14cf7375674f74d7dde185c8206fd9dea6fb6295e8a98098aaa97" +checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" dependencies = [ "futures-util", "http 0.2.12", @@ -3489,12 +3406,11 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.27.5" +version = "0.27.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d191583f3da1305256f22463b9bb0471acad48a4e534a5218b9963e9c1f59b2" +checksum = "e3c93eb611681b207e1fe55d5a71ecf91572ec8a6705cdb6857f7d8d5242cf58" dependencies = [ - "futures-util", - "http 1.1.0", + "http 1.3.1", "hyper 1.6.0", "hyper-util", "rustls 0.23.28", @@ -3502,7 +3418,7 @@ dependencies = [ "tokio", "tokio-rustls 0.26.2", "tower-service", - "webpki-roots 0.26.8", + "webpki-roots 1.0.1", ] [[package]] @@ -3532,16 +3448,16 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.13" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1c293b6b3d21eca78250dc7dbebd6b9210ec5530e038cbfe0661b5c47ab06e8" +checksum = "dc2fdfdbff08affe55bb779f33b053aa1fe5dd5b54c257343c17edfa55711bdb" dependencies = [ "base64 0.22.1", "bytes", "futures-channel", "futures-core", "futures-util", - "http 1.1.0", + "http 1.3.1", "http-body 1.0.1", "hyper 1.6.0", "ipnet", @@ -3556,67 +3472,59 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.46" +version = "0.1.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad2bfd338099682614d3ee3fe0cd72e0b6a41ca6a87f6a74a3bd593c91650501" +checksum = "b0c919e5debc312ad217002b8048a17b7d83f80703865bbfcfebb0458b0b27d8" dependencies = [ "android_system_properties", "core-foundation-sys", + "iana-time-zone-haiku", "js-sys", + "log", "wasm-bindgen", - "winapi 0.3.9", + "windows-core", ] [[package]] -name = "icu_collections" -version = "1.5.0" +name = "iana-time-zone-haiku" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" dependencies = [ - "displaydoc", - "yoke", - "zerofrom", - "zerovec", + "cc", ] [[package]] -name = "icu_locid" -version = "1.5.0" +name = "icu_collections" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637" +checksum = "200072f5d0e3614556f94a9930d5dc3e0662a652823904c3a75dc3b0af7fee47" dependencies = [ "displaydoc", - "litemap", - "tinystr", - "writeable", + "potential_utf", + "yoke", + "zerofrom", "zerovec", ] [[package]] -name = "icu_locid_transform" -version = "1.5.0" +name = "icu_locale_core" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e" +checksum = "0cde2700ccaed3872079a65fb1a78f6c0a36c91570f28755dda67bc8f7d9f00a" dependencies = [ "displaydoc", - "icu_locid", - "icu_locid_transform_data", - "icu_provider", + "litemap", "tinystr", + "writeable", "zerovec", ] -[[package]] -name = "icu_locid_transform_data" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e" - [[package]] name = "icu_normalizer" -version = "1.5.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f" +checksum = "436880e8e18df4d7bbc06d58432329d6458cc84531f7ac5f024e93deadb37979" dependencies = [ "displaydoc", "icu_collections", @@ -3624,67 +3532,54 @@ dependencies = [ "icu_properties", "icu_provider", "smallvec", - "utf16_iter", - "utf8_iter", - "write16", "zerovec", ] [[package]] name = "icu_normalizer_data" -version = "1.5.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516" +checksum = "00210d6893afc98edb752b664b8890f0ef174c8adbb8d0be9710fa66fbbf72d3" [[package]] name = "icu_properties" -version = "1.5.1" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5" +checksum = "016c619c1eeb94efb86809b015c58f479963de65bdb6253345c1a1276f22e32b" dependencies = [ "displaydoc", "icu_collections", - "icu_locid_transform", + "icu_locale_core", "icu_properties_data", "icu_provider", - "tinystr", + "potential_utf", + "zerotrie", "zerovec", ] [[package]] name = "icu_properties_data" -version = "1.5.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569" +checksum = "298459143998310acd25ffe6810ed544932242d3f07083eee1084d83a71bd632" [[package]] name = "icu_provider" -version = "1.5.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9" +checksum = "03c80da27b5f4187909049ee2d72f276f0d9f99a42c306bd0131ecfe04d8e5af" dependencies = [ "displaydoc", - "icu_locid", - "icu_provider_macros", + "icu_locale_core", "stable_deref_trait", "tinystr", "writeable", "yoke", "zerofrom", + "zerotrie", "zerovec", ] -[[package]] -name = "icu_provider_macros" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.104", -] - [[package]] name = "ident_case" version = "1.0.1" @@ -3715,9 +3610,9 @@ dependencies = [ [[package]] name = "idna_adapter" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71" +checksum = "3acae9609540aa318d1bc588455225fb2085b9ed0c4f6bd0d9d5bcd86f1a0344" dependencies = [ "icu_normalizer", "icu_properties", @@ -3776,12 +3671,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.9.0" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e" +checksum = "fe4cd85333e22411419a0bcae1297d25e58c9443848b11dc6a86fefe8c78a661" dependencies = [ "equivalent", - "hashbrown 0.15.1", + "hashbrown 0.15.4", "rayon", ] @@ -3794,24 +3689,24 @@ dependencies = [ "console", "number_prefix", "portable-atomic", - "unicode-width 0.2.0", + "unicode-width 0.2.1", "web-time", ] [[package]] name = "inout" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" +checksum = "879f10e63c20629ecabbb64a8010319738c66a5cd0c29b02d63d272b03751d01" dependencies = [ - "generic-array 0.14.7", + "generic-array", ] [[package]] name = "instant" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" dependencies = [ "cfg-if 1.0.1", ] @@ -3845,13 +3740,13 @@ dependencies = [ [[package]] name = "is-terminal" -version = "0.4.9" +version = "0.4.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" +checksum = "e04d7f318608d35d4b61ddd75cbdaee86b023ebe2bd5a66ee0915f0bf93095a9" dependencies = [ - "hermit-abi 0.3.9", - "rustix 0.38.39", - "windows-sys 0.48.0", + "hermit-abi 0.5.2", + "libc", + "windows-sys 0.59.0", ] [[package]] @@ -3880,9 +3775,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.9" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" +checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c" [[package]] name = "jni" @@ -3908,10 +3803,11 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" [[package]] name = "jobserver" -version = "0.1.32" +version = "0.1.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" +checksum = "38f262f097c174adebe41eb73d66ae9c06b2844fb0da69969647bbddd9b0538a" dependencies = [ + "getrandom 0.3.3", "libc", ] @@ -3942,7 +3838,7 @@ version = "18.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2b99d4207e2a04fb4581746903c2bb7eb376f88de9c699d0f3e10feeac0cd3a" dependencies = [ - "derive_more 0.99.16", + "derive_more 0.99.20", "futures 0.3.31", "jsonrpc-core", "jsonrpc-pubsub", @@ -4062,7 +3958,7 @@ version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2ba15de5aeb137f0f65aa3bf82187647f1285abfe5b20c80c2c37f7007ad519a" dependencies = [ - "borsh 0.10.3", + "borsh 0.10.4", "serde", ] @@ -4087,11 +3983,11 @@ dependencies = [ [[package]] name = "lazy-lru" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b031495510a5a17bfb14e9f1fc00f6efdebfaa9ab04a876a4e153b042a3fe06" +checksum = "a35523c6dfa972e1fd19132ef647eff4360a6546c6271807e1327ca6e8797f96" dependencies = [ - "hashbrown 0.14.3", + "hashbrown 0.15.4", ] [[package]] @@ -4124,9 +4020,20 @@ dependencies = [ [[package]] name = "libm" -version = "0.2.1" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9fbbcab51052fe104eb5e5d351cf728d30a5be1fe14d9be8a3b097481fb97de" + +[[package]] +name = "libredox" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7d73b3f436185384286bd8098d17ec07c9a7d2388a6599f824d8502b529702a" +checksum = "1580801010e535496706ba011c15f8532df6b42297d2e471fec38ceadd8c0638" +dependencies = [ + "bitflags 2.9.1", + "libc", + "redox_syscall 0.5.13", +] [[package]] name = "librocksdb-sys" @@ -4192,9 +4099,9 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.1.3" +version = "1.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de5435b8549c16d423ed0c03dbaafe57cf6c3344744f1242520d59c9d8ecec66" +checksum = "8b70e7a7df205e92a1a4cd9aaae7898dac0aa555503cc0a649494d0d60e7651d" dependencies = [ "cc", "pkg-config", @@ -4215,33 +4122,33 @@ dependencies = [ [[package]] name = "linked-hash-map" -version = "0.5.4" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fb9b38af92608140b86b693604b9ffcc5824240a484d1ecd4795bacb2fe88f3" +checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[package]] name = "linux-raw-sys" -version = "0.4.14" +version = "0.4.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" +checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab" [[package]] name = "linux-raw-sys" -version = "0.9.2" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6db9c683daf087dc577b7506e9695b3d556a9f3849903fa28186283afd6809e9" +checksum = "cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12" [[package]] name = "litemap" -version = "0.7.3" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "643cb0b8d4fcc284004d5fd0d67ccf61dfffadb7f75e1e71bc420f4688a3a704" +checksum = "241eaef5fd12c88705a01fc1066c48c4b36e0dd4377dcdc7ec3942cea7a69956" [[package]] name = "lock_api" -version = "0.4.10" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" +checksum = "96936507f153605bddfcda068dd804796c84324ed2510809e5b2a624c81da765" dependencies = [ "autocfg", "scopeguard", @@ -4293,12 +4200,6 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ca88d725a0a943b096803bd34e73a4437208b6077654cc4ecb2947a5f91618d" -[[package]] -name = "maplit" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d" - [[package]] name = "matches" version = "0.1.10" @@ -4307,15 +4208,15 @@ checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" [[package]] name = "matchit" -version = "0.7.0" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b87248edafb776e59e6ee64a79086f65890d3510f2c656c000bf2a7e8a0aea40" +checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" [[package]] name = "memchr" -version = "2.6.3" +version = "2.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c" +checksum = "32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0" [[package]] name = "memmap2" @@ -4335,15 +4236,6 @@ dependencies = [ "libc", ] -[[package]] -name = "memoffset" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59accc507f1338036a0477ef61afdae33cde60840f4dfe481319ce3ad116ddf9" -dependencies = [ - "autocfg", -] - [[package]] name = "memoffset" version = "0.9.1" @@ -4367,9 +4259,9 @@ dependencies = [ [[package]] name = "mime" -version = "0.3.16" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" [[package]] name = "min-max-heap" @@ -4379,28 +4271,28 @@ checksum = "2687e6cf9c00f48e9284cf9fd15f2ef341d03cc7743abf9df4c5f07fdee50b18" [[package]] name = "minimal-lexical" -version = "0.1.4" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c64630dcdd71f1a64c435f54885086a0de5d6a12d104d69b165fb7d5286d677" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.7.1" +version = "0.8.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316" dependencies = [ - "adler", + "adler2", ] [[package]] name = "mio" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd" +checksum = "78bed444cc8a2160f01cbcf811ef18cac863ad68ae8ca62092e8db51d51c761c" dependencies = [ "libc", - "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.52.0", + "wasi 0.11.1+wasi-snapshot-preview1", + "windows-sys 0.59.0", ] [[package]] @@ -4414,7 +4306,7 @@ dependencies = [ "fragile", "lazy_static", "mockall_derive", - "predicates", + "predicates 2.1.5", "predicates-tree", ] @@ -4459,11 +4351,10 @@ checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" [[package]] name = "native-tls" -version = "0.2.11" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" +checksum = "87de3442987e9dbec73158d5c715e7ad9072fda936bb03d19d7fa10e00520f0e" dependencies = [ - "lazy_static", "libc", "log", "openssl", @@ -4477,9 +4368,9 @@ dependencies = [ [[package]] name = "net2" -version = "0.2.37" +version = "0.2.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "391630d12b68002ae1e25e8f974306474966550ad82dac6886fb8910c19568ae" +checksum = "b13b648036a2339d06de780866fbdfda0dde886de7b3af2ddeba8b14f4ee34ac" dependencies = [ "cfg-if 0.1.10", "libc", @@ -4496,7 +4387,7 @@ dependencies = [ "cfg-if 1.0.1", "cfg_aliases", "libc", - "memoffset 0.9.1", + "memoffset", ] [[package]] @@ -4507,13 +4398,12 @@ checksum = "b93853da6d84c2e3c7d730d6473e8817692dd89be387eb01b94d7f108ecb5b8c" [[package]] name = "nom" -version = "7.0.0" +version = "7.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffd9d26838a953b4af82cbeb9f1592c6798916983959be223a7124e992742c1" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" dependencies = [ "memchr", "minimal-lexical", - "version_check", ] [[package]] @@ -4573,6 +4463,12 @@ dependencies = [ "num-traits", ] +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + [[package]] name = "num-derive" version = "0.4.2" @@ -4595,9 +4491,9 @@ dependencies = [ [[package]] name = "num-iter" -version = "0.1.43" +version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" +checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf" dependencies = [ "autocfg", "num-integer", @@ -4631,7 +4527,7 @@ version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "91df4bbde75afed763b708b7eee1e8e7651e02d97f6d5dd763e89367e957b23b" dependencies = [ - "hermit-abi 0.5.1", + "hermit-abi 0.5.2", "libc", ] @@ -4651,36 +4547,18 @@ version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77e878c846a8abae00dd069496dbe8751b16ac1c3d6bd2a7283a938e8228f90d" dependencies = [ - "proc-macro-crate 3.1.0", + "proc-macro-crate 3.3.0", "proc-macro2", "quote", "syn 2.0.104", ] -[[package]] -name = "num_threads" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97ba99ba6393e2c3734791401b66902d981cb03bf190af674ca69949b6d5fb15" -dependencies = [ - "libc", -] - [[package]] name = "number_prefix" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" -[[package]] -name = "object" -version = "0.31.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1" -dependencies = [ - "memchr", -] - [[package]] name = "object" version = "0.36.7" @@ -4688,16 +4566,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87" dependencies = [ "crc32fast", - "hashbrown 0.15.1", - "indexmap 2.9.0", + "hashbrown 0.15.4", + "indexmap 2.10.0", "memchr", ] [[package]] name = "oid-registry" -version = "0.6.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d4bda43fd1b844cbc6e6e54b5444e2b1bc7838bce59ad205902cccbb26d6761" +checksum = "9bedf36ffb6ba96c2eb7144ef6270557b52e54b20c0a8e1eb2ff99a6c6959bff" dependencies = [ "asn1-rs", ] @@ -4709,22 +4587,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" [[package]] -name = "oorandom" -version = "11.1.3" +name = "once_cell_polyfill" +version = "1.70.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" +checksum = "a4895175b425cb1f87721b59f0f286c2092bd4af812243672510e1ac53e2e0ad" [[package]] -name = "opaque-debug" -version = "0.2.3" +name = "oorandom" +version = "11.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c" +checksum = "d6790f58c7ff633d8771f42965289203411a5e5c68388703c06e14f24770b41e" [[package]] name = "opaque-debug" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" +checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" [[package]] name = "openssl" @@ -4754,15 +4632,15 @@ dependencies = [ [[package]] name = "openssl-probe" -version = "0.1.4" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28988d872ab76095a6e6ac88d99b54fd267702734fd7ffe610ca27f533ddb95a" +checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e" [[package]] name = "openssl-src" -version = "300.3.1+3.3.1" +version = "300.5.0+3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7259953d42a81bf137fbbd73bd30a8e1914d6dce43c2b90ed575783a22608b91" +checksum = "e8ce546f549326b0e6052b649198487d91320875da901e7bd11a06d1ee3f9c2f" dependencies = [ "cc", ] @@ -4801,9 +4679,9 @@ dependencies = [ [[package]] name = "os_str_bytes" -version = "6.0.0" +version = "6.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e22443d1643a904602595ba1cd8f7d896afe56d26712531c5ff73a15b2fbf64" +checksum = "e2355d85b9a3786f481747ced0e0ff2ba35213a1f9bd406ed906554d7af805a1" [[package]] name = "owo-colors" @@ -4839,51 +4717,51 @@ checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" dependencies = [ "instant", "lock_api", - "parking_lot_core 0.8.5", + "parking_lot_core 0.8.6", ] [[package]] name = "parking_lot" -version = "0.12.3" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" +checksum = "70d58bf43669b5795d1576d0641cfb6fbb2057bf629506267a92807158584a13" dependencies = [ "lock_api", - "parking_lot_core 0.9.8", + "parking_lot_core 0.9.11", ] [[package]] name = "parking_lot_core" -version = "0.8.5" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216" +checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" dependencies = [ "cfg-if 1.0.1", "instant", "libc", - "redox_syscall 0.2.10", + "redox_syscall 0.2.16", "smallvec", "winapi 0.3.9", ] [[package]] name = "parking_lot_core" -version = "0.9.8" +version = "0.9.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" +checksum = "bc838d2a56b5b1a6c25f55575dfc605fabb63bb2365f6c2353ef9159aa69e4a5" dependencies = [ "cfg-if 1.0.1", "libc", - "redox_syscall 0.3.5", + "redox_syscall 0.5.13", "smallvec", - "windows-targets 0.48.0", + "windows-targets 0.52.6", ] [[package]] name = "paste" -version = "1.0.9" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1de2e551fb905ac83f73f7aedf2f0cb4a0da7e35efa24a202a936269f1f18e1" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "pbkdf2" @@ -4946,18 +4824,20 @@ dependencies = [ [[package]] name = "pest" -version = "2.1.3" +version = "2.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10f4872ae94d7b90ae48754df22fd42ad52ce740b8f370b03da4835417403e53" +checksum = "1db05f56d34358a8b1066f67cbb203ee3e7ed2ba674a6263a1d5ec6db2204323" dependencies = [ + "memchr", + "thiserror 2.0.12", "ucd-trie", ] [[package]] name = "pest_derive" -version = "2.1.0" +version = "2.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "833d1ae558dc601e9a60366421196a8d94bc0ac980476d0b67e1d0988d72b2d0" +checksum = "bb056d9e8ea77922845ec74a1c4e8fb17e7c218cc4fc11a15c5d25e189aa40bc" dependencies = [ "pest", "pest_generator", @@ -4965,36 +4845,35 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.1.3" +version = "2.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99b8db626e31e5b81787b9783425769681b347011cc59471e33ea46d2ea0cf55" +checksum = "87e404e638f781eb3202dc82db6760c8ae8a1eeef7fb3fa8264b2ef280504966" dependencies = [ "pest", "pest_meta", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.104", ] [[package]] name = "pest_meta" -version = "2.1.3" +version = "2.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54be6e404f5317079812fc8f9f5279de376d8856929e21c184ecf6bbd692a11d" +checksum = "edd1101f170f5903fde0914f899bb503d9ff5271d7ba76bbb70bea63690cc0d5" dependencies = [ - "maplit", "pest", - "sha-1 0.8.2", + "sha2 0.10.9", ] [[package]] name = "petgraph" -version = "0.6.0" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a13a2fa9d0b63e5f22328828741e523766fff0ee9e779316902290dff3f824f" +checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" dependencies = [ "fixedbitset", - "indexmap 1.9.3", + "indexmap 2.10.0", ] [[package]] @@ -5009,29 +4888,29 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.0.12" +version = "1.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad29a609b6bcd67fee905812e544992d216af9d755757c05ed2d0e15a74c6ecc" +checksum = "677f1add503faace112b9f1373e43e9e054bfdd22ff1a63c1bc485eaec6a6a8a" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.0.12" +version = "1.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55" +checksum = "6e918e4ff8c4549eb882f14b3a4bc8c8bc93de829416eacf579f1207a8fbf861" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.104", ] [[package]] name = "pin-project-lite" -version = "0.2.14" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" +checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b" [[package]] name = "pin-utils" @@ -5041,15 +4920,15 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkg-config" -version = "0.3.22" +version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12295df4f294471248581bc09bef3c38a5e46f1e36d6a37353621a0c6c357e1f" +checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c" [[package]] name = "plotters" -version = "0.3.4" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2538b639e642295546c50fcd545198c9d64ee2a38620a628724a3b266d5fbf97" +checksum = "5aeb6f403d7a4911efb1e33402027fc44f29b5bf6def3effcc22d7bb75f2b747" dependencies = [ "num-traits", "plotters-backend", @@ -5060,15 +4939,15 @@ dependencies = [ [[package]] name = "plotters-backend" -version = "0.3.4" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "193228616381fecdc1224c62e96946dfbc73ff4384fba576e052ff8c1bea8142" +checksum = "df42e13c12958a16b3f7f4386b9ab1f3e7933914ecea48da7139435263a4172a" [[package]] name = "plotters-svg" -version = "0.3.3" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9a81d2759aae1dae668f783c308bc5c8ebd191ff4184aaa1b37f65a6ae5a56f" +checksum = "51bae2ac328883f7acdfea3d66a7c35751187f870bc81f94563733a154d7a670" dependencies = [ "plotters-backend", ] @@ -5081,21 +4960,39 @@ checksum = "9d1fe60d06143b2430aa532c94cfe9e29783047f06c0d7fd359a9a51b729fa25" dependencies = [ "cfg-if 1.0.1", "cpufeatures", - "opaque-debug 0.3.0", + "opaque-debug", "universal-hash", ] [[package]] name = "portable-atomic" -version = "1.7.0" +version = "1.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483" + +[[package]] +name = "potential_utf" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5a7c30837279ca13e7c867e9e40053bc68740f988cb07f7ca6df43cc734b585" +dependencies = [ + "zerovec", +] + +[[package]] +name = "powerfmt" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" [[package]] name = "ppv-lite86" -version = "0.2.15" +version = "0.2.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed0cfbc8191465bed66e1718596ee0b0b35d5ee1f41c5df2189d0fe8bde535ba" +checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9" +dependencies = [ + "zerocopy", +] [[package]] name = "predicates" @@ -5111,17 +5008,28 @@ dependencies = [ "regex", ] +[[package]] +name = "predicates" +version = "3.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5d19ee57562043d37e82899fade9a22ebab7be9cef5026b07fda9cdd4293573" +dependencies = [ + "anstyle", + "difflib", + "predicates-core", +] + [[package]] name = "predicates-core" -version = "1.0.2" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57e35a3326b75e49aa85f5dc6ec15b41108cf5aee58eabb1f274dd18b73c2451" +checksum = "727e462b119fe9c93fd0eb1429a5f7647394014cf3c04ab2c0350eeb09095ffa" [[package]] name = "predicates-tree" -version = "1.0.4" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "338c7be2905b732ae3984a2f40032b5e94fd8f52505b186c7d4d68d193445df7" +checksum = "72dd2d6d381dfb73a193c7fca536518d7caee39fc8503f74e7dc0be0531b425c" dependencies = [ "predicates-core", "termtree", @@ -5135,9 +5043,9 @@ checksum = "c6fa0831dd7cc608c38a5e323422a0077678fa5744aa2be4ad91c4ece8eec8d5" [[package]] name = "prettyplease" -version = "0.1.9" +version = "0.1.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b83ec2d0af5c5c556257ff52c9f98934e243b9fd39604bfb2a9b75ec2e97f18" +checksum = "6c8646e95016a7a6c4adea95bafa8a16baab64b583356217f2c85db4a39d9a86" dependencies = [ "proc-macro2", "syn 1.0.109", @@ -5149,7 +5057,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2f28921629370a46cf564f6ba1828bd8d1c97f7fad4ee9d1c6438f92feed6b8d" dependencies = [ - "ahash 0.8.11", + "ahash 0.8.12", ] [[package]] @@ -5158,16 +5066,16 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1d6ea3c4595b96363c13943497db34af4460fb474a95c43f4446ad341b8c9785" dependencies = [ - "toml 0.5.8", + "toml 0.5.11", ] [[package]] name = "proc-macro-crate" -version = "3.1.0" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" +checksum = "edce586971a4dfaa28950c6f18ed55e0406c1ab88bbce2c6f6293a7aaba73d35" dependencies = [ - "toml_edit 0.21.1", + "toml_edit", ] [[package]] @@ -5235,7 +5143,7 @@ dependencies = [ "bitflags 2.9.1", "lazy_static", "num-traits", - "rand 0.9.0", + "rand 0.9.1", "rand_chacha 0.9.0", "rand_xorshift", "regex-syntax", @@ -5261,7 +5169,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "119533552c9a7ffacc21e099c24a0ac8bb19c2a2a3f363de84cd9b844feab270" dependencies = [ "bytes", - "heck 0.4.0", + "heck 0.4.1", "itertools 0.10.5", "lazy_static", "log", @@ -5337,15 +5245,15 @@ dependencies = [ [[package]] name = "quanta" -version = "0.12.3" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e5167a477619228a0b284fac2674e3c388cba90631d7b7de620e6f1fcd08da5" +checksum = "f3ab5a9d756f0d97bdc89019bd2e4ea098cf9cde50ee7564dde6b81ccc8f06c7" dependencies = [ "crossbeam-utils", "libc", "once_cell", "raw-cpuid", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi 0.11.1+wasi-snapshot-preview1", "web-sys", "winapi 0.3.9", ] @@ -5367,7 +5275,7 @@ dependencies = [ "pin-project-lite", "quinn-proto", "quinn-udp", - "rustc-hash 2.0.0", + "rustc-hash 2.1.1", "rustls 0.23.28", "socket2", "thiserror 2.0.12", @@ -5386,9 +5294,9 @@ dependencies = [ "fastbloom", "getrandom 0.3.3", "lru-slab", - "rand 0.9.0", + "rand 0.9.1", "ring", - "rustc-hash 2.0.0", + "rustc-hash 2.1.1", "rustls 0.23.28", "rustls-pki-types", "rustls-platform-verifier", @@ -5401,10 +5309,11 @@ dependencies = [ [[package]] name = "quinn-udp" -version = "0.5.5" +version = "0.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fe68c2e9e1a1234e218683dbdf9f9dfcb094113c5ac2b938dfcb9bab4c4140b" +checksum = "fcebb1209ee276352ef14ff8732e24cc2b02bbac986cd74a4c81bcb2f9881970" dependencies = [ + "cfg_aliases", "libc", "once_cell", "socket2", @@ -5423,9 +5332,9 @@ dependencies = [ [[package]] name = "r-efi" -version = "5.2.0" +version = "5.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74765f6d916ee2faa39bc8e68e4f3ed8949b48cccdac59983d287a7cb71ce9c5" +checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f" [[package]] name = "radium" @@ -5472,13 +5381,12 @@ dependencies = [ [[package]] name = "rand" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3779b94aeb87e8bd4e834cee3650289ee9e0d5677f976ecdb6d219e5f4f6cd94" +checksum = "9fbfd9d094a40bf3ae768db9361049ace4c0e04a4fd6b359518bd7b73a73dd97" dependencies = [ "rand_chacha 0.9.0", "rand_core 0.9.3", - "zerocopy 0.8.23", ] [[package]] @@ -5541,7 +5449,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.15", + "getrandom 0.2.16", ] [[package]] @@ -5591,9 +5499,9 @@ dependencies = [ [[package]] name = "raw-cpuid" -version = "11.1.0" +version = "11.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb9ee317cfe3fbd54b36a511efc1edd42e216903c9cd575e686dd68a2ba90d8d" +checksum = "c6df7ab838ed27997ba19a4664507e6f82b41fe6e20be42929332156e5e85146" dependencies = [ "bitflags 2.9.1", ] @@ -5633,30 +5541,31 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.2.10" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8383f39639269cde97d255a32bdb68c047337295414940c68bdd30c2e13203ff" +checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" dependencies = [ "bitflags 1.3.2", ] [[package]] name = "redox_syscall" -version = "0.3.5" +version = "0.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +checksum = "0d04b7d0ee6b4a0207a0a7adb104d23ecb0b47d6beae7152d0fa34b692b29fd6" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.9.1", ] [[package]] name = "redox_users" -version = "0.4.0" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "528532f3d801c87aec9def2add9ca802fe569e44a544afe633765267840abe64" +checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" dependencies = [ - "getrandom 0.2.15", - "redox_syscall 0.2.10", + "getrandom 0.2.16", + "libredox", + "thiserror 1.0.69", ] [[package]] @@ -5680,25 +5589,19 @@ version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" dependencies = [ - "aho-corasick 1.0.1", + "aho-corasick", "memchr", - "regex-automata 0.4.8", + "regex-automata", "regex-syntax", ] [[package]] name = "regex-automata" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" - -[[package]] -name = "regex-automata" -version = "0.4.8" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3" +checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" dependencies = [ - "aho-corasick 1.0.1", + "aho-corasick", "memchr", "regex-syntax", ] @@ -5723,9 +5626,9 @@ dependencies = [ "futures-util", "h2", "http 0.2.12", - "http-body 0.4.5", + "http-body 0.4.6", "hyper 0.14.32", - "hyper-rustls 0.24.1", + "hyper-rustls 0.24.2", "hyper-tls", "ipnet", "js-sys", @@ -5751,7 +5654,7 @@ dependencies = [ "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "webpki-roots 0.25.2", + "webpki-roots 0.25.4", "winreg", ] @@ -5767,11 +5670,11 @@ dependencies = [ "futures-channel", "futures-core", "futures-util", - "http 1.1.0", + "http 1.3.1", "http-body 1.0.1", "http-body-util", "hyper 1.6.0", - "hyper-rustls 0.27.5", + "hyper-rustls 0.27.7", "hyper-util", "js-sys", "log", @@ -5794,7 +5697,7 @@ dependencies = [ "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "webpki-roots 1.0.0", + "webpki-roots 1.0.1", ] [[package]] @@ -5805,7 +5708,7 @@ checksum = "57f17d28a6e6acfe1733fe24bcd30774d13bffa4b8a22535b4c8c98423088d4e" dependencies = [ "anyhow", "async-trait", - "http 1.1.0", + "http 1.3.1", "reqwest 0.12.20", "serde", "thiserror 1.0.69", @@ -5820,7 +5723,7 @@ checksum = "a4689e6c2294d81e88dc6261c768b63bc4fcdb852be6d1352498b114f61383b7" dependencies = [ "cc", "cfg-if 1.0.1", - "getrandom 0.2.15", + "getrandom 0.2.16", "libc", "untrusted", "windows-sys 0.52.0", @@ -5858,19 +5761,19 @@ dependencies = [ [[package]] name = "rtoolbox" -version = "0.0.1" +version = "0.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "034e22c514f5c0cb8a10ff341b9b048b5ceb21591f31c8f44c43b960f9b3524a" +checksum = "a7cc970b249fbe527d6e02e0a227762c9108b2f49d81094fe357ffc6d14d7f6f" dependencies = [ "libc", - "winapi 0.3.9", + "windows-sys 0.52.0", ] [[package]] name = "rustc-demangle" -version = "0.1.21" +version = "0.1.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342" +checksum = "989e6739f80c4ad5b13e0fd7fe89531180375b18520cc8c82080e4dc4035b84f" [[package]] name = "rustc-hash" @@ -5880,18 +5783,9 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustc-hash" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152" - -[[package]] -name = "rustc_version" -version = "0.3.3" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0dfe2087c51c460008730de8b57e6a320782fbfb312e1f4d520e6c6fae155ee" -dependencies = [ - "semver 0.11.0", -] +checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d" [[package]] name = "rustc_version" @@ -5899,7 +5793,7 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" dependencies = [ - "semver 1.0.26", + "semver", ] [[package]] @@ -5913,27 +5807,27 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.39" +version = "0.38.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "375116bee2be9ed569afe2154ea6a99dfdffd257f533f187498c2a8f5feaf4ee" +checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154" dependencies = [ "bitflags 2.9.1", "errno", "libc", - "linux-raw-sys 0.4.14", - "windows-sys 0.52.0", + "linux-raw-sys 0.4.15", + "windows-sys 0.59.0", ] [[package]] name = "rustix" -version = "1.0.2" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7178faa4b75a30e269c71e61c353ce2748cf3d76f0c44c393f4e60abf49b825" +checksum = "c71e83d6afe7ff64890ec6b71d6a69bb8a610ab78ce364b3352876bb4c801266" dependencies = [ "bitflags 2.9.1", "errno", "libc", - "linux-raw-sys 0.9.2", + "linux-raw-sys 0.9.4", "windows-sys 0.59.0", ] @@ -5958,7 +5852,7 @@ dependencies = [ "once_cell", "ring", "rustls-pki-types", - "rustls-webpki 0.103.2", + "rustls-webpki 0.103.3", "subtle", "zeroize", ] @@ -5977,29 +5871,30 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "1.0.0" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7522c9de787ff061458fe9a829dc790a3f5b22dc571694fc5883f448b94d9a9" +checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" dependencies = [ - "base64 0.13.1", + "base64 0.21.7", ] [[package]] name = "rustls-pki-types" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "917ce264624a4b4db1c364dcc35bfca9ded014d0a958cd47ad3e960e988ea51c" +checksum = "229a4a4c221013e7e1f1a043678c5cc39fe5171437c88fb47151a21e6f5b5c79" dependencies = [ "web-time", + "zeroize", ] [[package]] name = "rustls-platform-verifier" -version = "0.5.1" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a5467026f437b4cb2a533865eaa73eb840019a0916f4b9ec563c6e617e086c9" +checksum = "19787cda76408ec5404443dc8b31795c87cd8fec49762dc75fa727740d34acc1" dependencies = [ - "core-foundation 0.10.0", + "core-foundation 0.10.1", "core-foundation-sys", "jni", "log", @@ -6007,10 +5902,10 @@ dependencies = [ "rustls 0.23.28", "rustls-native-certs", "rustls-platform-verifier-android", - "rustls-webpki 0.103.2", + "rustls-webpki 0.103.3", "security-framework 3.2.0", "security-framework-sys", - "webpki-root-certs", + "webpki-root-certs 0.26.11", "windows-sys 0.59.0", ] @@ -6032,9 +5927,9 @@ dependencies = [ [[package]] name = "rustls-webpki" -version = "0.103.2" +version = "0.103.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7149975849f1abb3832b246010ef62ccc80d3a76169517ada7188252b9cfb437" +checksum = "e4a72fe2bcf7a6ac6fd7d0b9e5cb68aeb7d4c0a0271730218b3e92d43b4eb435" dependencies = [ "ring", "rustls-pki-types", @@ -6043,9 +5938,9 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.17" +version = "1.0.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" +checksum = "8a0d197bd2c9dc6e53b84da9556a69ba4cdfab8619eb41a8bd1cc2027a0f6b1d" [[package]] name = "rusty-fork" @@ -6061,9 +5956,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.5" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" +checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f" [[package]] name = "safe_arch" @@ -6085,12 +5980,11 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.19" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f05ba609c234e60bee0d547fe94a4c7e9da733d1c962cf6e59efa4cd9c8bc75" +checksum = "1f29ebaa345f945cec9fbbc532eb307f0fdad8161f281b6369539c8d84876b3d" dependencies = [ - "lazy_static", - "winapi 0.3.9", + "windows-sys 0.59.0", ] [[package]] @@ -6135,7 +6029,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "271720403f46ca04f7ba6f55d438f8bd878d6b8ca0a1046e8228c4145bcbb316" dependencies = [ "bitflags 2.9.1", - "core-foundation 0.10.0", + "core-foundation 0.10.1", "core-foundation-sys", "libc", "security-framework-sys", @@ -6151,15 +6045,6 @@ dependencies = [ "libc", ] -[[package]] -name = "semver" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6" -dependencies = [ - "semver-parser", -] - [[package]] name = "semver" version = "1.0.26" @@ -6169,22 +6054,13 @@ dependencies = [ "serde", ] -[[package]] -name = "semver-parser" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0bef5b7f9e0df16536d3961cfb6e84331c065b4066afb39768d0e319411f7" -dependencies = [ - "pest", -] - [[package]] name = "seqlock" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b5c67b6f14ecc5b86c66fa63d76b5092352678545a8a3cdae80aef5128371910" dependencies = [ - "parking_lot 0.12.3", + "parking_lot 0.12.4", ] [[package]] @@ -6239,9 +6115,9 @@ dependencies = [ [[package]] name = "serde_path_to_error" -version = "0.1.16" +version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af99884400da37c88f5e9146b7f1fd0fbcae8f6eec4e9da38b67d05486f814a6" +checksum = "59fab13f937fa393d08645bf3a84bdfe86e296747b506ada67bb15f10f218b2a" dependencies = [ "itoa", "serde", @@ -6249,9 +6125,9 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "0.6.5" +version = "0.6.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" +checksum = "bf41e0cfaf7226dca15e8197172c295a782857fcb97fad1808a166870dee75a3" dependencies = [ "serde", ] @@ -6309,7 +6185,7 @@ version = "0.9.34+deprecated" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" dependencies = [ - "indexmap 2.9.0", + "indexmap 2.10.0", "itoa", "ryu", "serde", @@ -6326,7 +6202,7 @@ dependencies = [ "futures 0.3.31", "lazy_static", "log", - "parking_lot 0.12.3", + "parking_lot 0.12.4", "serial_test_derive", ] @@ -6341,18 +6217,6 @@ dependencies = [ "syn 2.0.104", ] -[[package]] -name = "sha-1" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7d94d0bede923b3cea61f3f1ff57ff8cdfd77b400fb8f9998949e0cf04163df" -dependencies = [ - "block-buffer 0.7.3", - "digest 0.8.1", - "fake-simd", - "opaque-debug 0.2.3", -] - [[package]] name = "sha-1" version = "0.9.8" @@ -6363,25 +6227,14 @@ dependencies = [ "cfg-if 1.0.1", "cpufeatures", "digest 0.9.0", - "opaque-debug 0.3.0", -] - -[[package]] -name = "sha-1" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "028f48d513f9678cda28f6e4064755b3fbb2af6acd672f2c209b62323f7aea0f" -dependencies = [ - "cfg-if 1.0.1", - "cpufeatures", - "digest 0.10.7", + "opaque-debug", ] [[package]] name = "sha1" -version = "0.10.5" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" dependencies = [ "cfg-if 1.0.1", "cpufeatures", @@ -6398,7 +6251,7 @@ dependencies = [ "cfg-if 1.0.1", "cpufeatures", "digest 0.9.0", - "opaque-debug 0.3.0", + "opaque-debug", ] [[package]] @@ -6424,9 +6277,9 @@ dependencies = [ [[package]] name = "sharded-slab" -version = "0.1.4" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31" +checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" dependencies = [ "lazy_static", ] @@ -6474,18 +6327,18 @@ dependencies = [ [[package]] name = "signal-hook-registry" -version = "1.4.0" +version = "1.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0" +checksum = "9203b8055f63a2a00e2f593bb0510367fe707d7ff1e5c872de2f537b339e5410" dependencies = [ "libc", ] [[package]] name = "signature" -version = "1.4.0" +version = "1.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02658e48d89f2bec991f9a78e69cfa4c316f8d6a6c4ec12fae1aeb263d486788" +checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c" [[package]] name = "simpl" @@ -6565,14 +6418,12 @@ dependencies = [ "httparse", "log", "rand 0.8.5", - "sha-1 0.9.8", + "sha-1", ] [[package]] name = "solana-account" version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f949fe4edaeaea78c844023bfc1c898e0b1f5a100f8a8d2d0f85d0a7b090258" dependencies = [ "bincode", "qualifier_attr", @@ -6651,8 +6502,6 @@ dependencies = [ [[package]] name = "solana-account-info" version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8f5152a288ef1912300fc6efa6c2d1f9bb55d9398eb6c72326360b8063987da" dependencies = [ "bincode", "serde", @@ -6665,7 +6514,7 @@ dependencies = [ name = "solana-accounts-bench" version = "3.0.0" dependencies = [ - "clap 2.33.3", + "clap 2.34.0", "log", "rayon", "solana-accounts-db", @@ -6682,7 +6531,7 @@ dependencies = [ name = "solana-accounts-cluster-bench" version = "3.0.0" dependencies = [ - "clap 2.33.3", + "clap 2.34.0", "log", "rand 0.8.5", "rayon", @@ -6698,12 +6547,12 @@ dependencies = [ "solana-gossip", "solana-hash", "solana-instruction", - "solana-keypair", + "solana-keypair 2.2.3", "solana-local-cluster", "solana-logger", "solana-measure", "solana-message", - "solana-native-token", + "solana-native-token 2.3.0", "solana-net-utils", "solana-poh-config", "solana-program-pack", @@ -6729,7 +6578,7 @@ version = "3.0.0" dependencies = [ "agave-io-uring", "agave-reserved-account-keys", - "ahash 0.8.11", + "ahash 0.8.12", "assert_matches", "bincode", "blake3", @@ -6740,7 +6589,7 @@ dependencies = [ "criterion", "crossbeam-channel", "dashmap", - "indexmap 2.9.0", + "indexmap 2.10.0", "io-uring", "itertools 0.12.1", "libc", @@ -6748,7 +6597,7 @@ dependencies = [ "log", "lz4", "memmap2 0.9.5", - "memoffset 0.9.1", + "memoffset", "modular-bitfield", "num_cpus", "num_enum", @@ -6775,7 +6624,7 @@ dependencies = [ "solana-genesis-config", "solana-hash", "solana-instruction", - "solana-keypair", + "solana-keypair 2.2.3", "solana-lattice-hash", "solana-logger", "solana-measure", @@ -6816,8 +6665,6 @@ dependencies = [ [[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", @@ -6833,10 +6680,8 @@ dependencies = [ [[package]] name = "solana-atomic-u64" version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52e52720efe60465b052b9e7445a01c17550666beec855cce66f44766697bc2" dependencies = [ - "parking_lot 0.12.3", + "parking_lot 0.12.4", ] [[package]] @@ -6845,7 +6690,7 @@ version = "3.0.0" dependencies = [ "agave-banking-stage-ingress-types", "assert_matches", - "clap 3.2.23", + "clap 3.2.25", "crossbeam-channel", "log", "rand 0.8.5", @@ -6855,7 +6700,7 @@ dependencies = [ "solana-core", "solana-gossip", "solana-hash", - "solana-keypair", + "solana-keypair 2.2.3", "solana-ledger", "solana-logger", "solana-measure", @@ -6956,7 +6801,7 @@ dependencies = [ name = "solana-bench-streamer" version = "3.0.0" dependencies = [ - "clap 3.2.23", + "clap 3.2.25", "crossbeam-channel", "solana-net-utils", "solana-streamer", @@ -6969,7 +6814,7 @@ version = "3.0.0" dependencies = [ "agave-feature-set", "chrono", - "clap 2.33.3", + "clap 2.34.0", "crossbeam-channel", "csv", "log", @@ -6995,13 +6840,13 @@ dependencies = [ "solana-gossip", "solana-hash", "solana-instruction", - "solana-keypair", + "solana-keypair 2.2.3", "solana-local-cluster", "solana-logger", "solana-measure", "solana-message", "solana-metrics", - "solana-native-token", + "solana-native-token 2.3.0", "solana-net-utils", "solana-nonce", "solana-pubkey", @@ -7034,13 +6879,13 @@ name = "solana-bench-vote" version = "3.0.0" dependencies = [ "bincode", - "clap 2.33.3", + "clap 2.34.0", "crossbeam-channel", "solana-clap-utils", "solana-client", "solana-connection-cache", "solana-hash", - "solana-keypair", + "solana-keypair 2.2.3", "solana-logger", "solana-message", "solana-net-utils", @@ -7055,8 +6900,6 @@ dependencies = [ [[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", @@ -7066,8 +6909,6 @@ dependencies = [ [[package]] name = "solana-bincode" version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19a3787b8cf9c9fe3dd360800e8b70982b9e5a8af9e11c354b6665dd4a003adc" dependencies = [ "bincode", "serde", @@ -7077,8 +6918,6 @@ dependencies = [ [[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", @@ -7108,8 +6947,6 @@ dependencies = [ [[package]] name = "solana-bn254" version = "2.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4420f125118732833f36facf96a27e7b78314b2d642ba07fa9ffdacd8d79e243" dependencies = [ "ark-bn254", "ark-ec", @@ -7123,10 +6960,8 @@ dependencies = [ [[package]] name = "solana-borsh" version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "718333bcd0a1a7aed6655aa66bef8d7fb047944922b2d3a18f49cbc13e73d004" dependencies = [ - "borsh 0.10.3", + "borsh 0.10.4", "borsh 1.5.7", ] @@ -7198,7 +7033,7 @@ dependencies = [ "solana-account", "solana-bpf-loader-program", "solana-instruction", - "solana-keypair", + "solana-keypair 2.2.3", "solana-loader-v3-interface", "solana-program-test", "solana-pubkey", @@ -7253,7 +7088,7 @@ name = "solana-builtins-default-costs" version = "3.0.0" dependencies = [ "agave-feature-set", - "ahash 0.8.11", + "ahash 0.8.12", "log", "rand 0.8.5", "solana-bpf-loader-program", @@ -7275,16 +7110,16 @@ dependencies = [ "assert_cmd", "bzip2", "cargo_metadata", - "clap 3.2.23", + "clap 3.2.25", "itertools 0.12.1", "log", - "predicates", + "predicates 2.1.5", "regex", "reqwest 0.12.20", - "semver 1.0.26", + "semver", "serial_test", "solana-file-download", - "solana-keypair", + "solana-keypair 2.2.1", "solana-logger", "tar", ] @@ -7294,7 +7129,7 @@ name = "solana-cargo-test-sbf" version = "3.0.0" dependencies = [ "cargo_metadata", - "clap 3.2.23", + "clap 3.2.25", "itertools 0.12.1", "log", "regex", @@ -7307,16 +7142,16 @@ version = "3.0.0" dependencies = [ "assert_matches", "chrono", - "clap 2.33.3", + "clap 2.34.0", "rpassword", "solana-clock", "solana-cluster-type", "solana-commitment-config", "solana-derivation-path", "solana-hash", - "solana-keypair", + "solana-keypair 2.2.3", "solana-message", - "solana-native-token", + "solana-native-token 2.3.0", "solana-presigner", "solana-pubkey", "solana-remote-wallet", @@ -7337,16 +7172,16 @@ version = "3.0.0" dependencies = [ "assert_matches", "chrono", - "clap 3.2.23", + "clap 3.2.25", "rpassword", "solana-clock", "solana-cluster-type", "solana-commitment-config", "solana-derivation-path", "solana-hash", - "solana-keypair", + "solana-keypair 2.2.3", "solana-message", - "solana-native-token", + "solana-native-token 2.3.0", "solana-presigner", "solana-pubkey", "solana-remote-wallet", @@ -7371,7 +7206,7 @@ dependencies = [ "assert_matches", "bincode", "bs58", - "clap 2.33.3", + "clap 2.34.0", "console", "const_format", "criterion-stats", @@ -7383,7 +7218,7 @@ dependencies = [ "num-traits", "pretty-hex", "reqwest 0.12.20", - "semver 1.0.26", + "semver", "serde", "serde_derive", "serde_json", @@ -7411,13 +7246,13 @@ dependencies = [ "solana-fee-structure", "solana-hash", "solana-instruction", - "solana-keypair", + "solana-keypair 2.2.1", "solana-loader-v3-interface", "solana-loader-v4-interface", "solana-loader-v4-program", "solana-logger", "solana-message", - "solana-native-token", + "solana-native-token 2.2.2", "solana-nonce", "solana-nonce-account", "solana-offchain-message", @@ -7482,13 +7317,13 @@ dependencies = [ "agave-reserved-account-keys", "base64 0.22.1", "chrono", - "clap 2.33.3", + "clap 2.34.0", "console", "ed25519-dalek", "humantime", "indicatif", "pretty-hex", - "semver 1.0.26", + "semver", "serde", "serde_json", "solana-account", @@ -7499,9 +7334,9 @@ dependencies = [ "solana-clock", "solana-epoch-info", "solana-hash", - "solana-keypair", + "solana-keypair 2.2.3", "solana-message", - "solana-native-token", + "solana-native-token 2.3.0", "solana-packet", "solana-pubkey", "solana-rpc-client-api", @@ -7530,7 +7365,7 @@ dependencies = [ "dashmap", "futures 0.3.31", "futures-util", - "indexmap 2.9.0", + "indexmap 2.10.0", "indicatif", "log", "quinn", @@ -7542,7 +7377,7 @@ dependencies = [ "solana-epoch-info", "solana-hash", "solana-instruction", - "solana-keypair", + "solana-keypair 2.2.3", "solana-measure", "solana-message", "solana-net-utils", @@ -7576,13 +7411,13 @@ dependencies = [ "solana-client", "solana-clock", "solana-commitment-config", - "solana-keypair", + "solana-keypair 2.2.3", "solana-ledger", "solana-logger", "solana-measure", "solana-merkle-tree", "solana-message", - "solana-native-token", + "solana-native-token 2.3.0", "solana-net-utils", "solana-perf", "solana-pubkey", @@ -7607,15 +7442,13 @@ dependencies = [ [[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-keypair 2.2.3", "solana-message", "solana-pubkey", "solana-signature", @@ -7628,8 +7461,6 @@ dependencies = [ [[package]] name = "solana-clock" version = "2.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bb482ab70fced82ad3d7d3d87be33d466a3498eb8aa856434ff3c0dfc2e2e31" dependencies = [ "serde", "serde_derive", @@ -7641,8 +7472,6 @@ dependencies = [ [[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", @@ -7652,8 +7481,6 @@ dependencies = [ [[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", @@ -7684,7 +7511,7 @@ dependencies = [ "solana-compute-budget-interface", "solana-hash", "solana-instruction", - "solana-keypair", + "solana-keypair 2.2.3", "solana-message", "solana-packet", "solana-pubkey", @@ -7701,8 +7528,6 @@ dependencies = [ [[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", "solana-instruction", @@ -7755,7 +7580,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ef9867b9ffae6e48a97ce6349e7796fcb34084298e909a8fa1fe427f41b52fd4" dependencies = [ "bincode", - "borsh 0.10.3", + "borsh 0.10.4", "kaigan", "serde", "solana-config-interface", @@ -7770,13 +7595,13 @@ dependencies = [ "bincode", "crossbeam-channel", "futures-util", - "indexmap 2.9.0", + "indexmap 2.10.0", "indicatif", "log", "rand 0.8.5", "rand_chacha 0.3.1", "rayon", - "solana-keypair", + "solana-keypair 2.2.3", "solana-logger", "solana-measure", "solana-metrics", @@ -7796,7 +7621,7 @@ dependencies = [ "agave-reserved-account-keys", "agave-transaction-view", "agave-verified-packet-receiver", - "ahash 0.8.11", + "ahash 0.8.12", "anyhow", "arrayvec", "assert_matches", @@ -7863,14 +7688,14 @@ dependencies = [ "solana-hard-forks", "solana-hash", "solana-instruction", - "solana-keypair", + "solana-keypair 2.2.3", "solana-ledger", "solana-loader-v3-interface", "solana-logger", "solana-measure", "solana-message", "solana-metrics", - "solana-native-token", + "solana-native-token 2.3.0", "solana-net-utils", "solana-nonce", "solana-nonce-account", @@ -7943,7 +7768,7 @@ version = "3.0.0" dependencies = [ "agave-feature-set", "agave-reserved-account-keys", - "ahash 0.8.11", + "ahash 0.8.12", "itertools 0.12.1", "log", "rand 0.8.5", @@ -7961,7 +7786,7 @@ dependencies = [ "solana-frozen-abi-macro", "solana-hash", "solana-instruction", - "solana-keypair", + "solana-keypair 2.2.3", "solana-logger", "solana-message", "solana-metrics", @@ -7986,8 +7811,6 @@ dependencies = [ [[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", @@ -7999,9 +7822,9 @@ dependencies = [ [[package]] name = "solana-curve25519" -version = "2.2.15" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "def3cfe5279edb64fc39111cff6dcf77b01fbfba2c02c13ced41e6a48baf4cbe" +checksum = "e2b575bfa3a3775e4201cd5179d4d390a056b8dc691a3df8ac754e8d7e629454" dependencies = [ "bytemuck", "bytemuck_derive", @@ -8025,9 +7848,9 @@ dependencies = [ [[package]] name = "solana-decode-error" -version = "2.2.1" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10a6a6383af236708048f8bd8d03db8ca4ff7baf4a48e5d580f4cce545925470" +checksum = "8c781686a18db2f942e70913f7ca15dc120ec38dcab42ff7557db2c70c625a35" dependencies = [ "num-traits", ] @@ -8035,14 +7858,10 @@ dependencies = [ [[package]] name = "solana-define-syscall" version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ae3e2abcf541c8122eafe9a625d4d194b4023c20adde1e251f94e056bb1aee2" [[package]] name = "solana-derivation-path" version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "939756d798b25c5ec3cca10e06212bdca3b1443cb9bb740a38124f58b258737b" dependencies = [ "derivation-path", "qstring", @@ -8054,7 +7873,7 @@ name = "solana-dos" version = "3.0.0" dependencies = [ "bincode", - "clap 3.2.23", + "clap 3.2.25", "crossbeam-channel", "itertools 0.12.1", "log", @@ -8068,7 +7887,7 @@ dependencies = [ "solana-gossip", "solana-hash", "solana-instruction", - "solana-keypair", + "solana-keypair 2.2.3", "solana-local-cluster", "solana-logger", "solana-measure", @@ -8106,15 +7925,10 @@ dependencies = [ [[package]] name = "solana-ed25519-program" version = "2.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1feafa1691ea3ae588f99056f4bdd1293212c7ece28243d7da257c443e84753" dependencies = [ "bytemuck", "bytemuck_derive", - "ed25519-dalek", - "solana-feature-set", "solana-instruction", - "solana-precompile-error", "solana-sdk-ids", ] @@ -8148,7 +7962,7 @@ dependencies = [ "rayon", "serde", "solana-hash", - "solana-keypair", + "solana-keypair 2.2.3", "solana-logger", "solana-measure", "solana-merkle-tree", @@ -8170,8 +7984,6 @@ dependencies = [ [[package]] name = "solana-epoch-info" version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ef6f0b449290b0b9f32973eefd95af35b01c5c0c34c569f936c34c5b20d77b" dependencies = [ "serde", "serde_derive", @@ -8180,8 +7992,6 @@ dependencies = [ [[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", @@ -8194,8 +8004,6 @@ dependencies = [ [[package]] name = "solana-epoch-rewards-hasher" version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96c5fd2662ae7574810904585fd443545ed2b568dbd304b25a31e79ccc76e81b" dependencies = [ "siphasher 0.3.11", "solana-hash", @@ -8205,8 +8013,6 @@ dependencies = [ [[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", @@ -8220,8 +8026,6 @@ dependencies = [ [[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", @@ -8243,7 +8047,7 @@ name = "solana-faucet" version = "3.0.0" dependencies = [ "bincode", - "clap 2.33.3", + "clap 2.34.0", "crossbeam-channel", "log", "serde", @@ -8252,11 +8056,11 @@ dependencies = [ "solana-cli-config", "solana-hash", "solana-instruction", - "solana-keypair", + "solana-keypair 2.2.1", "solana-logger", "solana-message", "solana-metrics", - "solana-native-token", + "solana-native-token 2.2.2", "solana-packet", "solana-pubkey", "solana-signer", @@ -8275,7 +8079,7 @@ version = "0.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f1056507c534839b5cd1b1010ffedb9e8c92313269786fb5066ff53b30326dc3" dependencies = [ - "borsh 0.10.3", + "borsh 0.10.4", "num-derive", "num-traits", "solana-program", @@ -8285,34 +8089,11 @@ dependencies = [ [[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.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92f6c09cc41059c0e03ccbee7f5d4cc0a315d68ef0d59b67eb90246adfd8cc35" -dependencies = [ - "ahash 0.8.11", - "lazy_static", - "solana-epoch-schedule", - "solana-hash", - "solana-pubkey", - "solana-sha256-hasher", ] [[package]] @@ -8327,8 +8108,6 @@ dependencies = [ [[package]] name = "solana-fee-calculator" version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d89bc408da0fb3812bc3008189d148b4d3e08252c79ad810b245482a3f70cd8d" dependencies = [ "log", "serde", @@ -8340,21 +8119,17 @@ dependencies = [ [[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-frozen-abi", "solana-message", - "solana-native-token", + "solana-native-token 2.3.0", ] [[package]] name = "solana-file-download" version = "2.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05a9744774fdbd7ae8575e5bd6d5df6946f321fb9b6019410b300a515369a37d" dependencies = [ "console", "indicatif", @@ -8365,8 +8140,6 @@ dependencies = [ [[package]] name = "solana-frozen-abi" version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ac93e831736e9cbd1571c5c692fa7533a304f184f77cba52e5b83c4c7eeebda" dependencies = [ "boxcar", "bs58", @@ -8387,8 +8160,6 @@ dependencies = [ [[package]] name = "solana-frozen-abi-macro" version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b83f88a126213cbcb57672c5e70ddb9791eff9b480e9f39fe9285fd2abca66fa" dependencies = [ "proc-macro2", "quote", @@ -8402,7 +8173,7 @@ dependencies = [ "agave-feature-set", "base64 0.22.1", "bincode", - "clap 2.33.3", + "clap 2.34.0", "itertools 0.12.1", "serde", "serde_json", @@ -8420,11 +8191,11 @@ dependencies = [ "solana-fee-calculator", "solana-genesis-config", "solana-inflation", - "solana-keypair", + "solana-keypair 2.2.1", "solana-ledger", "solana-loader-v3-interface", "solana-logger", - "solana-native-token", + "solana-native-token 2.2.2", "solana-poh-config", "solana-pubkey", "solana-rent", @@ -8444,8 +8215,6 @@ dependencies = [ [[package]] name = "solana-genesis-config" version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3725085d47b96d37fef07a29d78d2787fc89a0b9004c66eed7753d1e554989f" dependencies = [ "bincode", "chrono", @@ -8459,7 +8228,7 @@ dependencies = [ "solana-fee-calculator", "solana-hash", "solana-inflation", - "solana-keypair", + "solana-keypair 2.2.3", "solana-logger", "solana-poh-config", "solana-pubkey", @@ -8524,11 +8293,11 @@ dependencies = [ "bincode", "bs58", "bv", - "clap 2.33.3", + "clap 2.34.0", "criterion", "crossbeam-channel", "flate2", - "indexmap 2.9.0", + "indexmap 2.10.0", "itertools 0.12.1", "log", "lru", @@ -8555,12 +8324,12 @@ dependencies = [ "solana-frozen-abi", "solana-frozen-abi-macro", "solana-hash", - "solana-keypair", + "solana-keypair 2.2.1", "solana-ledger", "solana-logger", "solana-measure", "solana-metrics", - "solana-native-token", + "solana-native-token 2.2.2", "solana-net-utils", "solana-packet", "solana-perf", @@ -8592,8 +8361,6 @@ dependencies = [ [[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", @@ -8604,8 +8371,6 @@ dependencies = [ [[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", @@ -8624,8 +8389,6 @@ dependencies = [ [[package]] name = "solana-inflation" version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23eef6a09eb8e568ce6839573e4966850e85e9ce71e6ae1a6c930c1c43947de3" dependencies = [ "serde", "serde_derive", @@ -8636,12 +8399,10 @@ dependencies = [ [[package]] name = "solana-instruction" version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47298e2ce82876b64f71e9d13a46bc4b9056194e7f9937ad3084385befa50885" dependencies = [ "bincode", "borsh 1.5.7", - "getrandom 0.2.15", + "getrandom 0.2.16", "js-sys", "num-traits", "serde", @@ -8656,8 +8417,6 @@ dependencies = [ [[package]] name = "solana-instructions-sysvar" version = "2.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0e85a6fad5c2d0c4f5b91d34b8ca47118fc593af706e523cdbedf846a954f57" dependencies = [ "bitflags 2.9.1", "solana-account-info", @@ -8673,8 +8432,6 @@ dependencies = [ [[package]] name = "solana-keccak-hasher" version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7aeb957fbd42a451b99235df4942d96db7ef678e8d5061ef34c9b34cae12f79" dependencies = [ "sha3", "solana-define-syscall", @@ -8687,7 +8444,7 @@ name = "solana-keygen" version = "3.0.0" dependencies = [ "bs58", - "clap 3.2.23", + "clap 3.2.25", "dirs-next", "num_cpus", "serde_json", @@ -8695,7 +8452,7 @@ dependencies = [ "solana-cli-config", "solana-derivation-path", "solana-instruction", - "solana-keypair", + "solana-keypair 2.2.1", "solana-message", "solana-pubkey", "solana-remote-wallet", @@ -8713,8 +8470,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3dbb7042c2e0c561afa07242b2099d55c57bd1b1da3b6476932197d84e15e3e4" dependencies = [ "bs58", + "ed25519-dalek", + "rand 0.7.3", + "solana-pubkey", + "solana-seed-phrase", + "solana-signature", + "solana-signer", + "wasm-bindgen", +] + +[[package]] +name = "solana-keypair" +version = "2.2.3" +dependencies = [ "ed25519-dalek", "ed25519-dalek-bip32", + "five8", "rand 0.7.3", "solana-derivation-path", "solana-pubkey", @@ -8728,8 +8499,6 @@ dependencies = [ [[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", @@ -8805,13 +8574,13 @@ dependencies = [ "solana-genesis-config", "solana-hash", "solana-instruction", - "solana-keypair", + "solana-keypair 2.2.3", "solana-ledger", "solana-logger", "solana-measure", "solana-message", "solana-metrics", - "solana-native-token", + "solana-native-token 2.3.0", "solana-net-utils", "solana-packet", "solana-perf", @@ -8861,8 +8630,6 @@ dependencies = [ [[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", @@ -8875,8 +8642,6 @@ dependencies = [ [[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", @@ -8890,8 +8655,6 @@ dependencies = [ [[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", @@ -8955,12 +8718,12 @@ dependencies = [ "solana-gossip", "solana-hard-forks", "solana-hash", - "solana-keypair", + "solana-keypair 2.2.3", "solana-ledger", "solana-local-cluster", "solana-logger", "solana-message", - "solana-native-token", + "solana-native-token 2.3.0", "solana-net-utils", "solana-poh-config", "solana-pubkey", @@ -8999,7 +8762,7 @@ name = "solana-log-analyzer" version = "3.0.0" dependencies = [ "byte-unit", - "clap 3.2.23", + "clap 3.2.25", "serde", "serde_derive", "serde_json", @@ -9017,8 +8780,6 @@ dependencies = [ [[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", @@ -9048,8 +8809,6 @@ dependencies = [ [[package]] name = "solana-message" version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1796aabce376ff74bf89b78d268fa5e683d7d7a96a0a4e4813ec34de49d5314b" dependencies = [ "bincode", "blake3", @@ -9088,8 +8847,6 @@ dependencies = [ [[package]] name = "solana-msg" version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f36a1a14399afaabc2781a1db09cb14ee4cc4ee5c7a5a3cfcc601811379a8092" dependencies = [ "solana-define-syscall", ] @@ -9100,11 +8857,15 @@ version = "2.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "307fb2f78060995979e9b4f68f833623565ed4e55d3725f100454ce78a99a1a3" +[[package]] +name = "solana-native-token" +version = "2.3.0" + [[package]] name = "solana-net-shaper" version = "3.0.0" dependencies = [ - "clap 3.2.23", + "clap 3.2.25", "rand 0.8.5", "serde", "serde_derive", @@ -9143,8 +8904,6 @@ checksum = "8b8a731ed60e89177c8a7ab05fe0f1511cedd3e70e773f288f9de33a9cfdc21e" [[package]] name = "solana-nonce" version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "703e22eb185537e06204a5bd9d509b948f0066f2d1d814a6f475dafb3ddf1325" dependencies = [ "serde", "serde_derive", @@ -9157,8 +8916,6 @@ dependencies = [ [[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", @@ -9179,8 +8936,6 @@ dependencies = [ [[package]] name = "solana-offchain-message" version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b526398ade5dea37f1f147ce55dae49aa017a5d7326606359b0445ca8d946581" dependencies = [ "num_enum", "solana-hash", @@ -9195,8 +8950,6 @@ dependencies = [ [[package]] name = "solana-packet" version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "004f2d2daf407b3ec1a1ca5ec34b3ccdfd6866dd2d3c7d0715004a96e4b6d127" dependencies = [ "bincode", "bitflags 2.9.1", @@ -9212,7 +8965,7 @@ dependencies = [ name = "solana-perf" version = "3.0.0" dependencies = [ - "ahash 0.8.11", + "ahash 0.8.12", "assert_matches", "bincode", "bv", @@ -9232,7 +8985,7 @@ dependencies = [ "solana-frozen-abi", "solana-frozen-abi-macro", "solana-hash", - "solana-keypair", + "solana-keypair 2.2.3", "solana-logger", "solana-message", "solana-metrics", @@ -9268,7 +9021,7 @@ dependencies = [ "solana-clock", "solana-entry", "solana-hash", - "solana-keypair", + "solana-keypair 2.2.3", "solana-ledger", "solana-logger", "solana-measure", @@ -9290,7 +9043,7 @@ dependencies = [ name = "solana-poh-bench" version = "3.0.0" dependencies = [ - "clap 3.2.23", + "clap 3.2.25", "log", "rayon", "solana-entry", @@ -9305,8 +9058,6 @@ dependencies = [ [[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", @@ -9325,35 +9076,13 @@ dependencies = [ [[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.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a460ab805ec063802105b463ecb5eb02c3ffe469e67a967eea8a6e778e0bc06" -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", @@ -9363,56 +9092,40 @@ dependencies = [ [[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.3", + "borsh 0.10.4", "borsh 1.5.7", - "bs58", "bytemuck", - "console_error_panic_hook", - "console_log", - "getrandom 0.2.15", + "getrandom 0.2.16", "lazy_static", "log", - "memoffset 0.9.1", + "memoffset", "num-bigint 0.4.6", - "num-derive", "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-native-token 2.3.0", "solana-program-entrypoint", "solana-program-error", "solana-program-memory", @@ -9420,7 +9133,6 @@ dependencies = [ "solana-program-pack", "solana-pubkey", "solana-rent", - "solana-sanitize", "solana-sdk-ids", "solana-sdk-macro", "solana-secp256k1-recover", @@ -9431,22 +9143,17 @@ dependencies = [ "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.12", - "wasm-bindgen", ] [[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-define-syscall", "solana-msg", "solana-program-error", "solana-pubkey", @@ -9455,14 +9162,11 @@ dependencies = [ [[package]] name = "solana-program-error" 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", "solana-pubkey", @@ -9471,8 +9175,6 @@ dependencies = [ [[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", ] @@ -9480,14 +9182,10 @@ dependencies = [ [[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", ] @@ -9568,13 +9266,13 @@ dependencies = [ "solana-genesis-config", "solana-hash", "solana-instruction", - "solana-keypair", + "solana-keypair 2.2.3", "solana-loader-v3-interface", "solana-log-collector", "solana-logger", "solana-message", "solana-msg", - "solana-native-token", + "solana-native-token 2.3.0", "solana-poh-config", "solana-program", "solana-program-entrypoint", @@ -9607,25 +9305,22 @@ dependencies = [ [[package]] name = "solana-pubkey" version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b62adb9c3261a052ca1f999398c388f1daf558a1b492f60a6d9e64857db4ff1" dependencies = [ "arbitrary", - "borsh 0.10.3", + "borsh 0.10.4", "borsh 1.5.7", "bytemuck", "bytemuck_derive", "curve25519-dalek 4.1.3", "five8", "five8_const", - "getrandom 0.2.15", + "getrandom 0.2.16", "js-sys", "num-traits", "rand 0.8.5", "serde", "serde_derive", "solana-atomic-u64", - "solana-decode-error", "solana-define-syscall", "solana-frozen-abi", "solana-frozen-abi-macro", @@ -9643,7 +9338,7 @@ dependencies = [ "futures-util", "http 0.2.12", "log", - "semver 1.0.26", + "semver", "serde", "serde_derive", "serde_json", @@ -9675,7 +9370,7 @@ dependencies = [ "quinn-proto", "rustls 0.23.28", "solana-connection-cache", - "solana-keypair", + "solana-keypair 2.2.3", "solana-logger", "solana-measure", "solana-metrics", @@ -9699,7 +9394,7 @@ version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e606feac5110eb5d8afaa43ccaeea3ec49ccec36773387930b5ba545e745aea2" dependencies = [ - "solana-keypair", + "solana-keypair 2.2.3", ] [[package]] @@ -9720,9 +9415,9 @@ dependencies = [ "log", "num-derive", "num-traits", - "parking_lot 0.12.3", + "parking_lot 0.12.4", "qstring", - "semver 1.0.26", + "semver", "solana-derivation-path", "solana-offchain-message", "solana-pubkey", @@ -9735,8 +9430,6 @@ dependencies = [ [[package]] name = "solana-rent" version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1aea8fdea9de98ca6e8c2da5827707fb3842833521b528a713810ca685d2480" dependencies = [ "serde", "serde_derive", @@ -9750,8 +9443,6 @@ dependencies = [ [[package]] name = "solana-rent-collector" version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c1e19f5d5108b0d824244425e43bc78bbb9476e2199e979b0230c9f632d3bf4" dependencies = [ "serde", "serde_derive", @@ -9769,8 +9460,6 @@ dependencies = [ [[package]] name = "solana-reward-info" version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18205b69139b1ae0ab8f6e11cdcb627328c0814422ad2482000fa2ca54ae4a2f" dependencies = [ "serde", "serde_derive", @@ -9821,13 +9510,13 @@ dependencies = [ "solana-gossip", "solana-hash", "solana-instruction", - "solana-keypair", + "solana-keypair 2.2.3", "solana-ledger", "solana-log-collector", "solana-measure", "solana-message", "solana-metrics", - "solana-native-token", + "solana-native-token 2.3.0", "solana-net-utils", "solana-nonce", "solana-nonce-account", @@ -9899,7 +9588,7 @@ dependencies = [ "log", "reqwest 0.12.20", "reqwest-middleware", - "semver 1.0.26", + "semver", "serde", "serde_derive", "serde_json", @@ -9913,7 +9602,7 @@ dependencies = [ "solana-feature-gate-interface", "solana-hash", "solana-instruction", - "solana-keypair", + "solana-keypair 2.2.3", "solana-message", "solana-pubkey", "solana-rpc-client-api", @@ -9954,7 +9643,7 @@ name = "solana-rpc-client-nonce-utils" version = "3.0.0" dependencies = [ "anyhow", - "clap 2.33.3", + "clap 2.34.0", "futures 0.3.31", "serde_json", "solana-account", @@ -9963,7 +9652,7 @@ dependencies = [ "solana-commitment-config", "solana-fee-calculator", "solana-hash", - "solana-keypair", + "solana-keypair 2.2.3", "solana-message", "solana-nonce", "solana-pubkey", @@ -9985,7 +9674,7 @@ dependencies = [ "base64 0.22.1", "bs58", "const_format", - "semver 1.0.26", + "semver", "serde", "serde_derive", "serde_json", @@ -10021,7 +9710,7 @@ dependencies = [ "solana-commitment-config", "solana-connection-cache", "solana-hash", - "solana-keypair", + "solana-keypair 2.2.3", "solana-logger", "solana-net-utils", "solana-pubkey", @@ -10049,7 +9738,7 @@ dependencies = [ "agave-precompiles", "agave-reserved-account-keys", "agave-transaction-view", - "ahash 0.8.11", + "ahash 0.8.12", "aquamarine", "arrayref", "assert_matches", @@ -10070,7 +9759,7 @@ dependencies = [ "log", "lz4", "memmap2 0.9.5", - "memoffset 0.9.1", + "memoffset", "mockall", "modular-bitfield", "num-derive", @@ -10118,7 +9807,7 @@ dependencies = [ "solana-hash", "solana-inflation", "solana-instruction", - "solana-keypair", + "solana-keypair 2.2.3", "solana-lattice-hash", "solana-loader-v3-interface", "solana-loader-v4-interface", @@ -10126,7 +9815,7 @@ dependencies = [ "solana-measure", "solana-message", "solana-metrics", - "solana-native-token", + "solana-native-token 2.3.0", "solana-nohash-hasher", "solana-nonce", "solana-nonce-account", @@ -10201,7 +9890,7 @@ dependencies = [ "solana-compute-budget-interface", "solana-hash", "solana-instruction", - "solana-keypair", + "solana-keypair 2.2.3", "solana-message", "solana-pubkey", "solana-sdk-ids", @@ -10219,8 +9908,6 @@ dependencies = [ [[package]] name = "solana-sanitize" version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61f1bc1357b8188d9c4a3af3fc55276e56987265eb7ad073ae6f8180ee54cecf" [[package]] name = "solana-sbpf" @@ -10244,8 +9931,6 @@ dependencies = [ [[package]] name = "solana-sdk-ids" version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5d8b9cc68d5c88b062a33e23a6466722467dde0035152d8fb1afbcdf350a5f" dependencies = [ "solana-pubkey", ] @@ -10253,8 +9938,6 @@ dependencies = [ [[package]] name = "solana-sdk-macro" version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86280da8b99d03560f6ab5aca9de2e38805681df34e0bb8f238e69b29433b9df" dependencies = [ "bs58", "proc-macro2", @@ -10265,8 +9948,6 @@ dependencies = [ [[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", @@ -10274,9 +9955,7 @@ dependencies = [ "serde", "serde_derive", "sha3", - "solana-feature-set", "solana-instruction", - "solana-precompile-error", "solana-sdk-ids", "solana-signature", ] @@ -10284,8 +9963,6 @@ dependencies = [ [[package]] name = "solana-secp256k1-recover" version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baa3120b6cdaa270f39444f5093a90a7b03d296d362878f7a6991d6de3bbe496" dependencies = [ "libsecp256k1", "solana-define-syscall", @@ -10295,14 +9972,10 @@ dependencies = [ [[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", ] @@ -10315,8 +9988,6 @@ 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", ] @@ -10324,8 +9995,6 @@ dependencies = [ [[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", @@ -10347,7 +10016,7 @@ dependencies = [ "solana-fee-calculator", "solana-genesis-config", "solana-hash", - "solana-keypair", + "solana-keypair 2.2.3", "solana-logger", "solana-measure", "solana-metrics", @@ -10370,8 +10039,6 @@ dependencies = [ [[package]] name = "solana-serde" version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1931484a408af466e14171556a47adaa215953c7f48b24e5f6b0282763818b04" dependencies = [ "serde", ] @@ -10379,8 +10046,6 @@ dependencies = [ [[package]] name = "solana-serde-varint" version = "2.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a7e155eba458ecfb0107b98236088c3764a09ddf0201ec29e52a0be40857113" dependencies = [ "serde", ] @@ -10388,8 +10053,6 @@ dependencies = [ [[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", @@ -10399,8 +10062,6 @@ dependencies = [ [[package]] name = "solana-sha256-hasher" version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0037386961c0d633421f53560ad7c80675c0447cba4d1bb66d60974dd486c7ea" dependencies = [ "sha2 0.10.9", "solana-define-syscall", @@ -10410,8 +10071,6 @@ dependencies = [ [[package]] name = "solana-short-vec" version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c54c66f19b9766a56fa0057d060de8378676cb64987533fa088861858fc5a69" dependencies = [ "serde", "solana-frozen-abi", @@ -10421,8 +10080,6 @@ dependencies = [ [[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", @@ -10432,8 +10089,6 @@ dependencies = [ [[package]] name = "solana-signature" version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64c8ec8e657aecfc187522fc67495142c12f35e55ddeca8698edbb738b8dbd8c" dependencies = [ "ed25519-dalek", "five8", @@ -10449,8 +10104,6 @@ dependencies = [ [[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", @@ -10460,8 +10113,6 @@ dependencies = [ [[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", @@ -10473,8 +10124,6 @@ dependencies = [ [[package]] name = "solana-slot-history" version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97ccc1b2067ca22754d5283afb2b0126d61eae734fc616d23871b0943b0d935e" dependencies = [ "bv", "serde", @@ -10486,8 +10135,6 @@ dependencies = [ [[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", @@ -10497,7 +10144,7 @@ dependencies = [ name = "solana-stake-accounts" version = "3.0.0" dependencies = [ - "clap 2.33.3", + "clap 2.34.0", "solana-account", "solana-clap-utils", "solana-cli-config", @@ -10507,9 +10154,9 @@ dependencies = [ "solana-fee-calculator", "solana-genesis-config", "solana-instruction", - "solana-keypair", + "solana-keypair 2.2.3", "solana-message", - "solana-native-token", + "solana-native-token 2.3.0", "solana-pubkey", "solana-remote-wallet", "solana-rpc-client", @@ -10529,8 +10176,6 @@ version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5269e89fde216b4d7e1d1739cf5303f8398a1ff372a81232abbee80e554a838c" dependencies = [ - "borsh 0.10.3", - "borsh 1.5.7", "num-traits", "serde", "serde_derive", @@ -10566,7 +10211,7 @@ dependencies = [ "solana-genesis-config", "solana-instruction", "solana-log-collector", - "solana-native-token", + "solana-native-token 2.3.0", "solana-packet", "solana-program-runtime", "solana-pubkey", @@ -10593,7 +10238,7 @@ dependencies = [ "bincode", "solana-account", "solana-instruction", - "solana-keypair", + "solana-keypair 2.2.3", "solana-program-error", "solana-program-test", "solana-pubkey", @@ -10632,7 +10277,7 @@ dependencies = [ "smpl_jwt", "solana-clock", "solana-hash", - "solana-keypair", + "solana-keypair 2.2.3", "solana-message", "solana-metrics", "solana-pubkey", @@ -10690,7 +10335,7 @@ dependencies = [ "futures-util", "governor", "histogram", - "indexmap 2.9.0", + "indexmap 2.10.0", "itertools 0.12.1", "libc", "log", @@ -10704,7 +10349,7 @@ dependencies = [ "rustls 0.23.28", "smallvec", "socket2", - "solana-keypair", + "solana-keypair 2.2.3", "solana-logger", "solana-measure", "solana-metrics", @@ -10732,7 +10377,7 @@ version = "3.0.0" dependencies = [ "agave-feature-set", "agave-reserved-account-keys", - "ahash 0.8.11", + "ahash 0.8.12", "assert_matches", "bincode", "ed25519-dalek", @@ -10762,7 +10407,7 @@ dependencies = [ "solana-hash", "solana-instruction", "solana-instructions-sysvar", - "solana-keypair", + "solana-keypair 2.2.3", "solana-loader-v3-interface", "solana-loader-v4-interface", "solana-loader-v4-program", @@ -10770,7 +10415,7 @@ dependencies = [ "solana-logger", "solana-measure", "solana-message", - "solana-native-token", + "solana-native-token 2.3.0", "solana-nonce", "solana-nonce-account", "solana-precompile-error", @@ -10915,11 +10560,9 @@ dependencies = [ [[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-keypair 2.2.3", "solana-message", "solana-pubkey", "solana-signer", @@ -10930,8 +10573,6 @@ dependencies = [ [[package]] name = "solana-sysvar" version = "2.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d50c92bc019c590f5e42c61939676e18d14809ed00b2a59695dd5c67ae72c097" dependencies = [ "base64 0.22.1", "bincode", @@ -10967,8 +10608,6 @@ dependencies = [ [[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", @@ -10999,12 +10638,12 @@ dependencies = [ "solana-geyser-plugin-manager", "solana-gossip", "solana-instruction", - "solana-keypair", + "solana-keypair 2.2.3", "solana-ledger", "solana-loader-v3-interface", "solana-logger", "solana-message", - "solana-native-token", + "solana-native-token 2.3.0", "solana-net-utils", "solana-program-test", "solana-pubkey", @@ -11037,7 +10676,7 @@ dependencies = [ "solana-epoch-info", "solana-hash", "solana-instruction", - "solana-keypair", + "solana-keypair 2.2.3", "solana-logger", "solana-message", "solana-pubkey", @@ -11053,8 +10692,6 @@ dependencies = [ [[package]] name = "solana-time-utils" version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6af261afb0e8c39252a04d026e3ea9c405342b08c871a2ad8aa5448e068c784c" [[package]] name = "solana-timings" @@ -11070,7 +10707,7 @@ name = "solana-tls-utils" version = "3.0.0" dependencies = [ "rustls 0.23.28", - "solana-keypair", + "solana-keypair 2.2.3", "solana-pubkey", "solana-signer", "x509-parser", @@ -11083,11 +10720,11 @@ dependencies = [ "assert_matches", "bincode", "chrono", - "clap 2.33.3", + "clap 2.34.0", "console", "csv", "ctrlc", - "indexmap 2.9.0", + "indexmap 2.10.0", "indicatif", "pickledb", "serde", @@ -11099,10 +10736,10 @@ dependencies = [ "solana-commitment-config", "solana-hash", "solana-instruction", - "solana-keypair", + "solana-keypair 2.2.3", "solana-logger", "solana-message", - "solana-native-token", + "solana-native-token 2.3.0", "solana-pubkey", "solana-remote-wallet", "solana-rpc-client", @@ -11136,7 +10773,7 @@ dependencies = [ "solana-connection-cache", "solana-epoch-info", "solana-hash", - "solana-keypair", + "solana-keypair 2.2.3", "solana-message", "solana-pubkey", "solana-quic-client", @@ -11161,7 +10798,7 @@ dependencies = [ "async-trait", "bincode", "futures-util", - "indexmap 2.9.0", + "indexmap 2.10.0", "indicatif", "log", "rayon", @@ -11201,7 +10838,7 @@ dependencies = [ "solana-clock", "solana-commitment-config", "solana-connection-cache", - "solana-keypair", + "solana-keypair 2.2.3", "solana-measure", "solana-metrics", "solana-net-utils", @@ -11221,19 +10858,15 @@ dependencies = [ [[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-keypair 2.2.3", "solana-message", - "solana-precompiles", "solana-pubkey", "solana-sanitize", "solana-sdk-ids", @@ -11270,7 +10903,7 @@ name = "solana-transaction-dos" version = "3.0.0" dependencies = [ "bincode", - "clap 2.33.3", + "clap 2.34.0", "log", "rand 0.8.5", "rayon", @@ -11283,7 +10916,7 @@ dependencies = [ "solana-gossip", "solana-hash", "solana-instruction", - "solana-keypair", + "solana-keypair 2.2.3", "solana-local-cluster", "solana-logger", "solana-measure", @@ -11305,8 +10938,6 @@ dependencies = [ [[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", @@ -11325,7 +10956,7 @@ dependencies = [ "log", "rand 0.8.5", "solana-hash", - "solana-keypair", + "solana-keypair 2.2.3", "solana-packet", "solana-perf", "solana-pubkey", @@ -11430,12 +11061,12 @@ dependencies = [ "solana-genesis-config", "solana-gossip", "solana-hash", - "solana-keypair", + "solana-keypair 2.2.3", "solana-ledger", "solana-logger", "solana-measure", "solana-metrics", - "solana-native-token", + "solana-native-token 2.3.0", "solana-net-utils", "solana-perf", "solana-poh", @@ -11474,7 +11105,7 @@ version = "3.0.0" dependencies = [ "async-trait", "solana-connection-cache", - "solana-keypair", + "solana-keypair 2.2.3", "solana-net-utils", "solana-packet", "solana-streamer", @@ -11516,7 +11147,7 @@ dependencies = [ "solana-cost-model", "solana-entry", "solana-hash", - "solana-keypair", + "solana-keypair 2.2.3", "solana-ledger", "solana-logger", "solana-poh", @@ -11547,8 +11178,6 @@ dependencies = [ [[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" @@ -11556,7 +11185,7 @@ version = "3.0.0" dependencies = [ "agave-feature-set", "rand 0.8.5", - "semver 1.0.26", + "semver", "serde", "serde_derive", "solana-frozen-abi", @@ -11573,14 +11202,14 @@ dependencies = [ "assert_matches", "async-channel", "bytes", - "clap 4.5.31", + "clap 4.5.40", "crossbeam-channel", "dashmap", "futures 0.3.31", "futures-util", "governor", "histogram", - "indexmap 2.9.0", + "indexmap 2.10.0", "itertools 0.12.1", "libc", "log", @@ -11599,12 +11228,12 @@ dependencies = [ "solana-clock", "solana-commitment-config", "solana-core", - "solana-keypair", + "solana-keypair 2.2.3", "solana-local-cluster", "solana-logger", "solana-measure", "solana-metrics", - "solana-native-token", + "solana-native-token 2.3.0", "solana-net-utils", "solana-perf", "solana-pubkey", @@ -11637,7 +11266,7 @@ dependencies = [ "solana-frozen-abi-macro", "solana-hash", "solana-instruction", - "solana-keypair", + "solana-keypair 2.2.3", "solana-logger", "solana-packet", "solana-pubkey", @@ -11656,8 +11285,6 @@ dependencies = [ [[package]] name = "solana-vote-interface" version = "2.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef4f08746f154458f28b98330c0d55cb431e2de64ee4b8efc98dcbe292e0672b" dependencies = [ "arbitrary", "bincode", @@ -11666,7 +11293,6 @@ dependencies = [ "serde", "serde_derive", "solana-clock", - "solana-decode-error", "solana-frozen-abi", "solana-frozen-abi-macro", "solana-hash", @@ -11702,7 +11328,7 @@ dependencies = [ "solana-frozen-abi-macro", "solana-hash", "solana-instruction", - "solana-keypair", + "solana-keypair 2.2.3", "solana-logger", "solana-metrics", "solana-packet", @@ -11740,7 +11366,7 @@ dependencies = [ "solana-entry", "solana-gossip", "solana-hash", - "solana-keypair", + "solana-keypair 2.2.3", "solana-ledger", "solana-logger", "solana-pubkey", @@ -11782,7 +11408,7 @@ dependencies = [ "solana-compute-budget", "solana-compute-budget-interface", "solana-instruction", - "solana-keypair", + "solana-keypair 2.2.3", "solana-program-test", "solana-pubkey", "solana-signer", @@ -11797,7 +11423,7 @@ name = "solana-zk-keygen" version = "3.0.0" dependencies = [ "bs58", - "clap 3.2.23", + "clap 3.2.25", "dirs-next", "solana-clap-v3-utils", "solana-pubkey", @@ -11813,9 +11439,9 @@ dependencies = [ [[package]] name = "solana-zk-sdk" -version = "2.2.15" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15045540c315a9b8ea056323e73320e76098dfdaac9e65b1b33fe9c2f3c9b9e1" +checksum = "2fb02d3ce872d534e72e1c6c1439e94d0de5cf9fc9477d4dfd99e106530a11be" dependencies = [ "aes-gcm-siv", "base64 0.22.1", @@ -11825,7 +11451,6 @@ dependencies = [ "curve25519-dalek 4.1.3", "itertools 0.12.1", "js-sys", - "lazy_static", "merlin", "num-derive", "num-traits", @@ -11870,7 +11495,7 @@ dependencies = [ "sha3", "solana-derivation-path", "solana-instruction", - "solana-keypair", + "solana-keypair 2.2.3", "solana-pubkey", "solana-sdk-ids", "solana-seed-derivable", @@ -11923,7 +11548,7 @@ dependencies = [ "solana-curve25519 3.0.0", "solana-derivation-path", "solana-instruction", - "solana-keypair", + "solana-keypair 2.2.3", "solana-pubkey", "solana-sdk-ids", "solana-seed-derivable", @@ -11979,9 +11604,9 @@ dependencies = [ [[package]] name = "spl-discriminator" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a20542d4c8264856d205c0090512f374dbf7b3124479a3d93ab6184ae3631aa" +checksum = "a7398da23554a31660f17718164e31d31900956054f54f52d5ec1be51cb4f4b3" dependencies = [ "bytemuck", "solana-program-error", @@ -12031,7 +11656,7 @@ dependencies = [ "solana-sdk-ids", "solana-system-interface", "solana-sysvar", - "solana-zk-sdk 2.2.15", + "solana-zk-sdk 2.3.1", "spl-pod", "spl-token-confidential-transfer-proof-extraction", ] @@ -12091,7 +11716,7 @@ dependencies = [ "solana-program-error", "solana-program-option", "solana-pubkey", - "solana-zk-sdk 2.2.15", + "solana-zk-sdk 2.3.1", "thiserror 2.0.12", ] @@ -12189,7 +11814,7 @@ dependencies = [ "solana-decode-error", "solana-instruction", "solana-msg", - "solana-native-token", + "solana-native-token 2.3.0", "solana-program-entrypoint", "solana-program-error", "solana-program-memory", @@ -12201,7 +11826,7 @@ dependencies = [ "solana-security-txt", "solana-system-interface", "solana-sysvar", - "solana-zk-sdk 2.2.15", + "solana-zk-sdk 2.3.1", "spl-elgamal-registry", "spl-memo", "spl-pod", @@ -12224,8 +11849,8 @@ checksum = "94ab20faf7b5edaa79acd240e0f21d5a2ef936aa99ed98f698573a2825b299c4" dependencies = [ "base64 0.22.1", "bytemuck", - "solana-curve25519 2.2.15", - "solana-zk-sdk 2.2.15", + "solana-curve25519 2.3.1", + "solana-zk-sdk 2.3.1", ] [[package]] @@ -12236,14 +11861,14 @@ checksum = "fe2629860ff04c17bafa9ba4bed8850a404ecac81074113e1f840dbd0ebb7bd6" dependencies = [ "bytemuck", "solana-account-info", - "solana-curve25519 2.2.15", + "solana-curve25519 2.3.1", "solana-instruction", "solana-instructions-sysvar", "solana-msg", "solana-program-error", "solana-pubkey", "solana-sdk-ids", - "solana-zk-sdk 2.2.15", + "solana-zk-sdk 2.3.1", "spl-pod", "thiserror 2.0.12", ] @@ -12255,7 +11880,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae5b124840d4aed474cef101d946a798b806b46a509ee4df91021e1ab1cef3ef" dependencies = [ "curve25519-dalek 4.1.3", - "solana-zk-sdk 2.2.15", + "solana-zk-sdk 2.3.1", "thiserror 2.0.12", ] @@ -12398,7 +12023,7 @@ version = "0.24.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" dependencies = [ - "heck 0.4.0", + "heck 0.4.1", "proc-macro2", "quote", "rustversion", @@ -12468,9 +12093,9 @@ dependencies = [ [[package]] name = "synstructure" -version = "0.13.1" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" +checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2" dependencies = [ "proc-macro2", "quote", @@ -12596,7 +12221,7 @@ dependencies = [ "fastrand", "getrandom 0.3.3", "once_cell", - "rustix 1.0.2", + "rustix 1.0.7", "windows-sys 0.59.0", ] @@ -12611,9 +12236,9 @@ dependencies = [ [[package]] name = "termtree" -version = "0.2.3" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13a4ec180a2de59b57434704ccfad967f789b12737738798fa08798cd5824c16" +checksum = "8f50febec83f5ee1df3015341d8bd429f2d1cc62bcba7ea2076759d315084683" [[package]] name = "test-case" @@ -12626,12 +12251,11 @@ dependencies = [ [[package]] name = "test-case-core" -version = "3.2.1" +version = "3.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54c25e2cb8f5fcd7318157634e8838aa6f7e4715c96637f969fabaccd1ef5462" +checksum = "adcb7fd841cd518e279be3d5a3eb0636409487998a4aff22f3de87b81e88384f" dependencies = [ "cfg-if 1.0.1", - "proc-macro-error", "proc-macro2", "quote", "syn 2.0.104", @@ -12639,11 +12263,10 @@ dependencies = [ [[package]] name = "test-case-macros" -version = "3.2.1" +version = "3.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37cfd7bbc88a0104e304229fba519bdc45501a30b760fb72240342f1289ad257" +checksum = "5c89e72a01ed4c579669add59014b9a524d609c0c88c6a585ce37485879f6ffb" dependencies = [ - "proc-macro-error", "proc-macro2", "quote", "syn 2.0.104", @@ -12656,14 +12279,14 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" dependencies = [ - "unicode-width 0.1.9", + "unicode-width 0.1.14", ] [[package]] name = "textwrap" -version = "0.16.0" +version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" +checksum = "c13547615a44dc9c452a8a534638acdf07120d4b6847c8178705da06306a3057" [[package]] name = "thiserror" @@ -12727,11 +12350,11 @@ checksum = "bcbb6aa301e5d3b0b5ef639c9a9c7e2f1c944f177b460c04dc24c69b1fa2bd99" [[package]] name = "thread_local" -version = "1.1.4" +version = "1.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5516c27b78311c50bf42c071425c560ac799b11c30b31f87e3081965fe5e0180" +checksum = "f60246a4944f24f6e018aa17cdeffb7818b76356965d03b07d6a9886e8962185" dependencies = [ - "once_cell", + "cfg-if 1.0.1", ] [[package]] @@ -12756,21 +12379,34 @@ dependencies = [ [[package]] name = "time" -version = "0.3.9" +version = "0.3.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2702e08a7a860f005826c6815dcac101b19b5eb330c27fe4a5928fec1d20ddd" +checksum = "8a7619e19bc266e0f9c5e6686659d394bc57973859340060a69221e57dbc0c40" dependencies = [ + "deranged", "itoa", - "libc", - "num_threads", + "num-conv", + "powerfmt", + "serde", + "time-core", "time-macros", ] +[[package]] +name = "time-core" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9e9a38711f559d9e3ce1cdb06dd7c5b8ea546bc90052da6d06bb76da74bb07c" + [[package]] name = "time-macros" -version = "0.2.4" +version = "0.2.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42657b1a6f4d817cda8e7a0ace261fe0cc946cf3a80314390b22cc61ae080792" +checksum = "3526739392ec93fd8b359c8e98514cb3e8e021beb4e5f597b00a0221f8ed8a49" +dependencies = [ + "num-conv", + "time-core", +] [[package]] name = "tiny-bip39" @@ -12793,9 +12429,9 @@ dependencies = [ [[package]] name = "tinystr" -version = "0.7.6" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f" +checksum = "5d4f6d1145dcb577acf783d4e601bc1d76a13337bb54e6233add580b07344c8b" dependencies = [ "displaydoc", "zerovec", @@ -12813,18 +12449,18 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.6.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +checksum = "09b3661f17e86524eccd4371ab0429194e0d7c008abb45f7a7495b1719463c71" dependencies = [ "tinyvec_macros", ] [[package]] name = "tinyvec_macros" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" @@ -12836,7 +12472,7 @@ dependencies = [ "bytes", "libc", "mio", - "parking_lot 0.12.3", + "parking_lot 0.12.4", "pin-project-lite", "signal-hook-registry", "socket2", @@ -12846,9 +12482,9 @@ dependencies = [ [[package]] name = "tokio-io-timeout" -version = "1.1.1" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90c49f106be240de154571dd31fbe48acb10ba6c6dd6f6517ad603abffa42de9" +checksum = "30b74022ada614a1b4834de765f9bb43877f910cc8ce4be40e89042c9223a8bf" dependencies = [ "pin-project-lite", "tokio", @@ -12867,9 +12503,9 @@ dependencies = [ [[package]] name = "tokio-native-tls" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7d995660bd2b7f8c1568414c1126076c13fbb725c40112dc0120b78eb9b717b" +checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" dependencies = [ "native-tls", "tokio", @@ -12934,7 +12570,7 @@ dependencies = [ "tokio", "tokio-rustls 0.24.1", "tungstenite", - "webpki-roots 0.25.2", + "webpki-roots 0.25.4", ] [[package]] @@ -12968,57 +12604,53 @@ dependencies = [ [[package]] name = "toml" -version = "0.5.8" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa" +checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" dependencies = [ "serde", ] [[package]] name = "toml" -version = "0.8.12" +version = "0.8.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3" +checksum = "dc1beb996b9d83529a9e75c17a1686767d148d70663143c7854d8b4a09ced362" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.22.12", + "toml_edit", ] [[package]] name = "toml_datetime" -version = "0.6.5" +version = "0.6.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +checksum = "22cddaf88f4fbc13c51aebbf5f8eceb5c7c5a9da2ac40a13519eb5b0a0e8f11c" dependencies = [ "serde", ] [[package]] name = "toml_edit" -version = "0.21.1" +version = "0.22.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" +checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a" dependencies = [ - "indexmap 2.9.0", + "indexmap 2.10.0", + "serde", + "serde_spanned", "toml_datetime", - "winnow 0.5.16", + "toml_write", + "winnow", ] [[package]] -name = "toml_edit" -version = "0.22.12" +name = "toml_write" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3328d4f68a705b2a4498da1d580585d39a6510f98318a2cec3018a7ec61ddef" -dependencies = [ - "indexmap 2.9.0", - "serde", - "serde_spanned", - "toml_datetime", - "winnow 0.6.13", -] +checksum = "5d99f8c9a7727884afe522e9bd5edbfc91a3312b36a77b5fb8926e4c31a41801" [[package]] name = "tonic" @@ -13035,7 +12667,7 @@ dependencies = [ "futures-util", "h2", "http 0.2.12", - "http-body 0.4.5", + "http-body 0.4.6", "hyper 0.14.32", "hyper-timeout", "percent-encoding 2.3.1", @@ -13109,7 +12741,7 @@ dependencies = [ "bitflags 2.9.1", "bytes", "futures-util", - "http 1.1.0", + "http 1.3.1", "http-body 1.0.1", "iri-string", "pin-project-lite", @@ -13132,9 +12764,9 @@ checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" [[package]] name = "tracing" -version = "0.1.40" +version = "0.1.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0" dependencies = [ "log", "pin-project-lite", @@ -13144,9 +12776,9 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.27" +version = "0.1.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +checksum = "81383ab64e72a7a8b8e13130c49e3dab29def6d0c7d76a03087b3cf71c5c6903" dependencies = [ "proc-macro2", "quote", @@ -13155,9 +12787,9 @@ dependencies = [ [[package]] name = "tracing-core" -version = "0.1.32" +version = "0.1.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +checksum = "b9d12581f227e93f094d3af2ae690a574abb8a2b9b7a96e7cfe9647b2b617678" dependencies = [ "once_cell", "valuable", @@ -13165,10 +12797,11 @@ dependencies = [ [[package]] name = "tracing-opentelemetry" -version = "0.17.2" +version = "0.17.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f9378e96a9361190ae297e7f3a8ff644aacd2897f244b1ff81f381669196fa6" +checksum = "fbbe89715c1dbbb790059e2565353978564924ee85017b5fff365c872ff6721f" dependencies = [ + "once_cell", "opentelemetry", "tracing", "tracing-core", @@ -13177,9 +12810,9 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.3.7" +version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5312f325fe3588e277415f5a6cca1f4ccad0f248c4cd5a4bd33032d7286abc22" +checksum = "e8189decb5ac0fa7bc8b96b7cb9b2701d60d48805aca84a238004d665fcc4008" dependencies = [ "sharded-slab", "thread_local", @@ -13205,9 +12838,9 @@ checksum = "0de5f738ceab88e2491a94ddc33c3feeadfa95fedc60363ef110845df12f3878" [[package]] name = "try-lock" -version = "0.2.3" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "tungstenite" @@ -13232,15 +12865,15 @@ dependencies = [ [[package]] name = "typenum" -version = "1.15.0" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" +checksum = "1dccffe3ce07af9386bfd29e80c0ab1a8205a2fc34e4bcd40364df902cfa8f3f" [[package]] name = "ucd-trie" -version = "0.1.3" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c" +checksum = "2896d95c02a80c6d6a5d6e953d479f5ddf2dfdb6a244441010e373ac0fb88971" [[package]] name = "unarray" @@ -13250,30 +12883,27 @@ checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94" [[package]] name = "unicase" -version = "2.6.0" +version = "2.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" -dependencies = [ - "version_check", -] +checksum = "75b844d17643ee918803943289730bec8aac480150456169e647ed0b576ba539" [[package]] name = "unicode-bidi" -version = "0.3.13" +version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" +checksum = "5c1cb5db39152898a79168971543b1cb5020dff7fe43c8dc468b0885f5e29df5" [[package]] name = "unicode-ident" -version = "1.0.14" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" +checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512" [[package]] name = "unicode-normalization" -version = "0.1.22" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956" dependencies = [ "tinyvec", ] @@ -13286,21 +12916,21 @@ checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" [[package]] name = "unicode-width" -version = "0.1.9" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973" +checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" [[package]] name = "unicode-width" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd" +checksum = "4a1a07cc7db3810833284e8d372ccdc6da29741639ecc70c9ec107df0fa6154c" [[package]] name = "unicode-xid" -version = "0.2.2" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" +checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" [[package]] name = "universal-hash" @@ -13377,17 +13007,11 @@ version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" -[[package]] -name = "utf16_iter" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246" - [[package]] name = "utf8-width" -version = "0.1.5" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cf7d77f457ef8dfa11e4cd5933c5ddb5dc52a94664071951219a97710f0a32b" +checksum = "86bd8d4e895da8537e5315b8254664e6b769c4ff3db18321b297a1e7004392e3" [[package]] name = "utf8_iter" @@ -13403,9 +13027,9 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "valuable" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" +checksum = "ba73ea9cf16a25df0c8caa16c51acb937d5712a8429db78a3ee29d5dcacd3a65" [[package]] name = "vcpkg" @@ -13427,9 +13051,9 @@ checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" [[package]] name = "version_check" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" [[package]] name = "void" @@ -13439,31 +13063,29 @@ checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" [[package]] name = "wait-timeout" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6" +checksum = "09ac3b126d3914f9849036f826e054cbabdc8519970b8998ddaf3b5bd3c65f11" dependencies = [ "libc", ] [[package]] name = "walkdir" -version = "2.3.2" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" dependencies = [ "same-file", - "winapi 0.3.9", "winapi-util", ] [[package]] name = "want" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0" +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" dependencies = [ - "log", "try-lock", ] @@ -13475,9 +13097,9 @@ checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" [[package]] name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" +version = "0.11.1+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" +checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b" [[package]] name = "wasi" @@ -13516,12 +13138,13 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.28" +version = "0.4.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e8d7523cb1f2a4c96c1317ca690031b714a51cc14e05f712446691f413f5d39" +checksum = "555d470ec0bc3bb57890405e5d4322cc9ea83cebb085523ced7be4144dac1e61" dependencies = [ "cfg-if 1.0.1", "js-sys", + "once_cell", "wasm-bindgen", "web-sys", ] @@ -13560,9 +13183,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.55" +version = "0.3.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38eb105f1c59d9eaa6b5cdc92b859d85b926e82cb2e0945cd0c9259faa6fe9fb" +checksum = "33b6dd2ef9186f1f2072e409e99cd22a975331a6b3591b12c764e0e55c60d5d2" dependencies = [ "js-sys", "wasm-bindgen", @@ -13580,9 +13203,18 @@ dependencies = [ [[package]] name = "webpki-root-certs" -version = "0.26.6" +version = "0.26.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8c6dfa3ac045bc517de14c7b1384298de1dbd229d38e08e169d9ae8c170937c" +checksum = "75c7f0ef91146ebfb530314f5f1d24528d7f0767efbfd31dce919275413e393e" +dependencies = [ + "webpki-root-certs 1.0.1", +] + +[[package]] +name = "webpki-root-certs" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86138b15b2b7d561bc4469e77027b8dd005a43dc502e9031d1f5afc8ce1f280e" dependencies = [ "rustls-pki-types", ] @@ -13598,44 +13230,36 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.25.2" +version = "0.25.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc" +checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" [[package]] name = "webpki-roots" -version = "0.26.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2210b291f7ea53617fbafcc4939f10914214ec15aace5ba62293a668f322c5c9" -dependencies = [ - "rustls-pki-types", -] - -[[package]] -name = "webpki-roots" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2853738d1cc4f2da3a225c18ec6c3721abb31961096e9dbf5ab35fa88b19cfdb" +checksum = "8782dd5a41a24eed3a4f40b606249b3e236ca61adf1f25ea4d45c73de122b502" dependencies = [ "rustls-pki-types", ] [[package]] name = "which" -version = "4.2.2" +version = "4.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea187a8ef279bc014ec368c27a920da2024d2a711109bfbe3440585d5cf27ad9" +checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" dependencies = [ "either", - "lazy_static", - "libc", + "home", + "once_cell", + "rustix 0.38.44", ] [[package]] name = "wide" -version = "0.7.32" +version = "0.7.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41b5576b9a81633f3e8df296ce0063042a73507636cbe956c61133dd7034ab22" +checksum = "0ce5da8ecb62bcd8ec8b7ea19f69a51275e91299be594ea5cc6ef7819e16cd03" dependencies = [ "bytemuck", "safe_arch", @@ -13671,11 +13295,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.5" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ - "winapi 0.3.9", + "windows-sys 0.59.0", ] [[package]] @@ -13686,37 +13310,104 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows" -version = "0.54.0" +version = "0.61.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9252e5725dbed82865af151df558e754e4a3c2c30818359eb17465f1346a1b49" +checksum = "9babd3a767a4c1aef6900409f85f5d53ce2544ccdfaa86dad48c91782c6d6893" +dependencies = [ + "windows-collections", + "windows-core", + "windows-future", + "windows-link", + "windows-numerics", +] + +[[package]] +name = "windows-collections" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3beeceb5e5cfd9eb1d76b381630e82c4241ccd0d27f1a39ed41b2760b255c5e8" dependencies = [ "windows-core", - "windows-targets 0.52.6", ] [[package]] name = "windows-core" -version = "0.54.0" +version = "0.61.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12661b9c89351d684a50a8a643ce5f608e20243b9fb84687800163429f161d65" +checksum = "c0fdd3ddb90610c7638aa2b3a3ab2904fb9e5cdbecc643ddb3647212781c4ae3" dependencies = [ + "windows-implement", + "windows-interface", + "windows-link", "windows-result", - "windows-targets 0.52.6", + "windows-strings", +] + +[[package]] +name = "windows-future" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc6a41e98427b19fe4b73c550f060b59fa592d7d686537eebf9385621bfbad8e" +dependencies = [ + "windows-core", + "windows-link", + "windows-threading", +] + +[[package]] +name = "windows-implement" +version = "0.60.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a47fddd13af08290e67f4acabf4b459f647552718f683a7b415d290ac744a836" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.104", +] + +[[package]] +name = "windows-interface" +version = "0.59.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd9211b69f8dcdfa817bfd14bf1c97c9188afa36f4750130fcdf3f400eca9fa8" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.104", ] [[package]] name = "windows-link" -version = "0.1.0" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6dccfd733ce2b1753b03b6d3c65edf020262ea35e20ccdf3e288043e6dd620e3" +checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a" + +[[package]] +name = "windows-numerics" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9150af68066c4c5c07ddc0ce30421554771e528bde427614c61038bc2c92c2b1" +dependencies = [ + "windows-core", + "windows-link", +] [[package]] name = "windows-result" -version = "0.1.1" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "749f0da9cc72d82e600d8d2e44cadd0b9eedb9038f71a1c58556ac1c5791813b" +checksum = "56f42bd332cc6c8eac5af113fc0c1fd6a8fd2aa08a0119358686e5160d0586c6" dependencies = [ - "windows-targets 0.52.6", + "windows-link", +] + +[[package]] +name = "windows-strings" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56e6c93f3a0c3b36176cb1327a4958a0353d5d166c2a35cb268ace15e91d3b57" +dependencies = [ + "windows-link", ] [[package]] @@ -13734,7 +13425,7 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets 0.48.0", + "windows-targets 0.48.5", ] [[package]] @@ -13755,6 +13446,15 @@ dependencies = [ "windows-targets 0.52.6", ] +[[package]] +name = "windows-sys" +version = "0.60.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb" +dependencies = [ + "windows-targets 0.53.2", +] + [[package]] name = "windows-targets" version = "0.42.2" @@ -13772,17 +13472,17 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ - "windows_aarch64_gnullvm 0.48.0", - "windows_aarch64_msvc 0.48.0", - "windows_i686_gnu 0.48.0", - "windows_i686_msvc 0.48.0", - "windows_x86_64_gnu 0.48.0", - "windows_x86_64_gnullvm 0.48.0", - "windows_x86_64_msvc 0.48.0", + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", ] [[package]] @@ -13794,13 +13494,38 @@ dependencies = [ "windows_aarch64_gnullvm 0.52.6", "windows_aarch64_msvc 0.52.6", "windows_i686_gnu 0.52.6", - "windows_i686_gnullvm", + "windows_i686_gnullvm 0.52.6", "windows_i686_msvc 0.52.6", "windows_x86_64_gnu 0.52.6", "windows_x86_64_gnullvm 0.52.6", "windows_x86_64_msvc 0.52.6", ] +[[package]] +name = "windows-targets" +version = "0.53.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c66f69fcc9ce11da9966ddb31a40968cad001c5bedeb5c2b82ede4253ab48aef" +dependencies = [ + "windows_aarch64_gnullvm 0.53.0", + "windows_aarch64_msvc 0.53.0", + "windows_i686_gnu 0.53.0", + "windows_i686_gnullvm 0.53.0", + "windows_i686_msvc 0.53.0", + "windows_x86_64_gnu 0.53.0", + "windows_x86_64_gnullvm 0.53.0", + "windows_x86_64_msvc 0.53.0", +] + +[[package]] +name = "windows-threading" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b66463ad2e0ea3bbf808b7f1d371311c80e115c0b71d60efc142cafbcfb057a6" +dependencies = [ + "windows-link", +] + [[package]] name = "windows_aarch64_gnullvm" version = "0.42.2" @@ -13809,9 +13534,9 @@ checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" @@ -13819,6 +13544,12 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764" + [[package]] name = "windows_aarch64_msvc" version = "0.42.2" @@ -13827,9 +13558,9 @@ checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" [[package]] name = "windows_aarch64_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" @@ -13837,6 +13568,12 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" +[[package]] +name = "windows_aarch64_msvc" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c" + [[package]] name = "windows_i686_gnu" version = "0.42.2" @@ -13845,9 +13582,9 @@ checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" [[package]] name = "windows_i686_gnu" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" @@ -13855,12 +13592,24 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" +[[package]] +name = "windows_i686_gnu" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1dc67659d35f387f5f6c479dc4e28f1d4bb90ddd1a5d3da2e5d97b42d6272c3" + [[package]] name = "windows_i686_gnullvm" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" +[[package]] +name = "windows_i686_gnullvm" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11" + [[package]] name = "windows_i686_msvc" version = "0.42.2" @@ -13869,9 +13618,9 @@ checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" [[package]] name = "windows_i686_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" @@ -13879,6 +13628,12 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" +[[package]] +name = "windows_i686_msvc" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d" + [[package]] name = "windows_x86_64_gnu" version = "0.42.2" @@ -13887,9 +13642,9 @@ checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" [[package]] name = "windows_x86_64_gnu" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" @@ -13897,6 +13652,12 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" +[[package]] +name = "windows_x86_64_gnu" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba" + [[package]] name = "windows_x86_64_gnullvm" version = "0.42.2" @@ -13905,9 +13666,9 @@ checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" [[package]] name = "windows_x86_64_gnullvm" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" @@ -13915,6 +13676,12 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57" + [[package]] name = "windows_x86_64_msvc" version = "0.42.2" @@ -13923,9 +13690,9 @@ checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" [[package]] name = "windows_x86_64_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" @@ -13934,19 +13701,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] -name = "winnow" -version = "0.5.16" +name = "windows_x86_64_msvc" +version = "0.53.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "037711d82167854aff2018dfd193aa0fef5370f456732f0d5a0c59b0f1b4b907" -dependencies = [ - "memchr", -] +checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486" [[package]] name = "winnow" -version = "0.6.13" +version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59b5e5f6c299a3c7890b876a2a587f3115162487e704907d9b6cd29473052ba1" +checksum = "74c7b26e3480b707944fc872477815d29a8e429d2f93a1ce000f5fa84a15cbcd" dependencies = [ "memchr", ] @@ -13970,17 +13734,11 @@ dependencies = [ "bitflags 2.9.1", ] -[[package]] -name = "write16" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936" - [[package]] name = "writeable" -version = "0.5.5" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51" +checksum = "ea2f10b9bb0928dfb1b42b65e1f9e36f7f54dbdf08457afefb38afcdec4fa2bb" [[package]] name = "wyz" @@ -14011,13 +13769,12 @@ dependencies = [ [[package]] name = "xattr" -version = "1.3.1" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" +checksum = "af3a19837351dc82ba89f8a125e22a3c475f05aba604acc023d62b2739ae2909" dependencies = [ "libc", - "linux-raw-sys 0.4.14", - "rustix 0.38.39", + "rustix 1.0.7", ] [[package]] @@ -14031,9 +13788,9 @@ dependencies = [ [[package]] name = "yoke" -version = "0.7.4" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c5b1314b079b0930c31e3af543d8ee1757b1951ae1e1565ec704403a7240ca5" +checksum = "5f41bb01b8226ef4bfd589436a297c53d118f65921786300e427be8d487695cc" dependencies = [ "serde", "stable_deref_trait", @@ -14043,50 +13800,30 @@ dependencies = [ [[package]] name = "yoke-derive" -version = "0.7.4" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95" +checksum = "38da3c9736e16c5d3c8c597a9aaa5d1fa565d0532ae05e27c24aa62fb32c0ab6" dependencies = [ "proc-macro2", "quote", "syn 2.0.104", - "synstructure 0.13.1", + "synstructure 0.13.2", ] [[package]] name = "zerocopy" -version = "0.7.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c4061bedbb353041c12f413700357bec76df2c7e2ca8e4df8bac24c6bf68e3d" -dependencies = [ - "zerocopy-derive 0.7.31", -] - -[[package]] -name = "zerocopy" -version = "0.8.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd97444d05a4328b90e75e503a34bad781f14e28a823ad3557f0750df1ebcbc6" -dependencies = [ - "zerocopy-derive 0.8.23", -] - -[[package]] -name = "zerocopy-derive" -version = "0.7.31" +version = "0.8.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a" +checksum = "1039dd0d3c310cf05de012d8a39ff557cb0d23087fd44cad61df08fc31907a2f" dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.104", + "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.8.23" +version = "0.8.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6352c01d0edd5db859a63e2605f4ea3183ddbd15e2c4a9e7d32184df75e4f154" +checksum = "9ecf5b4cc5364572d7f4c329661bcc82724222973f2cab6f050a4e5c22f75181" dependencies = [ "proc-macro2", "quote", @@ -14095,23 +13832,23 @@ dependencies = [ [[package]] name = "zerofrom" -version = "0.1.4" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ec111ce797d0e0784a1116d0ddcdbea84322cd79e5d5ad173daeba4f93ab55" +checksum = "50cc42e0333e05660c3587f3bf9d0478688e15d870fab3346451ce7f8c9fbea5" dependencies = [ "zerofrom-derive", ] [[package]] name = "zerofrom-derive" -version = "0.1.4" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5" +checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502" dependencies = [ "proc-macro2", "quote", "syn 2.0.104", - "synstructure 0.13.1", + "synstructure 0.13.2", ] [[package]] @@ -14134,11 +13871,22 @@ dependencies = [ "syn 2.0.104", ] +[[package]] +name = "zerotrie" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36f0bbd478583f79edad978b407914f61b2972f5af6fa089686016be8f9af595" +dependencies = [ + "displaydoc", + "yoke", + "zerofrom", +] + [[package]] name = "zerovec" -version = "0.10.4" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079" +checksum = "4a05eb080e015ba39cc9e23bbe5e7fb04d5fb040350f99f34e338d5fdd294428" dependencies = [ "yoke", "zerofrom", @@ -14147,9 +13895,9 @@ dependencies = [ [[package]] name = "zerovec-derive" -version = "0.10.3" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" +checksum = "5b96237efa0c878c64bd89c436f661be4e46b2f3eff1ebb976f7ef2321d2f58f" dependencies = [ "proc-macro2", "quote", @@ -14167,19 +13915,44 @@ dependencies = [ [[package]] name = "zstd-safe" -version = "7.2.1" +version = "7.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54a3ab4db68cea366acc5c897c7b4d4d1b8994a9cd6e6f841f8964566a419059" +checksum = "8f49c4d5f0abb602a93fb8736af2a4f4dd9512e36f7f570d66e65ff867ed3b9d" dependencies = [ "zstd-sys", ] [[package]] name = "zstd-sys" -version = "2.0.13+zstd.1.5.6" +version = "2.0.15+zstd.1.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38ff0f21cfee8f97d94cef41359e0c89aa6113028ab0291aa8ca0038995a95aa" +checksum = "eb81183ddd97d0c74cedf1d50d85c8d08c1b8b68ee863bdee9e706eedba1a237" dependencies = [ "cc", "pkg-config", ] + +[[patch.unused]] +name = "crossbeam-epoch" +version = "0.9.5" +source = "git+https://github.com/anza-xyz/crossbeam?rev=fd279d707025f0e60951e429bf778b4813d1b6bf#fd279d707025f0e60951e429bf778b4813d1b6bf" + +[[patch.unused]] +name = "solana-package-metadata" +version = "2.2.1" + +[[patch.unused]] +name = "solana-package-metadata-macro" +version = "2.2.1" + +[[patch.unused]] +name = "solana-quic-definitions" +version = "2.3.1" + +[[patch.unused]] +name = "solana-rent-debits" +version = "2.2.1" + +[[patch.unused]] +name = "solana-sdk" +version = "2.3.0" diff --git a/Cargo.toml b/Cargo.toml index 189d6d901ac248..f335a5f8973580 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -677,3 +677,98 @@ crossbeam-epoch = { git = "https://github.com/anza-xyz/crossbeam", rev = "fd279d # comments and the overrides in sync. solana-curve25519 = { path = "curves/curve25519" } solana-zk-sdk = { path = "zk-sdk" } + +solana-account = { path = "../sdk/account" } +solana-account-info = { path = "../sdk/account-info" } +solana-address-lookup-table-interface = { path = "../sdk/address-lookup-table-interface" } +solana-atomic-u64 = { path = "../sdk/atomic-u64" } +solana-big-mod-exp = { path = "../sdk/big-mod-exp" } +solana-bincode = { path = "../sdk/bincode" } +solana-blake3-hasher = { path = "../sdk/blake3-hasher" } +solana-bn254 = { path = "../sdk/bn254" } +solana-borsh = { path = "../sdk/borsh" } +solana-client-traits = { path = "../sdk/client-traits" } +solana-clock = { path = "../sdk/clock" } +solana-cluster-type = { path = "../sdk/cluster-type" } +solana-commitment-config = { path = "../sdk/commitment-config" } +solana-compute-budget-interface = { path = "../sdk/compute-budget-interface" } +solana-cpi = { path = "../sdk/cpi" } +solana-define-syscall = { path = "../sdk/define-syscall" } +solana-derivation-path = { path = "../sdk/derivation-path" } +solana-ed25519-program = { path = "../sdk/ed25519-program" } +solana-epoch-info = { path = "../sdk/epoch-info" } +solana-epoch-rewards = { path = "../sdk/epoch-rewards" } +solana-epoch-rewards-hasher = { path = "../sdk/epoch-rewards-hasher" } +solana-epoch-schedule = { path = "../sdk/epoch-schedule" } +solana-example-mocks = { path = "../sdk/example-mocks" } +solana-feature-gate-interface = { path = "../sdk/feature-gate-interface" } +solana-fee-calculator = { path = "../sdk/fee-calculator" } +solana-fee-structure = { path = "../sdk/fee-structure" } +solana-file-download = { path = "../sdk/file-download" } +solana-frozen-abi = { path = "../sdk/frozen-abi" } +solana-frozen-abi-macro = { path = "../sdk/frozen-abi-macro" } +solana-genesis-config = { path = "../sdk/genesis-config" } +solana-hard-forks = { path = "../sdk/hard-forks" } +solana-hash = { path = "../sdk/hash" } +solana-inflation = { path = "../sdk/inflation" } +solana-instruction = { path = "../sdk/instruction" } +solana-instructions-sysvar = { path = "../sdk/instructions-sysvar" } +solana-keccak-hasher = { path = "../sdk/keccak-hasher" } +solana-keypair = { path = "../sdk/keypair" } +solana-last-restart-slot = { path = "../sdk/last-restart-slot" } +solana-loader-v2-interface = { path = "../sdk/loader-v2-interface" } +solana-loader-v3-interface = { path = "../sdk/loader-v3-interface" } +solana-loader-v4-interface = { path = "../sdk/loader-v4-interface" } +solana-logger = { path = "../sdk/logger" } +solana-message = { path = "../sdk/message" } +solana-msg = { path = "../sdk/msg" } +solana-native-token = { path = "../sdk/native-token" } +solana-nonce = { path = "../sdk/nonce" } +solana-nonce-account = { path = "../sdk/nonce-account" } +solana-offchain-message = { path = "../sdk/offchain-message" } +solana-package-metadata = { path = "../sdk/package-metadata" } +solana-package-metadata-macro = { path = "../sdk/package-metadata-macro" } +solana-packet = { path = "../sdk/packet" } +solana-poh-config = { path = "../sdk/poh-config" } +solana-precompile-error = { path = "../sdk/precompile-error" } +solana-presigner = { path = "../sdk/presigner" } +solana-program = { path = "../sdk/program" } +solana-program-entrypoint = { path = "../sdk/program-entrypoint" } +solana-program-error = { path = "../sdk/program-error" } +solana-program-memory = { path = "../sdk/program-memory" } +solana-program-option = { path = "../sdk/program-option" } +solana-program-pack = { path = "../sdk/program-pack" } +solana-pubkey = { path = "../sdk/pubkey" } +solana-quic-definitions = { path = "../sdk/quic-definitions" } +solana-rent = { path = "../sdk/rent" } +solana-rent-collector = { path = "../sdk/rent-collector" } +solana-rent-debits = { path = "../sdk/rent-debits" } +solana-reward-info = { path = "../sdk/reward-info" } +solana-sanitize = { path = "../sdk/sanitize" } +solana-sdk = { path = "../sdk/sdk" } +solana-sdk-ids = { path = "../sdk/sdk-ids" } +solana-sdk-macro = { path = "../sdk/sdk-macro" } +solana-secp256k1-program = { path = "../sdk/secp256k1-program" } +solana-secp256k1-recover = { path = "../sdk/secp256k1-recover" } +solana-secp256r1-program = { path = "../sdk/secp256r1-program" } +solana-seed-derivable = { path = "../sdk/seed-derivable" } +solana-seed-phrase = { path = "../sdk/seed-phrase" } +solana-serde = { path = "../sdk/serde" } +solana-serde-varint = { path = "../sdk/serde-varint" } +solana-serialize-utils = { path = "../sdk/serialize-utils" } +solana-sha256-hasher = { path = "../sdk/sha256-hasher" } +solana-short-vec = { path = "../sdk/short-vec" } +solana-shred-version = { path = "../sdk/shred-version" } +solana-signature = { path = "../sdk/signature" } +solana-signer = { path = "../sdk/signer" } +solana-slot-hashes = { path = "../sdk/slot-hashes" } +solana-slot-history = { path = "../sdk/slot-history" } +solana-stable-layout = { path = "../sdk/stable-layout" } +solana-system-transaction = { path = "../sdk/system-transaction" } +solana-sysvar = { path = "../sdk/sysvar" } +solana-sysvar-id = { path = "../sdk/sysvar-id" } +solana-time-utils = { path = "../sdk/time-utils" } +solana-transaction = { path = "../sdk/transaction" } +solana-transaction-error = { path = "../sdk/transaction-error" } +solana-validator-exit = { path = "../sdk/validator-exit" } +solana-vote-interface = { path = "../sdk/vote-interface" } From 2dbb374983c4f8f2b12f178d5c4f94c57764e1cd Mon Sep 17 00:00:00 2001 From: Joe Caulfield Date: Fri, 27 Jun 2025 06:26:03 +0000 Subject: [PATCH 2/2] vote-interface: explicitly use v3 --- account-decoder/src/parse_account_data.rs | 2 +- account-decoder/src/parse_vote.rs | 2 +- cli/tests/vote.rs | 10 +- core/src/commitment_service.rs | 8 +- core/src/consensus.rs | 4 +- core/src/replay_stage.rs | 2 +- ledger/src/blockstore_processor.rs | 2 +- ledger/src/staking_utils.rs | 2 +- program-test/src/lib.rs | 2 +- programs/stake/benches/stake.rs | 2 +- programs/stake/src/stake_instruction.rs | 55 +++--- programs/stake/src/stake_state.rs | 16 +- programs/vote/benches/process_vote.rs | 2 +- programs/vote/benches/vote_instructions.rs | 2 +- programs/vote/src/vote_processor.rs | 47 ++--- programs/vote/src/vote_state/mod.rs | 186 +++++++++--------- rpc/src/rpc.rs | 2 +- runtime/src/bank.rs | 2 +- .../src/bank/partitioned_epoch_rewards/mod.rs | 4 +- runtime/src/bank/tests.rs | 8 +- runtime/src/stakes.rs | 2 +- runtime/tests/stake.rs | 2 +- vote/benches/vote_account.rs | 2 +- vote/src/vote_account.rs | 4 +- vote/src/vote_state_view.rs | 8 +- vote/src/vote_state_view/frame_v3.rs | 4 +- 26 files changed, 192 insertions(+), 190 deletions(-) diff --git a/account-decoder/src/parse_account_data.rs b/account-decoder/src/parse_account_data.rs index 9f58a0c4fb49b9..33d0b329037c20 100644 --- a/account-decoder/src/parse_account_data.rs +++ b/account-decoder/src/parse_account_data.rs @@ -227,7 +227,7 @@ mod test { let vote_state = VoteState::default(); let mut vote_account_data: Vec = vec![0; VoteState::size_of()]; - let versioned = VoteStateVersions::new_current(vote_state); + let versioned = VoteStateVersions::new_v3(vote_state); VoteState::serialize(&versioned, &mut vote_account_data).unwrap(); let parsed = parse_account_data_v3( &account_pubkey, diff --git a/account-decoder/src/parse_vote.rs b/account-decoder/src/parse_vote.rs index aca75b74f8354d..ac31939084ed23 100644 --- a/account-decoder/src/parse_vote.rs +++ b/account-decoder/src/parse_vote.rs @@ -127,7 +127,7 @@ mod test { fn test_parse_vote() { let vote_state = VoteState::default(); let mut vote_account_data: Vec = vec![0; VoteState::size_of()]; - let versioned = VoteStateVersions::new_current(vote_state); + let versioned = VoteStateVersions::new_v3(vote_state); VoteState::serialize(&versioned, &mut vote_account_data).unwrap(); let expected_vote_state = UiVoteState { node_pubkey: Pubkey::default().to_string(), diff --git a/cli/tests/vote.rs b/cli/tests/vote.rs index 0fa1ac5ee33a3a..32fca28c9a0a34 100644 --- a/cli/tests/vote.rs +++ b/cli/tests/vote.rs @@ -64,7 +64,7 @@ fn test_vote_authorize_and_withdraw(compute_unit_price: Option) { .get_account(&vote_account_keypair.pubkey()) .unwrap(); let vote_state: VoteStateVersions = vote_account.state().unwrap(); - let authorized_withdrawer = vote_state.convert_to_current().authorized_withdrawer; + let authorized_withdrawer = vote_state.convert_to_v3().authorized_withdrawer; assert_eq!(authorized_withdrawer, config.signers[0].pubkey()); let expected_balance = rpc_client .get_minimum_balance_for_rent_exemption(VoteState::size_of()) @@ -118,7 +118,7 @@ fn test_vote_authorize_and_withdraw(compute_unit_price: Option) { .get_account(&vote_account_keypair.pubkey()) .unwrap(); let vote_state: VoteStateVersions = vote_account.state().unwrap(); - let authorized_withdrawer = vote_state.convert_to_current().authorized_withdrawer; + let authorized_withdrawer = vote_state.convert_to_v3().authorized_withdrawer; assert_eq!(authorized_withdrawer, first_withdraw_authority.pubkey()); // Authorize vote account withdrawal to another signer with checked instruction @@ -165,7 +165,7 @@ fn test_vote_authorize_and_withdraw(compute_unit_price: Option) { .get_account(&vote_account_keypair.pubkey()) .unwrap(); let vote_state: VoteStateVersions = vote_account.state().unwrap(); - let authorized_withdrawer = vote_state.convert_to_current().authorized_withdrawer; + let authorized_withdrawer = vote_state.convert_to_v3().authorized_withdrawer; assert_eq!(authorized_withdrawer, withdraw_authority.pubkey()); // Withdraw from vote account @@ -292,7 +292,7 @@ fn test_offline_vote_authorize_and_withdraw(compute_unit_price: Option) { .get_account(&vote_account_keypair.pubkey()) .unwrap(); let vote_state: VoteStateVersions = vote_account.state().unwrap(); - let authorized_withdrawer = vote_state.convert_to_current().authorized_withdrawer; + let authorized_withdrawer = vote_state.convert_to_v3().authorized_withdrawer; assert_eq!(authorized_withdrawer, offline_keypair.pubkey()); let expected_balance = rpc_client .get_minimum_balance_for_rent_exemption(VoteState::size_of()) @@ -369,7 +369,7 @@ fn test_offline_vote_authorize_and_withdraw(compute_unit_price: Option) { .get_account(&vote_account_keypair.pubkey()) .unwrap(); let vote_state: VoteStateVersions = vote_account.state().unwrap(); - let authorized_withdrawer = vote_state.convert_to_current().authorized_withdrawer; + let authorized_withdrawer = vote_state.convert_to_v3().authorized_withdrawer; assert_eq!(authorized_withdrawer, withdraw_authority.pubkey()); // Withdraw from vote account offline diff --git a/core/src/commitment_service.rs b/core/src/commitment_service.rs index 54c85728310869..a9be3005c6da17 100644 --- a/core/src/commitment_service.rs +++ b/core/src/commitment_service.rs @@ -462,7 +462,7 @@ mod tests { process_slot_vote_unchecked(&mut vote_state1, 3); process_slot_vote_unchecked(&mut vote_state1, 5); if !with_node_vote_state { - let versioned = VoteStateVersions::new_current(vote_state1.clone()); + let versioned = VoteStateVersions::new_v3(vote_state1.clone()); vote_state::to(&versioned, &mut vote_account1).unwrap(); bank.store_account(&pk1, &vote_account1); } @@ -470,19 +470,19 @@ mod tests { let mut vote_state2 = vote_state::from(&vote_account2).unwrap(); process_slot_vote_unchecked(&mut vote_state2, 9); process_slot_vote_unchecked(&mut vote_state2, 10); - let versioned = VoteStateVersions::new_current(vote_state2); + let versioned = VoteStateVersions::new_v3(vote_state2); vote_state::to(&versioned, &mut vote_account2).unwrap(); bank.store_account(&pk2, &vote_account2); let mut vote_state3 = vote_state::from(&vote_account3).unwrap(); vote_state3.root_slot = Some(1); - let versioned = VoteStateVersions::new_current(vote_state3); + let versioned = VoteStateVersions::new_v3(vote_state3); vote_state::to(&versioned, &mut vote_account3).unwrap(); bank.store_account(&pk3, &vote_account3); let mut vote_state4 = vote_state::from(&vote_account4).unwrap(); vote_state4.root_slot = Some(2); - let versioned = VoteStateVersions::new_current(vote_state4); + let versioned = VoteStateVersions::new_v3(vote_state4); vote_state::to(&versioned, &mut vote_account4).unwrap(); bank.store_account(&pk4, &vote_account4); diff --git a/core/src/consensus.rs b/core/src/consensus.rs index 4d6c1e24c7fcdf..4cd6c6e687fade 100644 --- a/core/src/consensus.rs +++ b/core/src/consensus.rs @@ -186,7 +186,7 @@ pub enum TowerVersions { } impl TowerVersions { - pub fn new_current(tower: Tower) -> Self { + pub fn new_v3(tower: Tower) -> Self { Self::Current(tower) } @@ -1822,7 +1822,7 @@ pub mod test { process_slot_vote_unchecked(&mut vote_state, *slot); } VoteState::serialize( - &VoteStateVersions::new_current(vote_state), + &VoteStateVersions::new_v3(vote_state), account.data_as_mut_slice(), ) .expect("serialize state"); diff --git a/core/src/replay_stage.rs b/core/src/replay_stage.rs index fb8b4575fc6ed5..923e43c8c4af8d 100644 --- a/core/src/replay_stage.rs +++ b/core/src/replay_stage.rs @@ -5169,7 +5169,7 @@ pub(crate) mod tests { let mut leader_vote_account = bank.get_account(pubkey).unwrap(); let mut vote_state = vote_state::from(&leader_vote_account).unwrap(); vote_state::process_slot_vote_unchecked(&mut vote_state, vote_slot); - let versioned = VoteStateVersions::new_current(vote_state.clone()); + let versioned = VoteStateVersions::new_v3(vote_state.clone()); vote_state::to(&versioned, &mut leader_vote_account).unwrap(); bank.store_account(pubkey, &leader_vote_account); (*pubkey, TowerVoteState::from(vote_state)) diff --git a/ledger/src/blockstore_processor.rs b/ledger/src/blockstore_processor.rs index 93830624b09c78..aa1405f0a0b4cf 100644 --- a/ledger/src/blockstore_processor.rs +++ b/ledger/src/blockstore_processor.rs @@ -4841,7 +4841,7 @@ pub mod tests { vote_state.root_slot = Some(root); let mut vote_account = AccountSharedData::new(1, VoteState::size_of(), &solana_vote_program::id()); - let versioned = VoteStateVersions::new_current(vote_state); + let versioned = VoteStateVersions::new_v3(vote_state); VoteState::serialize(&versioned, vote_account.data_as_mut_slice()).unwrap(); ( solana_pubkey::new_rand(), diff --git a/ledger/src/staking_utils.rs b/ledger/src/staking_utils.rs index cfb50cef83bcc4..e826084393d47b 100644 --- a/ledger/src/staking_utils.rs +++ b/ledger/src/staking_utils.rs @@ -112,7 +112,7 @@ pub(crate) mod tests { let vote_accounts = stakes.into_iter().map(|(stake, vote_state)| { let account = AccountSharedData::new_data( rng.gen(), // lamports - &VoteStateVersions::new_current(vote_state), + &VoteStateVersions::new_v3(vote_state), &solana_vote_program::id(), // owner ) .unwrap(); diff --git a/program-test/src/lib.rs b/program-test/src/lib.rs index 8c81300f6db808..f8f0a3d69b1f10 100644 --- a/program-test/src/lib.rs +++ b/program-test/src/lib.rs @@ -1109,7 +1109,7 @@ impl ProgramTestContext { for _ in 0..number_of_credits { vote_state.increment_credits(epoch, 1); } - let versioned = VoteStateVersions::new_current(vote_state); + let versioned = VoteStateVersions::new_v3(vote_state); vote_state::to(&versioned, &mut vote_account).unwrap(); bank.store_account(vote_account_address, &vote_account); } diff --git a/programs/stake/benches/stake.rs b/programs/stake/benches/stake.rs index ffee5d581d777d..abafcde1ff6122 100644 --- a/programs/stake/benches/stake.rs +++ b/programs/stake/benches/stake.rs @@ -625,7 +625,7 @@ fn bench_deactivate_delinquent(c: &mut Criterion) { let reference_vote_address = Pubkey::new_unique(); let reference_vote_account = AccountSharedData::new_data_with_space( 1, - &VoteStateVersions::new_current(vote_state), + &VoteStateVersions::new_v3(vote_state), VoteState::size_of(), &solana_sdk_ids::vote::id(), ) diff --git a/programs/stake/src/stake_instruction.rs b/programs/stake/src/stake_instruction.rs index 00ad700a902be1..83a0fe59d3fe20 100644 --- a/programs/stake/src/stake_instruction.rs +++ b/programs/stake/src/stake_instruction.rs @@ -18,6 +18,7 @@ use { state::{Authorized, Lockup}, }, solana_transaction_context::{IndexOfAccount, InstructionContext, TransactionContext}, + solana_vote_interface::state::{VoteStateV3, VoteStateVersions}, }; fn get_optional_pubkey<'a>( @@ -408,7 +409,7 @@ mod tests { rewards::Rewards, stake_history::{StakeHistory, StakeHistoryEntry}, }, - solana_vote_interface::state::{VoteState, VoteStateVersions}, + solana_vote_interface::state::{VoteStateV3, VoteStateVersions}, solana_vote_program::vote_state, std::{collections::HashSet, str::FromStr, sync::Arc}, test_case::test_case, @@ -2003,7 +2004,7 @@ mod tests { let vote_address_2 = solana_pubkey::new_rand(); let mut vote_account_2 = vote_state::create_account(&vote_address_2, &solana_pubkey::new_rand(), 0, 100); - vote_account_2.set_state(&VoteState::default()).unwrap(); + vote_account_2.set_state(&VoteStateVersions::new_v3(VoteStateV3::default())).unwrap(); #[allow(deprecated)] let mut transaction_accounts = vec![ (stake_address, stake_account), @@ -2183,7 +2184,7 @@ mod tests { #[test_case(feature_set_no_minimum_delegation(); "no_min_delegation")] #[test_case(feature_set_all_enabled(); "all_enabled")] fn test_stake_delegate(feature_set: Arc) { - let mut vote_state = VoteState::default(); + let mut vote_state = VoteStateV3::default(); for i in 0..1000 { vote_state::process_slot_vote_unchecked(&mut vote_state, i); } @@ -2195,10 +2196,10 @@ mod tests { let mut vote_account_2 = vote_state::create_account(&vote_address_2, &solana_pubkey::new_rand(), 0, 100); vote_account - .set_state(&VoteStateVersions::new_current(vote_state.clone())) + .set_state(&VoteStateVersions::new_v3(vote_state.clone())) .unwrap(); vote_account_2 - .set_state(&VoteStateVersions::new_current(vote_state)) + .set_state(&VoteStateVersions::new_v3(vote_state)) .unwrap(); let minimum_delegation = crate::get_minimum_delegation( feature_set @@ -2795,7 +2796,7 @@ mod tests { let mut vote_account = vote_state::create_account(&vote_address, &solana_pubkey::new_rand(), 0, 100); vote_account - .set_state(&VoteStateVersions::new_current(VoteState::default())) + .set_state(&VoteStateVersions::new_v3(VoteStateV3::default())) .unwrap(); #[allow(deprecated)] let mut transaction_accounts = vec![ @@ -3091,7 +3092,7 @@ mod tests { let mut vote_account = vote_state::create_account(&vote_address, &solana_pubkey::new_rand(), 0, 100); vote_account - .set_state(&VoteStateVersions::new_current(VoteState::default())) + .set_state(&VoteStateVersions::new_v3(VoteStateV3::default())) .unwrap(); let mut clock = Clock { epoch: 16, @@ -3449,7 +3450,7 @@ mod tests { let mut vote_account = vote_state::create_account(&vote_address, &solana_pubkey::new_rand(), 0, 100); vote_account - .set_state(&VoteStateVersions::new_current(VoteState::default())) + .set_state(&VoteStateVersions::new_v3(VoteStateV3::default())) .unwrap(); #[allow(deprecated)] let mut transaction_accounts = vec![ @@ -3584,7 +3585,7 @@ mod tests { let mut vote_account = vote_state::create_account(&vote_address, &solana_pubkey::new_rand(), 0, 100); vote_account - .set_state(&VoteStateVersions::new_current(VoteState::default())) + .set_state(&VoteStateVersions::new_v3(VoteStateV3::default())) .unwrap(); let instruction_data = serialize(&StakeInstruction::SetLockup(LockupArgs { unix_timestamp: Some(1), @@ -7081,7 +7082,7 @@ mod tests { new_stake( 1, /* stake */ &vote_address, - &VoteState::default(), + &VoteStateV3::default(), 1, /* activation_epoch */ ), StakeFlags::empty(), @@ -7097,16 +7098,16 @@ mod tests { let mut vote_account = AccountSharedData::new_data_with_space( 1, /* lamports */ - &VoteStateVersions::new_current(VoteState::default()), - VoteState::size_of(), + &VoteStateVersions::new_v3(VoteStateV3::default()), + VoteStateV3::size_of(), &solana_sdk_ids::vote::id(), ) .unwrap(); let mut reference_vote_account = AccountSharedData::new_data_with_space( 1, /* lamports */ - &VoteStateVersions::new_current(VoteState::default()), - VoteState::size_of(), + &VoteStateVersions::new_v3(VoteStateV3::default()), + VoteStateV3::size_of(), &solana_sdk_ids::vote::id(), ) .unwrap(); @@ -7171,12 +7172,12 @@ mod tests { // `reference_vote_account` has not consistently voted for at least // `MINIMUM_DELINQUENT_EPOCHS_FOR_DEACTIVATION`. // Instruction will fail - let mut reference_vote_state = VoteState::default(); + let mut reference_vote_state = VoteStateV3::default(); for epoch in 0..MINIMUM_DELINQUENT_EPOCHS_FOR_DEACTIVATION / 2 { reference_vote_state.increment_credits(epoch as Epoch, 1); } reference_vote_account - .serialize_data(&VoteStateVersions::new_current(reference_vote_state)) + .serialize_data(&VoteStateVersions::new_v3(reference_vote_state)) .unwrap(); process_instruction_deactivate_delinquent( @@ -7190,7 +7191,7 @@ mod tests { // `reference_vote_account` has not consistently voted for the last // `MINIMUM_DELINQUENT_EPOCHS_FOR_DEACTIVATION`. // Instruction will fail - let mut reference_vote_state = VoteState::default(); + let mut reference_vote_state = VoteStateV3::default(); for epoch in 0..=current_epoch { reference_vote_state.increment_credits(epoch, 1); } @@ -7206,7 +7207,7 @@ mod tests { current_epoch - 1 ); reference_vote_account - .serialize_data(&VoteStateVersions::new_current(reference_vote_state)) + .serialize_data(&VoteStateVersions::new_v3(reference_vote_state)) .unwrap(); process_instruction_deactivate_delinquent( @@ -7219,12 +7220,12 @@ mod tests { // `reference_vote_account` has consistently voted and `vote_account` has never voted. // Instruction will succeed - let mut reference_vote_state = VoteState::default(); + let mut reference_vote_state = VoteStateV3::default(); for epoch in 0..=current_epoch { reference_vote_state.increment_credits(epoch, 1); } reference_vote_account - .serialize_data(&VoteStateVersions::new_current(reference_vote_state)) + .serialize_data(&VoteStateVersions::new_v3(reference_vote_state)) .unwrap(); let post_stake_account = &process_instruction_deactivate_delinquent( @@ -7247,12 +7248,12 @@ mod tests { // last `MINIMUM_DELINQUENT_EPOCHS_FOR_DEACTIVATION`. // Instruction will succeed - let mut vote_state = VoteState::default(); + let mut vote_state = VoteStateV3::default(); for epoch in 0..MINIMUM_DELINQUENT_EPOCHS_FOR_DEACTIVATION / 2 { vote_state.increment_credits(epoch as Epoch, 1); } vote_account - .serialize_data(&VoteStateVersions::new_current(vote_state)) + .serialize_data(&VoteStateVersions::new_v3(vote_state)) .unwrap(); let post_stake_account = &process_instruction_deactivate_delinquent( @@ -7284,7 +7285,7 @@ mod tests { new_stake( 1, /* stake */ &unrelated_vote_address, - &VoteState::default(), + &VoteStateV3::default(), 1, /* activation_epoch */ ), StakeFlags::empty(), @@ -7302,13 +7303,13 @@ mod tests { // `reference_vote_account` has consistently voted and `vote_account` voted once // `MINIMUM_DELINQUENT_EPOCHS_FOR_DEACTIVATION` ago. // Instruction will succeed - let mut vote_state = VoteState::default(); + let mut vote_state = VoteStateV3::default(); vote_state.increment_credits( current_epoch - MINIMUM_DELINQUENT_EPOCHS_FOR_DEACTIVATION as Epoch, 1, ); vote_account - .serialize_data(&VoteStateVersions::new_current(vote_state)) + .serialize_data(&VoteStateVersions::new_v3(vote_state)) .unwrap(); process_instruction_deactivate_delinquent( &stake_address, @@ -7321,13 +7322,13 @@ mod tests { // `reference_vote_account` has consistently voted and `vote_account` voted once // `MINIMUM_DELINQUENT_EPOCHS_FOR_DEACTIVATION` - 1 epochs ago // Instruction will fail - let mut vote_state = VoteState::default(); + let mut vote_state = VoteStateV3::default(); vote_state.increment_credits( current_epoch - (MINIMUM_DELINQUENT_EPOCHS_FOR_DEACTIVATION - 1) as Epoch, 1, ); vote_account - .serialize_data(&VoteStateVersions::new_current(vote_state)) + .serialize_data(&VoteStateVersions::new_v3(vote_state)) .unwrap(); process_instruction_deactivate_delinquent( &stake_address, diff --git a/programs/stake/src/stake_state.rs b/programs/stake/src/stake_state.rs index f9b3cc8e565e1d..8416c91a67bc8d 100644 --- a/programs/stake/src/stake_state.rs +++ b/programs/stake/src/stake_state.rs @@ -27,7 +27,7 @@ use { solana_transaction_context::{ BorrowedAccount, IndexOfAccount, InstructionContext, TransactionContext, }, - solana_vote_interface::state::{VoteState, VoteStateVersions}, + solana_vote_interface::state::{VoteStateV3, VoteStateVersions}, std::{collections::HashSet, convert::TryFrom}, }; @@ -89,7 +89,7 @@ fn redelegate_stake( stake: &mut Stake, stake_lamports: u64, voter_pubkey: &Pubkey, - vote_state: &VoteState, + vote_state: &VoteStateV3, clock: &Clock, stake_history: &StakeHistory, ) -> Result<(), StakeError> { @@ -204,7 +204,7 @@ fn move_stake_or_lamports_shared_checks( pub(crate) fn new_stake( stake: u64, voter_pubkey: &Pubkey, - vote_state: &VoteState, + vote_state: &VoteStateV3, activation_epoch: Epoch, ) -> Stake { Stake { @@ -338,7 +338,7 @@ pub fn delegate( let stake = new_stake( stake_amount, &vote_pubkey, - &vote_state?.convert_to_current(), + &vote_state?.convert_to_v3(), clock.epoch, ); stake_account.set_state(&StakeStateV2::Stake(meta, stake, StakeFlags::empty())) @@ -351,7 +351,7 @@ pub fn delegate( &mut stake, stake_amount, &vote_pubkey, - &vote_state?.convert_to_current(), + &vote_state?.convert_to_v3(), clock, stake_history, )?; @@ -917,7 +917,7 @@ pub(crate) fn deactivate_delinquent( } let delinquent_vote_state = delinquent_vote_account .get_state::()? - .convert_to_current(); + .convert_to_v3(); let reference_vote_account = instruction_context .try_borrow_instruction_account(transaction_context, reference_vote_account_index)?; @@ -926,7 +926,7 @@ pub(crate) fn deactivate_delinquent( } let reference_vote_state = reference_vote_account .get_state::()? - .convert_to_current(); + .convert_to_v3(); if !acceptable_reference_epoch_credits(&reference_vote_state.epoch_credits, current_epoch) { return Err(StakeError::InsufficientReferenceVotes.into()); @@ -1420,7 +1420,7 @@ fn do_create_account( ) -> AccountSharedData { let mut stake_account = AccountSharedData::new(lamports, StakeStateV2::size_of(), &id()); - let vote_state = VoteState::deserialize(vote_account.data()).expect("vote_state"); + let vote_state = VoteStateV3::deserialize(vote_account.data()).expect("vote_state"); let rent_exempt_reserve = rent.minimum_balance(stake_account.data().len()); diff --git a/programs/vote/benches/process_vote.rs b/programs/vote/benches/process_vote.rs index afdf6b4ac62dc6..10c06fbd033d6b 100644 --- a/programs/vote/benches/process_vote.rs +++ b/programs/vote/benches/process_vote.rs @@ -53,7 +53,7 @@ fn create_accounts() -> (Slot, SlotHashes, Vec, Vec = vec![0; VoteState::size_of()]; - let versioned = VoteStateVersions::new_current(vote_state); + let versioned = VoteStateVersions::new_v3(vote_state); VoteState::serialize(&versioned, &mut vote_account_data).unwrap(); Account { diff --git a/programs/vote/benches/vote_instructions.rs b/programs/vote/benches/vote_instructions.rs index 92741648e8bef8..f76a612b98c879 100644 --- a/programs/vote/benches/vote_instructions.rs +++ b/programs/vote/benches/vote_instructions.rs @@ -62,7 +62,7 @@ fn create_accounts() -> (Slot, SlotHashes, Vec, Vec = vec![0; VoteState::size_of()]; - let versioned = VoteStateVersions::new_current(vote_state); + let versioned = VoteStateVersions::new_v3(vote_state); VoteState::serialize(&versioned, &mut vote_account_data).unwrap(); Account { diff --git a/programs/vote/src/vote_processor.rs b/programs/vote/src/vote_processor.rs index c31a30b561ce5b..7d6d89ca59574b 100644 --- a/programs/vote/src/vote_processor.rs +++ b/programs/vote/src/vote_processor.rs @@ -10,6 +10,7 @@ use { sysvar_cache::get_sysvar_with_account_check, }, solana_pubkey::Pubkey, + solana_sysvar as sysvar, solana_transaction_context::{BorrowedAccount, InstructionContext, TransactionContext}, solana_vote_interface::{instruction::VoteInstruction, program::id, state::VoteAuthorize}, std::collections::HashSet, @@ -229,7 +230,7 @@ mod tests { }, vote_state::{ self, Lockout, TowerSync, Vote, VoteAuthorize, VoteAuthorizeCheckedWithSeedArgs, - VoteAuthorizeWithSeedArgs, VoteInit, VoteState, VoteStateUpdate, VoteStateVersions, + VoteAuthorizeWithSeedArgs, VoteInit, VoteStateV3, VoteStateUpdate, VoteStateVersions, }, }, bincode::serialize, @@ -347,7 +348,7 @@ mod tests { fn create_test_account() -> (Pubkey, AccountSharedData) { let rent = Rent::default(); - let balance = VoteState::get_rent_exempt_reserve(&rent); + let balance = VoteStateV3::get_rent_exempt_reserve(&rent); let vote_pubkey = solana_pubkey::new_rand(); ( vote_pubkey, @@ -434,7 +435,7 @@ mod tests { let lamports = vote_account.lamports(); let mut vote_account_with_epoch_credits = AccountSharedData::new(lamports, vote_account_space, &id()); - let versioned = VoteStateVersions::new_current(vote_state); + let versioned = VoteStateVersions::new_v3(vote_state); vote_state::to(&versioned, &mut vote_account_with_epoch_credits); (vote_pubkey, vote_account_with_epoch_credits) @@ -480,7 +481,7 @@ mod tests { #[test] fn test_initialize_vote_account() { let vote_pubkey = solana_pubkey::new_rand(); - let vote_account = AccountSharedData::new(100, VoteState::size_of(), &id()); + let vote_account = AccountSharedData::new(100, VoteStateV3::size_of(), &id()); let node_pubkey = solana_pubkey::new_rand(); let node_account = AccountSharedData::default(); let instruction_data = serialize(&VoteInstruction::InitializeAccount(VoteInit { @@ -545,7 +546,7 @@ mod tests { vec![ ( vote_pubkey, - AccountSharedData::new(100, 2 * VoteState::size_of(), &id()), + AccountSharedData::new(100, 2 * VoteStateV3::size_of(), &id()), ), (sysvar::rent::id(), create_default_rent_account()), (sysvar::clock::id(), create_default_clock_account()), @@ -608,9 +609,9 @@ mod tests { Err(InstructionError::MissingRequiredSignature), ); instruction_accounts[1].is_signer = true; - let vote_state: VoteState = StateMut::::state(&accounts[0]) + let vote_state: VoteStateV3 = StateMut::::state(&accounts[0]) .unwrap() - .convert_to_current(); + .convert_to_v3(); assert_ne!(vote_state.node_pubkey, node_pubkey); // should fail, authorized_withdrawer didn't sign the transaction @@ -622,9 +623,9 @@ mod tests { Err(InstructionError::MissingRequiredSignature), ); instruction_accounts[2].is_signer = true; - let vote_state: VoteState = StateMut::::state(&accounts[0]) + let vote_state: VoteStateV3 = StateMut::::state(&accounts[0]) .unwrap() - .convert_to_current(); + .convert_to_v3(); assert_ne!(vote_state.node_pubkey, node_pubkey); // should pass @@ -634,9 +635,9 @@ mod tests { instruction_accounts, Ok(()), ); - let vote_state: VoteState = StateMut::::state(&accounts[0]) + let vote_state: VoteStateV3 = StateMut::::state(&accounts[0]) .unwrap() - .convert_to_current(); + .convert_to_v3(); assert_eq!(vote_state.node_pubkey, node_pubkey); } @@ -678,9 +679,9 @@ mod tests { instruction_accounts.clone(), Ok(()), ); - let vote_state: VoteState = StateMut::::state(&accounts[0]) + let vote_state: VoteStateV3 = StateMut::::state(&accounts[0]) .unwrap() - .convert_to_current(); + .convert_to_v3(); assert_eq!(vote_state.commission, u8::MAX); // should pass @@ -690,9 +691,9 @@ mod tests { instruction_accounts.clone(), Ok(()), ); - let vote_state: VoteState = StateMut::::state(&accounts[0]) + let vote_state: VoteStateV3 = StateMut::::state(&accounts[0]) .unwrap() - .convert_to_current(); + .convert_to_v3(); assert_eq!(vote_state.commission, 42); // should fail, authorized_withdrawer didn't sign the transaction @@ -703,9 +704,9 @@ mod tests { instruction_accounts, Err(InstructionError::MissingRequiredSignature), ); - let vote_state: VoteState = StateMut::::state(&accounts[0]) + let vote_state: VoteStateV3 = StateMut::::state(&accounts[0]) .unwrap() - .convert_to_current(); + .convert_to_v3(); assert_eq!(vote_state.commission, 0); } @@ -770,9 +771,9 @@ mod tests { }, ); if is_tower_sync { - let vote_state: VoteState = StateMut::::state(&accounts[0]) + let vote_state: VoteStateV3 = StateMut::::state(&accounts[0]) .unwrap() - .convert_to_current(); + .convert_to_v3(); assert_eq!( vote_state.votes, vec![vote_state::LandedVote::from(Lockout::new( @@ -823,7 +824,7 @@ mod tests { transaction_accounts[1] = (sysvar::slot_hashes::id(), slot_hashes_account.clone()); // should fail, uninitialized - let vote_account = AccountSharedData::new(100, VoteState::size_of(), &id()); + let vote_account = AccountSharedData::new(100, VoteStateV3::size_of(), &id()); transaction_accounts[0] = (vote_pubkey, vote_account); process_instruction( &instruction_data, @@ -1777,14 +1778,14 @@ mod tests { }, 101, CreateVoteAccountConfig { - space: vote_state::VoteState::size_of() as u64, + space: vote_state::VoteStateV3::size_of() as u64, ..CreateVoteAccountConfig::default() }, ); // grab the `space` value from SystemInstruction::CreateAccount by directly indexing, for // expediency let space = usize::from_le_bytes(instructions[0].data[12..20].try_into().unwrap()); - assert_eq!(space, vote_state::VoteState::size_of()); + assert_eq!(space, vote_state::VoteStateV3::size_of()); let empty_vote_account = AccountSharedData::new(101, space, &id()); let transaction_accounts = vec![ @@ -1965,7 +1966,7 @@ mod tests { ); // Test with new_authorized_pubkey signer - let vote_account = AccountSharedData::new(100, VoteState::size_of(), &id()); + let vote_account = AccountSharedData::new(100, VoteStateV3::size_of(), &id()); let clock_address = sysvar::clock::id(); let clock_account = account::create_account_shared_data_for_test(&Clock::default()); let default_authorized_pubkey = Pubkey::default(); diff --git a/programs/vote/src/vote_state/mod.rs b/programs/vote/src/vote_state/mod.rs index 2616dbe6d1d43a..e0eb6011544653 100644 --- a/programs/vote/src/vote_state/mod.rs +++ b/programs/vote/src/vote_state/mod.rs @@ -22,20 +22,20 @@ use { }; // utility function, used by Stakes, tests -pub fn from(account: &T) -> Option { - VoteState::deserialize(account.data()).ok() +pub fn from(account: &T) -> Option { + VoteStateV3::deserialize(account.data()).ok() } // utility function, used by Stakes, tests pub fn to(versioned: &VoteStateVersions, account: &mut T) -> Option<()> { - VoteState::serialize(versioned, account.data_as_mut_slice()).ok() + VoteStateV3::serialize(versioned, account.data_as_mut_slice()).ok() } -// Updates the vote account state with a new VoteState instance. This is required temporarily during the +// Updates the vote account state with a new VoteStateV3 instance. This is required temporarily during the // upgrade of vote account state from V1_14_11 to Current. fn set_vote_account_state( vote_account: &mut BorrowedAccount, - vote_state: VoteState, + vote_state: VoteStateV3, ) -> Result<(), InstructionError> { // If the account is not large enough to store the vote state, then attempt a realloc to make it large enough. // The realloc can only proceed if the vote account has balance sufficient for rent exemption at the new size. @@ -53,14 +53,14 @@ fn set_vote_account_state( ))); } // Vote account is large enough to store the newest version of vote state - vote_account.set_state(&VoteStateVersions::new_current(vote_state)) + vote_account.set_state(&VoteStateVersions::new_v3(vote_state)) } /// Checks the proposed vote state with the current and /// slot hashes, making adjustments to the root / filtering /// votes as needed. fn check_and_filter_proposed_vote_state( - vote_state: &VoteState, + vote_state: &VoteStateV3, proposed_lockouts: &mut VecDeque, proposed_root: &mut Option, proposed_hash: Hash, @@ -300,7 +300,7 @@ fn check_and_filter_proposed_vote_state( } fn check_slots_are_valid( - vote_state: &VoteState, + vote_state: &VoteStateV3, vote_slots: &[Slot], vote_hash: &Hash, slot_hashes: &[(Slot, Hash)], @@ -423,7 +423,7 @@ fn check_slots_are_valid( // have to have at least one other slot on top of it, even if the first 30 votes were all // popped off. pub fn process_new_vote_state( - vote_state: &mut VoteState, + vote_state: &mut VoteStateV3, mut new_state: VecDeque, new_root: Option, timestamp: Option, @@ -578,7 +578,7 @@ pub fn process_new_vote_state( // have had their latency initialized to 0 by the above loop. Those will now be updated to their actual latency. for new_vote in new_state.iter_mut() { if new_vote.latency == 0 { - new_vote.latency = VoteState::compute_vote_latency(new_vote.slot(), current_slot); + new_vote.latency = VoteStateV3::compute_vote_latency(new_vote.slot(), current_slot); } } @@ -599,7 +599,7 @@ pub fn process_new_vote_state( } pub fn process_vote_unfiltered( - vote_state: &mut VoteState, + vote_state: &mut VoteStateV3, vote_slots: &[Slot], vote: &Vote, slot_hashes: &[SlotHash], @@ -614,7 +614,7 @@ pub fn process_vote_unfiltered( } pub fn process_vote( - vote_state: &mut VoteState, + vote_state: &mut VoteStateV3, vote: &Vote, slot_hashes: &[SlotHash], epoch: Epoch, @@ -644,7 +644,7 @@ pub fn process_vote( } /// "unchecked" functions used by tests and Tower -pub fn process_vote_unchecked(vote_state: &mut VoteState, vote: Vote) -> Result<(), VoteError> { +pub fn process_vote_unchecked(vote_state: &mut VoteStateV3, vote: Vote) -> Result<(), VoteError> { if vote.slots.is_empty() { return Err(VoteError::EmptySlots); } @@ -660,13 +660,13 @@ pub fn process_vote_unchecked(vote_state: &mut VoteState, vote: Vote) -> Result< } #[cfg(test)] -pub fn process_slot_votes_unchecked(vote_state: &mut VoteState, slots: &[Slot]) { +pub fn process_slot_votes_unchecked(vote_state: &mut VoteStateV3, slots: &[Slot]) { for slot in slots { process_slot_vote_unchecked(vote_state, *slot); } } -pub fn process_slot_vote_unchecked(vote_state: &mut VoteState, slot: Slot) { +pub fn process_slot_vote_unchecked(vote_state: &mut VoteStateV3, slot: Slot) { let _ = process_vote_unchecked(vote_state, Vote::new(vec![slot], Hash::default())); } @@ -680,9 +680,9 @@ pub fn authorize( signers: &HashSet, clock: &Clock, ) -> Result<(), InstructionError> { - let mut vote_state: VoteState = vote_account + let mut vote_state: VoteStateV3 = vote_account .get_state::()? - .convert_to_current(); + .convert_to_v3(); match vote_authorize { VoteAuthorize::Voter => { @@ -722,9 +722,9 @@ pub fn update_validator_identity( node_pubkey: &Pubkey, signers: &HashSet, ) -> Result<(), InstructionError> { - let mut vote_state: VoteState = vote_account + let mut vote_state: VoteStateV3 = vote_account .get_state::()? - .convert_to_current(); + .convert_to_v3(); // current authorized withdrawer must say "yay" verify_authorized_signer(&vote_state.authorized_withdrawer, signers)?; @@ -747,7 +747,7 @@ pub fn update_commission( ) -> Result<(), InstructionError> { let vote_state_result = vote_account .get_state::() - .map(|vote_state| vote_state.convert_to_current()); + .map(|vote_state| vote_state.convert_to_v3()); let enforce_commission_update_rule = if let Ok(decoded_vote_state) = &vote_state_result { is_commission_increase(decoded_vote_state, commission) } else { @@ -769,7 +769,7 @@ pub fn update_commission( } /// Given a proposed new commission, returns true if this would be a commission increase, false otherwise -pub fn is_commission_increase(vote_state: &VoteState, commission: u8) -> bool { +pub fn is_commission_increase(vote_state: &VoteStateV3, commission: u8) -> bool { commission > vote_state.commission } @@ -813,9 +813,9 @@ pub fn withdraw( ) -> Result<(), InstructionError> { let mut vote_account = instruction_context .try_borrow_instruction_account(transaction_context, vote_account_index)?; - let vote_state: VoteState = vote_account + let vote_state: VoteStateV3 = vote_account .get_state::()? - .convert_to_current(); + .convert_to_v3(); verify_authorized_signer(&vote_state.authorized_withdrawer, signers)?; @@ -841,7 +841,7 @@ pub fn withdraw( return Err(VoteError::ActiveVoteAccountClose.into()); } else { // Deinitialize upon zero-balance - set_vote_account_state(&mut vote_account, VoteState::default())?; + set_vote_account_state(&mut vote_account, VoteStateV3::default())?; } } else { let min_rent_exempt_balance = rent_sysvar.minimum_balance(vote_account.get_data().len()); @@ -879,21 +879,21 @@ pub fn initialize_account( // node must agree to accept this vote account verify_authorized_signer(&vote_init.node_pubkey, signers)?; - set_vote_account_state(vote_account, VoteState::new(vote_init, clock)) + set_vote_account_state(vote_account, VoteStateV3::new(vote_init, clock)) } fn verify_and_get_vote_state( vote_account: &BorrowedAccount, clock: &Clock, signers: &HashSet, -) -> Result { +) -> Result { let versioned = vote_account.get_state::()?; if versioned.is_uninitialized() { return Err(InstructionError::UninitializedAccount); } - let mut vote_state = versioned.convert_to_current(); + let mut vote_state = versioned.convert_to_v3(); let authorized_voter = vote_state.get_and_update_authorized_voter(clock.epoch)?; verify_authorized_signer(&authorized_voter, signers)?; @@ -939,7 +939,7 @@ pub fn process_vote_state_update( } pub fn do_process_vote_state_update( - vote_state: &mut VoteState, + vote_state: &mut VoteStateV3, slot_hashes: &[SlotHash], epoch: u64, slot: u64, @@ -985,7 +985,7 @@ pub fn process_tower_sync( } fn do_process_tower_sync( - vote_state: &mut VoteState, + vote_state: &mut VoteStateV3, slot_hashes: &[SlotHash], epoch: u64, slot: u64, @@ -1023,9 +1023,9 @@ pub fn create_account_with_authorized( commission: u8, lamports: u64, ) -> AccountSharedData { - let mut vote_account = AccountSharedData::new(lamports, VoteState::size_of(), &id()); + let mut vote_account = AccountSharedData::new(lamports, VoteStateV3::size_of(), &id()); - let vote_state = VoteState::new( + let vote_state = VoteStateV3::new( &VoteInit { node_pubkey: *node_pubkey, authorized_voter: *authorized_voter, @@ -1035,8 +1035,8 @@ pub fn create_account_with_authorized( &Clock::default(), ); - VoteState::serialize( - &VoteStateVersions::Current(Box::new(vote_state)), + VoteStateV3::serialize( + &VoteStateVersions::new_v3(vote_state), vote_account.data_as_mut_slice(), ) .unwrap(); @@ -1070,8 +1070,8 @@ mod tests { const MAX_RECENT_VOTES: usize = 16; - fn vote_state_new_for_test(auth_pubkey: &Pubkey) -> VoteState { - VoteState::new( + fn vote_state_new_for_test(auth_pubkey: &Pubkey) -> VoteStateV3 { + VoteStateV3::new( &VoteInit { node_pubkey: solana_pubkey::new_rand(), authorized_voter: *auth_pubkey, @@ -1084,7 +1084,7 @@ mod tests { fn create_test_account() -> (Pubkey, RefCell) { let rent = Rent::default(); - let balance = VoteState::get_rent_exempt_reserve(&rent); + let balance = VoteStateV3::get_rent_exempt_reserve(&rent); let vote_pubkey = solana_pubkey::new_rand(); ( vote_pubkey, @@ -1103,7 +1103,7 @@ mod tests { // required lamports for rent exempt minimum at that size let node_pubkey = solana_pubkey::new_rand(); let withdrawer_pubkey = solana_pubkey::new_rand(); - let mut vote_state = VoteState::new( + let mut vote_state = VoteStateV3::new( &VoteInit { node_pubkey, authorized_voter: withdrawer_pubkey, @@ -1181,7 +1181,7 @@ mod tests { assert_matches!(vote_state_version, VoteStateVersions::V1_14_11(_)); // Convert the vote state to current as would occur during vote instructions - let converted_vote_state = vote_state_version.convert_to_current(); + let converted_vote_state = vote_state_version.convert_to_v3(); // Check to make sure that the vote_state is unchanged assert!(vote_state == converted_vote_state); @@ -1198,7 +1198,7 @@ mod tests { assert_matches!(vote_state_version, VoteStateVersions::V1_14_11(_)); // Convert the vote state to current as would occur during vote instructions - let converted_vote_state = vote_state_version.convert_to_current(); + let converted_vote_state = vote_state_version.convert_to_v3(); // Check to make sure that the vote_state is unchanged assert_eq!(vote_state, converted_vote_state); @@ -1215,7 +1215,7 @@ mod tests { assert_matches!(vote_state_version, VoteStateVersions::V1_14_11(_)); // Convert the vote state to current as would occur during vote instructions - let converted_vote_state = vote_state_version.convert_to_current(); + let converted_vote_state = vote_state_version.convert_to_v3(); // Check to make sure that the vote_state is unchanged assert_eq!(vote_state, converted_vote_state); @@ -1225,7 +1225,7 @@ mod tests { // Test that when the feature is enabled, if the vote account does have sufficient lamports, the // new vote state is written out assert_eq!( - borrowed_account.set_lamports(rent.minimum_balance(VoteState::size_of()),), + borrowed_account.set_lamports(rent.minimum_balance(VoteStateV3::size_of()),), Ok(()) ); assert_eq!( @@ -1233,10 +1233,10 @@ mod tests { Ok(()) ); let vote_state_version = borrowed_account.get_state::().unwrap(); - assert_matches!(vote_state_version, VoteStateVersions::Current(_)); + assert_matches!(vote_state_version, VoteStateVersions::V3(_)); // Convert the vote state to current as would occur during vote instructions - let converted_vote_state = vote_state_version.convert_to_current(); + let converted_vote_state = vote_state_version.convert_to_v3(); // Check to make sure that the vote_state is unchanged assert_eq!(vote_state, converted_vote_state); @@ -1246,10 +1246,10 @@ mod tests { fn test_vote_lockout() { let (_vote_pubkey, vote_account) = create_test_account(); - let mut vote_state: VoteState = + let mut vote_state: VoteStateV3 = StateMut::::state(&*vote_account.borrow()) .unwrap() - .convert_to_current(); + .convert_to_v3(); for i in 0..(MAX_LOCKOUT_HISTORY + 1) { process_slot_vote_unchecked(&mut vote_state, (INITIAL_LOCKOUT * i) as u64); @@ -1285,7 +1285,7 @@ mod tests { let node_pubkey = Pubkey::new_unique(); let withdrawer_pubkey = Pubkey::new_unique(); let clock = Clock::default(); - let vote_state = VoteState::new( + let vote_state = VoteStateV3::new( &VoteInit { node_pubkey, authorized_voter: withdrawer_pubkey, @@ -1296,7 +1296,7 @@ mod tests { ); let serialized = - bincode::serialize(&VoteStateVersions::Current(Box::new(vote_state.clone()))).unwrap(); + bincode::serialize(&VoteStateVersions::V3(Box::new(vote_state.clone()))).unwrap(); let serialized_len = serialized.len(); let rent = Rent::default(); let lamports = rent.minimum_balance(serialized_len); @@ -1350,7 +1350,7 @@ mod tests { borrowed_account .get_state::() .unwrap() - .convert_to_current() + .convert_to_v3() .commission, 10 ); @@ -1368,7 +1368,7 @@ mod tests { borrowed_account .get_state::() .unwrap() - .convert_to_current() + .convert_to_v3() .commission, 11 ); @@ -1388,7 +1388,7 @@ mod tests { borrowed_account .get_state::() .unwrap() - .convert_to_current() + .convert_to_v3() .commission, 11 ); @@ -1408,7 +1408,7 @@ mod tests { borrowed_account .get_state::() .unwrap() - .convert_to_current() + .convert_to_v3() .commission, 10 ); @@ -1417,7 +1417,7 @@ mod tests { borrowed_account .get_state::() .unwrap() - .convert_to_current() + .convert_to_v3() .commission, 10 ); @@ -1436,7 +1436,7 @@ mod tests { borrowed_account .get_state::() .unwrap() - .convert_to_current() + .convert_to_v3() .commission, 9 ); @@ -1548,7 +1548,7 @@ mod tests { assert!(vote_state.nth_recent_lockout(MAX_LOCKOUT_HISTORY).is_none()); } - fn check_lockouts(vote_state: &VoteState) { + fn check_lockouts(vote_state: &VoteStateV3) { for (i, vote) in vote_state.votes.iter().enumerate() { let num_votes = vote_state .votes @@ -1562,7 +1562,7 @@ mod tests { } } - fn recent_votes(vote_state: &VoteState) -> Vec { + fn recent_votes(vote_state: &VoteStateV3) -> Vec { let start = vote_state.votes.len().saturating_sub(MAX_RECENT_VOTES); (start..vote_state.votes.len()) .map(|i| { @@ -1604,7 +1604,7 @@ mod tests { #[test] fn test_process_vote_skips_old_vote() { - let mut vote_state = VoteState::default(); + let mut vote_state = VoteStateV3::default(); let vote = Vote::new(vec![0], Hash::default()); let slot_hashes: Vec<_> = vec![(0, vote.hash)]; @@ -1622,7 +1622,7 @@ mod tests { #[test] fn test_check_slots_are_valid_vote_empty_slot_hashes() { - let vote_state = VoteState::default(); + let vote_state = VoteStateV3::default(); let vote = Vote::new(vec![0], Hash::default()); assert_eq!( @@ -1633,7 +1633,7 @@ mod tests { #[test] fn test_check_slots_are_valid_new_vote() { - let vote_state = VoteState::default(); + let vote_state = VoteStateV3::default(); let vote = Vote::new(vec![0], Hash::default()); let slot_hashes: Vec<_> = vec![(*vote.slots.last().unwrap(), vote.hash)]; @@ -1645,7 +1645,7 @@ mod tests { #[test] fn test_check_slots_are_valid_bad_hash() { - let vote_state = VoteState::default(); + let vote_state = VoteStateV3::default(); let vote = Vote::new(vec![0], Hash::default()); let slot_hashes: Vec<_> = vec![(*vote.slots.last().unwrap(), hash(vote.hash.as_ref()))]; @@ -1657,7 +1657,7 @@ mod tests { #[test] fn test_check_slots_are_valid_bad_slot() { - let vote_state = VoteState::default(); + let vote_state = VoteStateV3::default(); let vote = Vote::new(vec![1], Hash::default()); let slot_hashes: Vec<_> = vec![(0, vote.hash)]; @@ -1669,7 +1669,7 @@ mod tests { #[test] fn test_check_slots_are_valid_duplicate_vote() { - let mut vote_state = VoteState::default(); + let mut vote_state = VoteStateV3::default(); let vote = Vote::new(vec![0], Hash::default()); let slot_hashes: Vec<_> = vec![(*vote.slots.last().unwrap(), vote.hash)]; @@ -1685,7 +1685,7 @@ mod tests { #[test] fn test_check_slots_are_valid_next_vote() { - let mut vote_state = VoteState::default(); + let mut vote_state = VoteStateV3::default(); let vote = Vote::new(vec![0], Hash::default()); let slot_hashes: Vec<_> = vec![(*vote.slots.last().unwrap(), vote.hash)]; @@ -1704,7 +1704,7 @@ mod tests { #[test] fn test_check_slots_are_valid_next_vote_only() { - let mut vote_state = VoteState::default(); + let mut vote_state = VoteStateV3::default(); let vote = Vote::new(vec![0], Hash::default()); let slot_hashes: Vec<_> = vec![(*vote.slots.last().unwrap(), vote.hash)]; @@ -1722,7 +1722,7 @@ mod tests { } #[test] fn test_process_vote_empty_slots() { - let mut vote_state = VoteState::default(); + let mut vote_state = VoteStateV3::default(); let vote = Vote::new(vec![], Hash::default()); assert_eq!( @@ -1732,7 +1732,7 @@ mod tests { } pub fn process_new_vote_state_from_lockouts( - vote_state: &mut VoteState, + vote_state: &mut VoteStateV3, new_state: VecDeque, new_root: Option, timestamp: Option, @@ -1752,7 +1752,7 @@ mod tests { #[test] fn test_vote_state_update_increment_credits() { // Create a new Votestate - let mut vote_state = VoteState::new(&VoteInit::default(), &Clock::default()); + let mut vote_state = VoteStateV3::new(&VoteInit::default(), &Clock::default()); // Test data: a sequence of groups of votes to simulate having been cast, after each group a vote // state update is compared to "normal" vote processing to ensure that credits are earned equally @@ -1997,10 +1997,10 @@ mod tests { // For each vote group, process all vote groups leading up to it and it itself, and ensure that the number of // credits earned is correct for both regular votes and vote state updates for i in 0..test_vote_groups.len() { - // Create a new VoteState for vote transaction - let mut vote_state_1 = VoteState::new(&VoteInit::default(), &Clock::default()); - // Create a new VoteState for vote state update transaction - let mut vote_state_2 = VoteState::new(&VoteInit::default(), &Clock::default()); + // Create a new VoteStateV3 for vote transaction + let mut vote_state_1 = VoteStateV3::new(&VoteInit::default(), &Clock::default()); + // Create a new VoteStateV3 for vote state update transaction + let mut vote_state_2 = VoteStateV3::new(&VoteInit::default(), &Clock::default()); test_vote_groups.iter().take(i + 1).for_each(|vote_group| { let vote = Vote { slots: vote_group.0.clone(), //vote_group.0 is the set of slots to cast votes on @@ -2123,7 +2123,7 @@ mod tests { ]; // Initial vote state - let mut vote_state = VoteState::new(&VoteInit::default(), &Clock::default()); + let mut vote_state = VoteStateV3::new(&VoteInit::default(), &Clock::default()); // Process the vote state updates in sequence and ensure that the credits earned after each is processed is // correct @@ -2157,7 +2157,7 @@ mod tests { #[test] fn test_process_new_vote_too_many_votes() { - let mut vote_state1 = VoteState::default(); + let mut vote_state1 = VoteStateV3::default(); let bad_votes: VecDeque = (0..=MAX_LOCKOUT_HISTORY) .map(|slot| { Lockout::new_with_confirmation_count( @@ -2182,7 +2182,7 @@ mod tests { #[test] fn test_process_new_vote_state_root_rollback() { - let mut vote_state1 = VoteState::default(); + let mut vote_state1 = VoteStateV3::default(); for i in 0..MAX_LOCKOUT_HISTORY + 2 { process_slot_vote_unchecked(&mut vote_state1, i as Slot); } @@ -2226,7 +2226,7 @@ mod tests { #[test] fn test_process_new_vote_state_zero_confirmations() { - let mut vote_state1 = VoteState::default(); + let mut vote_state1 = VoteStateV3::default(); let current_epoch = vote_state1.current_epoch(); let bad_votes: VecDeque = vec![ @@ -2266,7 +2266,7 @@ mod tests { #[test] fn test_process_new_vote_state_confirmations_too_large() { - let mut vote_state1 = VoteState::default(); + let mut vote_state1 = VoteStateV3::default(); let current_epoch = vote_state1.current_epoch(); let good_votes: VecDeque = vec![Lockout::new_with_confirmation_count( @@ -2285,7 +2285,7 @@ mod tests { ) .unwrap(); - let mut vote_state1 = VoteState::default(); + let mut vote_state1 = VoteStateV3::default(); let bad_votes: VecDeque = vec![Lockout::new_with_confirmation_count( 0, MAX_LOCKOUT_HISTORY as u32 + 1, @@ -2306,7 +2306,7 @@ mod tests { #[test] fn test_process_new_vote_state_slot_smaller_than_root() { - let mut vote_state1 = VoteState::default(); + let mut vote_state1 = VoteStateV3::default(); let current_epoch = vote_state1.current_epoch(); let root_slot = 5; @@ -2347,7 +2347,7 @@ mod tests { #[test] fn test_process_new_vote_state_slots_not_ordered() { - let mut vote_state1 = VoteState::default(); + let mut vote_state1 = VoteStateV3::default(); let current_epoch = vote_state1.current_epoch(); let bad_votes: VecDeque = vec![ @@ -2387,7 +2387,7 @@ mod tests { #[test] fn test_process_new_vote_state_confirmations_not_ordered() { - let mut vote_state1 = VoteState::default(); + let mut vote_state1 = VoteStateV3::default(); let current_epoch = vote_state1.current_epoch(); let bad_votes: VecDeque = vec![ @@ -2427,7 +2427,7 @@ mod tests { #[test] fn test_process_new_vote_state_new_vote_state_lockout_mismatch() { - let mut vote_state1 = VoteState::default(); + let mut vote_state1 = VoteStateV3::default(); let current_epoch = vote_state1.current_epoch(); let bad_votes: VecDeque = vec![ @@ -2452,7 +2452,7 @@ mod tests { #[test] fn test_process_new_vote_state_confirmation_rollback() { - let mut vote_state1 = VoteState::default(); + let mut vote_state1 = VoteStateV3::default(); let current_epoch = vote_state1.current_epoch(); let votes: VecDeque = vec![ Lockout::new_with_confirmation_count(0, 4), @@ -2487,7 +2487,7 @@ mod tests { #[test] fn test_process_new_vote_state_root_progress() { - let mut vote_state1 = VoteState::default(); + let mut vote_state1 = VoteStateV3::default(); for i in 0..MAX_LOCKOUT_HISTORY { process_slot_vote_unchecked(&mut vote_state1, i as u64); } @@ -2539,7 +2539,7 @@ mod tests { // will immediately pop off 2. // Construct on-chain vote state - let mut vote_state1 = VoteState::default(); + let mut vote_state1 = VoteStateV3::default(); process_slot_votes_unchecked(&mut vote_state1, &[1, 2, 5]); assert_eq!( vote_state1 @@ -2551,7 +2551,7 @@ mod tests { ); // Construct local tower state - let mut vote_state2 = VoteState::default(); + let mut vote_state2 = VoteStateV3::default(); process_slot_votes_unchecked(&mut vote_state2, &[1, 2, 3, 5, 7]); assert_eq!( vote_state2 @@ -2579,7 +2579,7 @@ mod tests { #[test] fn test_process_new_vote_state_lockout_violation() { // Construct on-chain vote state - let mut vote_state1 = VoteState::default(); + let mut vote_state1 = VoteStateV3::default(); process_slot_votes_unchecked(&mut vote_state1, &[1, 2, 4, 5]); assert_eq!( vote_state1 @@ -2592,7 +2592,7 @@ mod tests { // Construct conflicting tower state. Vote 4 is missing, // but 5 should not have popped off vote 4. - let mut vote_state2 = VoteState::default(); + let mut vote_state2 = VoteStateV3::default(); process_slot_votes_unchecked(&mut vote_state2, &[1, 2, 3, 5, 7]); assert_eq!( vote_state2 @@ -2620,7 +2620,7 @@ mod tests { #[test] fn test_process_new_vote_state_lockout_violation2() { // Construct on-chain vote state - let mut vote_state1 = VoteState::default(); + let mut vote_state1 = VoteStateV3::default(); process_slot_votes_unchecked(&mut vote_state1, &[1, 2, 5, 6, 7]); assert_eq!( vote_state1 @@ -2633,7 +2633,7 @@ mod tests { // Construct a new vote state. Violates on-chain state because 8 // should not have popped off 7 - let mut vote_state2 = VoteState::default(); + let mut vote_state2 = VoteStateV3::default(); process_slot_votes_unchecked(&mut vote_state2, &[1, 2, 3, 5, 6, 8]); assert_eq!( vote_state2 @@ -2662,7 +2662,7 @@ mod tests { #[test] fn test_process_new_vote_state_expired_ancestor_not_removed() { // Construct on-chain vote state - let mut vote_state1 = VoteState::default(); + let mut vote_state1 = VoteStateV3::default(); process_slot_votes_unchecked(&mut vote_state1, &[1, 2, 3, 9]); assert_eq!( vote_state1 @@ -2706,7 +2706,7 @@ mod tests { #[test] fn test_process_new_vote_current_state_contains_bigger_slots() { - let mut vote_state1 = VoteState::default(); + let mut vote_state1 = VoteStateV3::default(); process_slot_votes_unchecked(&mut vote_state1, &[6, 7, 8]); assert_eq!( vote_state1 @@ -2761,7 +2761,7 @@ mod tests { #[test] fn test_filter_old_votes() { - let mut vote_state = VoteState::default(); + let mut vote_state = VoteStateV3::default(); let old_vote_slot = 1; let vote = Vote::new(vec![old_vote_slot], Hash::default()); @@ -2802,8 +2802,8 @@ mod tests { .collect() } - fn build_vote_state(vote_slots: Vec, slot_hashes: &[(Slot, Hash)]) -> VoteState { - let mut vote_state = VoteState::default(); + fn build_vote_state(vote_slots: Vec, slot_hashes: &[(Slot, Hash)]) -> VoteStateV3 { + let mut vote_state = VoteStateV3::default(); if !vote_slots.is_empty() { let vote_hash = slot_hashes diff --git a/rpc/src/rpc.rs b/rpc/src/rpc.rs index 1df8307ebd9bc3..4c0960d250a12a 100644 --- a/rpc/src/rpc.rs +++ b/rpc/src/rpc.rs @@ -5038,7 +5038,7 @@ pub mod tests { fn store_vote_account(&self, vote_pubkey: &Pubkey, vote_state: VoteState) { let bank = self.working_bank(); - let versioned = VoteStateVersions::new_current(vote_state); + let versioned = VoteStateVersions::new_v3(vote_state); let space = VoteState::size_of(); let balance = bank.get_minimum_balance_for_rent_exemption(space); let mut vote_account = diff --git a/runtime/src/bank.rs b/runtime/src/bank.rs index 8ccc5073523e9b..ec5dcd357d0c87 100644 --- a/runtime/src/bank.rs +++ b/runtime/src/bank.rs @@ -7167,7 +7167,7 @@ pub mod test_utils { let mut vote_account = bank.get_account(vote_pubkey).unwrap_or_default(); let mut vote_state = vote_state::from(&vote_account).unwrap_or_default(); vote_state.last_timestamp = timestamp; - let versioned = VoteStateVersions::new_current(vote_state); + let versioned = VoteStateVersions::new_v3(vote_state); vote_state::to(&versioned, &mut vote_account).unwrap(); bank.store_account(vote_pubkey, &vote_account); } diff --git a/runtime/src/bank/partitioned_epoch_rewards/mod.rs b/runtime/src/bank/partitioned_epoch_rewards/mod.rs index e3b9f87973c682..e5988d9adb30f2 100644 --- a/runtime/src/bank/partitioned_epoch_rewards/mod.rs +++ b/runtime/src/bank/partitioned_epoch_rewards/mod.rs @@ -455,10 +455,10 @@ mod tests { if let Some(v) = vote_state.as_mut() { vote_state::process_slot_vote_unchecked(v, i as u64) } - let versioned = VoteStateVersions::Current(Box::new(vote_state.take().unwrap())); + let versioned = VoteStateVersions::V3(Box::new(vote_state.take().unwrap())); vote_state::to(&versioned, &mut vote_account).unwrap(); match versioned { - VoteStateVersions::Current(v) => { + VoteStateVersions::V3(v) => { vote_state = Some(*v); } _ => panic!("Has to be of type Current"), diff --git a/runtime/src/bank/tests.rs b/runtime/src/bank/tests.rs index 74cf5d60d6376f..55facad9b093a2 100644 --- a/runtime/src/bank/tests.rs +++ b/runtime/src/bank/tests.rs @@ -1276,11 +1276,11 @@ where if let Some(v) = vote_state.as_mut() { vote_state::process_slot_vote_unchecked(v, i as u64) } - let versioned = VoteStateVersions::Current(Box::new(vote_state.take().unwrap())); + let versioned = VoteStateVersions::V3(Box::new(vote_state.take().unwrap())); vote_state::to(&versioned, &mut vote_account).unwrap(); bank0.store_account_and_update_capitalization(&vote_id, &vote_account); match versioned { - VoteStateVersions::Current(v) => { + VoteStateVersions::V3(v) => { vote_state = Some(*v); } _ => panic!("Has to be of type Current"), @@ -1427,11 +1427,11 @@ fn do_test_bank_update_rewards_determinism() -> u64 { if let Some(v) = vote_state.as_mut() { vote_state::process_slot_vote_unchecked(v, i as u64) } - let versioned = VoteStateVersions::Current(Box::new(vote_state.take().unwrap())); + let versioned = VoteStateVersions::V3(Box::new(vote_state.take().unwrap())); vote_state::to(&versioned, &mut vote_account).unwrap(); bank.store_account_and_update_capitalization(&vote_id, &vote_account); match versioned { - VoteStateVersions::Current(v) => { + VoteStateVersions::V3(v) => { vote_state = Some(*v); } _ => panic!("Has to be of type Current"), diff --git a/runtime/src/stakes.rs b/runtime/src/stakes.rs index 8caf572ae7007c..46500f5ccdc4a9 100644 --- a/runtime/src/stakes.rs +++ b/runtime/src/stakes.rs @@ -697,7 +697,7 @@ pub(crate) mod tests { // Vote account uninitialized let default_vote_state = VoteState::default(); - let versioned = VoteStateVersions::new_current(default_vote_state); + let versioned = VoteStateVersions::new_v3(default_vote_state); vote_state::to(&versioned, &mut vote_account).unwrap(); stakes_cache.check_and_store(&vote_pubkey, &vote_account, None); diff --git a/runtime/tests/stake.rs b/runtime/tests/stake.rs index 39951b8b246f9a..31ecafc8fd0b8b 100755 --- a/runtime/tests/stake.rs +++ b/runtime/tests/stake.rs @@ -432,7 +432,7 @@ fn test_stake_account_lifetime() { let account = bank.get_account(&vote_pubkey).expect("account not found"); let vote_state: VoteState = StateMut::::state(&account) .expect("couldn't unpack account data") - .convert_to_current(); + .convert_to_v3(); // 1 less vote, as the first vote should have cleared the lockout assert_eq!(vote_state.votes.len(), 31); diff --git a/vote/benches/vote_account.rs b/vote/benches/vote_account.rs index b1cd6cb3a03fa7..62a30e5c834e48 100644 --- a/vote/benches/vote_account.rs +++ b/vote/benches/vote_account.rs @@ -31,7 +31,7 @@ fn new_rand_vote_account( vote_state.process_next_vote_slot(0, 0, 1); let account = AccountSharedData::new_data( rng.gen(), // lamports - &VoteStateVersions::new_current(vote_state.clone()), + &VoteStateVersions::new_v3(vote_state.clone()), &solana_sdk_ids::vote::id(), // owner ) .unwrap(); diff --git a/vote/src/vote_account.rs b/vote/src/vote_account.rs index 55204a8ef3ce9f..8230a611d29a65 100644 --- a/vote/src/vote_account.rs +++ b/vote/src/vote_account.rs @@ -117,7 +117,7 @@ impl VoteAccount { let vote_state = VoteState::new(&vote_init, &clock); let account = AccountSharedData::new_data( rng.gen(), // lamports - &VoteStateVersions::new_current(vote_state.clone()), + &VoteStateVersions::new_v3(vote_state.clone()), &solana_sdk_ids::vote::id(), // owner ) .unwrap(); @@ -477,7 +477,7 @@ mod tests { let vote_state = VoteState::new(&vote_init, &clock); AccountSharedData::new_data( rng.gen(), // lamports - &VoteStateVersions::new_current(vote_state.clone()), + &VoteStateVersions::new_v3(vote_state.clone()), &solana_sdk_ids::vote::id(), // owner ) .unwrap() diff --git a/vote/src/vote_state_view.rs b/vote/src/vote_state_view.rs index b4c6dc313a2a67..c903350da0c257 100644 --- a/vote/src/vote_state_view.rs +++ b/vote/src/vote_state_view.rs @@ -157,7 +157,7 @@ impl VoteStateView { impl From for VoteStateView { fn from(vote_state: VoteState) -> Self { let vote_account_data = - bincode::serialize(&VoteStateVersions::new_current(vote_state)).unwrap(); + bincode::serialize(&VoteStateVersions::new_v3(vote_state)).unwrap(); VoteStateView::try_new(Arc::new(vote_account_data)).unwrap() } } @@ -278,7 +278,7 @@ mod tests { fn test_vote_state_view_v3() { let target_vote_state = new_test_vote_state(); let target_vote_state_versions = - VoteStateVersions::Current(Box::new(target_vote_state.clone())); + VoteStateVersions::V3(Box::new(target_vote_state.clone())); let vote_state_buf = bincode::serialize(&target_vote_state_versions).unwrap(); let vote_state_view = VoteStateView::try_new(Arc::new(vote_state_buf)).unwrap(); assert_eq_vote_state_v3(&vote_state_view, &target_vote_state); @@ -288,7 +288,7 @@ mod tests { fn test_vote_state_view_v3_default() { let target_vote_state = VoteState::default(); let target_vote_state_versions = - VoteStateVersions::Current(Box::new(target_vote_state.clone())); + VoteStateVersions::V3(Box::new(target_vote_state.clone())); let vote_state_buf = bincode::serialize(&target_vote_state_versions).unwrap(); let vote_state_view = VoteStateView::try_new(Arc::new(vote_state_buf)).unwrap(); assert_eq_vote_state_v3(&vote_state_view, &target_vote_state); @@ -313,7 +313,7 @@ mod tests { } let target_vote_state_versions = - VoteStateVersions::Current(Box::new(target_vote_state.clone())); + VoteStateVersions::V3(Box::new(target_vote_state.clone())); let vote_state_buf = bincode::serialize(&target_vote_state_versions).unwrap(); let vote_state_view = VoteStateView::try_new(Arc::new(vote_state_buf)).unwrap(); assert_eq_vote_state_v3(&vote_state_view, &target_vote_state); diff --git a/vote/src/vote_state_view/frame_v3.rs b/vote/src/vote_state_view/frame_v3.rs index 69fe1b434b9bed..5acfd0a26b5497 100644 --- a/vote/src/vote_state_view/frame_v3.rs +++ b/vote/src/vote_state_view/frame_v3.rs @@ -108,7 +108,7 @@ mod tests { #[test] fn test_try_new_zeroed() { let target_vote_state = VoteState::default(); - let target_vote_state_versions = VoteStateVersions::Current(Box::new(target_vote_state)); + let target_vote_state_versions = VoteStateVersions::V3(Box::new(target_vote_state)); let mut bytes = bincode::serialize(&target_vote_state_versions).unwrap(); for i in 0..bytes.len() { @@ -147,7 +147,7 @@ mod tests { lockout: Lockout::default(), }); - let target_vote_state_versions = VoteStateVersions::Current(Box::new(target_vote_state)); + let target_vote_state_versions = VoteStateVersions::V3(Box::new(target_vote_state)); let mut bytes = bincode::serialize(&target_vote_state_versions).unwrap(); for i in 0..bytes.len() {