From 7dff71985cdd3ffa48bb223792faed6c81e30a22 Mon Sep 17 00:00:00 2001 From: kevinheavey Date: Wed, 2 Oct 2024 17:55:32 +0400 Subject: [PATCH 01/16] start upgrading to 2.0 --- Cargo.lock | 1714 +++++++++-------- Cargo.toml | 15 +- crates/banks-interface/Cargo.toml | 2 +- crates/commitment-config/src/lib.rs | 5 - crates/message/src/lib.rs | 34 +- crates/rpc-common/Cargo.toml | 1 + crates/rpc-common/src/lib.rs | 3 + crates/rpc-config-no-filter/src/lib.rs | 2 + crates/rpc-filter/src/lib.rs | 33 +- crates/rpc-program-accounts-config/src/lib.rs | 2 + crates/rpc-responses/src/lib.rs | 78 +- crates/token/Cargo.toml | 4 +- crates/transaction-error/src/lib.rs | 5 + crates/transaction-status/src/lib.rs | 2 + crates/transaction/src/lib.rs | 7 +- python/solders/message.pyi | 3 - python/solders/rpc/filter.pyi | 12 - python/solders/rpc/responses.pyi | 5 + python/solders/transaction.pyi | 3 - python/solders/transaction_status.pyi | 2 + rust-toolchain.toml | 2 +- tests/test_message.py | 38 - tests/test_transaction.py | 26 - 23 files changed, 989 insertions(+), 1009 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9fb8ecca..e1145561 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -27,32 +27,38 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +[[package]] +name = "adler2" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" + [[package]] name = "aead" -version = "0.4.3" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b613b8e1e3cf911a086f53f03bf286f52fd7a7258e4fa606f0ef220d39d8877" +checksum = "d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0" dependencies = [ + "crypto-common", "generic-array", ] [[package]] name = "aes" -version = "0.7.5" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8" +checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" dependencies = [ "cfg-if", "cipher", "cpufeatures", - "opaque-debug", ] [[package]] name = "aes-gcm-siv" -version = "0.10.3" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "589c637f0e68c877bbd59a4599bbe849cac8e5f3e4b5a3ebae8f528cd218dcdc" +checksum = "ae0784134ba9375416d469ec31e7c5f9fa94405049cf08c5ce5b4698be673e0d" dependencies = [ "aead", "aes", @@ -65,20 +71,9 @@ dependencies = [ [[package]] name = "ahash" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" -dependencies = [ - "getrandom 0.2.10", - "once_cell", - "version_check", -] - -[[package]] -name = "ahash" -version = "0.8.7" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77c3a9648d43b9cd48db467b3f87fdd6e146bcc88ab0180006cef2179fe11d01" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ "cfg-if", "getrandom 0.2.10", @@ -96,12 +91,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "aliasable" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "250f629c0161ad8107cf89319e990051fae62832fd343083bea452d93e2205fd" - [[package]] name = "alloc-no-stdlib" version = "2.0.4" @@ -143,9 +132,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.69" +version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "224afbd727c3d6e4b90103ece64b8d1b67fbb1973b1046c2281eed3f3803f800" +checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6" [[package]] name = "aquamarine" @@ -154,7 +143,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d1da02abba9f9063d786eab1509833ebb2fac0f966862ca59439c76b9c566760" dependencies = [ "include_dir", - "itertools", + "itertools 0.10.5", "proc-macro-error", "proc-macro2", "quote", @@ -184,7 +173,7 @@ dependencies = [ "ark-std", "derivative", "hashbrown 0.13.2", - "itertools", + "itertools 0.10.5", "num-traits", "zeroize", ] @@ -201,8 +190,8 @@ dependencies = [ "ark-std", "derivative", "digest 0.10.7", - "itertools", - "num-bigint 0.4.4", + "itertools 0.10.5", + "num-bigint 0.4.6", "num-traits", "paste", "rustc_version", @@ -225,7 +214,7 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7abe79b0e4288889c4574159ab790824d0033b9fdcb2a112a3182fac2e514565" dependencies = [ - "num-bigint 0.4.4", + "num-bigint 0.4.6", "num-traits", "proc-macro2", "quote", @@ -254,7 +243,7 @@ dependencies = [ "ark-serialize-derive", "ark-std", "digest 0.10.7", - "num-bigint 0.4.4", + "num-bigint 0.4.6", ] [[package]] @@ -280,9 +269,9 @@ dependencies = [ [[package]] name = "arrayref" -version = "0.3.7" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" +checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb" [[package]] name = "arrayvec" @@ -377,9 +366,9 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.77" +version = "0.1.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" +checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" dependencies = [ "proc-macro2", "quote", @@ -413,7 +402,7 @@ dependencies = [ "cc", "cfg-if", "libc", - "miniz_oxide", + "miniz_oxide 0.7.1", "object", "rustc-demangle", ] @@ -437,10 +426,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" [[package]] -name = "base64ct" -version = "1.5.3" +name = "base64" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b645a089122eccb6111b4f81cbc1a49f5900ac4666bb93ac027feaecf15607bf" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" [[package]] name = "bincode" @@ -459,9 +448,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.2" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" dependencies = [ "serde", ] @@ -477,9 +466,9 @@ dependencies = [ [[package]] name = "blake3" -version = "1.5.0" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0231f06152bf547e9c2b5194f247cd97aacf6dcd8b15d8e5ec0663f64580da87" +checksum = "30cca6d3674597c30ddf2c587bf8d9d65c9a84d2326d941cc79c9842dfe0ef52" dependencies = [ "arrayref", "arrayvec", @@ -514,16 +503,6 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae" -[[package]] -name = "borsh" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15bf3650200d8bffa99015595e10f1fbd17de07abbc25bb067da79e769939bfa" -dependencies = [ - "borsh-derive 0.9.3", - "hashbrown 0.11.2", -] - [[package]] name = "borsh" version = "0.10.3" @@ -536,25 +515,12 @@ dependencies = [ [[package]] name = "borsh" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f58b559fd6448c6e2fd0adb5720cd98a2506594cafa4737ff98c396f3e82f667" -dependencies = [ - "borsh-derive 1.3.1", - "cfg_aliases", -] - -[[package]] -name = "borsh-derive" -version = "0.9.3" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6441c552f230375d18e3cc377677914d2ca2b0d36e52129fe15450a2dce46775" +checksum = "a6362ed55def622cddc70a4746a68554d7b687713770de539e59a739b249f8ed" dependencies = [ - "borsh-derive-internal 0.9.3", - "borsh-schema-derive-internal 0.9.3", - "proc-macro-crate 0.1.5", - "proc-macro2", - "syn 1.0.107", + "borsh-derive 1.5.1", + "cfg_aliases 0.2.1", ] [[package]] @@ -563,8 +529,8 @@ version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0754613691538d51f329cce9af41d7b7ca150bc973056f1156611489475f54f7" dependencies = [ - "borsh-derive-internal 0.10.3", - "borsh-schema-derive-internal 0.10.3", + "borsh-derive-internal", + "borsh-schema-derive-internal", "proc-macro-crate 0.1.5", "proc-macro2", "syn 1.0.107", @@ -572,9 +538,9 @@ dependencies = [ [[package]] name = "borsh-derive" -version = "1.3.1" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7aadb5b6ccbd078890f6d7003694e33816e6b784358f18e15e7e6d9f065a57cd" +checksum = "c3ef8005764f53cd4dca619f5bf64cafd4664dada50ece25e4d81de54c80cc0b" dependencies = [ "once_cell", "proc-macro-crate 3.1.0", @@ -584,17 +550,6 @@ dependencies = [ "syn_derive", ] -[[package]] -name = "borsh-derive-internal" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5449c28a7b352f2d1e592a8a28bf139bc71afb0764a14f3c02500935d8c44065" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.107", -] - [[package]] name = "borsh-derive-internal" version = "0.10.3" @@ -606,17 +561,6 @@ dependencies = [ "syn 1.0.107", ] -[[package]] -name = "borsh-schema-derive-internal" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdbd5696d8bfa21d53d9fe39a714a18538bad11492a42d066dbbc395fb1951c0" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.107", -] - [[package]] name = "borsh-schema-derive-internal" version = "0.10.3" @@ -655,6 +599,15 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3" +[[package]] +name = "bs58" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf88ba1141d185c399bee5288d850d63b8369520c1eafc32a0430b5b6c287bf4" +dependencies = [ + "tinyvec", +] + [[package]] name = "bumpalo" version = "3.12.0" @@ -673,22 +626,22 @@ dependencies = [ [[package]] name = "bytemuck" -version = "1.14.0" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" +checksum = "94bbb0ad554ad961ddc5da507a12a29b14e4ae5bda06b19f575a3e6079d2e2ae" dependencies = [ "bytemuck_derive", ] [[package]] name = "bytemuck_derive" -version = "1.4.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1aca418a974d83d40a0c1f0c5cba6ff4bc28d8df099109ca459a2118d40b6322" +checksum = "0cc8b54b395f2fcfbb3d90c47b01c7f444d94d05bdeb775811dec868ac3bbc26" dependencies = [ "proc-macro2", "quote", - "syn 1.0.107", + "syn 2.0.48", ] [[package]] @@ -699,9 +652,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.5.0" +version = "1.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" +checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3" [[package]] name = "bzip2" @@ -742,12 +695,13 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.83" +version = "1.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +checksum = "812acba72f0a070b003d3697490d2b55b837230ae7c6c6497f05cc2ddbb8d938" dependencies = [ "jobserver", "libc", + "shlex", ] [[package]] @@ -762,11 +716,17 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" +[[package]] +name = "cfg_aliases" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" + [[package]] name = "chrono" -version = "0.4.31" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" dependencies = [ "android-tzdata", "iana-time-zone", @@ -774,7 +734,7 @@ dependencies = [ "num-traits", "serde", "wasm-bindgen", - "windows-targets 0.48.0", + "windows-targets 0.52.0", ] [[package]] @@ -788,11 +748,12 @@ dependencies = [ [[package]] name = "cipher" -version = "0.3.0" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ee52072ec15386f770805afd189a01c8841be8696bed250fa2f13c4c0d6dfb7" +checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" dependencies = [ - "generic-array", + "crypto-common", + "inout", ] [[package]] @@ -900,12 +861,6 @@ dependencies = [ "web-sys", ] -[[package]] -name = "const-oid" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4c78c047431fee22c1a7bb92e00ad095a02a983affe4d8a72e2a2c62c1b94f3" - [[package]] name = "constant_time_eq" version = "0.3.0" @@ -954,9 +909,9 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.11" +version = "0.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "176dc175b78f56c0f321911d9c8eb2b77a78a4860b9c19db83835fea1a46649b" +checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" dependencies = [ "crossbeam-utils", ] @@ -1004,6 +959,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" dependencies = [ "generic-array", + "rand_core 0.6.4", "typenum", ] @@ -1019,9 +975,9 @@ dependencies = [ [[package]] name = "ctr" -version = "0.8.0" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "049bb91fb4aaf0e3c7efa6cd5ef877dbbbd15b39dad06d9948de4ec8a75761ea" +checksum = "0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835" dependencies = [ "cipher", ] @@ -1174,15 +1130,6 @@ version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "23d8666cb01533c39dde32bcbab8e227b4ed6679b2c925eba05feabea39508fb" -[[package]] -name = "der" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6919815d73839e7ad218de758883aae3a257ba6759ce7a9992501efbb53d705c" -dependencies = [ - "const-oid", -] - [[package]] name = "der-parser" version = "8.1.0" @@ -1192,7 +1139,7 @@ dependencies = [ "asn1-rs", "displaydoc", "nom", - "num-bigint 0.4.4", + "num-bigint 0.4.6", "num-traits", "rusticata-macros", ] @@ -1425,7 +1372,7 @@ version = "3.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a62bb1df8b45ecb7ffa78dca1c17a438fb193eb083db0b1b494d2a61bcb5096a" dependencies = [ - "num-bigint 0.4.4", + "num-bigint 0.4.6", "num-traits", "proc-macro2", "quote", @@ -1470,9 +1417,9 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] name = "fastrand" -version = "2.0.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" +checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" [[package]] name = "feature-probe" @@ -1492,14 +1439,20 @@ dependencies = [ "windows-sys 0.45.0", ] +[[package]] +name = "fixedbitset" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" + [[package]] name = "flate2" -version = "1.0.28" +version = "1.0.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +checksum = "a1b589b4dc103969ad3cf85c950899926ec64300a1a46d76c03a6072957036f0" dependencies = [ "crc32fast", - "miniz_oxide", + "miniz_oxide 0.8.0", ] [[package]] @@ -1719,23 +1672,11 @@ dependencies = [ "byteorder", ] -[[package]] -name = "hashbrown" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" -dependencies = [ - "ahash 0.7.6", -] - [[package]] name = "hashbrown" version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" -dependencies = [ - "ahash 0.7.6", -] [[package]] name = "hashbrown" @@ -1743,7 +1684,7 @@ version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" dependencies = [ - "ahash 0.8.7", + "ahash", ] [[package]] @@ -1752,6 +1693,12 @@ version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7dfda62a12f55daeae5015f81b0baea145391cb4520f86c248fc615d72640d12" +[[package]] +name = "hashbrown" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb" + [[package]] name = "heck" version = "0.4.1" @@ -1809,6 +1756,15 @@ dependencies = [ "hmac 0.8.1", ] +[[package]] +name = "home" +version = "0.5.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" +dependencies = [ + "windows-sys 0.52.0", +] + [[package]] name = "http" version = "0.2.9" @@ -1980,19 +1936,19 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.2.2" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "824b2ae422412366ba479e8111fd301f7b5faece8149317bb81925979a53f520" +checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" dependencies = [ "equivalent", - "hashbrown 0.14.1", + "hashbrown 0.15.0", ] [[package]] name = "indicatif" -version = "0.17.7" +version = "0.17.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb28741c9db9a713d93deb3bb9515c20788cef5815265bee4980e87bde7e0f25" +checksum = "763a5a8f45087d6bcea4222e7b72c291a054edf80e4ef6efd2a4979878c7bea3" dependencies = [ "console", "instant", @@ -2007,6 +1963,15 @@ version = "2.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e186cfbae8084e513daff4240b4797e342f988cecda4fb6c939150f96315fd8" +[[package]] +name = "inout" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" +dependencies = [ + "generic-array", +] + [[package]] name = "instant" version = "0.1.12" @@ -2031,6 +1996,15 @@ dependencies = [ "either", ] +[[package]] +name = "itertools" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +dependencies = [ + "either", +] + [[package]] name = "itoa" version = "1.0.5" @@ -2039,18 +2013,18 @@ checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440" [[package]] name = "jobserver" -version = "0.1.25" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "068b1ee6743e4d11fb9c6a1e6064b3693a1b600e7f5f5988047d98b3dc9fb90b" +checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" dependencies = [ "libc", ] [[package]] name = "js-sys" -version = "0.3.67" +version = "0.3.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a1d36f1235bc969acba30b7f5990b864423a6068a10f7c90ae8f0112e3a59d1" +checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" dependencies = [ "wasm-bindgen", ] @@ -2072,9 +2046,9 @@ dependencies = [ [[package]] name = "keccak" -version = "0.1.3" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3afef3b6eff9ce9d8ff9b3601125eec7f0c8cbac7abd14f355d053fa56c98768" +checksum = "ecc2af9a1119c51f12a14607e783cb977bde58bc069ff0c3da1095e635d70654" dependencies = [ "cpufeatures", ] @@ -2087,9 +2061,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.153" +version = "0.2.159" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" +checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5" [[package]] name = "libsecp256k1" @@ -2147,7 +2121,7 @@ checksum = "3c9a85a9752c549ceb7578064b4ed891179d20acd85f27318573b64d2d7ee7ee" dependencies = [ "ark-bn254", "ark-ff", - "num-bigint 0.4.4", + "num-bigint 0.4.6", "thiserror", ] @@ -2178,34 +2152,24 @@ dependencies = [ [[package]] name = "log" -version = "0.4.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" - -[[package]] -name = "lru" -version = "0.7.8" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e999beba7b6e8345721bd280141ed958096a2e4abdf74f67ff4ce49b4b54e47a" -dependencies = [ - "hashbrown 0.12.3", -] +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] name = "lz4" -version = "1.24.0" +version = "1.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e9e2dd86df36ce760a60f6ff6ad526f7ba1f14ba0356f8254fb6905e6494df1" +checksum = "4d1febb2b4a79ddd1980eede06a8f7902197960aa0383ffcfdd62fe723036725" dependencies = [ - "libc", "lz4-sys", ] [[package]] name = "lz4-sys" -version = "1.9.4" +version = "1.11.1+lz4-1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57d27b317e207b10f69f5e75494119e391a96f48861ae870d1da6edac98ca900" +checksum = "6bd8c0d6c6ed0cd30b3652886bb8711dc4bb01d637a68105a3d5158039b418e6" dependencies = [ "cc", "libc", @@ -2262,6 +2226,16 @@ version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" +[[package]] +name = "mime_guess" +version = "2.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e" +dependencies = [ + "mime", + "unicase", +] + [[package]] name = "minimal-lexical" version = "0.2.1" @@ -2277,6 +2251,15 @@ dependencies = [ "adler", ] +[[package]] +name = "miniz_oxide" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" +dependencies = [ + "adler2", +] + [[package]] name = "mio" version = "0.8.8" @@ -2336,17 +2319,23 @@ dependencies = [ "syn 1.0.107", ] +[[package]] +name = "multimap" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" + [[package]] name = "nix" -version = "0.26.4" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" +checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", "cfg-if", + "cfg_aliases 0.1.1", "libc", - "memoffset 0.7.1", - "pin-utils", + "memoffset 0.9.0", ] [[package]] @@ -2359,15 +2348,6 @@ dependencies = [ "minimal-lexical", ] -[[package]] -name = "nom8" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae01545c9c7fc4486ab7debaf2aad7003ac19431791868fb2e8066df97fad2f8" -dependencies = [ - "memchr", -] - [[package]] name = "normalize-line-endings" version = "0.3.0" @@ -2401,11 +2381,10 @@ dependencies = [ [[package]] name = "num-bigint" -version = "0.4.4" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" +checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" dependencies = [ - "autocfg", "num-integer", "num-traits", ] @@ -2420,17 +2399,6 @@ dependencies = [ "num-traits", ] -[[package]] -name = "num-derive" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.107", -] - [[package]] name = "num-derive" version = "0.4.1" @@ -2444,11 +2412,10 @@ dependencies = [ [[package]] name = "num-integer" -version = "0.1.45" +version = "0.1.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" dependencies = [ - "autocfg", "num-traits", ] @@ -2477,9 +2444,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.16" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", ] @@ -2496,60 +2463,18 @@ dependencies = [ [[package]] name = "num_enum" -version = "0.5.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e0072973714303aa6e3631c7e8e777970cf4bdd25dc4932e41031027b8bcc4e" -dependencies = [ - "num_enum_derive 0.5.10", -] - -[[package]] -name = "num_enum" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a015b430d3c108a207fd776d2e2196aaf8b1cf8cf93253e3a097ff3085076a1" -dependencies = [ - "num_enum_derive 0.6.1", -] - -[[package]] -name = "num_enum" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845" -dependencies = [ - "num_enum_derive 0.7.2", -] - -[[package]] -name = "num_enum_derive" -version = "0.5.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0629cbd6b897944899b1f10496d9c4a7ac5878d45fd61bc22e9e79bfbbc29597" -dependencies = [ - "proc-macro-crate 1.3.0", - "proc-macro2", - "quote", - "syn 1.0.107", -] - -[[package]] -name = "num_enum_derive" -version = "0.6.1" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96667db765a921f7b295ffee8b60472b686a51d4f21c2ee4ffdb94c7013b65a6" +checksum = "4e613fc340b2220f734a8595782c551f1250e969d87d3be1ae0579e8d4065179" dependencies = [ - "proc-macro-crate 1.3.0", - "proc-macro2", - "quote", - "syn 2.0.48", + "num_enum_derive", ] [[package]] name = "num_enum_derive" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" +checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56" dependencies = [ "proc-macro-crate 3.1.0", "proc-macro2", @@ -2624,29 +2549,6 @@ version = "6.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee" -[[package]] -name = "ouroboros" -version = "0.15.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1358bd1558bd2a083fed428ffeda486fbfb323e698cdda7794259d592ca72db" -dependencies = [ - "aliasable", - "ouroboros_macro", -] - -[[package]] -name = "ouroboros_macro" -version = "0.15.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f7d21ccd03305a674437ee1248f3ab5d4b1db095cf1caf49f1713ddf61956b7" -dependencies = [ - "Inflector", - "proc-macro-error", - "proc-macro2", - "quote", - "syn 1.0.107", -] - [[package]] name = "parking_lot" version = "0.12.1" @@ -2719,8 +2621,18 @@ dependencies = [ ] [[package]] -name = "pin-project" -version = "1.0.12" +name = "petgraph" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" +dependencies = [ + "fixedbitset", + "indexmap 2.6.0", +] + +[[package]] +name = "pin-project" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ad29a609b6bcd67fee905812e544992d216af9d755757c05ed2d0e15a74c6ecc" dependencies = [ @@ -2750,17 +2662,6 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" -[[package]] -name = "pkcs8" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cabda3fb821068a9a4fab19a683eac3af12edf0f34b94a8be53c4972b8149d0" -dependencies = [ - "der", - "spki", - "zeroize", -] - [[package]] name = "pkg-config" version = "0.3.26" @@ -2775,9 +2676,9 @@ checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6" [[package]] name = "polyval" -version = "0.5.3" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8419d2b623c7c0896ff2d5d96e2cb4ede590fed28fcc34934f4c33c036e620a1" +checksum = "9d1fe60d06143b2430aa532c94cfe9e29783047f06c0d7fd359a9a51b729fa25" dependencies = [ "cfg-if", "cpufeatures", @@ -2805,7 +2706,7 @@ checksum = "59230a63c37f3e18569bdb90e4a89cbf5bf8b06fea0b84e65ea10cc4df47addd" dependencies = [ "difflib", "float-cmp", - "itertools", + "itertools 0.10.5", "normalize-line-endings", "predicates-core", "regex", @@ -2828,22 +2729,22 @@ dependencies = [ ] [[package]] -name = "proc-macro-crate" -version = "0.1.5" +name = "prettyplease" +version = "0.1.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d6ea3c4595b96363c13943497db34af4460fb474a95c43f4446ad341b8c9785" +checksum = "6c8646e95016a7a6c4adea95bafa8a16baab64b583356217f2c85db4a39d9a86" dependencies = [ - "toml 0.5.11", + "proc-macro2", + "syn 1.0.107", ] [[package]] name = "proc-macro-crate" -version = "1.3.0" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66618389e4ec1c7afe67d51a9bf34ff9236480f8d51e7489b7d5ab0303c13f34" +checksum = "1d6ea3c4595b96363c13943497db34af4460fb474a95c43f4446ad341b8c9785" dependencies = [ - "once_cell", - "toml_edit 0.18.1", + "toml 0.5.11", ] [[package]] @@ -2881,13 +2782,67 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.78" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" dependencies = [ "unicode-ident", ] +[[package]] +name = "prost" +version = "0.11.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd" +dependencies = [ + "bytes", + "prost-derive", +] + +[[package]] +name = "prost-build" +version = "0.11.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "119533552c9a7ffacc21e099c24a0ac8bb19c2a2a3f363de84cd9b844feab270" +dependencies = [ + "bytes", + "heck", + "itertools 0.10.5", + "lazy_static", + "log", + "multimap", + "petgraph", + "prettyplease", + "prost", + "prost-types", + "regex", + "syn 1.0.107", + "tempfile", + "which", +] + +[[package]] +name = "prost-derive" +version = "0.11.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4" +dependencies = [ + "anyhow", + "itertools 0.10.5", + "proc-macro2", + "quote", + "syn 1.0.107", +] + +[[package]] +name = "prost-types" +version = "0.11.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "213622a1460818959ac1181aaeb2dc9c7f63df720db7d788b3e24eacd1983e13" +dependencies = [ + "prost", +] + [[package]] name = "pyo3" version = "0.20.2" @@ -3035,7 +2990,7 @@ checksum = "055b4e778e8feb9f93c4e439f71dc2156ef13360b432b799e179a8c4cdf0b1d7" dependencies = [ "bytes", "libc", - "socket2 0.5.5", + "socket2 0.5.7", "tracing", "windows-sys 0.48.0", ] @@ -3131,9 +3086,9 @@ dependencies = [ [[package]] name = "rayon" -version = "1.8.1" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa7237101a77a10773db45d62004a272517633fbcc3df19d96455ede1122e051" +checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" dependencies = [ "either", "rayon-core", @@ -3149,18 +3104,6 @@ dependencies = [ "crossbeam-utils", ] -[[package]] -name = "rcgen" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffbe84efe2f38dea12e9bfc1f65377fdf03e53a18cb3b995faedf7934c7e785b" -dependencies = [ - "pem", - "ring 0.16.20", - "time", - "yasna", -] - [[package]] name = "redox_syscall" version = "0.2.16" @@ -3181,9 +3124,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.3" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" +checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8" dependencies = [ "aho-corasick", "memchr", @@ -3193,9 +3136,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.5" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd" +checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3" dependencies = [ "aho-corasick", "memchr", @@ -3204,15 +3147,15 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.2" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" +checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" [[package]] name = "reqwest" -version = "0.11.24" +version = "0.11.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6920094eb85afde5e4a138be3f2de8bbdf28000f0029e72c45025a56b042251" +checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62" dependencies = [ "async-compression", "base64 0.21.7", @@ -3229,6 +3172,7 @@ dependencies = [ "js-sys", "log", "mime", + "mime_guess", "once_cell", "percent-encoding", "pin-project-lite", @@ -3251,6 +3195,21 @@ dependencies = [ "winreg", ] +[[package]] +name = "reqwest-middleware" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a735987236a8e238bf0296c7e351b999c188ccc11477f311b82b55c93984216" +dependencies = [ + "anyhow", + "async-trait", + "http", + "reqwest", + "serde", + "task-local-extensions", + "thiserror", +] + [[package]] name = "ring" version = "0.16.20" @@ -3337,7 +3296,7 @@ version = "0.38.31" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.6.0", "errno", "libc", "linux-raw-sys", @@ -3346,9 +3305,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.21.10" +version = "0.21.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" +checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" dependencies = [ "log", "ring 0.17.7", @@ -3389,9 +3348,9 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.14" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" +checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" [[package]] name = "ryu" @@ -3484,9 +3443,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.21" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b97ed7a9823b74f99c7742f5336af7be5ecd3eeafcb1507d1fa93347b1d589b0" +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "seqlock" @@ -3499,9 +3458,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.196" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "870026e60fa08c69f064aa766c10f10b1d62db9ccd4d0abb206472bee0ce3b32" +checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" dependencies = [ "serde_derive", ] @@ -3527,9 +3486,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.196" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33c85360c95e7d137454dc81d9a4ed2b8efd8fbe19cee57357b32b9771fccb67" +checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" dependencies = [ "proc-macro2", "quote", @@ -3538,11 +3497,12 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.113" +version = "1.0.128" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69801b70b1c3dac963ecb03a364ba0ceda9cf60c71cfe475e99864759c8b8a79" +checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" dependencies = [ "itoa", + "memchr", "ryu", "serde", ] @@ -3662,9 +3622,9 @@ dependencies = [ [[package]] name = "sha3" -version = "0.10.6" +version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdf0c33fae925bdc080598b84bc15c55e7b9a4a43b3c704da051f977469691c9" +checksum = "75872d278a8f37ef87fa0ddbda7802605cb18344497949862c0d4dcb291eba60" dependencies = [ "digest 0.10.7", "keccak", @@ -3685,6 +3645,12 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde" +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + [[package]] name = "signal-hook-registry" version = "1.4.1" @@ -3727,9 +3693,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.13.1" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "socket2" @@ -3743,24 +3709,24 @@ dependencies = [ [[package]] name = "socket2" -version = "0.5.5" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" dependencies = [ "libc", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "solana-account-decoder" -version = "1.18.1" +version = "2.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06cc3f73c655469ddab1a7b8f9687e674737fc657dc2fa1e23a7abad2ec541fc" +checksum = "01c23b9de815f607b6cdadf0a65118bf90d812cfd29397c326b4dc222daad684" dependencies = [ "Inflector", - "base64 0.21.7", + "base64 0.22.1", "bincode", - "bs58", + "bs58 0.5.1", "bv", "lazy_static", "serde", @@ -3768,70 +3734,54 @@ dependencies = [ "serde_json", "solana-config-program", "solana-sdk", - "spl-token 4.0.0", - "spl-token-2022 1.0.0", - "spl-token-group-interface", - "spl-token-metadata-interface", + "spl-token", + "spl-token-2022 4.0.0", + "spl-token-group-interface 0.3.0", + "spl-token-metadata-interface 0.4.0", "thiserror", "zstd", ] [[package]] name = "solana-accounts-db" -version = "1.18.1" +version = "2.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd00cd2012983bf916d3379a09ef8e76b28d93da88ba76bca09b4455654c2e05" +checksum = "f4785251ba24affad78d0323a87c8ca15ae519832b6035f9e6e5a6f67fac1cc7" dependencies = [ - "arrayref", "bincode", "blake3", "bv", "bytemuck", - "byteorder", + "bytemuck_derive", "bzip2", "crossbeam-channel", "dashmap", - "flate2", - "fnv", - "im", "index_list", - "itertools", + "indexmap 2.6.0", + "itertools 0.12.1", "lazy_static", "log", "lz4", "memmap2", "modular-bitfield", - "num-derive 0.4.1", - "num-traits", "num_cpus", - "num_enum 0.7.2", - "ouroboros", - "percentage", - "qualifier_attr", + "num_enum", "rand 0.8.5", "rayon", - "regex", "rustc_version", "seqlock", "serde", "serde_derive", "smallvec", "solana-bucket-map", - "solana-config-program", - "solana-frozen-abi", - "solana-frozen-abi-macro", + "solana-inline-spl", "solana-measure", "solana-metrics", "solana-nohash-hasher", - "solana-program-runtime", "solana-rayon-threadlimit", "solana-sdk", - "solana-stake-program", - "solana-system-program", - "solana-vote-program", + "solana-svm", "static_assertions", - "strum", - "strum_macros", "tar", "tempfile", "thiserror", @@ -3839,19 +3789,16 @@ dependencies = [ [[package]] name = "solana-address-lookup-table-program" -version = "1.18.1" +version = "2.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbda589514bd080736ee62ea9631f8372a967273763efa5639667140eb658cad" +checksum = "6771f20c31d3665f1a33e02192b1295579af6c827bf6f9c2d8873f17c9280463" dependencies = [ "bincode", "bytemuck", "log", - "num-derive 0.4.1", + "num-derive", "num-traits", "rustc_version", - "serde", - "solana-frozen-abi", - "solana-frozen-abi-macro", "solana-program", "solana-program-runtime", "solana-sdk", @@ -3860,11 +3807,11 @@ dependencies = [ [[package]] name = "solana-banks-client" -version = "1.18.1" +version = "2.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ae95d278edf71ee51f69aec47526b4be24ca48557d25b9d0f23141d4c26ee85" +checksum = "97e874b4d0ae1ac6f313b525e4c5f20c0170b0b51cecb4c4cfd44d7a7ba0833e" dependencies = [ - "borsh 1.3.1", + "borsh 1.5.1", "futures", "solana-banks-interface", "solana-program", @@ -3877,30 +3824,31 @@ dependencies = [ [[package]] name = "solana-banks-interface" -version = "1.18.1" +version = "2.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "158758371166dc5be729e651bed494b1fb57227425484d87701bdd66d7ec82bd" +checksum = "f4d1c42f5f54e8dbf0cb02223be148896963175afdc996b897184b78b826db70" dependencies = [ "serde", + "serde_derive", "solana-sdk", "tarpc", ] [[package]] name = "solana-banks-server" -version = "1.18.1" +version = "2.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d866bc88e9f831e9b46417583949984a130b5304e9cf09e3f46e59f71a9aa6aa" +checksum = "646a142af0ba9c82781b07953d2cc50ca6b65e91d5b467a1846725392438e166" dependencies = [ "bincode", "crossbeam-channel", "futures", - "solana-accounts-db", "solana-banks-interface", "solana-client", "solana-runtime", "solana-sdk", "solana-send-transaction-service", + "solana-svm", "tarpc", "tokio", "tokio-serde", @@ -3908,35 +3856,39 @@ dependencies = [ [[package]] name = "solana-bpf-loader-program" -version = "1.18.1" +version = "2.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09be1798b0bae75d0981ff5d978543bed490c0f460adff784bdbdd0dc73f54f3" +checksum = "4616ea627eb914307ce2cfc41bc9759394a5a26e86ffa059b023ff5a6ea61e9f" dependencies = [ "bincode", "byteorder", "libsecp256k1", "log", "scopeguard", + "solana-compute-budget", + "solana-curve25519", "solana-measure", + "solana-poseidon", "solana-program-runtime", "solana-sdk", - "solana-zk-token-sdk", + "solana-type-overrides", "solana_rbpf", "thiserror", ] [[package]] name = "solana-bucket-map" -version = "1.18.1" +version = "2.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "472b99b8e23e7cc4d6cc3da2828168d3fceebbacbd86c7bb3d54a175e96b8643" +checksum = "cafc93c9393c6f1f907ce703ef41a579a0f4449ba730992bbf64f1787d430b29" dependencies = [ "bv", "bytemuck", + "bytemuck_derive", "log", "memmap2", "modular-bitfield", - "num_enum 0.7.2", + "num_enum", "rand 0.8.5", "solana-measure", "solana-sdk", @@ -3945,9 +3897,9 @@ dependencies = [ [[package]] name = "solana-clap-utils" -version = "1.18.1" +version = "2.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09392e795b353fa6527f19dc36cb9fa9cd40afb71215027fbafce73a6da63383" +checksum = "e4453ca3d1c13c7ac914adbad7aa58cb3cdfa7710e581ffcdbff65d1b2895377" dependencies = [ "chrono", "clap 2.34.0", @@ -3962,16 +3914,16 @@ dependencies = [ [[package]] name = "solana-client" -version = "1.18.1" +version = "2.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5515041f760618a2a669f236abc409f8aea9c865400563cdc8030eca5156f979" +checksum = "4d7d9dde51417ce52076059b3802db8e14c7c92e00e562208d9d53361bfd3f12" dependencies = [ "async-trait", "bincode", "dashmap", "futures", "futures-util", - "indexmap 2.2.2", + "indexmap 2.6.0", "indicatif", "log", "quinn", @@ -3993,11 +3945,21 @@ dependencies = [ "tokio", ] +[[package]] +name = "solana-compute-budget" +version = "2.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99f17feb6ffde6f6bfeff274f90345a1290cb04b0a60ea186c452a2435660c06" +dependencies = [ + "rustc_version", + "solana-sdk", +] + [[package]] name = "solana-compute-budget-program" -version = "1.18.1" +version = "2.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fa10f166f2e4cd0dc726e2fc364cfafabd8e30d4ea80da6425f61c7f5973386" +checksum = "e30043b3355ddbe903c0cdc97a3381f529b7cca54680cab66b24a73e9a850c84" dependencies = [ "solana-program-runtime", "solana-sdk", @@ -4005,9 +3967,9 @@ dependencies = [ [[package]] name = "solana-config-program" -version = "1.18.1" +version = "2.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17da53f316ec29baa40c8be233418da94d2cfcb79f77b8b0bb96ddd30b919525" +checksum = "db0730a851d7785f572617878009ec35ac020922fba473c536382ff30207859d" dependencies = [ "bincode", "chrono", @@ -4019,19 +3981,18 @@ dependencies = [ [[package]] name = "solana-connection-cache" -version = "1.18.1" +version = "2.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90651b04cc5dd1edd4cecae2db5736ac67fafd1150fa6c8502d5957fbde8fc37" +checksum = "5cb3522f31e8624a87116f770e082c9ac74fd0a9a2252ff11c952704218de246" dependencies = [ "async-trait", "bincode", "crossbeam-channel", "futures-util", - "indexmap 2.2.2", + "indexmap 2.6.0", "log", "rand 0.8.5", "rayon", - "rcgen", "solana-measure", "solana-metrics", "solana-sdk", @@ -4041,22 +4002,21 @@ dependencies = [ [[package]] name = "solana-cost-model" -version = "1.18.1" +version = "2.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4f41dc12f6155ee55c1731b653655d69f34a76b709fcb1ea772fa6534cce6ce" +checksum = "9f18fd3b569ec88c725650dc7206d8e4658dd9dbe98dede82c75ab9069328919" dependencies = [ + "ahash", "lazy_static", "log", "rustc_version", "solana-address-lookup-table-program", "solana-bpf-loader-program", + "solana-compute-budget", "solana-compute-budget-program", "solana-config-program", - "solana-frozen-abi", - "solana-frozen-abi-macro", "solana-loader-v4-program", "solana-metrics", - "solana-program-runtime", "solana-sdk", "solana-stake-program", "solana-system-program", @@ -4064,60 +4024,49 @@ dependencies = [ ] [[package]] -name = "solana-frozen-abi" -version = "1.18.1" +name = "solana-curve25519" +version = "2.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b24a0e5179387f145afba79d72b27db817cecf1b9494f7cd55d42aa986ed3141" +checksum = "698aeff176242ed50c887bea4c7e6e332ba5f120b7b02745d3a3cce3a719dcdd" dependencies = [ - "block-buffer 0.10.4", - "bs58", - "bv", - "either", - "generic-array", - "im", - "lazy_static", - "log", - "memmap2", - "rustc_version", - "serde", - "serde_bytes", - "serde_derive", - "sha2 0.10.8", - "solana-frozen-abi-macro", - "subtle", + "bytemuck", + "bytemuck_derive", + "curve25519-dalek", + "solana-program", "thiserror", ] [[package]] -name = "solana-frozen-abi-macro" -version = "1.18.1" +name = "solana-inline-spl" +version = "2.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92970a9898903eb1433d42f53ca4e8f497bc05382b7bc170ea81d4d3c6ff5d58" +checksum = "4137c8f12ed9362a7e55587f5556765a235192847ecff2f04fc46dde165303e2" dependencies = [ - "proc-macro2", - "quote", + "bytemuck", "rustc_version", - "syn 2.0.48", + "solana-sdk", ] [[package]] name = "solana-loader-v4-program" -version = "1.18.1" +version = "2.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82df2a4889d63972c7ffce63bb48ff69a7819015f9bf7fc11c7c581aa39d04f0" +checksum = "bbf9156ea4e281543775bd7660585a11f3b503b1b63f29e1873dcc332bc39424" dependencies = [ "log", + "solana-compute-budget", "solana-measure", "solana-program-runtime", "solana-sdk", + "solana-type-overrides", "solana_rbpf", ] [[package]] name = "solana-logger" -version = "1.18.1" +version = "2.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dea25cdb22fe3dfed39a9ef59b836153d226fb9e3984a1f5b6134061bfa94528" +checksum = "c94ce4da36c6b28b6d741cbd99bf4238b8ae93ce0c8f8c72225faa21a140645e" dependencies = [ "env_logger", "lazy_static", @@ -4126,9 +4075,9 @@ dependencies = [ [[package]] name = "solana-measure" -version = "1.18.1" +version = "2.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cda9ee9ea9115543ae59f81a45d6329ecd9dca0b96dac4a55be73aab714f7ed4" +checksum = "79ed5420dcffe2f7759c70eb6cac560c92304bf06d505012ad367b44bac7c8b4" dependencies = [ "log", "solana-sdk", @@ -4136,9 +4085,9 @@ dependencies = [ [[package]] name = "solana-metrics" -version = "1.18.1" +version = "2.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f69472348763363003c51c3af98de759c0153e99a31573a649330351a45f851" +checksum = "893c7b904946e99214bbaee7d366148a9b0fe2564ef6dfe7161a5a2d8c0c5738" dependencies = [ "crossbeam-channel", "gethostname", @@ -4151,9 +4100,9 @@ dependencies = [ [[package]] name = "solana-net-utils" -version = "1.18.1" +version = "2.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89d35642b3a76cb0920b8d044321ecd945f8d42a1c510b1d730b776ad8352b72" +checksum = "c556a6d542c1937376e785f793dc590ffe20330affca70ce9f4a7ade437ee7bd" dependencies = [ "bincode", "clap 3.2.23", @@ -4163,10 +4112,11 @@ dependencies = [ "rand 0.8.5", "serde", "serde_derive", - "socket2 0.5.5", + "socket2 0.5.7", "solana-logger", "solana-sdk", "solana-version", + "static_assertions", "tokio", "url", ] @@ -4179,11 +4129,11 @@ checksum = "8b8a731ed60e89177c8a7ab05fe0f1511cedd3e70e773f288f9de33a9cfdc21e" [[package]] name = "solana-perf" -version = "1.18.1" +version = "2.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbad7e94d4faf1a99b12c70c881d3f241f0e740fb595ee55d61ba0bfeee79b8f" +checksum = "2ba7e28aa36fbdd41eb83f95c4bdaf498e881e17ff76e7d8a84eaafb475355ae" dependencies = [ - "ahash 0.8.7", + "ahash", "bincode", "bv", "caps", @@ -4198,49 +4148,54 @@ dependencies = [ "rayon", "rustc_version", "serde", - "solana-frozen-abi", - "solana-frozen-abi-macro", "solana-metrics", "solana-rayon-threadlimit", "solana-sdk", "solana-vote-program", ] +[[package]] +name = "solana-poseidon" +version = "2.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c58f0ce80acf5cf19bb6bc802876d6710754c4373dd3172b6334c85ced148052" +dependencies = [ + "ark-bn254", + "light-poseidon", + "thiserror", +] + [[package]] name = "solana-program" -version = "1.18.1" +version = "2.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0ce0a1f4487b0b9e5e53610e8c17e558d17069145281aaae9f825bfef84b16e" +checksum = "1e9ae1a4ec088d868ed0ee777a9a85a3e2d44f192d7f4aa9f0f8dec16c342a92" dependencies = [ "ark-bn254", "ark-ec", "ark-ff", "ark-serialize", - "base64 0.21.7", + "base64 0.22.1", "bincode", - "bitflags 2.4.2", + "bitflags 2.6.0", "blake3", "borsh 0.10.3", - "borsh 0.9.3", - "borsh 1.3.1", - "bs58", + "borsh 1.5.1", + "bs58 0.5.1", "bv", "bytemuck", - "cc", + "bytemuck_derive", "console_error_panic_hook", "console_log", "curve25519-dalek", "getrandom 0.2.10", - "itertools", "js-sys", "lazy_static", - "libc", "libsecp256k1", - "light-poseidon", "log", "memoffset 0.9.0", - "num-bigint 0.4.4", - "num-derive 0.4.1", + "num-bigint 0.4.6", + "num-derive", "num-traits", "parking_lot", "rand 0.8.5", @@ -4249,55 +4204,51 @@ dependencies = [ "serde", "serde_bytes", "serde_derive", - "serde_json", "sha2 0.10.8", - "sha3 0.10.6", - "solana-frozen-abi", - "solana-frozen-abi-macro", + "sha3 0.10.8", "solana-sdk-macro", "thiserror", - "tiny-bip39", "wasm-bindgen", - "zeroize", ] [[package]] name = "solana-program-runtime" -version = "1.18.1" +version = "2.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b89a4eaf965a6d6ab917bcb427997e416e9cf6d23549b713d0fba6f7f861e63" +checksum = "50a8682d95f49de15b3e6e60e59754f3e36151cb5f8da7728297bc5b95976cbb" dependencies = [ - "base64 0.21.7", + "base64 0.22.1", "bincode", "eager", "enum-iterator", - "itertools", + "itertools 0.12.1", "libc", "log", - "num-derive 0.4.1", + "num-derive", "num-traits", "percentage", "rand 0.8.5", "rustc_version", "serde", - "solana-frozen-abi", - "solana-frozen-abi-macro", + "solana-compute-budget", "solana-measure", "solana-metrics", "solana-sdk", + "solana-type-overrides", + "solana-vote", "solana_rbpf", "thiserror", ] [[package]] name = "solana-program-test" -version = "1.18.1" +version = "2.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b616b7154fb779a6feae69e44f50409d745d68cd56172feaaf1462371ef48904" +checksum = "03f40f2e458a172b5876886803ee0c8d06c521de6dd637194ed4cb73a2933035" dependencies = [ "assert_matches", "async-trait", - "base64 0.21.7", + "base64 0.22.1", "bincode", "chrono-humanize", "crossbeam-channel", @@ -4308,22 +4259,24 @@ dependencies = [ "solana-banks-interface", "solana-banks-server", "solana-bpf-loader-program", + "solana-compute-budget", + "solana-inline-spl", "solana-logger", "solana-program-runtime", "solana-runtime", "solana-sdk", + "solana-svm", "solana-vote-program", "solana_rbpf", - "test-case", "thiserror", "tokio", ] [[package]] name = "solana-pubsub-client" -version = "1.18.1" +version = "2.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e84d25c9d389e243b7ebfd92ed3c7ba539fc95dbc95e09e5b9fc34aa6ef2d658" +checksum = "d7b784d5718ce45a67aa00465c515dd0e14cf0cf953b8bb658b42e8cab31ad3a" dependencies = [ "crossbeam-channel", "futures-util", @@ -4346,19 +4299,18 @@ dependencies = [ [[package]] name = "solana-quic-client" -version = "1.18.1" +version = "2.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "049cb69a18bc5023ca2adb4f20fdc9e10e97aff0a922d925a7ecb3042e67bcd1" +checksum = "1e397e7a3efe22128c35783f1ec2c306def1fe8f5f66f1f61ce7a94e2bdbb5a0" dependencies = [ "async-mutex", "async-trait", "futures", - "itertools", + "itertools 0.12.1", "lazy_static", "log", "quinn", "quinn-proto", - "rcgen", "rustls", "solana-connection-cache", "solana-measure", @@ -4373,9 +4325,9 @@ dependencies = [ [[package]] name = "solana-rayon-threadlimit" -version = "1.18.1" +version = "2.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "322615866c372ac1521b41cec073a0a5df6d492794b49418c8ed47eb74114652" +checksum = "5eb8779f9cff08b973e3b4cde6c73b993445d43f856128b673d720b9ea3998ba" dependencies = [ "lazy_static", "num_cpus", @@ -4383,14 +4335,14 @@ dependencies = [ [[package]] name = "solana-remote-wallet" -version = "1.18.1" +version = "2.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1239d53b3b544b9c5b27a65dc5d3d1fab77c124626a0aa09277e10b36badf9d3" +checksum = "80229078147b493b777804cbebe83dfcf0cd25f3a0a7d7bbe6487942a7c32bab" dependencies = [ "console", "dialoguer", "log", - "num-derive 0.4.1", + "num-derive", "num-traits", "parking_lot", "qstring", @@ -4402,17 +4354,18 @@ dependencies = [ [[package]] name = "solana-rpc-client" -version = "1.18.1" +version = "2.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b70fe092aac226e94df0289045fce6520025141d3c131e556a19119eaac26c59" +checksum = "1278725cbf0cf850043ecc8ea7ea5ce00e26c8c738c68c23eee1d47b5eff04ad" dependencies = [ "async-trait", - "base64 0.21.7", + "base64 0.22.1", "bincode", - "bs58", + "bs58 0.5.1", "indicatif", "log", "reqwest", + "reqwest-middleware", "semver", "serde", "serde_derive", @@ -4428,31 +4381,33 @@ dependencies = [ [[package]] name = "solana-rpc-client-api" -version = "1.18.1" +version = "2.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c4d480cff245c3ba367d396da87e908095160cdf57f33efb5d1b08a7763d490" +checksum = "05384a936fa8e0e77d4aee19f742950e2c057f264c9f1f5cbea5e4a251c66064" dependencies = [ - "base64 0.21.7", - "bs58", + "anyhow", + "base64 0.22.1", + "bs58 0.5.1", "jsonrpc-core", "reqwest", + "reqwest-middleware", "semver", "serde", "serde_derive", "serde_json", "solana-account-decoder", + "solana-inline-spl", "solana-sdk", "solana-transaction-status", "solana-version", - "spl-token-2022 1.0.0", "thiserror", ] [[package]] name = "solana-rpc-client-nonce-utils" -version = "1.18.1" +version = "2.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fc78ba1bb353500b23983f0f01957c6f37f54607f1275e4a7e4de1a77743cdc" +checksum = "b1460a8a59466be8c704e328402fdd638ddf0afb73e7f368acee4e923cf2620e" dependencies = [ "clap 2.34.0", "solana-clap-utils", @@ -4463,13 +4418,13 @@ dependencies = [ [[package]] name = "solana-runtime" -version = "1.18.1" +version = "2.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "407a2ee089795479a82fd19bd998e652f91f826fca14a9c7fcdc37376fe80657" +checksum = "b56c2e8e789b3123bc0c01c526c8165898dcca1f307d7d6c70dc4c10c0bffd6d" dependencies = [ "aquamarine", "arrayref", - "base64 0.21.7", + "base64 0.22.1", "bincode", "blake3", "bv", @@ -4483,19 +4438,18 @@ dependencies = [ "fnv", "im", "index_list", - "itertools", + "itertools 0.12.1", "lazy_static", + "libc", "log", - "lru", "lz4", "memmap2", "mockall", "modular-bitfield", - "num-derive 0.4.1", + "num-derive", "num-traits", "num_cpus", - "num_enum 0.7.2", - "ouroboros", + "num_enum", "percentage", "qualifier_attr", "rand 0.8.5", @@ -4509,11 +4463,11 @@ dependencies = [ "solana-address-lookup-table-program", "solana-bpf-loader-program", "solana-bucket-map", + "solana-compute-budget", "solana-compute-budget-program", "solana-config-program", "solana-cost-model", - "solana-frozen-abi", - "solana-frozen-abi-macro", + "solana-inline-spl", "solana-loader-v4-program", "solana-measure", "solana-metrics", @@ -4522,10 +4476,14 @@ dependencies = [ "solana-rayon-threadlimit", "solana-sdk", "solana-stake-program", + "solana-svm", "solana-system-program", + "solana-transaction-status", "solana-version", "solana-vote", "solana-vote-program", + "solana-zk-elgamal-proof-program", + "solana-zk-sdk", "solana-zk-token-proof-program", "solana-zk-token-sdk", "static_assertions", @@ -4540,17 +4498,16 @@ dependencies = [ [[package]] name = "solana-sdk" -version = "1.18.1" +version = "2.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90134b382769b2e7a1d87ae97d6242f1b7ce237591e06520641ad6e2df07653c" +checksum = "7092e9e22a2e8308a0f09c33f3411d2c9b51cac341468749398c8dbe5d32fb7a" dependencies = [ - "assert_matches", - "base64 0.21.7", "bincode", - "bitflags 2.4.2", - "borsh 1.3.1", - "bs58", + "bitflags 2.6.0", + "borsh 1.5.1", + "bs58 0.5.1", "bytemuck", + "bytemuck_derive", "byteorder", "chrono", "derivation-path", @@ -4558,19 +4515,17 @@ dependencies = [ "ed25519-dalek", "ed25519-dalek-bip32", "generic-array", + "getrandom 0.1.16", "hmac 0.12.1", - "itertools", + "itertools 0.12.1", "js-sys", "lazy_static", "libsecp256k1", "log", "memmap2", - "num-derive 0.4.1", - "num-traits", - "num_enum 0.7.2", + "num_enum", "pbkdf2 0.11.0", "qstring", - "qualifier_attr", "rand 0.7.3", "rand 0.8.5", "rustc_version", @@ -4581,11 +4536,8 @@ dependencies = [ "serde_json", "serde_with 2.3.3", "sha2 0.10.8", - "sha3 0.10.6", + "sha3 0.10.8", "siphasher", - "solana-frozen-abi", - "solana-frozen-abi-macro", - "solana-logger", "solana-program", "solana-sdk-macro", "thiserror", @@ -4595,11 +4547,11 @@ dependencies = [ [[package]] name = "solana-sdk-macro" -version = "1.18.1" +version = "2.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e3cdf8616a66e99343c3f99c39f311b4dc3e13977a4c96d7bbaa82dffd2fc5" +checksum = "b26de6abbe042a1e77cfbc755c8ebc96bac3c5d07a8d45f67108774369925e41" dependencies = [ - "bs58", + "bs58 0.5.1", "proc-macro2", "quote", "rustversion", @@ -4614,13 +4566,14 @@ checksum = "468aa43b7edb1f9b7b7b686d5c3aeb6630dc1708e86e31343499dd5c4d775183" [[package]] name = "solana-send-transaction-service" -version = "1.18.1" +version = "2.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad25c815e37ff91ced26dfeacad438e036d34434d3d825293f96c226e1962a03" +checksum = "7b6254258a9a517df90b2aa5213c549c52f6c11baacb5bc70fbec6295a2e8131" dependencies = [ "crossbeam-channel", "log", "solana-client", + "solana-connection-cache", "solana-measure", "solana-metrics", "solana-runtime", @@ -4630,9 +4583,9 @@ dependencies = [ [[package]] name = "solana-stake-program" -version = "1.18.1" +version = "2.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3faf8ea1ea94de12c1bad8bd44fbc8aea31e23bee84452e03143428ff937c0cd" +checksum = "f66ca14e7d5a1f0b8fd16c288a0234b0d396583301fb37e7ec8fe3bab0b19ca7" dependencies = [ "bincode", "log", @@ -4640,46 +4593,75 @@ dependencies = [ "solana-config-program", "solana-program-runtime", "solana-sdk", + "solana-type-overrides", "solana-vote-program", ] [[package]] name = "solana-streamer" -version = "1.18.1" +version = "2.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d18572dc946c176ff564c353a97c4bd8ce89774a95d98f1a9345c28e223948cd" +checksum = "912e1fe86ca58726eb2a8e392c6ee30ec99d188bbad0552603a9460973db27ea" dependencies = [ "async-channel", "bytes", "crossbeam-channel", + "dashmap", "futures-util", "histogram", - "indexmap 2.2.2", - "itertools", + "indexmap 2.6.0", + "itertools 0.12.1", "libc", "log", "nix", "pem", "percentage", - "pkcs8", "quinn", "quinn-proto", "rand 0.8.5", - "rcgen", "rustls", + "smallvec", + "solana-measure", "solana-metrics", "solana-perf", "solana-sdk", + "solana-transaction-metrics-tracker", "thiserror", "tokio", "x509-parser", ] +[[package]] +name = "solana-svm" +version = "2.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "846374db06cca609b9cb9e39c428db2da5ff9d182d21ce01d9ad0409e903529e" +dependencies = [ + "itertools 0.12.1", + "log", + "percentage", + "prost-build", + "qualifier_attr", + "rustc_version", + "serde", + "serde_derive", + "solana-bpf-loader-program", + "solana-compute-budget", + "solana-loader-v4-program", + "solana-measure", + "solana-metrics", + "solana-program-runtime", + "solana-sdk", + "solana-system-program", + "solana-type-overrides", + "solana-vote", +] + [[package]] name = "solana-system-program" -version = "1.18.1" +version = "2.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "107fae0f45ef55e8d01a844bdfab1740804e9abf1a0cafb0d7304a9cf40109a7" +checksum = "a4edee644880170f4bbcea08ed14081a1c6a51395e87607f79193ff91bb8d841" dependencies = [ "bincode", "log", @@ -4687,13 +4669,14 @@ dependencies = [ "serde_derive", "solana-program-runtime", "solana-sdk", + "solana-type-overrides", ] [[package]] name = "solana-thin-client" -version = "1.18.1" +version = "2.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "994469881eda11c8160b6ad7f42b3eb53125b91cc4328675fcfb784a79a878e4" +checksum = "04af07db7a995233ea5b71bfe05bed11c1c47595117adaeafe7f9a0ded710181" dependencies = [ "bincode", "log", @@ -4706,14 +4689,14 @@ dependencies = [ [[package]] name = "solana-tpu-client" -version = "1.18.1" +version = "2.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6bc1d8362ac84b281a880705faf5c0c4f813c4b335bac2456e89f4fee93aab7" +checksum = "eca6195b9922aa268f24af550ec15cd64fc07bf4f2014842ba1c13f4bb56b98a" dependencies = [ "async-trait", "bincode", "futures-util", - "indexmap 2.2.2", + "indexmap 2.6.0", "indicatif", "log", "rayon", @@ -4728,17 +4711,33 @@ dependencies = [ "tokio", ] +[[package]] +name = "solana-transaction-metrics-tracker" +version = "2.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0ca973b7caeb3054029a13a6a7d4f15808c7f7aee020402d6f962fb3d6589cc" +dependencies = [ + "Inflector", + "base64 0.22.1", + "bincode", + "lazy_static", + "log", + "rand 0.8.5", + "solana-perf", + "solana-sdk", +] + [[package]] name = "solana-transaction-status" -version = "1.18.1" +version = "2.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49b96a0b16e7bba624f778efd7ee532f91b0c540d453e25a02e9a43d590901bb" +checksum = "983f032cf30e9bf292d2ba324161225889ff6833dc466564f4983db1beb26cac" dependencies = [ "Inflector", - "base64 0.21.7", + "base64 0.22.1", "bincode", - "borsh 0.10.3", - "bs58", + "borsh 1.5.1", + "bs58 0.5.1", "lazy_static", "log", "serde", @@ -4746,18 +4745,30 @@ dependencies = [ "serde_json", "solana-account-decoder", "solana-sdk", - "spl-associated-token-account 2.3.0", - "spl-memo 4.0.0", - "spl-token 4.0.0", - "spl-token-2022 1.0.0", + "spl-associated-token-account 4.0.0", + "spl-memo", + "spl-token", + "spl-token-2022 4.0.0", + "spl-token-group-interface 0.3.0", + "spl-token-metadata-interface 0.4.0", "thiserror", ] +[[package]] +name = "solana-type-overrides" +version = "2.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2843050d3b1e81bb4fdb2e409978c4a3257295ef79f869a2493139eabc39eff" +dependencies = [ + "lazy_static", + "rand 0.8.5", +] + [[package]] name = "solana-udp-client" -version = "1.18.1" +version = "2.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d0bf02c785bd19e539801a0dd0ac603c6fb268237a21bdd330c3610d0140395" +checksum = "d17ed3191074bcfc361f4d14a2d728993727f6d9fa3b914c0468571f06d16bfa" dependencies = [ "async-trait", "solana-connection-cache", @@ -4770,54 +4781,46 @@ dependencies = [ [[package]] name = "solana-version" -version = "1.18.1" +version = "2.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f184e53aa8f66521fcae40cab29817ff665e86c683f40e2acde9def04e928cb" +checksum = "5f3b4f44e274fdc866ecb59d84dcd03bf9f11123d42414637b6df932318c220a" dependencies = [ "log", "rustc_version", "semver", "serde", "serde_derive", - "solana-frozen-abi", - "solana-frozen-abi-macro", "solana-sdk", ] [[package]] name = "solana-vote" -version = "1.18.1" +version = "2.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e84336f5550309be2c9b83d8a5b487403cd82b49dc5255ddef7dd1297de9d846" +checksum = "d74481c4d0b0325e7e2e8c3019984ffe08720c1403e2b3d773c3ca95138acd60" dependencies = [ - "crossbeam-channel", - "itertools", + "itertools 0.12.1", "log", "rustc_version", "serde", "serde_derive", - "solana-frozen-abi", - "solana-frozen-abi-macro", "solana-sdk", - "solana-vote-program", "thiserror", ] [[package]] name = "solana-vote-program" -version = "1.18.1" +version = "2.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f1e7878ebcdd5b3c681493e674f53bdfcee7d9a455d32e8813484c602ffd74c" +checksum = "e6aac1cb6470cc9af4b6483b463fbbaadf665358b4bcfcb4b268b6331ef9f718" dependencies = [ "bincode", "log", - "num-derive 0.4.1", + "num-derive", "num-traits", "rustc_version", "serde", "serde_derive", - "solana-frozen-abi", - "solana-frozen-abi-macro", "solana-metrics", "solana-program", "solana-program-runtime", @@ -4825,14 +4828,57 @@ dependencies = [ "thiserror", ] +[[package]] +name = "solana-zk-elgamal-proof-program" +version = "2.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18cdb9c62d95cd31588c8b0bcf3b344d7af3b8e8941df310be09bfa60039d96d" +dependencies = [ + "bytemuck", + "num-derive", + "num-traits", + "solana-program-runtime", + "solana-sdk", + "solana-zk-sdk", +] + +[[package]] +name = "solana-zk-sdk" +version = "2.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e79f29e79240fd273db888ee2049c17c139f8ab485d3567bbe0bbe7ed42846f" +dependencies = [ + "aes-gcm-siv", + "base64 0.22.1", + "bincode", + "bytemuck", + "bytemuck_derive", + "curve25519-dalek", + "itertools 0.12.1", + "lazy_static", + "merlin", + "num-derive", + "num-traits", + "rand 0.7.3", + "serde", + "serde_derive", + "serde_json", + "sha3 0.9.1", + "solana-program", + "solana-sdk", + "subtle", + "thiserror", + "zeroize", +] + [[package]] name = "solana-zk-token-proof-program" -version = "1.18.1" +version = "2.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba4506c4762f349afe6a0fe2df02613de03341da338220639afab3ab4b0e785f" +checksum = "7489984fbe203a57ab5cb7e071e3b37ae47fe9c9ce01bbe3bab9918a7ce27e11" dependencies = [ "bytemuck", - "num-derive 0.4.1", + "num-derive", "num-traits", "solana-program-runtime", "solana-sdk", @@ -4841,26 +4887,28 @@ dependencies = [ [[package]] name = "solana-zk-token-sdk" -version = "1.18.1" +version = "2.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29693ea4eac0f076b9beb54db7c11d0220b110620aeee56a32ff2a49a170ebe8" +checksum = "bc454c6b3a6018c1b0ef24fe90bf8b73af3e859148fc7fcbfbca3dc67c557cdc" dependencies = [ "aes-gcm-siv", - "base64 0.21.7", + "base64 0.22.1", "bincode", "bytemuck", + "bytemuck_derive", "byteorder", "curve25519-dalek", - "getrandom 0.1.16", - "itertools", + "itertools 0.12.1", "lazy_static", "merlin", - "num-derive 0.4.1", + "num-derive", "num-traits", "rand 0.7.3", "serde", + "serde_derive", "serde_json", "sha3 0.9.1", + "solana-curve25519", "solana-program", "solana-sdk", "subtle", @@ -4870,9 +4918,9 @@ dependencies = [ [[package]] name = "solana_rbpf" -version = "0.8.0" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d457cc2ba742c120492a64b7fa60e22c575e891f6b55039f4d736568fb112a3" +checksum = "ff08afd63f70a1ba712fb0017be41e93b017f7e874785b54bb5ec9aa8949781d" dependencies = [ "byteorder", "combine", @@ -4945,7 +4993,7 @@ name = "solders-account-decoder" version = "0.21.0" dependencies = [ "base64 0.13.1", - "bs58", + "bs58 0.4.0", "derive_more", "pyo3", "pythonize", @@ -5192,6 +5240,7 @@ dependencies = [ "solders-account", "solders-macros", "solders-rpc-response-data-boilerplate", + "solders-rpc-responses-common", "solders-traits-core", "solders-transaction-error", "solders-transaction-return-data", @@ -5295,7 +5344,7 @@ name = "solders-rpc-filter" version = "0.21.0" dependencies = [ "base64 0.13.1", - "bs58", + "bs58 0.4.0", "derive_more", "pyo3", "serde", @@ -5602,8 +5651,8 @@ dependencies = [ "solders-macros", "solders-pubkey", "solders-traits-core", - "spl-associated-token-account 1.1.3", - "spl-token 3.5.0", + "spl-associated-token-account 5.0.1", + "spl-token", ] [[package]] @@ -5692,7 +5741,7 @@ version = "0.21.0" dependencies = [ "base64 0.13.1", "bincode", - "bs58", + "bs58 0.4.0", "derive_more", "pyo3", "pythonize", @@ -5754,52 +5803,51 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" [[package]] -name = "spki" -version = "0.5.4" +name = "spl-associated-token-account" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d01ac02a6ccf3e07db148d2be087da624fea0221a16152ed01f0496a6b0a27" +checksum = "68034596cf4804880d265f834af1ff2f821ad5293e41fa0f8f59086c181fc38e" dependencies = [ - "base64ct", - "der", + "assert_matches", + "borsh 1.5.1", + "num-derive", + "num-traits", + "solana-program", + "spl-token", + "spl-token-2022 4.0.0", + "thiserror", ] [[package]] name = "spl-associated-token-account" -version = "1.1.3" +version = "5.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978dba3bcbe88d0c2c58366c254d9ea41c5f73357e72fc0bdee4d6b5fc99c8f4" +checksum = "714b53f7312c2802c62f14bc8a07916c2c872761e3d6be97e99fd432be7799ca" dependencies = [ - "assert_matches", - "borsh 0.9.3", - "num-derive 0.3.3", + "borsh 1.5.1", + "num-derive", "num-traits", "solana-program", - "spl-token 3.5.0", - "spl-token-2022 0.6.1", + "spl-associated-token-account-client", + "spl-token", + "spl-token-2022 5.0.2", "thiserror", ] [[package]] -name = "spl-associated-token-account" -version = "2.3.0" +name = "spl-associated-token-account-client" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "992d9c64c2564cc8f63a4b508bf3ebcdf2254b0429b13cd1d31adb6162432a5f" +checksum = "0c5c1e2d53941ea7ebc4be3f86302a3c6c5178baa932bbc038468429e6900d36" dependencies = [ - "assert_matches", - "borsh 0.10.3", - "num-derive 0.4.1", - "num-traits", "solana-program", - "spl-token 4.0.0", - "spl-token-2022 1.0.0", - "thiserror", ] [[package]] name = "spl-discriminator" -version = "0.1.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cce5d563b58ef1bb2cdbbfe0dfb9ffdc24903b10ae6a4df2d8f425ece375033f" +checksum = "a38ea8b6dedb7065887f12d62ed62c1743aa70749e8558f963609793f6fb12bc" dependencies = [ "bytemuck", "solana-program", @@ -5808,9 +5856,9 @@ dependencies = [ [[package]] name = "spl-discriminator-derive" -version = "0.1.1" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fadbefec4f3c678215ca72bd71862697bb06b41fd77c0088902dd3203354387b" +checksum = "d9e8418ea6269dcfb01c712f0444d2c75542c04448b480e87de59d2865edc750" dependencies = [ "quote", "spl-discriminator-syn", @@ -5819,9 +5867,9 @@ dependencies = [ [[package]] name = "spl-discriminator-syn" -version = "0.1.1" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e5f2044ca42c8938d54d1255ce599c79a1ffd86b677dfab695caa20f9ffc3f2" +checksum = "8c1f05593b7ca9eac7caca309720f2eafb96355e037e6d373b909a80fe7b69b9" dependencies = [ "proc-macro2", "quote", @@ -5832,42 +5880,48 @@ dependencies = [ [[package]] name = "spl-memo" -version = "3.0.1" +version = "5.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd0dc6f70db6bacea7ff25870b016a65ba1d1b6013536f08e4fd79a8f9005325" +checksum = "a0dba2f2bb6419523405d21c301a32c9f9568354d4742552e7972af801f4bdb3" dependencies = [ "solana-program", ] [[package]] -name = "spl-memo" -version = "4.0.0" +name = "spl-pod" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0f180b03318c3dbab3ef4e1e4d46d5211ae3c780940dd0a28695aba4b59a75a" +checksum = "c704c88fc457fa649ba3aabe195c79d885c3f26709efaddc453c8de352c90b87" dependencies = [ + "borsh 1.5.1", + "bytemuck", + "bytemuck_derive", "solana-program", + "solana-zk-token-sdk", + "spl-program-error", ] [[package]] name = "spl-pod" -version = "0.1.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2881dddfca792737c0706fa0175345ab282b1b0879c7d877bad129645737c079" +checksum = "00e38c99f09d58df06ca9a29fc0211786a4c34f4d099c1df27b1abaa206569a4" dependencies = [ - "borsh 0.10.3", + "borsh 1.5.1", "bytemuck", + "bytemuck_derive", "solana-program", - "solana-zk-token-sdk", + "solana-zk-sdk", "spl-program-error", ] [[package]] name = "spl-program-error" -version = "0.3.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "249e0318493b6bcf27ae9902600566c689b7dfba9f1bdff5893e92253374e78c" +checksum = "d7b28bed65356558133751cc32b48a7a5ddfc59ac4e941314630bbed1ac10532" dependencies = [ - "num-derive 0.4.1", + "num-derive", "num-traits", "solana-program", "spl-program-error-derive", @@ -5876,9 +5930,9 @@ dependencies = [ [[package]] name = "spl-program-error-derive" -version = "0.3.1" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab5269c8e868da17b6552ef35a51355a017bd8e0eae269c201fef830d35fa52c" +checksum = "e6d375dd76c517836353e093c2dbb490938ff72821ab568b545fd30ab3256b3e" dependencies = [ "proc-macro2", "quote", @@ -5888,143 +5942,242 @@ dependencies = [ [[package]] name = "spl-tlv-account-resolution" -version = "0.5.1" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "615d381f48ddd2bb3c57c7f7fb207591a2a05054639b18a62e785117dd7a8683" +checksum = "37a75a5f0fcc58126693ed78a17042e9dc53f07e357d6be91789f7d62aff61a4" dependencies = [ "bytemuck", "solana-program", "spl-discriminator", - "spl-pod", + "spl-pod 0.3.1", "spl-program-error", - "spl-type-length-value", + "spl-type-length-value 0.5.0", ] [[package]] -name = "spl-token" -version = "3.5.0" +name = "spl-tlv-account-resolution" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e85e168a785e82564160dcb87b2a8e04cee9bfd1f4d488c729d53d6a4bd300d" +checksum = "29ffc5c76926c1cbc8d92ac1d9341328308d15bae04a67da5a226e36d5bc395a" dependencies = [ - "arrayref", "bytemuck", - "num-derive 0.3.3", - "num-traits", - "num_enum 0.5.10", "solana-program", - "thiserror", + "spl-discriminator", + "spl-pod 0.4.0", + "spl-program-error", + "spl-type-length-value 0.6.0", ] [[package]] name = "spl-token" -version = "4.0.0" +version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08459ba1b8f7c1020b4582c4edf0f5c7511a5e099a7a97570c9698d4f2337060" +checksum = "70a0f06ac7f23dc0984931b1fe309468f14ea58e32660439c1cef19456f5d0e3" dependencies = [ "arrayref", "bytemuck", - "num-derive 0.3.3", + "num-derive", "num-traits", - "num_enum 0.6.1", + "num_enum", "solana-program", "thiserror", ] [[package]] name = "spl-token-2022" -version = "0.6.1" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0043b590232c400bad5ee9eb983ced003d15163c4c5d56b090ac6d9a57457b47" +checksum = "d9c10f3483e48679619c76598d4e4aebb955bc49b0a5cc63323afbf44135c9bf" dependencies = [ "arrayref", "bytemuck", - "num-derive 0.3.3", + "num-derive", "num-traits", - "num_enum 0.5.10", + "num_enum", "solana-program", + "solana-security-txt", "solana-zk-token-sdk", - "spl-memo 3.0.1", - "spl-token 3.5.0", + "spl-memo", + "spl-pod 0.3.1", + "spl-token", + "spl-token-group-interface 0.3.0", + "spl-token-metadata-interface 0.4.0", + "spl-transfer-hook-interface 0.7.0", + "spl-type-length-value 0.5.0", "thiserror", ] [[package]] name = "spl-token-2022" -version = "1.0.0" +version = "5.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d697fac19fd74ff472dfcc13f0b442dd71403178ce1de7b5d16f83a33561c059" +checksum = "c0b788a8c34a917b68b4ed2cdec255d03cc09ccba21545dac39c08a97fce640f" dependencies = [ "arrayref", "bytemuck", - "num-derive 0.4.1", + "num-derive", "num-traits", - "num_enum 0.7.2", + "num_enum", "solana-program", "solana-security-txt", - "solana-zk-token-sdk", - "spl-memo 4.0.0", - "spl-pod", - "spl-token 4.0.0", - "spl-token-group-interface", - "spl-token-metadata-interface", - "spl-transfer-hook-interface", - "spl-type-length-value", + "solana-zk-sdk", + "spl-memo", + "spl-pod 0.4.0", + "spl-token", + "spl-token-confidential-transfer-ciphertext-arithmetic", + "spl-token-confidential-transfer-proof-extraction", + "spl-token-confidential-transfer-proof-generation", + "spl-token-group-interface 0.4.2", + "spl-token-metadata-interface 0.5.1", + "spl-transfer-hook-interface 0.8.2", + "spl-type-length-value 0.6.0", "thiserror", ] [[package]] -name = "spl-token-group-interface" +name = "spl-token-confidential-transfer-ciphertext-arithmetic" version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b889509d49fa74a4a033ca5dae6c2307e9e918122d97e58562f5c4ffa795c75d" +checksum = "48df72fb98b4069979aa4806d4a634ad6f08cb0358e732e6fbac231c5dc075bd" +dependencies = [ + "base64 0.22.1", + "bytemuck", + "solana-curve25519", + "solana-zk-sdk", +] + +[[package]] +name = "spl-token-confidential-transfer-proof-extraction" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae2ce92a0b9673c44207b21d99526b96d557d5a25752f36c38fae37c49129c3b" +dependencies = [ + "bytemuck", + "solana-curve25519", + "solana-zk-sdk", + "thiserror", +] + +[[package]] +name = "spl-token-confidential-transfer-proof-generation" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "216517cc8cd26dfe768521542f221f91049be102d1eefd8054cde881d1b5d267" +dependencies = [ + "curve25519-dalek", + "solana-zk-sdk", + "thiserror", +] + +[[package]] +name = "spl-token-group-interface" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df8752b85a5ecc1d9f3a43bce3dd9a6a053673aacf5deb513d1cbb88d3534ffd" +dependencies = [ + "bytemuck", + "solana-program", + "spl-discriminator", + "spl-pod 0.3.1", + "spl-program-error", +] + +[[package]] +name = "spl-token-group-interface" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c54728921a6f180525c4f3a4cc3b231db8da940681c8009259faa65d84c6196" dependencies = [ "bytemuck", "solana-program", "spl-discriminator", - "spl-pod", + "spl-pod 0.4.0", "spl-program-error", ] [[package]] name = "spl-token-metadata-interface" -version = "0.2.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c16ce3ba6979645fb7627aa1e435576172dd63088dc7848cb09aa331fa1fe4f" +checksum = "c6c2318ddff97e006ed9b1291ebec0750a78547f870f62a69c56fe3b46a5d8fc" dependencies = [ - "borsh 0.10.3", + "borsh 1.5.1", "solana-program", "spl-discriminator", - "spl-pod", + "spl-pod 0.3.1", "spl-program-error", - "spl-type-length-value", + "spl-type-length-value 0.5.0", +] + +[[package]] +name = "spl-token-metadata-interface" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "27c7a6d2a2a4f23c8f051ba2f7edb5689f1b534b4126bd9b4ae4177685e9a341" +dependencies = [ + "borsh 1.5.1", + "solana-program", + "spl-discriminator", + "spl-pod 0.4.0", + "spl-program-error", + "spl-type-length-value 0.6.0", ] [[package]] name = "spl-transfer-hook-interface" -version = "0.4.1" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7aabdb7c471566f6ddcee724beb8618449ea24b399e58d464d6b5bc7db550259" +checksum = "a110f33d941275d9f868b96daaa993f1e73b6806cc8836e43075b4d3ad8338a7" dependencies = [ "arrayref", "bytemuck", "solana-program", "spl-discriminator", - "spl-pod", + "spl-pod 0.3.1", "spl-program-error", - "spl-tlv-account-resolution", - "spl-type-length-value", + "spl-tlv-account-resolution 0.7.0", + "spl-type-length-value 0.5.0", +] + +[[package]] +name = "spl-transfer-hook-interface" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b82e5ad62ad342d8fbb907b2a7aede7a5a258ce16366c26a686acc1df431fc63" +dependencies = [ + "arrayref", + "bytemuck", + "solana-program", + "spl-discriminator", + "spl-pod 0.4.0", + "spl-program-error", + "spl-tlv-account-resolution 0.8.1", + "spl-type-length-value 0.6.0", ] [[package]] name = "spl-type-length-value" -version = "0.3.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a468e6f6371f9c69aae760186ea9f1a01c2908351b06a5e0026d21cfc4d7ecac" +checksum = "bdcd73ec187bc409464c60759232e309f83b52a18a9c5610bf281c9c6432918c" dependencies = [ "bytemuck", "solana-program", "spl-discriminator", - "spl-pod", + "spl-pod 0.3.1", + "spl-program-error", +] + +[[package]] +name = "spl-type-length-value" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69c08deb8332a6c051f6e846b5e9c962695295dd97e0e151dccf3ef85dcf01b4" +dependencies = [ + "bytemuck", + "solana-program", + "spl-discriminator", + "spl-pod 0.4.0", "spl-program-error", ] @@ -6070,9 +6223,9 @@ dependencies = [ [[package]] name = "subtle" -version = "2.4.1" +version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "symlink" @@ -6155,9 +6308,9 @@ dependencies = [ [[package]] name = "tar" -version = "0.4.40" +version = "0.4.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb" +checksum = "4ff6c40d3aedb5e06b57c6f669ad17ab063dd1e63d977c6a88e7f4dfa4f04020" dependencies = [ "filetime", "libc", @@ -6205,15 +6358,23 @@ dependencies = [ "syn 1.0.107", ] +[[package]] +name = "task-local-extensions" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba323866e5d033818e3240feeb9f7db2c4296674e4d9e16b97b7bf8f490434e8" +dependencies = [ + "pin-utils", +] + [[package]] name = "tempfile" -version = "3.9.0" +version = "3.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01ce4141aa927a6d1bd34a041795abd0db1cccba5d5f24b009f694bdf3a1f3fa" +checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" dependencies = [ "cfg-if", "fastrand", - "redox_syscall 0.4.1", "rustix", "windows-sys 0.52.0", ] @@ -6233,41 +6394,6 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" -[[package]] -name = "test-case" -version = "3.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb2550dd13afcd286853192af8601920d959b14c401fcece38071d53bf0768a8" -dependencies = [ - "test-case-macros", -] - -[[package]] -name = "test-case-core" -version = "3.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54c25e2cb8f5fcd7318157634e8838aa6f7e4715c96637f969fabaccd1ef5462" -dependencies = [ - "cfg-if", - "proc-macro-error", - "proc-macro2", - "quote", - "syn 2.0.48", -] - -[[package]] -name = "test-case-macros" -version = "3.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37cfd7bbc88a0104e304229fba519bdc45501a30b760fb72240342f1289ad257" -dependencies = [ - "proc-macro-error", - "proc-macro2", - "quote", - "syn 2.0.48", - "test-case-core", -] - [[package]] name = "textwrap" version = "0.11.0" @@ -6285,18 +6411,18 @@ checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" [[package]] name = "thiserror" -version = "1.0.56" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad" +checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.56" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471" +checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3" dependencies = [ "proc-macro2", "quote", @@ -6388,7 +6514,7 @@ dependencies = [ "parking_lot", "pin-project-lite", "signal-hook-registry", - "socket2 0.5.5", + "socket2 0.5.7", "tokio-macros", "windows-sys 0.48.0", ] @@ -6432,9 +6558,9 @@ dependencies = [ [[package]] name = "tokio-stream" -version = "0.1.14" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" +checksum = "4f4e6ce100d0eb49a2734f8c0812bcd324cf357d21810932c5df6b96ef2b86f1" dependencies = [ "futures-core", "pin-project-lite", @@ -6502,16 +6628,10 @@ checksum = "b403acf6f2bb0859c93c7f0d967cb4a75a7ac552100f9322faf64dc047669b21" dependencies = [ "serde", "serde_spanned", - "toml_datetime 0.6.5", + "toml_datetime", "toml_edit 0.19.8", ] -[[package]] -name = "toml_datetime" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4553f467ac8e3d374bc9a177a26801e5d0f9b211aa1673fb137a403afd1c9cf5" - [[package]] name = "toml_datetime" version = "0.6.5" @@ -6521,17 +6641,6 @@ dependencies = [ "serde", ] -[[package]] -name = "toml_edit" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56c59d8dd7d0dcbc6428bf7aa2f0e823e26e43b3c9aca15bbc9475d23e5fa12b" -dependencies = [ - "indexmap 1.9.3", - "nom8", - "toml_datetime 0.5.1", -] - [[package]] name = "toml_edit" version = "0.19.8" @@ -6541,7 +6650,7 @@ dependencies = [ "indexmap 1.9.3", "serde", "serde_spanned", - "toml_datetime 0.6.5", + "toml_datetime", "winnow 0.4.6", ] @@ -6551,8 +6660,8 @@ version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" dependencies = [ - "indexmap 2.2.2", - "toml_datetime 0.6.5", + "indexmap 2.6.0", + "toml_datetime", "winnow 0.5.37", ] @@ -6653,6 +6762,15 @@ version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" +[[package]] +name = "unicase" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" +dependencies = [ + "version_check", +] + [[package]] name = "unicode-bidi" version = "0.3.10" @@ -6694,11 +6812,11 @@ checksum = "c7de7d73e1754487cb58364ee906a499937a0dfabd86bcb980fa99ec8c8fa2ce" [[package]] name = "universal-hash" -version = "0.4.1" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f214e8f697e925001e66ec2c6e37a4ef93f0f78c2eed7814394e10c62025b05" +checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea" dependencies = [ - "generic-array", + "crypto-common", "subtle", ] @@ -6735,9 +6853,9 @@ dependencies = [ [[package]] name = "url" -version = "2.5.0" +version = "2.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" +checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" dependencies = [ "form_urlencoded", "idna", @@ -6809,19 +6927,20 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.90" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1223296a201415c7fad14792dbefaace9bd52b62d33453ade1c5b5f07555406" +checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" dependencies = [ "cfg-if", + "once_cell", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.90" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcdc935b63408d58a32f8cc9738a0bffd8f05cc7c002086c6ef20b7312ad9dcd" +checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" dependencies = [ "bumpalo", "log", @@ -6846,9 +6965,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.90" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e4c238561b2d428924c49815533a8b9121c664599558a5d9ec51f8a1740a999" +checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -6856,9 +6975,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.90" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bae1abb6806dc1ad9e560ed242107c0f6c84335f1749dd4e8ddb012ebd5e25a7" +checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" dependencies = [ "proc-macro2", "quote", @@ -6869,9 +6988,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.90" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d91413b1c31d7539ba5ef2451af3f0b833a005eb27a631cec32bc0635a8602b" +checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" [[package]] name = "web-sys" @@ -6898,6 +7017,18 @@ version = "0.25.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc" +[[package]] +name = "which" +version = "4.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" +dependencies = [ + "either", + "home", + "once_cell", + "rustix", +] + [[package]] name = "winapi" version = "0.3.9" @@ -7190,20 +7321,13 @@ dependencies = [ [[package]] name = "xattr" -version = "1.0.1" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4686009f71ff3e5c4dbcf1a282d0a44db3f021ba69350cd42086b3e5f1c6985" +checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" dependencies = [ "libc", -] - -[[package]] -name = "yasna" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aed2e7a52e3744ab4d0c05c20aa065258e84c49fd4226f5191b2ed29712710b4" -dependencies = [ - "time", + "linux-raw-sys", + "rustix", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index fd6f2dcf..c9d2b330 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -128,11 +128,12 @@ solders-transaction-error = { path = "./crates/transaction-error", version = "=0 solders-account = { path = "./crates/account", version = "=0.21.0" } solders-hash = { path = "./crates/hash", version = "=0.21.0" } serde_with = { version = "^1.14.0", features = ["base64"] } -solana-sdk = "1.18.1" -solana-account-decoder = "1.18.1" -solana-transaction-status = "1.18.1" -solana-rpc-client-api = "1.18.1" -solana-program = "1.18.1" +solana-sdk = "2.0.11" +solana-account-decoder = "2.0.11" +solana-banks-interface = "2.0.11" +solana-transaction-status = "2.0.11" +solana-rpc-client-api = "2.0.11" +solana-program = "2.0.11" bincode = "1.3.3" base64 = "0.13.0" serde = "^1.0.188" @@ -140,8 +141,8 @@ serde_bytes = "0.11.12" serde_json = "^1.0.106" serde_cbor = "^0.11.2" derive_more = "0.99.17" -solana-program-test = "1.18.1" -solana-banks-client = "1.18.1" +solana-program-test = "2.0.11" +solana-banks-client = "2.0.11" pythonize = "0.20.0" bs58 = "0.4.0" thiserror = "^1.0.31" diff --git a/crates/banks-interface/Cargo.toml b/crates/banks-interface/Cargo.toml index bc65bb98..5c8dd8be 100644 --- a/crates/banks-interface/Cargo.toml +++ b/crates/banks-interface/Cargo.toml @@ -19,4 +19,4 @@ solders-transaction-confirmation-status = { workspace = true } solders-transaction-return-data = { workspace = true } solders-transaction-status-struct = { workspace = true } solana-banks-client = { workspace = true } -solana-banks-interface = { version = "1.16.0" } +solana-banks-interface = { workspace = true } diff --git a/crates/commitment-config/src/lib.rs b/crates/commitment-config/src/lib.rs index 2850a0c0..b633669a 100644 --- a/crates/commitment-config/src/lib.rs +++ b/crates/commitment-config/src/lib.rs @@ -58,11 +58,6 @@ impl From for CommitmentLevel { CommitmentLevelOriginal::Processed => Self::Processed, CommitmentLevelOriginal::Confirmed => Self::Confirmed, CommitmentLevelOriginal::Finalized => Self::Finalized, - CommitmentLevelOriginal::Max => Self::Finalized, - CommitmentLevelOriginal::Recent => Self::Processed, - CommitmentLevelOriginal::Root => Self::Finalized, - CommitmentLevelOriginal::Single => Self::Confirmed, - CommitmentLevelOriginal::SingleGossip => Self::Confirmed, } } } diff --git a/crates/message/src/lib.rs b/crates/message/src/lib.rs index 6bee7c6b..81ab452b 100644 --- a/crates/message/src/lib.rs +++ b/crates/message/src/lib.rs @@ -2,7 +2,7 @@ use derive_more::{From, Into}; use pyo3::{create_exception, exceptions::PyException, prelude::*, types::PyBytes}; use serde::{Deserialize, Serialize}; use solana_program::{ - address_lookup_table_account::AddressLookupTableAccount as AddressLookupTableAccountOriginal, + address_lookup_table::AddressLookupTableAccount as AddressLookupTableAccountOriginal, instruction::CompiledInstruction as CompiledInstructionOriginal, instruction::Instruction as InstructionOriginal, message::{ @@ -416,19 +416,6 @@ impl Message { self.0.program_ids().into_iter().map(Pubkey::from).collect() } - /// Check if ``key_index`` is contained in the accounts of - /// any of the message's instructions. - /// - /// Args: - /// key_index (int): The index to check. - /// - /// Returns: - /// bool: True if the key is passed to the program. - /// - pub fn is_key_passed_to_program(&self, key_index: usize) -> bool { - self.0.is_key_passed_to_program(key_index) - } - /// Check if the ``program_id_index`` of any of the message's instructions matches ``key_index``. /// /// Args: @@ -441,18 +428,6 @@ impl Message { self.0.is_key_called_as_program(key_index) } - /// Check if the key is passed to the program OR if the key is not called as program. - /// - /// Args: - /// key_index (int): The index to check. - /// - /// Returns: - /// bool: The result of the check. - /// - pub fn is_non_loader_key(&self, key_index: usize) -> bool { - self.0.is_non_loader_key(key_index) - } - /// See https://docs.rs/solana-sdk/latest/solana_sdk/message/legacy/struct.Message.html#method.program_position pub fn program_position(&self, index: usize) -> Option { self.0.program_position(index) @@ -463,11 +438,6 @@ impl Message { self.0.maybe_executable(i) } - /// See https://docs.rs/solana-sdk/latest/solana_sdk/message/legacy/struct.Message.html#method.is_writable - pub fn is_writable(&self, i: usize) -> bool { - self.0.is_writable(i) - } - /// See https://docs.rs/solana-sdk/latest/solana_sdk/message/legacy/struct.Message.html#method.is_signer pub fn is_signer(&self, i: usize) -> bool { self.0.is_signer(i) @@ -779,7 +749,7 @@ impl MessageV0 { /// Before loading addresses, we can't demote write locks for dynamically loaded /// addresses so this should not be used by the runtime. pub fn is_maybe_writable(&self, key_index: usize) -> bool { - self.0.is_maybe_writable(key_index) + self.0.is_maybe_writable(key_index, None) } /// Returns true if the account at the specified index signed this diff --git a/crates/rpc-common/Cargo.toml b/crates/rpc-common/Cargo.toml index 88ff2c55..d54bfe41 100644 --- a/crates/rpc-common/Cargo.toml +++ b/crates/rpc-common/Cargo.toml @@ -19,6 +19,7 @@ solana-transaction-status = { workspace = true } solana-rpc-client-api = { workspace = true } solders-account = { workspace = true } solders-rpc-response-data-boilerplate = { workspace = true } +solders-rpc-responses-common = { workspace = true } solders-transaction-return-data = { workspace = true } solders-transaction-error = { workspace = true } solders-transaction-status = { workspace = true } diff --git a/crates/rpc-common/src/lib.rs b/crates/rpc-common/src/lib.rs index 26a92d3e..f5ad3fd1 100644 --- a/crates/rpc-common/src/lib.rs +++ b/crates/rpc-common/src/lib.rs @@ -8,6 +8,7 @@ use solana_transaction_status::UiInnerInstructions as UiInnerInstructionsOrigina use solders_account::Account; use solders_macros::{common_methods, richcmp_eq_only}; use solders_rpc_response_data_boilerplate::response_data_boilerplate; +use solders_rpc_responses_common::RpcBlockhash; use solders_transaction_error::TransactionErrorType; use solders_transaction_return_data::TransactionReturnData; use solders_transaction_status::UiInnerInstructions; @@ -32,6 +33,7 @@ impl RpcSimulateTransactionResult { units_consumed: Option, return_data: Option, inner_instructions: Option>, + replacement_blockhash: Option ) -> Self { let accounts_underlying: Option>> = accounts.map(|accs| { accs.into_iter() @@ -47,6 +49,7 @@ impl RpcSimulateTransactionResult { units_consumed, return_data: return_data.map(Into::into), inner_instructions: inner_instructions_underlying, + replacement_blockhash: replacement_blockhash.map(Into::into), }) } diff --git a/crates/rpc-config-no-filter/src/lib.rs b/crates/rpc-config-no-filter/src/lib.rs index a6f37389..704ddf62 100644 --- a/crates/rpc-config-no-filter/src/lib.rs +++ b/crates/rpc-config-no-filter/src/lib.rs @@ -273,10 +273,12 @@ impl RpcLargestAccountsConfig { pub fn new( commitment: Option, filter: Option, + sort_results: Option, ) -> Self { Self(rpc_config::RpcLargestAccountsConfig { commitment: commitment.map(|c| c.into()), filter: filter.map(|f| f.into()), + sort_results }) } diff --git a/crates/rpc-filter/src/lib.rs b/crates/rpc-filter/src/lib.rs index b26d23a7..bd1ebb9a 100644 --- a/crates/rpc-filter/src/lib.rs +++ b/crates/rpc-filter/src/lib.rs @@ -6,11 +6,11 @@ use pyo3::{ use serde::{Deserialize, Serialize}; use solana_rpc_client_api::filter::{ Memcmp as MemcmpOriginal, MemcmpEncodedBytes as MemcmpEncodedBytesOriginal, - MemcmpEncoding as MemcmpEncodingOriginal, RpcFilterType as RpcFilterTypeOriginal, + RpcFilterType as RpcFilterTypeOriginal, }; use derive_more::{From, Into}; -use solders_macros::{common_methods, enum_original_mapping, richcmp_eq_only, EnumIntoPy}; +use solders_macros::{common_methods, richcmp_eq_only, EnumIntoPy}; use solders_traits_core::{ impl_display, py_from_bytes_general_via_bincode, pybytes_general_via_bincode, @@ -43,20 +43,11 @@ impl From for MemcmpEncodedBytes { } } -#[derive(Debug, Clone, PartialEq, Eq, Hash, Serialize, Deserialize)] -#[serde(rename_all = "camelCase")] -#[enum_original_mapping(MemcmpEncodingOriginal)] -#[pyclass(module = "solders.rpc.filter")] -pub enum MemcmpEncoding { - Binary, -} - /// Compares a provided series of bytes with program account data at a particular offset. /// /// Args: /// offset (int): Data offset to begin match. /// bytes_ (str | Sequnce[int]): Bytes, encoded with specified encoding, or default Binary -/// encoding (Optional[MemcmpEncoding]): Optional encoding specification. /// #[derive(Debug, Clone, PartialEq, Eq, Hash, Serialize, Deserialize, From, Into)] #[pyclass(module = "solders.rpc.filter", subclass)] @@ -75,28 +66,13 @@ impl Memcmp { pub fn new( offset: usize, bytes_: MemcmpEncodedBytes, - encoding: Option, ) -> Self { - Self(MemcmpOriginal { - offset, - bytes: bytes_.into(), - encoding: encoding.map(|e| e.into()), - }) + Self(MemcmpOriginal::new(offset, bytes_.into())) } #[getter] pub fn offset(&self) -> usize { - self.0.offset - } - - #[getter] - pub fn bytes_(&self, py: Python) -> PyObject { - MemcmpEncodedBytes::from(self.0.bytes.clone()).into_py(py) - } - - #[getter] - pub fn encoding(&self) -> Option { - self.0.encoding.clone().map(MemcmpEncoding::from) + self.0.offset() } } @@ -145,7 +121,6 @@ impl From for RpcFilterType { pub fn create_filter_mod(py: Python<'_>) -> PyResult<&PyModule> { let m = PyModule::new(py, "filter")?; - m.add_class::()?; m.add_class::()?; m.add_class::()?; let typing = py.import("typing")?; diff --git a/crates/rpc-program-accounts-config/src/lib.rs b/crates/rpc-program-accounts-config/src/lib.rs index 50024894..fd65abb6 100644 --- a/crates/rpc-program-accounts-config/src/lib.rs +++ b/crates/rpc-program-accounts-config/src/lib.rs @@ -30,11 +30,13 @@ impl RpcProgramAccountsConfig { account_config: RpcAccountInfoConfig, filters: Option>, with_context: Option, + sort_results: Option ) -> Self { Self(rpc_config::RpcProgramAccountsConfig { filters: filters.map(|v| v.into_iter().map(|f| f.into()).collect()), account_config: account_config.into(), with_context, + sort_results }) } diff --git a/crates/rpc-responses/src/lib.rs b/crates/rpc-responses/src/lib.rs index fff4a80f..a4257da6 100644 --- a/crates/rpc-responses/src/lib.rs +++ b/crates/rpc-responses/src/lib.rs @@ -46,7 +46,7 @@ use solana_rpc_client_api::{ RpcInflationReward as RpcInflationRewardOriginal, RpcLogsResponse as RpcLogsResponseOriginal, RpcPerfSample as RpcPerfSampleOriginal, RpcSnapshotSlotInfo as RpcSnapshotSlotInfoOriginal, - RpcStakeActivation as RpcStakeActivationOriginal, RpcSupply as RpcSupplyOriginal, + RpcSupply as RpcSupplyOriginal, RpcVote as RpcVoteOriginal, SlotInfo as SlotInfoOriginal, SlotTransactionStats as SlotTransactionStatsOriginal, SlotUpdate as SlotUpdateOriginal, StakeActivationState as StakeActivationStateOriginal, @@ -845,18 +845,38 @@ impl RpcContactInfo { version: Option, feature_set: Option, shred_version: Option, - ) -> Self { - Self(RpcContactInfoOriginal { + tvu: Option, + tpu_forwards: Option, + tpu_forwards_quic: Option, + tpu_vote: Option, + serve_repair: Option, + ) -> PyResult { + let gossip = gossip.map(|x| x.parse().unwrap()); + let tvu = tvu.map(|x| x.parse().unwrap()); + let pubsub = pubsub.map(|x| x.parse().unwrap()); + let rpc = rpc.map(|x| x.parse().unwrap()); + let tpu_quic = tpu_quic.map(|x| x.parse().unwrap()); + let tpu = tpu.map(|x| x.parse().unwrap()); + let tpu_forwards = tpu_forwards.map(|x| x.parse().unwrap()); + let tpu_forwards_quic = tpu_forwards_quic.map(|x| x.parse().unwrap()); + let tpu_vote = tpu_vote.map(|x| x.parse().unwrap()); + let serve_repair = serve_repair.map(|x| x.parse().unwrap()); + Ok(Self(RpcContactInfoOriginal { pubkey: pubkey.to_string(), - gossip: gossip.map(|x| x.parse().unwrap()), - tpu: tpu.map(|x| x.parse().unwrap()), - tpu_quic: tpu_quic.map(|x| x.parse().unwrap()), - rpc: rpc.map(|x| x.parse().unwrap()), - pubsub: pubsub.map(|x| x.parse().unwrap()), + gossip, + tpu, + tpu_quic, + rpc, + pubsub, version, feature_set, shred_version, - }) + tvu, + tpu_forwards, + tpu_forwards_quic, + tpu_vote, + serve_repair + })) } } @@ -1211,42 +1231,6 @@ pub enum StakeActivationState { Inactive, } -#[derive(Debug, PartialEq, Eq, Serialize, Deserialize, Clone, From, Into)] -#[pyclass(module = "solders.rpc.responses", subclass)] -pub struct RpcStakeActivation(RpcStakeActivationOriginal); - -response_data_boilerplate!(RpcStakeActivation); - -#[richcmp_eq_only] -#[common_methods] -#[pymethods] -impl RpcStakeActivation { - #[new] - pub fn new(state: StakeActivationState, active: u64, inactive: u64) -> Self { - RpcStakeActivationOriginal { - state: state.into(), - active, - inactive, - } - .into() - } - - #[getter] - pub fn state(&self) -> StakeActivationState { - self.0.state.clone().into() - } - #[getter] - pub fn active(&self) -> u64 { - self.0.active - } - #[getter] - pub fn inactive(&self) -> u64 { - self.0.inactive - } -} - -contextless_resp_eq!(GetStakeActivationResp, RpcStakeActivation, clone); - #[derive(Debug, PartialEq, Eq, Serialize, Deserialize, Clone, From, Into)] #[pyclass(module = "solders.rpc.responses", subclass)] pub struct RpcSupply(RpcSupplyOriginal); @@ -1847,7 +1831,6 @@ pyunion_resp!( GetSlotResp, GetSlotLeaderResp, GetSlotLeadersResp, - GetStakeActivationResp, GetSupplyResp, GetTokenAccountBalanceResp, GetTokenAccountsByDelegateResp, @@ -2060,7 +2043,6 @@ pub fn create_responses_mod(py: Python<'_>) -> PyResult<&PyModule> { GetSlotResp::type_object(py), GetSlotLeaderResp::type_object(py), GetSlotLeadersResp::type_object(py), - GetStakeActivationResp::type_object(py), GetSupplyResp::type_object(py), GetTokenAccountBalanceResp::type_object(py), GetTokenAccountsByDelegateResp::type_object(py), @@ -2188,8 +2170,6 @@ pub fn create_responses_mod(py: Python<'_>) -> PyResult<&PyModule> { m.add_class::()?; m.add_class::()?; m.add_class::()?; - m.add_class::()?; - m.add_class::()?; m.add_class::()?; m.add_class::()?; m.add_class::()?; diff --git a/crates/token/Cargo.toml b/crates/token/Cargo.toml index e19e86fd..0611e725 100644 --- a/crates/token/Cargo.toml +++ b/crates/token/Cargo.toml @@ -16,5 +16,5 @@ solana-program = { workspace = true } solders-macros = { workspace = true } solders-pubkey = { workspace = true } solders-traits-core = { workspace = true } -spl-associated-token-account = "1.1.2" -spl-token = "3.5.0" +spl-associated-token-account = "5.0.1" +spl-token = "6.0.0" diff --git a/crates/transaction-error/src/lib.rs b/crates/transaction-error/src/lib.rs index c8307146..e304fc26 100644 --- a/crates/transaction-error/src/lib.rs +++ b/crates/transaction-error/src/lib.rs @@ -500,6 +500,7 @@ pub enum TransactionErrorFieldless { ResanitizationNeeded, InvalidLoadedAccountsDataSizeLimit, UnbalancedTransaction, + ProgramCacheHitMaxLimit, } #[derive(FromPyObject, Clone, PartialEq, Eq, Serialize, Deserialize, Debug, EnumIntoPy)] @@ -606,6 +607,7 @@ impl From for TransactionErrorOriginal { Self::InvalidLoadedAccountsDataSizeLimit } TransactionErrorFieldless::UnbalancedTransaction => Self::UnbalancedTransaction, + TransactionErrorFieldless::ProgramCacheHitMaxLimit => Self::ProgramCacheHitMaxLimit, }, } } @@ -735,6 +737,9 @@ impl From for TransactionErrorType { TransactionErrorOriginal::UnbalancedTransaction => { Self::Fieldless(TransactionErrorFieldless::UnbalancedTransaction) } + TransactionErrorOriginal::ProgramCacheHitMaxLimit => { + Self::Fieldless(TransactionErrorFieldless::ProgramCacheHitMaxLimit) + } } } } diff --git a/crates/transaction-status/src/lib.rs b/crates/transaction-status/src/lib.rs index efc122e5..221d8518 100644 --- a/crates/transaction-status/src/lib.rs +++ b/crates/transaction-status/src/lib.rs @@ -1101,6 +1101,7 @@ impl UiConfirmedBlock { rewards: Option, block_time: Option, block_height: Option, + num_reward_partitions: Option, ) -> Self { UiConfirmedBlockOriginal { previous_blockhash: previous_blockhash.to_string(), @@ -1111,6 +1112,7 @@ impl UiConfirmedBlock { rewards: rewards.map(|v| v.into_iter().map(|r| r.into()).collect()), block_time, block_height, + num_reward_partitions } .into() } diff --git a/crates/transaction/src/lib.rs b/crates/transaction/src/lib.rs index 384276c9..37984dae 100644 --- a/crates/transaction/src/lib.rs +++ b/crates/transaction/src/lib.rs @@ -7,7 +7,7 @@ use solana_sdk::{ sanitize::Sanitize, signature::Signature as SignatureOriginal, transaction::{ - get_nonce_pubkey_from_instruction, uses_durable_nonce, Legacy as LegacyOriginal, + uses_durable_nonce, Legacy as LegacyOriginal, Transaction as TransactionOriginal, TransactionVersion as TransactionVersionOriginal, VersionedTransaction as VersionedTransactionOriginal, }, @@ -685,11 +685,6 @@ impl Transaction { pub fn from_bytes(data: &[u8]) -> PyResult { Self::py_from_bytes(data) } - - /// Deprecated in the Solana Rust SDK, expose here only for testing. - pub fn get_nonce_pubkey_from_instruction(&self, ix: &CompiledInstruction) -> Option { - get_nonce_pubkey_from_instruction(ix.as_ref(), self.as_ref()).map(Pubkey::from) - } } impl RichcmpEqualityOnly for Transaction {} diff --git a/python/solders/message.pyi b/python/solders/message.pyi index 691ff324..10fc8e70 100644 --- a/python/solders/message.pyi +++ b/python/solders/message.pyi @@ -73,12 +73,9 @@ class Message: def program_id(self, instruction_index: int) -> Optional[Pubkey]: ... def program_index(self, instruction_index: int) -> Optional[int]: ... def program_ids(self) -> List[Pubkey]: ... - def is_key_passed_to_program(self, key_index: int) -> bool: ... def is_key_called_as_program(self, key_index: int) -> bool: ... - def is_non_loader_key(self, key_index: int) -> bool: ... def program_position(self, index: int) -> Optional[int]: ... def maybe_executable(self, i: int) -> bool: ... - def is_writable(self, i: int) -> bool: ... def is_signer(self, i: int) -> bool: ... def signer_keys(self) -> List[Pubkey]: ... def has_duplicates(self) -> bool: ... diff --git a/python/solders/rpc/filter.pyi b/python/solders/rpc/filter.pyi index d0b1f775..62466049 100644 --- a/python/solders/rpc/filter.pyi +++ b/python/solders/rpc/filter.pyi @@ -1,25 +1,13 @@ from typing import Optional, Sequence, Union -class MemcmpEncoding: - Binary: "MemcmpEncoding" - def __int__(self) -> int: ... - def __str__(self) -> str: ... - def __repr__(self) -> str: ... - def __eq__(self, o: object) -> bool: ... - class Memcmp: def __init__( self, offset: int, bytes_: Union[str, Sequence[int], bytes], - encoding: Optional[MemcmpEncoding] = None, ): ... @property def offset(self) -> int: ... - @property - def bytes_(self) -> Union[str, Sequence[int]]: ... - @property - def encoding(self) -> Optional[MemcmpEncoding]: ... def __repr__(self) -> str: ... def __str__(self) -> str: ... def __richcmp__(self, other: "Memcmp", op: int) -> bool: ... diff --git a/python/solders/rpc/responses.pyi b/python/solders/rpc/responses.pyi index d8138360..d8a98a9d 100644 --- a/python/solders/rpc/responses.pyi +++ b/python/solders/rpc/responses.pyi @@ -313,6 +313,11 @@ class RpcContactInfo: version: Optional[str] feature_set: Optional[int] shred_version: Optional[int] + tvu: Optional[str] + tpu_forwards: Optional[str] + tpu_forwards_quic: Optional[str] + tpu_vote: Optional[str] + serve_repair: Optional[str] def __init__( self, pubkey: Pubkey, diff --git a/python/solders/transaction.pyi b/python/solders/transaction.pyi index ab2bb649..c08cb026 100644 --- a/python/solders/transaction.pyi +++ b/python/solders/transaction.pyi @@ -83,9 +83,6 @@ class Transaction: def __richcmp__(self, other: "Transaction", op: int) -> bool: ... def __repr__(self) -> str: ... def __str__(self) -> str: ... - def get_nonce_pubkey_from_instruction( - self, ix: CompiledInstruction - ) -> Optional[Pubkey]: ... def to_json(self) -> str: ... @staticmethod def from_json(raw: str) -> "Transaction": ... diff --git a/python/solders/transaction_status.pyi b/python/solders/transaction_status.pyi index 1c9cb88b..1ee39fb4 100644 --- a/python/solders/transaction_status.pyi +++ b/python/solders/transaction_status.pyi @@ -822,6 +822,7 @@ class UiConfirmedBlock: rewards: Optional[List[Reward]] block_time: Optional[int] block_height: Optional[int] + num_reward_partitions: Optional[int] def __init__( self, previous_blockhash: Hash, @@ -832,6 +833,7 @@ class UiConfirmedBlock: rewards: Optional[Sequence[Reward]] = None, block_time: Optional[int] = None, block_height: Optional[int] = None, + num_reward_partitions: Optional[int] = None, ) -> None: ... def to_json(self) -> str: ... @staticmethod diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 6d8d7cb8..797890ae 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,3 +1,3 @@ [toolchain] -channel = "1.75.0" +channel = "1.81.0" components = [ "clippy"] diff --git a/tests/test_message.py b/tests/test_message.py index 882238f7..64d8ed7d 100644 --- a/tests/test_message.py +++ b/tests/test_message.py @@ -118,44 +118,6 @@ def test_program_ids() -> None: ) assert message.program_ids() == [loader2] - -def test_is_key_passed_to_program() -> None: - key0 = Pubkey.new_unique() - key1 = Pubkey.new_unique() - loader2 = Pubkey.new_unique() - instructions = [CompiledInstruction(2, b"", bytes([0, 1]))] - message = Message.new_with_compiled_instructions( - 1, - 0, - 2, - [key0, key1, loader2], - Hash.default(), - instructions, - ) - - assert message.is_key_passed_to_program(0) - assert message.is_key_passed_to_program(1) - assert not message.is_key_passed_to_program(2) - - -def test_is_non_loader_key() -> None: - key0 = Pubkey.new_unique() - key1 = Pubkey.new_unique() - loader2 = Pubkey.new_unique() - instructions = [CompiledInstruction(2, b"", bytes([0, 1]))] - message = Message.new_with_compiled_instructions( - 1, - 0, - 2, - [key0, key1, loader2], - Hash.default(), - instructions, - ) - assert message.is_non_loader_key(0) - assert message.is_non_loader_key(1) - assert not message.is_non_loader_key(2) - - def test_message_header_len_constant() -> None: assert MessageHeader.LENGTH == 3 diff --git a/tests/test_transaction.py b/tests/test_transaction.py index 7c5d94a5..96f834fc 100644 --- a/tests/test_transaction.py +++ b/tests/test_transaction.py @@ -962,32 +962,6 @@ def test_tx_uses_nonce_wrong_first_nonce_ix_fail() -> None: tx = Transaction([from_keypair, nonce_keypair], message, Hash.default()) assert tx.uses_durable_nonce() is None - -def test_get_nonce_pub_from_ix_ok() -> None: - (_, nonce_pubkey, tx) = nonced_transfer_tx() - nonce_ix = tx.uses_durable_nonce() - assert nonce_ix is not None - assert tx.get_nonce_pubkey_from_instruction(nonce_ix) == nonce_pubkey - - -def test_get_nonce_pub_from_ix_no_accounts_fail() -> None: - (_, _, tx) = nonced_transfer_tx() - nonce_ix = tx.uses_durable_nonce() - assert nonce_ix is not None - nonce_ix = tx.uses_durable_nonce() - assert nonce_ix is not None - nonce_ix.accounts = b"" - assert tx.get_nonce_pubkey_from_instruction(nonce_ix) is None - - -def test_get_nonce_pub_from_ix_bad_acc_idx_fail() -> None: - (_, _, tx) = nonced_transfer_tx() - nonce_ix = tx.uses_durable_nonce() - assert nonce_ix is not None - nonce_ix.accounts = bytes([255, *list(nonce_ix.accounts[1:])]) - assert tx.get_nonce_pubkey_from_instruction(nonce_ix) is None - - def test_tx_keypair_pubkey_mismatch() -> None: from_keypair = Keypair() from_pubkey = from_keypair.pubkey() From 2754266ca3cac052af45c23c913e73f6472e8454 Mon Sep 17 00:00:00 2001 From: kevinheavey Date: Tue, 15 Oct 2024 00:51:34 +0400 Subject: [PATCH 02/16] rip required code out of solana-program-test and fix it after they broke the API --- Cargo.lock | 40 ++++++++++-- Cargo.toml | 3 + crates/bankrun/Cargo.toml | 3 + crates/bankrun/src/lib.rs | 124 +++++++++++++++++++++++++++++++++++++- 4 files changed, 162 insertions(+), 8 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e1145561..1d092510 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1144,6 +1144,15 @@ dependencies = [ "rusticata-macros", ] +[[package]] +name = "deranged" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +dependencies = [ + "powerfmt", +] + [[package]] name = "derivation-path" version = "0.2.0" @@ -2399,6 +2408,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.1" @@ -2692,6 +2707,12 @@ version = "1.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "767eb9f07d4a5ebcb39bbf2d452058a93c011373abf6832e24194a1c3f004794" +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + [[package]] name = "ppv-lite86" version = "0.2.17" @@ -5024,7 +5045,9 @@ dependencies = [ name = "solders-bankrun" version = "0.21.0" dependencies = [ + "chrono-humanize", "derive_more", + "log", "pyo3", "pyo3-asyncio", "solana-banks-client", @@ -5044,6 +5067,7 @@ dependencies = [ "solders-traits-core", "solders-transaction", "tarpc", + "time", "toml 0.7.3", ] @@ -6441,11 +6465,14 @@ dependencies = [ [[package]] name = "time" -version = "0.3.19" +version = "0.3.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53250a3b3fed8ff8fd988587d8925d26a83ac3845d9e03b220b37f34c2b8d6c2" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ + "deranged", "itoa", + "num-conv", + "powerfmt", "serde", "time-core", "time-macros", @@ -6453,16 +6480,17 @@ dependencies = [ [[package]] name = "time-core" -version = "0.1.0" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.7" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a460aeb8de6dcb0f381e1ee05f1cd56fcf5a5f6eb8187ff3d8f0b11078d38b7c" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" dependencies = [ + "num-conv", "time-core", ] diff --git a/Cargo.toml b/Cargo.toml index c9d2b330..44a44394 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -72,6 +72,8 @@ license = "MIT" edition = "2021" [workspace.dependencies] +chrono-humanize = "0.2.3" +log = "0.4" pyo3 = { version = "0.20.2", default-features = false } solders-macros = { path = "./crates/macros", version = "=0.21.0" } solders-traits = { path = "./crates/traits", version = "=0.21.0" } @@ -140,6 +142,7 @@ serde = "^1.0.188" serde_bytes = "0.11.12" serde_json = "^1.0.106" serde_cbor = "^0.11.2" +time = "0.3.35" derive_more = "0.99.17" solana-program-test = "2.0.11" solana-banks-client = "2.0.11" diff --git a/crates/bankrun/Cargo.toml b/crates/bankrun/Cargo.toml index 27954b6e..e94b2ce6 100644 --- a/crates/bankrun/Cargo.toml +++ b/crates/bankrun/Cargo.toml @@ -9,6 +9,8 @@ repository = { workspace = true } description = "Solders bankrun crate." [dependencies] +chrono-humanize = { workspace = true } +log = { workspace = true } pyo3 = { workspace = true, features = ["macros"] } derive_more = { workspace = true } solders-banks-interface = { workspace = true } @@ -28,5 +30,6 @@ solana-sdk = { workspace = true } solana-program-test = { workspace = true } solana-banks-client = { workspace = true } tarpc = { version = "0.29.0" } +time = { workspace = true } toml = "0.7.3" pyo3-asyncio = { version = "0.20.0", features = ["tokio-runtime"] } diff --git a/crates/bankrun/src/lib.rs b/crates/bankrun/src/lib.rs index fc37abfb..f9748f8a 100644 --- a/crates/bankrun/src/lib.rs +++ b/crates/bankrun/src/lib.rs @@ -1,11 +1,19 @@ -use std::{path::PathBuf, str::FromStr}; +use std::{ + fs::File, + io::Read, + path::{Path, PathBuf}, + str::FromStr, +}; +use chrono_humanize::{Accuracy, HumanTime, Tense}; use derive_more::{From, Into}; +use log::{info, warn}; use pyo3::{ exceptions::{PyFileNotFoundError, PyValueError}, prelude::*, }; use solana_banks_client::BanksClientError as BanksClientErrorOriginal; +use solana_program_test::find_file; use solders_account::Account; use solders_banks_interface::{ transaction_status_from_banks, BanksTransactionMeta, BanksTransactionResultWithMeta, @@ -407,6 +415,118 @@ impl BanksClient { } } +fn read_file>(path: P) -> Vec { + let path = path.as_ref(); + let mut file = File::open(path) + .unwrap_or_else(|err| panic!("Failed to open \"{}\": {}", path.display(), err)); + + let mut file_data = Vec::new(); + file.read_to_end(&mut file_data) + .unwrap_or_else(|err| panic!("Failed to read \"{}\": {}", path.display(), err)); + file_data +} + +fn default_shared_object_dirs() -> Vec { + let mut search_path = vec![]; + if let Ok(bpf_out_dir) = std::env::var("BPF_OUT_DIR") { + search_path.push(PathBuf::from(bpf_out_dir)); + } else if let Ok(bpf_out_dir) = std::env::var("SBF_OUT_DIR") { + search_path.push(PathBuf::from(bpf_out_dir)); + } + search_path.push(PathBuf::from("tests/fixtures")); + if let Ok(dir) = std::env::current_dir() { + search_path.push(dir); + } + search_path +} + +/// Ripped from solana-program-test after they rugged +/// by requiring &'static str +fn add_program_inner(inner: &mut ProgramTest, program_name: &str, program_id: Pubkey) { + let add_bpf = |this: &mut ProgramTest, program_file: PathBuf| { + let data = read_file(&program_file); + info!( + "\"{}\" SBF program from {}{}", + program_name, + program_file.display(), + std::fs::metadata(&program_file) + .map(|metadata| { + metadata + .modified() + .map(|time| { + format!( + ", modified {}", + HumanTime::from(time).to_text_en(Accuracy::Precise, Tense::Past) + ) + }) + .ok() + }) + .ok() + .flatten() + .unwrap_or_default() + ); + + this.add_account( + program_id.0, + solana_sdk::account::Account { + lamports: Rent::default().minimum_balance(data.len()).max(1), + data, + owner: solana_sdk::bpf_loader::id(), + executable: true, + rent_epoch: 0, + }, + ); + }; + + let warn_invalid_program_name = || { + let valid_program_names = default_shared_object_dirs() + .iter() + .filter_map(|dir| dir.read_dir().ok()) + .flat_map(|read_dir| { + read_dir.filter_map(|entry| { + let path = entry.ok()?.path(); + if !path.is_file() { + return None; + } + match path.extension()?.to_str()? { + "so" => Some(path.file_stem()?.to_os_string()), + _ => None, + } + }) + }) + .collect::>(); + + if valid_program_names.is_empty() { + // This should be unreachable as `test-bpf` should guarantee at least one shared + // object exists somewhere. + warn!("No SBF shared objects found."); + return; + } + + warn!( + "Possible bogus program name. Ensure the program name ({}) \ + matches one of the following recognizable program names:", + program_name, + ); + for name in valid_program_names { + warn!(" - {}", name.to_str().unwrap()); + } + }; + + let program_file = find_file(&format!("{program_name}.so")); + match program_file { + // If SBF is preferred (i.e., `test-sbf` is invoked) and a BPF shared object exists, + // use that as the program data. + Some(file) => add_bpf(inner, file), + + // Invalid: `test-sbf` invocation with no matching SBF shared object. + None => { + warn_invalid_program_name(); + panic!("Program file data not available for {program_name} ({program_id})"); + } + } +} + fn new_bankrun( programs: Vec<(&str, Pubkey)>, compute_max_units: Option, @@ -416,7 +536,7 @@ fn new_bankrun( let mut pt = ProgramTest::default(); pt.prefer_bpf(true); for prog in programs { - pt.add_program(prog.0, prog.1.into(), None); + add_program_inner(&mut pt, prog.0, prog.1); } if let Some(cmu) = compute_max_units { pt.set_compute_max_units(cmu); From 64238a62bfd360249c99ebe96953027ee46bf543 Mon Sep 17 00:00:00 2001 From: kevinheavey Date: Tue, 15 Oct 2024 00:52:06 +0400 Subject: [PATCH 03/16] fmt --- crates/rpc-common/src/lib.rs | 2 +- crates/rpc-config-no-filter/src/lib.rs | 2 +- crates/rpc-filter/src/lib.rs | 5 +---- crates/rpc-program-accounts-config/src/lib.rs | 4 ++-- crates/rpc-responses/src/lib.rs | 7 +++---- crates/transaction-status/src/lib.rs | 2 +- crates/transaction/src/lib.rs | 4 ++-- 7 files changed, 11 insertions(+), 15 deletions(-) diff --git a/crates/rpc-common/src/lib.rs b/crates/rpc-common/src/lib.rs index f5ad3fd1..b9ef9802 100644 --- a/crates/rpc-common/src/lib.rs +++ b/crates/rpc-common/src/lib.rs @@ -33,7 +33,7 @@ impl RpcSimulateTransactionResult { units_consumed: Option, return_data: Option, inner_instructions: Option>, - replacement_blockhash: Option + replacement_blockhash: Option, ) -> Self { let accounts_underlying: Option>> = accounts.map(|accs| { accs.into_iter() diff --git a/crates/rpc-config-no-filter/src/lib.rs b/crates/rpc-config-no-filter/src/lib.rs index 704ddf62..74ecfa6b 100644 --- a/crates/rpc-config-no-filter/src/lib.rs +++ b/crates/rpc-config-no-filter/src/lib.rs @@ -278,7 +278,7 @@ impl RpcLargestAccountsConfig { Self(rpc_config::RpcLargestAccountsConfig { commitment: commitment.map(|c| c.into()), filter: filter.map(|f| f.into()), - sort_results + sort_results, }) } diff --git a/crates/rpc-filter/src/lib.rs b/crates/rpc-filter/src/lib.rs index bd1ebb9a..ac03e223 100644 --- a/crates/rpc-filter/src/lib.rs +++ b/crates/rpc-filter/src/lib.rs @@ -63,10 +63,7 @@ impl_display!(Memcmp); #[pymethods] impl Memcmp { #[new] - pub fn new( - offset: usize, - bytes_: MemcmpEncodedBytes, - ) -> Self { + pub fn new(offset: usize, bytes_: MemcmpEncodedBytes) -> Self { Self(MemcmpOriginal::new(offset, bytes_.into())) } diff --git a/crates/rpc-program-accounts-config/src/lib.rs b/crates/rpc-program-accounts-config/src/lib.rs index fd65abb6..7923e014 100644 --- a/crates/rpc-program-accounts-config/src/lib.rs +++ b/crates/rpc-program-accounts-config/src/lib.rs @@ -30,13 +30,13 @@ impl RpcProgramAccountsConfig { account_config: RpcAccountInfoConfig, filters: Option>, with_context: Option, - sort_results: Option + sort_results: Option, ) -> Self { Self(rpc_config::RpcProgramAccountsConfig { filters: filters.map(|v| v.into_iter().map(|f| f.into()).collect()), account_config: account_config.into(), with_context, - sort_results + sort_results, }) } diff --git a/crates/rpc-responses/src/lib.rs b/crates/rpc-responses/src/lib.rs index a4257da6..84dbb0b8 100644 --- a/crates/rpc-responses/src/lib.rs +++ b/crates/rpc-responses/src/lib.rs @@ -45,8 +45,7 @@ use solana_rpc_client_api::{ RpcInflationRate as RpcInflationRateOriginal, RpcInflationReward as RpcInflationRewardOriginal, RpcLogsResponse as RpcLogsResponseOriginal, RpcPerfSample as RpcPerfSampleOriginal, - RpcSnapshotSlotInfo as RpcSnapshotSlotInfoOriginal, - RpcSupply as RpcSupplyOriginal, + RpcSnapshotSlotInfo as RpcSnapshotSlotInfoOriginal, RpcSupply as RpcSupplyOriginal, RpcVote as RpcVoteOriginal, SlotInfo as SlotInfoOriginal, SlotTransactionStats as SlotTransactionStatsOriginal, SlotUpdate as SlotUpdateOriginal, StakeActivationState as StakeActivationStateOriginal, @@ -398,7 +397,7 @@ impl<'de> serde::Deserialize<'de> for RPCError { Self::InternalErrorMessage(InternalErrorMessage::deserialize(value).unwrap()) } Some(num) => Self::Unrecognized(num), - type_ => return Err(D::Error::custom(format!("unsupported type {type_:?}"))) + type_ => return Err(D::Error::custom(format!("unsupported type {type_:?}"))), }, ) } @@ -875,7 +874,7 @@ impl RpcContactInfo { tpu_forwards, tpu_forwards_quic, tpu_vote, - serve_repair + serve_repair, })) } } diff --git a/crates/transaction-status/src/lib.rs b/crates/transaction-status/src/lib.rs index 221d8518..9938ab3e 100644 --- a/crates/transaction-status/src/lib.rs +++ b/crates/transaction-status/src/lib.rs @@ -1112,7 +1112,7 @@ impl UiConfirmedBlock { rewards: rewards.map(|v| v.into_iter().map(|r| r.into()).collect()), block_time, block_height, - num_reward_partitions + num_reward_partitions, } .into() } diff --git a/crates/transaction/src/lib.rs b/crates/transaction/src/lib.rs index 37984dae..765894c3 100644 --- a/crates/transaction/src/lib.rs +++ b/crates/transaction/src/lib.rs @@ -7,8 +7,8 @@ use solana_sdk::{ sanitize::Sanitize, signature::Signature as SignatureOriginal, transaction::{ - uses_durable_nonce, Legacy as LegacyOriginal, - Transaction as TransactionOriginal, TransactionVersion as TransactionVersionOriginal, + uses_durable_nonce, Legacy as LegacyOriginal, Transaction as TransactionOriginal, + TransactionVersion as TransactionVersionOriginal, VersionedTransaction as VersionedTransactionOriginal, }, }; From 5d4c38c794e14780fad98f995d2b2b2e34d5de8a Mon Sep 17 00:00:00 2001 From: kevinheavey Date: Tue, 15 Oct 2024 00:53:40 +0400 Subject: [PATCH 04/16] add changelog entry --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ea99bfbc..896171a7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ ## [0.21.1] - Unreleased +### Changed + +- Upgrade Solana deps to 2.0 [(#116)](https://github.com/kevinheavey/solders/pull/116). + ### Fixed - Avoid panic in `Keypair.from_base58_string` [(#93)](https://github.com/kevinheavey/solders/pull/93). From 6559e048f2c9873f19d74545976e12027b0379b4 Mon Sep 17 00:00:00 2001 From: kevinheavey Date: Tue, 15 Oct 2024 01:06:14 +0400 Subject: [PATCH 05/16] set version of upcoming release to 0.22 --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 896171a7..dc0c3d80 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Changelog -## [0.21.1] - Unreleased +## [0.22.0] - Unreleased ### Changed From 38e48339ed4d2f85353fcd5120ff9ac1f8b3dbac Mon Sep 17 00:00:00 2001 From: kevinheavey Date: Tue, 15 Oct 2024 01:17:18 +0400 Subject: [PATCH 06/16] add missing stesp to install protobuf compiler --- .github/workflows/build.yml | 8 ++++++++ .github/workflows/lint.yml | 3 +++ 2 files changed, 11 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index df008e54..8005161a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -28,6 +28,8 @@ jobs: toolchain: nightly profile: minimal default: true + - name: Install protobuf compiler + run: brew install protobuf-compiler - name: Build wheels uses: messense/maturin-action@v1 with: @@ -54,6 +56,8 @@ jobs: toolchain: nightly profile: minimal default: true + - name: Install protobuf compiler + run: brew install protobuf-compiler - name: Build wheels uses: messense/maturin-action@v1 with: @@ -119,6 +123,8 @@ jobs: toolchain: nightly profile: minimal default: true + - name: Install protobuf compiler + run: sudo apt-get install protobuf-compiler - name: Build Wheels uses: messense/maturin-action@v1 with: @@ -179,6 +185,8 @@ jobs: toolchain: nightly profile: minimal default: true + - name: Install protobuf compiler + run: sudo apt-get install protobuf-compiler - name: Build wheels uses: messense/maturin-action@v1 with: diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 76edf1aa..c657f4a6 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -14,6 +14,9 @@ jobs: with: rust-version: nightly components: clippy + + - name: Install protobuf compiler + run: sudo apt-get install protobuf-compiler - name: Set up Python uses: actions/setup-python@v1 From 6e27fbd5fb0a6836e2611fd7f065640eb4dc2f1b Mon Sep 17 00:00:00 2001 From: kevinheavey Date: Tue, 15 Oct 2024 01:27:23 +0400 Subject: [PATCH 07/16] Remove GetStakeActivationResp (no longer exists) --- CHANGELOG.md | 1 + crates/rpc-responses/src/lib.rs | 13 --------- docs/tutorials/rpc.rst | 12 ++++---- python/solders/rpc/responses.pyi | 47 -------------------------------- tests/test_rpc_responses.py | 17 ------------ 5 files changed, 6 insertions(+), 84 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dc0c3d80..1064c7ef 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ ### Changed - Upgrade Solana deps to 2.0 [(#116)](https://github.com/kevinheavey/solders/pull/116). +- Remove GetStakeActivationResp (no longer exists) [(#116)](https://github.com/kevinheavey/solders/pull/116). ### Fixed diff --git a/crates/rpc-responses/src/lib.rs b/crates/rpc-responses/src/lib.rs index 84dbb0b8..f808a225 100644 --- a/crates/rpc-responses/src/lib.rs +++ b/crates/rpc-responses/src/lib.rs @@ -48,7 +48,6 @@ use solana_rpc_client_api::{ RpcSnapshotSlotInfo as RpcSnapshotSlotInfoOriginal, RpcSupply as RpcSupplyOriginal, RpcVote as RpcVoteOriginal, SlotInfo as SlotInfoOriginal, SlotTransactionStats as SlotTransactionStatsOriginal, SlotUpdate as SlotUpdateOriginal, - StakeActivationState as StakeActivationStateOriginal, }, }; use solana_sdk::clock::{Epoch, Slot, UnixTimestamp}; @@ -1219,17 +1218,6 @@ contextless_resp_eq!( "Vec" ); -#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq)] -#[serde(rename_all = "camelCase")] -#[pyclass(module = "solders.rpc.responses")] -#[enum_original_mapping(StakeActivationStateOriginal)] -pub enum StakeActivationState { - Activating, - Active, - Deactivating, - Inactive, -} - #[derive(Debug, PartialEq, Eq, Serialize, Deserialize, Clone, From, Into)] #[pyclass(module = "solders.rpc.responses", subclass)] pub struct RpcSupply(RpcSupplyOriginal); @@ -2168,7 +2156,6 @@ pub fn create_responses_mod(py: Python<'_>) -> PyResult<&PyModule> { m.add_class::()?; m.add_class::()?; m.add_class::()?; - m.add_class::()?; m.add_class::()?; m.add_class::()?; m.add_class::()?; diff --git a/docs/tutorials/rpc.rst b/docs/tutorials/rpc.rst index c18d3c78..3f844db2 100644 --- a/docs/tutorials/rpc.rst +++ b/docs/tutorials/rpc.rst @@ -41,17 +41,15 @@ The ``rpc.repsonses`` module parses JSON RPC responses into strongly-typed objec .. testcode:: - from solders.rpc.responses import GetStakeActivationResp, RpcStakeActivation, StakeActivationState + from solders.rpc.responses import GetIdentityResp, RpcIdentity raw = """{ "jsonrpc": "2.0", - "result": { "active": 197717120, "inactive": 0, "state": "active" }, + "result": { "identity": "2r1F4iWqVcb8M1DbAjQuFpebkQHY9hcVU4WuW2DJBppN" }, "id": 1 }""" - parsed = GetStakeActivationResp.from_json(raw) - assert isinstance(parsed, GetStakeActivationResp) - assert parsed.value == RpcStakeActivation( - state=StakeActivationState.Active, active=197717120, inactive=0 - ) + parsed = GetIdentityResp.from_json(raw) + assert isinstance(parsed, GetIdentityResp) + assert str(parsed.value.identity) == "2r1F4iWqVcb8M1DbAjQuFpebkQHY9hcVU4WuW2DJBppN" ----------------------------- Parsing an RPC batch repsonse diff --git a/python/solders/rpc/responses.pyi b/python/solders/rpc/responses.pyi index d8a98a9d..5e764564 100644 --- a/python/solders/rpc/responses.pyi +++ b/python/solders/rpc/responses.pyi @@ -1130,52 +1130,6 @@ class GetSlotLeadersResp: def __bytes__(self) -> bytes: ... def __hash__(self) -> int: ... -class StakeActivationState: - Activating: "StakeActivationState" - Active: "StakeActivationState" - Deactivating: "StakeActivationState" - Inactive: "StakeActivationState" - def __int__(self) -> int: ... - def __str__(self) -> str: ... - def __repr__(self) -> str: ... - def __eq__(self, o: object) -> bool: ... - -class RpcStakeActivation: - def __init__( - self, state: StakeActivationState, active: int, inactive: int - ) -> None: ... - @property - def state(self) -> StakeActivationState: ... - @property - def active(self) -> int: ... - @property - def inactive(self) -> int: ... - def to_json(self) -> str: ... - @staticmethod - def from_json(raw: str) -> RpcStakeActivation: ... - @staticmethod - def from_bytes(data: bytes) -> RpcStakeActivation: ... - def __str__(self) -> str: ... - def __repr__(self) -> str: ... - def __eq__(self, o: object) -> bool: ... - def __bytes__(self) -> bytes: ... - def __hash__(self) -> int: ... - -class GetStakeActivationResp: - def __init__(self, value: RpcStakeActivation) -> None: ... - @property - def value(self) -> RpcStakeActivation: ... - def to_json(self) -> str: ... - @staticmethod - def from_json(raw: str) -> Resp[GetStakeActivationResp]: ... - @staticmethod - def from_bytes(data: bytes) -> GetStakeActivationResp: ... - def __str__(self) -> str: ... - def __repr__(self) -> str: ... - def __eq__(self, o: object) -> bool: ... - def __bytes__(self) -> bytes: ... - def __hash__(self) -> int: ... - class RpcSupply: def __init__( self, @@ -2262,7 +2216,6 @@ RPCResult = Union[ GetSlotResp, GetSlotLeaderResp, GetSlotLeadersResp, - GetStakeActivationResp, GetSupplyResp, GetTokenAccountBalanceResp, GetTokenAccountsByDelegateResp, diff --git a/tests/test_rpc_responses.py b/tests/test_rpc_responses.py index 00f7b6b7..bb0ea2e6 100644 --- a/tests/test_rpc_responses.py +++ b/tests/test_rpc_responses.py @@ -69,7 +69,6 @@ GetSlotLeaderResp, GetSlotLeadersResp, GetSlotResp, - GetStakeActivationResp, GetSupplyResp, GetTokenAccountBalanceResp, GetTokenAccountsByDelegateJsonParsedResp, @@ -110,7 +109,6 @@ RpcSignatureResponse, RpcSimulateTransactionResult, RpcSnapshotSlotInfo, - RpcStakeActivation, RpcSupply, RpcTokenAccountBalance, RpcVersionInfo, @@ -125,7 +123,6 @@ SlotNotification, SlotUpdateNotification, SlotUpdateOptimisticConfirmation, - StakeActivationState, SubscriptionError, SubscriptionResult, ValidatorExitResp, @@ -1526,20 +1523,6 @@ def test_get_slot_leaders() -> None: ) ] - -def test_get_stake_activation() -> None: - raw = """{ - "jsonrpc": "2.0", - "result": { "active": 197717120, "inactive": 0, "state": "active" }, - "id": 1 -}""" - parsed = GetStakeActivationResp.from_json(raw) - assert isinstance(parsed, GetStakeActivationResp) - assert parsed.value == RpcStakeActivation( - state=StakeActivationState.Active, active=197717120, inactive=0 - ) - - def test_get_supply() -> None: raw = """{ "jsonrpc": "2.0", From a334b65260ae5bf556360676a5bee9972f858311 Mon Sep 17 00:00:00 2001 From: kevinheavey Date: Tue, 15 Oct 2024 01:29:58 +0400 Subject: [PATCH 08/16] fix mac protobuf install command --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8005161a..5071923e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -29,7 +29,7 @@ jobs: profile: minimal default: true - name: Install protobuf compiler - run: brew install protobuf-compiler + run: brew install protobuf - name: Build wheels uses: messense/maturin-action@v1 with: @@ -57,7 +57,7 @@ jobs: profile: minimal default: true - name: Install protobuf compiler - run: brew install protobuf-compiler + run: brew install protobuf - name: Build wheels uses: messense/maturin-action@v1 with: From a83f595657c82d97faacd41b8941359480d7011b Mon Sep 17 00:00:00 2001 From: kevinheavey Date: Tue, 15 Oct 2024 01:34:54 +0400 Subject: [PATCH 09/16] unused import --- crates/rpc-responses/src/lib.rs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/crates/rpc-responses/src/lib.rs b/crates/rpc-responses/src/lib.rs index f808a225..b7c40453 100644 --- a/crates/rpc-responses/src/lib.rs +++ b/crates/rpc-responses/src/lib.rs @@ -56,9 +56,7 @@ use solders_account::{Account, AccountJSON}; use solders_account_decoder::UiTokenAmount; use solders_epoch_info::EpochInfo; use solders_hash::Hash as SolderHash; -use solders_macros::{ - common_methods, common_methods_rpc_resp, enum_original_mapping, richcmp_eq_only, EnumIntoPy, -}; +use solders_macros::{common_methods, common_methods_rpc_resp, richcmp_eq_only, EnumIntoPy}; use solders_primitives::epoch_schedule::EpochSchedule; use solders_pubkey::Pubkey; use solders_signature::Signature; From eb36ae007481bfe37565fd0b39b1afd762fbb7f6 Mon Sep 17 00:00:00 2001 From: kevinheavey Date: Tue, 15 Oct 2024 01:38:59 +0400 Subject: [PATCH 10/16] unused import --- python/solders/rpc/filter.pyi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/solders/rpc/filter.pyi b/python/solders/rpc/filter.pyi index 62466049..285146c3 100644 --- a/python/solders/rpc/filter.pyi +++ b/python/solders/rpc/filter.pyi @@ -1,4 +1,4 @@ -from typing import Optional, Sequence, Union +from typing import Sequence, Union class Memcmp: def __init__( From 974b134a9a6e9c6028b00293dd20839d03f77a53 Mon Sep 17 00:00:00 2001 From: kevinheavey Date: Tue, 15 Oct 2024 01:44:08 +0400 Subject: [PATCH 11/16] remove references to message.is_writable() --- python/solders/instruction.pyi | 2 -- tests/test_message.py | 25 ------------------------- 2 files changed, 27 deletions(-) diff --git a/python/solders/instruction.pyi b/python/solders/instruction.pyi index 9cd4cc18..4338b674 100644 --- a/python/solders/instruction.pyi +++ b/python/solders/instruction.pyi @@ -8,8 +8,6 @@ class AccountMeta: def pubkey(self) -> Pubkey: ... @property def is_signer(self) -> bool: ... - @property - def is_writable(self) -> bool: ... def __repr__(self) -> str: ... def __str__(self) -> str: ... def __hash__(self) -> int: ... diff --git a/tests/test_message.py b/tests/test_message.py index 64d8ed7d..09e1eb07 100644 --- a/tests/test_message.py +++ b/tests/test_message.py @@ -78,31 +78,6 @@ def test_program_position() -> None: assert message.program_position(1) == 0 assert message.program_position(2) == 1 - -def test_is_writable() -> None: - key0 = Pubkey.new_unique() - key1 = Pubkey.new_unique() - key2 = Pubkey.new_unique() - key3 = Pubkey.new_unique() - key4 = Pubkey.new_unique() - key5 = Pubkey.new_unique() - - message = Message.new_with_compiled_instructions( - num_required_signatures=3, - num_readonly_signed_accounts=2, - num_readonly_unsigned_accounts=1, - account_keys=[key0, key1, key2, key3, key4, key5], - recent_blockhash=Hash.default(), - instructions=[], - ) - assert message.is_writable(0) - assert not message.is_writable(1) - assert not message.is_writable(2) - assert message.is_writable(3) - assert message.is_writable(4) - assert not message.is_writable(5) - - def test_program_ids() -> None: key0 = Pubkey.new_unique() key1 = Pubkey.new_unique() From 5389b94527795d3a0585935f23cebd3636bf5881 Mon Sep 17 00:00:00 2001 From: kevinheavey Date: Tue, 15 Oct 2024 01:58:08 +0400 Subject: [PATCH 12/16] undo mistaken deletion --- python/solders/instruction.pyi | 2 ++ 1 file changed, 2 insertions(+) diff --git a/python/solders/instruction.pyi b/python/solders/instruction.pyi index 4338b674..9cd4cc18 100644 --- a/python/solders/instruction.pyi +++ b/python/solders/instruction.pyi @@ -8,6 +8,8 @@ class AccountMeta: def pubkey(self) -> Pubkey: ... @property def is_signer(self) -> bool: ... + @property + def is_writable(self) -> bool: ... def __repr__(self) -> str: ... def __str__(self) -> str: ... def __hash__(self) -> int: ... From 08057f98c6a4b67c40130a7856e3039315bcab30 Mon Sep 17 00:00:00 2001 From: kevinheavey Date: Tue, 15 Oct 2024 02:38:16 +0400 Subject: [PATCH 13/16] remove protobuf junk --- .github/workflows/lint.yml | 3 - Cargo.lock | 2178 ++++++++++++++++++------------------ Cargo.toml | 4 + 3 files changed, 1090 insertions(+), 1095 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index c657f4a6..76edf1aa 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -14,9 +14,6 @@ jobs: with: rust-version: nightly components: clippy - - - name: Install protobuf compiler - run: sudo apt-get install protobuf-compiler - name: Set up Python uses: actions/setup-python@v1 diff --git a/Cargo.lock b/Cargo.lock index 1d092510..48dd24a5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -14,19 +14,13 @@ dependencies = [ [[package]] name = "addr2line" -version = "0.21.0" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1" dependencies = [ "gimli", ] -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - [[package]] name = "adler2" version = "2.0.0" @@ -76,7 +70,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ "cfg-if", - "getrandom 0.2.10", + "getrandom 0.2.15", "once_cell", "version_check", "zerocopy", @@ -84,9 +78,9 @@ dependencies = [ [[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", ] @@ -147,7 +141,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] @@ -205,7 +199,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3ed4aa4fe255d0bc6d79373f7e31d2ea147bcf486cba1be5ba7ea85abdb92348" dependencies = [ "quote", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] @@ -218,7 +212,7 @@ dependencies = [ "num-traits", "proc-macro2", "quote", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] @@ -254,7 +248,7 @@ checksum = "ae3281bc6d0fd7e549af32b52511e1302185bd688fd3359fa36423346ff682ea" dependencies = [ "proc-macro2", "quote", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] @@ -275,9 +269,9 @@ checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb" [[package]] name = "arrayvec" -version = "0.7.4" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" +checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" [[package]] name = "ascii" @@ -287,9 +281,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", @@ -309,7 +303,7 @@ checksum = "726535892e8eae7e70657b4c8ea93d26b8553afb1ce617caee529ef96d7dee6c" dependencies = [ "proc-macro2", "quote", - "syn 1.0.107", + "syn 1.0.109", "synstructure", ] @@ -321,7 +315,7 @@ checksum = "2777730b2039ac0f95f093556e61b6d26cebed5393ca6f152717777cec3a42ed" dependencies = [ "proc-macro2", "quote", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] @@ -343,9 +337,9 @@ dependencies = [ [[package]] name = "async-compression" -version = "0.4.3" +version = "0.4.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb42b2197bf15ccb092b62c74515dbd8b86d0effd934795f6687c93b6e679a2c" +checksum = "e26a9844c659a2a293d239c7910b752f8487fe122c6c8bd1659bf85a6507c302" dependencies = [ "brotli", "flate2", @@ -372,7 +366,7 @@ checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.79", ] [[package]] @@ -388,23 +382,23 @@ dependencies = [ [[package]] name = "autocfg" -version = "1.1.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "backtrace" -version = "0.3.69" +version = "0.3.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a" dependencies = [ "addr2line", - "cc", "cfg-if", "libc", - "miniz_oxide 0.7.1", + "miniz_oxide", "object", "rustc-demangle", + "windows-targets 0.52.6", ] [[package]] @@ -505,11 +499,11 @@ checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae" [[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", ] @@ -525,15 +519,15 @@ 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", "proc-macro-crate 0.1.5", "proc-macro2", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] @@ -543,40 +537,40 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3ef8005764f53cd4dca619f5bf64cafd4664dada50ece25e4d81de54c80cc0b" dependencies = [ "once_cell", - "proc-macro-crate 3.1.0", + "proc-macro-crate 3.2.0", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.79", "syn_derive", ] [[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", - "syn 1.0.107", + "syn 1.0.109", ] [[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", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] name = "brotli" -version = "3.3.4" +version = "7.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1a0b1dbcc8ae29329621f8d4f0d835787c1c38bb1401979b49d13b0b305ff68" +checksum = "cc97b8f16f944bba54f0433f07e30be199b6dc2bd25937444bbad560bcea29bd" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -585,9 +579,9 @@ dependencies = [ [[package]] name = "brotli-decompressor" -version = "2.3.4" +version = "4.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b6561fd3f895a11e8f72af2cb7d22e08366bebc2b6b57f7744c4bda27034744" +checksum = "9a45bd2e4095a8b518033b128020dd4a55aab1c0a381ba4404a472630f4bc362" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -610,9 +604,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.12.0" +version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "bv" @@ -626,22 +620,22 @@ dependencies = [ [[package]] name = "bytemuck" -version = "1.18.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94bbb0ad554ad961ddc5da507a12a29b14e4ae5bda06b19f575a3e6079d2e2ae" +checksum = "8334215b81e418a0a7bdb8ef0849474f40bb10c8b71f1c4ed315cff49f32494d" dependencies = [ "bytemuck_derive", ] [[package]] name = "bytemuck_derive" -version = "1.7.1" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0cc8b54b395f2fcfbb3d90c47b01c7f444d94d05bdeb775811dec868ac3bbc26" +checksum = "bcfcc3cd946cb52f0bbfdbbcfa2f4e24f75ebb6c0e1002f7c25904fada18b9ec" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.79", ] [[package]] @@ -695,9 +689,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.1.24" +version = "1.1.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "812acba72f0a070b003d3697490d2b55b837230ae7c6c6497f05cc2ddbb8d938" +checksum = "b16803a61b81d9eabb7eae2588776c4c1e584b738ede45fdbb4c972cec1e9945" dependencies = [ "jobserver", "libc", @@ -734,7 +728,7 @@ dependencies = [ "num-traits", "serde", "wasm-bindgen", - "windows-targets 0.52.0", + "windows-targets 0.52.6", ] [[package]] @@ -773,9 +767,9 @@ dependencies = [ [[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", @@ -784,7 +778,7 @@ dependencies = [ "once_cell", "strsim 0.10.0", "termcolor", - "textwrap 0.16.0", + "textwrap 0.16.1", ] [[package]] @@ -796,16 +790,6 @@ dependencies = [ "os_str_bytes", ] -[[package]] -name = "codespan-reporting" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" -dependencies = [ - "termcolor", - "unicode-width", -] - [[package]] name = "combine" version = "3.8.1" @@ -821,9 +805,9 @@ dependencies = [ [[package]] name = "concurrent-queue" -version = "2.2.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62ec6771ecfa0762d24683ee5a32ad78487a3d3afdc0fb8cae19d2c5deb50b7c" +checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" dependencies = [ "crossbeam-utils", ] @@ -863,9 +847,9 @@ dependencies = [ [[package]] name = "constant_time_eq" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" +checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6" [[package]] name = "convert_case" @@ -875,9 +859,9 @@ checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" [[package]] name = "core-foundation" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" dependencies = [ "core-foundation-sys", "libc", @@ -885,24 +869,24 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.3" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] name = "cpufeatures" -version = "0.2.5" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320" +checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0" dependencies = [ "libc", ] [[package]] name = "crc32fast" -version = "1.3.2" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" dependencies = [ "cfg-if", ] @@ -918,33 +902,28 @@ dependencies = [ [[package]] name = "crossbeam-deque" -version = "0.8.2" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "715e8152b692bba2d374b53d4875445368fdf21a94751410af607a5ac677d1fc" +checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" dependencies = [ - "cfg-if", "crossbeam-epoch", "crossbeam-utils", ] [[package]] name = "crossbeam-epoch" -version = "0.9.13" +version = "0.9.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01a9af1f4c2ef74bb8aa1f7e19706bc72d03598c8a570bb5de72243c7a9d9d5a" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" dependencies = [ - "autocfg", - "cfg-if", "crossbeam-utils", - "memoffset 0.7.1", - "scopeguard", ] [[package]] name = "crossbeam-utils" -version = "0.8.19" +version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" [[package]] name = "crunchy" @@ -996,50 +975,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "cxx" -version = "1.0.91" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86d3488e7665a7a483b57e25bdd90d0aeb2bc7608c8d0346acf2ad3f1caf1d62" -dependencies = [ - "cc", - "cxxbridge-flags", - "cxxbridge-macro", - "link-cplusplus", -] - -[[package]] -name = "cxx-build" -version = "1.0.91" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48fcaf066a053a41a81dfb14d57d99738b767febb8b735c3016e469fac5da690" -dependencies = [ - "cc", - "codespan-reporting", - "once_cell", - "proc-macro2", - "quote", - "scratch", - "syn 1.0.107", -] - -[[package]] -name = "cxxbridge-flags" -version = "1.0.91" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2ef98b8b717a829ca5603af80e1f9e2e48013ab227b68ef37872ef84ee479bf" - -[[package]] -name = "cxxbridge-macro" -version = "1.0.91" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "086c685979a698443656e5cf7856c95c642295a38599f12fb1ff76fb28d19892" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.107", -] - [[package]] name = "darling" version = "0.13.4" @@ -1052,12 +987,12 @@ dependencies = [ [[package]] name = "darling" -version = "0.20.1" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0558d22a7b463ed0241e993f76f09f30b126687447751a8638587b864e4b3944" +checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" dependencies = [ - "darling_core 0.20.1", - "darling_macro 0.20.1", + "darling_core 0.20.10", + "darling_macro 0.20.10", ] [[package]] @@ -1071,21 +1006,21 @@ dependencies = [ "proc-macro2", "quote", "strsim 0.10.0", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] name = "darling_core" -version = "0.20.1" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab8bfa2e259f8ee1ce5e97824a3c55ec4404a0d772ca7fa96bf19f0752a046eb" +checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", - "strsim 0.10.0", - "syn 2.0.48", + "strsim 0.11.1", + "syn 2.0.79", ] [[package]] @@ -1096,18 +1031,18 @@ checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835" dependencies = [ "darling_core 0.13.4", "quote", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] name = "darling_macro" -version = "0.20.1" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29a358ff9f12ec09c3e61fef9b5a9902623a695a46a917b07f269bff1445611a" +checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ - "darling_core 0.20.1", + "darling_core 0.20.10", "quote", - "syn 2.0.48", + "syn 2.0.79", ] [[package]] @@ -1117,7 +1052,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ "cfg-if", - "hashbrown 0.14.1", + "hashbrown 0.14.5", "lock_api", "once_cell", "parking_lot_core", @@ -1126,15 +1061,15 @@ dependencies = [ [[package]] name = "data-encoding" -version = "2.3.3" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23d8666cb01533c39dde32bcbab8e227b4ed6679b2c925eba05feabea39508fb" +checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2" [[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", @@ -1167,20 +1102,20 @@ checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" dependencies = [ "proc-macro2", "quote", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] name = "derive_more" -version = "0.99.17" +version = "0.99.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" +checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce" dependencies = [ "convert_case", "proc-macro2", "quote", "rustc_version", - "syn 1.0.107", + "syn 2.0.79", ] [[package]] @@ -1197,13 +1132,13 @@ dependencies = [ [[package]] name = "dict_derive" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b46bc7c421493b2f684e78cee446c4537ad816ee452e7b0f2edb36ef4f29d5d6" +checksum = "846a520b3b7937dcfe564d9674d2d26da9e3cd0f8f1bbef51ca42fd6b7bb4f4a" dependencies = [ "proc-macro2", "quote", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] @@ -1243,13 +1178,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.107", + "syn 2.0.79", ] [[package]] @@ -1272,7 +1207,7 @@ checksum = "a6cbae11b3de8fce2a456e8ea3dada226b35fe791f0dc1d360c0941f0bb681f3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.79", ] [[package]] @@ -1324,21 +1259,21 @@ dependencies = [ [[package]] name = "educe" -version = "0.4.20" +version = "0.4.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb0188e3c3ba8df5753894d54461f0e39bc91741dc5b22e1c46999ec2c71f4e4" +checksum = "0f0042ff8246a363dbe77d2ceedb073339e85a804b9a47636c6e016a9a32c05f" dependencies = [ "enum-ordinalize", "proc-macro2", "quote", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] name = "either" -version = "1.9.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "encode_unicode" @@ -1348,9 +1283,9 @@ checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" [[package]] name = "encoding_rs" -version = "0.8.32" +version = "0.8.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394" +checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" dependencies = [ "cfg-if", ] @@ -1366,27 +1301,26 @@ 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", - "syn 2.0.48", + "syn 2.0.79", ] [[package]] name = "enum-ordinalize" -version = "3.1.12" +version = "3.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a62bb1df8b45ecb7ffa78dca1c17a438fb193eb083db0b1b494d2a61bcb5096a" +checksum = "1bf1fa3f06bbff1ea5b1a9c7b14aa992a39657db60a2759457328d7e058f49ee" dependencies = [ "num-bigint 0.4.6", "num-traits", "proc-macro2", "quote", - "rustc_version", - "syn 1.0.107", + "syn 2.0.79", ] [[package]] @@ -1410,9 +1344,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" dependencies = [ "libc", "windows-sys 0.52.0", @@ -1438,22 +1372,16 @@ checksum = "835a3dc7d1ec9e75e2b5fb4ba75396837112d2060b03f7d43bc1897c7f7211da" [[package]] name = "filetime" -version = "0.2.20" +version = "0.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a3de6e8d11b22ff9edc6d916f890800597d60f8b2da1caf2955c274638d6412" +checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.2.16", - "windows-sys 0.45.0", + "libredox", + "windows-sys 0.59.0", ] -[[package]] -name = "fixedbitset" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" - [[package]] name = "flate2" version = "1.0.34" @@ -1461,7 +1389,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1b589b4dc103969ad3cf85c950899926ec64300a1a46d76c03a6072957036f0" dependencies = [ "crc32fast", - "miniz_oxide 0.8.0", + "miniz_oxide", ] [[package]] @@ -1496,9 +1424,9 @@ checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa" [[package]] name = "futures" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" +checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876" dependencies = [ "futures-channel", "futures-core", @@ -1511,9 +1439,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" +checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10" dependencies = [ "futures-core", "futures-sink", @@ -1521,15 +1449,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" +checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e" [[package]] name = "futures-executor" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" +checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f" dependencies = [ "futures-core", "futures-task", @@ -1538,38 +1466,38 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" +checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" [[package]] name = "futures-macro" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" +checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.79", ] [[package]] name = "futures-sink" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" +checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7" [[package]] name = "futures-task" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" +checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" [[package]] name = "futures-util" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" dependencies = [ "futures-channel", "futures-core", @@ -1619,9 +1547,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.10" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", "js-sys", @@ -1632,9 +1560,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.28.0" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" +checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" [[package]] name = "goblin" @@ -1649,9 +1577,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.15" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f9f29bc9dda355256b2916cf526ab02ce0aeaaaf2bad60d65ef3f12f11dd0f4" +checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" dependencies = [ "bytes", "fnv", @@ -1659,18 +1587,18 @@ dependencies = [ "futures-sink", "futures-util", "http", - "indexmap 1.9.3", + "indexmap 2.6.0", "slab", "tokio", - "tokio-util 0.7.2", + "tokio-util 0.7.12", "tracing", ] [[package]] name = "half" -version = "1.8.2" +version = "1.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" +checksum = "1b43ede17f21864e81be2fa654110bf1e793774238d86ef8555c37e6519c0403" [[package]] name = "hash32" @@ -1698,9 +1626,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.14.1" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dfda62a12f55daeae5015f81b0baea145391cb4520f86c248fc615d72640d12" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" [[package]] name = "hashbrown" @@ -1725,9 +1653,9 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.3.1" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" [[package]] name = "histogram" @@ -1765,20 +1693,11 @@ dependencies = [ "hmac 0.8.1", ] -[[package]] -name = "home" -version = "0.5.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" -dependencies = [ - "windows-sys 0.52.0", -] - [[package]] name = "http" -version = "0.2.9" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" +checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" dependencies = [ "bytes", "fnv", @@ -1787,9 +1706,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", @@ -1798,15 +1717,15 @@ dependencies = [ [[package]] name = "httparse" -version = "1.8.0" +version = "1.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" +checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946" [[package]] name = "httpdate" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" +checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "humantime" @@ -1816,9 +1735,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.24" +version = "0.14.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e011372fa0b68db8350aa7a248930ecc7839bf46d8485577d69f117a75f164c" +checksum = "a152ddd61dfaec7273fe8419ab357f33aee0d914c5f4efbf0d96fa749eea5ec9" dependencies = [ "bytes", "futures-channel", @@ -1831,7 +1750,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2 0.4.9", + "socket2", "tokio", "tower-service", "tracing", @@ -1840,9 +1759,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", @@ -1854,26 +1773,25 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.53" +version = "0.1.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765" +checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220" dependencies = [ "android_system_properties", "core-foundation-sys", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "winapi", + "windows-core", ] [[package]] name = "iana-time-zone-haiku" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" dependencies = [ - "cxx", - "cxx-build", + "cc", ] [[package]] @@ -1910,18 +1828,18 @@ dependencies = [ [[package]] name = "include_dir" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18762faeff7122e89e0857b02f7ce6fcc0d101d5e9ad2ad7846cc01d61b7f19e" +checksum = "923d117408f1e49d914f1a379a309cffe4f18c05cf4e3d12e613a15fc81bd0dd" dependencies = [ "include_dir_macros", ] [[package]] name = "include_dir_macros" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b139284b5cf57ecfa712bcc66950bb635b31aff41c188e8a4cfc758eca374a3f" +checksum = "7cab85a7ed0bd5f0e76d93846e0147172bed2e2d3f859bcc33a8d9699cad1a75" dependencies = [ "proc-macro2", "quote", @@ -1929,9 +1847,9 @@ dependencies = [ [[package]] name = "index_list" -version = "0.2.11" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70891286cb8e844fdfcf1178b47569699f9e20b5ecc4b45a6240a64771444638" +checksum = "4e6ba961c14e98151cd6416dd3685efe786a94c38bc1a535c06ceff0a1600813" [[package]] name = "indexmap" @@ -1968,9 +1886,9 @@ dependencies = [ [[package]] name = "indoc" -version = "2.0.4" +version = "2.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e186cfbae8084e513daff4240b4797e342f988cecda4fb6c939150f96315fd8" +checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5" [[package]] name = "inout" @@ -1983,18 +1901,18 @@ dependencies = [ [[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", ] [[package]] name = "ipnet" -version = "2.7.1" +version = "2.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30e22bd8629359895450b59ea7a776c850561b96a3b1d31321c1949d9e6c9146" +checksum = "ddc24109865250148c2e0f3d25d4f0f479571723792d3802153c60922a4fb708" [[package]] name = "itertools" @@ -2016,9 +1934,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.5" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "jobserver" @@ -2031,9 +1949,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.70" +version = "0.3.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" +checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9" dependencies = [ "wasm-bindgen", ] @@ -2064,9 +1982,9 @@ dependencies = [ [[package]] name = "lazy_static" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "libc" @@ -2074,6 +1992,17 @@ version = "0.2.159" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5" +[[package]] +name = "libredox" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" +dependencies = [ + "bitflags 2.6.0", + "libc", + "redox_syscall", +] + [[package]] name = "libsecp256k1" version = "0.6.0" @@ -2134,26 +2063,17 @@ dependencies = [ "thiserror", ] -[[package]] -name = "link-cplusplus" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5" -dependencies = [ - "cc", -] - [[package]] name = "linux-raw-sys" -version = "0.4.13" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "lock_api" -version = "0.4.11" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" dependencies = [ "autocfg", "scopeguard", @@ -2186,9 +2106,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.6.3" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "memmap2" @@ -2201,18 +2121,9 @@ dependencies = [ [[package]] name = "memoffset" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" -dependencies = [ - "autocfg", -] - -[[package]] -name = "memoffset" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" dependencies = [ "autocfg", ] @@ -2231,9 +2142,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 = "mime_guess" @@ -2251,15 +2162,6 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" -[[package]] -name = "miniz_oxide" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" -dependencies = [ - "adler", -] - [[package]] name = "miniz_oxide" version = "0.8.0" @@ -2271,13 +2173,14 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.8" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" +checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" dependencies = [ + "hermit-abi 0.3.9", "libc", "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -2304,7 +2207,7 @@ dependencies = [ "cfg-if", "proc-macro2", "quote", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] @@ -2325,15 +2228,9 @@ checksum = "5a7d5f7076603ebc68de2dc6a650ec331a062a13abaa346975be747bbfa4b789" dependencies = [ "proc-macro2", "quote", - "syn 1.0.107", + "syn 1.0.109", ] -[[package]] -name = "multimap" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" - [[package]] name = "nix" version = "0.28.0" @@ -2344,7 +2241,7 @@ dependencies = [ "cfg-if", "cfg_aliases 0.1.1", "libc", - "memoffset 0.9.0", + "memoffset", ] [[package]] @@ -2416,13 +2313,13 @@ checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" [[package]] name = "num-derive" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfb77679af88f8b125209d354a202862602672222e7f2313fdd6dc349bad4712" +checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.79", ] [[package]] @@ -2436,9 +2333,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", @@ -2472,7 +2369,7 @@ version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi 0.3.1", + "hermit-abi 0.3.9", "libc", ] @@ -2491,10 +2388,10 @@ version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56" dependencies = [ - "proc-macro-crate 3.1.0", + "proc-macro-crate 3.2.0", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.79", ] [[package]] @@ -2505,9 +2402,9 @@ checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" [[package]] name = "object" -version = "0.32.1" +version = "0.36.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" +checksum = "aedf0a2d09c573ed1d8d85b30c119153926a2b36dce0ab28322c09a117a4683e" dependencies = [ "memchr", ] @@ -2523,15 +2420,15 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.18.0" +version = "1.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" +checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" [[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-probe" @@ -2560,15 +2457,15 @@ dependencies = [ [[package]] name = "os_str_bytes" -version = "6.4.1" +version = "6.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee" +checksum = "e2355d85b9a3786f481747ced0e0ff2ba35213a1f9bd406ed906554d7af805a1" [[package]] name = "parking_lot" -version = "0.12.1" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" dependencies = [ "lock_api", "parking_lot_core", @@ -2576,22 +2473,22 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.9" +version = "0.9.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.4.1", + "redox_syscall", "smallvec", - "windows-targets 0.48.0", + "windows-targets 0.52.6", ] [[package]] name = "paste" -version = "1.0.11" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d01a5bd0424d00070b0098dd17ebca6f961a959dead1dbcbbbc1d1cd8d3deeba" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "pbkdf2" @@ -2635,41 +2532,31 @@ dependencies = [ "num", ] -[[package]] -name = "petgraph" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" -dependencies = [ - "fixedbitset", - "indexmap 2.6.0", -] - [[package]] name = "pin-project" -version = "1.0.12" +version = "1.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad29a609b6bcd67fee905812e544992d216af9d755757c05ed2d0e15a74c6ecc" +checksum = "baf123a161dde1e524adf36f90bc5d8d3462824a9c43553ad07a8183161189ec" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.0.12" +version = "1.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55" +checksum = "a4502d8515ca9f32f1fb543d987f63d95a14934883db45bdb48060b6b69257f8" dependencies = [ "proc-macro2", "quote", - "syn 1.0.107", + "syn 2.0.79", ] [[package]] name = "pin-project-lite" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" [[package]] name = "pin-utils" @@ -2679,9 +2566,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkg-config" -version = "0.3.26" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" +checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" [[package]] name = "plain" @@ -2703,9 +2590,9 @@ dependencies = [ [[package]] name = "portable-atomic" -version = "1.3.3" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "767eb9f07d4a5ebcb39bbf2d452058a93c011373abf6832e24194a1c3f004794" +checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2" [[package]] name = "powerfmt" @@ -2715,9 +2602,12 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" [[package]] name = "ppv-lite86" -version = "0.2.17" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" +checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" +dependencies = [ + "zerocopy", +] [[package]] name = "predicates" @@ -2735,30 +2625,20 @@ dependencies = [ [[package]] name = "predicates-core" -version = "1.0.6" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b794032607612e7abeb4db69adb4e33590fa6cf1149e95fd7cb00e634b92f174" +checksum = "ae8177bee8e75d6846599c6b9ff679ed51e882816914eec639944d7c9aa11931" [[package]] name = "predicates-tree" -version = "1.0.9" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "368ba315fb8c5052ab692e68a0eefec6ec57b23a36959c14496f0b0df2c0cecf" +checksum = "41b740d195ed3166cd147c8047ec98db0e22ec019eb8eeb76d343b795304fb13" dependencies = [ "predicates-core", "termtree", ] -[[package]] -name = "prettyplease" -version = "0.1.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8646e95016a7a6c4adea95bafa8a16baab64b583356217f2c85db4a39d9a86" -dependencies = [ - "proc-macro2", - "syn 1.0.107", -] - [[package]] name = "proc-macro-crate" version = "0.1.5" @@ -2770,11 +2650,11 @@ dependencies = [ [[package]] name = "proc-macro-crate" -version = "3.1.0" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" +checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b" dependencies = [ - "toml_edit 0.21.1", + "toml_edit 0.22.22", ] [[package]] @@ -2786,7 +2666,7 @@ dependencies = [ "proc-macro-error-attr", "proc-macro2", "quote", - "syn 1.0.107", + "syn 1.0.109", "version_check", ] @@ -2803,78 +2683,25 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.86" +version = "1.0.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +checksum = "b3e4daa0dcf6feba26f985457cdf104d4b4256fc5a09547140f3631bb076b19a" dependencies = [ "unicode-ident", ] -[[package]] -name = "prost" -version = "0.11.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd" -dependencies = [ - "bytes", - "prost-derive", -] - -[[package]] -name = "prost-build" -version = "0.11.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "119533552c9a7ffacc21e099c24a0ac8bb19c2a2a3f363de84cd9b844feab270" -dependencies = [ - "bytes", - "heck", - "itertools 0.10.5", - "lazy_static", - "log", - "multimap", - "petgraph", - "prettyplease", - "prost", - "prost-types", - "regex", - "syn 1.0.107", - "tempfile", - "which", -] - -[[package]] -name = "prost-derive" -version = "0.11.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4" -dependencies = [ - "anyhow", - "itertools 0.10.5", - "proc-macro2", - "quote", - "syn 1.0.107", -] - -[[package]] -name = "prost-types" -version = "0.11.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213622a1460818959ac1181aaeb2dc9c7f63df720db7d788b3e24eacd1983e13" -dependencies = [ - "prost", -] - [[package]] name = "pyo3" -version = "0.20.2" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a89dc7a5850d0e983be1ec2a463a171d20990487c3cfcd68b5363f1ee3d6fe0" +checksum = "53bdbb96d49157e65d45cc287af5f32ffadd5f4761438b527b055fb0d4bb8233" dependencies = [ "cfg-if", "indoc", "libc", - "memoffset 0.9.0", + "memoffset", "parking_lot", + "portable-atomic", "pyo3-build-config", "pyo3-ffi", "pyo3-macros", @@ -2896,9 +2723,9 @@ dependencies = [ [[package]] name = "pyo3-build-config" -version = "0.20.2" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07426f0d8fe5a601f26293f300afd1a7b1ed5e78b2a705870c5f30893c5163be" +checksum = "deaa5745de3f5231ce10517a1f5dd97d53e5a2fd77aa6b5842292085831d48d7" dependencies = [ "once_cell", "target-lexicon", @@ -2906,9 +2733,9 @@ dependencies = [ [[package]] name = "pyo3-ffi" -version = "0.20.2" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbb7dec17e17766b46bca4f1a4215a85006b4c2ecde122076c562dd058da6cf1" +checksum = "62b42531d03e08d4ef1f6e85a2ed422eb678b8cd62b762e53891c05faf0d4afa" dependencies = [ "libc", "pyo3-build-config", @@ -2916,26 +2743,27 @@ dependencies = [ [[package]] name = "pyo3-macros" -version = "0.20.2" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05f738b4e40d50b5711957f142878cfa0f28e054aa0ebdfc3fd137a843f74ed3" +checksum = "7305c720fa01b8055ec95e484a6eca7a83c841267f0dd5280f0c8b8551d2c158" dependencies = [ "proc-macro2", "pyo3-macros-backend", "quote", - "syn 2.0.48", + "syn 2.0.79", ] [[package]] name = "pyo3-macros-backend" -version = "0.20.2" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fc910d4851847827daf9d6cdd4a823fbdaab5b8818325c5e97a86da79e8881f" +checksum = "7c7e9b68bb9c3149c5b0cade5d07f953d6d125eb4337723c4ccdb665f1f96185" dependencies = [ "heck", "proc-macro2", + "pyo3-build-config", "quote", - "syn 2.0.48", + "syn 2.0.79", ] [[package]] @@ -2965,7 +2793,7 @@ checksum = "9e2e25ee72f5b24d773cae88422baddefff7714f97aab68d96fe2b6fc4a28fb2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.79", ] [[package]] @@ -3011,16 +2839,16 @@ checksum = "055b4e778e8feb9f93c4e439f71dc2156ef13360b432b799e179a8c4cdf0b1d7" dependencies = [ "bytes", "libc", - "socket2 0.5.7", + "socket2", "tracing", "windows-sys 0.48.0", ] [[package]] name = "quote" -version = "1.0.35" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" dependencies = [ "proc-macro2", ] @@ -3084,7 +2912,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.10", + "getrandom 0.2.15", ] [[package]] @@ -3127,20 +2955,11 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "redox_syscall" -version = "0.4.1" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", ] [[package]] @@ -3206,13 +3025,13 @@ dependencies = [ "system-configuration", "tokio", "tokio-rustls", - "tokio-util 0.7.2", + "tokio-util 0.7.12", "tower-service", "url", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "webpki-roots 0.25.2", + "webpki-roots 0.25.4", "winreg", ] @@ -3248,16 +3067,17 @@ dependencies = [ [[package]] name = "ring" -version = "0.17.7" +version = "0.17.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74" +checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" dependencies = [ "cc", - "getrandom 0.2.10", + "cfg-if", + "getrandom 0.2.15", "libc", "spin 0.9.8", "untrusted 0.9.0", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -3273,19 +3093,19 @@ dependencies = [ [[package]] name = "rtoolbox" -version = "0.0.1" +version = "0.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "034e22c514f5c0cb8a10ff341b9b048b5ceb21591f31c8f44c43b960f9b3524a" +checksum = "c247d24e63230cdb56463ae328478bd5eac8b8faa8c69461a77e8e323afac90e" dependencies = [ "libc", - "winapi", + "windows-sys 0.48.0", ] [[package]] name = "rustc-demangle" -version = "0.1.21" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "rustc-hash" @@ -3295,9 +3115,9 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustc_version" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" dependencies = [ "semver", ] @@ -3313,9 +3133,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.31" +version = "0.38.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" +checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811" dependencies = [ "bitflags 2.6.0", "errno", @@ -3331,16 +3151,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" dependencies = [ "log", - "ring 0.17.7", + "ring 0.17.8", "rustls-webpki", "sct", ] [[package]] name = "rustls-native-certs" -version = "0.6.2" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0167bac7a9f490495f3c33013e7722b53cb087ecbe082fb0c6387c96f634ea50" +checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00" dependencies = [ "openssl-probe", "rustls-pemfile", @@ -3350,9 +3170,9 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "1.0.2" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d194b56d58803a43635bdc398cd17e383d6f71f9182b9a192c127ca42494a59b" +checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" dependencies = [ "base64 0.21.7", ] @@ -3363,21 +3183,21 @@ version = "0.101.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" dependencies = [ - "ring 0.17.7", + "ring 0.17.8", "untrusted 0.9.0", ] [[package]] name = "rustversion" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" +checksum = "0e819f2bc632f285be6d7cd36e25940d45b2391dd6d9b939e79de557f7014248" [[package]] name = "ryu" -version = "1.0.12" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "same-file" @@ -3390,11 +3210,11 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.21" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3" +checksum = "01227be5826fa0690321a2ba6c5cd57a19cf3f6a09e76973b58e61de6ab9d1c1" dependencies = [ - "windows-sys 0.42.0", + "windows-sys 0.59.0", ] [[package]] @@ -3403,12 +3223,6 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" -[[package]] -name = "scratch" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddccb15bcce173023b3fedd9436f882a0739b8dfb45e4f6b6002bee5929f61b2" - [[package]] name = "scroll" version = "0.11.0" @@ -3420,32 +3234,32 @@ dependencies = [ [[package]] name = "scroll_derive" -version = "0.11.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdbda6ac5cd1321e724fa9cee216f3a61885889b896f073b8f82322789c5250e" +checksum = "1db149f81d46d2deba7cd3c50772474707729550221e69588478ebf9ada425ae" dependencies = [ "proc-macro2", "quote", - "syn 1.0.107", + "syn 2.0.79", ] [[package]] name = "sct" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" +checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" dependencies = [ - "ring 0.16.20", - "untrusted 0.7.1", + "ring 0.17.8", + "untrusted 0.9.0", ] [[package]] name = "security-framework" -version = "2.8.2" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a332be01508d814fed64bf28f798a146d73792121129962fdf335bb3c49a4254" +checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", "core-foundation", "core-foundation-sys", "libc", @@ -3454,9 +3268,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.8.0" +version = "2.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31c9bb296072e961fcbd8853511dd39c2d8be2deb1e17c6860b1d30732b323b4" +checksum = "ea4a292869320c0272d7bc55a5a6aafaff59b4f63404a003887b679a2e05b4b6" dependencies = [ "core-foundation-sys", "libc", @@ -3488,9 +3302,9 @@ dependencies = [ [[package]] name = "serde_bytes" -version = "0.11.14" +version = "0.11.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b8497c313fd43ab992087548117643f6fcd935cbf36f176ffda0aacf9591734" +checksum = "387cc504cb06bb40a96c8e04e951fe01854cf6bc921053c954e4a606d9675c6a" dependencies = [ "serde", ] @@ -3513,7 +3327,7 @@ checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.79", ] [[package]] @@ -3530,9 +3344,9 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "0.6.1" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0efd8caf556a6cebd3b285caf480045fcc1ac04f6bd786b09a6f11af30c4fcf4" +checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1" dependencies = [ "serde", ] @@ -3579,7 +3393,7 @@ dependencies = [ "darling 0.13.4", "proc-macro2", "quote", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] @@ -3588,17 +3402,17 @@ version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "881b6f881b17d13214e5d494c939ebab463d01264ce1811e9d4ac3a882e7695f" dependencies = [ - "darling 0.20.1", + "darling 0.20.10", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.79", ] [[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", "cpufeatures", @@ -3653,9 +3467,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", ] @@ -3674,9 +3488,9 @@ checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" [[package]] name = "signal-hook-registry" -version = "1.4.1" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" dependencies = [ "libc", ] @@ -3705,9 +3519,9 @@ dependencies = [ [[package]] name = "slab" -version = "0.4.7" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" dependencies = [ "autocfg", ] @@ -3718,16 +3532,6 @@ version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" -[[package]] -name = "socket2" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" -dependencies = [ - "libc", - "winapi", -] - [[package]] name = "socket2" version = "0.5.7" @@ -3740,9 +3544,9 @@ dependencies = [ [[package]] name = "solana-account-decoder" -version = "2.0.11" +version = "2.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01c23b9de815f607b6cdadf0a65118bf90d812cfd29397c326b4dc222daad684" +checksum = "41d87c6ef8c13eb759fa8d887e12c67afd851799050b6afd501a27726551f52e" dependencies = [ "Inflector", "base64 0.22.1", @@ -3754,7 +3558,7 @@ dependencies = [ "serde_derive", "serde_json", "solana-config-program", - "solana-sdk", + "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", "spl-token", "spl-token-2022 4.0.0", "spl-token-group-interface 0.3.0", @@ -3765,9 +3569,9 @@ dependencies = [ [[package]] name = "solana-accounts-db" -version = "2.0.11" +version = "2.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4785251ba24affad78d0323a87c8ca15ae519832b6035f9e6e5a6f67fac1cc7" +checksum = "6431d2054df30bbd5b16b32a46186e103cb13478754d1bc34b4bfb59bd9c5677" dependencies = [ "bincode", "blake3", @@ -3796,11 +3600,11 @@ dependencies = [ "smallvec", "solana-bucket-map", "solana-inline-spl", - "solana-measure", - "solana-metrics", + "solana-measure 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-metrics 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", "solana-nohash-hasher", "solana-rayon-threadlimit", - "solana-sdk", + "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", "solana-svm", "static_assertions", "tar", @@ -3810,9 +3614,9 @@ dependencies = [ [[package]] name = "solana-address-lookup-table-program" -version = "2.0.11" +version = "2.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6771f20c31d3665f1a33e02192b1295579af6c827bf6f9c2d8873f17c9280463" +checksum = "4cfb847bf375f662ecad6082eaad747980416de6d74c4137f434a830f935ce7b" dependencies = [ "bincode", "bytemuck", @@ -3820,23 +3624,23 @@ dependencies = [ "num-derive", "num-traits", "rustc_version", - "solana-program", - "solana-program-runtime", - "solana-sdk", + "solana-program 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-program-runtime 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", "thiserror", ] [[package]] name = "solana-banks-client" -version = "2.0.11" +version = "2.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97e874b4d0ae1ac6f313b525e4c5f20c0170b0b51cecb4c4cfd44d7a7ba0833e" +checksum = "31871e4002b2a622b54b80cb77f85252e0d9112d665dabd34e9a2ace7cab5abc" dependencies = [ "borsh 1.5.1", "futures", "solana-banks-interface", - "solana-program", - "solana-sdk", + "solana-program 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", "tarpc", "thiserror", "tokio", @@ -3845,21 +3649,21 @@ dependencies = [ [[package]] name = "solana-banks-interface" -version = "2.0.11" +version = "2.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4d1c42f5f54e8dbf0cb02223be148896963175afdc996b897184b78b826db70" +checksum = "3aab1264080817f152525b842cc6a40df9fa5ce72e596a93337c3e6e5d89b905" dependencies = [ "serde", "serde_derive", - "solana-sdk", + "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", "tarpc", ] [[package]] name = "solana-banks-server" -version = "2.0.11" +version = "2.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "646a142af0ba9c82781b07953d2cc50ca6b65e91d5b467a1846725392438e166" +checksum = "e968a8b85e2c39fc8795ce9c193f428e4ebb40eb7ffb6c6b0bd034396717df09" dependencies = [ "bincode", "crossbeam-channel", @@ -3867,7 +3671,7 @@ dependencies = [ "solana-banks-interface", "solana-client", "solana-runtime", - "solana-sdk", + "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", "solana-send-transaction-service", "solana-svm", "tarpc", @@ -3877,31 +3681,52 @@ dependencies = [ [[package]] name = "solana-bpf-loader-program" -version = "2.0.11" +version = "2.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4616ea627eb914307ce2cfc41bc9759394a5a26e86ffa059b023ff5a6ea61e9f" +checksum = "d08fcde4e079069484b54aa7f1d2ec10763b1b271a7166f1ce363db318ff8ed2" +dependencies = [ + "bincode", + "byteorder", + "libsecp256k1", + "log", + "scopeguard", + "solana-compute-budget 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-curve25519 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-measure 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-poseidon 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-program-runtime 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-type-overrides 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana_rbpf", + "thiserror", +] + +[[package]] +name = "solana-bpf-loader-program" +version = "2.0.13" +source = "git+https://github.com/kevinheavey/agave?rev=5e3b64ccf335b8ca64344f00ee188859a4b9b844#5e3b64ccf335b8ca64344f00ee188859a4b9b844" dependencies = [ "bincode", "byteorder", "libsecp256k1", "log", "scopeguard", - "solana-compute-budget", - "solana-curve25519", - "solana-measure", - "solana-poseidon", - "solana-program-runtime", - "solana-sdk", - "solana-type-overrides", + "solana-compute-budget 2.0.13 (git+https://github.com/kevinheavey/agave?rev=5e3b64ccf335b8ca64344f00ee188859a4b9b844)", + "solana-curve25519 2.0.13 (git+https://github.com/kevinheavey/agave?rev=5e3b64ccf335b8ca64344f00ee188859a4b9b844)", + "solana-measure 2.0.13 (git+https://github.com/kevinheavey/agave?rev=5e3b64ccf335b8ca64344f00ee188859a4b9b844)", + "solana-poseidon 2.0.13 (git+https://github.com/kevinheavey/agave?rev=5e3b64ccf335b8ca64344f00ee188859a4b9b844)", + "solana-program-runtime 2.0.13 (git+https://github.com/kevinheavey/agave?rev=5e3b64ccf335b8ca64344f00ee188859a4b9b844)", + "solana-sdk 2.0.13 (git+https://github.com/kevinheavey/agave?rev=5e3b64ccf335b8ca64344f00ee188859a4b9b844)", + "solana-type-overrides 2.0.13 (git+https://github.com/kevinheavey/agave?rev=5e3b64ccf335b8ca64344f00ee188859a4b9b844)", "solana_rbpf", "thiserror", ] [[package]] name = "solana-bucket-map" -version = "2.0.11" +version = "2.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cafc93c9393c6f1f907ce703ef41a579a0f4449ba730992bbf64f1787d430b29" +checksum = "aab25a4121fef09620964308e9024d9e6a0875ae49b3ae01690d24f1478b0be5" dependencies = [ "bv", "bytemuck", @@ -3911,22 +3736,22 @@ dependencies = [ "modular-bitfield", "num_enum", "rand 0.8.5", - "solana-measure", - "solana-sdk", + "solana-measure 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", "tempfile", ] [[package]] name = "solana-clap-utils" -version = "2.0.11" +version = "2.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4453ca3d1c13c7ac914adbad7aa58cb3cdfa7710e581ffcdbff65d1b2895377" +checksum = "5f9709683a4d480a0185827292405cad0b6f414abaa479c7d1dfe5e2194aeec8" dependencies = [ "chrono", "clap 2.34.0", "rpassword", "solana-remote-wallet", - "solana-sdk", + "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", "thiserror", "tiny-bip39", "uriparse", @@ -3935,9 +3760,9 @@ dependencies = [ [[package]] name = "solana-client" -version = "2.0.11" +version = "2.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d7d9dde51417ce52076059b3802db8e14c7c92e00e562208d9d53361bfd3f12" +checksum = "67169e4f1faabb717ce81b5ca93960da21e3ac5c9b75cb6792f9b3ce38db459f" dependencies = [ "async-trait", "bincode", @@ -3950,14 +3775,14 @@ dependencies = [ "quinn", "rayon", "solana-connection-cache", - "solana-measure", - "solana-metrics", + "solana-measure 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-metrics 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", "solana-pubsub-client", "solana-quic-client", "solana-rpc-client", "solana-rpc-client-api", "solana-rpc-client-nonce-utils", - "solana-sdk", + "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", "solana-streamer", "solana-thin-client", "solana-tpu-client", @@ -3968,43 +3793,52 @@ dependencies = [ [[package]] name = "solana-compute-budget" -version = "2.0.11" +version = "2.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99f17feb6ffde6f6bfeff274f90345a1290cb04b0a60ea186c452a2435660c06" +checksum = "5acde49a883ca3e099a8050ad8321ea56b02041995dadcf84b0dab14561cc34a" +dependencies = [ + "rustc_version", + "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "solana-compute-budget" +version = "2.0.13" +source = "git+https://github.com/kevinheavey/agave?rev=5e3b64ccf335b8ca64344f00ee188859a4b9b844#5e3b64ccf335b8ca64344f00ee188859a4b9b844" dependencies = [ "rustc_version", - "solana-sdk", + "solana-sdk 2.0.13 (git+https://github.com/kevinheavey/agave?rev=5e3b64ccf335b8ca64344f00ee188859a4b9b844)", ] [[package]] name = "solana-compute-budget-program" -version = "2.0.11" +version = "2.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e30043b3355ddbe903c0cdc97a3381f529b7cca54680cab66b24a73e9a850c84" +checksum = "30d9a4850f254e23a6306a8eafa7bf8ecaf05d907d18b31ff096ea63f4c5ab32" dependencies = [ - "solana-program-runtime", - "solana-sdk", + "solana-program-runtime 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "solana-config-program" -version = "2.0.11" +version = "2.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db0730a851d7785f572617878009ec35ac020922fba473c536382ff30207859d" +checksum = "f638e44fb308bdc1ce99eb0fee194b2cb212917b258999cdb4a8b056d48973d4" dependencies = [ "bincode", "chrono", "serde", "serde_derive", - "solana-program-runtime", - "solana-sdk", + "solana-program-runtime 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "solana-connection-cache" -version = "2.0.11" +version = "2.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cb3522f31e8624a87116f770e082c9ac74fd0a9a2252ff11c952704218de246" +checksum = "3fd01a4d43b780996970cb3669946b002f71d34e6a26a19bd6d2a74513ecc0aa" dependencies = [ "async-trait", "bincode", @@ -4014,80 +3848,106 @@ dependencies = [ "log", "rand 0.8.5", "rayon", - "solana-measure", - "solana-metrics", - "solana-sdk", + "solana-measure 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-metrics 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", "thiserror", "tokio", ] [[package]] name = "solana-cost-model" -version = "2.0.11" +version = "2.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f18fd3b569ec88c725650dc7206d8e4658dd9dbe98dede82c75ab9069328919" +checksum = "a67709a37a380262f3be376d90e3b1567205ae271d1a3395019e6ae5974967eb" dependencies = [ "ahash", "lazy_static", "log", "rustc_version", "solana-address-lookup-table-program", - "solana-bpf-loader-program", - "solana-compute-budget", + "solana-bpf-loader-program 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-compute-budget 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", "solana-compute-budget-program", "solana-config-program", - "solana-loader-v4-program", - "solana-metrics", - "solana-sdk", + "solana-loader-v4-program 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-metrics 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", "solana-stake-program", - "solana-system-program", + "solana-system-program 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", "solana-vote-program", ] [[package]] name = "solana-curve25519" -version = "2.0.11" +version = "2.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "698aeff176242ed50c887bea4c7e6e332ba5f120b7b02745d3a3cce3a719dcdd" +checksum = "44b61d8eda3319deca3627e3eb3970ce2ad179ad39c106d6c003d06c90e3031d" dependencies = [ "bytemuck", "bytemuck_derive", "curve25519-dalek", - "solana-program", + "solana-program 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "thiserror", +] + +[[package]] +name = "solana-curve25519" +version = "2.0.13" +source = "git+https://github.com/kevinheavey/agave?rev=5e3b64ccf335b8ca64344f00ee188859a4b9b844#5e3b64ccf335b8ca64344f00ee188859a4b9b844" +dependencies = [ + "bytemuck", + "bytemuck_derive", + "curve25519-dalek", + "solana-program 2.0.13 (git+https://github.com/kevinheavey/agave?rev=5e3b64ccf335b8ca64344f00ee188859a4b9b844)", "thiserror", ] [[package]] name = "solana-inline-spl" -version = "2.0.11" +version = "2.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4137c8f12ed9362a7e55587f5556765a235192847ecff2f04fc46dde165303e2" +checksum = "7f6614014b976112fb6c9bf259f87c6659b8fdea628c656639e02211324d2b34" dependencies = [ "bytemuck", "rustc_version", - "solana-sdk", + "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "solana-loader-v4-program" -version = "2.0.11" +version = "2.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbf9156ea4e281543775bd7660585a11f3b503b1b63f29e1873dcc332bc39424" +checksum = "a7866a1140ceb81de5b82bd779b0c63f888904574da128dd40bc17795be6f084" +dependencies = [ + "log", + "solana-compute-budget 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-measure 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-program-runtime 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-type-overrides 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana_rbpf", +] + +[[package]] +name = "solana-loader-v4-program" +version = "2.0.13" +source = "git+https://github.com/kevinheavey/agave?rev=5e3b64ccf335b8ca64344f00ee188859a4b9b844#5e3b64ccf335b8ca64344f00ee188859a4b9b844" dependencies = [ "log", - "solana-compute-budget", - "solana-measure", - "solana-program-runtime", - "solana-sdk", - "solana-type-overrides", + "solana-compute-budget 2.0.13 (git+https://github.com/kevinheavey/agave?rev=5e3b64ccf335b8ca64344f00ee188859a4b9b844)", + "solana-measure 2.0.13 (git+https://github.com/kevinheavey/agave?rev=5e3b64ccf335b8ca64344f00ee188859a4b9b844)", + "solana-program-runtime 2.0.13 (git+https://github.com/kevinheavey/agave?rev=5e3b64ccf335b8ca64344f00ee188859a4b9b844)", + "solana-sdk 2.0.13 (git+https://github.com/kevinheavey/agave?rev=5e3b64ccf335b8ca64344f00ee188859a4b9b844)", + "solana-type-overrides 2.0.13 (git+https://github.com/kevinheavey/agave?rev=5e3b64ccf335b8ca64344f00ee188859a4b9b844)", "solana_rbpf", ] [[package]] name = "solana-logger" -version = "2.0.11" +version = "2.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c94ce4da36c6b28b6d741cbd99bf4238b8ae93ce0c8f8c72225faa21a140645e" +checksum = "c6b996befdb2bdbd816524fc7afe0e158fced33ff61c36ab29ae803c0462455d" dependencies = [ "env_logger", "lazy_static", @@ -4096,46 +3956,69 @@ dependencies = [ [[package]] name = "solana-measure" -version = "2.0.11" +version = "2.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79ed5420dcffe2f7759c70eb6cac560c92304bf06d505012ad367b44bac7c8b4" +checksum = "79d44cdbcf9e1489564cdae1cd92b8806b0ee89d05d36a58fef8c0d293ea7c2a" dependencies = [ "log", - "solana-sdk", + "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "solana-measure" +version = "2.0.13" +source = "git+https://github.com/kevinheavey/agave?rev=5e3b64ccf335b8ca64344f00ee188859a4b9b844#5e3b64ccf335b8ca64344f00ee188859a4b9b844" +dependencies = [ + "log", + "solana-sdk 2.0.13 (git+https://github.com/kevinheavey/agave?rev=5e3b64ccf335b8ca64344f00ee188859a4b9b844)", ] [[package]] name = "solana-metrics" -version = "2.0.11" +version = "2.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "893c7b904946e99214bbaee7d366148a9b0fe2564ef6dfe7161a5a2d8c0c5738" +checksum = "68979964a3a004f1af4f1571814817e7e050ef4c1b2a1bdaa3ff35e980072d69" dependencies = [ "crossbeam-channel", "gethostname", "lazy_static", "log", "reqwest", - "solana-sdk", + "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "thiserror", +] + +[[package]] +name = "solana-metrics" +version = "2.0.13" +source = "git+https://github.com/kevinheavey/agave?rev=5e3b64ccf335b8ca64344f00ee188859a4b9b844#5e3b64ccf335b8ca64344f00ee188859a4b9b844" +dependencies = [ + "crossbeam-channel", + "gethostname", + "lazy_static", + "log", + "reqwest", + "solana-sdk 2.0.13 (git+https://github.com/kevinheavey/agave?rev=5e3b64ccf335b8ca64344f00ee188859a4b9b844)", "thiserror", ] [[package]] name = "solana-net-utils" -version = "2.0.11" +version = "2.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c556a6d542c1937376e785f793dc590ffe20330affca70ce9f4a7ade437ee7bd" +checksum = "44bb419eb9293a277982cf14a58772e9b9ab30ff6f9421bc4ac0826d40122760" dependencies = [ "bincode", - "clap 3.2.23", + "clap 3.2.25", "crossbeam-channel", "log", "nix", "rand 0.8.5", "serde", "serde_derive", - "socket2 0.5.7", + "socket2", "solana-logger", - "solana-sdk", + "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", "solana-version", "static_assertions", "tokio", @@ -4150,9 +4033,9 @@ checksum = "8b8a731ed60e89177c8a7ab05fe0f1511cedd3e70e773f288f9de33a9cfdc21e" [[package]] name = "solana-perf" -version = "2.0.11" +version = "2.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ba7e28aa36fbdd41eb83f95c4bdaf498e881e17ff76e7d8a84eaafb475355ae" +checksum = "00c4128122787a61d8f94fdaa04cb71b3dbb017d9939ac4d632264c55ec345de" dependencies = [ "ahash", "bincode", @@ -4169,17 +4052,27 @@ dependencies = [ "rayon", "rustc_version", "serde", - "solana-metrics", + "solana-metrics 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", "solana-rayon-threadlimit", - "solana-sdk", + "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", "solana-vote-program", ] [[package]] name = "solana-poseidon" -version = "2.0.11" +version = "2.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c58f0ce80acf5cf19bb6bc802876d6710754c4373dd3172b6334c85ced148052" +checksum = "16cd1ecbbefa2e160f4c82734c2f38315005e1d8c3ddbdb20bfa50ea92264fdc" +dependencies = [ + "ark-bn254", + "light-poseidon", + "thiserror", +] + +[[package]] +name = "solana-poseidon" +version = "2.0.13" +source = "git+https://github.com/kevinheavey/agave?rev=5e3b64ccf335b8ca64344f00ee188859a4b9b844#5e3b64ccf335b8ca64344f00ee188859a4b9b844" dependencies = [ "ark-bn254", "light-poseidon", @@ -4188,9 +4081,54 @@ dependencies = [ [[package]] name = "solana-program" -version = "2.0.11" +version = "2.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e9ae1a4ec088d868ed0ee777a9a85a3e2d44f192d7f4aa9f0f8dec16c342a92" +checksum = "29249ce5b5c7bd018013adbb97439b0b1b986f16bb07c54db28f82e97baaa2f1" +dependencies = [ + "ark-bn254", + "ark-ec", + "ark-ff", + "ark-serialize", + "base64 0.22.1", + "bincode", + "bitflags 2.6.0", + "blake3", + "borsh 0.10.4", + "borsh 1.5.1", + "bs58 0.5.1", + "bv", + "bytemuck", + "bytemuck_derive", + "console_error_panic_hook", + "console_log", + "curve25519-dalek", + "getrandom 0.2.15", + "js-sys", + "lazy_static", + "libsecp256k1", + "log", + "memoffset", + "num-bigint 0.4.6", + "num-derive", + "num-traits", + "parking_lot", + "rand 0.8.5", + "rustc_version", + "rustversion", + "serde", + "serde_bytes", + "serde_derive", + "sha2 0.10.8", + "sha3 0.10.8", + "solana-sdk-macro 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "thiserror", + "wasm-bindgen", +] + +[[package]] +name = "solana-program" +version = "2.0.13" +source = "git+https://github.com/kevinheavey/agave?rev=5e3b64ccf335b8ca64344f00ee188859a4b9b844#5e3b64ccf335b8ca64344f00ee188859a4b9b844" dependencies = [ "ark-bn254", "ark-ec", @@ -4200,7 +4138,7 @@ dependencies = [ "bincode", "bitflags 2.6.0", "blake3", - "borsh 0.10.3", + "borsh 0.10.4", "borsh 1.5.1", "bs58 0.5.1", "bv", @@ -4209,12 +4147,12 @@ dependencies = [ "console_error_panic_hook", "console_log", "curve25519-dalek", - "getrandom 0.2.10", + "getrandom 0.2.15", "js-sys", "lazy_static", "libsecp256k1", "log", - "memoffset 0.9.0", + "memoffset", "num-bigint 0.4.6", "num-derive", "num-traits", @@ -4227,16 +4165,16 @@ dependencies = [ "serde_derive", "sha2 0.10.8", "sha3 0.10.8", - "solana-sdk-macro", + "solana-sdk-macro 2.0.13 (git+https://github.com/kevinheavey/agave?rev=5e3b64ccf335b8ca64344f00ee188859a4b9b844)", "thiserror", "wasm-bindgen", ] [[package]] name = "solana-program-runtime" -version = "2.0.11" +version = "2.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50a8682d95f49de15b3e6e60e59754f3e36151cb5f8da7728297bc5b95976cbb" +checksum = "948bfeb10ba38b55a8b2db2de8ccfa8f57b44b6d73c98e8e0de8b10f10ce043b" dependencies = [ "base64 0.22.1", "bincode", @@ -4251,21 +4189,49 @@ dependencies = [ "rand 0.8.5", "rustc_version", "serde", - "solana-compute-budget", - "solana-measure", - "solana-metrics", - "solana-sdk", - "solana-type-overrides", - "solana-vote", + "solana-compute-budget 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-measure 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-metrics 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-type-overrides 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-vote 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana_rbpf", + "thiserror", +] + +[[package]] +name = "solana-program-runtime" +version = "2.0.13" +source = "git+https://github.com/kevinheavey/agave?rev=5e3b64ccf335b8ca64344f00ee188859a4b9b844#5e3b64ccf335b8ca64344f00ee188859a4b9b844" +dependencies = [ + "base64 0.22.1", + "bincode", + "eager", + "enum-iterator", + "itertools 0.12.1", + "libc", + "log", + "num-derive", + "num-traits", + "percentage", + "rand 0.8.5", + "rustc_version", + "serde", + "solana-compute-budget 2.0.13 (git+https://github.com/kevinheavey/agave?rev=5e3b64ccf335b8ca64344f00ee188859a4b9b844)", + "solana-measure 2.0.13 (git+https://github.com/kevinheavey/agave?rev=5e3b64ccf335b8ca64344f00ee188859a4b9b844)", + "solana-metrics 2.0.13 (git+https://github.com/kevinheavey/agave?rev=5e3b64ccf335b8ca64344f00ee188859a4b9b844)", + "solana-sdk 2.0.13 (git+https://github.com/kevinheavey/agave?rev=5e3b64ccf335b8ca64344f00ee188859a4b9b844)", + "solana-type-overrides 2.0.13 (git+https://github.com/kevinheavey/agave?rev=5e3b64ccf335b8ca64344f00ee188859a4b9b844)", + "solana-vote 2.0.13 (git+https://github.com/kevinheavey/agave?rev=5e3b64ccf335b8ca64344f00ee188859a4b9b844)", "solana_rbpf", "thiserror", ] [[package]] name = "solana-program-test" -version = "2.0.11" +version = "2.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03f40f2e458a172b5876886803ee0c8d06c521de6dd637194ed4cb73a2933035" +checksum = "90fc0451bb2f44d5092239818a86a179600b351d04ca76ad720325bd70a7acf4" dependencies = [ "assert_matches", "async-trait", @@ -4279,13 +4245,13 @@ dependencies = [ "solana-banks-client", "solana-banks-interface", "solana-banks-server", - "solana-bpf-loader-program", - "solana-compute-budget", + "solana-bpf-loader-program 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-compute-budget 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", "solana-inline-spl", "solana-logger", - "solana-program-runtime", + "solana-program-runtime 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", "solana-runtime", - "solana-sdk", + "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", "solana-svm", "solana-vote-program", "solana_rbpf", @@ -4295,9 +4261,9 @@ dependencies = [ [[package]] name = "solana-pubsub-client" -version = "2.0.11" +version = "2.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7b784d5718ce45a67aa00465c515dd0e14cf0cf953b8bb658b42e8cab31ad3a" +checksum = "e3ce9fa94ef00f7dfec749fc6835a4c36e8cfa2166c4a80736af1b49ef5bcd8e" dependencies = [ "crossbeam-channel", "futures-util", @@ -4309,7 +4275,7 @@ dependencies = [ "serde_json", "solana-account-decoder", "solana-rpc-client-api", - "solana-sdk", + "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", "thiserror", "tokio", "tokio-stream", @@ -4320,9 +4286,9 @@ dependencies = [ [[package]] name = "solana-quic-client" -version = "2.0.11" +version = "2.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e397e7a3efe22128c35783f1ec2c306def1fe8f5f66f1f61ce7a94e2bdbb5a0" +checksum = "00764a5e5e36a94515d05f771e869c920671f5753cfc71ebf366546c891450b4" dependencies = [ "async-mutex", "async-trait", @@ -4334,11 +4300,11 @@ dependencies = [ "quinn-proto", "rustls", "solana-connection-cache", - "solana-measure", - "solana-metrics", + "solana-measure 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-metrics 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", "solana-net-utils", "solana-rpc-client-api", - "solana-sdk", + "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", "solana-streamer", "thiserror", "tokio", @@ -4346,9 +4312,9 @@ dependencies = [ [[package]] name = "solana-rayon-threadlimit" -version = "2.0.11" +version = "2.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5eb8779f9cff08b973e3b4cde6c73b993445d43f856128b673d720b9ea3998ba" +checksum = "33119350281687a17a8321f897dfd27009fc862711ee6555c26beb5b84d6c08c" dependencies = [ "lazy_static", "num_cpus", @@ -4356,9 +4322,9 @@ dependencies = [ [[package]] name = "solana-remote-wallet" -version = "2.0.11" +version = "2.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80229078147b493b777804cbebe83dfcf0cd25f3a0a7d7bbe6487942a7c32bab" +checksum = "aba8725448426110b9ac20d7256f43aad1ea46458fe35c63d174cf962af4a9d0" dependencies = [ "console", "dialoguer", @@ -4368,16 +4334,16 @@ dependencies = [ "parking_lot", "qstring", "semver", - "solana-sdk", + "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", "thiserror", "uriparse", ] [[package]] name = "solana-rpc-client" -version = "2.0.11" +version = "2.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1278725cbf0cf850043ecc8ea7ea5ce00e26c8c738c68c23eee1d47b5eff04ad" +checksum = "bd96f6a505a492544ee2459b608af3fe07da6c8ffc0bd842489e836ac2c3fce6" dependencies = [ "async-trait", "base64 0.22.1", @@ -4393,7 +4359,7 @@ dependencies = [ "serde_json", "solana-account-decoder", "solana-rpc-client-api", - "solana-sdk", + "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", "solana-transaction-status", "solana-version", "solana-vote-program", @@ -4402,9 +4368,9 @@ dependencies = [ [[package]] name = "solana-rpc-client-api" -version = "2.0.11" +version = "2.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05384a936fa8e0e77d4aee19f742950e2c057f264c9f1f5cbea5e4a251c66064" +checksum = "d04f79b88c53b675d5d885d498e7a7e6a4fdd60ffe56e543faddb5d94c6094ba" dependencies = [ "anyhow", "base64 0.22.1", @@ -4418,7 +4384,7 @@ dependencies = [ "serde_json", "solana-account-decoder", "solana-inline-spl", - "solana-sdk", + "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", "solana-transaction-status", "solana-version", "thiserror", @@ -4426,22 +4392,22 @@ dependencies = [ [[package]] name = "solana-rpc-client-nonce-utils" -version = "2.0.11" +version = "2.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1460a8a59466be8c704e328402fdd638ddf0afb73e7f368acee4e923cf2620e" +checksum = "42d46d162566cbf7d6eb2ae369fbb8a934bc846906cbe959aed9123c1ac92b85" dependencies = [ "clap 2.34.0", "solana-clap-utils", "solana-rpc-client", - "solana-sdk", + "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", "thiserror", ] [[package]] name = "solana-runtime" -version = "2.0.11" +version = "2.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b56c2e8e789b3123bc0c01c526c8165898dcca1f307d7d6c70dc4c10c0bffd6d" +checksum = "2b3b58b2ec1b41685aa829d4bde0990736f474821fee497deaf8da5f795d79f5" dependencies = [ "aquamarine", "arrayref", @@ -4482,26 +4448,26 @@ dependencies = [ "serde_json", "solana-accounts-db", "solana-address-lookup-table-program", - "solana-bpf-loader-program", + "solana-bpf-loader-program 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", "solana-bucket-map", - "solana-compute-budget", + "solana-compute-budget 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", "solana-compute-budget-program", "solana-config-program", "solana-cost-model", "solana-inline-spl", - "solana-loader-v4-program", - "solana-measure", - "solana-metrics", + "solana-loader-v4-program 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-measure 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-metrics 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", "solana-perf", - "solana-program-runtime", + "solana-program-runtime 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", "solana-rayon-threadlimit", - "solana-sdk", + "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", "solana-stake-program", "solana-svm", - "solana-system-program", + "solana-system-program 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", "solana-transaction-status", "solana-version", - "solana-vote", + "solana-vote 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", "solana-vote-program", "solana-zk-elgamal-proof-program", "solana-zk-sdk", @@ -4519,9 +4485,57 @@ dependencies = [ [[package]] name = "solana-sdk" -version = "2.0.11" +version = "2.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7092e9e22a2e8308a0f09c33f3411d2c9b51cac341468749398c8dbe5d32fb7a" +checksum = "24dae5bda29858add4df3a6c5eaf71c0d2042ca3317a9fd81d7e9f436278a1fe" +dependencies = [ + "bincode", + "bitflags 2.6.0", + "borsh 1.5.1", + "bs58 0.5.1", + "bytemuck", + "bytemuck_derive", + "byteorder", + "chrono", + "derivation-path", + "digest 0.10.7", + "ed25519-dalek", + "ed25519-dalek-bip32", + "generic-array", + "getrandom 0.1.16", + "hmac 0.12.1", + "itertools 0.12.1", + "js-sys", + "lazy_static", + "libsecp256k1", + "log", + "memmap2", + "num_enum", + "pbkdf2 0.11.0", + "qstring", + "rand 0.7.3", + "rand 0.8.5", + "rustc_version", + "rustversion", + "serde", + "serde_bytes", + "serde_derive", + "serde_json", + "serde_with 2.3.3", + "sha2 0.10.8", + "sha3 0.10.8", + "siphasher", + "solana-program 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-sdk-macro 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "thiserror", + "uriparse", + "wasm-bindgen", +] + +[[package]] +name = "solana-sdk" +version = "2.0.13" +source = "git+https://github.com/kevinheavey/agave?rev=5e3b64ccf335b8ca64344f00ee188859a4b9b844#5e3b64ccf335b8ca64344f00ee188859a4b9b844" dependencies = [ "bincode", "bitflags 2.6.0", @@ -4559,8 +4573,8 @@ dependencies = [ "sha2 0.10.8", "sha3 0.10.8", "siphasher", - "solana-program", - "solana-sdk-macro", + "solana-program 2.0.13 (git+https://github.com/kevinheavey/agave?rev=5e3b64ccf335b8ca64344f00ee188859a4b9b844)", + "solana-sdk-macro 2.0.13 (git+https://github.com/kevinheavey/agave?rev=5e3b64ccf335b8ca64344f00ee188859a4b9b844)", "thiserror", "uriparse", "wasm-bindgen", @@ -4568,15 +4582,27 @@ dependencies = [ [[package]] name = "solana-sdk-macro" -version = "2.0.11" +version = "2.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b26de6abbe042a1e77cfbc755c8ebc96bac3c5d07a8d45f67108774369925e41" +checksum = "704c9cacc61a5b9b6f717773cf4b3b45a4239dc7fa8c585258fceaf9b8e1cb94" dependencies = [ "bs58 0.5.1", "proc-macro2", "quote", "rustversion", - "syn 2.0.48", + "syn 2.0.79", +] + +[[package]] +name = "solana-sdk-macro" +version = "2.0.13" +source = "git+https://github.com/kevinheavey/agave?rev=5e3b64ccf335b8ca64344f00ee188859a4b9b844#5e3b64ccf335b8ca64344f00ee188859a4b9b844" +dependencies = [ + "bs58 0.5.1", + "proc-macro2", + "quote", + "rustversion", + "syn 2.0.79", ] [[package]] @@ -4587,42 +4613,42 @@ checksum = "468aa43b7edb1f9b7b7b686d5c3aeb6630dc1708e86e31343499dd5c4d775183" [[package]] name = "solana-send-transaction-service" -version = "2.0.11" +version = "2.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b6254258a9a517df90b2aa5213c549c52f6c11baacb5bc70fbec6295a2e8131" +checksum = "16c1c0b25b32b9b2d586281b4614f7cfd89fbe88760b1ec0e532d12d0919f224" dependencies = [ "crossbeam-channel", "log", "solana-client", "solana-connection-cache", - "solana-measure", - "solana-metrics", + "solana-measure 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-metrics 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", "solana-runtime", - "solana-sdk", + "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", "solana-tpu-client", ] [[package]] name = "solana-stake-program" -version = "2.0.11" +version = "2.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f66ca14e7d5a1f0b8fd16c288a0234b0d396583301fb37e7ec8fe3bab0b19ca7" +checksum = "a4601cba95c3aaebc3e3698d69c21fe128dcfb6ed08c98f0a6ee5184f25dd239" dependencies = [ "bincode", "log", "rustc_version", "solana-config-program", - "solana-program-runtime", - "solana-sdk", - "solana-type-overrides", + "solana-program-runtime 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-type-overrides 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", "solana-vote-program", ] [[package]] name = "solana-streamer" -version = "2.0.11" +version = "2.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "912e1fe86ca58726eb2a8e392c6ee30ec99d188bbad0552603a9460973db27ea" +checksum = "8cf77ab19483dce4b4307c9e6f195a8c52f0c219026b78af3a9fae1e63ba9222" dependencies = [ "async-channel", "bytes", @@ -4642,10 +4668,10 @@ dependencies = [ "rand 0.8.5", "rustls", "smallvec", - "solana-measure", - "solana-metrics", + "solana-measure 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-metrics 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", "solana-perf", - "solana-sdk", + "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", "solana-transaction-metrics-tracker", "thiserror", "tokio", @@ -4654,50 +4680,62 @@ dependencies = [ [[package]] name = "solana-svm" -version = "2.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "846374db06cca609b9cb9e39c428db2da5ff9d182d21ce01d9ad0409e903529e" +version = "2.0.13" +source = "git+https://github.com/kevinheavey/agave?rev=5e3b64ccf335b8ca64344f00ee188859a4b9b844#5e3b64ccf335b8ca64344f00ee188859a4b9b844" dependencies = [ "itertools 0.12.1", "log", "percentage", - "prost-build", "qualifier_attr", "rustc_version", "serde", "serde_derive", - "solana-bpf-loader-program", - "solana-compute-budget", - "solana-loader-v4-program", - "solana-measure", - "solana-metrics", - "solana-program-runtime", - "solana-sdk", - "solana-system-program", - "solana-type-overrides", - "solana-vote", + "solana-bpf-loader-program 2.0.13 (git+https://github.com/kevinheavey/agave?rev=5e3b64ccf335b8ca64344f00ee188859a4b9b844)", + "solana-compute-budget 2.0.13 (git+https://github.com/kevinheavey/agave?rev=5e3b64ccf335b8ca64344f00ee188859a4b9b844)", + "solana-loader-v4-program 2.0.13 (git+https://github.com/kevinheavey/agave?rev=5e3b64ccf335b8ca64344f00ee188859a4b9b844)", + "solana-measure 2.0.13 (git+https://github.com/kevinheavey/agave?rev=5e3b64ccf335b8ca64344f00ee188859a4b9b844)", + "solana-metrics 2.0.13 (git+https://github.com/kevinheavey/agave?rev=5e3b64ccf335b8ca64344f00ee188859a4b9b844)", + "solana-program-runtime 2.0.13 (git+https://github.com/kevinheavey/agave?rev=5e3b64ccf335b8ca64344f00ee188859a4b9b844)", + "solana-sdk 2.0.13 (git+https://github.com/kevinheavey/agave?rev=5e3b64ccf335b8ca64344f00ee188859a4b9b844)", + "solana-system-program 2.0.13 (git+https://github.com/kevinheavey/agave?rev=5e3b64ccf335b8ca64344f00ee188859a4b9b844)", + "solana-type-overrides 2.0.13 (git+https://github.com/kevinheavey/agave?rev=5e3b64ccf335b8ca64344f00ee188859a4b9b844)", + "solana-vote 2.0.13 (git+https://github.com/kevinheavey/agave?rev=5e3b64ccf335b8ca64344f00ee188859a4b9b844)", ] [[package]] name = "solana-system-program" -version = "2.0.11" +version = "2.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4edee644880170f4bbcea08ed14081a1c6a51395e87607f79193ff91bb8d841" +checksum = "0f582c0c7b64b7ddeac4d0623d793823ff661865af67b2100ad6ad8bdadeb1f5" dependencies = [ "bincode", "log", "serde", "serde_derive", - "solana-program-runtime", - "solana-sdk", - "solana-type-overrides", + "solana-program-runtime 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-type-overrides 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "solana-system-program" +version = "2.0.13" +source = "git+https://github.com/kevinheavey/agave?rev=5e3b64ccf335b8ca64344f00ee188859a4b9b844#5e3b64ccf335b8ca64344f00ee188859a4b9b844" +dependencies = [ + "bincode", + "log", + "serde", + "serde_derive", + "solana-program-runtime 2.0.13 (git+https://github.com/kevinheavey/agave?rev=5e3b64ccf335b8ca64344f00ee188859a4b9b844)", + "solana-sdk 2.0.13 (git+https://github.com/kevinheavey/agave?rev=5e3b64ccf335b8ca64344f00ee188859a4b9b844)", + "solana-type-overrides 2.0.13 (git+https://github.com/kevinheavey/agave?rev=5e3b64ccf335b8ca64344f00ee188859a4b9b844)", ] [[package]] name = "solana-thin-client" -version = "2.0.11" +version = "2.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04af07db7a995233ea5b71bfe05bed11c1c47595117adaeafe7f9a0ded710181" +checksum = "a8c880be4e50ff473b3e82b600162244b6eb28cb5a616dc90ee9232d34998680" dependencies = [ "bincode", "log", @@ -4705,14 +4743,14 @@ dependencies = [ "solana-connection-cache", "solana-rpc-client", "solana-rpc-client-api", - "solana-sdk", + "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "solana-tpu-client" -version = "2.0.11" +version = "2.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eca6195b9922aa268f24af550ec15cd64fc07bf4f2014842ba1c13f4bb56b98a" +checksum = "1e65c01edbca303273e735ae383dde54bd5c5b8a051c51162c0ff886b0939ec6" dependencies = [ "async-trait", "bincode", @@ -4722,21 +4760,21 @@ dependencies = [ "log", "rayon", "solana-connection-cache", - "solana-measure", - "solana-metrics", + "solana-measure 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-metrics 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", "solana-pubsub-client", "solana-rpc-client", "solana-rpc-client-api", - "solana-sdk", + "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", "thiserror", "tokio", ] [[package]] name = "solana-transaction-metrics-tracker" -version = "2.0.11" +version = "2.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0ca973b7caeb3054029a13a6a7d4f15808c7f7aee020402d6f962fb3d6589cc" +checksum = "44727bef1f8c57a6ed9a74761d8b7ddfcf4b4e2237cbcc5dc7f8f59985e07755" dependencies = [ "Inflector", "base64 0.22.1", @@ -4745,14 +4783,14 @@ dependencies = [ "log", "rand 0.8.5", "solana-perf", - "solana-sdk", + "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "solana-transaction-status" -version = "2.0.11" +version = "2.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "983f032cf30e9bf292d2ba324161225889ff6833dc466564f4983db1beb26cac" +checksum = "d51d9d4a6004708f9563a29aa87fdf9960c1e7420b69dd82e8b817cf8f02430b" dependencies = [ "Inflector", "base64 0.22.1", @@ -4765,7 +4803,7 @@ dependencies = [ "serde_derive", "serde_json", "solana-account-decoder", - "solana-sdk", + "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", "spl-associated-token-account 4.0.0", "spl-memo", "spl-token", @@ -4777,9 +4815,18 @@ dependencies = [ [[package]] name = "solana-type-overrides" -version = "2.0.11" +version = "2.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2843050d3b1e81bb4fdb2e409978c4a3257295ef79f869a2493139eabc39eff" +checksum = "2ab21276d6296965dc7181d785075b20e97b6789c76e8376cf363b3e2f7439b6" +dependencies = [ + "lazy_static", + "rand 0.8.5", +] + +[[package]] +name = "solana-type-overrides" +version = "2.0.13" +source = "git+https://github.com/kevinheavey/agave?rev=5e3b64ccf335b8ca64344f00ee188859a4b9b844#5e3b64ccf335b8ca64344f00ee188859a4b9b844" dependencies = [ "lazy_static", "rand 0.8.5", @@ -4787,14 +4834,14 @@ dependencies = [ [[package]] name = "solana-udp-client" -version = "2.0.11" +version = "2.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d17ed3191074bcfc361f4d14a2d728993727f6d9fa3b914c0468571f06d16bfa" +checksum = "10e902d4dc29cafc0794073805a2db1b48b818251480a9fbaec3959df72aec2f" dependencies = [ "async-trait", "solana-connection-cache", "solana-net-utils", - "solana-sdk", + "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", "solana-streamer", "thiserror", "tokio", @@ -4802,38 +4849,52 @@ dependencies = [ [[package]] name = "solana-version" -version = "2.0.11" +version = "2.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f3b4f44e274fdc866ecb59d84dcd03bf9f11123d42414637b6df932318c220a" +checksum = "0bcbc570264e5a61a8f84439dfc254931460769fedfb91ff16253acfc3644c9d" dependencies = [ "log", "rustc_version", "semver", "serde", "serde_derive", - "solana-sdk", + "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "solana-vote" -version = "2.0.11" +version = "2.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d74481c4d0b0325e7e2e8c3019984ffe08720c1403e2b3d773c3ca95138acd60" +checksum = "5fa1401a42023379f14af9165954f44ad02888a327dfd2a4abce0f18fa7cfab9" +dependencies = [ + "itertools 0.12.1", + "log", + "rustc_version", + "serde", + "serde_derive", + "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "thiserror", +] + +[[package]] +name = "solana-vote" +version = "2.0.13" +source = "git+https://github.com/kevinheavey/agave?rev=5e3b64ccf335b8ca64344f00ee188859a4b9b844#5e3b64ccf335b8ca64344f00ee188859a4b9b844" dependencies = [ "itertools 0.12.1", "log", "rustc_version", "serde", "serde_derive", - "solana-sdk", + "solana-sdk 2.0.13 (git+https://github.com/kevinheavey/agave?rev=5e3b64ccf335b8ca64344f00ee188859a4b9b844)", "thiserror", ] [[package]] name = "solana-vote-program" -version = "2.0.11" +version = "2.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6aac1cb6470cc9af4b6483b463fbbaadf665358b4bcfcb4b268b6331ef9f718" +checksum = "cfd8e539a9963c2914ff8426dfe92351a902892aea465cd507e36d638ca0b7d6" dependencies = [ "bincode", "log", @@ -4842,32 +4903,32 @@ dependencies = [ "rustc_version", "serde", "serde_derive", - "solana-metrics", - "solana-program", - "solana-program-runtime", - "solana-sdk", + "solana-metrics 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-program 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-program-runtime 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", "thiserror", ] [[package]] name = "solana-zk-elgamal-proof-program" -version = "2.0.11" +version = "2.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18cdb9c62d95cd31588c8b0bcf3b344d7af3b8e8941df310be09bfa60039d96d" +checksum = "7671ffcadb76705bb678d96380d3514fb927e70810b6857e5d9b1775322a211a" dependencies = [ "bytemuck", "num-derive", "num-traits", - "solana-program-runtime", - "solana-sdk", + "solana-program-runtime 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", "solana-zk-sdk", ] [[package]] name = "solana-zk-sdk" -version = "2.0.11" +version = "2.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e79f29e79240fd273db888ee2049c17c139f8ab485d3567bbe0bbe7ed42846f" +checksum = "bd59ccde525a3b831aa953ea8daf2643e734c4b49e3f8a79b4776ee8c1da8f2b" dependencies = [ "aes-gcm-siv", "base64 0.22.1", @@ -4885,8 +4946,8 @@ dependencies = [ "serde_derive", "serde_json", "sha3 0.9.1", - "solana-program", - "solana-sdk", + "solana-program 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", "subtle", "thiserror", "zeroize", @@ -4894,23 +4955,23 @@ dependencies = [ [[package]] name = "solana-zk-token-proof-program" -version = "2.0.11" +version = "2.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7489984fbe203a57ab5cb7e071e3b37ae47fe9c9ce01bbe3bab9918a7ce27e11" +checksum = "6063e185fcb6cc5690dde2e07c4040b58f5ecf25682420cc69dbba50564bf44b" dependencies = [ "bytemuck", "num-derive", "num-traits", - "solana-program-runtime", - "solana-sdk", + "solana-program-runtime 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", "solana-zk-token-sdk", ] [[package]] name = "solana-zk-token-sdk" -version = "2.0.11" +version = "2.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc454c6b3a6018c1b0ef24fe90bf8b73af3e859148fc7fcbfbca3dc67c557cdc" +checksum = "a1dd7a8d6843cb3de4c13c2cfec1994519735ea4110b7f36b80b41d57bea1c07" dependencies = [ "aes-gcm-siv", "base64 0.22.1", @@ -4929,9 +4990,9 @@ dependencies = [ "serde_derive", "serde_json", "sha3 0.9.1", - "solana-curve25519", - "solana-program", - "solana-sdk", + "solana-curve25519 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-program 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", "subtle", "thiserror", "zeroize", @@ -4964,7 +5025,7 @@ dependencies = [ "derive_more", "pyo3", "serde", - "solana-sdk", + "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", "solders-account", "solders-account-decoder", "solders-address-lookup-table-account", @@ -5002,7 +5063,7 @@ dependencies = [ "serde_bytes", "serde_with 1.14.0", "solana-account-decoder", - "solana-sdk", + "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", "solders-account-decoder", "solders-macros", "solders-pubkey", @@ -5021,7 +5082,7 @@ dependencies = [ "serde", "serde_json", "solana-account-decoder", - "solana-sdk", + "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", "solders-macros", "solders-traits-core", "zstd", @@ -5034,7 +5095,7 @@ dependencies = [ "derive_more", "pyo3", "serde", - "solana-program", + "solana-program 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", "solders-hash", "solders-macros", "solders-pubkey", @@ -5052,7 +5113,7 @@ dependencies = [ "pyo3-asyncio", "solana-banks-client", "solana-program-test", - "solana-sdk", + "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", "solders-account", "solders-banks-interface", "solders-commitment-config", @@ -5068,7 +5129,7 @@ dependencies = [ "solders-transaction", "tarpc", "time", - "toml 0.7.3", + "toml 0.7.8", ] [[package]] @@ -5095,7 +5156,7 @@ dependencies = [ "base64 0.13.1", "bincode", "serde", - "solana-sdk", + "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", "solders-message", "solders-transaction", ] @@ -5104,7 +5165,7 @@ dependencies = [ name = "solders-clock-example" version = "0.0.0" dependencies = [ - "solana-program", + "solana-program 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -5114,7 +5175,7 @@ dependencies = [ "derive_more", "pyo3", "serde", - "solana-sdk", + "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", "solders-traits", ] @@ -5123,7 +5184,7 @@ name = "solders-compute-budget" version = "0.21.0" dependencies = [ "pyo3", - "solana-sdk", + "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", "solders-instruction", "solders-pubkey", ] @@ -5135,8 +5196,8 @@ dependencies = [ "derive_more", "pyo3", "serde", - "solana-program", - "solana-sdk", + "solana-program 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", "solders-macros", "solders-traits-core", ] @@ -5148,7 +5209,7 @@ dependencies = [ "derive_more", "pyo3", "serde", - "solana-program", + "solana-program 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", "solders-macros", "solders-traits", "solders-traits-core", @@ -5161,7 +5222,7 @@ dependencies = [ "derive_more", "pyo3", "serde", - "solana-program", + "solana-program 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", "solders-macros", "solders-pubkey", "solders-traits-core", @@ -5174,7 +5235,7 @@ dependencies = [ "derive_more", "pyo3", "serde", - "solana-sdk", + "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", "solders-macros", "solders-pubkey", "solders-signature", @@ -5188,7 +5249,7 @@ version = "0.21.0" dependencies = [ "proc-macro2", "quote", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] @@ -5199,7 +5260,7 @@ dependencies = [ "derive_more", "pyo3", "serde", - "solana-program", + "solana-program 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", "solders-address-lookup-table-account", "solders-hash", "solders-instruction", @@ -5217,7 +5278,7 @@ dependencies = [ "derive_more", "pyo3", "serde", - "solana-program", + "solana-program 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", "solders-macros", "solders-traits-core", ] @@ -5229,7 +5290,7 @@ dependencies = [ "derive_more", "pyo3", "serde", - "solana-program", + "solana-program 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", "solders-macros", "solders-traits", "solders-traits-core", @@ -5300,7 +5361,7 @@ dependencies = [ "serde", "solana-account-decoder", "solana-rpc-client-api", - "solana-sdk", + "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", "solders-commitment-config", "solders-macros", "solders-pubkey", @@ -5490,7 +5551,7 @@ dependencies = [ "serde_with 1.14.0", "solana-account-decoder", "solana-rpc-client-api", - "solana-sdk", + "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", "solana-transaction-status", "solders-account", "solders-account-decoder", @@ -5526,7 +5587,7 @@ dependencies = [ "serde_with 1.14.0", "solana-account-decoder", "solana-rpc-client-api", - "solana-sdk", + "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", "solders-account", "solders-account-decoder", "solders-hash", @@ -5561,7 +5622,7 @@ dependencies = [ "pyo3", "serde", "solana-rpc-client-api", - "solana-sdk", + "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", "solana-transaction-status", "solders-commitment-config", "solders-macros", @@ -5640,7 +5701,7 @@ dependencies = [ "derive_more", "pyo3", "serde", - "solana-sdk", + "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", "solders-macros", "solders-pubkey", "solders-traits-core", @@ -5655,8 +5716,8 @@ dependencies = [ "dict_derive", "pyo3", "serde", - "solana-program", - "solana-sdk", + "solana-program 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", "solders-instruction", "solders-macros", "solders-pubkey", @@ -5671,7 +5732,7 @@ dependencies = [ "derive_more", "pyo3", "serde", - "solana-program", + "solana-program 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", "solders-macros", "solders-pubkey", "solders-traits-core", @@ -5688,7 +5749,7 @@ dependencies = [ "serde_cbor", "serde_json", "solana-banks-client", - "solana-sdk", + "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", "solders-traits-core", ] @@ -5710,7 +5771,7 @@ dependencies = [ "derive_more", "pyo3", "serde", - "solana-sdk", + "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", "solders-hash", "solders-instruction", "solders-keypair", @@ -5739,7 +5800,7 @@ dependencies = [ "derive_more", "pyo3", "serde", - "solana-sdk", + "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", "solders-macros", "solders-traits-core", ] @@ -5752,7 +5813,7 @@ dependencies = [ "derive_more", "pyo3", "serde", - "solana-sdk", + "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", "solana-transaction-status", "solders-macros", "solders-pubkey", @@ -5772,7 +5833,7 @@ dependencies = [ "serde", "serde_json", "solana-account-decoder", - "solana-sdk", + "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", "solana-transaction-status", "solders-account-decoder", "solders-hash", @@ -5836,7 +5897,7 @@ dependencies = [ "borsh 1.5.1", "num-derive", "num-traits", - "solana-program", + "solana-program 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", "spl-token", "spl-token-2022 4.0.0", "thiserror", @@ -5851,7 +5912,7 @@ dependencies = [ "borsh 1.5.1", "num-derive", "num-traits", - "solana-program", + "solana-program 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", "spl-associated-token-account-client", "spl-token", "spl-token-2022 5.0.2", @@ -5864,7 +5925,7 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c5c1e2d53941ea7ebc4be3f86302a3c6c5178baa932bbc038468429e6900d36" dependencies = [ - "solana-program", + "solana-program 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -5874,7 +5935,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a38ea8b6dedb7065887f12d62ed62c1743aa70749e8558f963609793f6fb12bc" dependencies = [ "bytemuck", - "solana-program", + "solana-program 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", "spl-discriminator-derive", ] @@ -5886,7 +5947,7 @@ checksum = "d9e8418ea6269dcfb01c712f0444d2c75542c04448b480e87de59d2865edc750" dependencies = [ "quote", "spl-discriminator-syn", - "syn 2.0.48", + "syn 2.0.79", ] [[package]] @@ -5898,7 +5959,7 @@ dependencies = [ "proc-macro2", "quote", "sha2 0.10.8", - "syn 2.0.48", + "syn 2.0.79", "thiserror", ] @@ -5908,7 +5969,7 @@ version = "5.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a0dba2f2bb6419523405d21c301a32c9f9568354d4742552e7972af801f4bdb3" dependencies = [ - "solana-program", + "solana-program 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -5920,7 +5981,7 @@ dependencies = [ "borsh 1.5.1", "bytemuck", "bytemuck_derive", - "solana-program", + "solana-program 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", "solana-zk-token-sdk", "spl-program-error", ] @@ -5934,7 +5995,7 @@ dependencies = [ "borsh 1.5.1", "bytemuck", "bytemuck_derive", - "solana-program", + "solana-program 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", "solana-zk-sdk", "spl-program-error", ] @@ -5947,7 +6008,7 @@ checksum = "d7b28bed65356558133751cc32b48a7a5ddfc59ac4e941314630bbed1ac10532" dependencies = [ "num-derive", "num-traits", - "solana-program", + "solana-program 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", "spl-program-error-derive", "thiserror", ] @@ -5961,7 +6022,7 @@ dependencies = [ "proc-macro2", "quote", "sha2 0.10.8", - "syn 2.0.48", + "syn 2.0.79", ] [[package]] @@ -5971,7 +6032,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "37a75a5f0fcc58126693ed78a17042e9dc53f07e357d6be91789f7d62aff61a4" dependencies = [ "bytemuck", - "solana-program", + "solana-program 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", "spl-discriminator", "spl-pod 0.3.1", "spl-program-error", @@ -5985,7 +6046,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "29ffc5c76926c1cbc8d92ac1d9341328308d15bae04a67da5a226e36d5bc395a" dependencies = [ "bytemuck", - "solana-program", + "solana-program 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", "spl-discriminator", "spl-pod 0.4.0", "spl-program-error", @@ -6003,7 +6064,7 @@ dependencies = [ "num-derive", "num-traits", "num_enum", - "solana-program", + "solana-program 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", "thiserror", ] @@ -6018,7 +6079,7 @@ dependencies = [ "num-derive", "num-traits", "num_enum", - "solana-program", + "solana-program 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", "solana-security-txt", "solana-zk-token-sdk", "spl-memo", @@ -6042,7 +6103,7 @@ dependencies = [ "num-derive", "num-traits", "num_enum", - "solana-program", + "solana-program 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", "solana-security-txt", "solana-zk-sdk", "spl-memo", @@ -6066,7 +6127,7 @@ checksum = "48df72fb98b4069979aa4806d4a634ad6f08cb0358e732e6fbac231c5dc075bd" dependencies = [ "base64 0.22.1", "bytemuck", - "solana-curve25519", + "solana-curve25519 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", "solana-zk-sdk", ] @@ -6077,7 +6138,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae2ce92a0b9673c44207b21d99526b96d557d5a25752f36c38fae37c49129c3b" dependencies = [ "bytemuck", - "solana-curve25519", + "solana-curve25519 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", "solana-zk-sdk", "thiserror", ] @@ -6100,7 +6161,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df8752b85a5ecc1d9f3a43bce3dd9a6a053673aacf5deb513d1cbb88d3534ffd" dependencies = [ "bytemuck", - "solana-program", + "solana-program 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", "spl-discriminator", "spl-pod 0.3.1", "spl-program-error", @@ -6113,7 +6174,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5c54728921a6f180525c4f3a4cc3b231db8da940681c8009259faa65d84c6196" dependencies = [ "bytemuck", - "solana-program", + "solana-program 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", "spl-discriminator", "spl-pod 0.4.0", "spl-program-error", @@ -6126,7 +6187,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c6c2318ddff97e006ed9b1291ebec0750a78547f870f62a69c56fe3b46a5d8fc" dependencies = [ "borsh 1.5.1", - "solana-program", + "solana-program 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", "spl-discriminator", "spl-pod 0.3.1", "spl-program-error", @@ -6140,7 +6201,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "27c7a6d2a2a4f23c8f051ba2f7edb5689f1b534b4126bd9b4ae4177685e9a341" dependencies = [ "borsh 1.5.1", - "solana-program", + "solana-program 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", "spl-discriminator", "spl-pod 0.4.0", "spl-program-error", @@ -6155,7 +6216,7 @@ checksum = "a110f33d941275d9f868b96daaa993f1e73b6806cc8836e43075b4d3ad8338a7" dependencies = [ "arrayref", "bytemuck", - "solana-program", + "solana-program 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", "spl-discriminator", "spl-pod 0.3.1", "spl-program-error", @@ -6171,7 +6232,7 @@ checksum = "b82e5ad62ad342d8fbb907b2a7aede7a5a258ce16366c26a686acc1df431fc63" dependencies = [ "arrayref", "bytemuck", - "solana-program", + "solana-program 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", "spl-discriminator", "spl-pod 0.4.0", "spl-program-error", @@ -6186,7 +6247,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bdcd73ec187bc409464c60759232e309f83b52a18a9c5610bf281c9c6432918c" dependencies = [ "bytemuck", - "solana-program", + "solana-program 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", "spl-discriminator", "spl-pod 0.3.1", "spl-program-error", @@ -6199,7 +6260,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "69c08deb8332a6c051f6e846b5e9c962695295dd97e0e151dccf3ef85dcf01b4" dependencies = [ "bytemuck", - "solana-program", + "solana-program 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", "spl-discriminator", "spl-pod 0.4.0", "spl-program-error", @@ -6223,6 +6284,12 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" +[[package]] +name = "strsim" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" + [[package]] name = "strum" version = "0.24.1" @@ -6242,7 +6309,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] @@ -6259,9 +6326,9 @@ checksum = "a7973cce6668464ea31f176d85b13c7ab3bba2cb3b77a2ed26abd7801688010a" [[package]] name = "syn" -version = "1.0.107" +version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ "proc-macro2", "quote", @@ -6270,9 +6337,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.48" +version = "2.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" +checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590" dependencies = [ "proc-macro2", "quote", @@ -6288,7 +6355,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.79", ] [[package]] @@ -6305,7 +6372,7 @@ checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" dependencies = [ "proc-macro2", "quote", - "syn 1.0.107", + "syn 1.0.109", "unicode-xid", ] @@ -6343,9 +6410,9 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.12.6" +version = "0.12.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ae9980cab1db3fceee2f6c6f643d5d8de2997c58ee8d25fb0cc8a9e9e7348e5" +checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" [[package]] name = "tarpc" @@ -6379,7 +6446,7 @@ checksum = "0ee42b4e559f17bce0385ebf511a7beb67d5cc33c12c96b7f4e9789919d9c10f" dependencies = [ "proc-macro2", "quote", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] @@ -6393,21 +6460,22 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.10.1" +version = "3.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" +checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b" dependencies = [ "cfg-if", "fastrand", + "once_cell", "rustix", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] name = "termcolor" -version = "1.2.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" +checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" dependencies = [ "winapi-util", ] @@ -6429,9 +6497,9 @@ dependencies = [ [[package]] name = "textwrap" -version = "0.16.0" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" +checksum = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9" [[package]] name = "thiserror" @@ -6450,14 +6518,14 @@ checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.79", ] [[package]] name = "thread_local" -version = "1.1.7" +version = "1.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" +checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" dependencies = [ "cfg-if", "once_cell", @@ -6515,9 +6583,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.6.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" dependencies = [ "tinyvec_macros", ] @@ -6530,32 +6598,31 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.32.0" +version = "1.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9" +checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" dependencies = [ "backtrace", "bytes", "libc", "mio", - "num_cpus", "parking_lot", "pin-project-lite", "signal-hook-registry", - "socket2 0.5.7", + "socket2", "tokio-macros", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "tokio-macros" -version = "2.1.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" +checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.79", ] [[package]] @@ -6607,7 +6674,7 @@ dependencies = [ "tokio", "tokio-rustls", "tungstenite", - "webpki-roots 0.25.2", + "webpki-roots 0.25.4", ] [[package]] @@ -6627,16 +6694,15 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.2" +version = "0.7.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f988a1a1adc2fb21f9c12aa96441da33a1728193ae0b95d2be22dbd17fcb4e5c" +checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a" dependencies = [ "bytes", "futures-core", "futures-sink", "pin-project-lite", "tokio", - "tracing", ] [[package]] @@ -6650,62 +6716,61 @@ dependencies = [ [[package]] name = "toml" -version = "0.7.3" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b403acf6f2bb0859c93c7f0d967cb4a75a7ac552100f9322faf64dc047669b21" +checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.19.8", + "toml_edit 0.19.15", ] [[package]] name = "toml_datetime" -version = "0.6.5" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" dependencies = [ "serde", ] [[package]] name = "toml_edit" -version = "0.19.8" +version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "239410c8609e8125456927e6707163a3b1fdb40561e4b803bc041f466ccfdc13" +checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 1.9.3", + "indexmap 2.6.0", "serde", "serde_spanned", "toml_datetime", - "winnow 0.4.6", + "winnow 0.5.40", ] [[package]] name = "toml_edit" -version = "0.21.1" +version = "0.22.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" +checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5" dependencies = [ "indexmap 2.6.0", "toml_datetime", - "winnow 0.5.37", + "winnow 0.6.20", ] [[package]] name = "tower-service" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" +checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" [[package]] name = "tracing" -version = "0.1.37" +version = "0.1.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ - "cfg-if", "log", "pin-project-lite", "tracing-attributes", @@ -6714,20 +6779,20 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.23" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 1.0.107", + "syn 2.0.79", ] [[package]] name = "tracing-core" -version = "0.1.30" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" dependencies = [ "once_cell", "valuable", @@ -6748,9 +6813,9 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.3.16" +version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6176eae26dd70d0c919749377897b54a9276bd7061339665dd68777926b5a70" +checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" dependencies = [ "sharded-slab", "thread_local", @@ -6759,9 +6824,9 @@ dependencies = [ [[package]] name = "try-lock" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "tungstenite" @@ -6786,9 +6851,9 @@ dependencies = [ [[package]] name = "typenum" -version = "1.16.0" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "unicase" @@ -6801,36 +6866,36 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.10" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54675592c1dbefd78cbd98db9bacd89886e1ca50692a0692baefffdeb92dd58" +checksum = "5ab17db44d7388991a428b2ee655ce0c212e862eff1768a455c58f9aad6e7893" [[package]] name = "unicode-ident" -version = "1.0.6" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc" +checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" [[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", ] [[package]] name = "unicode-width" -version = "0.1.10" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" +checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" [[package]] name = "unicode-xid" -version = "0.2.4" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" +checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" [[package]] name = "unindent" @@ -6910,9 +6975,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" @@ -6922,22 +6987,20 @@ checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" [[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", "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", ] @@ -6955,9 +7018,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" +checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e" dependencies = [ "cfg-if", "once_cell", @@ -6966,24 +7029,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" +checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.79", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.34" +version = "0.4.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f219e0d211ba40266969f6dbdd90636da12f75bee4fc9d6c23d1260dadb51454" +checksum = "cc7ec4f8827a71586374db3e87abdb5a2bb3a15afed140221307c3ec06b1f63b" dependencies = [ "cfg-if", "js-sys", @@ -6993,9 +7056,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" +checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -7003,28 +7066,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" +checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.79", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" +checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d" [[package]] name = "web-sys" -version = "0.3.61" +version = "0.3.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97" +checksum = "f6488b90108c040df0fe62fa815cbdee25124641df01814dd7282749234c6112" dependencies = [ "js-sys", "wasm-bindgen", @@ -7041,21 +7104,9 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.25.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc" - -[[package]] -name = "which" -version = "4.4.2" +version = "0.25.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" -dependencies = [ - "either", - "home", - "once_cell", - "rustix", -] +checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" [[package]] name = "winapi" @@ -7075,11 +7126,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", + "windows-sys 0.59.0", ] [[package]] @@ -7089,27 +7140,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] -name = "windows-sys" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" -dependencies = [ - "windows_aarch64_gnullvm 0.42.1", - "windows_aarch64_msvc 0.42.1", - "windows_i686_gnu 0.42.1", - "windows_i686_msvc 0.42.1", - "windows_x86_64_gnu 0.42.1", - "windows_x86_64_gnullvm 0.42.1", - "windows_x86_64_msvc 0.42.1", -] - -[[package]] -name = "windows-sys" -version = "0.45.0" +name = "windows-core" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.42.1", + "windows-targets 0.52.6", ] [[package]] @@ -7118,7 +7154,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]] @@ -7127,194 +7163,153 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.0", + "windows-targets 0.52.6", ] [[package]] -name = "windows-targets" -version = "0.42.1" +name = "windows-sys" +version = "0.59.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" dependencies = [ - "windows_aarch64_gnullvm 0.42.1", - "windows_aarch64_msvc 0.42.1", - "windows_i686_gnu 0.42.1", - "windows_i686_msvc 0.42.1", - "windows_x86_64_gnu 0.42.1", - "windows_x86_64_gnullvm 0.42.1", - "windows_x86_64_msvc 0.42.1", + "windows-targets 0.52.6", ] [[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]] name = "windows-targets" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm 0.52.0", - "windows_aarch64_msvc 0.52.0", - "windows_i686_gnu 0.52.0", - "windows_i686_msvc 0.52.0", - "windows_x86_64_gnu 0.52.0", - "windows_x86_64_gnullvm 0.52.0", - "windows_x86_64_msvc 0.52.0", + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", + "windows_i686_gnullvm", + "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_aarch64_gnullvm" -version = "0.42.1" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.48.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.42.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[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" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" - -[[package]] -name = "windows_i686_gnu" -version = "0.42.1" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[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" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" [[package]] -name = "windows_i686_msvc" -version = "0.42.1" +name = "windows_i686_gnullvm" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[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" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_x86_64_gnu" -version = "0.42.1" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.48.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.42.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[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" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_msvc" -version = "0.42.1" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.48.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" -version = "0.4.6" +version = "0.5.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61de7bac303dc551fe038e2b3cef0f571087a47571ea6e79a87692ac99b99699" +checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" dependencies = [ "memchr", ] [[package]] name = "winnow" -version = "0.5.37" +version = "0.6.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7cad8365489051ae9f054164e459304af2e7e9bb407c958076c8bf4aef52da5" +checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b" dependencies = [ "memchr", ] @@ -7360,22 +7355,23 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.7.32" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" dependencies = [ + "byteorder", "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.32" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.79", ] [[package]] @@ -7389,14 +7385,13 @@ dependencies = [ [[package]] name = "zeroize_derive" -version = "1.3.3" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44bf07cb3e50ea2003396695d58bf46bc9887a1f362260446fad6bc4e79bd36c" +checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 1.0.107", - "synstructure", + "syn 2.0.79", ] [[package]] @@ -7420,11 +7415,10 @@ dependencies = [ [[package]] name = "zstd-sys" -version = "2.0.7+zstd.1.5.4" +version = "2.0.13+zstd.1.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94509c3ba2fe55294d752b79842c530ccfab760192521df74a081a78d2b3c7f5" +checksum = "38ff0f21cfee8f97d94cef41359e0c89aa6113028ab0291aa8ca0038995a95aa" dependencies = [ "cc", - "libc", "pkg-config", ] diff --git a/Cargo.toml b/Cargo.toml index 44a44394..1136f1e2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -150,3 +150,7 @@ pythonize = "0.20.0" bs58 = "0.4.0" thiserror = "^1.0.31" camelpaste = "0.1.0" + + +[patch.crates-io] +solana-svm = { git = "https://github.com/kevinheavey/agave", rev = "5e3b64ccf335b8ca64344f00ee188859a4b9b844" } From 11757b18b7d602bf07dd90a6491098b24102c0e8 Mon Sep 17 00:00:00 2001 From: kevinheavey Date: Tue, 15 Oct 2024 02:38:26 +0400 Subject: [PATCH 14/16] remove more protobuf junk --- .github/workflows/build.yml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5071923e..df008e54 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -28,8 +28,6 @@ jobs: toolchain: nightly profile: minimal default: true - - name: Install protobuf compiler - run: brew install protobuf - name: Build wheels uses: messense/maturin-action@v1 with: @@ -56,8 +54,6 @@ jobs: toolchain: nightly profile: minimal default: true - - name: Install protobuf compiler - run: brew install protobuf - name: Build wheels uses: messense/maturin-action@v1 with: @@ -123,8 +119,6 @@ jobs: toolchain: nightly profile: minimal default: true - - name: Install protobuf compiler - run: sudo apt-get install protobuf-compiler - name: Build Wheels uses: messense/maturin-action@v1 with: @@ -185,8 +179,6 @@ jobs: toolchain: nightly profile: minimal default: true - - name: Install protobuf compiler - run: sudo apt-get install protobuf-compiler - name: Build wheels uses: messense/maturin-action@v1 with: From bda8be7f9af40c189c77ac865f84ae8e1ed7dc53 Mon Sep 17 00:00:00 2001 From: kevinheavey Date: Tue, 15 Oct 2024 17:32:36 +0400 Subject: [PATCH 15/16] get solana 2.0 deps working --- Cargo.lock | 2205 ++++++++++++------------ Cargo.toml | 25 +- crates/bankrun/src/lib.rs | 26 +- crates/token/Cargo.toml | 4 +- crates/token/src/associated.rs | 2 +- tests/bankrun/clock-example/Cargo.toml | 1 + tests/test_transaction.py | 26 - 7 files changed, 1116 insertions(+), 1173 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 48dd24a5..e4f438ee 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -63,6 +63,15 @@ dependencies = [ "zeroize", ] +[[package]] +name = "agave-transaction-view" +version = "2.1.0" +source = "git+https://github.com/anza-xyz/agave.git?rev=3628c03#3628c03195140534745e268f668be0f72cfed9d8" +dependencies = [ + "solana-sdk", + "solana-svm-transaction", +] + [[package]] name = "ahash" version = "0.8.11" @@ -115,15 +124,6 @@ dependencies = [ "libc", ] -[[package]] -name = "ansi_term" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" -dependencies = [ - "winapi", -] - [[package]] name = "anyhow" version = "1.0.89" @@ -331,7 +331,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" dependencies = [ "concurrent-queue", - "event-listener", + "event-listener 2.5.3", "futures-core", ] @@ -350,12 +350,14 @@ dependencies = [ ] [[package]] -name = "async-mutex" -version = "1.4.0" +name = "async-lock" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "479db852db25d9dbf6204e6cb6253698f175c15726470f78af0d918e99d6156e" +checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18" dependencies = [ - "event-listener", + "event-listener 5.3.1", + "event-listener-strategy", + "pin-project-lite", ] [[package]] @@ -460,9 +462,9 @@ dependencies = [ [[package]] name = "blake3" -version = "1.5.1" +version = "1.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30cca6d3674597c30ddf2c587bf8d9d65c9a84d2326d941cc79c9842dfe0ef52" +checksum = "d82033247fd8e890df8f740e407ad4d038debb9eb1f40533fffb32e7d17dc6f7" dependencies = [ "arrayref", "arrayvec", @@ -478,7 +480,6 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" dependencies = [ - "block-padding", "generic-array", ] @@ -491,12 +492,6 @@ dependencies = [ "generic-array", ] -[[package]] -name = "block-padding" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae" - [[package]] name = "borsh" version = "0.10.4" @@ -514,7 +509,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a6362ed55def622cddc70a4746a68554d7b687713770de539e59a739b249f8ed" dependencies = [ "borsh-derive 1.5.1", - "cfg_aliases 0.2.1", + "cfg_aliases", ] [[package]] @@ -699,16 +694,16 @@ dependencies = [ ] [[package]] -name = "cfg-if" -version = "1.0.0" +name = "cesu8" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" [[package]] -name = "cfg_aliases" -version = "0.1.1" +name = "cfg-if" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "cfg_aliases" @@ -750,46 +745,6 @@ dependencies = [ "inout", ] -[[package]] -name = "clap" -version = "2.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" -dependencies = [ - "ansi_term", - "atty", - "bitflags 1.3.2", - "strsim 0.8.0", - "textwrap 0.11.0", - "unicode-width", - "vec_map", -] - -[[package]] -name = "clap" -version = "3.2.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123" -dependencies = [ - "atty", - "bitflags 1.3.2", - "clap_lex", - "indexmap 1.9.3", - "once_cell", - "strsim 0.10.0", - "termcolor", - "textwrap 0.16.1", -] - -[[package]] -name = "clap_lex" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" -dependencies = [ - "os_str_bytes", -] - [[package]] name = "combine" version = "3.8.1" @@ -803,6 +758,16 @@ dependencies = [ "unreachable", ] +[[package]] +name = "combine" +version = "4.6.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd" +dependencies = [ + "bytes", + "memchr", +] + [[package]] name = "concurrent-queue" version = "2.5.0" @@ -964,17 +929,44 @@ dependencies = [ [[package]] name = "curve25519-dalek" version = "3.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90f9d052967f590a76e62eb387bd0bbb1b000182c3cefe5364db6b7211651bc0" +source = "git+https://github.com/anza-xyz/curve25519-dalek.git?rev=b500cdc2a920cd5bff9e2dd974d7b97349d61464#b500cdc2a920cd5bff9e2dd974d7b97349d61464" dependencies = [ "byteorder", "digest 0.9.0", "rand_core 0.5.1", + "subtle", + "zeroize", +] + +[[package]] +name = "curve25519-dalek" +version = "4.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97fb8b7c4503de7d6ae7b42ab72a5a59857b4c937ec27a3d4539dba95b5ab2be" +dependencies = [ + "cfg-if", + "cpufeatures", + "curve25519-dalek-derive", + "digest 0.10.7", + "fiat-crypto", + "rand_core 0.6.4", + "rustc_version", "serde", "subtle", "zeroize", ] +[[package]] +name = "curve25519-dalek-derive" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.79", +] + [[package]] name = "darling" version = "0.13.4" @@ -1118,18 +1110,6 @@ dependencies = [ "syn 2.0.79", ] -[[package]] -name = "dialoguer" -version = "0.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59c6f2989294b9a498d3ad5491a79c6deb604617378e1cdc4bfc1c1361fe2f87" -dependencies = [ - "console", - "shell-words", - "tempfile", - "zeroize", -] - [[package]] name = "dict_derive" version = "0.5.1" @@ -1237,7 +1217,7 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c762bae6dcaf24c4c84667b8579785430908723d5c889f469d76a41d59cc7a9d" dependencies = [ - "curve25519-dalek", + "curve25519-dalek 3.2.1", "ed25519", "rand 0.7.3", "serde", @@ -1358,6 +1338,27 @@ version = "2.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" +[[package]] +name = "event-listener" +version = "5.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener-strategy" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" +dependencies = [ + "event-listener 5.3.1", + "pin-project-lite", +] + [[package]] name = "fastrand" version = "2.1.1" @@ -1370,6 +1371,12 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "835a3dc7d1ec9e75e2b5fb4ba75396837112d2060b03f7d43bc1897c7f7211da" +[[package]] +name = "fiat-crypto" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d" + [[package]] name = "filetime" version = "0.2.25" @@ -1493,6 +1500,12 @@ version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" +[[package]] +name = "futures-timer" +version = "3.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24" + [[package]] name = "futures-util" version = "0.3.31" @@ -1565,14 +1578,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" [[package]] -name = "goblin" -version = "0.5.4" +name = "governor" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7666983ed0dd8d21a6f6576ee00053ca0926fb281a5522577a4dbd0f1b54143" +checksum = "68a7f542ee6b35af73b06abc0dad1c1bae89964e4e253bc4b587b91c9637867b" dependencies = [ - "log", - "plain", - "scroll", + "cfg-if", + "dashmap", + "futures", + "futures-timer", + "no-std-compat", + "nonzero_ext", + "parking_lot", + "portable-atomic", + "quanta", + "rand 0.8.5", + "smallvec", + "spinning_top", ] [[package]] @@ -1587,7 +1609,7 @@ dependencies = [ "futures-sink", "futures-util", "http", - "indexmap 2.6.0", + "indexmap", "slab", "tokio", "tokio-util 0.7.12", @@ -1609,12 +1631,6 @@ dependencies = [ "byteorder", ] -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" - [[package]] name = "hashbrown" version = "0.13.2" @@ -1766,7 +1782,7 @@ dependencies = [ "futures-util", "http", "hyper", - "rustls", + "rustls 0.21.12", "tokio", "tokio-rustls", ] @@ -1851,16 +1867,6 @@ version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4e6ba961c14e98151cd6416dd3685efe786a94c38bc1a535c06ceff0a1600813" -[[package]] -name = "indexmap" -version = "1.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" -dependencies = [ - "autocfg", - "hashbrown 0.12.3", -] - [[package]] name = "indexmap" version = "2.6.0" @@ -1938,6 +1944,26 @@ version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" +[[package]] +name = "jni" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6df18c2e3db7e453d3c6ac5b3e9d5182664d28788126d39b91f2d1e22b017ec" +dependencies = [ + "cesu8", + "combine 4.6.7", + "jni-sys", + "log", + "thiserror", + "walkdir", +] + +[[package]] +name = "jni-sys" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" + [[package]] name = "jobserver" version = "0.1.32" @@ -2233,17 +2259,23 @@ dependencies = [ [[package]] name = "nix" -version = "0.28.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" +checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" dependencies = [ "bitflags 2.6.0", "cfg-if", - "cfg_aliases 0.1.1", + "cfg_aliases", "libc", "memoffset", ] +[[package]] +name = "no-std-compat" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b93853da6d84c2e3c7d730d6473e8817692dd89be387eb01b94d7f108ecb5b8c" + [[package]] name = "nom" version = "7.1.3" @@ -2254,6 +2286,12 @@ dependencies = [ "minimal-lexical", ] +[[package]] +name = "nonzero_ext" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38bf9645c8b145698bb0b18a4637dcacbc421ea49bef2317e4fd8065a387cf21" + [[package]] name = "normalize-line-endings" version = "0.3.0" @@ -2456,10 +2494,10 @@ dependencies = [ ] [[package]] -name = "os_str_bytes" -version = "6.6.1" +name = "parking" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2355d85b9a3786f481747ced0e0ff2ba35213a1f9bd406ed906554d7af805a1" +checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba" [[package]] name = "parking_lot" @@ -2490,15 +2528,6 @@ version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" -[[package]] -name = "pbkdf2" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "216eaa586a190f0a738f2f918511eecfa90f13295abec0e457cdebcceda80cbd" -dependencies = [ - "crypto-mac", -] - [[package]] name = "pbkdf2" version = "0.11.0" @@ -2570,12 +2599,6 @@ version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" -[[package]] -name = "plain" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6" - [[package]] name = "polyval" version = "0.6.2" @@ -2796,18 +2819,34 @@ dependencies = [ "syn 2.0.79", ] +[[package]] +name = "quanta" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e5167a477619228a0b284fac2674e3c388cba90631d7b7de620e6f1fcd08da5" +dependencies = [ + "crossbeam-utils", + "libc", + "once_cell", + "raw-cpuid", + "wasi 0.11.0+wasi-snapshot-preview1", + "web-sys", + "winapi", +] + [[package]] name = "quinn" -version = "0.10.2" +version = "0.11.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cc2c5017e4b43d5995dcea317bc46c1e09404c0a9664d2908f7f02dfe943d75" +checksum = "8c7c5fdde3cdae7203427dc4f0a68fe0ed09833edc525a03456b153b79828684" dependencies = [ "bytes", "pin-project-lite", "quinn-proto", "quinn-udp", "rustc-hash", - "rustls", + "rustls 0.23.14", + "socket2", "thiserror", "tokio", "tracing", @@ -2815,16 +2854,16 @@ dependencies = [ [[package]] name = "quinn-proto" -version = "0.10.6" +version = "0.11.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "141bf7dfde2fbc246bfd3fe12f2455aa24b0fbd9af535d8c86c7bd1381ff2b1a" +checksum = "fadfaed2cd7f389d0161bb73eeb07b7b78f8691047a6f3e73caaeae55310a4a6" dependencies = [ "bytes", "rand 0.8.5", - "ring 0.16.20", + "ring", "rustc-hash", - "rustls", - "rustls-native-certs", + "rustls 0.23.14", + "rustls-platform-verifier", "slab", "thiserror", "tinyvec", @@ -2833,15 +2872,15 @@ dependencies = [ [[package]] name = "quinn-udp" -version = "0.4.1" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "055b4e778e8feb9f93c4e439f71dc2156ef13360b432b799e179a8c4cdf0b1d7" +checksum = "4fe68c2e9e1a1234e218683dbdf9f9dfcb094113c5ac2b938dfcb9bab4c4140b" dependencies = [ - "bytes", "libc", + "once_cell", "socket2", "tracing", - "windows-sys 0.48.0", + "windows-sys 0.59.0", ] [[package]] @@ -2933,6 +2972,15 @@ dependencies = [ "rand_core 0.6.4", ] +[[package]] +name = "raw-cpuid" +version = "11.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ab240315c661615f2ee9f0f2cd32d5a7343a84d5ebcccb99d46e6637565e7b0" +dependencies = [ + "bitflags 2.6.0", +] + [[package]] name = "rayon" version = "1.10.0" @@ -3016,8 +3064,8 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", - "rustls", - "rustls-pemfile", + "rustls 0.21.12", + "rustls-pemfile 1.0.4", "serde", "serde_json", "serde_urlencoded", @@ -3050,21 +3098,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "ring" -version = "0.16.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" -dependencies = [ - "cc", - "libc", - "once_cell", - "spin 0.5.2", - "untrusted 0.7.1", - "web-sys", - "winapi", -] - [[package]] name = "ring" version = "0.17.8" @@ -3075,32 +3108,11 @@ dependencies = [ "cfg-if", "getrandom 0.2.15", "libc", - "spin 0.9.8", - "untrusted 0.9.0", + "spin", + "untrusted", "windows-sys 0.52.0", ] -[[package]] -name = "rpassword" -version = "7.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80472be3c897911d0137b2d2b9055faf6eeac5b14e324073d83bc17b191d7e3f" -dependencies = [ - "libc", - "rtoolbox", - "windows-sys 0.48.0", -] - -[[package]] -name = "rtoolbox" -version = "0.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c247d24e63230cdb56463ae328478bd5eac8b8faa8c69461a77e8e323afac90e" -dependencies = [ - "libc", - "windows-sys 0.48.0", -] - [[package]] name = "rustc-demangle" version = "0.1.24" @@ -3109,9 +3121,9 @@ checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "rustc-hash" -version = "1.1.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" +checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152" [[package]] name = "rustc_version" @@ -3151,19 +3163,34 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" dependencies = [ "log", - "ring 0.17.8", - "rustls-webpki", + "ring", + "rustls-webpki 0.101.7", "sct", ] +[[package]] +name = "rustls" +version = "0.23.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "415d9944693cb90382053259f89fbb077ea730ad7273047ec63b19bc9b160ba8" +dependencies = [ + "once_cell", + "ring", + "rustls-pki-types", + "rustls-webpki 0.102.8", + "subtle", + "zeroize", +] + [[package]] name = "rustls-native-certs" -version = "0.6.3" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00" +checksum = "e5bfb394eeed242e909609f56089eecfe5fda225042e8b171791b9c95f5931e5" dependencies = [ "openssl-probe", - "rustls-pemfile", + "rustls-pemfile 2.2.0", + "rustls-pki-types", "schannel", "security-framework", ] @@ -3178,29 +3205,82 @@ dependencies = [ ] [[package]] -name = "rustls-webpki" -version = "0.101.7" +name = "rustls-pemfile" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" +checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50" dependencies = [ - "ring 0.17.8", - "untrusted 0.9.0", + "rustls-pki-types", ] [[package]] -name = "rustversion" -version = "1.0.18" +name = "rustls-pki-types" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e819f2bc632f285be6d7cd36e25940d45b2391dd6d9b939e79de557f7014248" +checksum = "16f1201b3c9a7ee8039bcadc17b7e605e2945b27eee7631788c1bd2b0643674b" [[package]] -name = "ryu" -version = "1.0.18" +name = "rustls-platform-verifier" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" +checksum = "afbb878bdfdf63a336a5e63561b1835e7a8c91524f51621db870169eac84b490" +dependencies = [ + "core-foundation", + "core-foundation-sys", + "jni", + "log", + "once_cell", + "rustls 0.23.14", + "rustls-native-certs", + "rustls-platform-verifier-android", + "rustls-webpki 0.102.8", + "security-framework", + "security-framework-sys", + "webpki-roots 0.26.6", + "winapi", +] [[package]] -name = "same-file" +name = "rustls-platform-verifier-android" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f87165f0995f63a9fbeea62b64d10b4d9d8e78ec6d7d51fb2125fda7bb36788f" + +[[package]] +name = "rustls-webpki" +version = "0.101.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "rustls-webpki" +version = "0.102.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9" +dependencies = [ + "ring", + "rustls-pki-types", + "untrusted", +] + +[[package]] +name = "rustversion" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e819f2bc632f285be6d7cd36e25940d45b2391dd6d9b939e79de557f7014248" + +[[package]] +name = "ryu" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" + +[[package]] +name = "same-file" version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" @@ -3228,20 +3308,6 @@ name = "scroll" version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "04c565b551bafbef4157586fa379538366e4385d42082f255bfd96e4fe8519da" -dependencies = [ - "scroll_derive", -] - -[[package]] -name = "scroll_derive" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1db149f81d46d2deba7cd3c50772474707729550221e69588478ebf9ada425ae" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.79", -] [[package]] name = "sct" @@ -3249,8 +3315,8 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" dependencies = [ - "ring 0.17.8", - "untrusted 0.9.0", + "ring", + "untrusted", ] [[package]] @@ -3263,6 +3329,7 @@ dependencies = [ "core-foundation", "core-foundation-sys", "libc", + "num-bigint 0.4.6", "security-framework-sys", ] @@ -3376,12 +3443,13 @@ dependencies = [ [[package]] name = "serde_with" -version = "2.3.3" +version = "3.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07ff71d2c147a7b57362cead5e22f772cd52f6ab31cfcd9edcd7f6aeb2a0afbe" +checksum = "8e28bdad6db2b8340e449f7108f020b3b092e8583a9e3fb82713e1d4e71fe817" dependencies = [ "serde", - "serde_with_macros 2.3.3", + "serde_derive", + "serde_with_macros 3.11.0", ] [[package]] @@ -3398,9 +3466,9 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "2.3.3" +version = "3.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "881b6f881b17d13214e5d494c939ebab463d01264ce1811e9d4ac3a882e7695f" +checksum = "9d846214a9854ef724f3da161b426242d8de7c1fc7de2f89bb1efcb154dca79d" dependencies = [ "darling 0.20.10", "proc-macro2", @@ -3443,18 +3511,6 @@ dependencies = [ "digest 0.10.7", ] -[[package]] -name = "sha3" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f81199417d4e5de3f04b1e871023acea7389672c4135918f05aa9cbf2f2fa809" -dependencies = [ - "block-buffer 0.9.0", - "digest 0.9.0", - "keccak", - "opaque-debug", -] - [[package]] name = "sha3" version = "0.10.8" @@ -3474,12 +3530,6 @@ dependencies = [ "lazy_static", ] -[[package]] -name = "shell-words" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde" - [[package]] name = "shlex" version = "1.3.0" @@ -3542,11 +3592,22 @@ dependencies = [ "windows-sys 0.52.0", ] +[[package]] +name = "solana-account" +version = "2.1.0" +source = "git+https://github.com/anza-xyz/agave.git?rev=3628c03#3628c03195140534745e268f668be0f72cfed9d8" +dependencies = [ + "bincode", + "serde", + "serde_bytes", + "serde_derive", + "solana-program", +] + [[package]] name = "solana-account-decoder" -version = "2.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41d87c6ef8c13eb759fa8d887e12c67afd851799050b6afd501a27726551f52e" +version = "2.1.0" +source = "git+https://github.com/anza-xyz/agave.git?rev=3628c03#3628c03195140534745e268f668be0f72cfed9d8" dependencies = [ "Inflector", "base64 0.22.1", @@ -3557,22 +3618,50 @@ dependencies = [ "serde", "serde_derive", "serde_json", + "solana-account-decoder-client-types", "solana-config-program", - "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", - "spl-token", - "spl-token-2022 4.0.0", - "spl-token-group-interface 0.3.0", - "spl-token-metadata-interface 0.4.0", + "solana-sdk", + "spl-token 6.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "spl-token-2022", + "spl-token-group-interface", + "spl-token-metadata-interface", "thiserror", - "zstd", + "zstd 0.13.2", +] + +[[package]] +name = "solana-account-decoder-client-types" +version = "2.1.0" +source = "git+https://github.com/anza-xyz/agave.git?rev=3628c03#3628c03195140534745e268f668be0f72cfed9d8" +dependencies = [ + "base64 0.22.1", + "bs58 0.5.1", + "serde", + "serde_derive", + "serde_json", + "solana-account", + "solana-pubkey", + "zstd 0.13.2", +] + +[[package]] +name = "solana-account-info" +version = "2.1.0" +source = "git+https://github.com/anza-xyz/agave.git?rev=3628c03#3628c03195140534745e268f668be0f72cfed9d8" +dependencies = [ + "bincode", + "serde", + "solana-program-error", + "solana-program-memory", + "solana-pubkey", ] [[package]] name = "solana-accounts-db" -version = "2.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6431d2054df30bbd5b16b32a46186e103cb13478754d1bc34b4bfb59bd9c5677" +version = "2.1.0" +source = "git+https://github.com/anza-xyz/agave.git?rev=3628c03#3628c03195140534745e268f668be0f72cfed9d8" dependencies = [ + "ahash", "bincode", "blake3", "bv", @@ -3582,7 +3671,7 @@ dependencies = [ "crossbeam-channel", "dashmap", "index_list", - "indexmap 2.6.0", + "indexmap", "itertools 0.12.1", "lazy_static", "log", @@ -3593,19 +3682,19 @@ dependencies = [ "num_enum", "rand 0.8.5", "rayon", - "rustc_version", "seqlock", "serde", "serde_derive", "smallvec", "solana-bucket-map", "solana-inline-spl", - "solana-measure 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-metrics 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-lattice-hash", + "solana-measure", + "solana-metrics", "solana-nohash-hasher", "solana-rayon-threadlimit", - "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-svm", + "solana-sdk", + "solana-svm-transaction", "static_assertions", "tar", "tempfile", @@ -3614,33 +3703,40 @@ dependencies = [ [[package]] name = "solana-address-lookup-table-program" -version = "2.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cfb847bf375f662ecad6082eaad747980416de6d74c4137f434a830f935ce7b" +version = "2.1.0" +source = "git+https://github.com/anza-xyz/agave.git?rev=3628c03#3628c03195140534745e268f668be0f72cfed9d8" dependencies = [ "bincode", "bytemuck", "log", "num-derive", "num-traits", - "rustc_version", - "solana-program 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-program-runtime 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-feature-set", + "solana-log-collector", + "solana-program", + "solana-program-runtime", + "solana-sdk", "thiserror", ] +[[package]] +name = "solana-atomic-u64" +version = "2.1.0" +source = "git+https://github.com/anza-xyz/agave.git?rev=3628c03#3628c03195140534745e268f668be0f72cfed9d8" +dependencies = [ + "parking_lot", +] + [[package]] name = "solana-banks-client" -version = "2.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31871e4002b2a622b54b80cb77f85252e0d9112d665dabd34e9a2ace7cab5abc" +version = "2.1.0" +source = "git+https://github.com/anza-xyz/agave.git?rev=3628c03#3628c03195140534745e268f668be0f72cfed9d8" dependencies = [ "borsh 1.5.1", "futures", "solana-banks-interface", - "solana-program 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-program", + "solana-sdk", "tarpc", "thiserror", "tokio", @@ -3649,29 +3745,28 @@ dependencies = [ [[package]] name = "solana-banks-interface" -version = "2.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3aab1264080817f152525b842cc6a40df9fa5ce72e596a93337c3e6e5d89b905" +version = "2.1.0" +source = "git+https://github.com/anza-xyz/agave.git?rev=3628c03#3628c03195140534745e268f668be0f72cfed9d8" dependencies = [ "serde", "serde_derive", - "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-sdk", "tarpc", ] [[package]] name = "solana-banks-server" -version = "2.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e968a8b85e2c39fc8795ce9c193f428e4ebb40eb7ffb6c6b0bd034396717df09" +version = "2.1.0" +source = "git+https://github.com/anza-xyz/agave.git?rev=3628c03#3628c03195140534745e268f668be0f72cfed9d8" dependencies = [ "bincode", "crossbeam-channel", "futures", "solana-banks-interface", "solana-client", + "solana-feature-set", "solana-runtime", - "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-sdk", "solana-send-transaction-service", "solana-svm", "tarpc", @@ -3680,53 +3775,49 @@ dependencies = [ ] [[package]] -name = "solana-bpf-loader-program" -version = "2.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d08fcde4e079069484b54aa7f1d2ec10763b1b271a7166f1ce363db318ff8ed2" +name = "solana-bn254" +version = "2.1.0" +source = "git+https://github.com/anza-xyz/agave.git?rev=3628c03#3628c03195140534745e268f668be0f72cfed9d8" dependencies = [ - "bincode", - "byteorder", - "libsecp256k1", - "log", - "scopeguard", - "solana-compute-budget 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-curve25519 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-measure 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-poseidon 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-program-runtime 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-type-overrides 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", - "solana_rbpf", + "ark-bn254", + "ark-ec", + "ark-ff", + "ark-serialize", + "bytemuck", + "solana-program", "thiserror", ] [[package]] name = "solana-bpf-loader-program" -version = "2.0.13" -source = "git+https://github.com/kevinheavey/agave?rev=5e3b64ccf335b8ca64344f00ee188859a4b9b844#5e3b64ccf335b8ca64344f00ee188859a4b9b844" +version = "2.1.0" +source = "git+https://github.com/anza-xyz/agave.git?rev=3628c03#3628c03195140534745e268f668be0f72cfed9d8" dependencies = [ "bincode", "byteorder", "libsecp256k1", "log", "scopeguard", - "solana-compute-budget 2.0.13 (git+https://github.com/kevinheavey/agave?rev=5e3b64ccf335b8ca64344f00ee188859a4b9b844)", - "solana-curve25519 2.0.13 (git+https://github.com/kevinheavey/agave?rev=5e3b64ccf335b8ca64344f00ee188859a4b9b844)", - "solana-measure 2.0.13 (git+https://github.com/kevinheavey/agave?rev=5e3b64ccf335b8ca64344f00ee188859a4b9b844)", - "solana-poseidon 2.0.13 (git+https://github.com/kevinheavey/agave?rev=5e3b64ccf335b8ca64344f00ee188859a4b9b844)", - "solana-program-runtime 2.0.13 (git+https://github.com/kevinheavey/agave?rev=5e3b64ccf335b8ca64344f00ee188859a4b9b844)", - "solana-sdk 2.0.13 (git+https://github.com/kevinheavey/agave?rev=5e3b64ccf335b8ca64344f00ee188859a4b9b844)", - "solana-type-overrides 2.0.13 (git+https://github.com/kevinheavey/agave?rev=5e3b64ccf335b8ca64344f00ee188859a4b9b844)", + "solana-bn254", + "solana-compute-budget", + "solana-curve25519", + "solana-feature-set", + "solana-log-collector", + "solana-measure", + "solana-poseidon", + "solana-program-memory", + "solana-program-runtime", + "solana-sdk", + "solana-timings", + "solana-type-overrides", "solana_rbpf", "thiserror", ] [[package]] name = "solana-bucket-map" -version = "2.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aab25a4121fef09620964308e9024d9e6a0875ae49b3ae01690d24f1478b0be5" +version = "2.1.0" +source = "git+https://github.com/anza-xyz/agave.git?rev=3628c03#3628c03195140534745e268f668be0f72cfed9d8" dependencies = [ "bv", "bytemuck", @@ -3736,53 +3827,53 @@ dependencies = [ "modular-bitfield", "num_enum", "rand 0.8.5", - "solana-measure 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-measure", + "solana-sdk", "tempfile", ] [[package]] -name = "solana-clap-utils" -version = "2.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f9709683a4d480a0185827292405cad0b6f414abaa479c7d1dfe5e2194aeec8" +name = "solana-builtins-default-costs" +version = "2.1.0" +source = "git+https://github.com/anza-xyz/agave.git?rev=3628c03#3628c03195140534745e268f668be0f72cfed9d8" dependencies = [ - "chrono", - "clap 2.34.0", - "rpassword", - "solana-remote-wallet", - "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", - "thiserror", - "tiny-bip39", - "uriparse", - "url", + "ahash", + "lazy_static", + "log", + "solana-address-lookup-table-program", + "solana-bpf-loader-program", + "solana-compute-budget-program", + "solana-config-program", + "solana-loader-v4-program", + "solana-sdk", + "solana-stake-program", + "solana-system-program", + "solana-vote-program", ] [[package]] name = "solana-client" -version = "2.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67169e4f1faabb717ce81b5ca93960da21e3ac5c9b75cb6792f9b3ce38db459f" +version = "2.1.0" +source = "git+https://github.com/anza-xyz/agave.git?rev=3628c03#3628c03195140534745e268f668be0f72cfed9d8" dependencies = [ "async-trait", "bincode", "dashmap", "futures", "futures-util", - "indexmap 2.6.0", + "indexmap", "indicatif", "log", "quinn", "rayon", "solana-connection-cache", - "solana-measure 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-metrics 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-measure", "solana-pubsub-client", "solana-quic-client", "solana-rpc-client", "solana-rpc-client-api", "solana-rpc-client-nonce-utils", - "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-sdk", "solana-streamer", "solana-thin-client", "solana-tpu-client", @@ -3792,224 +3883,259 @@ dependencies = [ ] [[package]] -name = "solana-compute-budget" -version = "2.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5acde49a883ca3e099a8050ad8321ea56b02041995dadcf84b0dab14561cc34a" +name = "solana-clock" +version = "2.1.0" +source = "git+https://github.com/anza-xyz/agave.git?rev=3628c03#3628c03195140534745e268f668be0f72cfed9d8" dependencies = [ - "rustc_version", - "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "serde", + "serde_derive", + "solana-sdk-macro", ] [[package]] name = "solana-compute-budget" -version = "2.0.13" -source = "git+https://github.com/kevinheavey/agave?rev=5e3b64ccf335b8ca64344f00ee188859a4b9b844#5e3b64ccf335b8ca64344f00ee188859a4b9b844" +version = "2.1.0" +source = "git+https://github.com/anza-xyz/agave.git?rev=3628c03#3628c03195140534745e268f668be0f72cfed9d8" dependencies = [ - "rustc_version", - "solana-sdk 2.0.13 (git+https://github.com/kevinheavey/agave?rev=5e3b64ccf335b8ca64344f00ee188859a4b9b844)", + "solana-sdk", ] [[package]] name = "solana-compute-budget-program" -version = "2.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30d9a4850f254e23a6306a8eafa7bf8ecaf05d907d18b31ff096ea63f4c5ab32" +version = "2.1.0" +source = "git+https://github.com/anza-xyz/agave.git?rev=3628c03#3628c03195140534745e268f668be0f72cfed9d8" dependencies = [ - "solana-program-runtime 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-program-runtime", + "solana-sdk", ] [[package]] name = "solana-config-program" -version = "2.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f638e44fb308bdc1ce99eb0fee194b2cb212917b258999cdb4a8b056d48973d4" +version = "2.1.0" +source = "git+https://github.com/anza-xyz/agave.git?rev=3628c03#3628c03195140534745e268f668be0f72cfed9d8" dependencies = [ "bincode", "chrono", "serde", "serde_derive", - "solana-program-runtime 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-log-collector", + "solana-program-runtime", + "solana-sdk", + "solana-short-vec", ] [[package]] name = "solana-connection-cache" -version = "2.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fd01a4d43b780996970cb3669946b002f71d34e6a26a19bd6d2a74513ecc0aa" +version = "2.1.0" +source = "git+https://github.com/anza-xyz/agave.git?rev=3628c03#3628c03195140534745e268f668be0f72cfed9d8" dependencies = [ "async-trait", "bincode", "crossbeam-channel", "futures-util", - "indexmap 2.6.0", + "indexmap", "log", "rand 0.8.5", "rayon", - "solana-measure 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-metrics 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-measure", + "solana-metrics", + "solana-sdk", "thiserror", "tokio", ] [[package]] name = "solana-cost-model" -version = "2.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a67709a37a380262f3be376d90e3b1567205ae271d1a3395019e6ae5974967eb" +version = "2.1.0" +source = "git+https://github.com/anza-xyz/agave.git?rev=3628c03#3628c03195140534745e268f668be0f72cfed9d8" dependencies = [ "ahash", "lazy_static", "log", - "rustc_version", - "solana-address-lookup-table-program", - "solana-bpf-loader-program 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-compute-budget 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-compute-budget-program", - "solana-config-program", - "solana-loader-v4-program 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-metrics 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-stake-program", - "solana-system-program 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-builtins-default-costs", + "solana-compute-budget", + "solana-feature-set", + "solana-metrics", + "solana-runtime-transaction", + "solana-sdk", + "solana-svm-transaction", "solana-vote-program", ] [[package]] name = "solana-curve25519" -version = "2.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44b61d8eda3319deca3627e3eb3970ce2ad179ad39c106d6c003d06c90e3031d" +version = "2.1.0" +source = "git+https://github.com/anza-xyz/agave.git?rev=3628c03#3628c03195140534745e268f668be0f72cfed9d8" dependencies = [ "bytemuck", "bytemuck_derive", - "curve25519-dalek", - "solana-program 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "curve25519-dalek 4.1.3", + "solana-program", "thiserror", ] [[package]] -name = "solana-curve25519" -version = "2.0.13" -source = "git+https://github.com/kevinheavey/agave?rev=5e3b64ccf335b8ca64344f00ee188859a4b9b844#5e3b64ccf335b8ca64344f00ee188859a4b9b844" +name = "solana-decode-error" +version = "2.1.0" +source = "git+https://github.com/anza-xyz/agave.git?rev=3628c03#3628c03195140534745e268f668be0f72cfed9d8" +dependencies = [ + "num-traits", +] + +[[package]] +name = "solana-define-syscall" +version = "2.1.0" +source = "git+https://github.com/anza-xyz/agave.git?rev=3628c03#3628c03195140534745e268f668be0f72cfed9d8" + +[[package]] +name = "solana-derivation-path" +version = "2.1.0" +source = "git+https://github.com/anza-xyz/agave.git?rev=3628c03#3628c03195140534745e268f668be0f72cfed9d8" +dependencies = [ + "derivation-path", + "qstring", + "thiserror", + "uriparse", +] + +[[package]] +name = "solana-feature-set" +version = "2.1.0" +source = "git+https://github.com/anza-xyz/agave.git?rev=3628c03#3628c03195140534745e268f668be0f72cfed9d8" +dependencies = [ + "lazy_static", + "solana-program", +] + +[[package]] +name = "solana-fee" +version = "2.1.0" +source = "git+https://github.com/anza-xyz/agave.git?rev=3628c03#3628c03195140534745e268f668be0f72cfed9d8" dependencies = [ + "solana-sdk", + "solana-svm-transaction", +] + +[[package]] +name = "solana-hash" +version = "2.1.0" +source = "git+https://github.com/anza-xyz/agave.git?rev=3628c03#3628c03195140534745e268f668be0f72cfed9d8" +dependencies = [ + "borsh 1.5.1", + "bs58 0.5.1", "bytemuck", "bytemuck_derive", - "curve25519-dalek", - "solana-program 2.0.13 (git+https://github.com/kevinheavey/agave?rev=5e3b64ccf335b8ca64344f00ee188859a4b9b844)", - "thiserror", + "js-sys", + "serde", + "serde_derive", + "solana-atomic-u64", + "solana-sanitize", + "wasm-bindgen", ] [[package]] name = "solana-inline-spl" -version = "2.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f6614014b976112fb6c9bf259f87c6659b8fdea628c656639e02211324d2b34" +version = "2.1.0" +source = "git+https://github.com/anza-xyz/agave.git?rev=3628c03#3628c03195140534745e268f668be0f72cfed9d8" dependencies = [ "bytemuck", - "rustc_version", - "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-program", ] [[package]] -name = "solana-loader-v4-program" -version = "2.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7866a1140ceb81de5b82bd779b0c63f888904574da128dd40bc17795be6f084" +name = "solana-instruction" +version = "2.1.0" +source = "git+https://github.com/anza-xyz/agave.git?rev=3628c03#3628c03195140534745e268f668be0f72cfed9d8" dependencies = [ - "log", - "solana-compute-budget 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-measure 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-program-runtime 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-type-overrides 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", - "solana_rbpf", + "bincode", + "borsh 1.5.1", + "getrandom 0.2.15", + "js-sys", + "num-traits", + "serde", + "serde_derive", + "solana-define-syscall", + "solana-pubkey", + "wasm-bindgen", +] + +[[package]] +name = "solana-lattice-hash" +version = "2.1.0" +source = "git+https://github.com/anza-xyz/agave.git?rev=3628c03#3628c03195140534745e268f668be0f72cfed9d8" +dependencies = [ + "base64 0.22.1", + "blake3", + "bytemuck", ] [[package]] name = "solana-loader-v4-program" -version = "2.0.13" -source = "git+https://github.com/kevinheavey/agave?rev=5e3b64ccf335b8ca64344f00ee188859a4b9b844#5e3b64ccf335b8ca64344f00ee188859a4b9b844" +version = "2.1.0" +source = "git+https://github.com/anza-xyz/agave.git?rev=3628c03#3628c03195140534745e268f668be0f72cfed9d8" dependencies = [ "log", - "solana-compute-budget 2.0.13 (git+https://github.com/kevinheavey/agave?rev=5e3b64ccf335b8ca64344f00ee188859a4b9b844)", - "solana-measure 2.0.13 (git+https://github.com/kevinheavey/agave?rev=5e3b64ccf335b8ca64344f00ee188859a4b9b844)", - "solana-program-runtime 2.0.13 (git+https://github.com/kevinheavey/agave?rev=5e3b64ccf335b8ca64344f00ee188859a4b9b844)", - "solana-sdk 2.0.13 (git+https://github.com/kevinheavey/agave?rev=5e3b64ccf335b8ca64344f00ee188859a4b9b844)", - "solana-type-overrides 2.0.13 (git+https://github.com/kevinheavey/agave?rev=5e3b64ccf335b8ca64344f00ee188859a4b9b844)", + "solana-bpf-loader-program", + "solana-compute-budget", + "solana-log-collector", + "solana-measure", + "solana-program-runtime", + "solana-sdk", + "solana-type-overrides", "solana_rbpf", ] [[package]] -name = "solana-logger" -version = "2.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6b996befdb2bdbd816524fc7afe0e158fced33ff61c36ab29ae803c0462455d" +name = "solana-log-collector" +version = "2.1.0" +source = "git+https://github.com/anza-xyz/agave.git?rev=3628c03#3628c03195140534745e268f668be0f72cfed9d8" dependencies = [ - "env_logger", - "lazy_static", "log", ] [[package]] -name = "solana-measure" -version = "2.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79d44cdbcf9e1489564cdae1cd92b8806b0ee89d05d36a58fef8c0d293ea7c2a" +name = "solana-logger" +version = "2.1.0" +source = "git+https://github.com/anza-xyz/agave.git?rev=3628c03#3628c03195140534745e268f668be0f72cfed9d8" dependencies = [ + "env_logger", + "lazy_static", "log", - "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "solana-measure" -version = "2.0.13" -source = "git+https://github.com/kevinheavey/agave?rev=5e3b64ccf335b8ca64344f00ee188859a4b9b844#5e3b64ccf335b8ca64344f00ee188859a4b9b844" -dependencies = [ - "log", - "solana-sdk 2.0.13 (git+https://github.com/kevinheavey/agave?rev=5e3b64ccf335b8ca64344f00ee188859a4b9b844)", -] +version = "2.1.0" +source = "git+https://github.com/anza-xyz/agave.git?rev=3628c03#3628c03195140534745e268f668be0f72cfed9d8" [[package]] name = "solana-metrics" -version = "2.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68979964a3a004f1af4f1571814817e7e050ef4c1b2a1bdaa3ff35e980072d69" +version = "2.1.0" +source = "git+https://github.com/anza-xyz/agave.git?rev=3628c03#3628c03195140534745e268f668be0f72cfed9d8" dependencies = [ "crossbeam-channel", "gethostname", "lazy_static", "log", "reqwest", - "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-sdk", "thiserror", ] [[package]] -name = "solana-metrics" -version = "2.0.13" -source = "git+https://github.com/kevinheavey/agave?rev=5e3b64ccf335b8ca64344f00ee188859a4b9b844#5e3b64ccf335b8ca64344f00ee188859a4b9b844" +name = "solana-msg" +version = "2.1.0" +source = "git+https://github.com/anza-xyz/agave.git?rev=3628c03#3628c03195140534745e268f668be0f72cfed9d8" dependencies = [ - "crossbeam-channel", - "gethostname", - "lazy_static", - "log", - "reqwest", - "solana-sdk 2.0.13 (git+https://github.com/kevinheavey/agave?rev=5e3b64ccf335b8ca64344f00ee188859a4b9b844)", - "thiserror", + "solana-define-syscall", ] [[package]] name = "solana-net-utils" -version = "2.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44bb419eb9293a277982cf14a58772e9b9ab30ff6f9421bc4ac0826d40122760" +version = "2.1.0" +source = "git+https://github.com/anza-xyz/agave.git?rev=3628c03#3628c03195140534745e268f668be0f72cfed9d8" dependencies = [ "bincode", - "clap 3.2.25", "crossbeam-channel", "log", "nix", @@ -4017,10 +4143,7 @@ dependencies = [ "serde", "serde_derive", "socket2", - "solana-logger", - "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-version", - "static_assertions", + "solana-sdk", "tokio", "url", ] @@ -4033,15 +4156,14 @@ checksum = "8b8a731ed60e89177c8a7ab05fe0f1511cedd3e70e773f288f9de33a9cfdc21e" [[package]] name = "solana-perf" -version = "2.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00c4128122787a61d8f94fdaa04cb71b3dbb017d9939ac4d632264c55ec345de" +version = "2.1.0" +source = "git+https://github.com/anza-xyz/agave.git?rev=3628c03#3628c03195140534745e268f668be0f72cfed9d8" dependencies = [ "ahash", "bincode", "bv", "caps", - "curve25519-dalek", + "curve25519-dalek 4.1.3", "dlopen2", "fnv", "lazy_static", @@ -4050,45 +4172,30 @@ dependencies = [ "nix", "rand 0.8.5", "rayon", - "rustc_version", "serde", - "solana-metrics 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-metrics", "solana-rayon-threadlimit", - "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-sdk", + "solana-short-vec", "solana-vote-program", ] [[package]] name = "solana-poseidon" -version = "2.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16cd1ecbbefa2e160f4c82734c2f38315005e1d8c3ddbdb20bfa50ea92264fdc" -dependencies = [ - "ark-bn254", - "light-poseidon", - "thiserror", -] - -[[package]] -name = "solana-poseidon" -version = "2.0.13" -source = "git+https://github.com/kevinheavey/agave?rev=5e3b64ccf335b8ca64344f00ee188859a4b9b844#5e3b64ccf335b8ca64344f00ee188859a4b9b844" +version = "2.1.0" +source = "git+https://github.com/anza-xyz/agave.git?rev=3628c03#3628c03195140534745e268f668be0f72cfed9d8" dependencies = [ "ark-bn254", "light-poseidon", + "solana-define-syscall", "thiserror", ] [[package]] name = "solana-program" -version = "2.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29249ce5b5c7bd018013adbb97439b0b1b986f16bb07c54db28f82e97baaa2f1" +version = "2.1.0" +source = "git+https://github.com/anza-xyz/agave.git?rev=3628c03#3628c03195140534745e268f668be0f72cfed9d8" dependencies = [ - "ark-bn254", - "ark-ec", - "ark-ff", - "ark-serialize", "base64 0.22.1", "bincode", "bitflags 2.6.0", @@ -4101,11 +4208,10 @@ dependencies = [ "bytemuck_derive", "console_error_panic_hook", "console_log", - "curve25519-dalek", + "curve25519-dalek 4.1.3", "getrandom 0.2.15", "js-sys", "lazy_static", - "libsecp256k1", "log", "memoffset", "num-bigint 0.4.6", @@ -4113,100 +4219,80 @@ dependencies = [ "num-traits", "parking_lot", "rand 0.8.5", - "rustc_version", - "rustversion", "serde", "serde_bytes", "serde_derive", "sha2 0.10.8", - "sha3 0.10.8", - "solana-sdk-macro 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "sha3", + "solana-account-info", + "solana-atomic-u64", + "solana-clock", + "solana-decode-error", + "solana-define-syscall", + "solana-hash", + "solana-instruction", + "solana-msg", + "solana-program-error", + "solana-program-memory", + "solana-program-option", + "solana-program-pack", + "solana-pubkey", + "solana-rent", + "solana-sanitize", + "solana-sdk-macro", + "solana-secp256k1-recover", + "solana-serde-varint", + "solana-serialize-utils", + "solana-sha256-hasher", + "solana-short-vec", "thiserror", "wasm-bindgen", ] [[package]] -name = "solana-program" -version = "2.0.13" -source = "git+https://github.com/kevinheavey/agave?rev=5e3b64ccf335b8ca64344f00ee188859a4b9b844#5e3b64ccf335b8ca64344f00ee188859a4b9b844" +name = "solana-program-error" +version = "2.1.0" +source = "git+https://github.com/anza-xyz/agave.git?rev=3628c03#3628c03195140534745e268f668be0f72cfed9d8" dependencies = [ - "ark-bn254", - "ark-ec", - "ark-ff", - "ark-serialize", - "base64 0.22.1", - "bincode", - "bitflags 2.6.0", - "blake3", - "borsh 0.10.4", "borsh 1.5.1", - "bs58 0.5.1", - "bv", - "bytemuck", - "bytemuck_derive", - "console_error_panic_hook", - "console_log", - "curve25519-dalek", - "getrandom 0.2.15", - "js-sys", - "lazy_static", - "libsecp256k1", - "log", - "memoffset", - "num-bigint 0.4.6", - "num-derive", "num-traits", - "parking_lot", - "rand 0.8.5", - "rustc_version", - "rustversion", "serde", - "serde_bytes", "serde_derive", - "sha2 0.10.8", - "sha3 0.10.8", - "solana-sdk-macro 2.0.13 (git+https://github.com/kevinheavey/agave?rev=5e3b64ccf335b8ca64344f00ee188859a4b9b844)", - "thiserror", - "wasm-bindgen", + "solana-decode-error", + "solana-instruction", + "solana-msg", + "solana-pubkey", ] [[package]] -name = "solana-program-runtime" -version = "2.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "948bfeb10ba38b55a8b2db2de8ccfa8f57b44b6d73c98e8e0de8b10f10ce043b" +name = "solana-program-memory" +version = "2.1.0" +source = "git+https://github.com/anza-xyz/agave.git?rev=3628c03#3628c03195140534745e268f668be0f72cfed9d8" dependencies = [ - "base64 0.22.1", - "bincode", - "eager", - "enum-iterator", - "itertools 0.12.1", - "libc", - "log", - "num-derive", "num-traits", - "percentage", - "rand 0.8.5", - "rustc_version", - "serde", - "solana-compute-budget 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-measure 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-metrics 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-type-overrides 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-vote 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", - "solana_rbpf", - "thiserror", + "solana-define-syscall", +] + +[[package]] +name = "solana-program-option" +version = "2.1.0" +source = "git+https://github.com/anza-xyz/agave.git?rev=3628c03#3628c03195140534745e268f668be0f72cfed9d8" + +[[package]] +name = "solana-program-pack" +version = "2.1.0" +source = "git+https://github.com/anza-xyz/agave.git?rev=3628c03#3628c03195140534745e268f668be0f72cfed9d8" +dependencies = [ + "solana-program-error", ] [[package]] name = "solana-program-runtime" -version = "2.0.13" -source = "git+https://github.com/kevinheavey/agave?rev=5e3b64ccf335b8ca64344f00ee188859a4b9b844#5e3b64ccf335b8ca64344f00ee188859a4b9b844" +version = "2.1.0" +source = "git+https://github.com/anza-xyz/agave.git?rev=3628c03#3628c03195140534745e268f668be0f72cfed9d8" dependencies = [ "base64 0.22.1", "bincode", - "eager", "enum-iterator", "itertools 0.12.1", "libc", @@ -4215,23 +4301,24 @@ dependencies = [ "num-traits", "percentage", "rand 0.8.5", - "rustc_version", "serde", - "solana-compute-budget 2.0.13 (git+https://github.com/kevinheavey/agave?rev=5e3b64ccf335b8ca64344f00ee188859a4b9b844)", - "solana-measure 2.0.13 (git+https://github.com/kevinheavey/agave?rev=5e3b64ccf335b8ca64344f00ee188859a4b9b844)", - "solana-metrics 2.0.13 (git+https://github.com/kevinheavey/agave?rev=5e3b64ccf335b8ca64344f00ee188859a4b9b844)", - "solana-sdk 2.0.13 (git+https://github.com/kevinheavey/agave?rev=5e3b64ccf335b8ca64344f00ee188859a4b9b844)", - "solana-type-overrides 2.0.13 (git+https://github.com/kevinheavey/agave?rev=5e3b64ccf335b8ca64344f00ee188859a4b9b844)", - "solana-vote 2.0.13 (git+https://github.com/kevinheavey/agave?rev=5e3b64ccf335b8ca64344f00ee188859a4b9b844)", + "solana-compute-budget", + "solana-feature-set", + "solana-log-collector", + "solana-measure", + "solana-metrics", + "solana-sdk", + "solana-timings", + "solana-type-overrides", + "solana-vote", "solana_rbpf", "thiserror", ] [[package]] name = "solana-program-test" -version = "2.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90fc0451bb2f44d5092239818a86a179600b351d04ca76ad720325bd70a7acf4" +version = "2.1.0" +source = "git+https://github.com/anza-xyz/agave.git?rev=3628c03#3628c03195140534745e268f668be0f72cfed9d8" dependencies = [ "assert_matches", "async-trait", @@ -4245,25 +4332,52 @@ dependencies = [ "solana-banks-client", "solana-banks-interface", "solana-banks-server", - "solana-bpf-loader-program 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-compute-budget 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-bpf-loader-program", + "solana-compute-budget", + "solana-feature-set", "solana-inline-spl", + "solana-instruction", + "solana-log-collector", "solana-logger", - "solana-program-runtime 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-program-runtime", "solana-runtime", - "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-sdk", "solana-svm", + "solana-timings", "solana-vote-program", "solana_rbpf", "thiserror", "tokio", ] +[[package]] +name = "solana-pubkey" +version = "2.1.0" +source = "git+https://github.com/anza-xyz/agave.git?rev=3628c03#3628c03195140534745e268f668be0f72cfed9d8" +dependencies = [ + "borsh 0.10.4", + "borsh 1.5.1", + "bs58 0.5.1", + "bytemuck", + "bytemuck_derive", + "curve25519-dalek 4.1.3", + "getrandom 0.2.15", + "js-sys", + "num-traits", + "serde", + "serde_derive", + "solana-atomic-u64", + "solana-decode-error", + "solana-define-syscall", + "solana-sanitize", + "solana-sha256-hasher", + "wasm-bindgen", +] + [[package]] name = "solana-pubsub-client" -version = "2.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3ce9fa94ef00f7dfec749fc6835a4c36e8cfa2166c4a80736af1b49ef5bcd8e" +version = "2.1.0" +source = "git+https://github.com/anza-xyz/agave.git?rev=3628c03#3628c03195140534745e268f668be0f72cfed9d8" dependencies = [ "crossbeam-channel", "futures-util", @@ -4275,7 +4389,7 @@ dependencies = [ "serde_json", "solana-account-decoder", "solana-rpc-client-api", - "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-sdk", "thiserror", "tokio", "tokio-stream", @@ -4286,11 +4400,10 @@ dependencies = [ [[package]] name = "solana-quic-client" -version = "2.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00764a5e5e36a94515d05f771e869c920671f5753cfc71ebf366546c891450b4" +version = "2.1.0" +source = "git+https://github.com/anza-xyz/agave.git?rev=3628c03#3628c03195140534745e268f668be0f72cfed9d8" dependencies = [ - "async-mutex", + "async-lock", "async-trait", "futures", "itertools 0.12.1", @@ -4298,13 +4411,13 @@ dependencies = [ "log", "quinn", "quinn-proto", - "rustls", + "rustls 0.23.14", "solana-connection-cache", - "solana-measure 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-metrics 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-measure", + "solana-metrics", "solana-net-utils", "solana-rpc-client-api", - "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-sdk", "solana-streamer", "thiserror", "tokio", @@ -4312,38 +4425,27 @@ dependencies = [ [[package]] name = "solana-rayon-threadlimit" -version = "2.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33119350281687a17a8321f897dfd27009fc862711ee6555c26beb5b84d6c08c" +version = "2.1.0" +source = "git+https://github.com/anza-xyz/agave.git?rev=3628c03#3628c03195140534745e268f668be0f72cfed9d8" dependencies = [ "lazy_static", "num_cpus", ] [[package]] -name = "solana-remote-wallet" -version = "2.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aba8725448426110b9ac20d7256f43aad1ea46458fe35c63d174cf962af4a9d0" +name = "solana-rent" +version = "2.1.0" +source = "git+https://github.com/anza-xyz/agave.git?rev=3628c03#3628c03195140534745e268f668be0f72cfed9d8" dependencies = [ - "console", - "dialoguer", - "log", - "num-derive", - "num-traits", - "parking_lot", - "qstring", - "semver", - "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", - "thiserror", - "uriparse", + "serde", + "serde_derive", + "solana-sdk-macro", ] [[package]] name = "solana-rpc-client" -version = "2.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd96f6a505a492544ee2459b608af3fe07da6c8ffc0bd842489e836ac2c3fce6" +version = "2.1.0" +source = "git+https://github.com/anza-xyz/agave.git?rev=3628c03#3628c03195140534745e268f668be0f72cfed9d8" dependencies = [ "async-trait", "base64 0.22.1", @@ -4357,10 +4459,10 @@ dependencies = [ "serde", "serde_derive", "serde_json", - "solana-account-decoder", + "solana-account-decoder-client-types", "solana-rpc-client-api", - "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-transaction-status", + "solana-sdk", + "solana-transaction-status-client-types", "solana-version", "solana-vote-program", "tokio", @@ -4368,9 +4470,8 @@ dependencies = [ [[package]] name = "solana-rpc-client-api" -version = "2.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d04f79b88c53b675d5d885d498e7a7e6a4fdd60ffe56e543faddb5d94c6094ba" +version = "2.1.0" +source = "git+https://github.com/anza-xyz/agave.git?rev=3628c03#3628c03195140534745e268f668be0f72cfed9d8" dependencies = [ "anyhow", "base64 0.22.1", @@ -4382,33 +4483,30 @@ dependencies = [ "serde", "serde_derive", "serde_json", - "solana-account-decoder", + "solana-account-decoder-client-types", "solana-inline-spl", - "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-transaction-status", + "solana-sdk", + "solana-transaction-status-client-types", "solana-version", "thiserror", ] [[package]] name = "solana-rpc-client-nonce-utils" -version = "2.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42d46d162566cbf7d6eb2ae369fbb8a934bc846906cbe959aed9123c1ac92b85" +version = "2.1.0" +source = "git+https://github.com/anza-xyz/agave.git?rev=3628c03#3628c03195140534745e268f668be0f72cfed9d8" dependencies = [ - "clap 2.34.0", - "solana-clap-utils", "solana-rpc-client", - "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-sdk", "thiserror", ] [[package]] name = "solana-runtime" -version = "2.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b3b58b2ec1b41685aa829d4bde0990736f474821fee497deaf8da5f795d79f5" +version = "2.1.0" +source = "git+https://github.com/anza-xyz/agave.git?rev=3628c03#3628c03195140534745e268f668be0f72cfed9d8" dependencies = [ + "ahash", "aquamarine", "arrayref", "base64 0.22.1", @@ -4442,32 +4540,40 @@ dependencies = [ "rand 0.8.5", "rayon", "regex", - "rustc_version", "serde", "serde_derive", "serde_json", + "serde_with 3.11.0", "solana-accounts-db", "solana-address-lookup-table-program", - "solana-bpf-loader-program 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-bpf-loader-program", "solana-bucket-map", - "solana-compute-budget 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-compute-budget", "solana-compute-budget-program", "solana-config-program", "solana-cost-model", + "solana-feature-set", + "solana-fee", "solana-inline-spl", - "solana-loader-v4-program 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-measure 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-metrics 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-lattice-hash", + "solana-loader-v4-program", + "solana-measure", + "solana-metrics", "solana-perf", - "solana-program-runtime 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-program", + "solana-program-runtime", "solana-rayon-threadlimit", - "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-runtime-transaction", + "solana-sdk", "solana-stake-program", "solana-svm", - "solana-system-program 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-svm-rent-collector", + "solana-svm-transaction", + "solana-system-program", + "solana-timings", "solana-transaction-status", "solana-version", - "solana-vote 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-vote", "solana-vote-program", "solana-zk-elgamal-proof-program", "solana-zk-sdk", @@ -4480,62 +4586,33 @@ dependencies = [ "tar", "tempfile", "thiserror", - "zstd", + "zstd 0.13.2", ] [[package]] -name = "solana-sdk" -version = "2.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24dae5bda29858add4df3a6c5eaf71c0d2042ca3317a9fd81d7e9f436278a1fe" +name = "solana-runtime-transaction" +version = "2.1.0" +source = "git+https://github.com/anza-xyz/agave.git?rev=3628c03#3628c03195140534745e268f668be0f72cfed9d8" dependencies = [ - "bincode", - "bitflags 2.6.0", - "borsh 1.5.1", - "bs58 0.5.1", - "bytemuck", - "bytemuck_derive", - "byteorder", - "chrono", - "derivation-path", - "digest 0.10.7", - "ed25519-dalek", - "ed25519-dalek-bip32", - "generic-array", - "getrandom 0.1.16", - "hmac 0.12.1", - "itertools 0.12.1", - "js-sys", - "lazy_static", - "libsecp256k1", + "agave-transaction-view", "log", - "memmap2", - "num_enum", - "pbkdf2 0.11.0", - "qstring", - "rand 0.7.3", - "rand 0.8.5", - "rustc_version", - "rustversion", - "serde", - "serde_bytes", - "serde_derive", - "serde_json", - "serde_with 2.3.3", - "sha2 0.10.8", - "sha3 0.10.8", - "siphasher", - "solana-program 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-sdk-macro 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-builtins-default-costs", + "solana-compute-budget", + "solana-pubkey", + "solana-sdk", + "solana-svm-transaction", "thiserror", - "uriparse", - "wasm-bindgen", ] +[[package]] +name = "solana-sanitize" +version = "2.1.0" +source = "git+https://github.com/anza-xyz/agave.git?rev=3628c03#3628c03195140534745e268f668be0f72cfed9d8" + [[package]] name = "solana-sdk" -version = "2.0.13" -source = "git+https://github.com/kevinheavey/agave?rev=5e3b64ccf335b8ca64344f00ee188859a4b9b844#5e3b64ccf335b8ca64344f00ee188859a4b9b844" +version = "2.1.0" +source = "git+https://github.com/anza-xyz/agave.git?rev=3628c03#3628c03195140534745e268f668be0f72cfed9d8" dependencies = [ "bincode", "bitflags 2.6.0", @@ -4545,11 +4622,9 @@ dependencies = [ "bytemuck_derive", "byteorder", "chrono", - "derivation-path", "digest 0.10.7", "ed25519-dalek", "ed25519-dalek-bip32", - "generic-array", "getrandom 0.1.16", "hmac 0.12.1", "itertools 0.12.1", @@ -4558,51 +4633,57 @@ dependencies = [ "libsecp256k1", "log", "memmap2", + "num-derive", + "num-traits", "num_enum", - "pbkdf2 0.11.0", - "qstring", + "pbkdf2", "rand 0.7.3", "rand 0.8.5", - "rustc_version", - "rustversion", "serde", "serde_bytes", "serde_derive", "serde_json", - "serde_with 2.3.3", + "serde_with 3.11.0", "sha2 0.10.8", - "sha3 0.10.8", + "sha3", "siphasher", - "solana-program 2.0.13 (git+https://github.com/kevinheavey/agave?rev=5e3b64ccf335b8ca64344f00ee188859a4b9b844)", - "solana-sdk-macro 2.0.13 (git+https://github.com/kevinheavey/agave?rev=5e3b64ccf335b8ca64344f00ee188859a4b9b844)", + "solana-account", + "solana-bn254", + "solana-decode-error", + "solana-derivation-path", + "solana-feature-set", + "solana-program", + "solana-program-memory", + "solana-sanitize", + "solana-sdk-macro", + "solana-secp256k1-recover", + "solana-serde-varint", + "solana-short-vec", + "solana-signature", "thiserror", - "uriparse", "wasm-bindgen", ] [[package]] name = "solana-sdk-macro" -version = "2.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "704c9cacc61a5b9b6f717773cf4b3b45a4239dc7fa8c585258fceaf9b8e1cb94" +version = "2.1.0" +source = "git+https://github.com/anza-xyz/agave.git?rev=3628c03#3628c03195140534745e268f668be0f72cfed9d8" dependencies = [ "bs58 0.5.1", "proc-macro2", "quote", - "rustversion", "syn 2.0.79", ] [[package]] -name = "solana-sdk-macro" -version = "2.0.13" -source = "git+https://github.com/kevinheavey/agave?rev=5e3b64ccf335b8ca64344f00ee188859a4b9b844#5e3b64ccf335b8ca64344f00ee188859a4b9b844" +name = "solana-secp256k1-recover" +version = "2.1.0" +source = "git+https://github.com/anza-xyz/agave.git?rev=3628c03#3628c03195140534745e268f668be0f72cfed9d8" dependencies = [ - "bs58 0.5.1", - "proc-macro2", - "quote", - "rustversion", - "syn 2.0.79", + "borsh 1.5.1", + "libsecp256k1", + "solana-define-syscall", + "thiserror", ] [[package]] @@ -4613,50 +4694,100 @@ checksum = "468aa43b7edb1f9b7b7b686d5c3aeb6630dc1708e86e31343499dd5c4d775183" [[package]] name = "solana-send-transaction-service" -version = "2.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16c1c0b25b32b9b2d586281b4614f7cfd89fbe88760b1ec0e532d12d0919f224" +version = "2.1.0" +source = "git+https://github.com/anza-xyz/agave.git?rev=3628c03#3628c03195140534745e268f668be0f72cfed9d8" dependencies = [ "crossbeam-channel", "log", "solana-client", "solana-connection-cache", - "solana-measure 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-metrics 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-measure", + "solana-metrics", "solana-runtime", - "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-sdk", "solana-tpu-client", ] +[[package]] +name = "solana-serde-varint" +version = "2.1.0" +source = "git+https://github.com/anza-xyz/agave.git?rev=3628c03#3628c03195140534745e268f668be0f72cfed9d8" +dependencies = [ + "serde", +] + +[[package]] +name = "solana-serialize-utils" +version = "2.1.0" +source = "git+https://github.com/anza-xyz/agave.git?rev=3628c03#3628c03195140534745e268f668be0f72cfed9d8" +dependencies = [ + "solana-instruction", + "solana-pubkey", + "solana-sanitize", +] + +[[package]] +name = "solana-sha256-hasher" +version = "2.1.0" +source = "git+https://github.com/anza-xyz/agave.git?rev=3628c03#3628c03195140534745e268f668be0f72cfed9d8" +dependencies = [ + "sha2 0.10.8", + "solana-define-syscall", + "solana-hash", +] + +[[package]] +name = "solana-short-vec" +version = "2.1.0" +source = "git+https://github.com/anza-xyz/agave.git?rev=3628c03#3628c03195140534745e268f668be0f72cfed9d8" +dependencies = [ + "serde", +] + +[[package]] +name = "solana-signature" +version = "2.1.0" +source = "git+https://github.com/anza-xyz/agave.git?rev=3628c03#3628c03195140534745e268f668be0f72cfed9d8" +dependencies = [ + "bs58 0.5.1", + "ed25519-dalek", + "generic-array", + "rand 0.8.5", + "serde", + "serde_derive", + "solana-sanitize", +] + [[package]] name = "solana-stake-program" -version = "2.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4601cba95c3aaebc3e3698d69c21fe128dcfb6ed08c98f0a6ee5184f25dd239" +version = "2.1.0" +source = "git+https://github.com/anza-xyz/agave.git?rev=3628c03#3628c03195140534745e268f668be0f72cfed9d8" dependencies = [ "bincode", "log", - "rustc_version", "solana-config-program", - "solana-program-runtime 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-type-overrides 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-feature-set", + "solana-log-collector", + "solana-program-runtime", + "solana-sdk", + "solana-type-overrides", "solana-vote-program", ] [[package]] name = "solana-streamer" -version = "2.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cf77ab19483dce4b4307c9e6f195a8c52f0c219026b78af3a9fae1e63ba9222" +version = "2.1.0" +source = "git+https://github.com/anza-xyz/agave.git?rev=3628c03#3628c03195140534745e268f668be0f72cfed9d8" dependencies = [ "async-channel", "bytes", "crossbeam-channel", "dashmap", + "futures", "futures-util", + "governor", "histogram", - "indexmap 2.6.0", + "indexmap", "itertools 0.12.1", "libc", "log", @@ -4666,12 +4797,13 @@ dependencies = [ "quinn", "quinn-proto", "rand 0.8.5", - "rustls", + "rustls 0.23.14", "smallvec", - "solana-measure 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-metrics 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "socket2", + "solana-measure", + "solana-metrics", "solana-perf", - "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-sdk", "solana-transaction-metrics-tracker", "thiserror", "tokio", @@ -4680,62 +4812,68 @@ dependencies = [ [[package]] name = "solana-svm" -version = "2.0.13" -source = "git+https://github.com/kevinheavey/agave?rev=5e3b64ccf335b8ca64344f00ee188859a4b9b844#5e3b64ccf335b8ca64344f00ee188859a4b9b844" +version = "2.1.0" +source = "git+https://github.com/anza-xyz/agave.git?rev=3628c03#3628c03195140534745e268f668be0f72cfed9d8" dependencies = [ "itertools 0.12.1", "log", "percentage", - "qualifier_attr", - "rustc_version", "serde", "serde_derive", - "solana-bpf-loader-program 2.0.13 (git+https://github.com/kevinheavey/agave?rev=5e3b64ccf335b8ca64344f00ee188859a4b9b844)", - "solana-compute-budget 2.0.13 (git+https://github.com/kevinheavey/agave?rev=5e3b64ccf335b8ca64344f00ee188859a4b9b844)", - "solana-loader-v4-program 2.0.13 (git+https://github.com/kevinheavey/agave?rev=5e3b64ccf335b8ca64344f00ee188859a4b9b844)", - "solana-measure 2.0.13 (git+https://github.com/kevinheavey/agave?rev=5e3b64ccf335b8ca64344f00ee188859a4b9b844)", - "solana-metrics 2.0.13 (git+https://github.com/kevinheavey/agave?rev=5e3b64ccf335b8ca64344f00ee188859a4b9b844)", - "solana-program-runtime 2.0.13 (git+https://github.com/kevinheavey/agave?rev=5e3b64ccf335b8ca64344f00ee188859a4b9b844)", - "solana-sdk 2.0.13 (git+https://github.com/kevinheavey/agave?rev=5e3b64ccf335b8ca64344f00ee188859a4b9b844)", - "solana-system-program 2.0.13 (git+https://github.com/kevinheavey/agave?rev=5e3b64ccf335b8ca64344f00ee188859a4b9b844)", - "solana-type-overrides 2.0.13 (git+https://github.com/kevinheavey/agave?rev=5e3b64ccf335b8ca64344f00ee188859a4b9b844)", - "solana-vote 2.0.13 (git+https://github.com/kevinheavey/agave?rev=5e3b64ccf335b8ca64344f00ee188859a4b9b844)", + "solana-bpf-loader-program", + "solana-compute-budget", + "solana-feature-set", + "solana-fee", + "solana-loader-v4-program", + "solana-log-collector", + "solana-measure", + "solana-program-runtime", + "solana-runtime-transaction", + "solana-sdk", + "solana-svm-rent-collector", + "solana-svm-transaction", + "solana-system-program", + "solana-timings", + "solana-type-overrides", + "solana-vote", + "thiserror", +] + +[[package]] +name = "solana-svm-rent-collector" +version = "2.1.0" +source = "git+https://github.com/anza-xyz/agave.git?rev=3628c03#3628c03195140534745e268f668be0f72cfed9d8" +dependencies = [ + "solana-sdk", ] [[package]] -name = "solana-system-program" -version = "2.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f582c0c7b64b7ddeac4d0623d793823ff661865af67b2100ad6ad8bdadeb1f5" +name = "solana-svm-transaction" +version = "2.1.0" +source = "git+https://github.com/anza-xyz/agave.git?rev=3628c03#3628c03195140534745e268f668be0f72cfed9d8" dependencies = [ - "bincode", - "log", - "serde", - "serde_derive", - "solana-program-runtime 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-type-overrides 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-sdk", ] [[package]] name = "solana-system-program" -version = "2.0.13" -source = "git+https://github.com/kevinheavey/agave?rev=5e3b64ccf335b8ca64344f00ee188859a4b9b844#5e3b64ccf335b8ca64344f00ee188859a4b9b844" +version = "2.1.0" +source = "git+https://github.com/anza-xyz/agave.git?rev=3628c03#3628c03195140534745e268f668be0f72cfed9d8" dependencies = [ "bincode", "log", "serde", "serde_derive", - "solana-program-runtime 2.0.13 (git+https://github.com/kevinheavey/agave?rev=5e3b64ccf335b8ca64344f00ee188859a4b9b844)", - "solana-sdk 2.0.13 (git+https://github.com/kevinheavey/agave?rev=5e3b64ccf335b8ca64344f00ee188859a4b9b844)", - "solana-type-overrides 2.0.13 (git+https://github.com/kevinheavey/agave?rev=5e3b64ccf335b8ca64344f00ee188859a4b9b844)", + "solana-log-collector", + "solana-program-runtime", + "solana-sdk", + "solana-type-overrides", ] [[package]] name = "solana-thin-client" -version = "2.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8c880be4e50ff473b3e82b600162244b6eb28cb5a616dc90ee9232d34998680" +version = "2.1.0" +source = "git+https://github.com/anza-xyz/agave.git?rev=3628c03#3628c03195140534745e268f668be0f72cfed9d8" dependencies = [ "bincode", "log", @@ -4743,54 +4881,60 @@ dependencies = [ "solana-connection-cache", "solana-rpc-client", "solana-rpc-client-api", - "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-sdk", +] + +[[package]] +name = "solana-timings" +version = "2.1.0" +source = "git+https://github.com/anza-xyz/agave.git?rev=3628c03#3628c03195140534745e268f668be0f72cfed9d8" +dependencies = [ + "eager", + "enum-iterator", + "solana-sdk", ] [[package]] name = "solana-tpu-client" -version = "2.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e65c01edbca303273e735ae383dde54bd5c5b8a051c51162c0ff886b0939ec6" +version = "2.1.0" +source = "git+https://github.com/anza-xyz/agave.git?rev=3628c03#3628c03195140534745e268f668be0f72cfed9d8" dependencies = [ "async-trait", "bincode", "futures-util", - "indexmap 2.6.0", + "indexmap", "indicatif", "log", "rayon", "solana-connection-cache", - "solana-measure 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-metrics 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-measure", "solana-pubsub-client", "solana-rpc-client", "solana-rpc-client-api", - "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-sdk", "thiserror", "tokio", ] [[package]] name = "solana-transaction-metrics-tracker" -version = "2.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44727bef1f8c57a6ed9a74761d8b7ddfcf4b4e2237cbcc5dc7f8f59985e07755" +version = "2.1.0" +source = "git+https://github.com/anza-xyz/agave.git?rev=3628c03#3628c03195140534745e268f668be0f72cfed9d8" dependencies = [ - "Inflector", "base64 0.22.1", "bincode", "lazy_static", "log", "rand 0.8.5", "solana-perf", - "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-sdk", + "solana-short-vec", ] [[package]] name = "solana-transaction-status" -version = "2.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d51d9d4a6004708f9563a29aa87fdf9960c1e7420b69dd82e8b817cf8f02430b" +version = "2.1.0" +source = "git+https://github.com/anza-xyz/agave.git?rev=3628c03#3628c03195140534745e268f668be0f72cfed9d8" dependencies = [ "Inflector", "base64 0.22.1", @@ -4803,30 +4947,38 @@ dependencies = [ "serde_derive", "serde_json", "solana-account-decoder", - "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", - "spl-associated-token-account 4.0.0", + "solana-sdk", + "solana-transaction-status-client-types", + "spl-associated-token-account", "spl-memo", - "spl-token", - "spl-token-2022 4.0.0", - "spl-token-group-interface 0.3.0", - "spl-token-metadata-interface 0.4.0", + "spl-token 6.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "spl-token-2022", + "spl-token-group-interface", + "spl-token-metadata-interface", "thiserror", ] [[package]] -name = "solana-type-overrides" -version = "2.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ab21276d6296965dc7181d785075b20e97b6789c76e8376cf363b3e2f7439b6" +name = "solana-transaction-status-client-types" +version = "2.1.0" +source = "git+https://github.com/anza-xyz/agave.git?rev=3628c03#3628c03195140534745e268f668be0f72cfed9d8" dependencies = [ - "lazy_static", - "rand 0.8.5", + "base64 0.22.1", + "bincode", + "bs58 0.5.1", + "serde", + "serde_derive", + "serde_json", + "solana-account-decoder-client-types", + "solana-sdk", + "solana-signature", + "thiserror", ] [[package]] name = "solana-type-overrides" -version = "2.0.13" -source = "git+https://github.com/kevinheavey/agave?rev=5e3b64ccf335b8ca64344f00ee188859a4b9b844#5e3b64ccf335b8ca64344f00ee188859a4b9b844" +version = "2.1.0" +source = "git+https://github.com/anza-xyz/agave.git?rev=3628c03#3628c03195140534745e268f668be0f72cfed9d8" dependencies = [ "lazy_static", "rand 0.8.5", @@ -4834,14 +4986,13 @@ dependencies = [ [[package]] name = "solana-udp-client" -version = "2.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10e902d4dc29cafc0794073805a2db1b48b818251480a9fbaec3959df72aec2f" +version = "2.1.0" +source = "git+https://github.com/anza-xyz/agave.git?rev=3628c03#3628c03195140534745e268f668be0f72cfed9d8" dependencies = [ "async-trait", "solana-connection-cache", "solana-net-utils", - "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-sdk", "solana-streamer", "thiserror", "tokio", @@ -4849,105 +5000,87 @@ dependencies = [ [[package]] name = "solana-version" -version = "2.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bcbc570264e5a61a8f84439dfc254931460769fedfb91ff16253acfc3644c9d" +version = "2.1.0" +source = "git+https://github.com/anza-xyz/agave.git?rev=3628c03#3628c03195140534745e268f668be0f72cfed9d8" dependencies = [ - "log", - "rustc_version", "semver", "serde", "serde_derive", - "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "solana-vote" -version = "2.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fa1401a42023379f14af9165954f44ad02888a327dfd2a4abce0f18fa7cfab9" -dependencies = [ - "itertools 0.12.1", - "log", - "rustc_version", - "serde", - "serde_derive", - "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", - "thiserror", + "solana-feature-set", + "solana-sanitize", + "solana-serde-varint", ] [[package]] name = "solana-vote" -version = "2.0.13" -source = "git+https://github.com/kevinheavey/agave?rev=5e3b64ccf335b8ca64344f00ee188859a4b9b844#5e3b64ccf335b8ca64344f00ee188859a4b9b844" +version = "2.1.0" +source = "git+https://github.com/anza-xyz/agave.git?rev=3628c03#3628c03195140534745e268f668be0f72cfed9d8" dependencies = [ "itertools 0.12.1", "log", - "rustc_version", "serde", "serde_derive", - "solana-sdk 2.0.13 (git+https://github.com/kevinheavey/agave?rev=5e3b64ccf335b8ca64344f00ee188859a4b9b844)", + "solana-sdk", "thiserror", ] [[package]] name = "solana-vote-program" -version = "2.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfd8e539a9963c2914ff8426dfe92351a902892aea465cd507e36d638ca0b7d6" +version = "2.1.0" +source = "git+https://github.com/anza-xyz/agave.git?rev=3628c03#3628c03195140534745e268f668be0f72cfed9d8" dependencies = [ "bincode", "log", "num-derive", "num-traits", - "rustc_version", "serde", "serde_derive", - "solana-metrics 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-program 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-program-runtime 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-feature-set", + "solana-metrics", + "solana-program", + "solana-program-runtime", + "solana-sdk", "thiserror", ] [[package]] name = "solana-zk-elgamal-proof-program" -version = "2.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7671ffcadb76705bb678d96380d3514fb927e70810b6857e5d9b1775322a211a" +version = "2.1.0" +source = "git+https://github.com/anza-xyz/agave.git?rev=3628c03#3628c03195140534745e268f668be0f72cfed9d8" dependencies = [ "bytemuck", "num-derive", "num-traits", - "solana-program-runtime 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-log-collector", + "solana-program-runtime", + "solana-sdk", "solana-zk-sdk", ] [[package]] name = "solana-zk-sdk" -version = "2.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd59ccde525a3b831aa953ea8daf2643e734c4b49e3f8a79b4776ee8c1da8f2b" +version = "2.1.0" +source = "git+https://github.com/anza-xyz/agave.git?rev=3628c03#3628c03195140534745e268f668be0f72cfed9d8" dependencies = [ "aes-gcm-siv", "base64 0.22.1", "bincode", "bytemuck", "bytemuck_derive", - "curve25519-dalek", + "curve25519-dalek 4.1.3", "itertools 0.12.1", "lazy_static", "merlin", "num-derive", "num-traits", - "rand 0.7.3", + "rand 0.8.5", "serde", "serde_derive", "serde_json", - "sha3 0.9.1", - "solana-program 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "sha3", + "solana-derivation-path", + "solana-program", + "solana-sdk", "subtle", "thiserror", "zeroize", @@ -4955,23 +5088,23 @@ dependencies = [ [[package]] name = "solana-zk-token-proof-program" -version = "2.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6063e185fcb6cc5690dde2e07c4040b58f5ecf25682420cc69dbba50564bf44b" +version = "2.1.0" +source = "git+https://github.com/anza-xyz/agave.git?rev=3628c03#3628c03195140534745e268f668be0f72cfed9d8" dependencies = [ "bytemuck", "num-derive", "num-traits", - "solana-program-runtime 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-feature-set", + "solana-log-collector", + "solana-program-runtime", + "solana-sdk", "solana-zk-token-sdk", ] [[package]] name = "solana-zk-token-sdk" -version = "2.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1dd7a8d6843cb3de4c13c2cfec1994519735ea4110b7f36b80b41d57bea1c07" +version = "2.1.0" +source = "git+https://github.com/anza-xyz/agave.git?rev=3628c03#3628c03195140534745e268f668be0f72cfed9d8" dependencies = [ "aes-gcm-siv", "base64 0.22.1", @@ -4979,20 +5112,21 @@ dependencies = [ "bytemuck", "bytemuck_derive", "byteorder", - "curve25519-dalek", + "curve25519-dalek 4.1.3", "itertools 0.12.1", "lazy_static", "merlin", "num-derive", "num-traits", - "rand 0.7.3", + "rand 0.8.5", "serde", "serde_derive", "serde_json", - "sha3 0.9.1", - "solana-curve25519 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-program 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "sha3", + "solana-curve25519", + "solana-derivation-path", + "solana-program", + "solana-sdk", "subtle", "thiserror", "zeroize", @@ -5000,13 +5134,12 @@ dependencies = [ [[package]] name = "solana_rbpf" -version = "0.8.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff08afd63f70a1ba712fb0017be41e93b017f7e874785b54bb5ec9aa8949781d" +checksum = "1c1941b5ef0c3ce8f2ac5dd984d0fb1a97423c4ff2a02eec81e3913f02e2ac2b" dependencies = [ "byteorder", - "combine", - "goblin", + "combine 3.8.1", "hash32", "libc", "log", @@ -5025,7 +5158,7 @@ dependencies = [ "derive_more", "pyo3", "serde", - "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-sdk", "solders-account", "solders-account-decoder", "solders-address-lookup-table-account", @@ -5063,7 +5196,7 @@ dependencies = [ "serde_bytes", "serde_with 1.14.0", "solana-account-decoder", - "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-sdk", "solders-account-decoder", "solders-macros", "solders-pubkey", @@ -5082,10 +5215,10 @@ dependencies = [ "serde", "serde_json", "solana-account-decoder", - "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-sdk", "solders-macros", "solders-traits-core", - "zstd", + "zstd 0.11.2+zstd.1.5.2", ] [[package]] @@ -5095,7 +5228,7 @@ dependencies = [ "derive_more", "pyo3", "serde", - "solana-program 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-program", "solders-hash", "solders-macros", "solders-pubkey", @@ -5113,7 +5246,7 @@ dependencies = [ "pyo3-asyncio", "solana-banks-client", "solana-program-test", - "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-sdk", "solders-account", "solders-banks-interface", "solders-commitment-config", @@ -5156,7 +5289,7 @@ dependencies = [ "base64 0.13.1", "bincode", "serde", - "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-sdk", "solders-message", "solders-transaction", ] @@ -5165,7 +5298,8 @@ dependencies = [ name = "solders-clock-example" version = "0.0.0" dependencies = [ - "solana-program 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-program", + "zeroize", ] [[package]] @@ -5175,7 +5309,7 @@ dependencies = [ "derive_more", "pyo3", "serde", - "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-sdk", "solders-traits", ] @@ -5184,7 +5318,7 @@ name = "solders-compute-budget" version = "0.21.0" dependencies = [ "pyo3", - "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-sdk", "solders-instruction", "solders-pubkey", ] @@ -5196,8 +5330,8 @@ dependencies = [ "derive_more", "pyo3", "serde", - "solana-program 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-program", + "solana-sdk", "solders-macros", "solders-traits-core", ] @@ -5209,7 +5343,7 @@ dependencies = [ "derive_more", "pyo3", "serde", - "solana-program 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-program", "solders-macros", "solders-traits", "solders-traits-core", @@ -5222,7 +5356,7 @@ dependencies = [ "derive_more", "pyo3", "serde", - "solana-program 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-program", "solders-macros", "solders-pubkey", "solders-traits-core", @@ -5235,7 +5369,7 @@ dependencies = [ "derive_more", "pyo3", "serde", - "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-sdk", "solders-macros", "solders-pubkey", "solders-signature", @@ -5260,7 +5394,7 @@ dependencies = [ "derive_more", "pyo3", "serde", - "solana-program 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-program", "solders-address-lookup-table-account", "solders-hash", "solders-instruction", @@ -5278,7 +5412,7 @@ dependencies = [ "derive_more", "pyo3", "serde", - "solana-program 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-program", "solders-macros", "solders-traits-core", ] @@ -5290,7 +5424,7 @@ dependencies = [ "derive_more", "pyo3", "serde", - "solana-program 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-program", "solders-macros", "solders-traits", "solders-traits-core", @@ -5361,7 +5495,7 @@ dependencies = [ "serde", "solana-account-decoder", "solana-rpc-client-api", - "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-sdk", "solders-commitment-config", "solders-macros", "solders-pubkey", @@ -5551,7 +5685,7 @@ dependencies = [ "serde_with 1.14.0", "solana-account-decoder", "solana-rpc-client-api", - "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-sdk", "solana-transaction-status", "solders-account", "solders-account-decoder", @@ -5587,7 +5721,7 @@ dependencies = [ "serde_with 1.14.0", "solana-account-decoder", "solana-rpc-client-api", - "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-sdk", "solders-account", "solders-account-decoder", "solders-hash", @@ -5622,7 +5756,7 @@ dependencies = [ "pyo3", "serde", "solana-rpc-client-api", - "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-sdk", "solana-transaction-status", "solders-commitment-config", "solders-macros", @@ -5701,7 +5835,7 @@ dependencies = [ "derive_more", "pyo3", "serde", - "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-sdk", "solders-macros", "solders-pubkey", "solders-traits-core", @@ -5716,8 +5850,8 @@ dependencies = [ "dict_derive", "pyo3", "serde", - "solana-program 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-program", + "solana-sdk", "solders-instruction", "solders-macros", "solders-pubkey", @@ -5732,12 +5866,12 @@ dependencies = [ "derive_more", "pyo3", "serde", - "solana-program 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-program", "solders-macros", "solders-pubkey", "solders-traits-core", - "spl-associated-token-account 5.0.1", - "spl-token", + "spl-associated-token-account-client", + "spl-token 6.0.0 (git+https://github.com/kevinheavey/solana-program-library.git?rev=e4865e21b7b7927b3dec49737ffbd2f8f942a05f)", ] [[package]] @@ -5749,7 +5883,7 @@ dependencies = [ "serde_cbor", "serde_json", "solana-banks-client", - "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-sdk", "solders-traits-core", ] @@ -5771,7 +5905,7 @@ dependencies = [ "derive_more", "pyo3", "serde", - "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-sdk", "solders-hash", "solders-instruction", "solders-keypair", @@ -5800,7 +5934,7 @@ dependencies = [ "derive_more", "pyo3", "serde", - "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-sdk", "solders-macros", "solders-traits-core", ] @@ -5813,7 +5947,7 @@ dependencies = [ "derive_more", "pyo3", "serde", - "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-sdk", "solana-transaction-status", "solders-macros", "solders-pubkey", @@ -5833,7 +5967,7 @@ dependencies = [ "serde", "serde_json", "solana-account-decoder", - "solana-sdk 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-sdk", "solana-transaction-status", "solders-account-decoder", "solders-hash", @@ -5875,12 +6009,6 @@ dependencies = [ "solders-transaction-error", ] -[[package]] -name = "spin" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" - [[package]] name = "spin" version = "0.9.8" @@ -5888,44 +6016,36 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" [[package]] -name = "spl-associated-token-account" -version = "4.0.0" +name = "spinning_top" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68034596cf4804880d265f834af1ff2f821ad5293e41fa0f8f59086c181fc38e" +checksum = "d96d2d1d716fb500937168cc09353ffdc7a012be8475ac7308e1bdf0e3923300" dependencies = [ - "assert_matches", - "borsh 1.5.1", - "num-derive", - "num-traits", - "solana-program 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", - "spl-token", - "spl-token-2022 4.0.0", - "thiserror", + "lock_api", ] [[package]] name = "spl-associated-token-account" -version = "5.0.1" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "714b53f7312c2802c62f14bc8a07916c2c872761e3d6be97e99fd432be7799ca" +checksum = "68034596cf4804880d265f834af1ff2f821ad5293e41fa0f8f59086c181fc38e" dependencies = [ + "assert_matches", "borsh 1.5.1", "num-derive", "num-traits", - "solana-program 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", - "spl-associated-token-account-client", - "spl-token", - "spl-token-2022 5.0.2", + "solana-program", + "spl-token 6.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "spl-token-2022", "thiserror", ] [[package]] name = "spl-associated-token-account-client" version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c5c1e2d53941ea7ebc4be3f86302a3c6c5178baa932bbc038468429e6900d36" +source = "git+https://github.com/kevinheavey/solana-program-library.git?rev=e4865e21b7b7927b3dec49737ffbd2f8f942a05f#e4865e21b7b7927b3dec49737ffbd2f8f942a05f" dependencies = [ - "solana-program 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-program", ] [[package]] @@ -5935,7 +6055,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a38ea8b6dedb7065887f12d62ed62c1743aa70749e8558f963609793f6fb12bc" dependencies = [ "bytemuck", - "solana-program 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-program", "spl-discriminator-derive", ] @@ -5969,7 +6089,7 @@ version = "5.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a0dba2f2bb6419523405d21c301a32c9f9568354d4742552e7972af801f4bdb3" dependencies = [ - "solana-program 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-program", ] [[package]] @@ -5981,25 +6101,11 @@ dependencies = [ "borsh 1.5.1", "bytemuck", "bytemuck_derive", - "solana-program 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-program", "solana-zk-token-sdk", "spl-program-error", ] -[[package]] -name = "spl-pod" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00e38c99f09d58df06ca9a29fc0211786a4c34f4d099c1df27b1abaa206569a4" -dependencies = [ - "borsh 1.5.1", - "bytemuck", - "bytemuck_derive", - "solana-program 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-zk-sdk", - "spl-program-error", -] - [[package]] name = "spl-program-error" version = "0.5.0" @@ -6008,7 +6114,7 @@ checksum = "d7b28bed65356558133751cc32b48a7a5ddfc59ac4e941314630bbed1ac10532" dependencies = [ "num-derive", "num-traits", - "solana-program 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-program", "spl-program-error-derive", "thiserror", ] @@ -6032,25 +6138,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "37a75a5f0fcc58126693ed78a17042e9dc53f07e357d6be91789f7d62aff61a4" dependencies = [ "bytemuck", - "solana-program 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", - "spl-discriminator", - "spl-pod 0.3.1", - "spl-program-error", - "spl-type-length-value 0.5.0", -] - -[[package]] -name = "spl-tlv-account-resolution" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29ffc5c76926c1cbc8d92ac1d9341328308d15bae04a67da5a226e36d5bc395a" -dependencies = [ - "bytemuck", - "solana-program 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-program", "spl-discriminator", - "spl-pod 0.4.0", + "spl-pod", "spl-program-error", - "spl-type-length-value 0.6.0", + "spl-type-length-value", ] [[package]] @@ -6064,93 +6156,45 @@ dependencies = [ "num-derive", "num-traits", "num_enum", - "solana-program 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-program", "thiserror", ] [[package]] -name = "spl-token-2022" -version = "4.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9c10f3483e48679619c76598d4e4aebb955bc49b0a5cc63323afbf44135c9bf" +name = "spl-token" +version = "6.0.0" +source = "git+https://github.com/kevinheavey/solana-program-library.git?rev=e4865e21b7b7927b3dec49737ffbd2f8f942a05f#e4865e21b7b7927b3dec49737ffbd2f8f942a05f" dependencies = [ "arrayref", "bytemuck", "num-derive", "num-traits", "num_enum", - "solana-program 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-security-txt", - "solana-zk-token-sdk", - "spl-memo", - "spl-pod 0.3.1", - "spl-token", - "spl-token-group-interface 0.3.0", - "spl-token-metadata-interface 0.4.0", - "spl-transfer-hook-interface 0.7.0", - "spl-type-length-value 0.5.0", + "solana-program", "thiserror", ] [[package]] name = "spl-token-2022" -version = "5.0.2" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0b788a8c34a917b68b4ed2cdec255d03cc09ccba21545dac39c08a97fce640f" +checksum = "d9c10f3483e48679619c76598d4e4aebb955bc49b0a5cc63323afbf44135c9bf" dependencies = [ "arrayref", "bytemuck", "num-derive", "num-traits", "num_enum", - "solana-program 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-program", "solana-security-txt", - "solana-zk-sdk", + "solana-zk-token-sdk", "spl-memo", - "spl-pod 0.4.0", - "spl-token", - "spl-token-confidential-transfer-ciphertext-arithmetic", - "spl-token-confidential-transfer-proof-extraction", - "spl-token-confidential-transfer-proof-generation", - "spl-token-group-interface 0.4.2", - "spl-token-metadata-interface 0.5.1", - "spl-transfer-hook-interface 0.8.2", - "spl-type-length-value 0.6.0", - "thiserror", -] - -[[package]] -name = "spl-token-confidential-transfer-ciphertext-arithmetic" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48df72fb98b4069979aa4806d4a634ad6f08cb0358e732e6fbac231c5dc075bd" -dependencies = [ - "base64 0.22.1", - "bytemuck", - "solana-curve25519 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-zk-sdk", -] - -[[package]] -name = "spl-token-confidential-transfer-proof-extraction" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae2ce92a0b9673c44207b21d99526b96d557d5a25752f36c38fae37c49129c3b" -dependencies = [ - "bytemuck", - "solana-curve25519 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-zk-sdk", - "thiserror", -] - -[[package]] -name = "spl-token-confidential-transfer-proof-generation" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "216517cc8cd26dfe768521542f221f91049be102d1eefd8054cde881d1b5d267" -dependencies = [ - "curve25519-dalek", - "solana-zk-sdk", + "spl-pod", + "spl-token 6.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "spl-token-group-interface", + "spl-token-metadata-interface", + "spl-transfer-hook-interface", + "spl-type-length-value", "thiserror", ] @@ -6161,22 +6205,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df8752b85a5ecc1d9f3a43bce3dd9a6a053673aacf5deb513d1cbb88d3534ffd" dependencies = [ "bytemuck", - "solana-program 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", - "spl-discriminator", - "spl-pod 0.3.1", - "spl-program-error", -] - -[[package]] -name = "spl-token-group-interface" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c54728921a6f180525c4f3a4cc3b231db8da940681c8009259faa65d84c6196" -dependencies = [ - "bytemuck", - "solana-program 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-program", "spl-discriminator", - "spl-pod 0.4.0", + "spl-pod", "spl-program-error", ] @@ -6187,25 +6218,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c6c2318ddff97e006ed9b1291ebec0750a78547f870f62a69c56fe3b46a5d8fc" dependencies = [ "borsh 1.5.1", - "solana-program 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", - "spl-discriminator", - "spl-pod 0.3.1", - "spl-program-error", - "spl-type-length-value 0.5.0", -] - -[[package]] -name = "spl-token-metadata-interface" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27c7a6d2a2a4f23c8f051ba2f7edb5689f1b534b4126bd9b4ae4177685e9a341" -dependencies = [ - "borsh 1.5.1", - "solana-program 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-program", "spl-discriminator", - "spl-pod 0.4.0", + "spl-pod", "spl-program-error", - "spl-type-length-value 0.6.0", + "spl-type-length-value", ] [[package]] @@ -6216,28 +6233,12 @@ checksum = "a110f33d941275d9f868b96daaa993f1e73b6806cc8836e43075b4d3ad8338a7" dependencies = [ "arrayref", "bytemuck", - "solana-program 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", - "spl-discriminator", - "spl-pod 0.3.1", - "spl-program-error", - "spl-tlv-account-resolution 0.7.0", - "spl-type-length-value 0.5.0", -] - -[[package]] -name = "spl-transfer-hook-interface" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b82e5ad62ad342d8fbb907b2a7aede7a5a258ce16366c26a686acc1df431fc63" -dependencies = [ - "arrayref", - "bytemuck", - "solana-program 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-program", "spl-discriminator", - "spl-pod 0.4.0", + "spl-pod", "spl-program-error", - "spl-tlv-account-resolution 0.8.1", - "spl-type-length-value 0.6.0", + "spl-tlv-account-resolution", + "spl-type-length-value", ] [[package]] @@ -6247,22 +6248,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bdcd73ec187bc409464c60759232e309f83b52a18a9c5610bf281c9c6432918c" dependencies = [ "bytemuck", - "solana-program 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", - "spl-discriminator", - "spl-pod 0.3.1", - "spl-program-error", -] - -[[package]] -name = "spl-type-length-value" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69c08deb8332a6c051f6e846b5e9c962695295dd97e0e151dccf3ef85dcf01b4" -dependencies = [ - "bytemuck", - "solana-program 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-program", "spl-discriminator", - "spl-pod 0.4.0", + "spl-pod", "spl-program-error", ] @@ -6272,12 +6260,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" -[[package]] -name = "strsim" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" - [[package]] name = "strsim" version = "0.10.0" @@ -6486,21 +6468,6 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" -[[package]] -name = "textwrap" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -dependencies = [ - "unicode-width", -] - -[[package]] -name = "textwrap" -version = "0.16.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9" - [[package]] name = "thiserror" version = "1.0.64" @@ -6562,25 +6529,6 @@ dependencies = [ "time-core", ] -[[package]] -name = "tiny-bip39" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffc59cb9dfc85bb312c3a78fd6aa8a8582e310b0fa885d5bb877f6dcc601839d" -dependencies = [ - "anyhow", - "hmac 0.8.1", - "once_cell", - "pbkdf2 0.4.0", - "rand 0.7.3", - "rustc-hash", - "sha2 0.9.9", - "thiserror", - "unicode-normalization", - "wasm-bindgen", - "zeroize", -] - [[package]] name = "tinyvec" version = "1.8.0" @@ -6631,7 +6579,7 @@ version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" dependencies = [ - "rustls", + "rustls 0.21.12", "tokio", ] @@ -6670,7 +6618,7 @@ checksum = "212d5dcb2a1ce06d81107c3d0ffa3121fe974b73f068c8282cb1c32328113b6c" dependencies = [ "futures-util", "log", - "rustls", + "rustls 0.21.12", "tokio", "tokio-rustls", "tungstenite", @@ -6741,7 +6689,7 @@ version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.6.0", + "indexmap", "serde", "serde_spanned", "toml_datetime", @@ -6754,7 +6702,7 @@ version = "0.22.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5" dependencies = [ - "indexmap 2.6.0", + "indexmap", "toml_datetime", "winnow 0.6.20", ] @@ -6841,7 +6789,7 @@ dependencies = [ "httparse", "log", "rand 0.8.5", - "rustls", + "rustls 0.21.12", "sha1", "thiserror", "url", @@ -6922,12 +6870,6 @@ dependencies = [ "void", ] -[[package]] -name = "untrusted" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" - [[package]] name = "untrusted" version = "0.9.0" @@ -6967,12 +6909,6 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" -[[package]] -name = "vec_map" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" - [[package]] name = "version_check" version = "0.9.5" @@ -7099,7 +7035,7 @@ version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b291546d5d9d1eab74f069c77749f2cb8504a12caa20f0f2de93ddbf6f411888" dependencies = [ - "rustls-webpki", + "rustls-webpki 0.101.7", ] [[package]] @@ -7108,6 +7044,15 @@ version = "0.25.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" +[[package]] +name = "webpki-roots" +version = "0.26.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "841c67bff177718f1d4dfefde8d8f0e78f9b6589319ba88312f567fc5841a958" +dependencies = [ + "rustls-pki-types", +] + [[package]] name = "winapi" version = "0.3.9" @@ -7376,9 +7321,9 @@ dependencies = [ [[package]] name = "zeroize" -version = "1.3.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4756f7db3f7b5574938c3eb1c117038b8e07f95ee6718c0efad4ac21508f1efd" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" dependencies = [ "zeroize_derive", ] @@ -7400,7 +7345,16 @@ version = "0.11.2+zstd.1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4" dependencies = [ - "zstd-safe", + "zstd-safe 5.0.2+zstd.1.5.2", +] + +[[package]] +name = "zstd" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcf2b778a664581e31e389454a7072dab1647606d44f7feea22cd5abb9c9f3f9" +dependencies = [ + "zstd-safe 7.2.1", ] [[package]] @@ -7413,6 +7367,15 @@ dependencies = [ "zstd-sys", ] +[[package]] +name = "zstd-safe" +version = "7.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54a3ab4db68cea366acc5c897c7b4d4d1b8994a9cd6e6f841f8964566a419059" +dependencies = [ + "zstd-sys", +] + [[package]] name = "zstd-sys" version = "2.0.13+zstd.1.5.6" diff --git a/Cargo.toml b/Cargo.toml index 1136f1e2..ede15caa 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -130,12 +130,14 @@ solders-transaction-error = { path = "./crates/transaction-error", version = "=0 solders-account = { path = "./crates/account", version = "=0.21.0" } solders-hash = { path = "./crates/hash", version = "=0.21.0" } serde_with = { version = "^1.14.0", features = ["base64"] } -solana-sdk = "2.0.11" -solana-account-decoder = "2.0.11" -solana-banks-interface = "2.0.11" -solana-transaction-status = "2.0.11" -solana-rpc-client-api = "2.0.11" -solana-program = "2.0.11" +solana-sdk = { git = "https://github.com/anza-xyz/agave.git", rev = "3628c03" } +solana-account-decoder = { git = "https://github.com/anza-xyz/agave.git", rev = "3628c03" } +solana-banks-interface = { git = "https://github.com/anza-xyz/agave.git", rev = "3628c03" } +solana-transaction-status = { git = "https://github.com/anza-xyz/agave.git", rev = "3628c03" } +solana-rpc-client-api = { git = "https://github.com/anza-xyz/agave.git", rev = "3628c03" } +solana-program = { git = "https://github.com/anza-xyz/agave.git", rev = "3628c03" } +spl-associated-token-account-client = { git = "https://github.com/kevinheavey/solana-program-library.git", rev = "e4865e21b7b7927b3dec49737ffbd2f8f942a05f" } +spl-token = { git = "https://github.com/kevinheavey/solana-program-library.git", rev = "e4865e21b7b7927b3dec49737ffbd2f8f942a05f" } bincode = "1.3.3" base64 = "0.13.0" serde = "^1.0.188" @@ -144,13 +146,16 @@ serde_json = "^1.0.106" serde_cbor = "^0.11.2" time = "0.3.35" derive_more = "0.99.17" -solana-program-test = "2.0.11" -solana-banks-client = "2.0.11" +solana-program-test = { git = "https://github.com/anza-xyz/agave.git", rev = "3628c03" } +solana-banks-client = { git = "https://github.com/anza-xyz/agave.git", rev = "3628c03" } pythonize = "0.20.0" bs58 = "0.4.0" thiserror = "^1.0.31" camelpaste = "0.1.0" - +zeroize = "1.7" [patch.crates-io] -solana-svm = { git = "https://github.com/kevinheavey/agave", rev = "5e3b64ccf335b8ca64344f00ee188859a4b9b844" } +curve25519-dalek = { git = "https://github.com/anza-xyz/curve25519-dalek.git", rev = "b500cdc2a920cd5bff9e2dd974d7b97349d61464" } +solana-program = { git = "https://github.com/anza-xyz/agave.git", rev = "3628c03" } +solana-program-test = { git = "https://github.com/anza-xyz/agave.git", rev = "3628c03" } +solana-zk-token-sdk = { git = "https://github.com/anza-xyz/agave.git", rev = "3628c03" } diff --git a/crates/bankrun/src/lib.rs b/crates/bankrun/src/lib.rs index f9748f8a..a6a40fe9 100644 --- a/crates/bankrun/src/lib.rs +++ b/crates/bankrun/src/lib.rs @@ -75,7 +75,7 @@ impl BanksClient { py: Python<'p>, transaction: TransactionType, ) -> PyResult<&'p PyAny> { - let mut underlying = self.0.clone(); + let underlying = self.0.clone(); pyo3_asyncio::tokio::future_into_py(py, async move { let res = match transaction { TransactionType::Legacy(t) => underlying.send_transaction(t.0).await, @@ -100,7 +100,7 @@ impl BanksClient { py: Python<'p>, transaction: TransactionType, ) -> PyResult<&'p PyAny> { - let mut underlying = self.0.clone(); + let underlying = self.0.clone(); pyo3_asyncio::tokio::future_into_py(py, async move { let awaited = match transaction { TransactionType::Legacy(t) => { @@ -139,7 +139,7 @@ impl BanksClient { commitment: Option, ) -> PyResult<&'p PyAny> { let commitment_inner = CommitmentLevelOriginal::from(commitment.unwrap_or_default()); - let mut underlying = self.0.clone(); + let underlying = self.0.clone(); pyo3_asyncio::tokio::future_into_py(py, async move { let awaited = match transaction { TransactionType::Legacy(t) => { @@ -179,7 +179,7 @@ impl BanksClient { ) -> PyResult<&'p PyAny> { let address_inner = address.0; let commitment_inner = CommitmentLevelOriginal::from(commitment.unwrap_or_default()); - let mut underlying = self.0.clone(); + let underlying = self.0.clone(); pyo3_asyncio::tokio::future_into_py(py, async move { let res = async_res!(underlying.get_account_with_commitment(address_inner, commitment_inner)); @@ -208,7 +208,7 @@ impl BanksClient { py: Python<'p>, signature: Signature, ) -> PyResult<&'p PyAny> { - let mut underlying = self.0.clone(); + let underlying = self.0.clone(); let signature_underlying = signature.0; pyo3_asyncio::tokio::future_into_py(py, async move { let res = async_res!(underlying.get_transaction_status(signature_underlying)); @@ -232,7 +232,7 @@ impl BanksClient { py: Python<'p>, signatures: Vec, ) -> PyResult<&'p PyAny> { - let mut underlying = self.0.clone(); + let underlying = self.0.clone(); let signatures_underlying = signatures.iter().map(|x| x.0).collect(); pyo3_asyncio::tokio::future_into_py(py, async move { let res = async_res!(underlying.get_transaction_statuses(signatures_underlying)); @@ -263,7 +263,7 @@ impl BanksClient { py: Python<'p>, commitment: Option, ) -> PyResult<&'p PyAny> { - let mut underlying = self.0.clone(); + let underlying = self.0.clone(); let commitment_inner = CommitmentLevelOriginal::from(commitment.unwrap_or_default()); pyo3_asyncio::tokio::future_into_py(py, async move { let res = async_res!(underlying.get_slot_with_context(current(), commitment_inner)); @@ -285,7 +285,7 @@ impl BanksClient { py: Python<'p>, commitment: Option, ) -> PyResult<&'p PyAny> { - let mut underlying = self.0.clone(); + let underlying = self.0.clone(); let commitment_inner = CommitmentLevelOriginal::from(commitment.unwrap_or_default()); pyo3_asyncio::tokio::future_into_py(py, async move { let res = @@ -301,7 +301,7 @@ impl BanksClient { /// Rent: The rent object. /// pub fn get_rent<'p>(&mut self, py: Python<'p>) -> PyResult<&'p PyAny> { - let mut underlying = self.0.clone(); + let underlying = self.0.clone(); pyo3_asyncio::tokio::future_into_py(py, async move { let res = async_res!(underlying.get_rent()); let pyobj: PyResult = @@ -316,7 +316,7 @@ impl BanksClient { /// Clock: the clock object. /// pub fn get_clock<'p>(&mut self, py: Python<'p>) -> PyResult<&'p PyAny> { - let mut underlying = self.0.clone(); + let underlying = self.0.clone(); pyo3_asyncio::tokio::future_into_py(py, async move { let res = async_res!(underlying.get_sysvar::()); let pyobj: PyResult = @@ -341,7 +341,7 @@ impl BanksClient { address: Pubkey, commitment: Option, ) -> PyResult<&'p PyAny> { - let mut underlying = self.0.clone(); + let underlying = self.0.clone(); let commitment_inner = CommitmentLevelOriginal::from(commitment.unwrap_or_default()); let address_inner = address.0; pyo3_asyncio::tokio::future_into_py(py, async move { @@ -365,7 +365,7 @@ impl BanksClient { py: Python<'p>, commitment: Option, ) -> PyResult<&'p PyAny> { - let mut underlying = self.0.clone(); + let underlying = self.0.clone(); let commitment_inner = CommitmentLevelOriginal::from(commitment.unwrap_or_default()); pyo3_asyncio::tokio::future_into_py(py, async move { let res = async_res!(underlying.get_latest_blockhash_with_commitment(commitment_inner)); @@ -399,7 +399,7 @@ impl BanksClient { message: Message, commitment: Option, ) -> PyResult<&'p PyAny> { - let mut underlying = self.0.clone(); + let underlying = self.0.clone(); let commitment_inner = CommitmentLevelOriginal::from(commitment.unwrap_or_default()); let message_inner = message.0; pyo3_asyncio::tokio::future_into_py(py, async move { diff --git a/crates/token/Cargo.toml b/crates/token/Cargo.toml index 0611e725..5e9ecb7b 100644 --- a/crates/token/Cargo.toml +++ b/crates/token/Cargo.toml @@ -16,5 +16,5 @@ solana-program = { workspace = true } solders-macros = { workspace = true } solders-pubkey = { workspace = true } solders-traits-core = { workspace = true } -spl-associated-token-account = "5.0.1" -spl-token = "6.0.0" +spl-associated-token-account-client = { workspace = true } +spl-token = { workspace = true } diff --git a/crates/token/src/associated.rs b/crates/token/src/associated.rs index 0519a1d7..5d0ad403 100644 --- a/crates/token/src/associated.rs +++ b/crates/token/src/associated.rs @@ -1,6 +1,6 @@ use pyo3::prelude::*; use solders_pubkey::Pubkey; -use spl_associated_token_account::get_associated_token_address as get_ata; +use spl_associated_token_account_client::address::get_associated_token_address as get_ata; /// Derives the associated token account address for the given wallet address and token mint. #[pyfunction] diff --git a/tests/bankrun/clock-example/Cargo.toml b/tests/bankrun/clock-example/Cargo.toml index ac152d26..10abdb72 100644 --- a/tests/bankrun/clock-example/Cargo.toml +++ b/tests/bankrun/clock-example/Cargo.toml @@ -7,6 +7,7 @@ include = ["/src"] [dependencies] solana-program = { workspace = true } +zeroize = { workspace = true } [lib] crate-type = ["cdylib"] diff --git a/tests/test_transaction.py b/tests/test_transaction.py index 96f834fc..12fe33bf 100644 --- a/tests/test_transaction.py +++ b/tests/test_transaction.py @@ -914,32 +914,6 @@ def test_tx_uses_nonce_first_prog_id_not_nonce_fail() -> None: tx = Transaction([from_keypair, nonce_keypair], message, Hash.default()) assert tx.uses_durable_nonce() is None - -def test_tx_uses_ro_nonce_account() -> None: - from_keypair = Keypair() - from_pubkey = from_keypair.pubkey() - nonce_keypair = Keypair() - nonce_pubkey = nonce_keypair.pubkey() - account_metas = [ - AccountMeta(nonce_pubkey, False, False), - AccountMeta(RECENT_BLOCKHASHES, False, False), - AccountMeta(nonce_pubkey, True, False), - ] - advance_nonce_account_idx = b"\x04\x00\x00\x00" - nonce_instruction = Instruction( - system_program.ID, - advance_nonce_account_idx, - account_metas, - ) - tx = Transaction.new_signed_with_payer( - [nonce_instruction], - from_pubkey, - [from_keypair, nonce_keypair], - Hash.default(), - ) - assert tx.uses_durable_nonce() is None - - def test_tx_uses_nonce_wrong_first_nonce_ix_fail() -> None: from_keypair = Keypair() from_pubkey = from_keypair.pubkey() From 1b9b57e61c1c8caf1b3b04efd515569b677367bf Mon Sep 17 00:00:00 2001 From: kevinheavey Date: Tue, 15 Oct 2024 17:41:50 +0400 Subject: [PATCH 16/16] lint --- tests/test_transaction.py | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/test_transaction.py b/tests/test_transaction.py index 12fe33bf..869e7cc4 100644 --- a/tests/test_transaction.py +++ b/tests/test_transaction.py @@ -13,7 +13,6 @@ from solders.presigner import Presigner from solders.pubkey import Pubkey from solders.signature import Signature -from solders.sysvar import RECENT_BLOCKHASHES from solders.transaction import SanitizeError, Transaction, TransactionError from .utils import ZERO_BYTES