diff --git a/Cargo.lock b/Cargo.lock index c6a1bdd314..e37c70a1c8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,21 +1,21 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "addr2line" -version = "0.22.0" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" +checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1" dependencies = [ "gimli", ] [[package]] -name = "adler" -version = "1.0.2" +name = "adler2" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" [[package]] name = "aead" @@ -97,9 +97,9 @@ dependencies = [ [[package]] name = "allocator-api2" -version = "0.2.18" +version = "0.2.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" +checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923" [[package]] name = "android-tzdata" @@ -133,9 +133,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.14" +version = "0.6.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b" +checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b" dependencies = [ "anstyle", "anstyle-parse", @@ -148,36 +148,36 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.8" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1" +checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9" [[package]] name = "anstyle-parse" -version = "0.2.4" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4" +checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.1.0" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad186efb764318d35165f1758e7dcef3b10628e26d41a44bc5550652e6804391" +checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.3" +version = "3.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19" +checksum = "2109dbce0e72be3ec00bed26e6a7479ca384ad226efdd66db8fa2e3a38c83125" dependencies = [ "anstyle", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -210,7 +210,7 @@ dependencies = [ [[package]] name = "ark-ec" version = "0.4.2" -source = "git+https://github.com/paberr/algebra?branch=pb/0.4#1ab82cb767bc4e462cfd1a4b89e9d4996586fbf6" +source = "git+https://github.com/paberr/algebra?branch=pb%2F0.4#1ab82cb767bc4e462cfd1a4b89e9d4996586fbf6" dependencies = [ "ark-ff", "ark-poly", @@ -227,7 +227,7 @@ dependencies = [ [[package]] name = "ark-ff" version = "0.4.2" -source = "git+https://github.com/paberr/algebra?branch=pb/0.4#1ab82cb767bc4e462cfd1a4b89e9d4996586fbf6" +source = "git+https://github.com/paberr/algebra?branch=pb%2F0.4#1ab82cb767bc4e462cfd1a4b89e9d4996586fbf6" dependencies = [ "ark-ff-asm", "ark-ff-macros", @@ -236,7 +236,7 @@ dependencies = [ "derivative", "digest", "itertools 0.10.5", - "num-bigint 0.4.5", + "num-bigint 0.4.6", "num-traits", "paste", "rayon", @@ -260,7 +260,7 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7abe79b0e4288889c4574159ab790824d0033b9fdcb2a112a3182fac2e514565" dependencies = [ - "num-bigint 0.4.5", + "num-bigint 0.4.6", "num-traits", "proc-macro2", "quote", @@ -328,14 +328,14 @@ dependencies = [ [[package]] name = "ark-r1cs-std" version = "0.4.0" -source = "git+https://github.com/paberr/r1cs-std?branch=pb/fix-pedersen#6eebca4dcab85efa6a855296137b2a9d4022a221" +source = "git+https://github.com/paberr/r1cs-std?branch=pb%2Ffix-pedersen#6eebca4dcab85efa6a855296137b2a9d4022a221" dependencies = [ "ark-ec", "ark-ff", "ark-relations", "ark-std", "derivative", - "num-bigint 0.4.5", + "num-bigint 0.4.6", "num-integer", "num-traits", "tracing", @@ -362,7 +362,7 @@ dependencies = [ "ark-serialize-derive", "ark-std", "digest", - "num-bigint 0.4.5", + "num-bigint 0.4.6", ] [[package]] @@ -401,9 +401,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" @@ -416,15 +416,15 @@ dependencies = [ [[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 = "asn1-rs" -version = "0.6.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22ad1373757efa0f70ec53939aabc7152e1591cb485208052993070ac8d2429d" +checksum = "5493c3bedbacf7fd7382c6346bbd66687d12bbaad3a89a2d2c303ee6cf20b048" dependencies = [ "asn1-rs-derive", "asn1-rs-impl", @@ -438,9 +438,9 @@ dependencies = [ [[package]] name = "asn1-rs-derive" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7378575ff571966e99a744addeff0bff98b8ada0dedf1956d59e634db95eaac1" +checksum = "965c2d33e53cb6b267e148a4cb0760bc01f4904c1cd4bb4002a085bb016d1490" dependencies = [ "proc-macro2", "quote", @@ -461,9 +461,9 @@ dependencies = [ [[package]] name = "async-io" -version = "2.3.3" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d6baa8f0178795da0e71bc42c9e5d13261aac7ee549853162e66a241ba17964" +checksum = "43a2b323ccce0a1d90b449fd71f2a06ca7faa7c54c2751f06c9bd851fc061059" dependencies = [ "async-lock", "cfg-if", @@ -475,7 +475,7 @@ dependencies = [ "rustix", "slab", "tracing", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -491,9 +491,9 @@ dependencies = [ [[package]] name = "async-stream" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51" +checksum = "0b5a71a6f37880a80d1d7f19efd781e4b5de42c88f0722cc13bcb6cc2cfe8476" dependencies = [ "async-stream-impl", "futures-core", @@ -502,9 +502,9 @@ dependencies = [ [[package]] name = "async-stream-impl" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" +checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d" dependencies = [ "proc-macro2", "quote", @@ -554,22 +554,22 @@ dependencies = [ [[package]] name = "autocfg" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" +checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "axum" -version = "0.7.5" +version = "0.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a6c9af12842a67734c9a2e355436e5d03b22383ed60cf13cd0c18fbfe3dcbcf" +checksum = "edca88bc138befd0323b20752846e6587272d3b03b0343c8ea28a6f819e6e71f" dependencies = [ "async-trait", "axum-core", "bytes", "futures-util", "http 1.2.0", - "http-body 1.0.0", + "http-body 1.0.1", "http-body-util", "itoa", "matchit", @@ -579,45 +579,45 @@ dependencies = [ "pin-project-lite", "rustversion", "serde", - "sync_wrapper 1.0.1", - "tower", + "sync_wrapper 1.0.2", + "tower 0.5.1", "tower-layer", "tower-service", ] [[package]] name = "axum-core" -version = "0.4.3" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a15c63fd72d41492dc4f497196f5da1fb04fb7529e631d73630d1b491e47a2e3" +checksum = "09f2bd6146b97ae3359fa0cc6d6b376d9539582c7b4220f041a33ec24c226199" dependencies = [ "async-trait", "bytes", "futures-util", "http 1.2.0", - "http-body 1.0.0", + "http-body 1.0.1", "http-body-util", "mime", "pin-project-lite", "rustversion", - "sync_wrapper 0.1.2", + "sync_wrapper 1.0.2", "tower-layer", "tower-service", ] [[package]] name = "backtrace" -version = "0.3.73" +version = "0.3.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" +checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a" dependencies = [ "addr2line", - "cc", "cfg-if", "libc", "miniz_oxide", "object", "rustc-demangle", + "windows-targets 0.52.6", ] [[package]] @@ -727,8 +727,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "23285ad32269793932e830392f2fe2f83e26488fd3ec778883a93c8323735780" dependencies = [ "arrayref", - "arrayvec 0.7.4", - "constant_time_eq 0.3.0", + "arrayvec 0.7.6", + "constant_time_eq 0.3.1", ] [[package]] @@ -767,9 +767,9 @@ checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "bytemuck" -version = "1.16.1" +version = "1.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b236fc92302c97ed75b38da1f4917b5cdda4984745740f153a5d3059e48d725e" +checksum = "8b37c88a63ffd85d15b406896cc343916d7cf57838a847b3a6f2ca5d39a5695a" [[package]] name = "byteorder" @@ -794,9 +794,12 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" [[package]] name = "cc" -version = "1.0.100" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c891175c3fb232128f48de6590095e59198bbeb8620c310be349bfc3afd12c7b" +checksum = "f34d93e62b03caf570cccc334cbc6c2fceca82f39211051345108adcba3eebdc" +dependencies = [ + "shlex", +] [[package]] name = "cesu8" @@ -819,6 +822,12 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +[[package]] +name = "cfg_aliases" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" + [[package]] name = "cfg_eval" version = "0.1.2" @@ -952,9 +961,9 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.7.1" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b82cf0babdbd58558212896d1a4272303a57bdb245c2bf1147185fb45640e70" +checksum = "afb84c814227b90d6895e01398aee0d8033c00e7466aca416fb6a8e0eb19d8a7" [[package]] name = "clear_on_drop" @@ -973,9 +982,9 @@ checksum = "67ba02a97a2bd10f4b59b25c7973101c79642302776489e030cd13cdab09ed15" [[package]] name = "colorchoice" -version = "1.0.1" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422" +checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990" [[package]] name = "combine" @@ -1003,8 +1012,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8030735ecb0d128428b64cd379809817e620a40e5001c54465b99ec5feec2857" dependencies = [ "futures-core", - "prost 0.13.1", - "prost-types 0.13.1", + "prost 0.13.3", + "prost-types 0.13.3", "tonic", "tracing-core", ] @@ -1023,8 +1032,8 @@ dependencies = [ "humantime", "hyper-util", "parking_lot", - "prost 0.13.1", - "prost-types 0.13.1", + "prost 0.13.3", + "prost-types 0.13.3", "serde", "serde_json", "thread_local", @@ -1033,7 +1042,7 @@ dependencies = [ "tonic", "tracing", "tracing-core", - "tracing-subscriber 0.3.18", + "tracing-subscriber 0.3.19", ] [[package]] @@ -1050,9 +1059,9 @@ checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" [[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" @@ -1100,18 +1109,18 @@ dependencies = [ [[package]] name = "cpp_demangle" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e8227005286ec39567949b33df9896bcadfa6051bccca2488129f108ca23119" +checksum = "96e58d342ad113c2b878f16d5d034c03be492ae460cdbc02b7f0f2284d310c7d" dependencies = [ "cfg-if", ] [[package]] name = "cpufeatures" -version = "0.2.12" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" +checksum = "16b80225097f2e5ae4e7179dd2266824648f3e2f49d9134d584b76389d31c4c3" dependencies = [ "libc", ] @@ -1350,7 +1359,7 @@ dependencies = [ "asn1-rs", "displaydoc", "nom", - "num-bigint 0.4.5", + "num-bigint 0.4.6", "num-traits", "rusticata-macros", ] @@ -1549,9 +1558,9 @@ dependencies = [ [[package]] name = "either" -version = "1.12.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "elliptic-curve" @@ -1588,20 +1597,20 @@ checksum = "edd0f118536f44f5ccd48bcb8b111bdc3de888b58c74639dfb034a357d0f206d" [[package]] name = "encoding_rs" -version = "0.8.34" +version = "0.8.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" +checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3" dependencies = [ "cfg-if", ] [[package]] name = "enum-as-inner" -version = "0.6.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ffccbb6966c05b32ef8fbac435df276c4ae4d3dc55a8cd0eb9745e6c12f546a" +checksum = "a1e6a265c649f3f5979b601d26f1d05ada116434c87741c9493cb56218f76cbc" dependencies = [ - "heck 0.4.1", + "heck 0.5.0", "proc-macro2", "quote", "syn 2.0.90", @@ -1635,12 +1644,12 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.9" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" +checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d" dependencies = [ "libc", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -1656,9 +1665,9 @@ dependencies = [ [[package]] name = "event-listener-strategy" -version = "0.5.2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" +checksum = "3c3e4e0dd3673c1139bf041f3008816d9cf2946bbfac2945c09e523b8d7b05b2" dependencies = [ "event-listener", "pin-project-lite", @@ -1666,9 +1675,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.1.1" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" +checksum = "486f806e73c5707928240ddc295403b1b93c96a02038563881c4a2fd84b81ac4" [[package]] name = "ff" @@ -1706,9 +1715,9 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flate2" -version = "1.0.30" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" +checksum = "c936bfdafb507ebbf50b8074c54fa31c5be9a1e7e5f467dd659697041407d07c" dependencies = [ "crc32fast", "miniz_oxide", @@ -1720,6 +1729,12 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" +[[package]] +name = "foldhash" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f81ec6369c545a7d40e4589b5597581fa1c441fe1cce96dd1de43159910a36a2" + [[package]] name = "foreign-types" version = "0.3.2" @@ -1752,9 +1767,9 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" [[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", @@ -1777,9 +1792,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", @@ -1787,15 +1802,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", @@ -1805,15 +1820,15 @@ 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-lite" -version = "2.3.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" +checksum = "cef40d21ae2c515b51041df9ed313ed21e572df340ea58a922a0aefe7e8891a1" dependencies = [ "futures-core", "pin-project-lite", @@ -1821,9 +1836,9 @@ dependencies = [ [[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", @@ -1843,15 +1858,15 @@ dependencies = [ [[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-ticker" @@ -1876,9 +1891,9 @@ dependencies = [ [[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", @@ -1928,9 +1943,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.29.0" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" +checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" [[package]] name = "glob" @@ -1985,7 +2000,7 @@ dependencies = [ "futures-sink", "futures-util", "http 0.2.12", - "indexmap 2.2.6", + "indexmap 2.7.0", "slab", "tokio", "tokio-util", @@ -1994,9 +2009,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.4.5" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab" +checksum = "ccae279728d634d083c00f6099cb58f01cc99c145b84b8be2f6c74618d79922e" dependencies = [ "atomic-waker", "bytes", @@ -2004,7 +2019,7 @@ dependencies = [ "futures-core", "futures-sink", "http 1.2.0", - "indexmap 2.2.6", + "indexmap 2.7.0", "slab", "tokio", "tokio-util", @@ -2055,6 +2070,17 @@ dependencies = [ "allocator-api2", ] +[[package]] +name = "hashbrown" +version = "0.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289" +dependencies = [ + "allocator-api2", + "equivalent", + "foldhash", +] + [[package]] name = "hashlink" version = "0.9.1" @@ -2268,9 +2294,9 @@ dependencies = [ [[package]] name = "http-body" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" +checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" dependencies = [ "bytes", "http 1.2.0", @@ -2285,15 +2311,15 @@ dependencies = [ "bytes", "futures-util", "http 1.2.0", - "http-body 1.0.0", + "http-body 1.0.1", "pin-project-lite", ] [[package]] name = "httparse" -version = "1.9.4" +version = "1.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" +checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946" [[package]] name = "httpdate" @@ -2309,9 +2335,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.29" +version = "0.14.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f361cde2f109281a220d4307746cdfd5ee3f410da58a70377762396775634b33" +checksum = "8c08302e8fa335b151b788c775ff56e7a03ae64ff85c548ee820fecb70356e85" dependencies = [ "bytes", "futures-channel", @@ -2340,9 +2366,9 @@ dependencies = [ "bytes", "futures-channel", "futures-util", - "h2 0.4.5", + "h2 0.4.7", "http 1.2.0", - "http-body 1.0.0", + "http-body 1.0.1", "httparse", "httpdate", "itoa", @@ -2373,9 +2399,9 @@ dependencies = [ [[package]] name = "hyper-timeout" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3203a961e5c83b6f5498933e78b6b263e208c197b63e9c6c53cc82ffd3f63793" +checksum = "2b90d566bffbce6a75bd8b09a05aa8c2cb1fabb6cb348f8840c9e4c90a0d83b0" dependencies = [ "hyper 1.5.1", "hyper-util", @@ -2410,7 +2436,7 @@ dependencies = [ "futures-channel", "futures-util", "http 1.2.0", - "http-body 1.0.0", + "http-body 1.0.1", "hyper 1.5.1", "pin-project-lite", "socket2", @@ -2421,9 +2447,9 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.60" +version = "0.1.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" +checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -2609,9 +2635,9 @@ dependencies = [ [[package]] name = "if-watch" -version = "3.2.0" +version = "3.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6b0422c86d7ce0e97169cc42e04ae643caf278874a7a3c87b8150a220dc7e1e" +checksum = "cdf9d64cfcf380606e64f9a0bcf493616b65331199f984151a6fa11a7b3cde38" dependencies = [ "async-io", "core-foundation 0.9.4", @@ -2620,6 +2646,10 @@ dependencies = [ "if-addrs", "ipnet", "log", + "netlink-packet-core", + "netlink-packet-route", + "netlink-proto", + "netlink-sys", "rtnetlink", "system-configuration", "tokio", @@ -2637,7 +2667,7 @@ dependencies = [ "bytes", "futures", "http 0.2.12", - "hyper 0.14.29", + "hyper 0.14.31", "log", "rand", "tokio", @@ -2658,23 +2688,23 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.2.6" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" +checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f" dependencies = [ "equivalent", - "hashbrown 0.14.5", + "hashbrown 0.15.2", "serde", ] [[package]] name = "inferno" -version = "0.11.19" +version = "0.11.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "321f0f839cd44a4686e9504b0a62b4d69a50b62072144c71c68f5873c167b8d9" +checksum = "232929e1d75fe899576a3d5c7416ad0d88dbfbb3c3d6aa00873a7408a50ddb88" dependencies = [ "ahash", - "indexmap 2.2.6", + "indexmap 2.7.0", "is-terminal", "itoa", "log", @@ -2721,31 +2751,31 @@ dependencies = [ "socket2", "widestring", "windows-sys 0.48.0", - "winreg 0.50.0", + "winreg", ] [[package]] name = "ipnet" -version = "2.9.0" +version = "2.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" +checksum = "ddc24109865250148c2e0f3d25d4f0f479571723792d3802153c60922a4fb708" [[package]] name = "is-terminal" -version = "0.4.12" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b" +checksum = "261f68e344040fbd0edea105bef17c66edf46f984ddb1115b775ce31be948f4b" dependencies = [ - "hermit-abi 0.3.9", + "hermit-abi 0.4.0", "libc", "windows-sys 0.52.0", ] [[package]] name = "is_terminal_polyfill" -version = "1.70.0" +version = "1.70.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800" +checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" [[package]] name = "itertools" @@ -2776,9 +2806,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.11" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" +checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674" [[package]] name = "jni" @@ -2831,7 +2861,7 @@ dependencies = [ "bytes", "futures-util", "http 1.2.0", - "http-body 1.0.0", + "http-body 1.0.1", "http-body-util", "jsonrpsee-types", "serde", @@ -2849,7 +2879,7 @@ checksum = "b3638bc4617f96675973253b3a45006933bde93c2fd8a6170b33c777cc389e5b" dependencies = [ "async-trait", "base64 0.22.1", - "http-body 1.0.0", + "http-body 1.0.1", "hyper 1.5.1", "hyper-rustls", "hyper-util", @@ -2861,7 +2891,7 @@ dependencies = [ "serde_json", "thiserror 1.0.69", "tokio", - "tower", + "tower 0.4.13", "tracing", "url", ] @@ -2884,7 +2914,7 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ee7893dab2e44ae5f9d0173f26ff4aa327c10b01b06a72b52dd9405b628640d" dependencies = [ - "indexmap 2.2.6", + "indexmap 2.7.0", ] [[package]] @@ -2895,15 +2925,15 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "libc" -version = "0.2.164" +version = "0.2.167" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "433bfe06b8c75da9b2e3fbea6e5329ff87748f0b144ef75306e674c3f6f7c13f" +checksum = "09d6582e104315a817dff97f75133544b2e094ee22447d2acf4a74e189ba06fc" [[package]] name = "libloading" -version = "0.8.4" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e310b3a6b5907f99202fcdb4960ff45b93735d7c7d96b760fcff8db2dc0e103d" +checksum = "fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34" dependencies = [ "cfg-if", "windows-targets 0.52.6", @@ -2917,7 +2947,7 @@ checksum = "afaecaddb5d9fb8b12a9f1998a079dd8c07c913a92902d414984b1b4608f066b" dependencies = [ "bitflags 2.6.0", "derive_more", - "indexmap 2.2.6", + "indexmap 2.7.0", "libc", "mdbx-sys", "parking_lot", @@ -3111,11 +3141,11 @@ dependencies = [ [[package]] name = "libp2p-kad" -version = "0.46.1" +version = "0.46.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cd7b7a2b2d3914d1b52fcd295551526b60b21054788d086cecb440850cb36a5" +checksum = "ced237d0bd84bbebb7c2cad4c073160dacb4fe40534963c32ed6d4c6bb7702a3" dependencies = [ - "arrayvec 0.7.4", + "arrayvec 0.7.6", "asynchronous-codec", "bytes", "either", @@ -3407,7 +3437,7 @@ dependencies = [ "thiserror 1.0.69", "tracing", "yamux 0.12.1", - "yamux 0.13.3", + "yamux 0.13.4", ] [[package]] @@ -3434,9 +3464,9 @@ checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "litemap" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "643cb0b8d4fcc284004d5fd0d67ccf61dfffadb7f75e1e71bc420f4688a3a704" +checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104" [[package]] name = "lock_api" @@ -3476,11 +3506,11 @@ dependencies = [ [[package]] name = "lru" -version = "0.12.3" +version = "0.12.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3262e75e648fce39813cb56ac41f3c3e3f65217ebf3844d818d1f9398cfb0dc" +checksum = "234cf4f4a04dc1f57e24b96cc0cd600cf2af460d4161ac5ecdd0af8e1f3b2a38" dependencies = [ - "hashbrown 0.14.5", + "hashbrown 0.15.2", ] [[package]] @@ -3532,9 +3562,9 @@ checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "memmap2" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322" +checksum = "fd3f7eed9d3848f8b98834af67102b720745c4ec028fcd0aa0239277e7de374f" dependencies = [ "libc", ] @@ -3547,9 +3577,9 @@ checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" [[package]] name = "mime_guess" -version = "2.0.4" +version = "2.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef" +checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e" dependencies = [ "mime", "unicase", @@ -3557,9 +3587,9 @@ dependencies = [ [[package]] name = "minicov" -version = "0.3.5" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c71e683cd655513b99affab7d317deb690528255a0d5f717f1024093c12b169" +checksum = "f27fe9f1cc3c22e1687f9446c2083c4c5fc7f0bcf1c7a86bdbded14985895b4b" dependencies = [ "cc", "walkdir", @@ -3573,20 +3603,19 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.7.4" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" +checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" dependencies = [ - "adler", + "adler2", ] [[package]] name = "mio" -version = "1.0.1" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4569e456d394deccd22ce1c1913e6ea0e54519f577285001215d33557431afe4" +checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd" dependencies = [ - "hermit-abi 0.3.9", "libc", "wasi", "windows-sys 0.52.0", @@ -3642,13 +3671,13 @@ dependencies = [ [[package]] name = "multihash" -version = "0.19.1" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "076d548d76a0e2a0d4ab471d0b1c36c577786dfc4471242035d97a12a735c492" +checksum = "cc41f430805af9d1cf4adae4ed2149c759b877b01d909a1f40256188d09345d2" dependencies = [ "core2", "serde", - "unsigned-varint 0.7.2", + "unsigned-varint 0.8.0", ] [[package]] @@ -3677,28 +3706,27 @@ dependencies = [ "openssl-probe", "openssl-sys", "schannel", - "security-framework 2.11.0", + "security-framework 2.11.1", "security-framework-sys", "tempfile", ] [[package]] name = "netlink-packet-core" -version = "0.4.2" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "345b8ab5bd4e71a2986663e88c56856699d060e78e152e6e9d7966fcd5491297" +checksum = "72724faf704479d67b388da142b186f916188505e7e0b26719019c525882eda4" dependencies = [ "anyhow", "byteorder", - "libc", "netlink-packet-utils", ] [[package]] name = "netlink-packet-route" -version = "0.12.0" +version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9ea4302b9759a7a88242299225ea3688e63c85ea136371bb6cf94fd674efaab" +checksum = "053998cea5a306971f88580d0829e90f270f940befd7cf928da179d4187a5a66" dependencies = [ "anyhow", "bitflags 1.3.2", @@ -3722,9 +3750,9 @@ dependencies = [ [[package]] name = "netlink-proto" -version = "0.10.0" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65b4b14489ab424703c092062176d52ba55485a89c076b4f9db05092b7223aa6" +checksum = "86b33524dc0968bfad349684447bfce6db937a9ac3332a1fe60c0c5a5ce63f21" dependencies = [ "bytes", "futures", @@ -4056,7 +4084,7 @@ dependencies = [ "nimiq-utils", "serde", "tracing", - "tracing-subscriber 0.3.18", + "tracing-subscriber 0.3.19", "url", ] @@ -4081,7 +4109,7 @@ dependencies = [ "time", "toml", "tracing", - "tracing-subscriber 0.3.18", + "tracing-subscriber 0.3.19", ] [[package]] @@ -4313,7 +4341,7 @@ dependencies = [ "toml", "tracing", "tracing-loki", - "tracing-subscriber 0.3.18", + "tracing-subscriber 0.3.19", "tracing-web", "url", ] @@ -4351,7 +4379,7 @@ dependencies = [ "time", "tracing", "tracing-log 0.2.0", - "tracing-subscriber 0.3.18", + "tracing-subscriber 0.3.19", ] [[package]] @@ -4653,7 +4681,7 @@ dependencies = [ "nimiq-rpc-interface", "nimiq-transaction", "tokio", - "tracing-subscriber 0.3.18", + "tracing-subscriber 0.3.19", "url", ] @@ -4825,7 +4853,7 @@ dependencies = [ "nimiq-test-log-proc-macro", "parking_lot", "tracing", - "tracing-subscriber 0.3.18", + "tracing-subscriber 0.3.19", ] [[package]] @@ -4892,7 +4920,7 @@ dependencies = [ "tokio", "tokio-stream", "tracing", - "tracing-subscriber 0.3.18", + "tracing-subscriber 0.3.19", ] [[package]] @@ -5077,7 +5105,7 @@ dependencies = [ "tokio-stream", "tracing", "tracing-core", - "tracing-subscriber 0.3.18", + "tracing-subscriber 0.3.19", ] [[package]] @@ -5216,7 +5244,7 @@ dependencies = [ "serde_json", "thiserror 2.0.4", "tracing", - "tracing-subscriber 0.3.18", + "tracing-subscriber 0.3.19", ] [[package]] @@ -5257,7 +5285,7 @@ dependencies = [ "serde", "serde_json", "tracing", - "tracing-subscriber 0.3.18", + "tracing-subscriber 0.3.19", ] [[package]] @@ -5304,7 +5332,7 @@ dependencies = [ "tokio", "tokio-stream", "tracing", - "tracing-subscriber 0.3.18", + "tracing-subscriber 0.3.19", ] [[package]] @@ -5362,7 +5390,7 @@ dependencies = [ "serde", "tokio", "tracing", - "tracing-subscriber 0.3.18", + "tracing-subscriber 0.3.19", ] [[package]] @@ -5379,17 +5407,6 @@ dependencies = [ "url", ] -[[package]] -name = "nix" -version = "0.24.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" -dependencies = [ - "bitflags 1.3.2", - "cfg-if", - "libc", -] - [[package]] name = "nix" version = "0.26.4" @@ -5460,9 +5477,9 @@ dependencies = [ [[package]] name = "num-bigint" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c165a9ab64cf766f73521c0dd2cfdff64f488b8f0b3e621face3462d3db536d7" +checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" dependencies = [ "num-integer", "num-traits", @@ -5490,7 +5507,7 @@ version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a652d9771a63711fd3c3deb670acfbe5c30a4072e664d7a3bf5a9e1056ac72c3" dependencies = [ - "arrayvec 0.7.4", + "arrayvec 0.7.6", "itoa", ] @@ -5547,18 +5564,18 @@ dependencies = [ [[package]] name = "object" -version = "0.36.0" +version = "0.36.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "576dfe1fc8f9df304abb159d767a29d0476f7750fbf8aa7ad07816004a207434" +checksum = "aedf0a2d09c573ed1d8d85b30c119153926a2b36dce0ab28322c09a117a4683e" dependencies = [ "memchr", ] [[package]] name = "oid-registry" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c958dd45046245b9c3c2547369bb634eb461670b2e7e0de552905801a648d1d" +checksum = "a8d8034d9489cdaf79228eb9f6a3b8d7bb32ba00d6645ebd48eef4077ceb5bd9" dependencies = [ "asn1-rs", ] @@ -5571,9 +5588,9 @@ checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" [[package]] name = "oorandom" -version = "11.1.3" +version = "11.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" +checksum = "b410bbe7e14ab526a0e86877eb47c6996a2bd7746f027ba551028c925390e4e9" [[package]] name = "opaque-debug" @@ -5583,9 +5600,9 @@ checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" [[package]] name = "openssl" -version = "0.10.66" +version = "0.10.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1" +checksum = "6174bc48f102d208783c2c84bf931bb75927a617866870de8a4ea85597f871f5" dependencies = [ "bitflags 2.6.0", "cfg-if", @@ -5615,9 +5632,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.103" +version = "0.9.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6" +checksum = "45abf306cbf99debc8195b66b7346498d7b10c210de50418b5ccd7ceba08c741" dependencies = [ "cc", "libc", @@ -5652,9 +5669,9 @@ dependencies = [ [[package]] name = "parking" -version = "2.2.0" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" +checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba" [[package]] name = "parking_lot" @@ -5729,7 +5746,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" dependencies = [ "fixedbitset", - "indexmap 2.2.6", + "indexmap 2.7.0", ] [[package]] @@ -5776,15 +5793,15 @@ dependencies = [ [[package]] name = "pkg-config" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" +checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" [[package]] name = "plotters" -version = "0.3.6" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a15b6eccb8484002195a3e44fe65a4ce8e93a625797a063735536fd59cb01cf3" +checksum = "5aeb6f403d7a4911efb1e33402027fc44f29b5bf6def3effcc22d7bb75f2b747" dependencies = [ "num-traits", "plotters-backend", @@ -5795,24 +5812,24 @@ dependencies = [ [[package]] name = "plotters-backend" -version = "0.3.6" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "414cec62c6634ae900ea1c56128dfe87cf63e7caece0852ec76aba307cebadb7" +checksum = "df42e13c12958a16b3f7f4386b9ab1f3e7933914ecea48da7139435263a4172a" [[package]] name = "plotters-svg" -version = "0.3.6" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81b30686a7d9c3e010b84284bdd26a29f2138574f52f5eb6f794fc0ad924e705" +checksum = "51bae2ac328883f7acdfea3d66a7c35751187f870bc81f94563733a154d7a670" dependencies = [ "plotters-backend", ] [[package]] name = "polling" -version = "3.7.2" +version = "3.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3ed00ed3fbf728b5816498ecd316d1716eecaced9c0c8d2c5a6740ca214985b" +checksum = "a604568c3202727d1507653cb121dbd627a58684eb09a820fd746bee38b4442f" dependencies = [ "cfg-if", "concurrent-queue", @@ -5820,7 +5837,7 @@ dependencies = [ "pin-project-lite", "rustix", "tracing", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -5848,9 +5865,9 @@ dependencies = [ [[package]] name = "portable-atomic" -version = "1.6.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" +checksum = "280dc24453071f1b63954171985a0b0d30058d287960968b9b2aca264c8d4ee6" [[package]] name = "postcard" @@ -5884,7 +5901,7 @@ dependencies = [ "inferno", "libc", "log", - "nix 0.26.4", + "nix", "once_cell", "parking_lot", "smallvec", @@ -5895,9 +5912,12 @@ dependencies = [ [[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 = "primeorder" @@ -5953,12 +5973,12 @@ dependencies = [ [[package]] name = "prost" -version = "0.13.1" +version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e13db3d3fde688c61e2446b4d843bc27a7e8af269a69440c0308021dc92333cc" +checksum = "7b0487d90e047de87f984913713b85c601c05609aad5b0df4b4573fbf69aa13f" dependencies = [ "bytes", - "prost-derive 0.13.1", + "prost-derive 0.13.3", ] [[package]] @@ -5976,9 +5996,9 @@ dependencies = [ [[package]] name = "prost-derive" -version = "0.13.1" +version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18bec9b0adc4eba778b33684b7ba3e7137789434769ee3ce3930463ef904cfca" +checksum = "e9552f850d5f0964a4e4d0bf306459ac29323ddfbae05e35a7c0d35cb0803cc5" dependencies = [ "anyhow", "itertools 0.13.0", @@ -5998,11 +6018,11 @@ dependencies = [ [[package]] name = "prost-types" -version = "0.13.1" +version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cee5168b05f49d4b0ca581206eb14a7b22fafd963efe729ac48eb03266e25cc2" +checksum = "4759aa0d3a6232fb8dbdb97b61de2c20047c68aca932c7ed76da9d788508d670" dependencies = [ - "prost 0.13.1", + "prost 0.13.3", ] [[package]] @@ -6044,50 +6064,55 @@ dependencies = [ [[package]] name = "quinn" -version = "0.11.2" +version = "0.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4ceeeeabace7857413798eb1ffa1e9c905a9946a57d81fb69b4b71c4d8eb3ad" +checksum = "62e96808277ec6f97351a2380e6c25114bc9e67037775464979f3037c92d05ef" dependencies = [ "bytes", "futures-io", "pin-project-lite", "quinn-proto", "quinn-udp", - "rustc-hash 1.1.0", + "rustc-hash 2.1.0", "rustls", - "thiserror 1.0.69", + "socket2", + "thiserror 2.0.4", "tokio", "tracing", ] [[package]] name = "quinn-proto" -version = "0.11.8" +version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fadfaed2cd7f389d0161bb73eeb07b7b78f8691047a6f3e73caaeae55310a4a6" +checksum = "a2fe5ef3495d7d2e377ff17b1a8ce2ee2ec2a18cde8b6ad6619d65d0701c135d" dependencies = [ "bytes", + "getrandom", "rand", "ring 0.17.8", - "rustc-hash 2.0.0", + "rustc-hash 2.1.0", "rustls", + "rustls-pki-types", "slab", - "thiserror 1.0.69", + "thiserror 2.0.4", "tinyvec", "tracing", + "web-time", ] [[package]] name = "quinn-udp" -version = "0.5.2" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9096629c45860fc7fb143e125eb826b5e721e10be3263160c7d60ca832cf8c46" +checksum = "7d5a626c6807713b15cac82a6acaccd6043c9a5408c24baae07611fec3f243da" dependencies = [ + "cfg_aliases", "libc", "once_cell", "socket2", "tracing", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -6169,18 +6194,18 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.2" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd" +checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f" dependencies = [ "bitflags 2.6.0", ] [[package]] name = "redox_users" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" +checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" dependencies = [ "getrandom", "libredox", @@ -6195,7 +6220,7 @@ checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.8", + "regex-automata 0.4.9", "regex-syntax 0.8.5", ] @@ -6210,9 +6235,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.8" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3" +checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" dependencies = [ "aho-corasick", "memchr", @@ -6233,18 +6258,18 @@ checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" [[package]] name = "reqwest" -version = "0.12.5" +version = "0.12.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7d6d2a27d57148378eb5e111173f4276ad26340ecc5c49a4a2152167a2d6a37" +checksum = "a77c62af46e79de0a562e1a9849205ffcb7fc1238876e9bd743357570e04046f" dependencies = [ "base64 0.22.1", "bytes", "encoding_rs", "futures-core", "futures-util", - "h2 0.4.5", + "h2 0.4.7", "http 1.2.0", - "http-body 1.0.0", + "http-body 1.0.1", "http-body-util", "hyper 1.5.1", "hyper-rustls", @@ -6262,7 +6287,7 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded", - "sync_wrapper 1.0.1", + "sync_wrapper 1.0.2", "system-configuration", "tokio", "tokio-native-tls", @@ -6271,7 +6296,7 @@ dependencies = [ "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "winreg 0.52.0", + "windows-registry", ] [[package]] @@ -6296,9 +6321,9 @@ dependencies = [ [[package]] name = "rgb" -version = "0.8.37" +version = "0.8.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05aaa8004b64fd573fc9d002f4e632d51ad4f026c2b5ba95fcb6c2f32c2c47d8" +checksum = "57397d16646700483b67d2dd6511d79318f9d057fdbd21a4066aeac8b41d310a" dependencies = [ "bytemuck", ] @@ -6335,15 +6360,18 @@ dependencies = [ [[package]] name = "rtnetlink" -version = "0.10.1" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "322c53fd76a18698f1c27381d58091de3a043d356aa5bd0d510608b565f469a0" +checksum = "7a552eb82d19f38c3beed3f786bd23aa434ceb9ac43ab44419ca6d67a7e186c0" dependencies = [ "futures", "log", + "netlink-packet-core", "netlink-packet-route", + "netlink-packet-utils", "netlink-proto", - "nix 0.24.3", + "netlink-sys", + "nix", "thiserror 1.0.69", "tokio", ] @@ -6356,7 +6384,7 @@ checksum = "9d9848531d60c9cbbcf9d166c885316c24bc0e2a9d3eba0956bb6cbbd79bc6e8" dependencies = [ "base64 0.21.7", "blake2b_simd", - "constant_time_eq 0.3.0", + "constant_time_eq 0.3.1", ] [[package]] @@ -6373,15 +6401,15 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustc-hash" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152" +checksum = "c7fb8039b3032c191086b10f11f319a6e99e1e82889c5cc6046f515c9db1d497" [[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", ] @@ -6397,9 +6425,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.40" +version = "0.38.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99e4ea3e1cdc4b559b8e5650f9c8e5998e3e5c1343b4eaf034565f32318d63c0" +checksum = "d7f649912bc1495e167a6edee79151c84b1bad49748cb4f1f1167f459f6224f6" dependencies = [ "bitflags 2.6.0", "errno", @@ -6410,15 +6438,15 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.10" +version = "0.23.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05cff451f60db80f490f3c182b77c35260baace73209e9cdbbe526bfe3a4d402" +checksum = "934b404430bb06b3fae2cba809eb45a1ab1aecd64491213d7c3301b88393f8d1" dependencies = [ "log", "once_cell", "ring 0.17.8", "rustls-pki-types", - "rustls-webpki 0.102.4", + "rustls-webpki 0.102.8", "subtle", "zeroize", ] @@ -6433,7 +6461,7 @@ dependencies = [ "rustls-pemfile", "rustls-pki-types", "schannel", - "security-framework 2.11.0", + "security-framework 2.11.1", ] [[package]] @@ -6477,10 +6505,10 @@ dependencies = [ "rustls", "rustls-native-certs 0.7.3", "rustls-platform-verifier-android", - "rustls-webpki 0.102.4", - "security-framework 2.11.0", + "rustls-webpki 0.102.8", + "security-framework 2.11.1", "security-framework-sys", - "webpki-roots 0.26.6", + "webpki-roots 0.26.7", "winapi", ] @@ -6502,9 +6530,9 @@ dependencies = [ [[package]] name = "rustls-webpki" -version = "0.102.4" +version = "0.102.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff448f7e92e913c4b7d4c6d8e4540a1724b319b4152b8aef6d4cf8339712b33e" +checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9" dependencies = [ "ring 0.17.8", "rustls-pki-types", @@ -6513,9 +6541,9 @@ dependencies = [ [[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 = "rw-stream-sink" @@ -6592,11 +6620,11 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.23" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" +checksum = "1f29ebaa345f945cec9fbbc532eb307f0fdad8161f281b6369539c8d84876b3d" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -6664,15 +6692,15 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.11.0" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0" +checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" dependencies = [ "bitflags 2.6.0", "core-foundation 0.9.4", "core-foundation-sys", "libc", - "num-bigint 0.4.5", + "num-bigint 0.4.6", "security-framework-sys", ] @@ -6799,7 +6827,7 @@ version = "1.0.133" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377" dependencies = [ - "indexmap 2.2.6", + "indexmap 2.7.0", "itoa", "memchr", "ryu", @@ -6819,9 +6847,9 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "0.6.7" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d" +checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1" dependencies = [ "serde", ] @@ -6848,7 +6876,7 @@ dependencies = [ "chrono", "hex", "indexmap 1.9.3", - "indexmap 2.2.6", + "indexmap 2.7.0", "serde", "serde_derive", "serde_json", @@ -6984,9 +7012,9 @@ dependencies = [ [[package]] name = "socket2" -version = "0.5.7" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" +checksum = "c970269d99b64e60ec3bd6ad27270092a5394c4e309314b18ae3fe575695fbe8" dependencies = [ "libc", "windows-sys 0.52.0", @@ -6994,9 +7022,9 @@ dependencies = [ [[package]] name = "soketto" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37468c595637c10857701c990f93a40ce0e357cedb0953d1c26c8d8027f9bb53" +checksum = "2e859df029d160cb88608f5d7df7fb4753fd20fdfb4de5644f3d8b8440841721" dependencies = [ "base64 0.22.1", "bytes", @@ -7061,9 +7089,9 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "symbolic-common" -version = "12.9.2" +version = "12.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71297dc3e250f7dbdf8adb99e235da783d690f5819fdeb4cce39d9cfb0aca9f1" +checksum = "e5ba5365997a4e375660bed52f5b42766475d5bc8ceb1bb13fea09c469ea0f49" dependencies = [ "debugid", "memmap2", @@ -7073,9 +7101,9 @@ dependencies = [ [[package]] name = "symbolic-demangle" -version = "12.9.2" +version = "12.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "424fa2c9bf2c862891b9cfd354a752751a6730fd838a4691e7f6c2c7957b9daf" +checksum = "beff338b2788519120f38c59ff4bb15174f52a183e547bac3d6072c2c0aa48aa" dependencies = [ "cpp_demangle", "rustc-demangle", @@ -7112,9 +7140,12 @@ checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" [[package]] name = "sync_wrapper" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" +checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263" +dependencies = [ + "futures-core", +] [[package]] name = "synstructure" @@ -7129,20 +7160,20 @@ dependencies = [ [[package]] name = "system-configuration" -version = "0.5.1" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" +checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", "core-foundation 0.9.4", "system-configuration-sys", ] [[package]] name = "system-configuration-sys" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" +checksum = "8e1d1b10ced5ca923a1fcb8d03e96b8d3268065d724548c0211415ff6ac6bac4" dependencies = [ "core-foundation-sys", "libc", @@ -7209,9 +7240,9 @@ dependencies = [ [[package]] name = "thread-id" -version = "4.2.1" +version = "4.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0ec81c46e9eb50deaa257be2f148adf052d1fb7701cfd55ccfab2525280b70b" +checksum = "cfe8f25bbdd100db7e1d34acf7fd2dc59c4bf8f7483f505eaa7d4f12f76cc0ea" dependencies = [ "libc", "winapi", @@ -7281,9 +7312,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.6.1" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c55115c6fbe2d2bef26eb09ad74bde02d8255476fc0c7b515ef09fbb35742d82" +checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" dependencies = [ "tinyvec_macros", ] @@ -7428,11 +7459,11 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.22.20" +version = "0.22.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d" +checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5" dependencies = [ - "indexmap 2.2.6", + "indexmap 2.7.0", "serde", "serde_spanned", "toml_datetime", @@ -7450,20 +7481,20 @@ dependencies = [ "axum", "base64 0.22.1", "bytes", - "h2 0.4.5", + "h2 0.4.7", "http 1.2.0", - "http-body 1.0.0", + "http-body 1.0.1", "http-body-util", "hyper 1.5.1", "hyper-timeout", "hyper-util", "percent-encoding", "pin-project", - "prost 0.13.1", + "prost 0.13.3", "socket2", "tokio", "tokio-stream", - "tower", + "tower 0.4.13", "tower-layer", "tower-service", "tracing", @@ -7489,23 +7520,37 @@ dependencies = [ "tracing", ] +[[package]] +name = "tower" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2873938d487c3cfb9aed7546dc9f2711d867c9f90c46b889989a2cb84eba6b4f" +dependencies = [ + "futures-core", + "futures-util", + "pin-project-lite", + "sync_wrapper 0.1.2", + "tower-layer", + "tower-service", +] + [[package]] name = "tower-layer" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" +checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e" [[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.40" +version = "0.1.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0" dependencies = [ "log", "pin-project-lite", @@ -7515,9 +7560,9 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.27" +version = "0.1.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d" dependencies = [ "proc-macro2", "quote", @@ -7573,7 +7618,7 @@ dependencies = [ "tracing-core", "tracing-log 0.1.4", "tracing-serde", - "tracing-subscriber 0.3.18", + "tracing-subscriber 0.3.19", "url", ] @@ -7598,9 +7643,9 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.3.18" +version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" +checksum = "e8189decb5ac0fa7bc8b96b7cb9b2701d60d48805aca84a238004d665fcc4008" dependencies = [ "matchers", "nu-ansi-term", @@ -7624,7 +7669,7 @@ checksum = "b9e6a141feebd51f8d91ebfd785af50fca223c570b86852166caa3b141defe7c" dependencies = [ "js-sys", "tracing-core", - "tracing-subscriber 0.3.18", + "tracing-subscriber 0.3.19", "wasm-bindgen", "web-sys", ] @@ -7638,7 +7683,7 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "tsify" version = "0.4.5" -source = "git+https://github.com/sisou/tsify?branch=sisou/comments#e36e55bcf3c9ac7c1d8185e5ad994885f4a2eb46" +source = "git+https://github.com/sisou/tsify?branch=sisou%2Fcomments#e36e55bcf3c9ac7c1d8185e5ad994885f4a2eb46" dependencies = [ "serde", "serde-wasm-bindgen 0.5.0", @@ -7649,7 +7694,7 @@ dependencies = [ [[package]] name = "tsify-macros" version = "0.4.5" -source = "git+https://github.com/sisou/tsify?branch=sisou/comments#e36e55bcf3c9ac7c1d8185e5ad994885f4a2eb46" +source = "git+https://github.com/sisou/tsify?branch=sisou%2Fcomments#e36e55bcf3c9ac7c1d8185e5ad994885f4a2eb46" dependencies = [ "proc-macro2", "quote", @@ -7715,24 +7760,21 @@ dependencies = [ [[package]] name = "unicase" -version = "2.7.0" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" -dependencies = [ - "version_check", -] +checksum = "7e51b68083f157f853b6379db119d1c1be0e6e4dec98101079dec41f6f5cf6df" [[package]] name = "unicode-bidi" -version = "0.3.15" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" +checksum = "5ab17db44d7388991a428b2ee655ce0c212e862eff1768a455c58f9aad6e7893" [[package]] name = "unicode-ident" -version = "1.0.12" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unicode-normalization" @@ -7745,15 +7787,15 @@ dependencies = [ [[package]] name = "unicode-segmentation" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" +checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" [[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 = "universal-hash" @@ -7827,9 +7869,9 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "uuid" -version = "1.9.1" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de17fd2f7da591098415cff336e12965a28061ddace43b59cb3c430179c9439" +checksum = "f8c5f0a0af699448548ad1a2fbf920fb4bee257eae39953ba95cb84891a0446a" [[package]] name = "valuable" @@ -7845,9 +7887,9 @@ checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" [[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" @@ -7885,7 +7927,7 @@ dependencies = [ "futures-util", "headers", "http 0.2.12", - "hyper 0.14.29", + "hyper 0.14.31", "log", "mime", "mime_guess", @@ -8053,9 +8095,9 @@ checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" [[package]] name = "webpki-roots" -version = "0.26.6" +version = "0.26.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "841c67bff177718f1d4dfefde8d8f0e78f9b6589319ba88312f567fc5841a958" +checksum = "5d642ff16b7e79272ae451b7322067cdc17cadf68c23264be9d94a32319efe7e" dependencies = [ "rustls-pki-types", ] @@ -8084,11 +8126,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" +checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -8099,32 +8141,72 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows" -version = "0.51.1" +version = "0.53.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9" +checksum = "efc5cf48f83140dcaab716eeaea345f9e93d0018fb81162753a3f76c3397b538" dependencies = [ - "windows-core 0.51.1", - "windows-targets 0.48.5", + "windows-core 0.53.0", + "windows-targets 0.52.6", ] [[package]] name = "windows-core" -version = "0.51.1" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.48.5", + "windows-targets 0.52.6", ] [[package]] name = "windows-core" -version = "0.52.0" +version = "0.53.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" +checksum = "9dcc5b895a6377f1ab9fa55acedab1fd5ac0db66ad1e6c7f47e28a22e446a5dd" +dependencies = [ + "windows-result 0.1.2", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-registry" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0" +dependencies = [ + "windows-result 0.2.0", + "windows-strings", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-result" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8" dependencies = [ "windows-targets 0.52.6", ] +[[package]] +name = "windows-result" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-strings" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10" +dependencies = [ + "windows-result 0.2.0", + "windows-targets 0.52.6", +] + [[package]] name = "windows-sys" version = "0.48.0" @@ -8275,9 +8357,9 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" -version = "0.6.18" +version = "0.6.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f" +checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b" dependencies = [ "memchr", ] @@ -8292,16 +8374,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "winreg" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5" -dependencies = [ - "cfg-if", - "windows-sys 0.48.0", -] - [[package]] name = "write16" version = "1.0.0" @@ -8360,9 +8432,9 @@ checksum = "213b7324336b53d2414b2db8537e56544d981803139155afa84f76eeebb7a546" [[package]] name = "xml-rs" -version = "0.8.20" +version = "0.8.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "791978798f0597cfc70478424c2b4fdc2b7a8024aaff78497ef00f24ef674193" +checksum = "ea8b391c9a790b496184c29f7f93b9ed5b16abb306c05415b68bcc16e4d06432" [[package]] name = "xmltree" @@ -8390,9 +8462,9 @@ dependencies = [ [[package]] name = "yamux" -version = "0.13.3" +version = "0.13.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a31b5e376a8b012bee9c423acdbb835fc34d45001cfa3106236a624e4b738028" +checksum = "17610762a1207ee816c6fadc29220904753648aba0a9ed61c7b8336e80a559c4" dependencies = [ "futures", "log", @@ -8415,9 +8487,9 @@ dependencies = [ [[package]] name = "yoke" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c5b1314b079b0930c31e3af543d8ee1757b1951ae1e1565ec704403a7240ca5" +checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40" dependencies = [ "serde", "stable_deref_trait", @@ -8427,9 +8499,9 @@ dependencies = [ [[package]] name = "yoke-derive" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95" +checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154" dependencies = [ "proc-macro2", "quote", @@ -8439,18 +8511,19 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.7.34" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" dependencies = [ + "byteorder", "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.34" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", @@ -8459,18 +8532,18 @@ dependencies = [ [[package]] name = "zerofrom" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ec111ce797d0e0784a1116d0ddcdbea84322cd79e5d5ad173daeba4f93ab55" +checksum = "cff3ee08c995dee1859d998dea82f7374f2826091dd9cd47def953cae446cd2e" dependencies = [ "zerofrom-derive", ] [[package]] name = "zerofrom-derive" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5" +checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808" dependencies = [ "proc-macro2", "quote", diff --git a/blockchain-proxy/src/blockchain_proxy.rs b/blockchain-proxy/src/blockchain_proxy.rs index f8c29005db..8a2ddd27c0 100644 --- a/blockchain-proxy/src/blockchain_proxy.rs +++ b/blockchain-proxy/src/blockchain_proxy.rs @@ -94,7 +94,7 @@ pub enum BlockchainReadProxy<'a> { Light(RwLockReadGuard<'a, LightBlockchain>), } -impl<'a> AbstractBlockchain for BlockchainReadProxy<'a> { +impl AbstractBlockchain for BlockchainReadProxy<'_> { fn network_id(&self) -> NetworkId { gen_blockchain_match!(self, BlockchainReadProxy, network_id) } diff --git a/blockchain/src/history/history_store.rs b/blockchain/src/history/history_store.rs index 99485523fd..0405508b83 100644 --- a/blockchain/src/history/history_store.rs +++ b/blockchain/src/history/history_store.rs @@ -1062,15 +1062,9 @@ mod tests { history_store.add_to_history(&mut txn, Policy::genesis_block_number() + 1, &hist_txs); // Those transactions should be part of the valitidy window - assert_eq!( - history_store.tx_in_validity_window(&ext_0.tx_hash(), Some(&txn)), - true - ); + assert!(history_store.tx_in_validity_window(&ext_0.tx_hash(), Some(&txn))); - assert_eq!( - history_store.tx_in_validity_window(&ext_1.tx_hash(), Some(&txn)), - true - ); + assert!(history_store.tx_in_validity_window(&ext_1.tx_hash(), Some(&txn))); // Now keep pushing transactions to the history store until we are past the transaction validity window let validity_window_blocks = Policy::transaction_validity_window_blocks(); @@ -1083,33 +1077,21 @@ mod tests { history_store.add_to_history( &mut txn, Policy::genesis_block_number() + bn, - &vec![historic_txn], + &[historic_txn], ); } // Since we are past the txn in validity window, the first two transaction should no longer be in it - assert_eq!( - history_store.tx_in_validity_window(&ext_0.tx_hash(), Some(&txn)), - false - ); + assert!(!history_store.tx_in_validity_window(&ext_0.tx_hash(), Some(&txn))); - assert_eq!( - history_store.tx_in_validity_window(&ext_1.tx_hash(), Some(&txn)), - false - ); + assert!(!history_store.tx_in_validity_window(&ext_1.tx_hash(), Some(&txn))); for txn_hash in &txn_hashes[..8] { - assert_eq!( - history_store.tx_in_validity_window(txn_hash, Some(&txn)), - false - ); + assert!(!history_store.tx_in_validity_window(txn_hash, Some(&txn))); } for txn_hash in &txn_hashes[8..] { - assert_eq!( - history_store.tx_in_validity_window(txn_hash, Some(&txn)), - true - ); + assert!(history_store.tx_in_validity_window(txn_hash, Some(&txn))); } } @@ -1124,12 +1106,12 @@ mod tests { // Add historic transactions to History Store. let mut txn = env.write_transaction(); - history_store.add_to_history(&mut txn, Policy::genesis_block_number() + 0, &hist_txs[..3]); + history_store.add_to_history(&mut txn, Policy::genesis_block_number(), &hist_txs[..3]); history_store.add_to_history(&mut txn, Policy::genesis_block_number() + 2, &hist_txs[3..]); // Verify method works. let real_root_0 = - history_store.get_history_tree_root(Policy::genesis_block_number() + 0, Some(&txn)); + history_store.get_history_tree_root(Policy::genesis_block_number(), Some(&txn)); let calc_root_0 = HistoryStore::_root_from_hist_txs(&hist_txs[..3]); assert_eq!(real_root_0, calc_root_0); @@ -1153,7 +1135,7 @@ mod tests { // Add historic transactions to History Store. let mut txn = env.write_transaction(); - history_store.add_to_history(&mut txn, Policy::genesis_block_number() + 0, &hist_txs[..3]); + history_store.add_to_history(&mut txn, Policy::genesis_block_number(), &hist_txs[..3]); history_store.add_to_history(&mut txn, Policy::genesis_block_number() + 2, &hist_txs[3..]); // Verify method works. Note that the block transactions are returned in the same @@ -1313,7 +1295,7 @@ mod tests { // Add historic transactions to History Store. let mut txn = env.write_transaction(); - history_store.add_to_history(&mut txn, Policy::genesis_block_number() + 0, &hist_txs[..3]); + history_store.add_to_history(&mut txn, Policy::genesis_block_number(), &hist_txs[..3]); history_store.add_to_history(&mut txn, Policy::genesis_block_number() + 2, &hist_txs[3..]); // Verify method works. @@ -1417,7 +1399,7 @@ mod tests { // Add historic transactions to History Store. let mut txn = env.write_transaction(); - history_store.add_to_history(&mut txn, Policy::genesis_block_number() + 0, &hist_txs[..3]); + history_store.add_to_history(&mut txn, Policy::genesis_block_number(), &hist_txs[..3]); history_store.add_to_history(&mut txn, Policy::genesis_block_number() + 2, &hist_txs[3..]); // Verify method works. @@ -1573,9 +1555,9 @@ mod tests { fn gen_hist_txs() -> Vec { let genesis_block_number = Policy::genesis_block_number(); - let ext_0 = create_transaction(genesis_block_number + 0, 0); - let ext_1 = create_transaction(genesis_block_number + 0, 1); - let ext_2 = create_reward_inherent(genesis_block_number + 0, 2); + let ext_0 = create_transaction(genesis_block_number, 0); + let ext_1 = create_transaction(genesis_block_number, 1); + let ext_2 = create_reward_inherent(genesis_block_number, 2); let ext_3 = create_transaction(genesis_block_number + 1, 3); let ext_4 = create_reward_inherent(genesis_block_number + 1, 4); diff --git a/blockchain/src/history/history_store_index.rs b/blockchain/src/history/history_store_index.rs index 4de7419ba6..49144624cc 100644 --- a/blockchain/src/history/history_store_index.rs +++ b/blockchain/src/history/history_store_index.rs @@ -600,7 +600,7 @@ impl<'txn> TxHashIterator<'txn> { } } -impl<'txn> Iterator for TxHashIterator<'txn> { +impl Iterator for TxHashIterator<'_> { type Item = Blake2bHash; fn next(&mut self) -> Option { @@ -829,15 +829,9 @@ mod tests { history_store.add_to_history(&mut txn, Policy::genesis_block_number() + 1, &hist_txs); // Those transactions should be part of the valitidy window - assert_eq!( - history_store.tx_in_validity_window(&ext_0.tx_hash(), Some(&txn)), - true - ); + assert!(history_store.tx_in_validity_window(&ext_0.tx_hash(), Some(&txn))); - assert_eq!( - history_store.tx_in_validity_window(&ext_1.tx_hash(), Some(&txn)), - true - ); + assert!(history_store.tx_in_validity_window(&ext_1.tx_hash(), Some(&txn))); // Now keep pushing transactions to the history store until we are past the transaction validity window let validity_window_blocks = Policy::transaction_validity_window_blocks(); @@ -850,33 +844,21 @@ mod tests { history_store.add_to_history( &mut txn, Policy::genesis_block_number() + bn, - &vec![historic_txn], + &[historic_txn], ); } // Since we are past the txn in validity window, the first two transaction should no longer be in it - assert_eq!( - history_store.tx_in_validity_window(&ext_0.tx_hash(), Some(&txn)), - false - ); + assert!(!history_store.tx_in_validity_window(&ext_0.tx_hash(), Some(&txn))); - assert_eq!( - history_store.tx_in_validity_window(&ext_1.tx_hash(), Some(&txn)), - false - ); + assert!(!history_store.tx_in_validity_window(&ext_1.tx_hash(), Some(&txn))); for txn_hash in &txn_hashes[..8] { - assert_eq!( - history_store.tx_in_validity_window(txn_hash, Some(&txn)), - false - ); + assert!(!history_store.tx_in_validity_window(txn_hash, Some(&txn))); } for txn_hash in &txn_hashes[8..] { - assert_eq!( - history_store.tx_in_validity_window(txn_hash, Some(&txn)), - true - ); + assert!(history_store.tx_in_validity_window(txn_hash, Some(&txn))); } } @@ -891,12 +873,12 @@ mod tests { // Add historic transactions to History Store. let mut txn = env.write_transaction(); - history_store.add_to_history(&mut txn, Policy::genesis_block_number() + 0, &hist_txs[..3]); + history_store.add_to_history(&mut txn, Policy::genesis_block_number(), &hist_txs[..3]); history_store.add_to_history(&mut txn, Policy::genesis_block_number() + 2, &hist_txs[3..]); // Verify method works. let real_root_0 = - history_store.get_history_tree_root(Policy::genesis_block_number() + 0, Some(&txn)); + history_store.get_history_tree_root(Policy::genesis_block_number(), Some(&txn)); let calc_root_0 = HistoryStore::_root_from_hist_txs(&hist_txs[..3]); assert_eq!(real_root_0, calc_root_0); @@ -919,7 +901,7 @@ mod tests { // Add historic transactions to History Store. let mut txn = env.write_transaction(); - history_store.add_to_history(&mut txn, Policy::genesis_block_number() + 0, &hist_txs[..3]); + history_store.add_to_history(&mut txn, Policy::genesis_block_number(), &hist_txs[..3]); history_store.add_to_history(&mut txn, Policy::genesis_block_number() + 2, &hist_txs[3..]); let hashes: Vec<_> = hist_txs.iter().map(|hist_tx| hist_tx.tx_hash()).collect(); @@ -967,7 +949,7 @@ mod tests { // Add historic transactions to History Store. let mut txn = env.write_transaction(); - history_store.add_to_history(&mut txn, Policy::genesis_block_number() + 0, &hist_txs[..3]); + history_store.add_to_history(&mut txn, Policy::genesis_block_number(), &hist_txs[..3]); history_store.add_to_history(&mut txn, Policy::genesis_block_number() + 2, &hist_txs[3..]); // Verify method works. Note that the block transactions are returned in the same @@ -1127,7 +1109,7 @@ mod tests { // Add historic transactions to History Store. let mut txn = env.write_transaction(); - history_store.add_to_history(&mut txn, Policy::genesis_block_number() + 0, &hist_txs[..3]); + history_store.add_to_history(&mut txn, Policy::genesis_block_number(), &hist_txs[..3]); history_store.add_to_history(&mut txn, Policy::genesis_block_number() + 2, &hist_txs[3..]); // Verify method works. @@ -1231,7 +1213,7 @@ mod tests { // Add historic transactions to History Store. let mut txn = env.write_transaction(); - history_store.add_to_history(&mut txn, Policy::genesis_block_number() + 0, &hist_txs[..3]); + history_store.add_to_history(&mut txn, Policy::genesis_block_number(), &hist_txs[..3]); history_store.add_to_history(&mut txn, Policy::genesis_block_number() + 2, &hist_txs[3..]); // Verify method works. @@ -1259,7 +1241,7 @@ mod tests { // Add historic transactions to History Store. let mut txn = env.write_transaction(); - history_store.add_to_history(&mut txn, Policy::genesis_block_number() + 0, &hist_txs[..3]); + history_store.add_to_history(&mut txn, Policy::genesis_block_number(), &hist_txs[..3]); history_store.add_to_history(&mut txn, Policy::genesis_block_number() + 2, &hist_txs[3..]); // Verify method works. @@ -1334,14 +1316,14 @@ mod tests { // Add historic transactions to History Store. let mut txn = env.write_transaction(); - history_store.add_to_history(&mut txn, Policy::genesis_block_number() + 0, &hist_txs[..3]); + history_store.add_to_history(&mut txn, Policy::genesis_block_number(), &hist_txs[..3]); history_store.add_to_history(&mut txn, Policy::genesis_block_number() + 2, &hist_txs[3..]); let hashes: Vec<_> = hist_txs.iter().map(|hist_tx| hist_tx.tx_hash()).collect(); // Verify method works. let root = history_store - .get_history_tree_root(Policy::genesis_block_number() + 0, Some(&txn)) + .get_history_tree_root(Policy::genesis_block_number(), Some(&txn)) .unwrap(); let proof = history_store @@ -1405,7 +1387,7 @@ mod tests { // Verify method works. let root = history_store - .get_history_tree_root(Policy::genesis_block_number() + 0, Some(&txn)) + .get_history_tree_root(Policy::genesis_block_number(), Some(&txn)) .unwrap(); let proof = history_store.prove(0, vec![], None, Some(&txn)).unwrap(); @@ -1561,9 +1543,9 @@ mod tests { fn gen_hist_txs() -> Vec { let genesis_block_number = Policy::genesis_block_number(); - let ext_0 = create_transaction(genesis_block_number + 0, 0); - let ext_1 = create_transaction(genesis_block_number + 0, 1); - let ext_2 = create_reward_inherent(genesis_block_number + 0, 2); + let ext_0 = create_transaction(genesis_block_number, 0); + let ext_1 = create_transaction(genesis_block_number, 1); + let ext_2 = create_reward_inherent(genesis_block_number, 2); let ext_3 = create_transaction(genesis_block_number + 1, 3); let ext_4 = create_reward_inherent(genesis_block_number + 1, 4); diff --git a/blockchain/src/history/merged_history_store.rs b/blockchain/src/history/merged_history_store.rs index 7c6e69cebb..621ae7346a 100644 --- a/blockchain/src/history/merged_history_store.rs +++ b/blockchain/src/history/merged_history_store.rs @@ -731,10 +731,10 @@ mod tests { } fn gen_hist_txs() -> Vec { - let start_block_number = Policy::genesis_block_number() + 0; - let ext_0 = create_transaction(start_block_number + 0, 0); - let ext_1 = create_transaction(start_block_number + 0, 1); - let ext_2 = create_reward_inherent(start_block_number + 0, 2); + let start_block_number = Policy::genesis_block_number(); + let ext_0 = create_transaction(start_block_number, 0); + let ext_1 = create_transaction(start_block_number, 1); + let ext_2 = create_reward_inherent(start_block_number, 2); let ext_3 = create_transaction(start_block_number + 1, 3); let ext_4 = create_reward_inherent(start_block_number + 1, 4); diff --git a/blockchain/src/history/mmr_store.rs b/blockchain/src/history/mmr_store.rs index f2588fb1da..3c42673032 100644 --- a/blockchain/src/history/mmr_store.rs +++ b/blockchain/src/history/mmr_store.rs @@ -116,7 +116,7 @@ fn get_size( } } -impl<'a, 'env> Store for MMRStore<'a, 'env> { +impl Store for MMRStore<'_, '_> { fn push(&mut self, elem: Blake2bHash) { // This function assumes that there is no higher epoch. // Otherwise the append method will fail. diff --git a/blockchain/tests/block_production.rs b/blockchain/tests/block_production.rs index c56ec2e4f7..ff33958356 100644 --- a/blockchain/tests/block_production.rs +++ b/blockchain/tests/block_production.rs @@ -201,7 +201,7 @@ fn it_can_produce_micro_blocks_with_equivocation_proofs() { let equivocation_proofs = if reverse { equivocation_proofs.iter().cloned().rev().collect() } else { - equivocation_proofs.iter().cloned().collect() + equivocation_proofs.to_vec() }; let time = Arc::new(OffsetTime::new()); diff --git a/blockchain/tests/blockchain.rs b/blockchain/tests/blockchain.rs index 38802d1123..2f645f26df 100644 --- a/blockchain/tests/blockchain.rs +++ b/blockchain/tests/blockchain.rs @@ -27,7 +27,7 @@ fn prune_epoch_micro_blocks() { producer .next_micro_block( &bc_read, - &bc_read.time.now() + 1_u64 * 1000, + &bc_read.time.now() + 1000, vec![], vec![], vec![0x42], @@ -40,7 +40,7 @@ fn prune_epoch_micro_blocks() { producer .next_micro_block( &bc_read, - bc_read.time.now() + 1_u64 * 100, + bc_read.time.now() + 100, vec![], vec![], vec![0x32], @@ -53,7 +53,7 @@ fn prune_epoch_micro_blocks() { producer .next_micro_block( &bc_read, - bc_read.time.now() + 1_u64 * 10000, + bc_read.time.now() + 10000, vec![], vec![], vec![0x82], diff --git a/blockchain/tests/history_store.rs b/blockchain/tests/history_store.rs index 5f3fecd883..95898657e9 100644 --- a/blockchain/tests/history_store.rs +++ b/blockchain/tests/history_store.rs @@ -46,7 +46,7 @@ fn revert_block(temp_producer: &TemporaryBlockProducer, hist_tx_pre: &[HistoricT blockchain.revert_blocks(1, &mut txn).unwrap(); txn.commit(); - let hist_tx_revert = get_hist_tx(&temp_producer); + let hist_tx_revert = get_hist_tx(temp_producer); assert_eq!(hist_tx_pre, &hist_tx_revert); } @@ -215,7 +215,7 @@ fn add_block_assert_history_store( is_skip_block: bool, ) -> (Vec, Vec) { // Get initial history store. - let hist_tx_pre = get_hist_tx(&temp_producer1); + let hist_tx_pre = get_hist_tx(temp_producer1); // Add a block with the equivocation proofs. let skip_block_proof = if is_skip_block { @@ -244,7 +244,7 @@ fn add_block_assert_history_store( ); // Get the new history store after the block push. - let hist_tx_after = get_hist_tx(&temp_producer1); + let hist_tx_after = get_hist_tx(temp_producer1); // Assert that the jail inherent and equivocation proofs are present in history store. // There is 1 inherent and 1 event generated per equivocation proof. diff --git a/blockchain/tests/merged_history_store.rs b/blockchain/tests/merged_history_store.rs index 702316a415..8144827a23 100644 --- a/blockchain/tests/merged_history_store.rs +++ b/blockchain/tests/merged_history_store.rs @@ -46,7 +46,7 @@ fn revert_block(temp_producer: &TemporaryBlockProducer, hist_tx_pre: &[HistoricT blockchain.revert_blocks(1, &mut txn).unwrap(); txn.commit(); - let hist_tx_revert = get_hist_tx(&temp_producer); + let hist_tx_revert = get_hist_tx(temp_producer); assert_eq!(hist_tx_pre, &hist_tx_revert); } @@ -215,7 +215,7 @@ fn add_block_assert_history_store( is_skip_block: bool, ) -> (Vec, Vec) { // Get initial history store. - let hist_tx_pre = get_hist_tx(&temp_producer1); + let hist_tx_pre = get_hist_tx(temp_producer1); // Add a block with the equivocation proofs. let skip_block_proof = if is_skip_block { @@ -244,7 +244,7 @@ fn add_block_assert_history_store( ); // Get the new history store after the block push. - let hist_tx_after = get_hist_tx(&temp_producer1); + let hist_tx_after = get_hist_tx(temp_producer1); // Assert that the jail inherent and equivocation proofs are present in history store. // There is 1 inherent and 1 event generated per equivocation proof. diff --git a/blockchain/tests/signed.rs b/blockchain/tests/signed.rs index 3b2b5e06b3..400607adaf 100644 --- a/blockchain/tests/signed.rs +++ b/blockchain/tests/signed.rs @@ -123,7 +123,7 @@ fn test_replay() { }); // verify commit - this should fail - assert!(!TendermintProof::verify(&block, &validators)); + assert!(!TendermintProof::verify(&block, validators)); // create the same thing again but for the PreCommit round let vote = TendermintVote { @@ -154,5 +154,5 @@ fn test_replay() { }); // verify commit - this should not fail as this time it is the correct round - assert!(TendermintProof::verify(&block, &validators)); + assert!(TendermintProof::verify(&block, validators)); } diff --git a/consensus/src/sync/live/block_queue/assembler.rs b/consensus/src/sync/live/block_queue/assembler.rs index 6e231d7bc1..7d88cdee3d 100644 --- a/consensus/src/sync/live/block_queue/assembler.rs +++ b/consensus/src/sync/live/block_queue/assembler.rs @@ -390,7 +390,7 @@ mod tests { )); assert_eq!(cache.len(), 2); - assert!(matches!(cache.get(&1), None)); + assert!(cache.get(&1).is_none()); assert!(matches!(cache.get(&2), Some(2))); assert!(matches!(cache.get(&3), Some(3))); diff --git a/database/benches/hash_keys.rs b/database/benches/hash_keys.rs index 9ed28ef125..9ce5abb0a8 100644 --- a/database/benches/hash_keys.rs +++ b/database/benches/hash_keys.rs @@ -14,7 +14,7 @@ use rand::{ thread_rng, Rng, }; -const TABLE: &'static str = "bench"; +const TABLE: &str = "bench"; criterion_group! { name = benches; @@ -158,7 +158,7 @@ fn measure_table_insertion, size: usize) let mut txn = db.write_transaction(); for (key, value) in &preload { - let _ = txn.put(&table, key, value); + txn.put(&table, key, value); } txn.commit(); diff --git a/database/src/mdbx/cursor.rs b/database/src/mdbx/cursor.rs index add7a70375..7b832c8e4e 100644 --- a/database/src/mdbx/cursor.rs +++ b/database/src/mdbx/cursor.rs @@ -31,7 +31,7 @@ impl<'txn, Kind: TransactionKind, T: Table> MdbxCursor<'txn, Kind, T> { } } -impl<'txn, Kind: TransactionKind, T: DupTable> MdbxCursor<'txn, Kind, T> +impl MdbxCursor<'_, Kind, T> where T::Value: DupTableValue, { @@ -223,7 +223,7 @@ impl<'txn, Kind: TransactionKind, T: DupTable> DupReadCursor<'txn, T> let result: Option = self.cursor.get_current().unwrap(); if let Some((key, _)) = result { - return self.cursor.iter_dup_of::<(), ()>(&key).count(); + self.cursor.iter_dup_of::<(), ()>(&key).count() } else { 0_usize } @@ -238,7 +238,7 @@ impl<'txn, Kind: TransactionKind, T: DupTable> DupReadCursor<'txn, T> } } -impl<'txn, Kind: TransactionKind, T: Table> Clone for MdbxCursor<'txn, Kind, T> { +impl Clone for MdbxCursor<'_, Kind, T> { fn clone(&self) -> Self { Self { cursor: self.cursor.clone(), @@ -286,7 +286,7 @@ pub enum CursorProxy<'txn, T: Table> { Write(MdbxCursor<'txn, RW, T>), } -impl<'txn, T: Table> Clone for CursorProxy<'txn, T> { +impl Clone for CursorProxy<'_, T> { fn clone(&self) -> Self { match self { Self::Read(cursor) => Self::Read(cursor.clone()), diff --git a/database/src/mdbx/iterators.rs b/database/src/mdbx/iterators.rs index 3125c95eee..086bff47e6 100644 --- a/database/src/mdbx/iterators.rs +++ b/database/src/mdbx/iterators.rs @@ -13,7 +13,7 @@ pub struct IntoIter<'txn, Kind: TransactionKind, T: Table> { pub(super) _t: PhantomData, } -impl<'txn, Kind: TransactionKind, T: Table> Iterator for IntoIter<'txn, Kind, T> { +impl Iterator for IntoIter<'_, Kind, T> { type Item = Row; fn next(&mut self) -> Option { @@ -33,7 +33,7 @@ pub enum IntoIterProxy<'txn, T: Table> { Write(IntoIter<'txn, RW, T>), } -impl<'txn, T: Table> Iterator for IntoIterProxy<'txn, T> { +impl Iterator for IntoIterProxy<'_, T> { type Item = Row; fn next(&mut self) -> Option { diff --git a/hash/src/hmac.rs b/hash/src/hmac.rs index 49181059cb..43df197bb3 100644 --- a/hash/src/hmac.rs +++ b/hash/src/hmac.rs @@ -8,7 +8,7 @@ enum Key<'a> { Owned([u8; SHA512_LENGTH]), } -impl<'a> Key<'a> { +impl Key<'_> { fn get(&self, index: usize) -> Option { match self { Key::Borrowed(key) => key.get(index), diff --git a/hash/src/lib.rs b/hash/src/lib.rs index 8d0de74e17..023e80fd22 100644 --- a/hash/src/lib.rs +++ b/hash/src/lib.rs @@ -355,7 +355,7 @@ impl SerializeContent for String { } } -impl<'a, T: SerializeContent + ?Sized> SerializeContent for &'a T { +impl SerializeContent for &T { fn serialize_content(&self, writer: &mut W) -> io::Result<()> { (**self).serialize_content::(writer) } diff --git a/network-libp2p/tests/network.rs b/network-libp2p/tests/network.rs index ca07b90402..8fec7df3ef 100644 --- a/network-libp2p/tests/network.rs +++ b/network-libp2p/tests/network.rs @@ -198,7 +198,7 @@ impl Verifier { keys: &Arc::PublicKey>>>, ) -> Self { Self { - keys: Arc::clone(&keys), + keys: Arc::clone(keys), } } } @@ -234,7 +234,7 @@ impl dht::Verifier for Verifier { .ok_or(dht::DhtVerifierError::UnknownValidator(validator_address))?; validator_record - .verify(&public_key) + .verify(public_key) .then(|| { dht::DhtRecord::Validator( record.publisher.unwrap(), diff --git a/network-libp2p/tests/request_response.rs b/network-libp2p/tests/request_response.rs index 50525d8915..a40ec2d6ff 100644 --- a/network-libp2p/tests/request_response.rs +++ b/network-libp2p/tests/request_response.rs @@ -573,8 +573,8 @@ async fn send_n_request_to_succeed(net1: &Arc, net2: &Arc, n: async fn send_n_request_to_fail(net1: &Arc, net2: &Arc, n: u32) { for i in 0..n { let test_request = TestRequest4 { request: 42 }; - let net1 = Arc::clone(&net1); - let net2 = Arc::clone(&net2); + let net1 = Arc::clone(net1); + let net2 = Arc::clone(net2); assert!(net2.has_peer(net1.get_local_peer_id())); log::info!("Fail {:?}, {:?}", i, Instant::now()); diff --git a/network-mock/src/lib.rs b/network-mock/src/lib.rs index 3f2916c3b1..36f5e4a181 100644 --- a/network-mock/src/lib.rs +++ b/network-mock/src/lib.rs @@ -71,10 +71,8 @@ pub async fn create_mock_validator_network(n: usize, dial: bool) -> Vec StakingContractStoreRead<'read, T> { } } -impl<'read, T: DataStoreReadOps> StakingContractStoreReadOps - for StakingContractStoreRead<'read, T> -{ +impl StakingContractStoreReadOps for StakingContractStoreRead<'_, T> { fn get_validator(&self, address: &Address) -> Option { self.0.get(&StakingContractStore::validator_key(address)) } @@ -70,7 +68,7 @@ impl<'read, T: DataStoreReadOps> StakingContractStoreReadOps } } -impl<'read, T: DataStoreReadOps + DataStoreIterOps> StakingContractStoreRead<'read, T> { +impl StakingContractStoreRead<'_, T> { pub(crate) fn iter_stakers(&self) -> impl Iterator { self.0.iter( &StakingContractStore::staker_key(&Address::START_ADDRESS), @@ -128,9 +126,7 @@ impl<'write, 'store, 'tree, 'txn, 'txni, 'env> } #[cfg(feature = "interaction-traits")] -impl<'write, 'store, 'tree, 'txn, 'txni, 'env> StakingContractStoreReadOps - for StakingContractStoreWrite<'write, 'store, 'tree, 'txn, 'txni, 'env> -{ +impl StakingContractStoreReadOps for StakingContractStoreWrite<'_, '_, '_, '_, '_, '_> { fn get_validator(&self, address: &Address) -> Option { self.0.get(&StakingContractStore::validator_key(address)) } diff --git a/primitives/account/src/data_store.rs b/primitives/account/src/data_store.rs index 55eac61c58..8d1ea8a180 100644 --- a/primitives/account/src/data_store.rs +++ b/primitives/account/src/data_store.rs @@ -59,13 +59,13 @@ pub struct DataStoreRead<'store, 'tree, 'txn, 'env> { txn: &'txn MdbxReadTransaction<'env>, } -impl<'store, 'tree, 'txn, 'env> DataStoreReadOps for DataStoreRead<'store, 'tree, 'txn, 'env> { +impl DataStoreReadOps for DataStoreRead<'_, '_, '_, '_> { fn get(&self, key: &KeyNibbles) -> Option { self.store.get(self.txn, key) } } -impl<'store, 'tree, 'txn, 'env> DataStoreIterOps for DataStoreRead<'store, 'tree, 'txn, 'env> { +impl<'txn> DataStoreIterOps for DataStoreRead<'_, '_, 'txn, '_> { type Iter = TrieNodeIter<'txn, AccountsTrieTable, T>; fn iter(&self, start_key: &KeyNibbles, end_key: &KeyNibbles) -> Self::Iter { @@ -82,7 +82,7 @@ pub struct DataStoreWrite<'store, 'tree, 'txn, 'txni, 'env> { txn: &'txn mut WriteTransactionProxy<'txni, 'env>, } -impl<'store, 'tree, 'txn, 'txni, 'env> DataStoreWrite<'store, 'tree, 'txn, 'txni, 'env> { +impl DataStoreWrite<'_, '_, '_, '_, '_> { pub fn get(&self, key: &KeyNibbles) -> Option { self.store.get(self.txn, key) } diff --git a/primitives/account/tests/accounts.rs b/primitives/account/tests/accounts.rs index ee1de782b3..f22465f161 100644 --- a/primitives/account/tests/accounts.rs +++ b/primitives/account/tests/accounts.rs @@ -537,7 +537,7 @@ fn accounts_performance_history_sync_batches_single_sender() { let recipient_balances = vec![0; total_txns as usize]; let mut genesis_builder = GenesisBuilder::default(); genesis_builder.with_network(NetworkId::UnitAlbatross); - let rewards = vec![]; + let rewards = []; // Generate accounts let recipient_accounts = @@ -666,7 +666,7 @@ fn accounts_performance_history_sync_batches_many_to_many() { let recipient_balances = vec![10; total_txns as usize]; let mut genesis_builder = GenesisBuilder::default(); genesis_builder.with_network(NetworkId::UnitAlbatross); - let rewards = vec![]; + let rewards = []; // Generate accounts let recipient_accounts = diff --git a/primitives/block/tests/macro_block.rs b/primitives/block/tests/macro_block.rs index 953f120d7f..c5df764bf8 100644 --- a/primitives/block/tests/macro_block.rs +++ b/primitives/block/tests/macro_block.rs @@ -15,7 +15,7 @@ fn test_next_interlink() { } } - let block2 = create_interlink_macro_block(2, &vec![]); + let block2 = create_interlink_macro_block(2, &[]); let block3_interlink = vec![block2.hash()]; assert_eq!(block2.get_next_interlink().unwrap(), block3_interlink); let block3 = create_interlink_macro_block(3, &block3_interlink); diff --git a/primitives/mmr/src/store/memory.rs b/primitives/mmr/src/store/memory.rs index 3ba14f1c2a..101188ecc5 100644 --- a/primitives/mmr/src/store/memory.rs +++ b/primitives/mmr/src/store/memory.rs @@ -74,7 +74,7 @@ impl<'a, H: Clone, S: Store> MemoryTransaction<'a, H, S> { pub fn abort(self) {} } -impl<'a, H: Clone, S: Store> Store for MemoryTransaction<'a, H, S> { +impl> Store for MemoryTransaction<'_, H, S> { fn push(&mut self, elem: H) { self.data.push(elem); } diff --git a/primitives/src/key_nibbles.rs b/primitives/src/key_nibbles.rs index f24bc74bc7..4042b4c070 100644 --- a/primitives/src/key_nibbles.rs +++ b/primitives/src/key_nibbles.rs @@ -429,7 +429,7 @@ mod serde_derive { struct KeyNibblesBytesVisitor; - impl<'de> Visitor<'de> for KeyNibblesBytesVisitor { + impl Visitor<'_> for KeyNibblesBytesVisitor { type Value = KeyNibblesBytes; fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result { diff --git a/primitives/src/policy.rs b/primitives/src/policy.rs index 8eb8d1e25d..c2842405a1 100644 --- a/primitives/src/policy.rs +++ b/primitives/src/policy.rs @@ -79,13 +79,13 @@ impl Policy { /// be honest). /// It is calculated as `ceil(SLOTS*2/3)` and we use the formula `ceil(x/y) = (x+y-1)/y` for the /// ceiling division. - pub const TWO_F_PLUS_ONE: u16 = (2 * Self::SLOTS + 3 - 1) / 3; + pub const TWO_F_PLUS_ONE: u16 = (2 * Self::SLOTS).div_ceil(3); /// Calculates f+1 slots which is the minimum number of slots necessary to be guaranteed to have at /// least one honest slots. That's because from a total of 3f+1 slots at most f will be malicious. /// It is calculated as `ceil(SLOTS/3)` and we use the formula `ceil(x/y) = (x+y-1)/y` for the /// ceiling division. - pub const F_PLUS_ONE: u16 = (Self::SLOTS + 3 - 1) / 3; + pub const F_PLUS_ONE: u16 = Self::SLOTS.div_ceil(3); /// The minimum timeout in milliseconds for a validator to produce a block (4s) pub const MIN_PRODUCER_TIMEOUT: u64 = 4 * 1000; @@ -239,7 +239,7 @@ impl Policy { } else { let block_number = block_number - Self::genesis_block_number(); let blocks_per_epoch = Self::blocks_per_epoch(); - (block_number + blocks_per_epoch - 1) / blocks_per_epoch + block_number.div_ceil(blocks_per_epoch) } } @@ -268,7 +268,7 @@ impl Policy { } else { let block_number = block_number - Self::genesis_block_number(); let blocks_per_batch = Self::blocks_per_batch(); - (block_number + blocks_per_batch - 1) / blocks_per_batch + block_number.div_ceil(blocks_per_batch) } } @@ -717,13 +717,11 @@ mod tests { assert_eq!(Policy::batch_at(Policy::genesis_block_number()), 0); assert_eq!(Policy::batch_at(1 + Policy::genesis_block_number()), 1); assert_eq!( - Policy::batch_at(Policy::blocks_per_batch() as u32 + Policy::genesis_block_number()), + Policy::batch_at(Policy::blocks_per_batch() + Policy::genesis_block_number()), 1 ); assert_eq!( - Policy::batch_at( - Policy::blocks_per_batch() as u32 + Policy::genesis_block_number() + 1 - ), + Policy::batch_at(Policy::blocks_per_batch() + Policy::genesis_block_number() + 1), 2 ); } @@ -752,135 +750,85 @@ mod tests { #[test] fn it_correctly_computes_block_positions() { initialize_policy(); - assert_eq!( - Policy::is_macro_block_at(Policy::genesis_block_number()), - true - ); - assert_eq!( - !Policy::is_micro_block_at(Policy::genesis_block_number()), - true - ); - assert_eq!( - Policy::is_election_block_at(Policy::genesis_block_number()), - true - ); - - assert_eq!( - Policy::is_macro_block_at(1 + Policy::genesis_block_number()), - false - ); - assert_eq!( - !Policy::is_micro_block_at(1 + Policy::genesis_block_number()), - false - ); - assert_eq!( - Policy::is_election_block_at(1 + Policy::genesis_block_number()), - false - ); - - assert_eq!( - Policy::is_macro_block_at(2 + Policy::genesis_block_number()), - false - ); - assert_eq!( - !Policy::is_micro_block_at(2 + Policy::genesis_block_number()), - false - ); - assert_eq!( - Policy::is_election_block_at(2 + Policy::genesis_block_number()), - false - ); - - assert_eq!( - Policy::is_macro_block_at( - Policy::blocks_per_batch() as u32 + Policy::genesis_block_number() - ), - true - ); - assert_eq!( - Policy::is_micro_block_at( - Policy::blocks_per_batch() as u32 + Policy::genesis_block_number() - ), - false - ); - assert_eq!( - Policy::is_election_block_at( - Policy::blocks_per_batch() as u32 + Policy::genesis_block_number() - ), - false - ); - - assert_eq!( - Policy::is_macro_block_at(127 + Policy::genesis_block_number()), - false - ); - assert_eq!( - !Policy::is_micro_block_at(127 + Policy::genesis_block_number()), - false - ); - assert_eq!( - Policy::is_election_block_at(127 + Policy::genesis_block_number()), - false - ); - - assert_eq!( - Policy::is_macro_block_at(Policy::blocks_per_epoch() + Policy::genesis_block_number()), - true - ); - assert_eq!( - !Policy::is_micro_block_at(Policy::blocks_per_epoch() + Policy::genesis_block_number()), - true - ); - assert_eq!( - Policy::is_election_block_at( - Policy::blocks_per_epoch() + Policy::genesis_block_number() - ), - true - ); - - assert_eq!( - Policy::is_macro_block_at( - Policy::blocks_per_epoch() + Policy::genesis_block_number() + 1 - ), - false - ); - assert_eq!( - !Policy::is_micro_block_at( - Policy::blocks_per_epoch() + Policy::genesis_block_number() + 1 - ), - false - ); - assert_eq!( - Policy::is_election_block_at( - Policy::blocks_per_epoch() + Policy::genesis_block_number() + 1 - ), - false - ); - - assert_eq!( - Policy::is_macro_block_at( - Policy::blocks_per_epoch() - + Policy::blocks_per_batch() as u32 - + Policy::genesis_block_number() - ), - true - ); - assert_eq!( - Policy::is_micro_block_at( - Policy::blocks_per_epoch() - + Policy::blocks_per_batch() as u32 - + Policy::genesis_block_number() - ), - false - ); - assert_eq!( - Policy::is_election_block_at( - Policy::blocks_per_epoch() - + Policy::blocks_per_batch() as u32 - + Policy::genesis_block_number() - ), - false - ); + assert!(Policy::is_macro_block_at(Policy::genesis_block_number())); + assert!(!Policy::is_micro_block_at(Policy::genesis_block_number())); + assert!(Policy::is_election_block_at(Policy::genesis_block_number())); + + assert!(!Policy::is_macro_block_at( + 1 + Policy::genesis_block_number() + )); + assert!(Policy::is_micro_block_at( + 1 + Policy::genesis_block_number() + )); + assert!(!Policy::is_election_block_at( + 1 + Policy::genesis_block_number() + )); + + assert!(!Policy::is_macro_block_at( + 2 + Policy::genesis_block_number() + )); + assert!(Policy::is_micro_block_at( + 2 + Policy::genesis_block_number() + )); + assert!(!Policy::is_election_block_at( + 2 + Policy::genesis_block_number() + )); + + assert!(Policy::is_macro_block_at( + Policy::blocks_per_batch() + Policy::genesis_block_number() + )); + assert!(!Policy::is_micro_block_at( + Policy::blocks_per_batch() + Policy::genesis_block_number() + )); + assert!(!Policy::is_election_block_at( + Policy::blocks_per_batch() + Policy::genesis_block_number() + )); + + assert!(!Policy::is_macro_block_at( + 127 + Policy::genesis_block_number() + )); + assert!(Policy::is_micro_block_at( + 127 + Policy::genesis_block_number() + )); + assert!(!Policy::is_election_block_at( + 127 + Policy::genesis_block_number() + )); + + assert!(Policy::is_macro_block_at( + Policy::blocks_per_epoch() + Policy::genesis_block_number() + )); + assert!(!Policy::is_micro_block_at( + Policy::blocks_per_epoch() + Policy::genesis_block_number() + )); + assert!(Policy::is_election_block_at( + Policy::blocks_per_epoch() + Policy::genesis_block_number() + )); + + assert!(!Policy::is_macro_block_at( + Policy::blocks_per_epoch() + Policy::genesis_block_number() + 1 + )); + assert!(Policy::is_micro_block_at( + Policy::blocks_per_epoch() + Policy::genesis_block_number() + 1 + )); + assert!(!Policy::is_election_block_at( + Policy::blocks_per_epoch() + Policy::genesis_block_number() + 1 + )); + + assert!(Policy::is_macro_block_at( + Policy::blocks_per_epoch() + + Policy::blocks_per_batch() + + Policy::genesis_block_number() + )); + assert!(!Policy::is_micro_block_at( + Policy::blocks_per_epoch() + + Policy::blocks_per_batch() + + Policy::genesis_block_number() + )); + assert!(!Policy::is_election_block_at( + Policy::blocks_per_epoch() + + Policy::blocks_per_batch() + + Policy::genesis_block_number() + )); } #[test] @@ -888,11 +836,11 @@ mod tests { initialize_policy(); assert_eq!( Policy::macro_block_after(Policy::genesis_block_number()), - Policy::genesis_block_number() + Policy::blocks_per_batch() as u32 + Policy::genesis_block_number() + Policy::blocks_per_batch() ); assert_eq!( Policy::macro_block_after(1 + Policy::genesis_block_number()), - Policy::genesis_block_number() + Policy::blocks_per_batch() as u32 + Policy::genesis_block_number() + Policy::blocks_per_batch() ); assert_eq!( Policy::macro_block_after(127 + Policy::genesis_block_number()), @@ -1071,34 +1019,21 @@ mod tests { #[test] fn it_correctly_computes_first_batch_of_epoch() { initialize_policy(); - assert_eq!( - Policy::first_batch_of_epoch(1 + Policy::genesis_block_number()), - true - ); - assert_eq!( - Policy::first_batch_of_epoch( - Policy::blocks_per_batch() as u32 + Policy::genesis_block_number() - ), - true - ); - assert_eq!( - Policy::first_batch_of_epoch( - Policy::blocks_per_batch() as u32 + 1 + Policy::genesis_block_number() - ), - false - ); - assert_eq!( - Policy::first_batch_of_epoch( - Policy::blocks_per_epoch() + Policy::genesis_block_number() - ), - false - ); - assert_eq!( - Policy::first_batch_of_epoch( - Policy::blocks_per_epoch() + 1 + Policy::genesis_block_number() - ), - true - ); + assert!(Policy::first_batch_of_epoch( + 1 + Policy::genesis_block_number() + )); + assert!(Policy::first_batch_of_epoch( + Policy::blocks_per_batch() + Policy::genesis_block_number() + )); + assert!(!Policy::first_batch_of_epoch( + Policy::blocks_per_batch() + 1 + Policy::genesis_block_number() + )); + assert!(!Policy::first_batch_of_epoch( + Policy::blocks_per_epoch() + Policy::genesis_block_number() + )); + assert!(Policy::first_batch_of_epoch( + Policy::blocks_per_epoch() + 1 + Policy::genesis_block_number() + )); } #[test] @@ -1132,28 +1067,18 @@ mod tests { ); // No macro blocks before genesis - assert_eq!(Policy::is_macro_block_at(1), false); - assert_eq!( - Policy::is_macro_block_at(Policy::genesis_block_number()), - true - ); + assert!(!Policy::is_macro_block_at(1)); + assert!(Policy::is_macro_block_at(Policy::genesis_block_number())); // No micro blocks before genesis - assert_eq!( - Policy::is_micro_block_at(Policy::genesis_block_number() - 20), - false - ); - assert_eq!(Policy::is_micro_block_at(15), false); + assert!(!Policy::is_micro_block_at( + Policy::genesis_block_number() - 20 + )); + assert!(!Policy::is_micro_block_at(15)); // Genesis is a macro/election block - assert_eq!( - Policy::is_macro_block_at(Policy::genesis_block_number()), - true - ); - assert_eq!( - Policy::is_election_block_at(Policy::genesis_block_number()), - true - ); + assert!(Policy::is_macro_block_at(Policy::genesis_block_number())); + assert!(Policy::is_election_block_at(Policy::genesis_block_number())); // The next macro for any pre-genesis block is the genesis itself assert_eq!(Policy::macro_block_after(0), Policy::genesis_block_number()); diff --git a/primitives/src/trie/trie_node.rs b/primitives/src/trie/trie_node.rs index 914527069f..8ad0db9a9b 100644 --- a/primitives/src/trie/trie_node.rs +++ b/primitives/src/trie/trie_node.rs @@ -309,7 +309,7 @@ impl<'a> Iterator for Iter<'a> { } } -impl<'a> DoubleEndedIterator for Iter<'a> { +impl DoubleEndedIterator for Iter<'_> { fn next_back(&mut self) -> Option { loop { match self.it.next_back() { @@ -346,7 +346,7 @@ impl<'a> Iterator for IterMut<'a> { } } -impl<'a> DoubleEndedIterator for IterMut<'a> { +impl DoubleEndedIterator for IterMut<'_> { fn next_back(&mut self) -> Option { loop { match self.it.next_back() { diff --git a/primitives/transaction/tests/serialization.rs b/primitives/transaction/tests/serialization.rs index 52862bf148..b63c13c1ee 100644 --- a/primitives/transaction/tests/serialization.rs +++ b/primitives/transaction/tests/serialization.rs @@ -114,9 +114,9 @@ fn it_cannot_deserialize_webuath_proofs_exceeding_max_size() { let mut proof = SignatureProof::default(); proof.webauthn_fields = Some( WebauthnExtraFields { - origin_json_str: format!("www.test.i.am.a.veeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeery.looooooooooooooooooooooooooong.url.auth.example/123456789/sadfuhijkddesjfhghjswakd"), + origin_json_str: "www.test.i.am.a.veeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeery.looooooooooooooooooooooooooong.url.auth.example/123456789/sadfuhijkddesjfhghjswakd".to_string(), has_cross_origin_field: false, - client_data_extra_json: format!("sdfgbhngfdsdfvhjndskldmjfnvhdskfngfdksadnfbghjdnksmjnfhbgdjksmjnfhbgjadfghnfdseawdfgdseawqdfgnhbgfdsawqSDFGFDSAWqaswdfgfdsawdfghfdseawqswDFGDSEAFGHNBGF"), + client_data_extra_json: "sdfgbhngfdsdfvhjndskldmjfnvhdskfngfdksadnfbghjdnksmjnfhbgdjksmjnfhbgjadfghnfdseawdfgdseawqdfgnhbgfdsawqSDFGFDSAWqaswdfgfdsawdfghfdseawqswDFGDSEAFGHNBGF".to_string(), authenticator_data_suffix: vec![0u8; 209] } ); diff --git a/primitives/trie/src/transaction.rs b/primitives/trie/src/transaction.rs index f043568040..4bc9d80188 100644 --- a/primitives/trie/src/transaction.rs +++ b/primitives/trie/src/transaction.rs @@ -20,7 +20,7 @@ pub(crate) trait TransactionExt { fn get_node(&self, db: &T, key: &KeyNibbles) -> Option; } -impl<'db> TransactionExt for MdbxReadTransaction<'db> { +impl TransactionExt for MdbxReadTransaction<'_> { fn get_node(&self, db: &T, key: &KeyNibbles) -> Option { let mut node: TrieNode = self.get(db, key)?; node.key = key.clone(); @@ -28,7 +28,7 @@ impl<'db> TransactionExt for MdbxReadTransaction<'db> { } } -impl<'txn, 'env> TransactionExt for WriteTransactionProxy<'txn, 'env> { +impl TransactionExt for WriteTransactionProxy<'_, '_> { fn get_node(&self, table: &T, key: &KeyNibbles) -> Option { self.raw.get_node(table, key) } @@ -60,7 +60,7 @@ impl<'txn, 'env> From<&'txn mut MdbxWriteTransaction<'env>> for WriteTransaction } } -impl<'txn, 'env> WriteTransactionProxy<'txn, 'env> { +impl<'env> WriteTransactionProxy<'_, 'env> { pub fn start_recording(&mut self) { assert!(self.diff.is_none(), "cannot stack change recordings"); self.diff = Some(Default::default()); @@ -118,7 +118,7 @@ impl<'txn, 'env> WriteTransactionProxy<'txn, 'env> { } } -impl<'txn, 'env> ops::Deref for WriteTransactionProxy<'txn, 'env> { +impl<'env> ops::Deref for WriteTransactionProxy<'_, 'env> { type Target = MdbxWriteTransaction<'env>; fn deref(&self) -> &MdbxWriteTransaction<'env> { self.raw diff --git a/primitives/trie/src/trie.rs b/primitives/trie/src/trie.rs index e85c945146..0712b29887 100644 --- a/primitives/trie/src/trie.rs +++ b/primitives/trie/src/trie.rs @@ -1607,7 +1607,7 @@ pub struct TrieNodeIter<'txn, T: TrieTable, D> { _type: PhantomData, } -impl<'txn, T: TrieTable, D> TrieNodeIter<'txn, T, D> { +impl TrieNodeIter<'_, T, D> { /// This iterator is meant to start at `start_key` and finish at `end_key`, both of these are inclusive. fn new( table: &T, @@ -1625,7 +1625,7 @@ impl<'txn, T: TrieTable, D> TrieNodeIter<'txn, T, D> { } } -impl<'txn, T: TrieTable, D: Deserialize> Iterator for TrieNodeIter<'txn, T, D> { +impl Iterator for TrieNodeIter<'_, T, D> { type Item = D; fn next(&mut self) -> Option { diff --git a/serde/src/lib.rs b/serde/src/lib.rs index 6b3bb2da95..9726a25d59 100644 --- a/serde/src/lib.rs +++ b/serde/src/lib.rs @@ -243,7 +243,7 @@ pub trait Serialize: serde::Serialize { written: &'b mut usize, error: &'b mut Option, } - impl<'a, 'b, W: Write> postcard::ser_flavors::Flavor for Wrapper<'a, 'b, W> { + impl postcard::ser_flavors::Flavor for Wrapper<'_, '_, W> { type Output = (); fn try_push(&mut self, data: u8) -> postcard::Result<()> { self.try_extend(&[data]) diff --git a/utils/tests/merkle/incremental.rs b/utils/tests/merkle/incremental.rs index 6ae5d28b9e..fc93d2e367 100644 --- a/utils/tests/merkle/incremental.rs +++ b/utils/tests/merkle/incremental.rs @@ -315,7 +315,7 @@ fn it_correctly_computes_more_complex_proofs() { for chunk_size in 1..end { let chunks = incremental(&values[..end], chunk_size); - assert_eq!(chunks.len(), (end + chunk_size - 1) / chunk_size); + assert_eq!(chunks.len(), end.div_ceil(chunk_size)); // Verify each chunk. let mut prev_proof = None; diff --git a/utils/tests/merkle/partial.rs b/utils/tests/merkle/partial.rs index 8cca2a7c89..69947e3c16 100644 --- a/utils/tests/merkle/partial.rs +++ b/utils/tests/merkle/partial.rs @@ -356,7 +356,7 @@ fn it_correctly_computes_more_complex_proofs() { ); let chunks = chunks.unwrap(); - assert_eq!(chunks.len(), (end + chunk_size - 1) / chunk_size); + assert_eq!(chunks.len(), end.div_ceil(chunk_size)); // Verify each chunk. let mut prev_proof = None; diff --git a/validator-network/src/single_response_requester.rs b/validator-network/src/single_response_requester.rs index 0251eccb20..7aefdd3bf7 100644 --- a/validator-network/src/single_response_requester.rs +++ b/validator-network/src/single_response_requester.rs @@ -29,8 +29,8 @@ where FuturesUnordered::Response, u16>>>, } -impl<'a, TValidatorNetwork, TRequest, TOutput> - SingleResponseRequester<'a, TValidatorNetwork, TRequest, TOutput> +impl + SingleResponseRequester<'_, TValidatorNetwork, TRequest, TOutput> where TValidatorNetwork: ValidatorNetwork + 'static, TRequest: Request + Clone, @@ -87,8 +87,8 @@ where } } -impl<'a, TValidatorNetwork, TRequest, TOutput> Future - for SingleResponseRequester<'a, TValidatorNetwork, TRequest, TOutput> +impl Future + for SingleResponseRequester<'_, TValidatorNetwork, TRequest, TOutput> where TValidatorNetwork: ValidatorNetwork + 'static, TRequest: Request + Clone, diff --git a/validator/src/aggregation/tendermint/state.rs b/validator/src/aggregation/tendermint/state.rs index 584d2a6622..94e447ba9b 100644 --- a/validator/src/aggregation/tendermint/state.rs +++ b/validator/src/aggregation/tendermint/state.rs @@ -48,7 +48,7 @@ impl Debug for MacroState { /// A simple wrapper to use `Display` instead of `Debug`. struct DisplayWrapper<'a, T>(&'a T); -impl<'a, T> Debug for DisplayWrapper<'a, T> +impl Debug for DisplayWrapper<'_, T> where T: Display, { @@ -59,7 +59,7 @@ where } struct BestVotes<'a>(&'a BTreeMap<(u32, Step), TendermintContribution>); -impl<'a> Debug for BestVotes<'a> { +impl Debug for BestVotes<'_> { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { // Use the `Display` implementation for `TendermintContribution` instead. f.debug_map() @@ -69,7 +69,7 @@ impl<'a> Debug for BestVotes<'a> { } struct Votes<'a>(&'a BTreeMap<(u32, Step), Option>); -impl<'a> Debug for Votes<'a> { +impl Debug for Votes<'_> { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { // Use short representations for the hashes instead. f.debug_map() diff --git a/validator/tests/integration.rs b/validator/tests/integration.rs index c5a0950f5c..371127bbdd 100644 --- a/validator/tests/integration.rs +++ b/validator/tests/integration.rs @@ -43,7 +43,7 @@ async fn validator_update() { let tx = TransactionBuilder::new_update_validator( &validator_key(), &validator_key(), - Some(new_signing_key.public.clone()), + Some(new_signing_key.public), Some(&new_voting_key), None, None, diff --git a/web-client/tests/wasm.rs b/web-client/tests/wasm.rs index 9a5d1b03af..a0e420472b 100644 --- a/web-client/tests/wasm.rs +++ b/web-client/tests/wasm.rs @@ -7,7 +7,6 @@ use nimiq_genesis::NetworkId; use nimiq_light_blockchain::LightBlockchain; use nimiq_network_interface::network::{Network, Topic}; use nimiq_network_mock::MockHub; -use nimiq_primitives::policy::Policy; use nimiq_zkp_component::ZKPComponent; use parking_lot::{Mutex, RwLock}; use serde::{Deserialize, Serialize}; diff --git a/zkp-circuits/src/circuits/mod.rs b/zkp-circuits/src/circuits/mod.rs index 1f1160a143..92f8e69b32 100644 --- a/zkp-circuits/src/circuits/mod.rs +++ b/zkp-circuits/src/circuits/mod.rs @@ -20,7 +20,7 @@ pub const fn num_inputs(num_bytes: &[usize]) -> usize { let mut i = 0; loop { // ceiling div: (self + rhs - 1) / rhs - num_inputs += (num_bytes[i] * 8 + capacity - 1) / capacity; + num_inputs += (num_bytes[i] * 8).div_ceil(capacity); i += 1; if i >= num_bytes.len() { break; diff --git a/zkp-primitives/pedersen-generators/src/lib.rs b/zkp-primitives/pedersen-generators/src/lib.rs index 2945e73cbe..72f1c0a850 100644 --- a/zkp-primitives/pedersen-generators/src/lib.rs +++ b/zkp-primitives/pedersen-generators/src/lib.rs @@ -46,7 +46,7 @@ const fn num_windows() -> usize { let capacity = POINT_CAPACITY; let generators_needed_a = 4; // At least this much is required for the non-leaf nodes. - let generators_needed_b = (num_bits_per_leaf + capacity - 1) / capacity + 1; + let generators_needed_b = num_bits_per_leaf.div_ceil(capacity) + 1; // Choose maximum. if generators_needed_a > generators_needed_b { diff --git a/zkp/examples/verify.rs b/zkp/examples/verify.rs index 5ad086c999..8d0f534010 100644 --- a/zkp/examples/verify.rs +++ b/zkp/examples/verify.rs @@ -48,7 +48,7 @@ fn main() { let path = &PathBuf::from(DEFAULT_EXAMPLE_ZKP_PATH); ZKP_VERIFYING_DATA - .init_with_data(load_verifying_data(&path).expect("No keys in current directory")); + .init_with_data(load_verifying_data(path).expect("No keys in current directory")); // Ask user for the number of epochs. println!("Enter the number of epochs to verify:");