From 15281eaf93ed761f7be9084b21ba4b902770b229 Mon Sep 17 00:00:00 2001 From: Daniel Date: Mon, 25 Nov 2024 13:51:08 +0100 Subject: [PATCH 01/11] fix: update deps and remove stale audit exceptions --- .cargo/config.toml | 7 - Cargo.lock | 1075 +++++++++++++++++++++++++++----------------- 2 files changed, 674 insertions(+), 408 deletions(-) diff --git a/.cargo/config.toml b/.cargo/config.toml index 6ef693e4f1..d513085448 100644 --- a/.cargo/config.toml +++ b/.cargo/config.toml @@ -32,10 +32,7 @@ tree --no-default-features --depth 1 --edges=features,normal # Requires `cargo-audit`. Run `cargo install cargo-audit` to install it. # The `cf-audit` command is configured to ignore the following advisories: # Vulnerabilities: -# - RUSTSEC-2022-0093: This advisory is related to ed25519-dalek's public api design, which we don't expose. # - RUSTSEC-2024-0344: curve25519-dalek is a transitive dependency of `substrate` -# Unsound: -# - RUSTSEC-2021-0145: This advisory only affects the windows platform. It's a transitive dependency of `substrate`. # Unmaintained: # - RUSTSEC-2020-0168: This advisory comes from `mach`, which is unmaintained but not a security issue. It's a dependency of `subxt`. # - RUSTSEC-2021-0139: This advisory comes from `ansi_term`, which is unmaintained but not a security issue. It's a dependency of `subxt`. @@ -43,21 +40,17 @@ tree --no-default-features --depth 1 --edges=features,normal # - RUSTSEC-2024-0336: This adivsory comes from rustls, which is a dependency of the `try-runtime-cli` crate. # - RUSTSEC-2024-0320: Unmaintained transitive `yaml-rust` dependency of `insta` crate. We only use insta for testing. # - RUSTSEC-2024-0370: Unmaintained transitive dependency. Only affects macro generation efficiency. -# - RUSTSEC-2024-0375: Unmaintained transitive dependency used by clap. # - RUSTSEC-2024-0388: Unmaintained transitive dependency `derivative` used by substrate. # - RUSTSEC-2024-0384: Unmaintained transitive dependency `instant` used by substrate. cf-audit = ''' audit -D unmaintained -D unsound - --ignore RUSTSEC-2022-0093 --ignore RUSTSEC-2021-0139 --ignore RUSTSEC-2020-0168 --ignore RUSTSEC-2022-0061 - --ignore RUSTSEC-2021-0145 --ignore RUSTSEC-2024-0320 --ignore RUSTSEC-2024-0336 --ignore RUSTSEC-2024-0344 --ignore RUSTSEC-2024-0370 - --ignore RUSTSEC-2024-0375 --ignore RUSTSEC-2024-0388 --ignore RUSTSEC-2024-0384 ''' diff --git a/Cargo.lock b/Cargo.lock index 09dcc14c16..383106b201 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -106,9 +106,9 @@ dependencies = [ [[package]] name = "allocator-api2" -version = "0.2.18" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" +checksum = "45862d1c77f2228b9e10bc609d5bc203d86ebc9b87ad8d5d5167a6c9abf739d9" [[package]] name = "android-tzdata" @@ -136,9 +136,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.15" +version = "0.6.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526" +checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b" dependencies = [ "anstyle", "anstyle-parse", @@ -151,43 +151,43 @@ 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.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb" +checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.1.1" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a" +checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.4" +version = "3.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8" +checksum = "2109dbce0e72be3ec00bed26e6a7479ca384ad226efdd66db8fa2e3a38c83125" dependencies = [ "anstyle", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] name = "anyhow" -version = "1.0.89" +version = "1.0.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6" +checksum = "4c95c10ba0b00a02636238b814946408b1322d5ac4760326e6fb8ec956d85775" [[package]] name = "approx" @@ -209,7 +209,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -435,7 +435,7 @@ checksum = "965c2d33e53cb6b267e148a4cb0760bc01f4904c1cd4bb4002a085bb016d1490" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", "synstructure 0.13.1", ] @@ -458,7 +458,7 @@ checksum = "7b18050c2cd6fe86c3a76584ef5e0baf286d038cda203eb6223df2cc413565f7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -536,9 +536,9 @@ dependencies = [ [[package]] name = "async-io" -version = "2.3.4" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "444b0228950ee6501b3568d3c93bf1176a1fdbc3b758dcd9475046d30f4dc7e8" +checksum = "43a2b323ccce0a1d90b449fd71f2a06ca7faa7c54c2751f06c9bd851fc061059" dependencies = [ "async-lock", "cfg-if", @@ -547,7 +547,7 @@ dependencies = [ "futures-lite", "parking", "polling", - "rustix 0.38.37", + "rustix 0.38.41", "slab", "tracing", "windows-sys 0.59.0", @@ -590,7 +590,7 @@ dependencies = [ "cfg-if", "event-listener 5.3.1", "futures-lite", - "rustix 0.38.37", + "rustix 0.38.41", "tracing", ] @@ -606,7 +606,7 @@ dependencies = [ "cfg-if", "futures-core", "futures-io", - "rustix 0.38.37", + "rustix 0.38.41", "signal-hook-registry", "slab", "windows-sys 0.59.0", @@ -626,7 +626,7 @@ checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -684,7 +684,7 @@ checksum = "3c87f3f15e7794432337fc718554eaa4dc8f04c9677a950ffe366f20a162ae42" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -783,9 +783,9 @@ dependencies = [ [[package]] name = "bigdecimal" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51d712318a27c7150326677b321a5fa91b55f6d9034ffd67f20319e147d40cee" +checksum = "8f850665a0385e070b64c38d2354e6c104c8479c59868d1e48a0c13ee2c7a1c1" dependencies = [ "autocfg", "libm", @@ -824,13 +824,13 @@ dependencies = [ "lazy_static", "lazycell", "peeking_take_while", - "prettyplease 0.2.22", + "prettyplease 0.2.25", "proc-macro2", "quote", "regex", "rustc-hash", "shlex", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -859,9 +859,9 @@ checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" [[package]] name = "bitcoin" -version = "0.32.3" +version = "0.32.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0032b0e8ead7074cda7fc4f034409607e3f03a6f71d66ade8a307f79b4d99e73" +checksum = "788902099d47c8682efe6a7afb01c8d58b9794ba66c06affd81c3d6b560743eb" dependencies = [ "base58ck", "bech32 0.11.0", @@ -892,9 +892,9 @@ dependencies = [ [[package]] name = "bitcoin-io" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "340e09e8399c7bd8912f495af6aa58bea0c9214773417ffaa8f6460f93aaee56" +checksum = "0b47c4ab7a93edb0c7198c5535ed9b52b63095f4e9b45279c6736cec4b856baf" [[package]] name = "bitcoin-units" @@ -1050,9 +1050,9 @@ dependencies = [ [[package]] name = "borsh" -version = "1.5.1" +version = "1.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6362ed55def622cddc70a4746a68554d7b687713770de539e59a739b249f8ed" +checksum = "2506947f73ad44e344215ccd6403ac2ae18cd8e046e581a441bf8d199f257f03" dependencies = [ "borsh-derive", "cfg_aliases 0.2.1", @@ -1061,23 +1061,22 @@ dependencies = [ [[package]] name = "borsh-derive" -version = "1.5.1" +version = "1.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3ef8005764f53cd4dca619f5bf64cafd4664dada50ece25e4d81de54c80cc0b" +checksum = "c2593a3b8b938bd68373196c9832f516be11fa487ef4ae745eb282e6a56a7244" dependencies = [ "once_cell", "proc-macro-crate 3.2.0", "proc-macro2", "quote", - "syn 2.0.79", - "syn_derive", + "syn 2.0.89", ] [[package]] name = "bounded-collections" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db436177db0d505b1507f03aca56a41442ae6efdf8b6eaa855d73e52c5b078dc" +checksum = "3d077619e9c237a5d1875166f5e8033e8f6bff0c96f8caf81e1c2d7738c431bf" dependencies = [ "log", "parity-scale-codec", @@ -1103,12 +1102,12 @@ dependencies = [ [[package]] name = "bstr" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40723b8fb387abc38f4f4a37c09073622e41dd12327033091ef8950659e6dc0c" +checksum = "1a68f1f47cdf0ec8ee4b941b2eee2a80cb796db73118c0dd09ac63fbe405be22" dependencies = [ "memchr", - "regex-automata 0.4.8", + "regex-automata 0.4.9", "serde", ] @@ -1141,9 +1140,9 @@ checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" [[package]] name = "bytemuck" -version = "1.18.0" +version = "1.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94bbb0ad554ad961ddc5da507a12a29b14e4ae5bda06b19f575a3e6079d2e2ae" +checksum = "8b37c88a63ffd85d15b406896cc343916d7cf57838a847b3a6f2ca5d39a5695a" [[package]] name = "byteorder" @@ -1153,9 +1152,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.7.2" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3" +checksum = "9ac0150caa2ae65ca5bd83f25c7de183dea78d4d366469f148435e2acfbad0da" dependencies = [ "serde", ] @@ -1239,9 +1238,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.1.28" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e80e3b6a3ab07840e1cae9b0666a63970dc28e8ed5ffbcdacbfc760c281bfc1" +checksum = "fd9de9f2205d5ef3fd67e685b0df337994ddd4495e2a28d185500d0e1edfea47" dependencies = [ "jobserver", "libc", @@ -1312,7 +1311,7 @@ dependencies = [ "ethereum", "ethereum-types", "frame-support", - "generic-array 1.1.0", + "generic-array 1.1.1", "heck 0.5.0", "hex", "hex-literal", @@ -1439,7 +1438,7 @@ name = "cf-runtime-macros" version = "0.1.0" dependencies = [ "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -1714,7 +1713,7 @@ dependencies = [ "jsonrpsee 0.23.2", "lazy_format", "lazy_static", - "mockall 0.13.0", + "mockall 0.13.1", "multisig", "num-bigint", "num-derive", @@ -1791,7 +1790,7 @@ dependencies = [ "hex", "insta", "jsonrpsee 0.23.2", - "mockall 0.13.0", + "mockall 0.13.1", "pallet-cf-broadcast", "pallet-cf-environment", "pallet-cf-ingress-egress", @@ -1965,9 +1964,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.20" +version = "4.5.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b97f376d85a664d5837dbae44bf546e6477a679ff6610010f17276f686d867e8" +checksum = "fb3b4b9e5a7c7514dfa52869339ee98b3156b0bfb4e8a77c4ff4babb64b1604f" dependencies = [ "clap_builder", "clap_derive", @@ -1975,9 +1974,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.20" +version = "4.5.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19bc80abd44e4bed93ca373a0704ccbd1b710dc5749406201bb018272808dc54" +checksum = "b17a95aa67cc7b5ebd32aa5370189aa0d79069ef1c64ce893bd30fb24bff20ec" dependencies = [ "anstream", "anstyle", @@ -1995,14 +1994,14 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] name = "clap_lex" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97" +checksum = "afb84c814227b90d6895e01398aee0d8033c00e7466aca416fb6a8e0eb19d8a7" [[package]] name = "cmake" @@ -2020,7 +2019,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" dependencies = [ "termcolor", - "unicode-width", + "unicode-width 0.1.14", ] [[package]] @@ -2077,9 +2076,9 @@ dependencies = [ [[package]] name = "colorchoice" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0" +checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990" [[package]] name = "combine" @@ -2097,13 +2096,13 @@ dependencies = [ [[package]] name = "comfy-table" -version = "7.1.1" +version = "7.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b34115915337defe99b2aff5c2ce6771e5fbc4079f4b506301f5cf394c8452f7" +checksum = "24f165e7b643266ea80cb858aed492ad9280e3e05ce24d4a99d7d7b889b6a4d9" dependencies = [ "strum 0.26.3", "strum_macros 0.26.4", - "unicode-width", + "unicode-width 0.2.0", ] [[package]] @@ -2149,15 +2148,15 @@ dependencies = [ "encode_unicode", "lazy_static", "libc", - "unicode-width", + "unicode-width 0.1.14", "windows-sys 0.52.0", ] [[package]] name = "const-hex" -version = "1.13.1" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0121754e84117e65f9d90648ee6aa4882a6e63110307ab73967a4c5e7e69e586" +checksum = "487981fa1af147182687064d0a2c336586d337a606595ced9ffb0c685c250c73" dependencies = [ "cfg-if", "cpufeatures", @@ -2252,9 +2251,9 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.14" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0" +checksum = "16b80225097f2e5ae4e7179dd2266824648f3e2f49d9134d584b76389d31c4c3" dependencies = [ "libc", ] @@ -2466,9 +2465,9 @@ dependencies = [ [[package]] name = "csv" -version = "1.3.0" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac574ff4d437a7b5ad237ef331c17ccca63c46479e5b5453eb8e10bb99a759fe" +checksum = "acdc4883a9c96732e4733212c01447ebd805833b7275a73ca3ee080fd77afdaf" dependencies = [ "csv-core", "itoa", @@ -2545,7 +2544,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -2586,46 +2585,47 @@ dependencies = [ [[package]] name = "cxx" -version = "1.0.128" +version = "1.0.131" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54ccead7d199d584d139148b04b4a368d1ec7556a1d9ea2548febb1b9d49f9a4" +checksum = "2568d7d2cfc051e43414fe1ef80c712cbcd60c3624d1ad1cb4b2572324d0a5d9" dependencies = [ "cc", "cxxbridge-flags", "cxxbridge-macro", + "foldhash", "link-cplusplus", ] [[package]] name = "cxx-build" -version = "1.0.128" +version = "1.0.131" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c77953e99f01508f89f55c494bfa867171ef3a6c8cea03d26975368f2121a5c1" +checksum = "1674a8b80cdcce32512a75975d85d569b160f612ee1d31645bc46771f7c220a1" dependencies = [ "cc", "codespan-reporting", - "once_cell", "proc-macro2", "quote", "scratch", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] name = "cxxbridge-flags" -version = "1.0.128" +version = "1.0.131" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65777e06cc48f0cb0152024c77d6cf9e4bdb4408e7b48bea993d42fa0f5b02b6" +checksum = "0c710c27f23b7fa00c23aaee9e6fd3e79a6dffc5f5c6217487ec5213f51296b7" [[package]] name = "cxxbridge-macro" -version = "1.0.128" +version = "1.0.131" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98532a60dedaebc4848cb2cba5023337cc9ea3af16a5b062633fabfd9f18fb60" +checksum = "0aa53ef9fc54b986272efe83e257bbb417d1c3ceab1b732411d8c634fda572be" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "rustversion", + "syn 2.0.89", ] [[package]] @@ -2697,7 +2697,7 @@ dependencies = [ "proc-macro2", "quote", "strsim 0.11.1", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -2730,7 +2730,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core 0.20.10", "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -2839,7 +2839,7 @@ checksum = "d65d7ce8132b7c0e54497a4d9a55a1c2a0912a0d786cf894472ba818fba45762" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -2850,7 +2850,7 @@ checksum = "62d671cc41a825ebabc75757b62d3d168c577f9149b2d49ece1dad1f72119d25" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -2888,7 +2888,27 @@ dependencies = [ "proc-macro2", "quote", "rustc_version", - "syn 2.0.79", + "syn 2.0.89", +] + +[[package]] +name = "derive_more" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a9b99b9cbbe49445b21764dc0625032a89b145a2642e67603e1c936f5458d05" +dependencies = [ + "derive_more-impl", +] + +[[package]] +name = "derive_more-impl" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.89", ] [[package]] @@ -2996,7 +3016,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -3025,18 +3045,18 @@ checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" [[package]] name = "docify" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43a2f138ad521dc4a2ced1a4576148a6a610b4c5923933b062a263130a6802ce" +checksum = "a772b62b1837c8f060432ddcc10b17aae1453ef17617a99bc07789252d2a5896" dependencies = [ "docify_macros", ] [[package]] name = "docify_macros" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a081e51fb188742f5a7a1164ad752121abcb22874b21e2c3b0dd040c515fdad" +checksum = "60e6be249b0a462a14784a99b19bf35a667bb5e09de611738bb7362fa4c95ff7" dependencies = [ "common-path", "derive-syn-parse", @@ -3044,7 +3064,7 @@ dependencies = [ "proc-macro2", "quote", "regex", - "syn 2.0.79", + "syn 2.0.89", "termcolor", "toml 0.8.19", "walkdir", @@ -3213,9 +3233,9 @@ checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" [[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", ] @@ -3233,7 +3253,7 @@ dependencies = [ "engine-upgrade-utils", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -3309,7 +3329,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -3533,14 +3553,14 @@ dependencies = [ "ethers-core", "ethers-etherscan", "eyre", - "prettyplease 0.2.22", + "prettyplease 0.2.25", "proc-macro2", "quote", "regex", "reqwest", "serde", "serde_json", - "syn 2.0.79", + "syn 2.0.89", "toml 0.8.19", "walkdir", ] @@ -3558,7 +3578,7 @@ dependencies = [ "proc-macro2", "quote", "serde_json", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -3584,7 +3604,7 @@ dependencies = [ "serde", "serde_json", "strum 0.26.3", - "syn 2.0.79", + "syn 2.0.89", "tempfile", "thiserror", "tiny-keccak", @@ -3777,10 +3797,10 @@ dependencies = [ "blake2 0.10.6", "file-guard", "fs-err", - "prettyplease 0.2.22", + "prettyplease 0.2.25", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -3807,9 +3827,9 @@ checksum = "2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649" [[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 = "fdlimit" @@ -3915,9 +3935,9 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flate2" -version = "1.0.34" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1b589b4dc103969ad3cf85c950899926ec64300a1a46d76c03a6072957036f0" +checksum = "c936bfdafb507ebbf50b8074c54fa31c5be9a1e7e5f467dd659697041407d07c" dependencies = [ "crc32fast", "miniz_oxide", @@ -4164,7 +4184,7 @@ dependencies = [ "proc-macro2", "quote", "sp-crypto-hashing 0.1.0 (git+https://github.com/chainflip-io/polkadot-sdk.git?tag=chainflip-substrate-1.15.2+2)", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -4176,7 +4196,7 @@ dependencies = [ "proc-macro-crate 3.2.0", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -4186,7 +4206,7 @@ source = "git+https://github.com/chainflip-io/polkadot-sdk.git?tag=chainflip-sub dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -4336,9 +4356,9 @@ 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 = [ "fastrand", "futures-core", @@ -4365,7 +4385,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -4469,9 +4489,9 @@ dependencies = [ [[package]] name = "generic-array" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96512db27971c2c3eece70a1e106fbe6c87760234e31e8f7e5634912fe52794a" +checksum = "2cb8bc4c28d15ade99c7e90b219f30da4be5c88e586277e8cbe886beeb868ab2" dependencies = [ "serde", "typenum", @@ -4660,9 +4680,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.4.6" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524e8ac6999421f49a846c2d4411f337e53497d8ec55d67753beffa43c5d9205" +checksum = "ccae279728d634d083c00f6099cb58f01cc99c145b84b8be2f6c74618d79922e" dependencies = [ "atomic-waker", "bytes", @@ -4743,9 +4763,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.15.0" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb" +checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289" dependencies = [ "allocator-api2", "equivalent", @@ -4995,9 +5015,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.30" +version = "0.14.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a152ddd61dfaec7273fe8419ab357f33aee0d914c5f4efbf0d96fa749eea5ec9" +checksum = "8c08302e8fa335b151b788c775ff56e7a03ae64ff85c548ee820fecb70356e85" dependencies = [ "bytes", "futures-channel", @@ -5019,14 +5039,14 @@ dependencies = [ [[package]] name = "hyper" -version = "1.4.1" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05" +checksum = "97818827ef4f364230e16705d4706e2897df2bb60617d6ca15d598025a3c481f" dependencies = [ "bytes", "futures-channel", "futures-util", - "h2 0.4.6", + "h2 0.4.7", "http 1.1.0", "http-body 1.0.1", "httparse", @@ -5046,7 +5066,7 @@ checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" dependencies = [ "futures-util", "http 0.2.12", - "hyper 0.14.30", + "hyper 0.14.31", "log", "rustls 0.21.12", "rustls-native-certs 0.6.3", @@ -5062,10 +5082,10 @@ checksum = "08afdbb5c31130e3034af566421053ab03787c640246a446327f550d11bcb333" dependencies = [ "futures-util", "http 1.1.0", - "hyper 1.4.1", + "hyper 1.5.1", "hyper-util", "log", - "rustls 0.23.14", + "rustls 0.23.18", "rustls-pki-types", "tokio", "tokio-rustls 0.26.0", @@ -5080,7 +5100,7 @@ checksum = "6eea26c5d0b6ab9d72219f65000af310f042a740926f7b2fa3553e774036e2e7" dependencies = [ "derive_builder", "dns-lookup", - "hyper 0.14.30", + "hyper 0.14.31", "tokio", "tower-service", "tracing", @@ -5093,7 +5113,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" dependencies = [ "bytes", - "hyper 0.14.30", + "hyper 0.14.31", "native-tls", "tokio", "tokio-native-tls", @@ -5101,16 +5121,16 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.9" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41296eb09f183ac68eec06e03cdbea2e759633d4067b2f6552fc2e009bcad08b" +checksum = "df2dcfbe0677734ab2f3ffa7fa7bfd4706bfdc1ef393f2ee30184aed67e631b4" dependencies = [ "bytes", "futures-channel", "futures-util", "http 1.1.0", "http-body 1.0.1", - "hyper 1.4.1", + "hyper 1.5.1", "pin-project-lite", "socket2 0.5.7", "tokio", @@ -5141,6 +5161,124 @@ dependencies = [ "cc", ] +[[package]] +name = "icu_collections" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526" +dependencies = [ + "displaydoc", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_locid" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637" +dependencies = [ + "displaydoc", + "litemap", + "tinystr", + "writeable", + "zerovec", +] + +[[package]] +name = "icu_locid_transform" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e" +dependencies = [ + "displaydoc", + "icu_locid", + "icu_locid_transform_data", + "icu_provider", + "tinystr", + "zerovec", +] + +[[package]] +name = "icu_locid_transform_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e" + +[[package]] +name = "icu_normalizer" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f" +dependencies = [ + "displaydoc", + "icu_collections", + "icu_normalizer_data", + "icu_properties", + "icu_provider", + "smallvec", + "utf16_iter", + "utf8_iter", + "write16", + "zerovec", +] + +[[package]] +name = "icu_normalizer_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516" + +[[package]] +name = "icu_properties" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5" +dependencies = [ + "displaydoc", + "icu_collections", + "icu_locid_transform", + "icu_properties_data", + "icu_provider", + "tinystr", + "zerovec", +] + +[[package]] +name = "icu_properties_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569" + +[[package]] +name = "icu_provider" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9" +dependencies = [ + "displaydoc", + "icu_locid", + "icu_provider_macros", + "stable_deref_trait", + "tinystr", + "writeable", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_provider_macros" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.89", +] + [[package]] name = "ident_case" version = "1.0.1" @@ -5170,12 +5308,23 @@ dependencies = [ [[package]] name = "idna" -version = "0.5.0" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e" dependencies = [ - "unicode-bidi", - "unicode-normalization", + "idna_adapter", + "smallvec", + "utf8_iter", +] + +[[package]] +name = "idna_adapter" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71" +dependencies = [ + "icu_normalizer", + "icu_properties", ] [[package]] @@ -5190,9 +5339,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", @@ -5201,8 +5350,12 @@ dependencies = [ "if-addrs", "ipnet", "log", + "netlink-packet-core", + "netlink-packet-route", + "netlink-proto", + "netlink-sys", "rtnetlink", - "system-configuration", + "system-configuration 0.6.1", "tokio", "windows", ] @@ -5218,7 +5371,7 @@ dependencies = [ "bytes", "futures", "http 0.2.12", - "hyper 0.14.30", + "hyper 0.14.31", "log", "rand", "tokio", @@ -5255,13 +5408,13 @@ dependencies = [ [[package]] name = "impl-trait-for-tuples" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11d7a9f6330b71fea57921c9b61c47ee6e84f72d394754eff6163ae67e7395eb" +checksum = "a0eb5a3343abf848c0984fe4604b2b105da9539376e24fc0a3b0007411ae4fd9" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.89", ] [[package]] @@ -5307,7 +5460,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" dependencies = [ "equivalent", - "hashbrown 0.15.0", + "hashbrown 0.15.2", "serde", ] @@ -5328,9 +5481,9 @@ dependencies = [ [[package]] name = "insta" -version = "1.40.0" +version = "1.41.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6593a41c7a73841868772495db7dc1e8ecab43bb5c0b6da2059246c4b506ab60" +checksum = "7e9ffc4d4892617c50a928c52b2961cb5174b6fc6ebf252b2fac9d21955c48b8" dependencies = [ "console", "lazy_static", @@ -5447,9 +5600,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.11" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" +checksum = "540654e97a3f4470a492cd30ff187bc95d89557a903a2bbf112e2fae98104ef2" [[package]] name = "jni" @@ -5579,7 +5732,7 @@ dependencies = [ "http 1.1.0", "jsonrpsee-core 0.23.2", "pin-project", - "rustls 0.23.14", + "rustls 0.23.18", "rustls-pki-types", "rustls-platform-verifier", "soketto 0.8.0", @@ -5602,7 +5755,7 @@ dependencies = [ "beef", "futures-timer", "futures-util", - "hyper 0.14.30", + "hyper 0.14.31", "jsonrpsee-types 0.22.5", "pin-project", "rustc-hash", @@ -5650,7 +5803,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ccf93fc4a0bfe05d851d37d7c32b7f370fe94336b52a2f0efc5f1981895c2e5" dependencies = [ "async-trait", - "hyper 0.14.30", + "hyper 0.14.31", "hyper-rustls 0.24.2", "jsonrpsee-core 0.22.5", "jsonrpsee-types 0.22.5", @@ -5672,12 +5825,12 @@ dependencies = [ "async-trait", "base64 0.22.1", "http-body 1.0.1", - "hyper 1.4.1", + "hyper 1.5.1", "hyper-rustls 0.27.3", "hyper-util", "jsonrpsee-core 0.23.2", "jsonrpsee-types 0.23.2", - "rustls 0.23.14", + "rustls 0.23.18", "rustls-platform-verifier", "serde", "serde_json", @@ -5698,7 +5851,7 @@ dependencies = [ "proc-macro-crate 3.2.0", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -5712,7 +5865,7 @@ dependencies = [ "http 1.1.0", "http-body 1.0.1", "http-body-util", - "hyper 1.4.1", + "hyper 1.5.1", "hyper-util", "jsonrpsee-core 0.23.2", "jsonrpsee-types 0.23.2", @@ -5883,7 +6036,7 @@ version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "507460a910eb7b32ee961886ff48539633b788a36b65692b95f225b844c82553" dependencies = [ - "regex-automata 0.4.8", + "regex-automata 0.4.9", ] [[package]] @@ -5906,9 +6059,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.159" +version = "0.2.164" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5" +checksum = "433bfe06b8c75da9b2e3fbea6e5329ff87748f0b144ef75306e674c3f6f7c13f" [[package]] name = "libloading" @@ -5922,9 +6075,9 @@ dependencies = [ [[package]] name = "libm" -version = "0.2.8" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" +checksum = "8355be11b20d696c8f18f6cc018c4e372165b1fa8126cef092399c9951984ffa" [[package]] name = "libp2p" @@ -6001,7 +6154,7 @@ dependencies = [ "libp2p-identity", "log", "multiaddr 0.18.2", - "multihash 0.19.1", + "multihash 0.19.2", "multistream-select", "once_cell", "parking_lot 0.12.3", @@ -6056,14 +6209,14 @@ dependencies = [ [[package]] name = "libp2p-identity" -version = "0.2.9" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55cca1eb2bc1fd29f099f3daaab7effd01e1a54b7c577d0ed082521034d912e8" +checksum = "257b5621d159b32282eac446bed6670c39c7dc68a200a992d8f056afa0066f6d" dependencies = [ "bs58 0.5.1", "ed25519-dalek", "hkdf", - "multihash 0.19.1", + "multihash 0.19.2", "quick-protobuf", "rand", "sha2 0.10.8", @@ -6152,7 +6305,7 @@ dependencies = [ "libp2p-identity", "log", "multiaddr 0.18.2", - "multihash 0.19.1", + "multihash 0.19.2", "once_cell", "quick-protobuf", "rand", @@ -6257,7 +6410,7 @@ dependencies = [ "proc-macro-warning 0.4.2", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -6473,9 +6626,9 @@ dependencies = [ [[package]] name = "linregress" -version = "0.5.3" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4de04dcecc58d366391f9920245b85ffa684558a5ef6e7736e754347c3aea9c2" +checksum = "a9eda9dcf4f2a99787827661f312ac3219292549c2ee992bf9a6248ffb066bf7" dependencies = [ "nalgebra", ] @@ -6504,6 +6657,12 @@ dependencies = [ "keystream", ] +[[package]] +name = "litemap" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104" + [[package]] name = "litep2p" version = "0.6.2" @@ -6581,7 +6740,7 @@ version = "0.12.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "234cf4f4a04dc1f57e24b96cc0cd600cf2af460d4161ac5ecdd0af8e1f3b2a38" dependencies = [ - "hashbrown 0.15.0", + "hashbrown 0.15.2", ] [[package]] @@ -6630,7 +6789,7 @@ dependencies = [ "macro_magic_core", "macro_magic_macros", "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -6644,7 +6803,7 @@ dependencies = [ "macro_magic_core_macros", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -6655,7 +6814,7 @@ checksum = "b02abfe41815b5bd98dbd4260173db2c116dda171dc0fe7838cb206333b83308" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -6666,7 +6825,7 @@ checksum = "73ea28ee64b88876bf45277ed9a5817c1817df061a74f2b988971a12570e5869" dependencies = [ "macro_magic_core", "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -6731,7 +6890,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b2cffa4ad52c6f791f4f8b15f0c05f9824b2ced1160e88cc393d64fff9a8ac64" dependencies = [ - "rustix 0.38.37", + "rustix 0.38.41", ] [[package]] @@ -6893,14 +7052,14 @@ dependencies = [ [[package]] name = "mockall" -version = "0.13.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4c28b3fb6d753d28c20e826cd46ee611fda1cf3cde03a443a974043247c065a" +checksum = "39a6bfcc6c8c7eed5ee98b9c3e33adc726054389233e201c95dab2d41a3839d2" dependencies = [ "cfg-if", "downcast", "fragile", - "mockall_derive 0.13.0", + "mockall_derive 0.13.1", "predicates 3.1.2", "predicates-tree", ] @@ -6926,19 +7085,19 @@ dependencies = [ "cfg-if", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] name = "mockall_derive" -version = "0.13.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "341014e7f530314e9a1fdbc7400b244efea7122662c96bfa248c31da5bfb2020" +checksum = "25ca3004c2efe9011bd4e461bd8256445052b9615405b4f7ea43fc8ca5c20898" dependencies = [ "cfg-if", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -6989,7 +7148,7 @@ dependencies = [ "data-encoding", "libp2p-identity", "multibase", - "multihash 0.19.1", + "multihash 0.19.2", "percent-encoding", "serde", "static_assertions", @@ -7044,12 +7203,12 @@ 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", - "unsigned-varint 0.7.2", + "unsigned-varint 0.8.0", ] [[package]] @@ -7095,11 +7254,11 @@ dependencies = [ "futures", "futures-core", "futures-util", - "generic-array 1.1.0", + "generic-array 1.1.1", "hex", "itertools 0.13.0", "lazy_static", - "mockall 0.13.0", + "mockall 0.13.1", "multisig", "num-bigint", "num-derive", @@ -7141,13 +7300,12 @@ dependencies = [ [[package]] name = "nalgebra" -version = "0.32.6" +version = "0.33.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b5c17de023a86f59ed79891b2e5d5a94c705dbe904a5b5c9c952ea6221b03e4" +checksum = "26aecdf64b707efd1310e3544d709c5c0ac61c13756046aaaba41be5c4f66a3b" dependencies = [ "approx", "matrixmultiply", - "nalgebra-macros", "num-complex", "num-rational", "num-traits", @@ -7155,17 +7313,6 @@ dependencies = [ "typenum", ] -[[package]] -name = "nalgebra-macros" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "254a5372af8fc138e36684761d3c0cdb758a4410e938babcff1c860ce14ddbfc" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.79", -] - [[package]] name = "names" version = "0.14.0" @@ -7200,21 +7347,20 @@ dependencies = [ [[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", @@ -7238,9 +7384,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", @@ -7293,9 +7439,9 @@ dependencies = [ [[package]] name = "nix" -version = "0.24.3" +version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" +checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" dependencies = [ "bitflags 1.3.2", "cfg-if", @@ -7397,7 +7543,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -7468,7 +7614,7 @@ dependencies = [ "proc-macro-crate 3.2.0", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -7585,9 +7731,9 @@ dependencies = [ [[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", @@ -7606,7 +7752,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -7617,18 +7763,18 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-src" -version = "300.3.2+3.3.2" +version = "300.4.1+3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a211a18d945ef7e648cc6e0058f4c548ee46aab922ea203e0d30e966ea23647b" +checksum = "faa4eac4138c62414b5622d1b31c5c304f34b406b013c079c2bbc652fdd6678c" dependencies = [ "cc", ] [[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", @@ -8316,9 +8462,9 @@ dependencies = [ [[package]] name = "parity-scale-codec" -version = "3.6.12" +version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "306800abfa29c7f16596b5970a588435e3d5b3149683d00c12b699cc19f895ee" +checksum = "8be4817d39f3272f69c59fe05d0535ae6456c2dc2fa1ba02910296c7e0a5c590" dependencies = [ "arrayvec 0.7.6", "bitvec", @@ -8326,19 +8472,20 @@ dependencies = [ "bytes", "impl-trait-for-tuples", "parity-scale-codec-derive", + "rustversion", "serde", ] [[package]] name = "parity-scale-codec-derive" -version = "3.6.12" +version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d830939c76d294956402033aee57a6da7b438f2294eb94864c37b0569053a42c" +checksum = "8781a75c6205af67215f382092b6e0a4ff3734798523e69073d4bcd294ec767b" dependencies = [ "proc-macro-crate 3.2.0", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.89", ] [[package]] @@ -8443,9 +8590,9 @@ checksum = "1e91099d4268b0e11973f036e885d652fb0b21fedcf69738c627f94db6a44f42" [[package]] name = "pathdiff" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" +checksum = "d61c5ce1153ab5b689d0c074c4e7fc613e942dfb7dd9eea5ab202d2ad91fe361" [[package]] name = "pbkdf2" @@ -8493,9 +8640,9 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pest" -version = "2.7.13" +version = "2.7.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdbef9d1d47087a895abd220ed25eb4ad973a5e26f6a4367b038c25e28dfc2d9" +checksum = "879952a81a83930934cbf1786752d6dedc3b1f29e8f8fb2ad1d0a36f377cf442" dependencies = [ "memchr", "thiserror", @@ -8504,9 +8651,9 @@ dependencies = [ [[package]] name = "pest_derive" -version = "2.7.13" +version = "2.7.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d3a6e3394ec80feb3b6393c725571754c6188490265c61aaf260810d6b95aa0" +checksum = "d214365f632b123a47fd913301e14c946c61d1c183ee245fa76eb752e59a02dd" dependencies = [ "pest", "pest_generator", @@ -8514,22 +8661,22 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.7.13" +version = "2.7.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94429506bde1ca69d1b5601962c73f4172ab4726571a59ea95931218cb0e930e" +checksum = "eb55586734301717aea2ac313f50b2eb8f60d2fc3dc01d190eefa2e625f60c4e" dependencies = [ "pest", "pest_meta", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] name = "pest_meta" -version = "2.7.13" +version = "2.7.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac8a071862e93690b6e34e9a5fb8e33ff3734473ac0245b27232222c4906a33f" +checksum = "b75da2a70cf4d9cb76833c990ac9cd3923c9a8905a8929789ce347c84564d03d" dependencies = [ "once_cell", "pest", @@ -8586,7 +8733,7 @@ dependencies = [ "phf_shared 0.11.2", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -8609,29 +8756,29 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.1.6" +version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf123a161dde1e524adf36f90bc5d8d3462824a9c43553ad07a8183161189ec" +checksum = "be57f64e946e500c8ee36ef6331845d40a93055567ec57e8fae13efd33759b95" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.6" +version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4502d8515ca9f32f1fb543d987f63d95a14934883db45bdb48060b6b69257f8" +checksum = "3c0f5fad0874fc7abcd4d750e76917eaebbecaa2c20bde22e1dbeeba8beb758c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] name = "pin-project-lite" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" +checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff" [[package]] name = "pin-utils" @@ -8730,7 +8877,7 @@ dependencies = [ "polkavm-common 0.8.0", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -8742,7 +8889,7 @@ dependencies = [ "polkavm-common 0.9.0", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -8752,7 +8899,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "15e85319a0d5129dc9f021c62607e0804f5fb777a05cdda44d750ac0732def66" dependencies = [ "polkavm-derive-impl 0.8.0", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -8762,7 +8909,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ba81f7b5faac81e528eb6158a6f3c9e0bb1008e0ffa19653bc8dea925ecb429" dependencies = [ "polkavm-derive-impl 0.9.0", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -8788,15 +8935,15 @@ checksum = "26e85d3456948e650dff0cfc85603915847faf893ed1e66b020bb82ef4557120" [[package]] name = "polling" -version = "3.7.3" +version = "3.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc2790cd301dec6cd3b7a025e4815cf825724a51c98dccfe6a3e55f05ffb6511" +checksum = "a604568c3202727d1507653cb121dbd627a58684eb09a820fd746bee38b4442f" dependencies = [ "cfg-if", "concurrent-queue", "hermit-abi 0.4.0", "pin-project-lite", - "rustix 0.38.37", + "rustix 0.38.41", "tracing", "windows-sys 0.59.0", ] @@ -8826,9 +8973,9 @@ dependencies = [ [[package]] name = "portable-atomic" -version = "1.9.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2" +checksum = "280dc24453071f1b63954171985a0b0d30058d287960968b9b2aca264c8d4ee6" [[package]] name = "powerfmt" @@ -8907,12 +9054,12 @@ dependencies = [ [[package]] name = "prettyplease" -version = "0.2.22" +version = "0.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "479cf940fbbb3426c32c5d5176f62ad57549a0bb84773423ba8be9d089f5faba" +checksum = "64d1ec885c64d0457d564db4ec299b2dae3f9c02808b8ad9c3a089c591b18033" dependencies = [ "proc-macro2", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -8980,7 +9127,7 @@ checksum = "3d1eaa7fa0aa1929ffdf7eeb6eac234dde6268914a14ad44d23521ab6a9b258e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -8991,14 +9138,14 @@ checksum = "834da187cfe638ae8abb0203f0b33e5ccdb02a28e7199f2f47b3e2754f50edca" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] name = "proc-macro2" -version = "1.0.87" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3e4daa0dcf6feba26f985457cdf104d4b4256fc5a09547140f3631bb076b19a" +checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" dependencies = [ "unicode-ident", ] @@ -9037,7 +9184,7 @@ checksum = "440f724eba9f6996b75d63681b0a92b06947f1457076d503a4d2e2c8f56442b8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -9111,11 +9258,11 @@ dependencies = [ "multimap 0.10.0", "once_cell", "petgraph", - "prettyplease 0.2.22", + "prettyplease 0.2.25", "prost 0.12.6", "prost-types 0.12.6", "regex", - "syn 2.0.79", + "syn 2.0.89", "tempfile", ] @@ -9142,7 +9289,7 @@ dependencies = [ "itertools 0.12.1", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -9165,9 +9312,9 @@ dependencies = [ [[package]] name = "psm" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa37f80ca58604976033fae9515a8a2989fc13797d953f7c04fb8fa36a11f205" +checksum = "200b9ff220857e53e184257720a14553b2f4aa02577d2ed9842d45d4b9654810" dependencies = [ "cc", ] @@ -9182,7 +9329,7 @@ dependencies = [ "futures-core", "futures-util", "http 0.2.12", - "hyper 0.14.30", + "hyper 0.14.31", "hyper-system-resolver", "pin-project-lite", "thiserror", @@ -9579,7 +9726,7 @@ checksum = "bcc303e793d3734489387d205e9b186fac9c6cfacedd98cbb2e8a5943595f3e6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -9609,13 +9756,13 @@ dependencies = [ [[package]] name = "regex" -version = "1.11.0" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8" +checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.8", + "regex-automata 0.4.9", "regex-syntax 0.8.5", ] @@ -9630,9 +9777,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", @@ -9665,7 +9812,7 @@ dependencies = [ "h2 0.3.26", "http 0.2.12", "http-body 0.4.6", - "hyper 0.14.30", + "hyper 0.14.31", "hyper-rustls 0.24.2", "hyper-tls", "ipnet", @@ -9682,7 +9829,7 @@ dependencies = [ "serde_json", "serde_urlencoded", "sync_wrapper", - "system-configuration", + "system-configuration 0.5.1", "tokio", "tokio-native-tls", "tokio-rustls 0.24.1", @@ -9816,14 +9963,17 @@ 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", + "netlink-sys", "nix", "thiserror", "tokio", @@ -9901,9 +10051,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.37" +version = "0.38.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811" +checksum = "d7f649912bc1495e167a6edee79151c84b1bad49748cb4f1f1167f459f6224f6" dependencies = [ "bitflags 2.6.0", "errno", @@ -9951,9 +10101,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.14" +version = "0.23.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "415d9944693cb90382053259f89fbb077ea730ad7273047ec63b19bc9b160ba8" +checksum = "9c9cc1d47e243d655ace55ed38201c19ae02c148ae56412ab8750e8f0166ab7f" dependencies = [ "log", "once_cell", @@ -10009,9 +10159,9 @@ dependencies = [ [[package]] name = "rustls-pki-types" -version = "1.9.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e696e35370c65c9c541198af4543ccd580cf17fc25d8e05c5a242b202488c55" +checksum = "16f1201b3c9a7ee8039bcadc17b7e605e2945b27eee7631788c1bd2b0643674b" [[package]] name = "rustls-platform-verifier" @@ -10024,13 +10174,13 @@ dependencies = [ "jni", "log", "once_cell", - "rustls 0.23.14", + "rustls 0.23.18", "rustls-native-certs 0.7.3", "rustls-platform-verifier-android", "rustls-webpki 0.102.8", "security-framework", "security-framework-sys", - "webpki-roots 0.26.6", + "webpki-roots 0.26.7", "winapi", ] @@ -10063,9 +10213,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 = "ruzstd" @@ -10074,7 +10224,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "58c4eb8a81997cf040a091d1f7e1938aeab6749d3a0dfa73af43cdc32393483d" dependencies = [ "byteorder", - "derive_more", + "derive_more 0.99.18", "twox-hash", ] @@ -10205,7 +10355,7 @@ dependencies = [ "proc-macro-crate 3.2.0", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -10743,7 +10893,7 @@ dependencies = [ "litep2p", "log", "multiaddr 0.18.2", - "multihash 0.19.1", + "multihash 0.19.2", "rand", "thiserror", "zeroize", @@ -10759,7 +10909,7 @@ dependencies = [ "fnv", "futures", "futures-timer", - "hyper 0.14.30", + "hyper 0.14.31", "hyper-rustls 0.24.2", "log", "num_cpus", @@ -10854,7 +11004,7 @@ dependencies = [ "governor", "http 1.1.0", "http-body-util", - "hyper 1.4.1", + "hyper 1.5.1", "ip_network", "jsonrpsee 0.23.2", "log", @@ -10978,7 +11128,7 @@ name = "sc-sysinfo" version = "37.0.0" source = "git+https://github.com/chainflip-io/polkadot-sdk.git?tag=chainflip-substrate-1.15.2+2#d4792faaa7ab3fbb9798dcc629564d182853690e" dependencies = [ - "derive_more", + "derive_more 0.99.18", "futures", "libc", "log", @@ -11052,7 +11202,7 @@ dependencies = [ "proc-macro-crate 3.2.0", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -11131,7 +11281,7 @@ version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e98f3262c250d90e700bb802eb704e1f841e03331c2eb815e46516c4edbf5b27" dependencies = [ - "derive_more", + "derive_more 0.99.18", "parity-scale-codec", "primitive-types", "scale-bits", @@ -11158,7 +11308,7 @@ version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "528464e6ae6c8f98e2b79633bf79ef939552e795e316579dab09c61670d56602" dependencies = [ - "derive_more", + "derive_more 0.99.18", "parity-scale-codec", "primitive-types", "scale-bits", @@ -11177,18 +11327,18 @@ dependencies = [ "proc-macro-crate 3.2.0", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] name = "scale-info" -version = "2.11.3" +version = "2.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eca070c12893629e2cc820a9761bedf6ce1dcddc9852984d1dc734b8bd9bd024" +checksum = "346a3b32eba2640d17a9cb5927056b08f3de90f65b72fe09402c2ad07d684d0b" dependencies = [ "bitvec", "cfg-if", - "derive_more", + "derive_more 1.0.0", "parity-scale-codec", "scale-info-derive", "serde", @@ -11196,14 +11346,14 @@ dependencies = [ [[package]] name = "scale-info-derive" -version = "2.11.3" +version = "2.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d35494501194174bda522a32605929eefc9ecf7e0a326c26db1fdd85881eb62" +checksum = "c6630024bf739e2179b91fb424b28898baf819414262c5d376677dbff1fe7ebf" dependencies = [ "proc-macro-crate 3.2.0", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.89", ] [[package]] @@ -11254,7 +11404,7 @@ dependencies = [ "proc-macro2", "quote", "scale-info", - "syn 2.0.79", + "syn 2.0.89", "thiserror", ] @@ -11266,7 +11416,7 @@ checksum = "8cd6ab090d823e75cfdb258aad5fe92e13f2af7d04b43a55d607d25fcc38c811" dependencies = [ "base58", "blake2 0.10.6", - "derive_more", + "derive_more 0.99.18", "either", "frame-metadata 15.1.0", "parity-scale-codec", @@ -11281,9 +11431,9 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.26" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01227be5826fa0690321a2ba6c5cd57a19cf3f6a09e76973b58e61de6ab9d1c1" +checksum = "1f29ebaa345f945cec9fbbc532eb307f0fdad8161f281b6369539c8d84876b3d" dependencies = [ "windows-sys 0.59.0", ] @@ -11470,9 +11620,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.12.0" +version = "2.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea4a292869320c0272d7bc55a5a6aafaff59b4f63404a003887b679a2e05b4b6" +checksum = "fa39c7303dc58b5543c94d22c1766b0d31f2ee58306363ea622b10bbc075eaa2" dependencies = [ "core-foundation-sys", "libc", @@ -11516,9 +11666,9 @@ checksum = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73" [[package]] name = "serde" -version = "1.0.210" +version = "1.0.215" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" +checksum = "6513c1ad0b11a9376da888e3e0baa0077f1aed55c17f50e7b2397136129fb88f" dependencies = [ "serde_derive", ] @@ -11534,20 +11684,20 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.210" +version = "1.0.215" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" +checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] name = "serde_json" -version = "1.0.128" +version = "1.0.133" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" +checksum = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377" dependencies = [ "itoa", "memchr", @@ -11613,7 +11763,7 @@ dependencies = [ "darling 0.20.10", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -11753,9 +11903,9 @@ dependencies = [ [[package]] name = "simba" -version = "0.8.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "061507c94fc6ab4ba1c9a0305018408e312e17c041eb63bef8aa726fa33aceae" +checksum = "b3a386a501cd104797982c15ae17aafe8b9261315b5d07e3ec803f2ea26be0fa" dependencies = [ "approx", "num-complex", @@ -11862,7 +12012,7 @@ dependencies = [ "bs58 0.5.1", "chacha20", "crossbeam-queue", - "derive_more", + "derive_more 0.99.18", "ed25519-zebra 4.0.3", "either", "event-listener 4.0.3", @@ -11912,7 +12062,7 @@ dependencies = [ "async-lock", "base64 0.21.7", "blake2-rfc", - "derive_more", + "derive_more 0.99.18", "either", "event-listener 4.0.3", "fnv", @@ -12075,7 +12225,7 @@ dependencies = [ "proc-macro-crate 3.2.0", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -12348,7 +12498,7 @@ source = "git+https://github.com/chainflip-io/polkadot-sdk.git?tag=chainflip-sub dependencies = [ "quote", "sp-crypto-hashing 0.1.0 (git+https://github.com/chainflip-io/polkadot-sdk.git?tag=chainflip-substrate-1.15.2+2)", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -12368,7 +12518,7 @@ checksum = "48d09fa0a5f7299fb81ee25ae3853d26200f7a348148aed6de76be905c007dbe" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -12378,7 +12528,7 @@ source = "git+https://github.com/chainflip-io/polkadot-sdk.git?tag=chainflip-sub dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -12686,7 +12836,7 @@ dependencies = [ "proc-macro-crate 3.2.0", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -12699,7 +12849,7 @@ dependencies = [ "proc-macro-crate 3.2.0", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -12964,7 +13114,7 @@ dependencies = [ "parity-scale-codec", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -13273,7 +13423,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -13332,7 +13482,7 @@ version = "0.17.0" source = "git+https://github.com/chainflip-io/polkadot-sdk.git?tag=chainflip-substrate-1.15.2+2#d4792faaa7ab3fbb9798dcc629564d182853690e" dependencies = [ "http-body-util", - "hyper 1.4.1", + "hyper 1.5.1", "hyper-util", "log", "prometheus", @@ -13423,7 +13573,7 @@ dependencies = [ "scale-info", "scale-typegen", "subxt-metadata", - "syn 2.0.79", + "syn 2.0.89", "thiserror", "tokio", ] @@ -13486,7 +13636,7 @@ dependencies = [ "quote", "scale-typegen", "subxt-codegen", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -13535,27 +13685,15 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.79" +version = "2.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590" +checksum = "44d46482f1c1c87acd84dea20c1bf5ebff4c757009ed6bf19cfd36fb10e92c4e" dependencies = [ "proc-macro2", "quote", "unicode-ident", ] -[[package]] -name = "syn_derive" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1329189c02ff984e9736652b1631330da25eaa6bc639089ed4915d25446cbe7b" -dependencies = [ - "proc-macro-error", - "proc-macro2", - "quote", - "syn 2.0.79", -] - [[package]] name = "sync_wrapper" version = "0.1.2" @@ -13582,7 +13720,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -13593,7 +13731,18 @@ checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" dependencies = [ "bitflags 1.3.2", "core-foundation", - "system-configuration-sys", + "system-configuration-sys 0.5.0", +] + +[[package]] +name = "system-configuration" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b" +dependencies = [ + "bitflags 2.6.0", + "core-foundation", + "system-configuration-sys 0.6.0", ] [[package]] @@ -13606,6 +13755,16 @@ dependencies = [ "libc", ] +[[package]] +name = "system-configuration-sys" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e1d1b10ced5ca923a1fcb8d03e96b8d3268065d724548c0211415ff6ac6bac4" +dependencies = [ + "core-foundation-sys", + "libc", +] + [[package]] name = "tap" version = "1.0.1" @@ -13620,14 +13779,14 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" [[package]] name = "tempfile" -version = "3.13.0" +version = "3.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b" +checksum = "28cce251fcbc87fac86a866eeb0d6c2d536fc16d06f184bb61aeae11aa4cee0c" dependencies = [ "cfg-if", "fastrand", "once_cell", - "rustix 0.38.37", + "rustix 0.38.41", "windows-sys 0.59.0", ] @@ -13657,7 +13816,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4f599bd7ca042cfdf8f4512b277c02ba102247820f9d9d4a9f521f496751a6ef" dependencies = [ - "rustix 0.38.37", + "rustix 0.38.41", "windows-sys 0.59.0", ] @@ -13669,22 +13828,22 @@ checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" [[package]] name = "thiserror" -version = "1.0.64" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84" +checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.64" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3" +checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -13781,6 +13940,16 @@ dependencies = [ "crunchy", ] +[[package]] +name = "tinystr" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f" +dependencies = [ + "displaydoc", + "zerovec", +] + [[package]] name = "tinyvec" version = "1.8.0" @@ -13798,9 +13967,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.40.0" +version = "1.41.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" +checksum = "22cfb5bee7a6a52939ca9224d6ac897bb669134078daa8735560897f69de4d33" dependencies = [ "backtrace", "bytes", @@ -13822,7 +13991,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -13862,7 +14031,7 @@ version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" dependencies = [ - "rustls 0.23.14", + "rustls 0.23.18", "rustls-pki-types", "tokio", ] @@ -14033,7 +14202,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -14390,12 +14559,9 @@ checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94" [[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" @@ -14405,9 +14571,9 @@ checksum = "5ab17db44d7388991a428b2ee655ce0c212e862eff1768a455c58f9aad6e7893" [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unicode-normalization" @@ -14424,6 +14590,12 @@ version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" +[[package]] +name = "unicode-width" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd" + [[package]] name = "unicode-xid" version = "0.2.6" @@ -14476,12 +14648,12 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "url" -version = "2.5.2" +version = "2.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" +checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60" dependencies = [ "form_urlencoded", - "idna 0.5.0", + "idna 1.0.3", "percent-encoding", ] @@ -14491,6 +14663,18 @@ version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" +[[package]] +name = "utf16_iter" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246" + +[[package]] +name = "utf8_iter" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" + [[package]] name = "utf8parse" version = "0.2.2" @@ -14514,7 +14698,7 @@ dependencies = [ "lazy_format", "lazy_static", "log", - "mockall 0.13.0", + "mockall 0.13.1", "num-traits", "pin-project", "predicates 3.1.2", @@ -14573,9 +14757,9 @@ checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" [[package]] name = "w3f-bls" -version = "0.1.4" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c5da5fa2c6afa2c9158eaa7cd9aee249765eb32b5fb0c63ad8b9e79336a47ec" +checksum = "70a3028804c8bbae2a97a15b71ffc0e308c4b01a520994aafa77d56e94e19024" dependencies = [ "ark-bls12-377", "ark-bls12-381", @@ -14634,7 +14818,7 @@ dependencies = [ "futures-util", "headers", "http 0.2.12", - "hyper 0.14.30", + "hyper 0.14.31", "log", "mime", "mime_guess", @@ -14686,7 +14870,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", "wasm-bindgen-shared", ] @@ -14720,7 +14904,7 @@ checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -15059,7 +15243,7 @@ dependencies = [ "arrayvec 0.7.6", "base64 0.21.7", "bytes", - "derive_more", + "derive_more 0.99.18", "ethabi", "ethereum-types", "futures", @@ -15116,9 +15300,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", ] @@ -15132,14 +15316,14 @@ dependencies = [ "either", "home", "once_cell", - "rustix 0.38.37", + "rustix 0.38.41", ] [[package]] name = "wide" -version = "0.7.28" +version = "0.7.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b828f995bf1e9622031f8009f8481a85406ce1f4d4588ff746d872043e855690" +checksum = "58e6db2670d2be78525979e9a5f9c69d296fd7d670549fe9ebf70f8708cb5019" dependencies = [ "bytemuck", "safe_arch", @@ -15184,28 +15368,38 @@ 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", + "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", ] @@ -15458,6 +15652,18 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "write16" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936" + +[[package]] +name = "writeable" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51" + [[package]] name = "ws_stream_wasm" version = "0.7.4" @@ -15534,9 +15740,9 @@ dependencies = [ [[package]] name = "xml-rs" -version = "0.8.22" +version = "0.8.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af4e2e2f7cba5a093896c1e150fbfe177d1883e7448200efb81d40b9d339ef26" +checksum = "af310deaae937e48a26602b730250b4949e125f468f11e6990be3e5304ddd96f" [[package]] name = "xmltree" @@ -15592,6 +15798,30 @@ dependencies = [ "time", ] +[[package]] +name = "yoke" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40" +dependencies = [ + "serde", + "stable_deref_trait", + "yoke-derive", + "zerofrom", +] + +[[package]] +name = "yoke-derive" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.89", + "synstructure 0.13.1", +] + [[package]] name = "zerocopy" version = "0.7.35" @@ -15610,7 +15840,28 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", +] + +[[package]] +name = "zerofrom" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cff3ee08c995dee1859d998dea82f7374f2826091dd9cd47def953cae446cd2e" +dependencies = [ + "zerofrom-derive", +] + +[[package]] +name = "zerofrom-derive" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.89", + "synstructure 0.13.1", ] [[package]] @@ -15630,7 +15881,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -15642,6 +15893,28 @@ dependencies = [ "cmake", ] +[[package]] +name = "zerovec" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079" +dependencies = [ + "yoke", + "zerofrom", + "zerovec-derive", +] + +[[package]] +name = "zerovec-derive" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.89", +] + [[package]] name = "zip" version = "0.6.6" From 0baa1e35d8fda636c5290170faa5164bb1f9f631 Mon Sep 17 00:00:00 2001 From: Daniel Date: Mon, 25 Nov 2024 16:22:11 +0100 Subject: [PATCH 02/11] fix: update toolchain to support new dependencies + fix new clippy lints --- api/lib/src/lib.rs | 4 ++-- api/lib/src/queries.rs | 4 ++-- .../src/client/keygen/keygen_data/tests.rs | 2 +- engine/src/common.rs | 6 +++--- engine/src/db/persistent/rocksdb_kv.rs | 2 +- engine/src/settings.rs | 2 +- engine/src/state_chain_observer/client.rs | 19 ++++++++--------- .../client/extrinsic_api/signed.rs | 3 +-- .../witness/common/chain_source/lag_safety.rs | 2 +- .../chunked_by_vault/monitored_items.rs | 3 +-- engine/src/witness/common/epoch_source.rs | 4 ++-- engine/src/witness/evm/source.rs | 3 +-- rust-toolchain.toml | 2 +- state-chain/chains/src/btc.rs | 2 +- .../src/electoral_systems/mocks.rs | 21 ------------------- state-chain/test-utilities/Cargo.toml | 3 +++ state-chain/traits/src/lib.rs | 1 - utilities/src/lib.rs | 4 ++-- utilities/src/with_std/dynamic_events.rs | 2 +- utilities/src/with_std/health.rs | 4 ++-- utilities/src/with_std/rle_bitmap.rs | 2 +- .../src/with_std/serde_helpers/deser_path.rs | 1 + utilities/src/with_std/unending_stream.rs | 2 +- 23 files changed, 38 insertions(+), 60 deletions(-) diff --git a/api/lib/src/lib.rs b/api/lib/src/lib.rs index 4c1837e3b0..7b739dd021 100644 --- a/api/lib/src/lib.rs +++ b/api/lib/src/lib.rs @@ -111,8 +111,8 @@ pub struct StateChainApi { } impl StateChainApi { - pub async fn connect<'a>( - scope: &Scope<'a, anyhow::Error>, + pub async fn connect( + scope: &Scope<'_, anyhow::Error>, state_chain_settings: settings::StateChain, ) -> Result { let (.., state_chain_client) = StateChainClient::connect_with_account( diff --git a/api/lib/src/queries.rs b/api/lib/src/queries.rs index f6485337d9..e1d5e3e8e8 100644 --- a/api/lib/src/queries.rs +++ b/api/lib/src/queries.rs @@ -37,8 +37,8 @@ pub struct QueryApi { } impl QueryApi { - pub async fn connect<'a>( - scope: &task_scope::Scope<'a, anyhow::Error>, + pub async fn connect( + scope: &task_scope::Scope<'_, anyhow::Error>, state_chain_settings: &settings::StateChain, ) -> Result { log::debug!("Connecting to state chain at: {}", state_chain_settings.ws_endpoint); diff --git a/engine/multisig/src/client/keygen/keygen_data/tests.rs b/engine/multisig/src/client/keygen/keygen_data/tests.rs index aef44f51d9..152791180d 100644 --- a/engine/multisig/src/client/keygen/keygen_data/tests.rs +++ b/engine/multisig/src/client/keygen/keygen_data/tests.rs @@ -18,7 +18,7 @@ use crate::{ eth::{EthSigning, Point}, }; -/// ========================== +// ========================== // Generate invalid keygen data with the given number of elements in its inner and outer // collection(s) diff --git a/engine/src/common.rs b/engine/src/common.rs index 95e44c5516..a8db032dfd 100644 --- a/engine/src/common.rs +++ b/engine/src/common.rs @@ -8,19 +8,19 @@ struct MutexStateAndPoisonFlag { pub struct MutexGuard<'a, T> { guard: tokio::sync::MutexGuard<'a, MutexStateAndPoisonFlag>, } -impl<'a, T> Deref for MutexGuard<'a, T> { +impl Deref for MutexGuard<'_, T> { type Target = T; fn deref(&self) -> &Self::Target { &self.guard.deref().state } } -impl<'a, T> DerefMut for MutexGuard<'a, T> { +impl DerefMut for MutexGuard<'_, T> { fn deref_mut(&mut self) -> &mut Self::Target { &mut self.guard.deref_mut().state } } -impl<'a, T> Drop for MutexGuard<'a, T> { +impl Drop for MutexGuard<'_, T> { fn drop(&mut self) { let guarded = self.guard.deref_mut(); if !guarded.poisoned && std::thread::panicking() { diff --git a/engine/src/db/persistent/rocksdb_kv.rs b/engine/src/db/persistent/rocksdb_kv.rs index 0701eaec28..d3752ea967 100644 --- a/engine/src/db/persistent/rocksdb_kv.rs +++ b/engine/src/db/persistent/rocksdb_kv.rs @@ -122,7 +122,7 @@ pub struct KVWriteBatch<'a> { batch: WriteBatch, } -impl<'a> KVWriteBatch<'a> { +impl KVWriteBatch<'_> { #[allow(dead_code)] pub fn put_value(&mut self, key: &[u8], value: &[u8]) { self.batch.put_cf(get_data_column_handle(self.db), key, value); diff --git a/engine/src/settings.rs b/engine/src/settings.rs index 00cff6c3dd..1ac087ab3b 100644 --- a/engine/src/settings.rs +++ b/engine/src/settings.rs @@ -379,7 +379,7 @@ where { struct PathVisitor; - impl<'de> de::Visitor<'de> for PathVisitor { + impl de::Visitor<'_> for PathVisitor { type Value = PathBuf; fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result { diff --git a/engine/src/state_chain_observer/client.rs b/engine/src/state_chain_observer/client.rs index 4a95bd7e51..4981b94738 100644 --- a/engine/src/state_chain_observer/client.rs +++ b/engine/src/state_chain_observer/client.rs @@ -122,8 +122,8 @@ pub struct StateChainClient< } impl StateChainClient { - pub async fn connect_with_account<'a>( - scope: &Scope<'a, anyhow::Error>, + pub async fn connect_with_account( + scope: &Scope<'_, anyhow::Error>, ws_endpoint: &str, signing_key_file: &std::path::Path, required_role: AccountRole, @@ -146,8 +146,8 @@ impl StateChainClient { } impl StateChainClient<()> { - pub async fn connect_without_account<'a>( - scope: &Scope<'a, anyhow::Error>, + pub async fn connect_without_account( + scope: &Scope<'_, anyhow::Error>, ws_endpoint: &str, ) -> Result<(impl StreamApi + Clone, impl StreamApi + Clone, Arc)> { @@ -158,8 +158,8 @@ impl StateChainClient<()> { impl StateChainClient { - pub async fn new_with_account<'a>( - scope: &Scope<'a, anyhow::Error>, + pub async fn new_with_account( + scope: &Scope<'_, anyhow::Error>, base_rpc_client: Arc, signing_key_file: &std::path::Path, required_role: AccountRole, @@ -189,8 +189,8 @@ impl impl StateChainClient<(), BaseRpcClient> { - pub async fn new_without_account<'a>( - scope: &Scope<'a, anyhow::Error>, + pub async fn new_without_account( + scope: &Scope<'_, anyhow::Error>, base_rpc_client: Arc, ) -> Result<(impl StreamApi + Clone, impl StreamApi + Clone, Arc)> { @@ -423,10 +423,9 @@ impl { async fn new< - 'a, SignedExtrinsicClientBuilder: SignedExtrinsicClientBuilderTrait, >( - scope: &Scope<'a, anyhow::Error>, + scope: &Scope<'_, anyhow::Error>, base_rpc_client: Arc, mut signed_extrinsic_client_builder: SignedExtrinsicClientBuilder, start_from: Option, diff --git a/engine/src/state_chain_observer/client/extrinsic_api/signed.rs b/engine/src/state_chain_observer/client/extrinsic_api/signed.rs index f1f7485f99..63dc8b1c80 100644 --- a/engine/src/state_chain_observer/client/extrinsic_api/signed.rs +++ b/engine/src/state_chain_observer/client/extrinsic_api/signed.rs @@ -169,11 +169,10 @@ pub struct SignedExtrinsicClient { impl SignedExtrinsicClient { pub async fn new< - 'a, BaseRpcClient: base_rpc_api::BaseRpcApi + Send + Sync + 'static, BlockStream: StreamApi + Clone, >( - scope: &Scope<'a, anyhow::Error>, + scope: &Scope<'_, anyhow::Error>, base_rpc_client: Arc, account_nonce: Nonce, signer: signer::PairSigner, diff --git a/engine/src/witness/common/chain_source/lag_safety.rs b/engine/src/witness/common/chain_source/lag_safety.rs index fa330931b0..f0a0bbc8ae 100644 --- a/engine/src/witness/common/chain_source/lag_safety.rs +++ b/engine/src/witness/common/chain_source/lag_safety.rs @@ -80,7 +80,7 @@ where if let Some(header) = chain_stream.next() => { let header_index = header.index; assert!(::is_block_witness_root(header_index)); - if unsafe_cache.back().map_or(false, |last_header| Some(&last_header.hash) != header.parent_hash.as_ref()) { + if unsafe_cache.back().is_some_and(|last_header| Some(&last_header.hash) != header.parent_hash.as_ref()) { unsafe_cache.clear(); } unsafe_cache.push_back(header); diff --git a/engine/src/witness/common/chunked_chain_source/chunked_by_vault/monitored_items.rs b/engine/src/witness/common/chunked_chain_source/chunked_by_vault/monitored_items.rs index 9538a812ac..1aacc55e63 100644 --- a/engine/src/witness/common/chunked_chain_source/chunked_by_vault/monitored_items.rs +++ b/engine/src/witness/common/chunked_chain_source/chunked_by_vault/monitored_items.rs @@ -95,7 +95,6 @@ where } pub async fn new< - 'env, StateChainStream: StreamApi, StateChainClient: StorageApi + Send + Sync + 'static, GetItemsFut: Future + Send + 'static, @@ -103,7 +102,7 @@ where const IS_FINALIZED: bool, >( inner: Inner, - scope: &Scope<'env, anyhow::Error>, + scope: &Scope<'_, anyhow::Error>, mut state_chain_stream: StateChainStream, state_chain_client: Arc, get_items: GetItemsGenerator, diff --git a/engine/src/witness/common/epoch_source.rs b/engine/src/witness/common/epoch_source.rs index e1c399cc33..e023415506 100644 --- a/engine/src/witness/common/epoch_source.rs +++ b/engine/src/witness/common/epoch_source.rs @@ -65,8 +65,8 @@ pub struct EpochSourceBuilder<'a, 'env, StateChainClient, Info, HistoricInfo> { epoch_update_receiver: spmc::Receiver<(EpochIndex, state_chain_runtime::Hash, EpochUpdate)>, } -impl<'a, 'env, StateChainClient, Info: Clone, HistoricInfo: Clone> Clone - for EpochSourceBuilder<'a, 'env, StateChainClient, Info, HistoricInfo> +impl Clone + for EpochSourceBuilder<'_, '_, StateChainClient, Info, HistoricInfo> { fn clone(&self) -> Self { Self { diff --git a/engine/src/witness/evm/source.rs b/engine/src/witness/evm/source.rs index dcbfab1543..f6633813c3 100644 --- a/engine/src/witness/evm/source.rs +++ b/engine/src/witness/evm/source.rs @@ -93,8 +93,7 @@ where data: raw_evm_header.logs_bloom, }) }) { - if state.evm_header_sequence.back().map_or( - false, + if state.evm_header_sequence.back().is_some_and( |previous_evm_header| { Some(previous_evm_header.hash) != evm_header.parent_hash }, diff --git a/rust-toolchain.toml b/rust-toolchain.toml index c1b43f7a30..0cc31a3626 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,5 +1,5 @@ [toolchain] -channel = "nightly-2024-07-31" +channel = "nightly-2024-11-23" components = [ "cargo", "clippy", diff --git a/state-chain/chains/src/btc.rs b/state-chain/chains/src/btc.rs index 3161a15426..d4d9d579c4 100644 --- a/state-chain/chains/src/btc.rs +++ b/state-chain/chains/src/btc.rs @@ -292,7 +292,7 @@ impl ChainCrypto for BitcoinCrypto { PreviousOrCurrent::Previous => agg_key.previous.as_ref(), PreviousOrCurrent::Current => Some(&agg_key.current), } - .map_or(false, |key| verify_single_threshold_signature(key, payload, signature)) + .is_some_and(|key| verify_single_threshold_signature(key, payload, signature)) }) } diff --git a/state-chain/pallets/cf-elections/src/electoral_systems/mocks.rs b/state-chain/pallets/cf-elections/src/electoral_systems/mocks.rs index d2a532de83..afd92d3c97 100644 --- a/state-chain/pallets/cf-elections/src/electoral_systems/mocks.rs +++ b/state-chain/pallets/cf-elections/src/electoral_systems/mocks.rs @@ -225,26 +225,6 @@ impl TestContext { type CheckFnParam = Box, &ElectoralSystemState, Param)>; -pub struct CheckParam { - check_fn: CheckFnParam, -} - -impl CheckParam { - pub fn new( - check_fn: impl Fn(&ElectoralSystemState, &ElectoralSystemState, Param) + 'static, - ) -> Self { - Self { check_fn: Box::new(check_fn) } - } - - pub fn check( - &self, - pre_finalize: &ElectoralSystemState, - post_finalize: &ElectoralSystemState, - param: Param, - ) { - (self.check_fn)(pre_finalize, post_finalize, param) - } -} pub struct SingleCheck { param: Param, @@ -334,7 +314,6 @@ macro_rules! single_check_new { /// }, /// } /// ``` - #[macro_export] macro_rules! register_checks { ( diff --git a/state-chain/test-utilities/Cargo.toml b/state-chain/test-utilities/Cargo.toml index 623c7244d5..965abcc119 100644 --- a/state-chain/test-utilities/Cargo.toml +++ b/state-chain/test-utilities/Cargo.toml @@ -22,3 +22,6 @@ sp-runtime = { workspace = true, default-features = true } scale-info = { workspace = true, default-features = true, features = [ "derive", ] } + +[features] +std = [] diff --git a/state-chain/traits/src/lib.rs b/state-chain/traits/src/lib.rs index 627a2d7c59..98d1603f09 100644 --- a/state-chain/traits/src/lib.rs +++ b/state-chain/traits/src/lib.rs @@ -1,5 +1,4 @@ #![cfg_attr(not(feature = "std"), no_std)] -#![cfg_attr(feature = "std", feature(option_get_or_insert_default))] mod async_result; mod liquidity; diff --git a/utilities/src/lib.rs b/utilities/src/lib.rs index c4b4632353..fb51794d51 100644 --- a/utilities/src/lib.rs +++ b/utilities/src/lib.rs @@ -1,5 +1,4 @@ #![cfg_attr(not(feature = "std"), no_std)] -#![feature(const_option)] #![feature(step_trait)] #![cfg_attr(any(feature = "test-utils", test), feature(closure_track_caller))] #![feature(async_fn_track_caller)] @@ -175,7 +174,7 @@ fn test_collect_array_dropping() { Self { instance_count } } } - impl<'a> Drop for InstanceCounter<'a> { + impl Drop for InstanceCounter<'_> { fn drop(&mut self) { self.instance_count.fetch_sub(1, Ordering::Relaxed); } @@ -256,6 +255,7 @@ where struct IteratorRef<'a, T, It: Iterator> { it: &'a mut It, } + #[allow(clippy::needless_lifetimes)] impl<'a, T, It: Iterator> Iterator for IteratorRef<'a, T, It> { type Item = T; diff --git a/utilities/src/with_std/dynamic_events.rs b/utilities/src/with_std/dynamic_events.rs index 7db634afcf..24d9b7e33d 100644 --- a/utilities/src/with_std/dynamic_events.rs +++ b/utilities/src/with_std/dynamic_events.rs @@ -56,7 +56,7 @@ impl Deref for DynamicEvent { impl DynamicEventRecord { /// Wrap a JSON value that represents a substrate EventRecord. pub fn new(json: JsonValue) -> Option { - if json.as_object().map_or(false, |obj| { + if json.as_object().is_some_and(|obj| { obj.contains_key("event") && obj.contains_key("phase") && obj.contains_key("topics") }) { Some(Self(json)) diff --git a/utilities/src/with_std/health.rs b/utilities/src/with_std/health.rs index c684ac3ca1..69c923eee4 100644 --- a/utilities/src/with_std/health.rs +++ b/utilities/src/with_std/health.rs @@ -38,8 +38,8 @@ pub struct HealthCheck { const INITIALISING: &str = "INITIALISING"; const RUNNING: &str = "RUNNING"; -pub async fn start_if_configured<'a, 'env>( - scope: &'a task_scope::Scope<'env, anyhow::Error>, +pub async fn start_if_configured<'a>( + scope: &'a task_scope::Scope<'_, anyhow::Error>, opts: &'a HealthCheckOptions, has_completed_initialising: Arc, ) -> Result<(), anyhow::Error> { diff --git a/utilities/src/with_std/rle_bitmap.rs b/utilities/src/with_std/rle_bitmap.rs index 9fbff8ae19..21ca75bfbe 100644 --- a/utilities/src/with_std/rle_bitmap.rs +++ b/utilities/src/with_std/rle_bitmap.rs @@ -46,7 +46,7 @@ impl RleBitmap { if option_exclusive_end != Some(inclusive_start) { let does_start_value_match = option_exclusive_start - .map_or(false, |option_exclusive_start| self.get(&option_exclusive_start) == value); + .is_some_and(|option_exclusive_start| self.get(&option_exclusive_start) == value); let does_end_value_match = option_exclusive_end .map_or(true, |exclusive_end| self.get(&exclusive_end) == value); diff --git a/utilities/src/with_std/serde_helpers/deser_path.rs b/utilities/src/with_std/serde_helpers/deser_path.rs index dd4808e86a..877fc9214c 100644 --- a/utilities/src/with_std/serde_helpers/deser_path.rs +++ b/utilities/src/with_std/serde_helpers/deser_path.rs @@ -3,6 +3,7 @@ use core::fmt; use std::path::PathBuf; #[cfg(feature = "std")] +#[allow(clippy::needless_lifetimes)] // We use PathBuf because the value must be Sized, Path is not Sized pub fn deser_path<'de, D>(deserializer: D) -> std::result::Result where diff --git a/utilities/src/with_std/unending_stream.rs b/utilities/src/with_std/unending_stream.rs index 04f0e16388..45b4b6d553 100644 --- a/utilities/src/with_std/unending_stream.rs +++ b/utilities/src/with_std/unending_stream.rs @@ -5,7 +5,7 @@ pub struct NextOrPending<'a, St: ?Sized> { #[pin] stream: &'a mut St, } -impl<'a, St: Stream + ?Sized + Unpin> Future for NextOrPending<'a, St> { +impl Future for NextOrPending<'_, St> { type Output = ::Item; fn poll( From e6f207b08d2e5eb93b5a668a3789a615b3f4f6b4 Mon Sep 17 00:00:00 2001 From: kylezs Date: Mon, 25 Nov 2024 17:45:44 +0100 Subject: [PATCH 03/11] chore: fmt --- state-chain/pallets/cf-elections/src/electoral_systems/mocks.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/state-chain/pallets/cf-elections/src/electoral_systems/mocks.rs b/state-chain/pallets/cf-elections/src/electoral_systems/mocks.rs index afd92d3c97..2dcb58fc96 100644 --- a/state-chain/pallets/cf-elections/src/electoral_systems/mocks.rs +++ b/state-chain/pallets/cf-elections/src/electoral_systems/mocks.rs @@ -225,7 +225,6 @@ impl TestContext { type CheckFnParam = Box, &ElectoralSystemState, Param)>; - pub struct SingleCheck { param: Param, check_fn: CheckFnParam, From e7db8348f4cc681e35008c16d1dc29db0a34ef20 Mon Sep 17 00:00:00 2001 From: Daniel Date: Tue, 26 Nov 2024 13:52:48 +0100 Subject: [PATCH 04/11] fix: update dylib build/download paths --- engine-runner-bin/build.rs | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/engine-runner-bin/build.rs b/engine-runner-bin/build.rs index 31e1102460..694733cc28 100644 --- a/engine-runner-bin/build.rs +++ b/engine-runner-bin/build.rs @@ -102,16 +102,17 @@ fn main() { let out_dir = std::env::var("OUT_DIR").unwrap(); - let build_dir = std::path::Path::new(&out_dir) + let lib_dir = std::path::Path::new(&out_dir) .parent() .unwrap() .parent() .unwrap() .parent() - .unwrap(); // target/debug or target/release + .unwrap() // target/debug or target/release + .join("deps"); download_old_dylib( - build_dir, + &lib_dir, match env::var("IS_MAINNET") { Ok(val) => val.to_lowercase() == "true", Err(_) => false, // Default to false @@ -119,9 +120,9 @@ fn main() { ) .unwrap(); - let build_dir_str = build_dir.to_str().unwrap(); + let lib_dir_str = lib_dir.to_str().unwrap(); - println!("cargo:rustc-link-search=native={build_dir_str}"); + println!("cargo:rustc-link-search=native={lib_dir_str}"); let old_version_suffix = OLD_VERSION.replace('.', "_"); let new_version_suffix = NEW_VERSION.replace('.', "_"); @@ -131,12 +132,12 @@ fn main() { if env::var("TARGET").unwrap().contains("apple") { // === For local testing on Mac === - // The new dylib is in the same directory as the binary. - println!("cargo:rustc-link-arg=-Wl,-rpath,@executable_path"); + // The new dylib is in the ./deps subfolder. + println!("cargo:rustc-link-arg=-Wl,-rpath,@executable_path/deps"); } else { // === For local testing on Linux === - // The new dylib is in the same directory as the binary. - println!("cargo:rustc-link-arg=-Wl,-rpath,$ORIGIN"); + // The new dylib is in the ./deps subfolder. + println!("cargo:rustc-link-arg=-Wl,-rpath,$ORIGIN/deps"); // === For releasing === // This path is where we store the libraries in the docker image, and as part of the apt From d17e3a2c727ef57909a8b4098100ad145e4985e1 Mon Sep 17 00:00:00 2001 From: Daniel Date: Tue, 26 Nov 2024 14:44:39 +0100 Subject: [PATCH 05/11] fix: imports --- state-chain/amm/src/common.rs | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/state-chain/amm/src/common.rs b/state-chain/amm/src/common.rs index 294e72380c..fd02ddae5e 100644 --- a/state-chain/amm/src/common.rs +++ b/state-chain/amm/src/common.rs @@ -288,17 +288,12 @@ pub(super) fn nth_root_of_integer_as_fixed_point(x: U256, n: u32) -> U256 { root } -#[cfg(test)] +#[cfg(all(test, feature = "slow-tests"))] mod test { use super::*; - - #[cfg(feature = "slow-tests")] - use rand::SeedableRng; - - #[cfg(feature = "slow-tests")] use cf_amm_math::test_utilities::rng_u256_inclusive_bound; + use rand::SeedableRng; - #[cfg(feature = "slow-tests")] #[test] fn test_increase_sqrt_price() { fn inner() { @@ -330,7 +325,6 @@ mod test { inner::(); } - #[cfg(feature = "slow-tests")] #[test] fn test_fixed_point_to_power_as_fixed_point() { for n in 0..9u32 { @@ -356,7 +350,6 @@ mod test { ); } - #[cfg(feature = "slow-tests")] #[test] fn test_nth_root_of_integer_as_fixed_point() { fn fixed_point_to_float(x: U256) -> f64 { From 01caea869c2f674d723d765f78bbd71c9923f2ac Mon Sep 17 00:00:00 2001 From: Daniel Date: Tue, 26 Nov 2024 15:01:43 +0100 Subject: [PATCH 06/11] fix: update debian settings --- engine-runner-bin/Cargo.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/engine-runner-bin/Cargo.toml b/engine-runner-bin/Cargo.toml index e613346536..581a790a44 100644 --- a/engine-runner-bin/Cargo.toml +++ b/engine-runner-bin/Cargo.toml @@ -22,16 +22,16 @@ assets = [ # to specify this. We do this in the `chainflip-engine.service` files, so the user does not need to set it # manually. [ - "target/release/libchainflip_engine_v1_8_0.so", + "target/release/deps/libchainflip_engine_v1_8_0.so", # This is the path where the engine dylib is searched for on linux. # As set in the build.rs file. "usr/lib/chainflip-engine/libchainflip_engine_v1_8_0.so", "755", ], - # The old version gets put into target/release by the package github actions workflow. + # The old version gets put into target/release/deps by the package github actions workflow. # It downloads the correct version from the releases page. [ - "target/release/libchainflip_engine_v1_7_1.so", + "target/release/deps/libchainflip_engine_v1_7_1.so", # This is the path where the engine dylib is searched for on linux. # As set in the build.rs file. "usr/lib/chainflip-engine/libchainflip_engine_v1_7_1.so", From 1d27b621beb749aa848df5a9294885b90901e029 Mon Sep 17 00:00:00 2001 From: Daniel Date: Tue, 26 Nov 2024 15:19:30 +0100 Subject: [PATCH 07/11] chore: bump old engine version to 1_7_2 --- engine-runner-bin/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/engine-runner-bin/Cargo.toml b/engine-runner-bin/Cargo.toml index 581a790a44..63c404ade6 100644 --- a/engine-runner-bin/Cargo.toml +++ b/engine-runner-bin/Cargo.toml @@ -31,10 +31,10 @@ assets = [ # The old version gets put into target/release/deps by the package github actions workflow. # It downloads the correct version from the releases page. [ - "target/release/deps/libchainflip_engine_v1_7_1.so", + "target/release/deps/libchainflip_engine_v1_7_2.so", # This is the path where the engine dylib is searched for on linux. # As set in the build.rs file. - "usr/lib/chainflip-engine/libchainflip_engine_v1_7_1.so", + "usr/lib/chainflip-engine/libchainflip_engine_v1_7_2.so", "755", ], ] From 2ba3833d2c0cb7e7d376f2c8d6d219e4c0793910 Mon Sep 17 00:00:00 2001 From: Daniel Date: Tue, 26 Nov 2024 15:26:56 +0100 Subject: [PATCH 08/11] chore: bump old version 1.7.1 -> 1.7.2 --- engine-runner-bin/src/main.rs | 2 +- engine-upgrade-utils/src/lib.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/engine-runner-bin/src/main.rs b/engine-runner-bin/src/main.rs index afdd764a94..533f58e188 100644 --- a/engine-runner-bin/src/main.rs +++ b/engine-runner-bin/src/main.rs @@ -2,7 +2,7 @@ use engine_upgrade_utils::{CStrArray, NEW_VERSION, OLD_VERSION}; // Declare the entrypoints into each version of the engine mod old { - #[engine_proc_macros::link_engine_library_version("1.7.1")] + #[engine_proc_macros::link_engine_library_version("1.7.2")] extern "C" { pub fn cfe_entrypoint( c_args: engine_upgrade_utils::CStrArray, diff --git a/engine-upgrade-utils/src/lib.rs b/engine-upgrade-utils/src/lib.rs index 176fe6c008..77bf8dc682 100644 --- a/engine-upgrade-utils/src/lib.rs +++ b/engine-upgrade-utils/src/lib.rs @@ -10,7 +10,7 @@ pub mod build_helpers; // rest of the places the version needs changing on build using the build scripts in each of the // relevant crates. // Should also check that the compatibility function below `args_compatible_with_old` is correct. -pub const OLD_VERSION: &str = "1.7.1"; +pub const OLD_VERSION: &str = "1.7.2"; pub const NEW_VERSION: &str = "1.8.0"; pub const ENGINE_LIB_PREFIX: &str = "chainflip_engine_v"; From ba4a2d7d9bb9303364ead41ac34dda5433807477 Mon Sep 17 00:00:00 2001 From: Daniel Date: Tue, 26 Nov 2024 16:24:03 +0100 Subject: [PATCH 09/11] fix: upload dylibs from /deps folder --- .github/workflows/_20_build.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/_20_build.yml b/.github/workflows/_20_build.yml index 295460489a..d7e65e1704 100644 --- a/.github/workflows/_20_build.yml +++ b/.github/workflows/_20_build.yml @@ -64,7 +64,6 @@ jobs: fi cargo cf-build-${{ inputs.profile }} --locked - - name: ls directory run: | ls -la ./target/${{ inputs.binary-subdir }} @@ -80,7 +79,7 @@ jobs: ./target/${{ inputs.binary-subdir }}/chainflip-broker-api ./target/${{ inputs.binary-subdir }}/chainflip-lp-api ./target/${{ inputs.binary-subdir }}/chainflip-ingress-egress-tracker - ./target/${{ inputs.binary-subdir }}/libchainflip_engine_v*.so + ./target/${{ inputs.binary-subdir }}/deps/libchainflip_engine_v*.so ./target/${{ inputs.binary-subdir }}/engine-runner - name: Upload runtime artifacts From 7d30413deb643072bb39bc2ccc63149e775d75dd Mon Sep 17 00:00:00 2001 From: Daniel Date: Tue, 26 Nov 2024 22:37:28 +0100 Subject: [PATCH 10/11] fix: add more /deps folders in CI jobs --- .github/workflows/_21_build_m2.yml | 2 +- .github/workflows/_40_post_check.yml | 2 +- .github/workflows/_60_upload.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/_21_build_m2.yml b/.github/workflows/_21_build_m2.yml index c19b4d513a..b2ccc53fac 100644 --- a/.github/workflows/_21_build_m2.yml +++ b/.github/workflows/_21_build_m2.yml @@ -60,7 +60,7 @@ jobs: ./target/${{ inputs.binary-subdir }}/chainflip-broker-api ./target/${{ inputs.binary-subdir }}/chainflip-lp-api ./target/${{ inputs.binary-subdir }}/chainflip-ingress-egress-tracker - ./target/${{ inputs.binary-subdir }}/libchainflip_engine_v*.dylib + ./target/${{ inputs.binary-subdir }}/deps/libchainflip_engine_v*.dylib ./target/${{ inputs.binary-subdir }}/engine-runner - name: Upload runtime artifacts diff --git a/.github/workflows/_40_post_check.yml b/.github/workflows/_40_post_check.yml index f951c295ae..8d9439366a 100644 --- a/.github/workflows/_40_post_check.yml +++ b/.github/workflows/_40_post_check.yml @@ -99,7 +99,7 @@ jobs: echo "Check for libchainflip_engine_v*.so" ls -l /usr/lib/ # TODO: These shouldn't be required: PRO-1510 - sudo cp ${{ env.BINARY_ROOT_PATH }}/libchainflip_engine_v*.so /usr/lib/ + sudo cp ${{ env.BINARY_ROOT_PATH }}/deps/libchainflip_engine_v*.so /usr/lib/ echo "Check /usr/lib after copy" ls -l /usr/lib/ touch ./localnet/.setup_complete diff --git a/.github/workflows/_60_upload.yml b/.github/workflows/_60_upload.yml index 9f88a6982d..590f326cdc 100644 --- a/.github/workflows/_60_upload.yml +++ b/.github/workflows/_60_upload.yml @@ -41,7 +41,7 @@ jobs: - name: Move .dylib files 📂 run: | mkdir -p assets/m2 - mv /tmp/assets/m2/libchainflip_engine_v*.dylib assets/m2/ + mv /tmp/assets/m2/deps/libchainflip_engine_v*.dylib assets/m2/ - name: Download packages 📥 uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 From c41db5b23dd0eb117e17ceba80622f77fce90d54 Mon Sep 17 00:00:00 2001 From: kylezs Date: Wed, 27 Nov 2024 08:52:59 +0100 Subject: [PATCH 11/11] fix: flatten upload structure --- .github/workflows/_20_build.yml | 8 +++++++- .github/workflows/_21_build_m2.yml | 8 +++++++- .github/workflows/_40_post_check.yml | 2 +- .github/workflows/_60_upload.yml | 2 +- engine-runner-bin/Cargo.toml | 4 ++-- 5 files changed, 18 insertions(+), 6 deletions(-) diff --git a/.github/workflows/_20_build.yml b/.github/workflows/_20_build.yml index d7e65e1704..6f7f8dcdf4 100644 --- a/.github/workflows/_20_build.yml +++ b/.github/workflows/_20_build.yml @@ -68,6 +68,12 @@ jobs: run: | ls -la ./target/${{ inputs.binary-subdir }} + # We flatten the structure so upload-artifact uploads a flattened structure + - name: Prepare binaries for upload + run: | + mkdir -p ./target/${{ inputs.binary-subdir }} + cp ./target/${{ inputs.binary-subdir }}/deps/libchainflip_engine_v*.so ./target/${{ inputs.binary-subdir }}/ || true + - name: Upload binary artifacts uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 with: @@ -79,7 +85,7 @@ jobs: ./target/${{ inputs.binary-subdir }}/chainflip-broker-api ./target/${{ inputs.binary-subdir }}/chainflip-lp-api ./target/${{ inputs.binary-subdir }}/chainflip-ingress-egress-tracker - ./target/${{ inputs.binary-subdir }}/deps/libchainflip_engine_v*.so + ./target/${{ inputs.binary-subdir }}/libchainflip_engine_v*.so ./target/${{ inputs.binary-subdir }}/engine-runner - name: Upload runtime artifacts diff --git a/.github/workflows/_21_build_m2.yml b/.github/workflows/_21_build_m2.yml index b2ccc53fac..307b81e775 100644 --- a/.github/workflows/_21_build_m2.yml +++ b/.github/workflows/_21_build_m2.yml @@ -49,6 +49,12 @@ jobs: run: | ls -la ./target/${{ inputs.binary-subdir }} + # We flatten the structure so upload-artifact uploads a flattened structure + - name: Prepare binaries for upload + run: | + mkdir -p ./target/${{ inputs.binary-subdir }} + cp ./target/${{ inputs.binary-subdir }}/deps/libchainflip_engine_v*.so ./target/${{ inputs.binary-subdir }}/ || true + - name: Upload binary artifacts uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 with: @@ -60,7 +66,7 @@ jobs: ./target/${{ inputs.binary-subdir }}/chainflip-broker-api ./target/${{ inputs.binary-subdir }}/chainflip-lp-api ./target/${{ inputs.binary-subdir }}/chainflip-ingress-egress-tracker - ./target/${{ inputs.binary-subdir }}/deps/libchainflip_engine_v*.dylib + ./target/${{ inputs.binary-subdir }}/libchainflip_engine_v*.dylib ./target/${{ inputs.binary-subdir }}/engine-runner - name: Upload runtime artifacts diff --git a/.github/workflows/_40_post_check.yml b/.github/workflows/_40_post_check.yml index 8d9439366a..f951c295ae 100644 --- a/.github/workflows/_40_post_check.yml +++ b/.github/workflows/_40_post_check.yml @@ -99,7 +99,7 @@ jobs: echo "Check for libchainflip_engine_v*.so" ls -l /usr/lib/ # TODO: These shouldn't be required: PRO-1510 - sudo cp ${{ env.BINARY_ROOT_PATH }}/deps/libchainflip_engine_v*.so /usr/lib/ + sudo cp ${{ env.BINARY_ROOT_PATH }}/libchainflip_engine_v*.so /usr/lib/ echo "Check /usr/lib after copy" ls -l /usr/lib/ touch ./localnet/.setup_complete diff --git a/.github/workflows/_60_upload.yml b/.github/workflows/_60_upload.yml index 590f326cdc..9f88a6982d 100644 --- a/.github/workflows/_60_upload.yml +++ b/.github/workflows/_60_upload.yml @@ -41,7 +41,7 @@ jobs: - name: Move .dylib files 📂 run: | mkdir -p assets/m2 - mv /tmp/assets/m2/deps/libchainflip_engine_v*.dylib assets/m2/ + mv /tmp/assets/m2/libchainflip_engine_v*.dylib assets/m2/ - name: Download packages 📥 uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 diff --git a/engine-runner-bin/Cargo.toml b/engine-runner-bin/Cargo.toml index 63c404ade6..b658296ee9 100644 --- a/engine-runner-bin/Cargo.toml +++ b/engine-runner-bin/Cargo.toml @@ -22,7 +22,7 @@ assets = [ # to specify this. We do this in the `chainflip-engine.service` files, so the user does not need to set it # manually. [ - "target/release/deps/libchainflip_engine_v1_8_0.so", + "target/release/libchainflip_engine_v1_8_0.so", # This is the path where the engine dylib is searched for on linux. # As set in the build.rs file. "usr/lib/chainflip-engine/libchainflip_engine_v1_8_0.so", @@ -31,7 +31,7 @@ assets = [ # The old version gets put into target/release/deps by the package github actions workflow. # It downloads the correct version from the releases page. [ - "target/release/deps/libchainflip_engine_v1_7_2.so", + "target/release/libchainflip_engine_v1_7_2.so", # This is the path where the engine dylib is searched for on linux. # As set in the build.rs file. "usr/lib/chainflip-engine/libchainflip_engine_v1_7_2.so",