diff --git a/Cargo.lock b/Cargo.lock index 7c50df8a0..7b065f91b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -23,11 +23,11 @@ dependencies = [ [[package]] name = "addr2line" -version = "0.21.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97" dependencies = [ - "gimli 0.28.0", + "gimli 0.27.3", ] [[package]] @@ -115,9 +115,9 @@ dependencies = [ [[package]] name = "aes-gcm" -version = "0.10.3" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "831010a0f742e1209b3bcea8fab6a8e149051ba6099432c8cb2cc117dec3ead1" +checksum = "209b47e8954a928e1d72e86eca7000ebb6655fe1436d33eefc2201cad027e237" dependencies = [ "aead 0.5.2", "aes 0.8.3", @@ -172,9 +172,18 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.1.2" +version = "0.7.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" +dependencies = [ + "memchr", +] + +[[package]] +name = "aho-corasick" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41" dependencies = [ "memchr", ] @@ -256,9 +265,9 @@ dependencies = [ [[package]] name = "anstyle-wincon" -version = "1.0.2" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c677ab05e09154296dd37acecd46420c17b9713e8366facafa8fc0885167cf4c" +checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188" dependencies = [ "anstyle", "windows-sys 0.48.0", @@ -266,9 +275,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.75" +version = "1.0.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" +checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8" [[package]] name = "approx" @@ -328,7 +337,7 @@ dependencies = [ "num-traits", "rusticata-macros", "thiserror", - "time", + "time 0.3.22", ] [[package]] @@ -344,7 +353,7 @@ dependencies = [ "num-traits", "rusticata-macros", "thiserror", - "time", + "time 0.3.22", ] [[package]] @@ -408,7 +417,7 @@ dependencies = [ "log", "parking", "polling", - "rustix 0.37.25", + "rustix 0.37.20", "slab", "socket2 0.4.9", "waker-fn", @@ -416,42 +425,42 @@ dependencies = [ [[package]] name = "async-lock" -version = "2.8.0" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" +checksum = "fa24f727524730b077666307f2734b4a1a1c57acb79193127dcc8914d5242dd7" dependencies = [ "event-listener", ] [[package]] name = "async-trait" -version = "0.1.74" +version = "0.1.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" +checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.22", ] [[package]] name = "asynchronous-codec" -version = "0.6.2" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4057f2c32adbb2fc158e22fb38433c8e9bbf76b75a4732c7c0cbaf695fb65568" +checksum = "06a0daa378f5fd10634e44b0a29b2a87b890657658e072a30d6f26e57ddee182" dependencies = [ "bytes", "futures-sink", "futures-util", "memchr", - "pin-project-lite 0.2.13", + "pin-project-lite 0.2.9", ] [[package]] name = "atomic-waker" -version = "1.1.2" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" +checksum = "1181e1e0d1fce796a03db1ae795d67167da795f9cf4a39c37589e85ef57f26d3" [[package]] name = "atty" @@ -490,16 +499,16 @@ checksum = "7b7e4c2464d97fe331d41de9d5db0def0a96f4d823b8b32a2efd503578988973" [[package]] name = "backtrace" -version = "0.3.69" +version = "0.3.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca" dependencies = [ - "addr2line 0.21.0", + "addr2line 0.19.0", "cc", "cfg-if", "libc", - "miniz_oxide", - "object 0.32.1", + "miniz_oxide 0.6.2", + "object 0.30.4", "rustc-demangle", ] @@ -529,9 +538,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "base64" -version = "0.21.4" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2" +checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" [[package]] name = "base64ct" @@ -589,7 +598,7 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#bc dependencies = [ "beefy-gadget", "futures", - "jsonrpsee 0.16.3", + "jsonrpsee 0.16.2", "log", "parity-scale-codec", "parking_lot 0.12.1", @@ -626,7 +635,7 @@ version = "0.64.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c4243e6031260db77ede97ad86c27e501d646a27ab57b59a574f725d98ab1fb4" dependencies = [ - "bitflags 1.3.2", + "bitflags", "cexpr", "clang-sys", "lazy_static", @@ -661,12 +670,6 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" -[[package]] -name = "bitflags" -version = "2.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" - [[package]] name = "bitvec" version = "1.0.1" @@ -690,9 +693,9 @@ dependencies = [ [[package]] name = "blake2b_simd" -version = "1.0.2" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23285ad32269793932e830392f2fe2f83e26488fd3ec778883a93c8323735780" +checksum = "3c2f0dc9a68c6317d884f97cc36cf5a3d20ba14ce404227df55e1af708ab04bc" dependencies = [ "arrayref", "arrayvec 0.7.4", @@ -701,9 +704,9 @@ dependencies = [ [[package]] name = "blake2s_simd" -version = "1.0.2" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94230421e395b9920d23df13ea5d77a20e1725331f90fbbf6df6040b33f756ae" +checksum = "6637f448b9e61dfadbdcbae9a885fadee1f3eaffb1f8d3c1965d3ade8bdfd44f" dependencies = [ "arrayref", "arrayvec 0.7.4", @@ -712,15 +715,16 @@ dependencies = [ [[package]] name = "blake3" -version = "1.5.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0231f06152bf547e9c2b5194f247cd97aacf6dcd8b15d8e5ec0663f64580da87" +checksum = "729b71f35bd3fa1a4c86b85d32c8b9069ea7fe14f7a53cfabb65f62d4265b888" dependencies = [ "arrayref", "arrayvec 0.7.4", "cc", "cfg-if", "constant_time_eq", + "digest 0.10.7", ] [[package]] @@ -795,9 +799,9 @@ checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3" [[package]] name = "bstr" -version = "1.7.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c79ad7fb2dd38f3dabd76b09c6a5a20c038fc0213ef1e9afd30eb777f120f019" +checksum = "a246e68bb43f6cd9db24bea052a53e40405417c5fb372e3d1a8a7f770a564ef5" dependencies = [ "memchr", "serde", @@ -814,9 +818,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.14.0" +version = "3.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" +checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" [[package]] name = "byte-slice-cast" @@ -832,21 +836,21 @@ checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" [[package]] name = "bytemuck" -version = "1.14.0" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" +checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea" [[package]] name = "byteorder" -version = "1.5.0" +version = "1.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" +checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] name = "bytes" -version = "1.5.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" +checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" [[package]] name = "bzip2-sys" @@ -861,9 +865,9 @@ dependencies = [ [[package]] name = "camino" -version = "1.1.6" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c59e92b5a388f549b863a7bea62612c09f24c8393560709a54558a9abdfb3b9c" +checksum = "c530edf18f37068ac2d977409ed5cd50d53d73bc653c7647b48eb78976ac9ae2" dependencies = [ "serde", ] @@ -884,9 +888,9 @@ dependencies = [ [[package]] name = "cargo-platform" -version = "0.1.4" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12024c4645c97566567129c204f65d5815a8c9aecf30fcbe682b2fe034996d36" +checksum = "cbdb825da8a5df079a43676dbe042702f1707b1109f713a01420fbb4cc71fa27" dependencies = [ "serde", ] @@ -899,7 +903,7 @@ checksum = "4acbb09d9ee8e23699b9634375c72795d095bf268439da88562cf9b501f181fa" dependencies = [ "camino", "cargo-platform", - "semver 1.0.20", + "semver 1.0.17", "serde", "serde_json", ] @@ -912,12 +916,11 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" [[package]] name = "cc" -version = "1.0.83" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" dependencies = [ "jobserver", - "libc", ] [[package]] @@ -988,16 +991,17 @@ dependencies = [ [[package]] name = "chrono" -version = "0.4.31" +version = "0.4.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" +checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5" dependencies = [ "android-tzdata", "iana-time-zone", "js-sys", "num-traits", + "time 0.1.45", "wasm-bindgen", - "windows-targets", + "winapi", ] [[package]] @@ -1095,7 +1099,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123" dependencies = [ "atty", - "bitflags 1.3.2", + "bitflags", "clap_derive 3.2.25", "clap_lex 0.2.4", "indexmap 1.9.3", @@ -1124,7 +1128,7 @@ checksum = "2c9b4a88bb4bc35d3d6f65a21b0f0bafe9c894fa00978de242c555ec28bea1c0" dependencies = [ "anstream", "anstyle", - "bitflags 1.3.2", + "bitflags", "clap_lex 0.5.0", "strsim", ] @@ -1151,7 +1155,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.22", ] [[package]] @@ -1171,9 +1175,9 @@ checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b" [[package]] name = "coarsetime" -version = "0.1.29" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a73ef0d00d14301df35d0f13f5ea32344de6b00837485c358458f1e7f2d27db4" +checksum = "a90d114103adbc625300f346d4d09dfb4ab1c4a8df6868435dd903392ecf4354" dependencies = [ "libc", "once_cell", @@ -1210,24 +1214,24 @@ dependencies = [ [[package]] name = "concurrent-queue" -version = "2.3.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f057a694a54f12365049b0958a1685bb52d567f5593b355fbf685838e873d400" +checksum = "62ec6771ecfa0762d24683ee5a32ad78487a3d3afdc0fb8cae19d2c5deb50b7c" dependencies = [ "crossbeam-utils", ] [[package]] name = "const-oid" -version = "0.9.5" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28c122c3980598d243d63d9a704629a2d748d101f278052ff068be5a4423ab6f" +checksum = "520fbf3c07483f94e3e3ca9d0cfd913d7718ef2483d2cfd91c0d9e91474ab913" [[package]] name = "constant_time_eq" -version = "0.3.0" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" +checksum = "21a53c0a4d288377e7415b53dcfc3c04da5cdc2cc95c8d5ac178b58f0b861ad6" [[package]] name = "convert_case" @@ -1281,9 +1285,9 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.9" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" +checksum = "03e69e28e9f7f77debdedbaafa2866e1de9ba56df55a8bd7cfc724c25a09987c" dependencies = [ "libc", ] @@ -1379,7 +1383,7 @@ dependencies = [ "cranelift-codegen", "cranelift-entity", "cranelift-frontend", - "itertools 0.10.5", + "itertools", "log", "smallvec", "wasmparser", @@ -1422,7 +1426,7 @@ dependencies = [ "ciborium", "clap 3.2.25", "criterion-plot", - "itertools 0.10.5", + "itertools", "lazy_static", "num-traits", "oorandom", @@ -1443,7 +1447,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1" dependencies = [ "cast", - "itertools 0.10.5", + "itertools", +] + +[[package]] +name = "crossbeam-channel" +version = "0.5.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" +dependencies = [ + "cfg-if", + "crossbeam-utils", ] [[package]] @@ -1957,7 +1971,7 @@ dependencies = [ "async-trait", "cumulus-primitives-core", "futures", - "jsonrpsee-core 0.16.3", + "jsonrpsee-core 0.16.2", "parity-scale-codec", "polkadot-overseer", "sc-client-api", @@ -2018,7 +2032,7 @@ dependencies = [ "cumulus-relay-chain-interface", "futures", "futures-timer", - "jsonrpsee 0.16.3", + "jsonrpsee 0.16.2", "lru 0.9.0", "parity-scale-codec", "polkadot-service", @@ -2078,37 +2092,23 @@ dependencies = [ [[package]] name = "curve25519-dalek" -version = "4.1.1" +version = "4.0.0-rc.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e89b8c6a2e4b1f45971ad09761aafb85514a84744b67a95e32c3cc1352d1f65c" +checksum = "8d4ba9852b42210c7538b75484f9daa0655e9a3ac04f693747bb0f02cf3cfe16" dependencies = [ "cfg-if", - "cpufeatures", - "curve25519-dalek-derive", - "digest 0.10.7", "fiat-crypto", - "platforms 3.1.2", - "rustc_version", + "packed_simd_2", + "platforms 3.0.2", "subtle", "zeroize", ] -[[package]] -name = "curve25519-dalek-derive" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83fdaf97f4804dcebfa5862639bc9ce4121e82140bec2a987ac5140294865b5b" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.38", -] - [[package]] name = "cxx" -version = "1.0.109" +version = "1.0.97" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c390c123d671cc547244943ecad81bdaab756c6ea332d9ca9c1f48d952a24895" +checksum = "e88abab2f5abbe4c56e8f1fb431b784d710b709888f35755a160e62e33fe38e8" dependencies = [ "cc", "cxxbridge-flags", @@ -2118,9 +2118,9 @@ dependencies = [ [[package]] name = "cxx-build" -version = "1.0.109" +version = "1.0.97" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00d3d3ac9ffb900304edf51ca719187c779f4001bb544f26c4511d621de905cf" +checksum = "5c0c11acd0e63bae27dcd2afced407063312771212b7a823b4fd72d633be30fb" dependencies = [ "cc", "codespan-reporting", @@ -2128,24 +2128,24 @@ dependencies = [ "proc-macro2", "quote", "scratch", - "syn 2.0.38", + "syn 2.0.22", ] [[package]] name = "cxxbridge-flags" -version = "1.0.109" +version = "1.0.97" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94415827ecfea0f0c74c8cad7d1a86ddb3f05354d6a6ddeda0adee5e875d2939" +checksum = "8d3816ed957c008ccd4728485511e3d9aaf7db419aa321e3d2c5a2f3411e36c8" [[package]] name = "cxxbridge-macro" -version = "1.0.109" +version = "1.0.97" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e33dbbe9f5621c9247f97ec14213b04f350bff4b6cebefe834c60055db266ecf" +checksum = "a26acccf6f445af85ea056362561a24ef56cdc15fcc685f03aec50b9c702cb6d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.22", ] [[package]] @@ -2220,16 +2220,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "der" -version = "0.7.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fffa369a668c8af7dbf8b5e56c9f744fbd399949ed171606040001947de40b1c" -dependencies = [ - "const-oid", - "zeroize", -] - [[package]] name = "der-parser" version = "7.0.0" @@ -2258,15 +2248,6 @@ dependencies = [ "rusticata-macros", ] -[[package]] -name = "deranged" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3" -dependencies = [ - "powerfmt", -] - [[package]] name = "derivative" version = "2.2.0" @@ -2423,7 +2404,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.22", ] [[package]] @@ -2440,9 +2421,9 @@ checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" [[package]] name = "dtoa" -version = "1.0.9" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcbb2bf8e87535c23f7a8a321e364ce21462d0ff10cb6407820e8e96dfff6653" +checksum = "65d09067bfacaa79114679b279d7f5885b53295b1e2cfb4e79c8e4bd3d633169" [[package]] name = "dyn-clonable" @@ -2467,9 +2448,9 @@ dependencies = [ [[package]] name = "dyn-clone" -version = "1.0.14" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23d2f3407d9a573d666de4b5bdf10569d73ca9478087346697dcbae6244bfbcd" +checksum = "68b0cf012f1230e43cd00ebb729c6bb58707ecfa8ad08b52ef3a4ccd2697fc30" [[package]] name = "ecdsa" @@ -2477,10 +2458,10 @@ version = "0.14.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "413301934810f597c1d19ca71c8710e99a3f1ba28a0d2ebc01551a2daeea3c5c" dependencies = [ - "der 0.6.1", + "der", "elliptic-curve", "rfc6979", - "signature 1.6.4", + "signature", ] [[package]] @@ -2489,17 +2470,7 @@ version = "1.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "91cff35c70bba8a626e3185d8cd48cc11b5437e1a5bcd15b9b5fa3c64b6dfee7" dependencies = [ - "signature 1.6.4", -] - -[[package]] -name = "ed25519" -version = "2.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53" -dependencies = [ - "pkcs8 0.10.2", - "signature 2.1.0", + "signature", ] [[package]] @@ -2509,27 +2480,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c762bae6dcaf24c4c84667b8579785430908723d5c889f469d76a41d59cc7a9d" dependencies = [ "curve25519-dalek 3.2.0", - "ed25519 1.5.3", + "ed25519", "rand 0.7.3", "serde", "sha2 0.9.9", "zeroize", ] -[[package]] -name = "ed25519-dalek" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7277392b266383ef8396db7fdeb1e77b6c52fed775f5df15bb24f35b72156980" -dependencies = [ - "curve25519-dalek 4.1.1", - "ed25519 2.2.3", - "rand_core 0.6.4", - "serde", - "sha2 0.10.8", - "zeroize", -] - [[package]] name = "ed25519-zebra" version = "3.1.0" @@ -2546,9 +2503,9 @@ dependencies = [ [[package]] name = "either" -version = "1.9.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" +checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" [[package]] name = "elliptic-curve" @@ -2558,14 +2515,14 @@ checksum = "e7bb888ab5300a19b8e5bceef25ac745ad065f3c9f7efc6de1b91958110891d3" dependencies = [ "base16ct", "crypto-bigint", - "der 0.6.1", + "der", "digest 0.10.7", "ff", "generic-array 0.14.7", "group", "hkdf", "pem-rfc7468", - "pkcs8 0.9.0", + "pkcs8", "rand_core 0.6.4", "sec1", "subtle", @@ -2586,33 +2543,33 @@ dependencies = [ [[package]] name = "enumflags2" -version = "0.7.8" +version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5998b4f30320c9d93aed72f63af821bfdac50465b75428fce77b48ec482c3939" +checksum = "c041f5090df68b32bcd905365fd51769c8b9d553fe87fde0b683534f10c01bd2" dependencies = [ "enumflags2_derive", ] [[package]] name = "enumflags2_derive" -version = "0.7.8" +version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f95e2801cd355d4a1a3e3953ce6ee5ae9603a5c833455343a8bfe3f44d418246" +checksum = "5e9a1f9f7d83e59740248a6e14ecf93929ade55027844dfcea78beafccc15745" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.22", ] [[package]] name = "enumn" -version = "0.1.12" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2ad8cef1d801a4686bfd8919f0b30eac4c8e48968c437a6405ded4fb5272d2b" +checksum = "48016319042fb7c87b78d2993084a831793a897a5cd1a2a67cab9d1eeb4b7d76" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.22", ] [[package]] @@ -2649,9 +2606,9 @@ checksum = "e48c92028aaa870e83d51c64e5d4e0b6981b360c522198c23959f219a4e1b15b" [[package]] name = "equivalent" -version = "1.0.1" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" +checksum = "88bffebc5d80432c9b140ee17875ff173a8ab62faad5b257da912bd2f6c1c0a1" [[package]] name = "errno" @@ -2666,10 +2623,11 @@ dependencies = [ [[package]] name = "errno" -version = "0.3.5" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860" +checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" dependencies = [ + "errno-dragonfly", "libc", "windows-sys 0.48.0", ] @@ -2917,12 +2875,6 @@ dependencies = [ "instant", ] -[[package]] -name = "fastrand" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" - [[package]] name = "fatality" version = "0.0.6" @@ -3019,7 +2971,7 @@ dependencies = [ "fp-storage", "futures", "hex", - "jsonrpsee 0.16.3", + "jsonrpsee 0.16.2", "libsecp256k1", "log", "lru 0.8.1", @@ -3055,7 +3007,7 @@ source = "git+https://github.com/PureStake/frontier?branch=moonbeam-polkadot-v0. dependencies = [ "ethereum", "ethereum-types", - "jsonrpsee 0.16.3", + "jsonrpsee 0.16.2", "rustc-hex", "serde", "serde_json", @@ -3100,9 +3052,9 @@ dependencies = [ [[package]] name = "fiat-crypto" -version = "0.2.1" +version = "0.1.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0870c84016d4b481be5c9f323c24f65e31e901ae618f0e80f4308fb00de1d2d" +checksum = "e825f6987101665dea6ec934c09ec6d721de7bc1bf92248e1d5810c8cd636b77" [[package]] name = "file-per-thread-logger" @@ -3116,13 +3068,13 @@ dependencies = [ [[package]] name = "filetime" -version = "0.2.22" +version = "0.2.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0" +checksum = "5cbc844cecaee9d4443931972e1289c8ff485cb4cc2767cb03ca139ed6885153" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.3.5", + "redox_syscall 0.2.16", "windows-sys 0.48.0", ] @@ -3181,13 +3133,13 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flate2" -version = "1.0.28" +version = "1.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" dependencies = [ "crc32fast", "libz-sys", - "miniz_oxide", + "miniz_oxide 0.7.1", ] [[package]] @@ -3346,7 +3298,7 @@ dependencies = [ "frame-system", "gethostname", "handlebars", - "itertools 0.10.5", + "itertools", "lazy_static", "linked-hash-map", "log", @@ -3456,7 +3408,7 @@ name = "frame-support" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#bcff60a227d455d95b4712b6cb356ce56b1ff672" dependencies = [ - "bitflags 1.3.2", + "bitflags", "frame-metadata", "frame-support-procedural", "impl-trait-for-tuples", @@ -3492,7 +3444,7 @@ dependencies = [ "cfg-expr", "derive-syn-parse", "frame-support-procedural-tools", - "itertools 0.10.5", + "itertools", "proc-macro2", "quote", "syn 1.0.109", @@ -3651,12 +3603,12 @@ version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" dependencies = [ - "fastrand 1.9.0", + "fastrand", "futures-core", "futures-io", "memchr", "parking", - "pin-project-lite 0.2.13", + "pin-project-lite 0.2.9", "waker-fn", ] @@ -3668,7 +3620,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.22", ] [[package]] @@ -3678,8 +3630,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2411eed028cdf8c8034eaf21f9915f956b6c3abec4d4c7949ee67f0721127bd" dependencies = [ "futures-io", - "rustls 0.20.9", - "webpki 0.22.4", + "rustls 0.20.8", + "webpki 0.22.0", ] [[package]] @@ -3713,7 +3665,7 @@ dependencies = [ "futures-sink", "futures-task", "memchr", - "pin-project-lite 0.2.13", + "pin-project-lite 0.2.9", "pin-utils", "slab", ] @@ -3811,9 +3763,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.28.0" +version = "0.27.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" +checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" [[package]] name = "glob" @@ -3823,11 +3775,11 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "globset" -version = "0.4.13" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "759c97c1e17c55525b57192c06a267cda0ac5210b222d6b82189a2338fa1c13d" +checksum = "029d74589adefde59de1a0c4f4732695c32805624aec7b68d91503d4dba79afc" dependencies = [ - "aho-corasick", + "aho-corasick 0.7.20", "bstr", "fnv", "log", @@ -3836,9 +3788,9 @@ dependencies = [ [[package]] name = "gmp-mpfr-sys" -version = "1.6.1" +version = "1.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19c5c67d8c29fe87e3266e691dd60948e6e4df4496c53355ef3551142945721b" +checksum = "13eabc29d16e4a621b495e3919c71ebb7caaed24380955671e7d417370fea95d" dependencies = [ "libc", "windows-sys 0.42.0", @@ -3877,9 +3829,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.21" +version = "0.3.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833" +checksum = "97ec8491ebaf99c8eaa73058b045fe58073cd6be7f596ac993ced0b0a0c01049" dependencies = [ "bytes", "fnv", @@ -3902,9 +3854,9 @@ checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" [[package]] name = "handlebars" -version = "4.4.0" +version = "4.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c39b3bc2a8f715298032cf5087e58573809374b08160aa7d750582bdb82d2683" +checksum = "83c3372087601b532857d332f5957cbae686da52bb7810bf038c3e3c3cc2fa0d" dependencies = [ "log", "pest", @@ -3949,9 +3901,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.14.1" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dfda62a12f55daeae5015f81b0baea145391cb4520f86c248fc615d72640d12" +checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" [[package]] name = "heck" @@ -3970,9 +3922,18 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.3.3" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" +dependencies = [ + "libc", +] + +[[package]] +name = "hermit-abi" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" +checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" [[package]] name = "hex" @@ -4041,15 +4002,6 @@ dependencies = [ "hmac 0.8.1", ] -[[package]] -name = "home" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" -dependencies = [ - "windows-sys 0.48.0", -] - [[package]] name = "hostname" version = "0.3.1" @@ -4080,14 +4032,14 @@ checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" dependencies = [ "bytes", "http", - "pin-project-lite 0.2.13", + "pin-project-lite 0.2.9", ] [[package]] name = "http-range-header" -version = "0.3.1" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "add0ab9360ddbd88cfeb3bd9574a1d85cfdfa14db10b3e21d3700dbc4328758f" +checksum = "0bfe8eed0a9285ef776bb792479ea3834e8b94e13d615c2f66d03dd50a435a29" [[package]] name = "httparse" @@ -4097,9 +4049,9 @@ checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" [[package]] name = "httpdate" -version = "1.0.3" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" +checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" [[package]] name = "humantime" @@ -4169,7 +4121,7 @@ dependencies = [ "hex-literal 0.3.4", "hydra-dx-build-script-utils", "hydradx-runtime", - "jsonrpsee 0.16.3", + "jsonrpsee 0.16.2", "log", "pallet-transaction-payment-rpc", "pallet-transaction-payment-rpc-runtime-api", @@ -4268,7 +4220,7 @@ dependencies = [ [[package]] name = "hydradx-runtime" -version = "185.0.0" +version = "188.0.0" dependencies = [ "cumulus-pallet-aura-ext", "cumulus-pallet-dmp-queue", @@ -4410,7 +4362,7 @@ dependencies = [ "httparse", "httpdate", "itoa", - "pin-project-lite 0.2.13", + "pin-project-lite 0.2.9", "socket2 0.4.9", "tokio", "tower-service", @@ -4427,10 +4379,10 @@ dependencies = [ "http", "hyper", "log", - "rustls 0.20.9", + "rustls 0.20.8", "rustls-native-certs", "tokio", - "tokio-rustls 0.23.4", + "tokio-rustls", ] [[package]] @@ -4495,9 +4447,9 @@ dependencies = [ [[package]] name = "if-watch" -version = "3.1.0" +version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbb892e5777fe09e16f3d44de7802f4daa7267ecbe8c466f19d94e25bb0c303e" +checksum = "a9465340214b296cd17a0009acdb890d6160010b8adf8f78a00d0d7ab270f79f" dependencies = [ "async-io", "core-foundation", @@ -4509,7 +4461,7 @@ dependencies = [ "rtnetlink", "system-configuration", "tokio", - "windows 0.51.1", + "windows 0.34.0", ] [[package]] @@ -4563,12 +4515,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.0.2" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897" +checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" dependencies = [ "equivalent", - "hashbrown 0.14.1", + "hashbrown 0.14.0", ] [[package]] @@ -4635,7 +4587,7 @@ version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" dependencies = [ - "hermit-abi 0.3.3", + "hermit-abi 0.3.1", "libc", "windows-sys 0.48.0", ] @@ -4652,7 +4604,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f" dependencies = [ - "socket2 0.5.4", + "socket2 0.5.3", "widestring", "windows-sys 0.48.0", "winreg", @@ -4666,12 +4618,13 @@ checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6" [[package]] name = "is-terminal" -version = "0.4.9" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" +checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f" dependencies = [ - "hermit-abi 0.3.3", - "rustix 0.38.19", + "hermit-abi 0.3.1", + "io-lifetimes 1.0.11", + "rustix 0.37.20", "windows-sys 0.48.0", ] @@ -4684,26 +4637,17 @@ dependencies = [ "either", ] -[[package]] -name = "itertools" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" -dependencies = [ - "either", -] - [[package]] name = "itoa" -version = "1.0.9" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" +checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" [[package]] name = "jobserver" -version = "0.1.27" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d" +checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2" dependencies = [ "libc", ] @@ -4733,37 +4677,37 @@ dependencies = [ [[package]] name = "jsonrpsee" -version = "0.16.3" +version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "367a292944c07385839818bb71c8d76611138e2dedb0677d035b8da21d29c78b" +checksum = "7d291e3a5818a2384645fd9756362e6d89cf0541b0b916fa7702ea4a9833608e" dependencies = [ - "jsonrpsee-core 0.16.3", - "jsonrpsee-proc-macros 0.16.3", + "jsonrpsee-core 0.16.2", + "jsonrpsee-proc-macros 0.16.2", "jsonrpsee-server", - "jsonrpsee-types 0.16.3", + "jsonrpsee-types 0.16.2", "jsonrpsee-ws-client", "tracing", ] [[package]] name = "jsonrpsee-client-transport" -version = "0.16.3" +version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8b3815d9f5d5de348e5f162b316dc9cdf4548305ebb15b4eb9328e66cf27d7a" +checksum = "965de52763f2004bc91ac5bcec504192440f0b568a5d621c59d9dbd6f886c3fb" dependencies = [ "futures-util", "http", - "jsonrpsee-core 0.16.3", - "jsonrpsee-types 0.16.3", + "jsonrpsee-core 0.16.2", + "jsonrpsee-types 0.16.2", "pin-project", "rustls-native-certs", "soketto", "thiserror", "tokio", - "tokio-rustls 0.24.1", + "tokio-rustls", "tokio-util", "tracing", - "webpki-roots 0.25.2", + "webpki-roots", ] [[package]] @@ -4797,9 +4741,9 @@ dependencies = [ [[package]] name = "jsonrpsee-core" -version = "0.16.3" +version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b5dde66c53d6dcdc8caea1874a45632ec0fcf5b437789f1e45766a1512ce803" +checksum = "a4e70b4439a751a5de7dd5ed55eacff78ebf4ffe0fc009cb1ebb11417f5b536b" dependencies = [ "anyhow", "arrayvec 0.7.4", @@ -4811,7 +4755,7 @@ dependencies = [ "futures-util", "globset", "hyper", - "jsonrpsee-types 0.16.3", + "jsonrpsee-types 0.16.2", "parking_lot 0.12.1", "rand 0.8.5", "rustc-hash", @@ -4855,9 +4799,9 @@ dependencies = [ [[package]] name = "jsonrpsee-proc-macros" -version = "0.16.3" +version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44e8ab85614a08792b9bff6c8feee23be78c98d0182d4c622c05256ab553892a" +checksum = "baa6da1e4199c10d7b1d0a6e5e8bd8e55f351163b6f4b3cbb044672a69bd4c1c" dependencies = [ "heck", "proc-macro-crate", @@ -4868,16 +4812,16 @@ dependencies = [ [[package]] name = "jsonrpsee-server" -version = "0.16.3" +version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4d945a6008c9b03db3354fb3c83ee02d2faa9f2e755ec1dfb69c3551b8f4ba" +checksum = "1fb69dad85df79527c019659a992498d03f8495390496da2f07e6c24c2b356fc" dependencies = [ "futures-channel", "futures-util", "http", "hyper", - "jsonrpsee-core 0.16.3", - "jsonrpsee-types 0.16.3", + "jsonrpsee-core 0.16.2", + "jsonrpsee-types 0.16.2", "serde", "serde_json", "soketto", @@ -4904,9 +4848,9 @@ dependencies = [ [[package]] name = "jsonrpsee-types" -version = "0.16.3" +version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "245ba8e5aa633dd1c1e4fae72bce06e71f42d34c14a2767c6b4d173b57bee5e5" +checksum = "5bd522fe1ce3702fd94812965d7bb7a3364b1c9aba743944c5a00529aae80f8c" dependencies = [ "anyhow", "beef", @@ -4918,14 +4862,14 @@ dependencies = [ [[package]] name = "jsonrpsee-ws-client" -version = "0.16.3" +version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e1b3975ed5d73f456478681a417128597acd6a2487855fdb7b4a3d4d195bf5e" +checksum = "0b83daeecfc6517cfe210df24e570fb06213533dfb990318fae781f4c7119dd9" dependencies = [ "http", "jsonrpsee-client-transport", - "jsonrpsee-core 0.16.3", - "jsonrpsee-types 0.16.3", + "jsonrpsee-core 0.16.2", + "jsonrpsee-types 0.16.2", ] [[package]] @@ -4957,7 +4901,7 @@ dependencies = [ "cfg-if", "ecdsa", "elliptic-curve", - "sha2 0.10.8", + "sha2 0.10.7", ] [[package]] @@ -5119,7 +5063,7 @@ version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" dependencies = [ - "spin 0.5.2", + "spin", ] [[package]] @@ -5130,9 +5074,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.149" +version = "0.2.147" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" +checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" [[package]] name = "libloading" @@ -5146,9 +5090,15 @@ dependencies = [ [[package]] name = "libm" -version = "0.2.8" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fc7aa29613bd6a620df431842069224d8bc9011086b1db4c0e0cd47fa03ec9a" + +[[package]] +name = "libm" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" +checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4" [[package]] name = "libp2p" @@ -5192,7 +5142,7 @@ checksum = "b6a8fcd392ff67af6cc3f03b1426c41f7f26b6b9aff2dc632c1c56dd649e571f" dependencies = [ "asn1_der", "bs58", - "ed25519-dalek 1.0.1", + "ed25519-dalek", "either", "fnv", "futures", @@ -5210,7 +5160,7 @@ dependencies = [ "rand 0.8.5", "rw-stream-sink", "sec1", - "sha2 0.10.8", + "sha2 0.10.7", "smallvec", "thiserror", "unsigned-varint", @@ -5283,18 +5233,18 @@ dependencies = [ [[package]] name = "libp2p-identity" -version = "0.1.3" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "276bb57e7af15d8f100d3c11cbdd32c6752b7eef4ba7a18ecf464972c07abcce" +checksum = "9e2d584751cecb2aabaa56106be6be91338a60a0f4e420cf2af639204f596fc1" dependencies = [ "bs58", - "ed25519-dalek 2.0.0", + "ed25519-dalek", "log", "multiaddr 0.17.1", "multihash 0.17.0", "quick-protobuf", "rand 0.8.5", - "sha2 0.10.8", + "sha2 0.10.7", "thiserror", "zeroize", ] @@ -5319,7 +5269,7 @@ dependencies = [ "prost", "prost-build", "rand 0.8.5", - "sha2 0.10.8", + "sha2 0.10.7", "smallvec", "thiserror", "uint", @@ -5394,7 +5344,7 @@ dependencies = [ "prost", "prost-build", "rand 0.8.5", - "sha2 0.10.8", + "sha2 0.10.7", "snow", "static_assertions", "thiserror", @@ -5434,7 +5384,7 @@ dependencies = [ "parking_lot 0.12.1", "quinn-proto", "rand 0.8.5", - "rustls 0.20.9", + "rustls 0.20.8", "thiserror", "tokio", ] @@ -5517,10 +5467,10 @@ dependencies = [ "libp2p-core 0.39.2", "libp2p-identity", "rcgen 0.10.0", - "ring 0.16.20", - "rustls 0.20.9", + "ring", + "rustls 0.20.8", "thiserror", - "webpki 0.22.4", + "webpki 0.22.0", "x509-parser 0.14.0", "yasna", ] @@ -5586,7 +5536,7 @@ dependencies = [ "rw-stream-sink", "soketto", "url", - "webpki-roots 0.22.6", + "webpki-roots", ] [[package]] @@ -5668,9 +5618,9 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.1.12" +version = "1.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d97137b25e321a73eef1418d1d5d2eda4d77e12813f8e6dead84bc52c5870a7b" +checksum = "56ee889ecc9568871456d42f603d6a0ce59ff328d291063a45cbdf0036baf6db" dependencies = [ "cc", "pkg-config", @@ -5679,9 +5629,9 @@ dependencies = [ [[package]] name = "link-cplusplus" -version = "1.0.9" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d240c6f7e1ba3a28b0249f774e6a9dd0175054b52dfbb61b16eb8505c3785c9" +checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5" dependencies = [ "cc", ] @@ -5723,12 +5673,6 @@ version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" -[[package]] -name = "linux-raw-sys" -version = "0.4.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" - [[package]] name = "lock_api" version = "0.4.10" @@ -5813,7 +5757,7 @@ version = "0.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f099785f7595cc4b4553a174ce30dd7589ef93391ff414dbb67f62392b9e0ce1" dependencies = [ - "regex-automata 0.1.10", + "regex-automata", ] [[package]] @@ -5824,9 +5768,9 @@ checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" [[package]] name = "matrixmultiply" -version = "0.3.8" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7574c1cf36da4798ab73da5b215bbf444f50718207754cb522201d78d1cd0ff2" +checksum = "090126dc04f95dc0d1c1c91f61bdd474b3930ca064c1edc8a849da2c6cbe1e77" dependencies = [ "autocfg", "rawpointer", @@ -5834,27 +5778,26 @@ dependencies = [ [[package]] name = "md-5" -version = "0.10.6" +version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" +checksum = "6365506850d44bff6e2fbcb5176cf63650e48bd45ef2fe2665ae1570e0f4b9ca" dependencies = [ - "cfg-if", "digest 0.10.7", ] [[package]] name = "memchr" -version = "2.6.4" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" +checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" [[package]] name = "memfd" -version = "0.6.4" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2cffa4ad52c6f791f4f8b15f0c05f9824b2ced1160e88cc393d64fff9a8ac64" +checksum = "ffc89ccdc6e10d6907450f753537ebc5c5d3460d2e4e62ea74bd571db62c0f9e" dependencies = [ - "rustix 0.38.19", + "rustix 0.37.20", ] [[package]] @@ -5938,6 +5881,15 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" +[[package]] +name = "miniz_oxide" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" +dependencies = [ + "adler", +] + [[package]] name = "miniz_oxide" version = "0.7.1" @@ -5983,7 +5935,7 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#bcff60a227d455d95b4712b6cb356ce56b1ff672" dependencies = [ "anyhow", - "jsonrpsee 0.16.3", + "jsonrpsee 0.16.2", "parity-scale-codec", "serde", "sp-api", @@ -6102,7 +6054,7 @@ dependencies = [ "core2", "digest 0.10.7", "multihash-derive", - "sha2 0.10.8", + "sha2 0.10.7", "sha3", "unsigned-varint", ] @@ -6215,7 +6167,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d9ea4302b9759a7a88242299225ea3688e63c85ea136371bb6cf94fd674efaab" dependencies = [ "anyhow", - "bitflags 1.3.2", + "bitflags", "byteorder", "libc", "netlink-packet-core", @@ -6268,7 +6220,7 @@ version = "0.24.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" dependencies = [ - "bitflags 1.3.2", + "bitflags", "cfg-if", "libc", "memoffset 0.6.5", @@ -6276,15 +6228,16 @@ dependencies = [ [[package]] name = "nix" -version = "0.26.4" +version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" +checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a" dependencies = [ - "bitflags 1.3.2", + "bitflags", "cfg-if", "libc", "memoffset 0.7.1", "pin-utils", + "static_assertions", ] [[package]] @@ -6311,9 +6264,9 @@ checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be" [[package]] name = "num-bigint" -version = "0.4.4" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" +checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" dependencies = [ "autocfg", "num-integer", @@ -6322,9 +6275,9 @@ dependencies = [ [[package]] name = "num-complex" -version = "0.4.4" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214" +checksum = "02e0d21255c828d6f128a1e41534206671e8c3ea0c62f32291e808dc82cff17d" dependencies = [ "num-traits", ] @@ -6363,21 +6316,21 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.17" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" +checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" dependencies = [ "autocfg", - "libm", + "libm 0.2.7", ] [[package]] name = "num_cpus" -version = "1.16.0" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" +checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" dependencies = [ - "hermit-abi 0.3.3", + "hermit-abi 0.2.6", "libc", ] @@ -6416,9 +6369,9 @@ dependencies = [ [[package]] name = "object" -version = "0.32.1" +version = "0.30.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" +checksum = "03b4680b86d9cfafba8fc491dc9b6df26b68cf40e9e6cd73909194759a63c385" dependencies = [ "memchr", ] @@ -6495,8 +6448,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2af4dabb2286b0be0e9711d2d24e25f6217048b71210cffd3daddc3b5c84e1f" dependencies = [ "expander 0.0.6", - "itertools 0.10.5", - "petgraph 0.6.4", + "itertools", + "petgraph 0.6.3", "proc-macro-crate", "proc-macro2", "quote", @@ -6677,9 +6630,9 @@ dependencies = [ [[package]] name = "os_str_bytes" -version = "6.6.1" +version = "6.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2355d85b9a3786f481747ced0e0ff2ba35213a1f9bd406ed906554d7af805a1" +checksum = "4d5d9eb14b174ee9aa2ef96dc2b94637a2d4b6e7cb873c7e171f0c20c6cf3eac" [[package]] name = "p256" @@ -6689,7 +6642,7 @@ checksum = "51f44edd08f51e2ade572f141051021c5af22677e42b7dd28a88155151c33594" dependencies = [ "ecdsa", "elliptic-curve", - "sha2 0.10.8", + "sha2 0.10.7", ] [[package]] @@ -6700,7 +6653,17 @@ checksum = "dfc8c5bf642dde52bb9e87c0ecd8ca5a76faac2eeed98dedb7c717997e1080aa" dependencies = [ "ecdsa", "elliptic-curve", - "sha2 0.10.8", + "sha2 0.10.7", +] + +[[package]] +name = "packed_simd_2" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1914cd452d8fccd6f9db48147b29fd4ae05bea9dc5d9ad578509f72415de282" +dependencies = [ + "cfg-if", + "libm 0.1.4", ] [[package]] @@ -6955,7 +6918,7 @@ dependencies = [ "sp-io", "sp-runtime", "sp-std", - "test-case 3.2.1", + "test-case 3.1.0", "test-utils", ] @@ -7085,7 +7048,7 @@ dependencies = [ [[package]] name = "pallet-dca" -version = "1.2.0" +version = "1.2.2" dependencies = [ "cumulus-pallet-parachain-system", "cumulus-primitives-core", @@ -7470,7 +7433,7 @@ dependencies = [ [[package]] name = "pallet-lbp" -version = "4.6.16" +version = "4.7.0" dependencies = [ "frame-benchmarking", "frame-support", @@ -7482,7 +7445,6 @@ dependencies = [ "orml-traits", "parity-scale-codec", "primitive-types", - "primitives", "proptest", "rug", "scale-info", @@ -7679,7 +7641,7 @@ dependencies = [ name = "pallet-omnipool" version = "3.3.0" dependencies = [ - "bitflags 1.3.2", + "bitflags", "frame-benchmarking", "frame-support", "frame-system", @@ -7706,7 +7668,7 @@ dependencies = [ name = "pallet-omnipool-liquidity-mining" version = "2.0.11" dependencies = [ - "bitflags 1.3.2", + "bitflags", "frame-benchmarking", "frame-support", "frame-system", @@ -7948,7 +7910,7 @@ dependencies = [ name = "pallet-stableswap" version = "3.3.1" dependencies = [ - "bitflags 1.3.2", + "bitflags", "frame-benchmarking", "frame-support", "frame-system", @@ -8169,7 +8131,7 @@ name = "pallet-transaction-payment-rpc" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#bcff60a227d455d95b4712b6cb356ce56b1ff672" dependencies = [ - "jsonrpsee 0.16.3", + "jsonrpsee 0.16.2", "pallet-transaction-payment-rpc-runtime-api", "parity-scale-codec", "sp-api", @@ -8333,14 +8295,14 @@ dependencies = [ "sp-io", "sp-runtime", "sp-std", - "test-case 3.2.1", + "test-case 3.1.0", "test-utils", "xcm", ] [[package]] name = "pallet-xyk" -version = "6.2.10" +version = "6.3.1" dependencies = [ "frame-benchmarking", "frame-support", @@ -8355,7 +8317,6 @@ dependencies = [ "pallet-asset-registry", "parity-scale-codec", "primitive-types", - "primitives", "proptest", "scale-info", "serde", @@ -8381,9 +8342,9 @@ dependencies = [ [[package]] name = "parity-db" -version = "0.4.12" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59e9ab494af9e6e813c72170f0d3c1de1500990d62c97cc05cc7576f91aa402f" +checksum = "4890dcb9556136a4ec2b0c51fa4a08c8b733b829506af8fff2e853f3a065985b" dependencies = [ "blake2", "crc32fast", @@ -8401,9 +8362,9 @@ dependencies = [ [[package]] name = "parity-scale-codec" -version = "3.6.5" +version = "3.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dec8a8073036902368c2cdc0387e85ff9a37054d7e7c98e592145e0c92cd4fb" +checksum = "2287753623c76f953acd29d15d8100bcab84d29db78fb6f352adb3c53e83b967" dependencies = [ "arrayvec 0.7.4", "bitvec", @@ -8416,9 +8377,9 @@ dependencies = [ [[package]] name = "parity-scale-codec-derive" -version = "3.6.5" +version = "3.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "312270ee71e1cd70289dacf597cab7b207aa107d2f28191c2ae45b2ece18a260" +checksum = "2b6937b5e67bfba3351b87b040d48352a2fcb6ad72f81855412ce97b45c8f110" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -8440,9 +8401,9 @@ checksum = "e1ad0aff30c1da14b1254fcb2af73e1fa9a28670e584a626f53a369d0e157304" [[package]] name = "parking" -version = "2.1.1" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e52c774a4c39359c1d1c52e43f73dd91a75a614652c825408eec30c95a9b2067" +checksum = "14f2252c834a40ed9bb5422029649578e63aa341ac401f74e719dd1afda8394e" [[package]] name = "parking_lot" @@ -8494,9 +8455,9 @@ dependencies = [ [[package]] name = "paste" -version = "1.0.14" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" +checksum = "9f746c4065a8fa3fe23974dd82f15431cc8d40779821001404d10d2e79ca7d79" [[package]] name = "pbkdf2" @@ -8548,20 +8509,19 @@ checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" [[package]] name = "pest" -version = "2.7.4" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c022f1e7b65d6a24c0dbbd5fb344c66881bc01f3e5ae74a1c8100f2f985d98a4" +checksum = "f73935e4d55e2abf7f130186537b19e7a4abc886a0252380b59248af473a3fc9" dependencies = [ - "memchr", "thiserror", "ucd-trie", ] [[package]] name = "pest_derive" -version = "2.7.4" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35513f630d46400a977c4cb58f78e1bfbe01434316e60c37d27b9ad6139c66d8" +checksum = "aef623c9bbfa0eedf5a0efba11a5ee83209c326653ca31ff019bec3a95bfff2b" dependencies = [ "pest", "pest_generator", @@ -8569,26 +8529,26 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.7.4" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc9fc1b9e7057baba189b5c626e2d6f40681ae5b6eb064dc7c7834101ec8123a" +checksum = "b3e8cba4ec22bada7fc55ffe51e2deb6a0e0db2d0b7ab0b103acc80d2510c190" dependencies = [ "pest", "pest_meta", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.22", ] [[package]] name = "pest_meta" -version = "2.7.4" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1df74e9e7ec4053ceb980e7c0c8bd3594e977fde1af91daba9c928e8e8c6708d" +checksum = "a01f71cb40bd8bb94232df14b946909e14660e33fc05db3e50ae2a82d7ea0ca0" dependencies = [ "once_cell", "pest", - "sha2 0.10.8", + "sha2 0.10.7", ] [[package]] @@ -8603,32 +8563,32 @@ dependencies = [ [[package]] name = "petgraph" -version = "0.6.4" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" +checksum = "4dd7d28ee937e54fe3080c91faa1c3a46c06de6252988a7f4592ba2310ef22a4" dependencies = [ "fixedbitset 0.4.2", - "indexmap 2.0.2", + "indexmap 1.9.3", ] [[package]] name = "pin-project" -version = "1.1.3" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" +checksum = "c95a7476719eab1e366eaf73d0260af3021184f18177925b07f54b30089ceead" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.3" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" +checksum = "39407670928234ebc5e6e580247dd567ad73a3578460c5990f9503df207e8f07" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.22", ] [[package]] @@ -8639,9 +8599,9 @@ checksum = "257b64915a082f7811703966789728173279bdebb956b143dbcd23f6f970a777" [[package]] name = "pin-project-lite" -version = "0.2.13" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" +checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" [[package]] name = "pin-utils" @@ -8655,18 +8615,8 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9eca2c590a5f85da82668fa685c09ce2888b9430e83299debf1f34b65fd4a4ba" dependencies = [ - "der 0.6.1", - "spki 0.6.0", -] - -[[package]] -name = "pkcs8" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" -dependencies = [ - "der 0.7.8", - "spki 0.7.2", + "der", + "spki", ] [[package]] @@ -8689,9 +8639,9 @@ checksum = "e8d0eef3571242013a0d5dc84861c3ae4a652e56e12adf8bdc26ff5f8cb34c94" [[package]] name = "platforms" -version = "3.1.2" +version = "3.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4503fa043bf02cee09a9582e9554b4c6403b2ef55e4612e96561d294419429f8" +checksum = "e3d7ddaed09e0eb771a79ab0fd64609ba0afb0a8366421957936ad14cbd13630" [[package]] name = "plotters" @@ -9436,7 +9386,7 @@ dependencies = [ "fatality", "futures", "futures-channel", - "itertools 0.10.5", + "itertools", "kvdb", "lru 0.9.0", "parity-db", @@ -9546,7 +9496,7 @@ source = "git+https://github.com/galacticcouncil/polkadot?branch=fix-xcm-executo dependencies = [ "beefy-gadget", "beefy-gadget-rpc", - "jsonrpsee 0.16.3", + "jsonrpsee 0.16.2", "mmr-rpc", "pallet-transaction-payment-rpc", "polkadot-primitives", @@ -9740,7 +9690,7 @@ name = "polkadot-runtime-parachains" version = "0.9.38" source = "git+https://github.com/galacticcouncil/polkadot?branch=fix-xcm-executor-atomicity-9-38#a225599ab533bb5f7913429690e5c12ee3cff5ba" dependencies = [ - "bitflags 1.3.2", + "bitflags", "bitvec", "derive_more", "frame-benchmarking", @@ -9924,12 +9874,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" dependencies = [ "autocfg", - "bitflags 1.3.2", + "bitflags", "cfg-if", "concurrent-queue", "libc", "log", - "pin-project-lite 0.2.13", + "pin-project-lite 0.2.9", "windows-sys 0.48.0", ] @@ -9968,12 +9918,6 @@ dependencies = [ "universal-hash 0.5.1", ] -[[package]] -name = "powerfmt" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" - [[package]] name = "ppv-lite86" version = "0.2.17" @@ -9988,7 +9932,7 @@ checksum = "59230a63c37f3e18569bdb90e4a89cbf5bf8b06fea0b84e65ea10cc4df47addd" dependencies = [ "difflib", "float-cmp", - "itertools 0.10.5", + "itertools", "normalize-line-endings", "predicates-core", "regex", @@ -10032,9 +9976,9 @@ dependencies = [ [[package]] name = "primitive-types" -version = "0.12.2" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b34d9fd68ae0b74a41b21c03c2f62847aa0ffea044eee893b4c140b37e244e2" +checksum = "9f3486ccba82358b11a77516035647c34ba167dfa53312630de83b12bd4f3d66" dependencies = [ "fixed-hash", "impl-codec", @@ -10046,7 +9990,7 @@ dependencies = [ [[package]] name = "primitives" -version = "5.8.5" +version = "6.0.0" dependencies = [ "frame-support", "hex-literal 0.3.4", @@ -10111,9 +10055,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.69" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" +checksum = "7b368fba921b0dce7e60f5e04ec15e565b3303972b42bcfde1d0713b881959eb" dependencies = [ "unicode-ident", ] @@ -10157,19 +10101,19 @@ dependencies = [ [[package]] name = "proptest" -version = "1.3.1" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c003ac8c77cb07bb74f5f198bce836a689bcd5a42574612bf14d17bfd08c20e" +checksum = "4e35c06b98bf36aba164cc17cb25f7e232f5c4aeea73baa14b8a9f0d92dbfa65" dependencies = [ "bit-set", - "bit-vec", - "bitflags 2.4.1", + "bitflags", + "byteorder", "lazy_static", "num-traits", "rand 0.8.5", "rand_chacha 0.3.1", "rand_xorshift", - "regex-syntax 0.7.5", + "regex-syntax 0.6.29", "rusty-fork", "tempfile", "unarray", @@ -10193,11 +10137,11 @@ checksum = "119533552c9a7ffacc21e099c24a0ac8bb19c2a2a3f363de84cd9b844feab270" dependencies = [ "bytes", "heck", - "itertools 0.10.5", + "itertools", "lazy_static", "log", "multimap", - "petgraph 0.6.4", + "petgraph 0.6.3", "prettyplease", "prost", "prost-types", @@ -10227,7 +10171,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4" dependencies = [ "anyhow", - "itertools 0.10.5", + "itertools", "proc-macro2", "quote", "syn 1.0.109", @@ -10279,27 +10223,27 @@ dependencies = [ [[package]] name = "quinn-proto" -version = "0.9.6" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94b0b33c13a79f669c85defaf4c275dc86a0c0372807d0ca3d78e0bb87274863" +checksum = "67c10f662eee9c94ddd7135043e544f3c82fa839a1e7b865911331961b53186c" dependencies = [ "bytes", "rand 0.8.5", - "ring 0.16.20", + "ring", "rustc-hash", - "rustls 0.20.9", + "rustls 0.20.8", "slab", "thiserror", "tinyvec", "tracing", - "webpki 0.22.4", + "webpki 0.22.0", ] [[package]] name = "quote" -version = "1.0.33" +version = "1.0.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +checksum = "573015e8ab27661678357f27dc26460738fd2b6c86e46f386fde94cb5d913105" dependencies = [ "proc-macro2", ] @@ -10426,9 +10370,9 @@ checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3" [[package]] name = "rayon" -version = "1.8.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" +checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" dependencies = [ "either", "rayon-core", @@ -10436,12 +10380,14 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.12.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" +checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" dependencies = [ + "crossbeam-channel", "crossbeam-deque", "crossbeam-utils", + "num_cpus", ] [[package]] @@ -10451,8 +10397,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6413f3de1edee53342e6138e75b56d32e7bc6e332b3bd62d497b1929d4cfbcdd" dependencies = [ "pem", - "ring 0.16.20", - "time", + "ring", + "time 0.3.22", "x509-parser 0.13.2", "yasna", ] @@ -10464,8 +10410,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ffbe84efe2f38dea12e9bfc1f65377fdf03e53a18cb3b995faedf7934c7e785b" dependencies = [ "pem", - "ring 0.16.20", - "time", + "ring", + "time 0.3.22", "yasna", ] @@ -10475,7 +10421,7 @@ version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" dependencies = [ - "bitflags 1.3.2", + "bitflags", ] [[package]] @@ -10484,7 +10430,7 @@ version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" dependencies = [ - "bitflags 1.3.2", + "bitflags", ] [[package]] @@ -10500,35 +10446,35 @@ dependencies = [ [[package]] name = "reed-solomon-novelpoly" -version = "1.0.2" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58130877ca403ab42c864fbac74bb319a0746c07a634a92a5cfc7f54af272582" +checksum = "3bd8f48b2066e9f69ab192797d66da804d1935bf22763204ed3675740cb0f221" dependencies = [ "derive_more", "fs-err", - "itertools 0.11.0", - "static_init", + "itertools", + "static_init 0.5.2", "thiserror", ] [[package]] name = "ref-cast" -version = "1.0.20" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acde58d073e9c79da00f2b5b84eed919c8326832648a5b109b3fce1bb1175280" +checksum = "f43faa91b1c8b36841ee70e97188a869d37ae21759da6846d4be66de5bf7b12c" dependencies = [ "ref-cast-impl", ] [[package]] name = "ref-cast-impl" -version = "1.0.20" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f7473c2cfcf90008193dd0e3e16599455cb601a9fce322b5bb55de799664925" +checksum = "8d2275aab483050ab2a7364c1a46604865ee7d6906684e08db0f090acf74f9e7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.22", ] [[package]] @@ -10545,14 +10491,13 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.2" +version = "1.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" +checksum = "d0ab3ca65655bb1e41f2a8c8cd662eb4fb035e67c3f78da1d61dffe89d07300f" dependencies = [ - "aho-corasick", + "aho-corasick 1.0.2", "memchr", - "regex-automata 0.4.3", - "regex-syntax 0.8.2", + "regex-syntax 0.7.2", ] [[package]] @@ -10564,17 +10509,6 @@ dependencies = [ "regex-syntax 0.6.29", ] -[[package]] -name = "regex-automata" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax 0.8.2", -] - [[package]] name = "regex-syntax" version = "0.6.29" @@ -10583,15 +10517,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" - -[[package]] -name = "regex-syntax" -version = "0.8.2" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" +checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78" [[package]] name = "resolv-conf" @@ -10623,26 +10551,12 @@ dependencies = [ "cc", "libc", "once_cell", - "spin 0.5.2", - "untrusted 0.7.1", + "spin", + "untrusted", "web-sys", "winapi", ] -[[package]] -name = "ring" -version = "0.17.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fce3045ffa7c981a6ee93f640b538952e155f1ae3a1a02b84547fc7a56b7059a" -dependencies = [ - "cc", - "getrandom 0.2.10", - "libc", - "spin 0.9.8", - "untrusted 0.9.0", - "windows-sys 0.48.0", -] - [[package]] name = "rlp" version = "0.5.2" @@ -10838,9 +10752,9 @@ dependencies = [ [[package]] name = "rug" -version = "1.22.0" +version = "1.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a118f8296241f6952511e8f9ab5b8a759c0d9ed902159b0aeed82d902e84ca6" +checksum = "555e8b44763d034526db899c88cd56ccc4486cd38b444c8aa0e79d4e70ae5a34" dependencies = [ "az", "gmp-mpfr-sys", @@ -10851,7 +10765,7 @@ dependencies = [ [[package]] name = "runtime-integration-tests" -version = "1.15.0" +version = "1.16.0" dependencies = [ "cumulus-pallet-aura-ext", "cumulus-pallet-dmp-queue", @@ -10974,7 +10888,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ - "semver 1.0.20", + "semver 1.0.17", ] [[package]] @@ -10988,11 +10902,11 @@ dependencies = [ [[package]] name = "rustix" -version = "0.35.15" +version = "0.35.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "413c4d41e2f1b0814c63567d11618483de0bd64f451b452f2ca43896579486ba" +checksum = "727a1a6d65f786ec22df8a81ca3121107f235970dc1705ed681d3e6e8b9cd5f9" dependencies = [ - "bitflags 1.3.2", + "bitflags", "errno 0.2.8", "io-lifetimes 0.7.5", "libc", @@ -11002,31 +10916,18 @@ dependencies = [ [[package]] name = "rustix" -version = "0.37.25" +version = "0.37.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4eb579851244c2c03e7c24f501c3432bed80b8f720af1d6e5b0e0f01555a035" +checksum = "b96e891d04aa506a6d1f318d2771bcb1c7dfda84e126660ace067c9b474bb2c0" dependencies = [ - "bitflags 1.3.2", - "errno 0.3.5", + "bitflags", + "errno 0.3.1", "io-lifetimes 1.0.11", "libc", "linux-raw-sys 0.3.8", "windows-sys 0.48.0", ] -[[package]] -name = "rustix" -version = "0.38.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "745ecfa778e66b2b63c88a61cb36e0eea109e803b0b86bf9879fbc77c70e86ed" -dependencies = [ - "bitflags 2.4.1", - "errno 0.3.5", - "libc", - "linux-raw-sys 0.4.10", - "windows-sys 0.48.0", -] - [[package]] name = "rustls" version = "0.19.1" @@ -11035,33 +10936,21 @@ checksum = "35edb675feee39aec9c99fa5ff985081995a06d594114ae14cbe797ad7b7a6d7" dependencies = [ "base64 0.13.1", "log", - "ring 0.16.20", + "ring", "sct 0.6.1", "webpki 0.21.4", ] [[package]] name = "rustls" -version = "0.20.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b80e3dec595989ea8510028f30c408a4630db12c9cbb8de34203b89d6577e99" -dependencies = [ - "log", - "ring 0.16.20", - "sct 0.7.0", - "webpki 0.22.4", -] - -[[package]] -name = "rustls" -version = "0.21.7" +version = "0.20.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8" +checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f" dependencies = [ "log", - "ring 0.16.20", - "rustls-webpki", + "ring", "sct 0.7.0", + "webpki 0.22.0", ] [[package]] @@ -11082,24 +10971,14 @@ version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" dependencies = [ - "base64 0.21.4", -] - -[[package]] -name = "rustls-webpki" -version = "0.101.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c7d5dece342910d9ba34d259310cae3e0154b873b35408b787b59bce53d34fe" -dependencies = [ - "ring 0.16.20", - "untrusted 0.7.1", + "base64 0.21.2", ] [[package]] name = "rustversion" -version = "1.0.14" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" +checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06" [[package]] name = "rusty-fork" @@ -11126,9 +11005,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.15" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" +checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" [[package]] name = "same-file" @@ -11432,7 +11311,7 @@ version = "0.10.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#bcff60a227d455d95b4712b6cb356ce56b1ff672" dependencies = [ "futures", - "jsonrpsee 0.16.3", + "jsonrpsee 0.16.2", "sc-consensus-babe", "sc-consensus-epochs", "sc-rpc-api", @@ -11543,7 +11422,7 @@ dependencies = [ "libc", "log", "once_cell", - "rustix 0.35.15", + "rustix 0.35.13", "sc-allocator", "sc-executor-common", "sp-runtime-interface", @@ -11598,7 +11477,7 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#bc dependencies = [ "finality-grandpa", "futures", - "jsonrpsee 0.16.3", + "jsonrpsee 0.16.2", "log", "parity-scale-codec", "sc-client-api", @@ -11708,7 +11587,7 @@ version = "0.10.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#bcff60a227d455d95b4712b6cb356ce56b1ff672" dependencies = [ "async-trait", - "bitflags 1.3.2", + "bitflags", "bytes", "futures", "futures-timer", @@ -11876,7 +11755,7 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#bcff60a227d455d95b4712b6cb356ce56b1ff672" dependencies = [ "futures", - "jsonrpsee 0.16.3", + "jsonrpsee 0.16.2", "log", "parity-scale-codec", "parking_lot 0.12.1", @@ -11905,7 +11784,7 @@ name = "sc-rpc-api" version = "0.10.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#bcff60a227d455d95b4712b6cb356ce56b1ff672" dependencies = [ - "jsonrpsee 0.16.3", + "jsonrpsee 0.16.2", "parity-scale-codec", "sc-chain-spec", "sc-transaction-pool-api", @@ -11925,7 +11804,7 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#bcff60a227d455d95b4712b6cb356ce56b1ff672" dependencies = [ "http", - "jsonrpsee 0.16.3", + "jsonrpsee 0.16.2", "log", "serde_json", "substrate-prometheus-endpoint", @@ -11943,7 +11822,7 @@ dependencies = [ "futures", "futures-util", "hex", - "jsonrpsee 0.16.3", + "jsonrpsee 0.16.2", "log", "parity-scale-codec", "parking_lot 0.12.1", @@ -11970,7 +11849,7 @@ dependencies = [ "exit-future", "futures", "futures-timer", - "jsonrpsee 0.16.3", + "jsonrpsee 0.16.2", "log", "parity-scale-codec", "parking_lot 0.12.1", @@ -12017,7 +11896,7 @@ dependencies = [ "sp-transaction-storage-proof", "sp-trie", "sp-version", - "static_init", + "static_init 1.0.3", "substrate-prometheus-endpoint", "tempfile", "thiserror", @@ -12045,7 +11924,7 @@ dependencies = [ "clap 4.3.9", "futures", "log", - "nix 0.26.4", + "nix 0.26.2", "sc-client-db", "sc-utils", "sp-core", @@ -12058,7 +11937,7 @@ name = "sc-sync-state-rpc" version = "0.10.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#bcff60a227d455d95b4712b6cb356ce56b1ff672" dependencies = [ - "jsonrpsee 0.16.3", + "jsonrpsee 0.16.2", "parity-scale-codec", "sc-chain-spec", "sc-client-api", @@ -12209,9 +12088,9 @@ dependencies = [ [[package]] name = "scale-info" -version = "2.9.0" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35c0a159d0c45c12b20c5a844feb1fe4bea86e28f17b92a5f0c42193634d3782" +checksum = "ad560913365790f17cbf12479491169f01b9d46d29cfc7422bf8c64bdc61b731" dependencies = [ "bitvec", "cfg-if", @@ -12223,9 +12102,9 @@ dependencies = [ [[package]] name = "scale-info-derive" -version = "2.9.0" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "912e55f6d20e0e80d63733872b40e1227c0bce1e1ab81ba67d696339bfd7fd29" +checksum = "19df9bd9ace6cc2fe19387c96ce677e823e07d017ceed253e7bb3d1d1bd9c73b" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -12235,11 +12114,11 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.22" +version = "0.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" +checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.42.0", ] [[package]] @@ -12273,9 +12152,9 @@ dependencies = [ [[package]] name = "scopeguard" -version = "1.2.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" +checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" [[package]] name = "scraper" @@ -12295,9 +12174,9 @@ dependencies = [ [[package]] name = "scratch" -version = "1.0.7" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3cf7c11c38cb994f3d40e8a8cde3bbd1f72a435e4c49e85d6553d8312306152" +checksum = "1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1" [[package]] name = "sct" @@ -12305,8 +12184,8 @@ version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b362b83898e0e69f38515b82ee15aa80636befe47c3b6d3d89a911e78fc228ce" dependencies = [ - "ring 0.16.20", - "untrusted 0.7.1", + "ring", + "untrusted", ] [[package]] @@ -12315,8 +12194,8 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" dependencies = [ - "ring 0.16.20", - "untrusted 0.7.1", + "ring", + "untrusted", ] [[package]] @@ -12338,9 +12217,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3be24c1842290c45df0a7bf069e0c268a747ad05a192f2fd7dcfdbc1cba40928" dependencies = [ "base16ct", - "der 0.6.1", + "der", "generic-array 0.14.7", - "pkcs8 0.9.0", + "pkcs8", "subtle", "zeroize", ] @@ -12374,11 +12253,11 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.9.2" +version = "2.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" +checksum = "1fc758eb7bffce5b308734e9b0c1468893cae9ff70ebf13e7090be8dcbcc83a8" dependencies = [ - "bitflags 1.3.2", + "bitflags", "core-foundation", "core-foundation-sys", "libc", @@ -12387,9 +12266,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.9.1" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" +checksum = "f51d0c0d83bec45f16480d0ce0058397a69e48fcdc52d1dc8855fb68acbd31a7" dependencies = [ "core-foundation-sys", "libc", @@ -12416,9 +12295,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.20" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" +checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" dependencies = [ "serde", ] @@ -12431,29 +12310,29 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.189" +version = "1.0.164" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e422a44e74ad4001bdc8eede9a4570ab52f71190e9c076d14369f38b9200537" +checksum = "9e8c8cf938e98f769bc164923b06dce91cea1751522f46f8466461af04c9027d" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.189" +version = "1.0.164" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e48d1f918009ce3145511378cf68d613e3b3d9137d67272562080d68a2b32d5" +checksum = "d9735b638ccc51c28bf6914d90a2e9725b377144fc612c49a611fddd1b631d68" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.22", ] [[package]] name = "serde_json" -version = "1.0.107" +version = "1.0.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" +checksum = "46266871c240a00b8f503b877622fe33430b3c7d963bdc0f2adc511e54a1eae3" dependencies = [ "itoa", "ryu", @@ -12475,9 +12354,9 @@ dependencies = [ [[package]] name = "sha1" -version = "0.10.6" +version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" +checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" dependencies = [ "cfg-if", "cpufeatures", @@ -12511,9 +12390,9 @@ dependencies = [ [[package]] name = "sha2" -version = "0.10.8" +version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" +checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8" dependencies = [ "cfg-if", "cpufeatures", @@ -12532,18 +12411,18 @@ dependencies = [ [[package]] name = "sharded-slab" -version = "0.1.7" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" +checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31" dependencies = [ "lazy_static", ] [[package]] name = "shlex" -version = "1.2.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7cee0529a6d40f580e7a5e6c495c8fbfe21b7b52795ed4bb5e62cdf92bc6380" +checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" [[package]] name = "signal-hook-registry" @@ -12564,12 +12443,6 @@ dependencies = [ "rand_core 0.6.4", ] -[[package]] -name = "signature" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e1788eed21689f9cf370582dfc467ef36ed9c707f073528ddafa8d83e3b8500" - [[package]] name = "simba" version = "0.5.1" @@ -12584,15 +12457,15 @@ dependencies = [ [[package]] name = "siphasher" -version = "0.3.11" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" +checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" [[package]] name = "slab" -version = "0.4.9" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" +checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" dependencies = [ "autocfg", ] @@ -12626,9 +12499,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.1" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" +checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" [[package]] name = "snap" @@ -12638,18 +12511,18 @@ checksum = "5e9f0ab6ef7eb7353d9119c170a436d1bf248eea575ac42d19d12f4e34130831" [[package]] name = "snow" -version = "0.9.3" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c9d1425eb528a21de2755c75af4c9b5d57f50a0d4c3b7f1828a4cd03f8ba155" +checksum = "5ccba027ba85743e09d15c03296797cad56395089b832b48b5a5217880f57733" dependencies = [ "aes-gcm 0.9.4", "blake2", "chacha20poly1305", - "curve25519-dalek 4.1.1", + "curve25519-dalek 4.0.0-rc.1", "rand_core 0.6.4", - "ring 0.16.20", + "ring", "rustc_version", - "sha2 0.10.8", + "sha2 0.10.7", "subtle", ] @@ -12665,9 +12538,9 @@ dependencies = [ [[package]] name = "socket2" -version = "0.5.4" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4031e820eb552adee9295814c0ced9e5cf38ddf1e8b7d566d6de8e2538ea989e" +checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877" dependencies = [ "libc", "windows-sys 0.48.0", @@ -12898,7 +12771,7 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#bc dependencies = [ "array-bytes 4.2.0", "base58", - "bitflags 1.3.2", + "bitflags", "blake2", "dyn-clonable", "ed25519-zebra", @@ -12941,7 +12814,7 @@ dependencies = [ "blake2", "byteorder", "digest 0.10.7", - "sha2 0.10.8", + "sha2 0.10.7", "sha3", "sp-std", "twox-hash", @@ -13026,8 +12899,8 @@ version = "7.0.0" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#bcff60a227d455d95b4712b6cb356ce56b1ff672" dependencies = [ "bytes", - "ed25519 1.5.3", - "ed25519-dalek 1.0.1", + "ed25519", + "ed25519-dalek", "futures", "libsecp256k1", "log", @@ -13397,12 +13270,6 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" -[[package]] -name = "spin" -version = "0.9.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" - [[package]] name = "spki" version = "0.6.0" @@ -13410,24 +13277,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "67cf02bbac7a337dc36e4f5a693db6c21e7863f45070f7064577eb4367a3212b" dependencies = [ "base64ct", - "der 0.6.1", -] - -[[package]] -name = "spki" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d1e996ef02c474957d681f1b05213dfb0abab947b446a62d37770b23500184a" -dependencies = [ - "base64ct", - "der 0.7.8", + "der", ] [[package]] name = "ss58-registry" -version = "1.43.0" +version = "1.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e6915280e2d0db8911e5032a5c275571af6bdded2916abd691a659be25d3439" +checksum = "eb47a8ad42e5fc72d5b1eb104a5546937eaf39843499948bb666d6e93c62423b" dependencies = [ "Inflector", "num-format", @@ -13450,21 +13307,46 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" +[[package]] +name = "static_init" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11b73400442027c4adedda20a9f9b7945234a5bd8d5f7e86da22bd5d0622369c" +dependencies = [ + "cfg_aliases", + "libc", + "parking_lot 0.11.2", + "static_init_macro 0.5.0", +] + [[package]] name = "static_init" version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a2a1c578e98c1c16fc3b8ec1328f7659a500737d7a0c6d625e73e830ff9c1f6" dependencies = [ - "bitflags 1.3.2", + "bitflags", "cfg_aliases", "libc", "parking_lot 0.11.2", "parking_lot_core 0.8.6", - "static_init_macro", + "static_init_macro 1.0.2", "winapi", ] +[[package]] +name = "static_init_macro" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2261c91034a1edc3fc4d1b80e89d82714faede0515c14a75da10cb941546bbf" +dependencies = [ + "cfg_aliases", + "memchr", + "proc-macro2", + "quote", + "syn 1.0.109", +] + [[package]] name = "static_init_macro" version = "1.0.2" @@ -13530,7 +13412,7 @@ dependencies = [ "lazy_static", "md-5", "rand 0.8.5", - "ring 0.16.20", + "ring", "subtle", "thiserror", "tokio", @@ -13566,7 +13448,7 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#bc dependencies = [ "frame-system-rpc-runtime-api", "futures", - "jsonrpsee 0.16.3", + "jsonrpsee 0.16.2", "log", "parity-scale-codec", "sc-rpc-api", @@ -13596,7 +13478,7 @@ version = "0.10.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#bcff60a227d455d95b4712b6cb356ce56b1ff672" dependencies = [ "async-trait", - "jsonrpsee 0.16.3", + "jsonrpsee 0.16.2", "log", "sc-rpc-api", "serde", @@ -13608,7 +13490,7 @@ name = "substrate-state-trie-migration-rpc" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#bcff60a227d455d95b4712b6cb356ce56b1ff672" dependencies = [ - "jsonrpsee 0.16.3", + "jsonrpsee 0.16.2", "log", "parity-scale-codec", "sc-client-api", @@ -13667,9 +13549,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.38" +version = "2.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" +checksum = "2efbeae7acf4eabd6bcdcbd11c92f45231ddda7539edc7806bd1a04a03b24616" dependencies = [ "proc-macro2", "quote", @@ -13694,7 +13576,7 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" dependencies = [ - "bitflags 1.3.2", + "bitflags", "core-foundation", "system-configuration-sys", ] @@ -13717,28 +13599,29 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "target-lexicon" -version = "0.12.11" +version = "0.12.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d0e916b1148c8e263850e1ebcbd046f333e0683c724876bb0da63ea4373dc8a" +checksum = "1b1c7f239eb94671427157bd93b3694320f3668d4e1eff08c7285366fd777fac" [[package]] name = "tempfile" -version = "3.8.0" +version = "3.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" +checksum = "31c0432476357e58790aaa47a8efb0c5138f137343f3b5f23bd36a27e3b0a6d6" dependencies = [ + "autocfg", "cfg-if", - "fastrand 2.0.1", + "fastrand", "redox_syscall 0.3.5", - "rustix 0.38.19", + "rustix 0.37.20", "windows-sys 0.48.0", ] [[package]] name = "termcolor" -version = "1.3.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6093bad37da69aab9d123a8091e4be0aa4a03e4d601ec641c327398315f62b64" +checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" dependencies = [ "winapi-util", ] @@ -13760,24 +13643,24 @@ dependencies = [ [[package]] name = "test-case" -version = "3.2.1" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8f1e820b7f1d95a0cdbf97a5df9de10e1be731983ab943e56703ac1b8e9d425" +checksum = "2a1d6e7bde536b0412f20765b76e921028059adfd1b90d8974d33fd3c91b25df" dependencies = [ - "test-case-macros 3.2.1", + "test-case-macros 3.1.0", ] [[package]] name = "test-case-core" -version = "3.2.1" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54c25e2cb8f5fcd7318157634e8838aa6f7e4715c96637f969fabaccd1ef5462" +checksum = "d10394d5d1e27794f772b6fc854c7e91a2dc26e2cbf807ad523370c2a59c0cee" dependencies = [ "cfg-if", "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.38", + "syn 1.0.109", ] [[package]] @@ -13795,14 +13678,14 @@ dependencies = [ [[package]] name = "test-case-macros" -version = "3.2.1" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37cfd7bbc88a0104e304229fba519bdc45501a30b760fb72240342f1289ad257" +checksum = "eeb9a44b1c6a54c1ba58b152797739dba2a83ca74e18168a68c980eb142f9404" dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.38", + "syn 1.0.109", "test-case-core", ] @@ -13822,22 +13705,22 @@ checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" [[package]] name = "thiserror" -version = "1.0.49" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1177e8c6d7ede7afde3585fd2513e611227efd6481bd78d2e82ba1ce16557ed4" +checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.49" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10712f02019e9288794769fba95cd6847df9874d49d871d062172f9dd41bc4cc" +checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.22", ] [[package]] @@ -13880,9 +13763,9 @@ dependencies = [ [[package]] name = "tikv-jemalloc-ctl" -version = "0.5.4" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "619bfed27d807b54f7f776b9430d4f8060e66ee138a28632ca898584d462c31c" +checksum = "e37706572f4b151dff7a0146e040804e9c26fe3a3118591112f05cf12a4216c1" dependencies = [ "libc", "paste", @@ -13891,9 +13774,9 @@ dependencies = [ [[package]] name = "tikv-jemalloc-sys" -version = "0.5.4+5.3.0-patched" +version = "0.5.3+5.3.0-patched" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9402443cb8fd499b6f327e40565234ff34dbda27460c5b47db0db77443dd85d1" +checksum = "a678df20055b43e57ef8cddde41cdfda9a3c1a060b67f4c5836dfb1d78543ba8" dependencies = [ "cc", "libc", @@ -13901,13 +13784,22 @@ dependencies = [ [[package]] name = "time" -version = "0.3.30" +version = "0.1.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a" +dependencies = [ + "libc", + "wasi 0.10.0+wasi-snapshot-preview1", + "winapi", +] + +[[package]] +name = "time" +version = "0.3.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5" +checksum = "ea9e1b3cf1243ae005d9e74085d4d542f3125458f3a81af210d901dcd7411efd" dependencies = [ - "deranged", "itoa", - "powerfmt", "serde", "time-core", "time-macros", @@ -13915,15 +13807,15 @@ dependencies = [ [[package]] name = "time-core" -version = "0.1.2" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" +checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" [[package]] name = "time-macros" -version = "0.2.15" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" +checksum = "372950940a5f07bf38dbe211d7283c9e6d7327df53794992d293e534c733d09b" dependencies = [ "time-core", ] @@ -13940,7 +13832,7 @@ dependencies = [ "pbkdf2 0.11.0", "rand 0.8.5", "rustc-hash", - "sha2 0.10.8", + "sha2 0.10.7", "thiserror", "unicode-normalization", "wasm-bindgen", @@ -13983,19 +13875,20 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.33.0" +version = "1.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f38200e3ef7995e5ef13baec2f432a6da0aa9ac495b2c0e8f3b7eec2c92d653" +checksum = "374442f06ee49c3a28a8fc9f01a2596fed7559c6b99b31279c3261778e77d84f" dependencies = [ + "autocfg", "backtrace", "bytes", "libc", "mio", "num_cpus", "parking_lot 0.12.1", - "pin-project-lite 0.2.13", + "pin-project-lite 0.2.9", "signal-hook-registry", - "socket2 0.5.4", + "socket2 0.4.9", "tokio-macros", "windows-sys 0.48.0", ] @@ -14008,7 +13901,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.22", ] [[package]] @@ -14017,19 +13910,9 @@ version = "0.23.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" dependencies = [ - "rustls 0.20.9", - "tokio", - "webpki 0.22.4", -] - -[[package]] -name = "tokio-rustls" -version = "0.24.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" -dependencies = [ - "rustls 0.21.7", + "rustls 0.20.8", "tokio", + "webpki 0.22.0", ] [[package]] @@ -14039,22 +13922,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" dependencies = [ "futures-core", - "pin-project-lite 0.2.13", + "pin-project-lite 0.2.9", "tokio", "tokio-util", ] [[package]] name = "tokio-util" -version = "0.7.9" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d68074620f57a0b21594d9735eb2e98ab38b17f80d3fcb189fca266771ca60d" +checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" dependencies = [ "bytes", "futures-core", "futures-io", "futures-sink", - "pin-project-lite 0.2.13", + "pin-project-lite 0.2.9", "tokio", "tracing", ] @@ -14076,11 +13959,11 @@ checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" [[package]] name = "toml_edit" -version = "0.19.15" +version = "0.19.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +checksum = "266f016b7f039eec8a1a80dfe6156b633d208b9fccca5e4db1d6775b0c4e34a7" dependencies = [ - "indexmap 2.0.2", + "indexmap 2.0.0", "toml_datetime", "winnow", ] @@ -14102,14 +13985,14 @@ version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f873044bf02dd1e8239e9c1293ea39dad76dc594ec16185d0a1bf31d8dc8d858" dependencies = [ - "bitflags 1.3.2", + "bitflags", "bytes", "futures-core", "futures-util", "http", "http-body", "http-range-header", - "pin-project-lite 0.2.13", + "pin-project-lite 0.2.9", "tower-layer", "tower-service", ] @@ -14128,32 +14011,33 @@ checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" [[package]] name = "tracing" -version = "0.1.39" +version = "0.1.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee2ef2af84856a50c1d430afce2fdded0a4ec7eda868db86409b4543df0797f9" +checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" dependencies = [ + "cfg-if", "log", - "pin-project-lite 0.2.13", + "pin-project-lite 0.2.9", "tracing-attributes", "tracing-core", ] [[package]] name = "tracing-attributes" -version = "0.1.27" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.22", ] [[package]] name = "tracing-core" -version = "0.1.32" +version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" dependencies = [ "once_cell", "valuable", @@ -14392,7 +14276,7 @@ dependencies = [ "log", "md-5", "rand 0.8.5", - "ring 0.16.20", + "ring", "stun", "thiserror", "tokio", @@ -14413,15 +14297,15 @@ dependencies = [ [[package]] name = "typenum" -version = "1.17.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" +checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" [[package]] name = "ucd-trie" -version = "0.1.6" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" +checksum = "9e79c4d996edb816c91e4308506774452e55e95c3c9de07b6729e17e15a5ef81" [[package]] name = "uint" @@ -14443,9 +14327,9 @@ checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94" [[package]] name = "unicase" -version = "2.7.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" +checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" dependencies = [ "version_check", ] @@ -14458,9 +14342,9 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-ident" -version = "1.0.12" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" +checksum = "b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0" [[package]] name = "unicode-normalization" @@ -14473,9 +14357,9 @@ dependencies = [ [[package]] name = "unicode-width" -version = "0.1.11" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" +checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" [[package]] name = "unicode-xid" @@ -14505,9 +14389,9 @@ dependencies = [ [[package]] name = "unsigned-varint" -version = "0.7.2" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6889a77d49f1f013504cec6bf97a2c730394adedaeb1deb5ea08949a50541105" +checksum = "d86a8dc7f45e4c1b0d30e43038c38f274e77af056aa5f74b93c2cf9eb3c1c836" dependencies = [ "asynchronous-codec", "bytes", @@ -14521,17 +14405,11 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" -[[package]] -name = "untrusted" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" - [[package]] name = "url" -version = "2.4.1" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" +checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb" dependencies = [ "form_urlencoded", "idna 0.4.0", @@ -14546,9 +14424,9 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "uuid" -version = "1.4.1" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d" +checksum = "d023da39d1fde5a8a3fe1f3e01ca9632ada0a63e9797de55a879d6e2236277be" dependencies = [ "getrandom 0.2.10", ] @@ -14597,15 +14475,15 @@ dependencies = [ [[package]] name = "waker-fn" -version = "1.1.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690" +checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" [[package]] name = "walkdir" -version = "2.4.0" +version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" +checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" dependencies = [ "same-file", "winapi-util", @@ -14626,6 +14504,12 @@ version = "0.9.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" +[[package]] +name = "wasi" +version = "0.10.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" + [[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" @@ -14653,7 +14537,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.22", "wasm-bindgen-shared", ] @@ -14687,7 +14571,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.22", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -14790,7 +14674,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "57d20cb3c59b788653d99541c646c561c9dd26506f25c0cebfe810659c54c6d7" dependencies = [ "downcast-rs", - "libm", + "libm 0.2.7", "memory_units", "num-rational", "num-traits", @@ -14854,7 +14738,7 @@ dependencies = [ "directories-next", "file-per-thread-logger", "log", - "rustix 0.35.15", + "rustix 0.35.13", "serde", "sha2 0.9.9", "toml", @@ -14917,7 +14801,7 @@ dependencies = [ "log", "object 0.29.0", "rustc-demangle", - "rustix 0.35.15", + "rustix 0.35.13", "serde", "target-lexicon", "thiserror", @@ -14935,7 +14819,7 @@ checksum = "f671b588486f5ccec8c5a3dba6b4c07eac2e66ab8c60e6f4e53717c77f709731" dependencies = [ "object 0.29.0", "once_cell", - "rustix 0.35.15", + "rustix 0.35.13", ] [[package]] @@ -14955,7 +14839,7 @@ dependencies = [ "memoffset 0.6.5", "paste", "rand 0.8.5", - "rustix 0.35.15", + "rustix 0.35.13", "thiserror", "wasmtime-asm-macros", "wasmtime-environ", @@ -14991,18 +14875,18 @@ version = "0.21.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea" dependencies = [ - "ring 0.16.20", - "untrusted 0.7.1", + "ring", + "untrusted", ] [[package]] name = "webpki" -version = "0.22.4" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed63aea5ce73d0ff405984102c42de94fc55a6b75765d621c65262469b3c9b53" +checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" dependencies = [ - "ring 0.17.4", - "untrusted 0.9.0", + "ring", + "untrusted", ] [[package]] @@ -15011,15 +14895,9 @@ version = "0.22.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87" dependencies = [ - "webpki 0.22.4", + "webpki 0.22.0", ] -[[package]] -name = "webpki-roots" -version = "0.25.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc" - [[package]] name = "webrtc" version = "0.6.0" @@ -15036,17 +14914,17 @@ dependencies = [ "rand 0.8.5", "rcgen 0.9.3", "regex", - "ring 0.16.20", + "ring", "rtcp", "rtp", "rustls 0.19.1", "sdp", "serde", "serde_json", - "sha2 0.10.8", + "sha2 0.10.7", "stun", "thiserror", - "time", + "time 0.3.22", "tokio", "turn", "url", @@ -15078,12 +14956,12 @@ dependencies = [ [[package]] name = "webrtc-dtls" -version = "0.7.2" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a00f4242f2db33307347bd5be53263c52a0331c96c14292118c9a6bb48d267" +checksum = "942be5bd85f072c3128396f6e5a9bfb93ca8c1939ded735d177b7bcba9a13d05" dependencies = [ "aes 0.6.0", - "aes-gcm 0.10.3", + "aes-gcm 0.10.2", "async-trait", "bincode", "block-modes", @@ -15095,24 +14973,25 @@ dependencies = [ "hkdf", "hmac 0.12.1", "log", + "oid-registry 0.6.1", "p256", "p384", "rand 0.8.5", "rand_core 0.6.4", - "rcgen 0.10.0", - "ring 0.16.20", + "rcgen 0.9.3", + "ring", "rustls 0.19.1", "sec1", "serde", "sha1", - "sha2 0.10.8", - "signature 1.6.4", + "sha2 0.10.7", + "signature", "subtle", "thiserror", "tokio", "webpki 0.21.4", "webrtc-util", - "x25519-dalek 2.0.0", + "x25519-dalek 2.0.0-pre.1", "x509-parser 0.13.2", ] @@ -15214,7 +15093,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "93f1db1727772c05cf7a2cfece52c3aca8045ca1e176cd517d323489aa3c6d87" dependencies = [ "async-trait", - "bitflags 1.3.2", + "bitflags", "bytes", "cc", "ipnet", @@ -15335,14 +15214,13 @@ dependencies = [ [[package]] name = "which" -version = "4.4.2" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" +checksum = "2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269" dependencies = [ "either", - "home", + "libc", "once_cell", - "rustix 0.38.19", ] [[package]] @@ -15369,9 +15247,9 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.6" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" dependencies = [ "winapi", ] @@ -15384,28 +15262,22 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows" -version = "0.48.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +checksum = "45296b64204227616fdbf2614cefa4c236b98ee64dfaaaa435207ed99fe7829f" dependencies = [ - "windows-targets", + "windows_aarch64_msvc 0.34.0", + "windows_i686_gnu 0.34.0", + "windows_i686_msvc 0.34.0", + "windows_x86_64_gnu 0.34.0", + "windows_x86_64_msvc 0.34.0", ] [[package]] name = "windows" -version = "0.51.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9" -dependencies = [ - "windows-core", - "windows-targets", -] - -[[package]] -name = "windows-core" -version = "0.51.1" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" +checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" dependencies = [ "windows-targets", ] @@ -15449,17 +15321,17 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.48.5" +version = "0.48.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" dependencies = [ - "windows_aarch64_gnullvm 0.48.5", - "windows_aarch64_msvc 0.48.5", - "windows_i686_gnu 0.48.5", - "windows_i686_msvc 0.48.5", - "windows_x86_64_gnu 0.48.5", - "windows_x86_64_gnullvm 0.48.5", - "windows_x86_64_msvc 0.48.5", + "windows_aarch64_gnullvm 0.48.0", + "windows_aarch64_msvc 0.48.0", + "windows_i686_gnu 0.48.0", + "windows_i686_msvc 0.48.0", + "windows_x86_64_gnu 0.48.0", + "windows_x86_64_gnullvm 0.48.0", + "windows_x86_64_msvc 0.48.0", ] [[package]] @@ -15470,9 +15342,15 @@ checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.48.5" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" +checksum = "17cffbe740121affb56fad0fc0e421804adf0ae00891205213b5cecd30db881d" [[package]] name = "windows_aarch64_msvc" @@ -15488,9 +15366,15 @@ checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" [[package]] name = "windows_aarch64_msvc" -version = "0.48.5" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" + +[[package]] +name = "windows_i686_gnu" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" +checksum = "2564fde759adb79129d9b4f54be42b32c89970c18ebf93124ca8870a498688ed" [[package]] name = "windows_i686_gnu" @@ -15506,9 +15390,15 @@ checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" [[package]] name = "windows_i686_gnu" -version = "0.48.5" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" + +[[package]] +name = "windows_i686_msvc" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" +checksum = "9cd9d32ba70453522332c14d38814bceeb747d80b3958676007acadd7e166956" [[package]] name = "windows_i686_msvc" @@ -15524,9 +15414,15 @@ checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" [[package]] name = "windows_i686_msvc" -version = "0.48.5" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" +checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfce6deae227ee8d356d19effc141a509cc503dfd1f850622ec4b0f84428e1f4" [[package]] name = "windows_x86_64_gnu" @@ -15542,9 +15438,9 @@ checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" [[package]] name = "windows_x86_64_gnu" -version = "0.48.5" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" +checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" [[package]] name = "windows_x86_64_gnullvm" @@ -15554,9 +15450,15 @@ checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" [[package]] name = "windows_x86_64_gnullvm" -version = "0.48.5" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" +checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d19538ccc21819d01deaf88d6a17eae6596a12e9aafdbb97916fb49896d89de9" [[package]] name = "windows_x86_64_msvc" @@ -15572,15 +15474,15 @@ checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" [[package]] name = "windows_x86_64_msvc" -version = "0.48.5" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" +checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" [[package]] name = "winnow" -version = "0.5.17" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3b801d0e0a6726477cc207f60162da452f3a95adb368399bef20a946e06f65c" +checksum = "ca0ace3845f0d96209f0375e6d367e3eb87eb65d27d445bdc9f1843a26f39448" dependencies = [ "memchr", ] @@ -15617,13 +15519,12 @@ dependencies = [ [[package]] name = "x25519-dalek" -version = "2.0.0" +version = "2.0.0-pre.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb66477291e7e8d2b0ff1bcb900bf29489a9692816d79874bea351e7a8b6de96" +checksum = "e5da623d8af10a62342bcbbb230e33e58a63255a58012f8653c578e54bab48df" dependencies = [ - "curve25519-dalek 4.1.1", + "curve25519-dalek 3.2.0", "rand_core 0.6.4", - "serde", "zeroize", ] @@ -15640,10 +15541,10 @@ dependencies = [ "lazy_static", "nom", "oid-registry 0.4.0", - "ring 0.16.20", + "ring", "rusticata-macros", "thiserror", - "time", + "time 0.3.22", ] [[package]] @@ -15661,7 +15562,7 @@ dependencies = [ "oid-registry 0.6.1", "rusticata-macros", "thiserror", - "time", + "time 0.3.22", ] [[package]] @@ -15784,7 +15685,7 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e17bb3549cc1321ae1296b9cdc2698e2b6cb1992adfa19a8c72e5b7a738f44cd" dependencies = [ - "time", + "time 0.3.22", ] [[package]] @@ -15804,7 +15705,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.22", ] [[package]] @@ -15828,10 +15729,11 @@ dependencies = [ [[package]] name = "zstd-sys" -version = "2.0.9+zstd.1.5.5" +version = "2.0.8+zstd.1.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e16efa8a874a0481a574084d34cc26fdb3b99627480f785888deb6386506656" +checksum = "5556e6ee25d32df2586c098bbfa278803692a20d0ab9565e049480d52707ec8c" dependencies = [ "cc", + "libc", "pkg-config", ] diff --git a/integration-tests/Cargo.toml b/integration-tests/Cargo.toml index 2629882c5..dff10c86f 100644 --- a/integration-tests/Cargo.toml +++ b/integration-tests/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "runtime-integration-tests" -version = "1.15.0" +version = "1.16.0" description = "Integration tests" authors = ["GalacticCouncil"] edition = "2021" diff --git a/integration-tests/src/dca.rs b/integration-tests/src/dca.rs index 9a8853439..ed15a02c8 100644 --- a/integration-tests/src/dca.rs +++ b/integration-tests/src/dca.rs @@ -10,7 +10,8 @@ use hydradx_runtime::{ AssetRegistry, Balances, Currencies, Omnipool, Router, Runtime, RuntimeEvent, RuntimeOrigin, Stableswap, Tokens, Treasury, DCA, }; -use hydradx_traits::router::{PoolType, Trade}; +use hydradx_traits::router::PoolType; +use hydradx_traits::router::Trade; use hydradx_traits::Registry; use orml_traits::MultiCurrency; use orml_traits::MultiReservableCurrency; @@ -99,6 +100,43 @@ mod omnipool { }); } + #[test] + fn buy_schedule_execution_should_work_without_route() { + TestNet::reset(); + Hydra::execute_with(|| { + //Arrange + init_omnipool_with_oracle_for_block_10(); + + let dca_budget = 1000 * UNITS; + + assert_balance!(ALICE.into(), HDX, ALICE_INITIAL_NATIVE_BALANCE); + + let amount_out = 100 * UNITS; + let no_route = vec![]; + let schedule1 = schedule_fake_with_buy_order_with_route(HDX, DAI, amount_out, dca_budget, no_route); + create_schedule(ALICE, schedule1); + + assert_balance!(ALICE.into(), HDX, ALICE_INITIAL_NATIVE_BALANCE - dca_budget); + assert_balance!(ALICE.into(), DAI, ALICE_INITIAL_DAI_BALANCE); + assert_reserved_balance!(&ALICE.into(), HDX, dca_budget); + assert_balance!(&Treasury::account_id(), HDX, TREASURY_ACCOUNT_INIT_BALANCE); + + //Act + set_relaychain_block_number(11); + + //Assert + let fee = Currencies::free_balance(HDX, &Treasury::account_id()) - TREASURY_ACCOUNT_INIT_BALANCE; + let amount_in = 140421094431120; + + assert_balance!(ALICE.into(), DAI, ALICE_INITIAL_DAI_BALANCE + amount_out); + assert_balance!(ALICE.into(), HDX, ALICE_INITIAL_NATIVE_BALANCE - dca_budget); + assert_reserved_balance!(&ALICE.into(), HDX, dca_budget - amount_in - fee); + + let treasury_balance = Currencies::free_balance(HDX, &Treasury::account_id()); + assert!(treasury_balance > TREASURY_ACCOUNT_INIT_BALANCE); + }); + } + #[test] fn buy_schedule_should_be_retried_multiple_times_then_terminated() { TestNet::reset(); @@ -493,6 +531,45 @@ mod omnipool { }); } + #[test] + fn sell_schedule_should_work_without_route() { + TestNet::reset(); + Hydra::execute_with(|| { + //Arrange + init_omnipool_with_oracle_for_block_10(); + let alice_init_hdx_balance = 5000 * UNITS; + assert_ok!(Balances::set_balance( + RuntimeOrigin::root(), + ALICE.into(), + alice_init_hdx_balance, + 0, + )); + + let dca_budget = 1000 * UNITS; + let amount_to_sell = 700 * UNITS; + let no_route = vec![]; + let schedule1 = + schedule_fake_with_sell_order_with_route(ALICE, dca_budget, HDX, DAI, amount_to_sell, no_route); + create_schedule(ALICE, schedule1); + + assert_balance!(ALICE.into(), HDX, alice_init_hdx_balance - dca_budget); + assert_balance!(ALICE.into(), DAI, ALICE_INITIAL_DAI_BALANCE); + assert_reserved_balance!(&ALICE.into(), HDX, dca_budget); + assert_balance!(&Treasury::account_id(), HDX, TREASURY_ACCOUNT_INIT_BALANCE); + + //Act + run_to_block(11, 15); + + //Assert + assert_balance!(ALICE.into(), HDX, alice_init_hdx_balance - dca_budget); + assert_reserved_balance!(&ALICE.into(), HDX, 0); + + let schedule_id = 0; + let schedule = DCA::schedules(schedule_id); + assert!(schedule.is_none()); + }); + } + #[test] fn sell_schedule_should_be_terminated_after_retries() { TestNet::reset(); @@ -2045,6 +2122,26 @@ fn schedule_fake_with_buy_order( asset_out: AssetId, amount: Balance, budget: Balance, +) -> Schedule { + schedule_fake_with_buy_order_with_route( + asset_in, + asset_out, + amount, + budget, + vec![Trade { + pool, + asset_in, + asset_out, + }], + ) +} + +fn schedule_fake_with_buy_order_with_route( + asset_in: AssetId, + asset_out: AssetId, + amount: Balance, + budget: Balance, + route: Vec>, ) -> Schedule { Schedule { owner: AccountId::from(ALICE), @@ -2058,11 +2155,7 @@ fn schedule_fake_with_buy_order( asset_out, amount_out: amount, max_amount_in: Balance::MAX, - route: create_bounded_vec(vec![Trade { - pool, - asset_in, - asset_out, - }]), + route: create_bounded_vec(route), }, } } @@ -2074,6 +2167,28 @@ fn schedule_fake_with_sell_order( asset_in: AssetId, asset_out: AssetId, amount: Balance, +) -> Schedule { + schedule_fake_with_sell_order_with_route( + owner, + total_amount, + asset_in, + asset_out, + amount, + vec![Trade { + pool, + asset_in, + asset_out, + }], + ) +} + +fn schedule_fake_with_sell_order_with_route( + owner: [u8; 32], + total_amount: Balance, + asset_in: AssetId, + asset_out: AssetId, + amount: Balance, + route: Vec>, ) -> Schedule { Schedule { owner: AccountId::from(owner), @@ -2087,11 +2202,7 @@ fn schedule_fake_with_sell_order( asset_out, amount_in: amount, min_amount_out: Balance::MIN, - route: create_bounded_vec(vec![Trade { - pool, - asset_in, - asset_out, - }]), + route: create_bounded_vec(route), }, } } diff --git a/integration-tests/src/omnipool_init.rs b/integration-tests/src/omnipool_init.rs index da18be5c8..a363f4107 100644 --- a/integration-tests/src/omnipool_init.rs +++ b/integration-tests/src/omnipool_init.rs @@ -296,7 +296,6 @@ fn removing_token_should_work_when_no_shares_remaining() { position.shares, )); - let state = pallet_omnipool::Pallet::::load_asset_state(DOT).unwrap(); let dot_balance = hydradx_runtime::Tokens::free_balance(DOT, &bob_account); assert!(dot_balance <= dot_amount); let lrna_balance = hydradx_runtime::Tokens::free_balance(LRNA, &bob_account); diff --git a/integration-tests/src/router.rs b/integration-tests/src/router.rs index e46cd5d37..2fb234ee2 100644 --- a/integration-tests/src/router.rs +++ b/integration-tests/src/router.rs @@ -21,7 +21,6 @@ use pallet_omnipool::traits::OmnipoolHooks; use pallet_omnipool::weights::WeightInfo as OmnipoolWeights; use pallet_route_executor::AmmTradeWeights; -use primitives::asset::AssetPair; use primitives::AssetId; use frame_support::{assert_noop, assert_ok}; @@ -2237,7 +2236,7 @@ fn create_lbp_pool(accumulated_asset: u32, distributed_asset: u32) { } fn get_lbp_pair_account_id(asset_a: AssetId, asset_b: AssetId) -> AccountId { - let asset_pair = AssetPair { + let asset_pair = pallet_lbp::AssetPair { asset_in: asset_a, asset_out: asset_b, }; diff --git a/integration-tests/src/xyk.rs b/integration-tests/src/xyk.rs index 882427e27..ed737e062 100644 --- a/integration-tests/src/xyk.rs +++ b/integration-tests/src/xyk.rs @@ -4,7 +4,7 @@ use crate::polkadot_test_net::*; use hydradx_runtime::{DustRemovalWhitelist, RuntimeOrigin, XYK}; use hydradx_traits::AMM; -use primitives::{asset::AssetPair, AssetId}; +use pallet_xyk::types::AssetPair; use xcm_emulator::TestExt; use frame_support::{assert_ok, traits::Contains}; diff --git a/pallets/dca/Cargo.toml b/pallets/dca/Cargo.toml index 00e5aef6a..7e50d9283 100644 --- a/pallets/dca/Cargo.toml +++ b/pallets/dca/Cargo.toml @@ -1,6 +1,6 @@ [package] name = 'pallet-dca' -version = "1.2.0" +version = "1.2.2" description = 'A pallet to manage DCA scheduling' authors = ['GalacticCouncil'] edition = '2021' diff --git a/pallets/dca/src/lib.rs b/pallets/dca/src/lib.rs index 1008a1b3f..7eb1096d2 100644 --- a/pallets/dca/src/lib.rs +++ b/pallets/dca/src/lib.rs @@ -73,8 +73,11 @@ use frame_support::{ }; use frame_system::{ensure_signed, pallet_prelude::OriginFor, Origin}; use hydradx_adapters::RelayChainBlockHashProvider; +use hydradx_traits::router::RouteProvider; use hydradx_traits::router::{AmmTradeWeights, AmountInAndOut, RouterT, Trade}; -use hydradx_traits::{NativePriceOracle, OraclePeriod, PriceOracle}; +use hydradx_traits::NativePriceOracle; +use hydradx_traits::OraclePeriod; +use hydradx_traits::PriceOracle; use orml_traits::{arithmetic::CheckedAdd, MultiCurrency, NamedMultiReservableCurrency}; use rand::rngs::StdRng; use rand::{Rng, SeedableRng}; @@ -83,6 +86,7 @@ use sp_runtime::{ traits::{BlockNumberProvider, Saturating}, ArithmeticError, BoundedVec, DispatchError, FixedPointNumber, FixedU128, Permill, }; + use sp_std::vec::Vec; use sp_std::{cmp::min, vec}; @@ -225,7 +229,16 @@ pub mod pallet { type NativePriceOracle: NativePriceOracle; ///Router implementation - type Router: RouterT, AmountInAndOut>; + type RouteExecutor: RouterT< + Self::RuntimeOrigin, + Self::AssetId, + Balance, + Trade, + AmountInAndOut, + >; + + ///Spot price provider to get the current price between two asset + type RouteProvider: RouteProvider; ///Max price difference allowed between blocks #[pallet::constant] @@ -338,8 +351,6 @@ pub mod pallet { TradeLimitReached, ///Slippage limit calculated from oracle is reached, leading to retry SlippageLimitReached, - ///The route to execute the trade on is not specified - RouteNotSpecified, ///No parent hash has been found from relay chain NoParentHashFound, ///Error that should not really happen only in case of invalid state of the schedule storage entries @@ -406,7 +417,8 @@ pub mod pallet { /// Emits `Scheduled` and `ExecutionPlanned` event when successful. /// #[pallet::call_index(0)] - #[pallet::weight(::WeightInfo::schedule() + ::AmmTradeWeights::calculate_buy_trade_amounts_weight(schedule.order.get_route()))] + #[pallet::weight(::WeightInfo::schedule() + + ::AmmTradeWeights::calculate_buy_trade_amounts_weight(&schedule.order.get_route_or_default::()))] #[transactional] pub fn schedule( origin: OriginFor, @@ -416,8 +428,6 @@ pub mod pallet { let who = ensure_signed(origin.clone())?; ensure!(who == schedule.owner, Error::::Forbidden); - ensure!(schedule.order.get_route_length() > 0, Error::::RouteNotSpecified); - let min_budget = Self::convert_native_amount_to_currency( schedule.order.get_asset_in(), T::MinBudgetInNativeCurrency::get(), @@ -431,9 +441,10 @@ pub mod pallet { let amount_in = match schedule.order { Order::Sell { amount_in, .. } => amount_in, - Order::Buy { - amount_out, ref route, .. - } => Self::get_amount_in_for_buy(&amount_out, route)?, + Order::Buy { amount_out, .. } => { + let route = schedule.order.get_route_or_default::(); + Self::get_amount_in_for_buy(&amount_out, &route)? + } }; let min_trade_amount_in_from_fee = transaction_fee.saturating_mul(FEE_MULTIPLIER_FOR_MIN_TRADE_LIMIT); ensure!( @@ -623,8 +634,9 @@ impl Pallet { asset_out, amount_in, min_amount_out, - route, + .. } => { + let route = &schedule.order.get_route_or_default::(); let remaining_amount = RemainingAmounts::::get(schedule_id).defensive_ok_or(Error::::InvalidState)?; let amount_to_sell = min(remaining_amount, *amount_in); @@ -638,8 +650,7 @@ impl Pallet { .checked_sub(slippage_amount) .ok_or(ArithmeticError::Overflow)?; - let route = route.to_vec(); - let trade_amounts = T::Router::calculate_sell_trade_amounts(&route, amount_to_sell)?; + let trade_amounts = T::RouteExecutor::calculate_sell_trade_amounts(route, amount_to_sell)?; let last_trade = trade_amounts.last().defensive_ok_or(Error::::InvalidState)?; let amount_out = last_trade.amount_out; @@ -652,7 +663,14 @@ impl Pallet { ); }; - T::Router::sell(origin, *asset_in, *asset_out, amount_to_sell, amount_out, route)?; + T::RouteExecutor::sell( + origin, + *asset_in, + *asset_out, + amount_to_sell, + amount_out, + route.to_vec(), + )?; Ok(AmountInAndOut { amount_in: amount_to_sell, @@ -664,14 +682,15 @@ impl Pallet { asset_out, amount_out, max_amount_in, - route, + .. } => { - let amount_in = Self::get_amount_in_for_buy(amount_out, route)?; + let route = schedule.order.get_route_or_default::(); + let amount_in = Self::get_amount_in_for_buy(amount_out, &route)?; Self::unallocate_amount(schedule_id, schedule, amount_in)?; let (estimated_amount_in, slippage_amount) = - Self::calculate_last_block_slippage(route, *amount_out, schedule.slippage)?; + Self::calculate_last_block_slippage(&route, *amount_out, schedule.slippage)?; let last_block_slippage_max_limit = estimated_amount_in .checked_add(slippage_amount) .ok_or(ArithmeticError::Overflow)?; @@ -685,7 +704,7 @@ impl Pallet { ); }; - T::Router::buy(origin, *asset_in, *asset_out, *amount_out, amount_in, route.to_vec())?; + T::RouteExecutor::buy(origin, *asset_in, *asset_out, *amount_out, amount_in, route.to_vec())?; Ok(AmountInAndOut { amount_in, @@ -721,8 +740,9 @@ impl Pallet { } //In buy we complete with returning leftover, in sell we sell the leftover in the next trade - if let Order::Buy { amount_out, route, .. } = &schedule.order { - let amount_to_unreserve: Balance = Self::get_amount_in_for_buy(amount_out, route)?; + if let Order::Buy { amount_out, .. } = &schedule.order { + let route = schedule.order.get_route_or_default::(); + let amount_to_unreserve: Balance = Self::get_amount_in_for_buy(amount_out, &route)?; let amount_for_next_trade: Balance = amount_to_unreserve .checked_add(transaction_fee) @@ -775,9 +795,7 @@ impl Pallet { } fn is_price_unstable(schedule: &Schedule) -> bool { - let route = match &schedule.order { - Order::Sell { route, .. } | Order::Buy { route, .. } => route, - }; + let route = &schedule.order.get_route_or_default::(); let Ok(last_block_price) = Self::get_price_from_last_block_oracle(route) else { return true; @@ -820,11 +838,8 @@ impl Pallet { diff > max_allowed_difference } - fn get_amount_in_for_buy( - amount_out: &Balance, - route: &BoundedVec, ConstU32<5>>, - ) -> Result { - let trade_amounts = T::Router::calculate_buy_trade_amounts(route.as_ref(), *amount_out)?; + fn get_amount_in_for_buy(amount_out: &Balance, route: &[Trade]) -> Result { + let trade_amounts = T::RouteExecutor::calculate_buy_trade_amounts(route, *amount_out)?; let first_trade = trade_amounts.last().defensive_ok_or(Error::::InvalidState)?; @@ -1043,9 +1058,7 @@ impl Pallet { Ok(price_from_rational) } - fn get_price_from_short_oracle( - route: &BoundedVec, ConstU32<5>>, - ) -> Result { + fn get_price_from_short_oracle(route: &[Trade]) -> Result { let price = T::OraclePriceProvider::price(route, OraclePeriod::Short).ok_or(Error::::CalculatingPriceError)?; diff --git a/pallets/dca/src/tests/mock.rs b/pallets/dca/src/tests/mock.rs index 2cec929fc..e59cdee7f 100644 --- a/pallets/dca/src/tests/mock.rs +++ b/pallets/dca/src/tests/mock.rs @@ -629,7 +629,8 @@ impl Config for Test { type WeightToFee = IdentityFee; type WeightInfo = (); type OraclePriceProvider = PriceProviderMock; - type Router = RouteExecutor; + type RouteExecutor = RouteExecutor; + type RouteProvider = DefaultRouteProvider; type MaxPriceDifferenceBetweenBlocks = OmnipoolMaxAllowedPriceDifference; type NamedReserveId = NamedReserveId; type MaxNumberOfRetriesOnError = MaxNumberOfRetriesOnError; @@ -648,6 +649,10 @@ impl NativePriceOracle for NativePriceOracleMock { } } +pub struct DefaultRouteProvider; + +impl RouteProvider for DefaultRouteProvider {} + pub struct ParentHashGetterMock {} impl RelayChainBlockHashProvider for ParentHashGetterMock { @@ -662,7 +667,7 @@ use frame_system::pallet_prelude::OriginFor; use hydra_dx_math::ema::EmaPrice; use hydra_dx_math::to_u128_wrapper; use hydra_dx_math::types::Ratio; -use hydradx_traits::router::{ExecutorError, PoolType, Trade, TradeExecution}; +use hydradx_traits::router::{ExecutorError, PoolType, RouteProvider, Trade, TradeExecution}; use pallet_omnipool::traits::ExternalPriceProvider; use rand::prelude::StdRng; use rand::SeedableRng; diff --git a/pallets/dca/src/tests/mod.rs b/pallets/dca/src/tests/mod.rs index 940f9c0d6..9336d1007 100644 --- a/pallets/dca/src/tests/mod.rs +++ b/pallets/dca/src/tests/mod.rs @@ -1,6 +1,7 @@ use crate::tests::mock::*; use crate::{Balance, Order, Schedule, ScheduleId}; -use hydradx_traits::router::{PoolType, Trade}; +use hydradx_traits::router::PoolType; +use hydradx_traits::router::Trade; use sp_runtime::traits::ConstU32; use sp_runtime::{BoundedVec, Permill}; diff --git a/pallets/dca/src/tests/on_initialize.rs b/pallets/dca/src/tests/on_initialize.rs index 4b66adef2..df6e560d5 100644 --- a/pallets/dca/src/tests/on_initialize.rs +++ b/pallets/dca/src/tests/on_initialize.rs @@ -480,6 +480,46 @@ fn full_sell_dca_should_be_completed_with_selling_leftover_in_last_trade() { }); } +#[test] +fn full_sell_dca_should_be_completed_when_default_routes_used() { + ExtBuilder::default() + .with_endowed_accounts(vec![(ALICE, HDX, 10000 * ONE)]) + .build() + .execute_with(|| { + //Arrange + proceed_to_blocknumber(1, 500); + + let total_amount = 3 * *AMOUNT_OUT_FOR_OMNIPOOL_SELL; + let amount_to_sell = *AMOUNT_OUT_FOR_OMNIPOOL_SELL; + + let schedule = ScheduleBuilder::new() + .with_total_amount(total_amount) + .with_period(ONE_HUNDRED_BLOCKS) + .with_order(Order::Sell { + asset_in: HDX, + asset_out: BTC, + amount_in: amount_to_sell, + min_amount_out: Balance::MIN, + route: create_bounded_vec(vec![]), + }) + .build(); + + assert_ok!(DCA::schedule(RuntimeOrigin::signed(ALICE), schedule, Option::None)); + assert_eq!(total_amount, Currencies::reserved_balance(HDX, &ALICE)); + + //Act + proceed_to_blocknumber(501, 801); + + //Assert + assert_eq!(0, Currencies::reserved_balance(HDX, &ALICE)); + + assert_number_of_executed_sell_trades!(3); + + let schedule_id = 0; + assert_that_dca_is_completed(ALICE, schedule_id); + }); +} + #[test] fn full_sell_dca_should_be_completed_when_some_successful_dca_execution_happened_but_less_than_fee_left() { ExtBuilder::default() @@ -525,6 +565,48 @@ fn full_sell_dca_should_be_completed_when_some_successful_dca_execution_happened }); } +#[test] +fn full_buy_should_be_completed_when_with_default_routes() { + ExtBuilder::default() + .with_endowed_accounts(vec![(ALICE, HDX, 10000 * ONE)]) + .build() + .execute_with(|| { + //Arrange + proceed_to_blocknumber(1, 500); + + let total_amount = 3 * CALCULATED_AMOUNT_IN_FOR_OMNIPOOL_BUY; + let amount_to_buy = 10 * ONE; + + let schedule = ScheduleBuilder::new() + .with_total_amount(total_amount) + .with_period(ONE_HUNDRED_BLOCKS) + .with_slippage(Some(Permill::from_percent(20))) + .with_order(Order::Buy { + asset_in: HDX, + asset_out: BTC, + amount_out: amount_to_buy, + max_amount_in: Balance::MAX, + route: create_bounded_vec(vec![]), + }) + .build(); + + assert_ok!(DCA::schedule(RuntimeOrigin::signed(ALICE), schedule, Option::None)); + assert_eq!(total_amount, Currencies::reserved_balance(HDX, &ALICE)); + + //Act + proceed_to_blocknumber(501, 1001); + + //Assert + assert_eq!(0, Currencies::reserved_balance(HDX, &ALICE)); + + assert_number_of_executed_buy_trades!(2); + assert_balance!(ALICE, BTC, 2 * CALCULATED_AMOUNT_IN_FOR_OMNIPOOL_BUY); + + let schedule_id = 0; + assert_that_dca_is_completed(ALICE, schedule_id); + }); +} + #[test] fn full_buy_dca_should_be_completed_when_some_successful_dca_execution_happened_but_less_than_fee_left() { ExtBuilder::default() diff --git a/pallets/dca/src/tests/schedule.rs b/pallets/dca/src/tests/schedule.rs index 9f1a84c63..be1305e14 100644 --- a/pallets/dca/src/tests/schedule.rs +++ b/pallets/dca/src/tests/schedule.rs @@ -839,12 +839,13 @@ fn schedule_should_fail_when_wrong_user_is_specified_in_schedule() { } #[test] -fn schedule_should_fail_when_no_routes_specified() { +fn schedule_should_be_created_when_no_routes_specified() { ExtBuilder::default() .with_endowed_accounts(vec![(ALICE, HDX, 10000 * ONE)]) .build() .execute_with(|| { //Arrange + set_block_number(500); let total_amount = 100 * ONE; let schedule = ScheduleBuilder::new() @@ -858,12 +859,8 @@ fn schedule_should_fail_when_no_routes_specified() { }) .build(); - //Act - set_block_number(500); - assert_noop!( - DCA::schedule(RuntimeOrigin::signed(ALICE), schedule, Option::None), - Error::::RouteNotSpecified - ); + //Act and assert + assert_ok!(DCA::schedule(RuntimeOrigin::signed(ALICE), schedule, Option::None)); }); } diff --git a/pallets/dca/src/types.rs b/pallets/dca/src/types.rs index 2968d8903..8c9d7f100 100644 --- a/pallets/dca/src/types.rs +++ b/pallets/dca/src/types.rs @@ -1,8 +1,9 @@ use codec::{Decode, Encode, MaxEncodedLen}; -use hydradx_traits::router::Trade; +use hydradx_traits::router::{RouteProvider, Trade}; use scale_info::TypeInfo; use sp_runtime::traits::ConstU32; use sp_runtime::{BoundedVec, Permill}; +use sp_std::vec::Vec; pub type Balance = u128; pub type ScheduleId = u32; @@ -71,14 +72,15 @@ where *asset_out } - pub fn get_route(&self) -> &BoundedVec, ConstU32<5>> { - match &self { + pub fn get_route_or_default>(&self) -> Vec> { + let route = match &self { Order::Sell { route, .. } => route, Order::Buy { route, .. } => route, + }; + if route.is_empty() { + Provider::get(self.get_asset_in(), self.get_asset_out()) + } else { + route.to_vec() } } - - pub fn get_route_length(&self) -> usize { - self.get_route().len() - } } diff --git a/pallets/lbp/Cargo.toml b/pallets/lbp/Cargo.toml index 72c7b5861..61d072fc9 100644 --- a/pallets/lbp/Cargo.toml +++ b/pallets/lbp/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "pallet-lbp" -version = "4.6.16" +version = "4.7.0" description = "HydraDX Liquidity Bootstrapping Pool Pallet" authors = ["GalacticCouncil"] edition = "2021" @@ -23,7 +23,6 @@ serde = { features = ["derive"], optional = true, version = "1.0.136" } ## Local dependencies hydra-dx-math = { workspace = true } hydradx-traits = { workspace = true } -primitives = { workspace = true } ## ORML dependencies orml-traits = { workspace = true } @@ -63,7 +62,6 @@ std = [ "sp-runtime/std", "sp-core/std", "sp-std/std", - "primitives/std", "hydradx-traits/std", "scale-info/std", "hydra-dx-math/std", diff --git a/pallets/lbp/src/benchmarking.rs b/pallets/lbp/src/benchmarking.rs index e9bba5295..f00406ede 100644 --- a/pallets/lbp/src/benchmarking.rs +++ b/pallets/lbp/src/benchmarking.rs @@ -20,7 +20,6 @@ use super::*; use crate::Pallet as LBP; use hydradx_traits::router::{PoolType, TradeExecution}; -use primitives::AssetId; use frame_benchmarking::{account, benchmarks}; use frame_system::RawOrigin; diff --git a/pallets/lbp/src/lib.rs b/pallets/lbp/src/lib.rs index 01a551dc5..9e18755c4 100644 --- a/pallets/lbp/src/lib.rs +++ b/pallets/lbp/src/lib.rs @@ -21,6 +21,7 @@ #![allow(clippy::type_complexity)] #![allow(clippy::too_many_arguments)] +pub use crate::types::{Amount, AssetId, AssetPair, Balance}; use codec::{Decode, Encode, MaxEncodedLen}; use frame_support::sp_runtime::{ traits::{AtLeast32BitUnsigned, BlockNumberProvider, Saturating, Zero}, @@ -36,7 +37,6 @@ use frame_system::ensure_signed; use hydra_dx_math::types::LBPWeight; use hydradx_traits::{AMMTransfer, AssetPairAccountIdFor, CanCreatePool, LockedBalance, AMM}; use orml_traits::{MultiCurrency, MultiCurrencyExtended, MultiLockableCurrency}; -use primitives::{asset::AssetPair, Amount, AssetId, Balance}; use scale_info::TypeInfo; @@ -58,7 +58,9 @@ pub mod weights; #[cfg(test)] mod invariants; + mod trade_execution; +pub mod types; use weights::WeightInfo; // Re-export pallet items so that they can be accessed from the crate namespace. diff --git a/pallets/lbp/src/mock.rs b/pallets/lbp/src/mock.rs index 6f247e052..97d27507e 100644 --- a/pallets/lbp/src/mock.rs +++ b/pallets/lbp/src/mock.rs @@ -2,12 +2,14 @@ use super::*; use crate as lbp; -use crate::{AssetPairAccountIdFor, Config}; +use crate::{ + types::{AssetId, AssetPair, Balance}, + AssetPairAccountIdFor, Config, +}; use frame_support::parameter_types; use frame_support::traits::{Everything, GenesisBuild, LockIdentifier, Nothing}; use hydradx_traits::LockedBalance; use orml_traits::parameter_type_with_key; -use primitives::constants::chain::{AssetId, Balance, CORE_ASSET_ID}; use sp_core::H256; use sp_runtime::{ testing::Header, @@ -28,7 +30,7 @@ pub const ALICE: AccountId = 1; pub const BOB: AccountId = 2; pub const CHARLIE: AccountId = 3; -pub const HDX: AssetId = CORE_ASSET_ID; +pub const HDX: AssetId = 0; pub const KUSD: AssetId = 2_000; pub const BSX: AssetId = 3_000; pub const ETH: AssetId = 4_000; @@ -151,7 +153,7 @@ impl AssetPairAccountIdFor for AssetPairAccountIdTest { } parameter_types! { - pub const NativeAssetId: AssetId = CORE_ASSET_ID; + pub const NativeAssetId: AssetId = HDX; pub const MinTradingLimit: Balance = 1_000; pub const MinPoolLiquidity: Balance = 1_000; pub const MaxInRatio: u128 = 3; diff --git a/pallets/lbp/src/tests.rs b/pallets/lbp/src/tests.rs index 2ea4b6ee4..c77bfbc9e 100644 --- a/pallets/lbp/src/tests.rs +++ b/pallets/lbp/src/tests.rs @@ -31,9 +31,6 @@ use hydradx_traits::{AMMTransfer, LockedBalance}; use sp_runtime::traits::BadOrigin; use sp_std::convert::TryInto; -use primitives::asset::AssetPair; -use primitives::constants::chain::CORE_ASSET_ID; - pub fn new_test_ext() -> sp_io::TestExternalities { let mut ext = ExtBuilder::default().build(); ext.execute_with(|| set_block_number::(1)); @@ -2317,12 +2314,12 @@ fn buy_should_work() { .into(), frame_system::Event::NewAccount { account: pool_id2 }.into(), mock::RuntimeEvent::Currency(orml_tokens::Event::Endowed { - currency_id: CORE_ASSET_ID, + currency_id: HDX, who: HDX_BSX_POOL_ID, amount: 1000000000, }), mock::RuntimeEvent::Currency(orml_tokens::Event::Transfer { - currency_id: CORE_ASSET_ID, + currency_id: HDX, from: ALICE, to: HDX_BSX_POOL_ID, amount: 1000000000, @@ -2544,12 +2541,12 @@ fn sell_should_work() { .into(), frame_system::Event::NewAccount { account: pool_id2 }.into(), mock::RuntimeEvent::Currency(orml_tokens::Event::Endowed { - currency_id: CORE_ASSET_ID, + currency_id: HDX, who: HDX_BSX_POOL_ID, amount: 1000000000, }), mock::RuntimeEvent::Currency(orml_tokens::Event::Transfer { - currency_id: CORE_ASSET_ID, + currency_id: HDX, from: ALICE, to: HDX_BSX_POOL_ID, amount: 1000000000, diff --git a/pallets/lbp/src/trade_execution.rs b/pallets/lbp/src/trade_execution.rs index 3a0bc1c07..1acaf276d 100644 --- a/pallets/lbp/src/trade_execution.rs +++ b/pallets/lbp/src/trade_execution.rs @@ -1,9 +1,7 @@ -use crate::{Config, Error, Pallet, PoolData}; +use crate::*; use hydradx_traits::router::{ExecutorError, PoolType, TradeExecution}; use hydradx_traits::AMM; use orml_traits::MultiCurrency; -use primitives::asset::AssetPair; -use primitives::{AssetId, Balance}; use sp_runtime::traits::BlockNumberProvider; use sp_runtime::DispatchError; diff --git a/primitives/src/asset.rs b/pallets/lbp/src/types.rs similarity index 94% rename from primitives/src/asset.rs rename to pallets/lbp/src/types.rs index 534be4e0c..63c51add9 100644 --- a/primitives/src/asset.rs +++ b/pallets/lbp/src/types.rs @@ -1,4 +1,4 @@ -// This file is part of Basilisk-node. +// This file is part of HydraDX-node. // Copyright (C) 2020-2022 Intergalactic, Limited (GIB). // SPDX-License-Identifier: Apache-2.0 @@ -15,13 +15,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -use crate::AssetId; +pub type AssetId = u32; +pub type Amount = i128; +pub type Balance = u128; use codec::{Decode, Encode}; - -use sp_std::vec::Vec; - use scale_info::TypeInfo; +use sp_std::vec::Vec; #[cfg(feature = "std")] use serde::{Deserialize, Serialize}; @@ -42,6 +42,7 @@ impl AssetPair { pub fn new(asset_in: AssetId, asset_out: AssetId) -> Self { Self { asset_in, asset_out } } + /// Return ordered asset tuple (A,B) where A < B /// Used in storage pub fn ordered_pair(&self) -> (AssetId, AssetId) { diff --git a/pallets/xyk/Cargo.toml b/pallets/xyk/Cargo.toml index 4c88f9acc..f9a07717a 100644 --- a/pallets/xyk/Cargo.toml +++ b/pallets/xyk/Cargo.toml @@ -1,6 +1,6 @@ [package] name = 'pallet-xyk' -version = "6.2.10" +version = "6.3.1" description = 'XYK automated market maker' authors = ['GalacticCouncil'] edition = '2021' @@ -23,9 +23,6 @@ log = { version = "0.4.17", default-features = false } hydra-dx-math = { workspace = true } -# Local dependencies -primitives = {path = '../../primitives', default-features = false} - # ORML dependencies orml-tokens = { workspace = true } orml-traits = { workspace = true } @@ -65,7 +62,6 @@ std = [ 'sp-core/std', 'sp-std/std', 'orml-traits/std', - 'primitives/std', "hydradx-traits/std", 'orml-tokens/std', 'frame-benchmarking/std', diff --git a/pallets/xyk/src/benchmarking.rs b/pallets/xyk/src/benchmarking.rs index 6b6acc765..f8835aa7e 100644 --- a/pallets/xyk/src/benchmarking.rs +++ b/pallets/xyk/src/benchmarking.rs @@ -25,8 +25,8 @@ use sp_std::prelude::*; use crate::Pallet as XYK; +use crate::types::{AssetId, Balance}; use hydradx_traits::router::{PoolType, TradeExecution}; -use primitives::{AssetId, Balance}; const SEED: u32 = 1; diff --git a/pallets/xyk/src/impls.rs b/pallets/xyk/src/impls.rs index 8bba9f9a6..41f8a3ca0 100644 --- a/pallets/xyk/src/impls.rs +++ b/pallets/xyk/src/impls.rs @@ -1,8 +1,7 @@ +use crate::types::{AssetId, AssetPair, Price}; use hydradx_traits::pools::SpotPriceProvider; use hydradx_traits::AMM; use orml_traits::MultiCurrency; -use primitives::asset::AssetPair; -use primitives::{AssetId, Price}; use sp_runtime::FixedPointNumber; use sp_std::marker::PhantomData; diff --git a/pallets/xyk/src/lib.rs b/pallets/xyk/src/lib.rs index 9e442e140..69979508f 100644 --- a/pallets/xyk/src/lib.rs +++ b/pallets/xyk/src/lib.rs @@ -35,12 +35,11 @@ use hydradx_traits::{ AMMPosition, AMMTransfer, AssetPairAccountIdFor, CanCreatePool, OnCreatePoolHandler, OnLiquidityChangedHandler, OnTradeHandler, Source, AMM, }; -use primitives::{asset::AssetPair, AssetId, Balance}; use sp_std::{vec, vec::Vec}; +use crate::types::{Amount, AssetId, AssetPair, Balance}; use hydra_dx_math::ratio::Ratio; use orml_traits::{MultiCurrency, MultiCurrencyExtended}; -use primitives::Amount; #[cfg(test)] mod tests; @@ -49,15 +48,13 @@ mod benchmarking; mod impls; mod trade_execution; +pub mod types; pub mod weights; pub use impls::XYKSpotPrice; use weights::WeightInfo; -/// Oracle source identifier for this pallet. -pub const SOURCE: Source = *b"hydraxyk"; - // Re-export pallet items so that they can be accessed from the crate namespace. pub use pallet::*; @@ -114,6 +111,10 @@ pub mod pallet { #[pallet::constant] type MaxOutRatio: Get; + /// Oracle source identifier for this pallet. + #[pallet::constant] + type OracleSource: Get; + /// Called to ensure that pool can be created type CanCreatePool: CanCreatePool; @@ -461,7 +462,7 @@ pub mod pallet { let liquidity_a = T::Currency::total_balance(asset_a, &pair_account); let liquidity_b = T::Currency::total_balance(asset_b, &pair_account); T::AMMHandler::on_liquidity_changed( - SOURCE, + T::OracleSource::get(), asset_a, asset_b, amount_a, @@ -567,7 +568,7 @@ pub mod pallet { let liquidity_a = T::Currency::total_balance(asset_a, &pair_account); let liquidity_b = T::Currency::total_balance(asset_b, &pair_account); T::AMMHandler::on_liquidity_changed( - SOURCE, + T::OracleSource::get(), asset_a, asset_b, remove_amount_a, @@ -870,7 +871,7 @@ impl AMM for Pallet { let liquidity_in = T::Currency::total_balance(transfer.assets.asset_in, &pair_account); let liquidity_out = T::Currency::total_balance(transfer.assets.asset_out, &pair_account); T::AMMHandler::on_trade( - SOURCE, + T::OracleSource::get(), transfer.assets.asset_in, transfer.assets.asset_out, transfer.amount, @@ -1032,7 +1033,7 @@ impl AMM for Pallet { let liquidity_in = T::Currency::total_balance(transfer.assets.asset_in, &pair_account); let liquidity_out = T::Currency::total_balance(transfer.assets.asset_out, &pair_account); T::AMMHandler::on_trade( - SOURCE, + T::OracleSource::get(), transfer.assets.asset_in, transfer.assets.asset_out, transfer.amount, diff --git a/pallets/xyk/src/tests/amm_position.rs b/pallets/xyk/src/tests/amm_position.rs index b04b73da1..65196d4d3 100644 --- a/pallets/xyk/src/tests/amm_position.rs +++ b/pallets/xyk/src/tests/amm_position.rs @@ -1,7 +1,7 @@ use super::mock::*; +use crate::types::AssetPair; use crate::*; use frame_support::assert_ok; -use primitives::asset::AssetPair; #[test] fn get_liquidity_behind_shares_should_return_both_assets_value_when_pool_exists() { diff --git a/pallets/xyk/src/tests/creation.rs b/pallets/xyk/src/tests/creation.rs index fb4e56ba2..30e2a67fa 100644 --- a/pallets/xyk/src/tests/creation.rs +++ b/pallets/xyk/src/tests/creation.rs @@ -7,7 +7,7 @@ use orml_traits::MultiCurrency; use pallet_asset_registry::AssetType; use sp_std::convert::TryInto; -use primitives::asset::AssetPair; +use crate::types::AssetPair; #[test] fn create_pool_should_work() { diff --git a/pallets/xyk/src/tests/fees.rs b/pallets/xyk/src/tests/fees.rs index 07477e8f4..49937e3a8 100644 --- a/pallets/xyk/src/tests/fees.rs +++ b/pallets/xyk/src/tests/fees.rs @@ -4,7 +4,7 @@ use frame_support::{assert_noop, assert_ok}; use hydradx_traits::AMM as AmmPool; use orml_traits::MultiCurrency; -use primitives::asset::AssetPair; +use crate::types::AssetPair; #[test] fn fee_calculation() { diff --git a/pallets/xyk/src/tests/liquidity.rs b/pallets/xyk/src/tests/liquidity.rs index 7a5438387..2e2ac8e40 100644 --- a/pallets/xyk/src/tests/liquidity.rs +++ b/pallets/xyk/src/tests/liquidity.rs @@ -1,12 +1,10 @@ pub use super::mock::*; +use crate::types::{AssetPair, Balance}; use crate::{Error, Event}; use frame_support::{assert_noop, assert_ok}; use hydradx_traits::AMM as AmmPool; use orml_traits::MultiCurrency; -use primitives::asset::AssetPair; -use primitives::Balance; - #[test] fn add_liquidity_should_work() { new_test_ext().execute_with(|| { diff --git a/pallets/xyk/src/tests/mock.rs b/pallets/xyk/src/tests/mock.rs index a376fa2aa..9823f1e67 100644 --- a/pallets/xyk/src/tests/mock.rs +++ b/pallets/xyk/src/tests/mock.rs @@ -27,9 +27,9 @@ use sp_runtime::{ traits::{BlakeTwo256, IdentityLookup, One}, }; +use crate::types::{AssetId, Balance}; use frame_support::traits::{Everything, GenesisBuild, Get, Nothing}; -use hydradx_traits::{AssetPairAccountIdFor, CanCreatePool}; -use primitives::{AssetId, Balance}; +use hydradx_traits::{AssetPairAccountIdFor, CanCreatePool, Source}; use frame_system::EnsureSigned; use hydradx_traits::pools::DustRemovalAccountWhitelist; @@ -181,6 +181,7 @@ parameter_types! { pub MaxOutRatio: u128 = MaximumOutRatio::get(); pub ExchangeFeeRate: (u32, u32) = ExchangeFee::get(); pub DiscountedFeeRate: (u32, u32) = DiscountedFee::get(); + pub const OracleSourceIdentifier: Source = *b"hydraxyk"; } pub struct Disallow10_10Pool(); @@ -207,6 +208,7 @@ impl Config for Test { type AMMHandler = (); type DiscountedFee = DiscountedFeeRate; type NonDustableWhitelistHandler = Whitelist; + type OracleSource = OracleSourceIdentifier; } pub struct ExtBuilder { diff --git a/pallets/xyk/src/tests/spot_price.rs b/pallets/xyk/src/tests/spot_price.rs index 66bf37eba..b24eea24e 100644 --- a/pallets/xyk/src/tests/spot_price.rs +++ b/pallets/xyk/src/tests/spot_price.rs @@ -1,11 +1,10 @@ use super::mock::*; +use crate::types::{AssetPair, Price}; use crate::XYKSpotPrice; use crate::*; use frame_support::assert_ok; use frame_support::dispatch::RawOrigin; use hydradx_traits::pools::SpotPriceProvider; -use primitives::asset::AssetPair; -use primitives::Price; #[test] fn spot_price_provider_should_return_correct_price_when_pool_exists() { diff --git a/pallets/xyk/src/tests/trades.rs b/pallets/xyk/src/tests/trades.rs index 5c51c2d9b..55c05d925 100644 --- a/pallets/xyk/src/tests/trades.rs +++ b/pallets/xyk/src/tests/trades.rs @@ -4,7 +4,7 @@ use frame_support::{assert_noop, assert_ok}; use hydradx_traits::AMM as AmmPool; use orml_traits::MultiCurrency; -use primitives::asset::AssetPair; +use crate::types::AssetPair; #[test] fn sell_test() { diff --git a/pallets/xyk/src/trade_execution.rs b/pallets/xyk/src/trade_execution.rs index 6722ed711..c0d77218e 100644 --- a/pallets/xyk/src/trade_execution.rs +++ b/pallets/xyk/src/trade_execution.rs @@ -1,11 +1,10 @@ +use crate::types::{AssetId, AssetPair, Balance}; use crate::{Config, Error, Pallet}; use frame_support::ensure; use frame_support::traits::Get; use hydradx_traits::router::{ExecutorError, PoolType, TradeExecution}; use hydradx_traits::AMM; use orml_traits::MultiCurrency; -use primitives::asset::AssetPair; -use primitives::{AssetId, Balance}; use sp_runtime::DispatchError; impl TradeExecution for Pallet { diff --git a/pallets/xyk/src/types.rs b/pallets/xyk/src/types.rs new file mode 100644 index 000000000..ce20f6aa3 --- /dev/null +++ b/pallets/xyk/src/types.rs @@ -0,0 +1,69 @@ +// This file is part of Basilisk-node. + +// Copyright (C) 2020-2022 Intergalactic, Limited (GIB). +// SPDX-License-Identifier: Apache-2.0 + +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +pub type AssetId = u32; +pub type Amount = i128; +pub type Balance = u128; +pub type Price = FixedU128; + +use codec::{Decode, Encode}; +use scale_info::TypeInfo; +use sp_runtime::FixedU128; +use sp_std::vec::Vec; + +#[cfg(feature = "std")] +use serde::{Deserialize, Serialize}; + +/// Asset Pair representation for AMM trades +/// ( asset_a, asset_b ) combination where asset_a is meant to be exchanged for asset_b +/// +/// asset_in represents asset coming into the pool +/// asset_out represents asset coming out of the pool +#[cfg_attr(feature = "std", derive(Serialize, Deserialize))] +#[derive(Debug, Encode, Decode, Copy, Clone, PartialEq, Eq, Default, TypeInfo)] +pub struct AssetPair { + pub asset_in: AssetId, + pub asset_out: AssetId, +} + +impl AssetPair { + pub fn new(asset_in: AssetId, asset_out: AssetId) -> Self { + Self { asset_in, asset_out } + } + + /// Return ordered asset tuple (A,B) where A < B + /// Used in storage + pub fn ordered_pair(&self) -> (AssetId, AssetId) { + match self.asset_in <= self.asset_out { + true => (self.asset_in, self.asset_out), + false => (self.asset_out, self.asset_in), + } + } + + /// Return share token name + pub fn name(&self) -> Vec { + let mut buf: Vec = Vec::new(); + + let (asset_a, asset_b) = self.ordered_pair(); + + buf.extend_from_slice(&asset_a.to_le_bytes()); + buf.extend_from_slice(b"HDT"); + buf.extend_from_slice(&asset_b.to_le_bytes()); + + buf + } +} diff --git a/primitives/Cargo.toml b/primitives/Cargo.toml index d775fc942..4cbb432c3 100644 --- a/primitives/Cargo.toml +++ b/primitives/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "primitives" -version = "5.8.5" +version = "6.0.0" authors = ["GalacticCouncil"] edition = "2021" repository = "https://github.com/galacticcouncil/HydraDX-node" diff --git a/primitives/src/lib.rs b/primitives/src/lib.rs index a165cbbd8..9fe493c72 100644 --- a/primitives/src/lib.rs +++ b/primitives/src/lib.rs @@ -27,7 +27,6 @@ use frame_support::sp_runtime::{ MultiSignature, }; -pub mod asset; pub mod constants; /// An index to a block. diff --git a/runtime/adapters/src/lib.rs b/runtime/adapters/src/lib.rs index 12c4ddf84..2e82f43d9 100644 --- a/runtime/adapters/src/lib.rs +++ b/runtime/adapters/src/lib.rs @@ -566,6 +566,10 @@ where prices.push(price); } + if prices.is_empty() { + return None; + } + let nominator = prices .iter() .try_fold(U512::from(1u128), |acc, price| acc.checked_mul(U512::from(price.n)))?; diff --git a/runtime/hydradx/Cargo.toml b/runtime/hydradx/Cargo.toml index d3fd8f38a..4dfd4c5dd 100644 --- a/runtime/hydradx/Cargo.toml +++ b/runtime/hydradx/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "hydradx-runtime" -version = "185.0.0" +version = "188.0.0" authors = ["GalacticCouncil"] edition = "2021" license = "Apache 2.0" diff --git a/runtime/hydradx/src/assets.rs b/runtime/hydradx/src/assets.rs index f8c922620..f9016c93a 100644 --- a/runtime/hydradx/src/assets.rs +++ b/runtime/hydradx/src/assets.rs @@ -51,7 +51,7 @@ use frame_support::{ BoundedVec, PalletId, }; use frame_system::{EnsureRoot, EnsureSigned, RawOrigin}; -use hydradx_traits::router::Trade; +use hydradx_traits::router::{RouteProvider, Trade}; use orml_traits::currency::MutationHooks; use orml_traits::GetByKey; use pallet_dynamic_fees::types::FeeParams; @@ -470,9 +470,10 @@ impl pallet_dca::Config for Runtime { #[cfg(feature = "runtime-benchmarks")] type OraclePriceProvider = DummyOraclePriceProvider; #[cfg(not(feature = "runtime-benchmarks"))] - type Router = Router; + type RouteExecutor = Router; #[cfg(feature = "runtime-benchmarks")] - type Router = pallet_route_executor::DummyRouter; + type RouteExecutor = pallet_route_executor::DummyRouter; + type RouteProvider = Runtime; type MaxPriceDifferenceBetweenBlocks = MaxPriceDifference; type MaxSchedulePerBlock = MaxSchedulesPerBlock; type MaxNumberOfRetriesOnError = MaxNumberOfRetriesOnError; @@ -487,6 +488,9 @@ impl pallet_dca::Config for Runtime { type NativePriceOracle = MultiTransactionPayment; } +//Using the default implementation, will be replaced with the real implementation once we have routes stored +impl RouteProvider for Runtime {} + // Provides weight info for the router. Router extrinsics can be executed with different AMMs, so we split the router weights into two parts: // the router extrinsic overhead and the AMM weight. pub struct RouterWeightInfo; @@ -906,6 +910,7 @@ impl pallet_lbp::Config for Runtime { parameter_types! { pub XYKExchangeFee: (u32, u32) = (3, 1_000); pub const DiscountedFee: (u32, u32) = (7, 10_000); + pub const XYKOracleSourceIdentifier: Source = *b"hydraxyk"; } impl pallet_xyk::Config for Runtime { @@ -924,4 +929,5 @@ impl pallet_xyk::Config for Runtime { type AMMHandler = pallet_ema_oracle::OnActivityHandler; type DiscountedFee = DiscountedFee; type NonDustableWhitelistHandler = Duster; + type OracleSource = XYKOracleSourceIdentifier; } diff --git a/runtime/hydradx/src/lib.rs b/runtime/hydradx/src/lib.rs index b6b2ddf59..f2eaf84bc 100644 --- a/runtime/hydradx/src/lib.rs +++ b/runtime/hydradx/src/lib.rs @@ -99,7 +99,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { spec_name: create_runtime_str!("hydradx"), impl_name: create_runtime_str!("hydradx"), authoring_version: 1, - spec_version: 185, + spec_version: 188, impl_version: 0, apis: RUNTIME_API_VERSIONS, transaction_version: 1, diff --git a/traits/src/router.rs b/traits/src/router.rs index ed17e69c7..afe8ae0f0 100644 --- a/traits/src/router.rs +++ b/traits/src/router.rs @@ -2,7 +2,17 @@ use codec::{Decode, Encode, MaxEncodedLen}; use frame_support::sp_runtime::{DispatchError, DispatchResult}; use frame_support::weights::Weight; use scale_info::TypeInfo; +use sp_std::vec; use sp_std::vec::Vec; +pub trait RouteProvider { + fn get(asset_in: AssetId, asset_out: AssetId) -> Vec> { + vec![Trade { + pool: PoolType::Omnipool, + asset_in, + asset_out, + }] + } +} #[derive(Encode, Decode, Clone, Copy, Debug, Eq, PartialEq, TypeInfo, MaxEncodedLen)] pub enum PoolType {