From 3db2d69b40f9b4fe88c869566aedaf56752f4e9b Mon Sep 17 00:00:00 2001 From: Alistair Singh Date: Sun, 2 Apr 2023 12:00:02 +0200 Subject: [PATCH] Use `master` branches for parity dependencies (#796) * changed dependencies to use master * reverted cargo.lock to main * fixed cargo lock * remove deprecated generate_store macro * removed deprecated Weights::from_ref_time * use crate versions from bridge hub * removed unused xcm support libs * use the correct branch --- cumulus | 2 +- parachain/Cargo.lock | 802 +++++++++++------- parachain/pallets/basic-channel/Cargo.toml | 22 +- .../basic-channel/merkle-proof/Cargo.toml | 4 +- .../pallets/basic-channel/rpc/Cargo.toml | 6 +- .../pallets/basic-channel/src/inbound/mod.rs | 1 - .../pallets/basic-channel/src/outbound/mod.rs | 3 +- .../basic-channel/src/outbound/weights.rs | 16 +- parachain/pallets/dispatch/Cargo.toml | 18 +- parachain/pallets/dispatch/src/lib.rs | 1 - .../pallets/ethereum-beacon-client/Cargo.toml | 20 +- .../pallets/ethereum-beacon-client/src/lib.rs | 1 - .../ethereum-beacon-client/src/weights.rs | 12 +- parachain/pallets/xcm-support/Cargo.toml | 49 -- parachain/pallets/xcm-support/src/lib.rs | 186 ---- parachain/primitives/beacon/Cargo.toml | 14 +- parachain/primitives/core/Cargo.toml | 12 +- parachain/primitives/ethereum/Cargo.toml | 14 +- parachain/primitives/xcm-support/Cargo.toml | 20 - parachain/primitives/xcm-support/src/lib.rs | 51 -- parachain/tools/query-events/Cargo.toml | 4 +- 21 files changed, 580 insertions(+), 678 deletions(-) delete mode 100644 parachain/pallets/xcm-support/Cargo.toml delete mode 100644 parachain/pallets/xcm-support/src/lib.rs delete mode 100644 parachain/primitives/xcm-support/Cargo.toml delete mode 100644 parachain/primitives/xcm-support/src/lib.rs diff --git a/cumulus b/cumulus index 07296e8f0f..c208515158 160000 --- a/cumulus +++ b/cumulus @@ -1 +1 @@ -Subproject commit 07296e8f0f3bcaabd11aeb6e99a38e08ecbb1da2 +Subproject commit c208515158020d634b83664dc68e87f9f45d836e diff --git a/parachain/Cargo.lock b/parachain/Cargo.lock index 10572dcb9f..5782c8dc33 100644 --- a/parachain/Cargo.lock +++ b/parachain/Cargo.lock @@ -91,6 +91,46 @@ dependencies = [ "winapi", ] +[[package]] +name = "anstream" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "342258dd14006105c2b75ab1bd7543a03bdf0cfc94383303ac212a04939dff6f" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-wincon", + "concolor-override", + "concolor-query", + "is-terminal", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23ea9e81bd02e310c216d080f6223c179012256e5151c41db88d12c88a1684d2" + +[[package]] +name = "anstyle-parse" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7d1bb534e9efed14f3e5f44e7dd1a4f709384023a4165199a4241e18dff0116" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-wincon" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3127af6145b149f3287bb9a0d10ad9c5692dba8c53ad48285e5bec4063834fa" +dependencies = [ + "anstyle", + "windows-sys 0.45.0", +] + [[package]] name = "anyhow" version = "1.0.69" @@ -166,7 +206,7 @@ checksum = "1cd7fce9ba8c3c042128ce72d8b2ddbf3a05747efb67ea0313c635e10bda47a2" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -203,9 +243,9 @@ dependencies = [ [[package]] name = "base16ct" -version = "0.1.1" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "349a06037c7bf932dd7e7d1f653678b2038b9ad46a74102f1fc7bd7872678cce" +checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf" [[package]] name = "base58" @@ -283,7 +323,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5d6d530bdd2d52966a6d03b7a964add7ae1a288d25214066fd4b600f0f796400" dependencies = [ "arrayvec 0.4.12", - "constant_time_eq", + "constant_time_eq 0.1.5", +] + +[[package]] +name = "blake2b_simd" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c2f0dc9a68c6317d884f97cc36cf5a3d20ba14ce404227df55e1af708ab04bc" +dependencies = [ + "arrayref", + "arrayvec 0.7.2", + "constant_time_eq 0.2.5", ] [[package]] @@ -325,6 +376,18 @@ dependencies = [ "byte-tools", ] +[[package]] +name = "bounded-collections" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a071c348a5ef6da1d3a87166b408170b46002382b1dda83992b5c2208cefb370" +dependencies = [ + "log", + "parity-scale-codec", + "scale-info", + "serde", +] + [[package]] name = "bstr" version = "1.3.0" @@ -353,6 +416,12 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" +[[package]] +name = "bytemuck" +version = "1.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea" + [[package]] name = "byteorder" version = "1.4.3" @@ -400,42 +469,45 @@ dependencies = [ [[package]] name = "clap" -version = "3.2.23" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71655c45cb9845d3270c9d6df84ebe72b4dad3c2ba3f7023ad47c144e4e473a5" +checksum = "6efb5f0a41b5ef5b50c5da28c07609c20091df0c1fc33d418fa2a7e693c2b624" dependencies = [ - "atty", - "bitflags", + "clap_builder", "clap_derive", - "clap_lex", - "indexmap", "once_cell", +] + +[[package]] +name = "clap_builder" +version = "4.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "671fcaa5debda4b9a84aa7fde49c907c8986c0e6ab927e04217c9cb74e7c8bc9" +dependencies = [ + "anstream", + "anstyle", + "bitflags", + "clap_lex", "strsim", - "termcolor", - "textwrap", ] [[package]] name = "clap_derive" -version = "3.2.18" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea0c8bce528c4be4da13ea6fead8965e95b6073585a2f05204bd8f4119f82a65" +checksum = "3f9644cd56d6b87dbe899ef8b053e331c0637664e9e21a33dfcdc36093f5c5c4" dependencies = [ "heck", - "proc-macro-error", "proc-macro2", "quote", - "syn", + "syn 2.0.11", ] [[package]] name = "clap_lex" -version = "0.2.4" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" -dependencies = [ - "os_str_bytes", -] +checksum = "8a2dd5a6fe8c6e3502f568a6353e5273bbb15193ad9a89e457b9970798efbea1" [[package]] name = "codespan-reporting" @@ -447,6 +519,21 @@ dependencies = [ "unicode-width", ] +[[package]] +name = "concolor-override" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a855d4a1978dc52fb0536a04d384c2c0c1aa273597f08b77c8c4d3b2eec6037f" + +[[package]] +name = "concolor-query" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88d11d52c3d7ca2e6d0040212be9e4dbbcd78b6447f535b6b561f449427944cf" +dependencies = [ + "windows-sys 0.45.0", +] + [[package]] name = "console_error_panic_hook" version = "0.1.7" @@ -469,6 +556,12 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" +[[package]] +name = "constant_time_eq" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13418e745008f7349ec7e449155f419a61b92b58a99cc3616942b926825ec76b" + [[package]] name = "core-foundation" version = "0.9.3" @@ -505,9 +598,9 @@ dependencies = [ [[package]] name = "cranelift-entity" -version = "0.88.2" +version = "0.93.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87a0f1b2fdc18776956370cf8d9b009ded3f855350c480c1c52142510961f352" +checksum = "7cf583f7b093f291005f9fb1323e2c37f6ee4c7909e39ce016b2e8360d461705" dependencies = [ "serde", ] @@ -529,9 +622,9 @@ checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" [[package]] name = "crypto-bigint" -version = "0.4.9" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef2b4b23cddf68b89b8f8069890e8c270d54e2d5fe1b143820234805e4cb17ef" +checksum = "7c2538c4e68e52548bacb3e83ac549f903d44f011ac9d5abb5e132e67d0808f7" dependencies = [ "generic-array 0.14.6", "rand_core 0.6.4", @@ -619,7 +712,7 @@ dependencies = [ "proc-macro2", "quote", "scratch", - "syn", + "syn 1.0.109", ] [[package]] @@ -636,7 +729,7 @@ checksum = "086c685979a698443656e5cf7856c95c642295a38599f12fb1ff76fb28d19892" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -660,7 +753,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn", + "syn 1.0.109", ] [[package]] @@ -671,14 +764,14 @@ checksum = "b36230598a2d5de7ec1c6f51f72d8a99a9208daff41de2084d06e3fd3ea56685" dependencies = [ "darling_core", "quote", - "syn", + "syn 1.0.109", ] [[package]] name = "der" -version = "0.6.1" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1a467a65c5e759bce6e65eaf91cc29f466cdc57cb65777bd646872a8a1fd4de" +checksum = "bc906908ea6458456e5eaa160a9c08543ec3d1e6f71e2235cedd660cb65f9df0" dependencies = [ "const-oid", "zeroize", @@ -692,7 +785,7 @@ checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -703,7 +796,7 @@ checksum = "e79116f119dd1dba1abf1f3405f03b9b0e79a27a3883864bfebded8a3dc768cd" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -714,7 +807,7 @@ checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -770,7 +863,7 @@ checksum = "558e40ea573c374cf53507fd240b7ee2f5477df7cfebdb97323ec61c719399c5" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -781,14 +874,14 @@ checksum = "68b0cf012f1230e43cd00ebb729c6bb58707ecfa8ad08b52ef3a4ccd2697fc30" [[package]] name = "ecdsa" -version = "0.14.8" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "413301934810f597c1d19ca71c8710e99a3f1ba28a0d2ebc01551a2daeea3c5c" +checksum = "d1b0a1222f8072619e8a6b667a854020a03d363738303203c09468b3424a420a" dependencies = [ "der", "elliptic-curve", "rfc6979", - "signature", + "signature 2.0.0", ] [[package]] @@ -797,7 +890,7 @@ version = "1.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "91cff35c70bba8a626e3185d8cd48cc11b5437e1a5bcd15b9b5fa3c64b6dfee7" dependencies = [ - "signature", + "signature 1.6.4", ] [[package]] @@ -836,17 +929,17 @@ checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" [[package]] name = "elliptic-curve" -version = "0.12.3" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7bb888ab5300a19b8e5bceef25ac745ad065f3c9f7efc6de1b91958110891d3" +checksum = "6ea5a92946e8614bb585254898bb7dd1ddad241ace60c52149e3765e34cc039d" dependencies = [ "base16ct", "crypto-bigint", - "der", "digest 0.10.6", "ff", "generic-array 0.14.6", "group", + "pkcs8", "rand_core 0.6.4", "sec1", "subtle", @@ -883,6 +976,17 @@ dependencies = [ "winapi", ] +[[package]] +name = "errno" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50d6a0976c999d473fe89ad888d5a284e55366d9dc9038b1ba2aa15128c4afa0" +dependencies = [ + "errno-dragonfly", + "libc", + "windows-sys 0.45.0", +] + [[package]] name = "errno-dragonfly" version = "0.1.2" @@ -948,6 +1052,19 @@ version = "2.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" +[[package]] +name = "expander" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f360349150728553f92e4c997a16af8915f418d3a0f21b440d34c5632f16ed84" +dependencies = [ + "blake2", + "fs-err", + "proc-macro2", + "quote", + "syn 1.0.109", +] + [[package]] name = "fake-simd" version = "0.1.2" @@ -971,9 +1088,9 @@ dependencies = [ [[package]] name = "ff" -version = "0.12.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d013fc25338cc558c5c2cfbad646908fb23591e2404481826742b651c9af7160" +checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449" dependencies = [ "rand_core 0.6.4", "subtle", @@ -1009,10 +1126,19 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" +[[package]] +name = "form_urlencoded" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" +dependencies = [ + "percent-encoding", +] + [[package]] name = "frame-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" +source = "git+https://github.com/paritytech/substrate.git?branch=master#dec0369a35893c2be432e74358c4c7039e1e57be" dependencies = [ "frame-support", "frame-support-procedural", @@ -1049,9 +1175,10 @@ dependencies = [ [[package]] name = "frame-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" +source = "git+https://github.com/paritytech/substrate.git?branch=master#dec0369a35893c2be432e74358c4c7039e1e57be" dependencies = [ "bitflags", + "environmental", "frame-metadata", "frame-support-procedural", "impl-trait-for-tuples", @@ -1081,7 +1208,7 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" +source = "git+https://github.com/paritytech/substrate.git?branch=master#dec0369a35893c2be432e74358c4c7039e1e57be" dependencies = [ "Inflector", "cfg-expr", @@ -1090,35 +1217,35 @@ dependencies = [ "itertools", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] name = "frame-support-procedural-tools" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" +source = "git+https://github.com/paritytech/substrate.git?branch=master#dec0369a35893c2be432e74358c4c7039e1e57be" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] name = "frame-support-procedural-tools-derive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" +source = "git+https://github.com/paritytech/substrate.git?branch=master#dec0369a35893c2be432e74358c4c7039e1e57be" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] name = "frame-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" +source = "git+https://github.com/paritytech/substrate.git?branch=master#dec0369a35893c2be432e74358c4c7039e1e57be" dependencies = [ "frame-support", "log", @@ -1133,6 +1260,12 @@ dependencies = [ "sp-weights", ] +[[package]] +name = "fs-err" +version = "2.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0845fa252299212f0389d64ba26f34fa32cfe41588355f21ed507c59a0f64541" + [[package]] name = "funty" version = "2.0.0" @@ -1211,7 +1344,7 @@ checksum = "95a73af87da33b5acf53acfebdc339fe592ecf5357ac7c0a7734ab9d8c876a70" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -1267,6 +1400,7 @@ checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" dependencies = [ "typenum", "version_check", + "zeroize", ] [[package]] @@ -1324,9 +1458,9 @@ dependencies = [ [[package]] name = "group" -version = "0.12.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dfbfb3a6cfbd390d5c9564ab283a0349b9b9fcd46a706c1eb10e0db70bfbac7" +checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63" dependencies = [ "ff", "rand_core 0.6.4", @@ -1358,6 +1492,12 @@ version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d23bd4e7b5eda0d0f3a307e8b381fdc8ba9000f26fbe912250c0a4cc3956364a" +[[package]] +name = "hash-db" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e7d7786361d7425ae2fe4f9e407eb0efaa0840f5212d109cc018c40c35c6ab4" + [[package]] name = "hash256-std-hasher" version = "0.15.2" @@ -1381,6 +1521,9 @@ name = "hashbrown" version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" +dependencies = [ + "ahash 0.8.3", +] [[package]] name = "heck" @@ -1406,6 +1549,12 @@ dependencies = [ "libc", ] +[[package]] +name = "hermit-abi" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" + [[package]] name = "hex" version = "0.4.3" @@ -1551,6 +1700,16 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" +[[package]] +name = "idna" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + [[package]] name = "impl-codec" version = "0.6.0" @@ -1595,7 +1754,7 @@ checksum = "11d7a9f6330b71fea57921c9b61c47ee6e84f72d394754eff6163ae67e7395eb" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -1629,9 +1788,26 @@ dependencies = [ [[package]] name = "io-lifetimes" -version = "0.7.5" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59ce5ef949d49ee85593fc4d3f3f95ad61657076395cbbce23e2121fc5542074" +checksum = "09270fd4fa1111bc614ed2246c7ef56239a3063d5be0d1ec3b589c505d400aeb" +dependencies = [ + "hermit-abi 0.3.1", + "libc", + "windows-sys 0.45.0", +] + +[[package]] +name = "is-terminal" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "256017f749ab3117e93acb91063009e1f1bb56d03965b14c2c8df4eb02c524d8" +dependencies = [ + "hermit-abi 0.3.1", + "io-lifetimes", + "rustix 0.37.4", + "windows-sys 0.45.0", +] [[package]] name = "itertools" @@ -1760,7 +1936,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -1815,13 +1991,14 @@ dependencies = [ [[package]] name = "k256" -version = "0.11.6" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72c1e0b51e7ec0a97369623508396067a486bd0cbed95a2659a4b863d28cfc8b" +checksum = "955890845095ccf31ef83ad41a05aabb4d8cc23dc3cac5a9f5c89cf26dd0da75" dependencies = [ "cfg-if", "ecdsa", "elliptic-curve", + "once_cell", "sha2 0.10.6", ] @@ -1842,9 +2019,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.139" +version = "0.2.140" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" +checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c" [[package]] name = "libm" @@ -1911,19 +2088,24 @@ dependencies = [ [[package]] name = "linregress" -version = "0.4.4" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6c601a85f5ecd1aba625247bca0031585fb1c446461b142878a16f8245ddeb8" +checksum = "475015a7f8f017edb28d2e69813be23500ad4b32cfe3421c4148efc97324ee52" dependencies = [ "nalgebra", - "statrs", ] [[package]] name = "linux-raw-sys" -version = "0.0.46" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" + +[[package]] +name = "linux-raw-sys" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4d2456c373231a208ad294c33dc5bff30051eafd954cd4caae83a712b12854d" +checksum = "cd550e73688e6d578f0ac2119e32b797a327631a42f9433e59d02e139c8df60d" [[package]] name = "lock_api" @@ -1983,6 +2165,15 @@ version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +[[package]] +name = "memfd" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b20a59d985586e4a5aef64564ac77299f8586d8be6cf9106a5a40207e8908efb" +dependencies = [ + "rustix 0.36.11", +] + [[package]] name = "memoffset" version = "0.6.5" @@ -1998,19 +2189,18 @@ version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6566c70c1016f525ced45d7b7f97730a2bafb037c788211d0c186ef5b2189f0a" dependencies = [ - "hash-db", + "hash-db 0.15.2", "hashbrown 0.12.3", "parity-util-mem", ] [[package]] name = "memory-db" -version = "0.31.0" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e0c7cba9ce19ac7ffd2053ac9f49843bbd3f4318feedfd74e85c19d5fb0ba66" +checksum = "808b50db46293432a45e63bc15ea51e0ab4c0a1647b8eb114e31a3e698dd6fbe" dependencies = [ - "hash-db", - "hashbrown 0.12.3", + "hash-db 0.16.0", ] [[package]] @@ -2072,9 +2262,9 @@ dependencies = [ [[package]] name = "nalgebra" -version = "0.27.1" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "462fffe4002f4f2e1f6a9dcf12cc1a6fc0e15989014efc02a941d3e0f5dc2120" +checksum = "d68d47bba83f9e2006d117a9a33af1524e655516b8919caac694427a6fb1e511" dependencies = [ "approx", "matrixmultiply", @@ -2082,21 +2272,19 @@ dependencies = [ "num-complex", "num-rational 0.4.1", "num-traits", - "rand 0.8.5", - "rand_distr", "simba", "typenum", ] [[package]] name = "nalgebra-macros" -version = "0.1.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01fcc0b8149b4632adc89ac3b7b31a12fb6099a0317a4eb2ebff574ef7de7218" +checksum = "d232c68884c0c99810a5a4d333ef7e47689cfd0edc85efc9e54e1e6bf5212766" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -2193,7 +2381,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" dependencies = [ "autocfg", - "libm", ] [[package]] @@ -2251,16 +2438,10 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" -[[package]] -name = "os_str_bytes" -version = "6.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee" - [[package]] name = "pallet-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" +source = "git+https://github.com/paritytech/substrate.git?branch=master#dec0369a35893c2be432e74358c4c7039e1e57be" dependencies = [ "frame-benchmarking", "frame-support", @@ -2305,7 +2486,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -2330,7 +2511,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f557c32c6d268a07c921471619c0295f5efad3a0e76d4f97a05c091a51d110b2" dependencies = [ "proc-macro2", - "syn", + "syn 1.0.109", "synstructure", ] @@ -2433,6 +2614,12 @@ dependencies = [ "digest 0.10.6", ] +[[package]] +name = "percent-encoding" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" + [[package]] name = "pin-project" version = "1.0.12" @@ -2450,7 +2637,7 @@ checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -2467,9 +2654,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkcs8" -version = "0.9.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9eca2c590a5f85da82668fa685c09ce2888b9430e83299debf1f34b65fd4a4ba" +checksum = "3d2820d87d2b008616e5c27212dd9e0e694fb4c6b522de06094106813328cb49" dependencies = [ "der", "spki", @@ -2527,7 +2714,7 @@ dependencies = [ "proc-macro-error-attr", "proc-macro2", "quote", - "syn", + "syn 1.0.109", "version_check", ] @@ -2544,9 +2731,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.51" +version = "1.0.54" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d727cae5b39d21da60fa540906919ad737832fe0b1c165da3a34d6548c849d6" +checksum = "e472a104799c74b514a57226160104aa483546de37e839ec50e3c2e41dd87534" dependencies = [ "unicode-ident", ] @@ -2562,9 +2749,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.23" +version = "1.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b" +checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" dependencies = [ "proc-macro2", ] @@ -2638,16 +2825,6 @@ dependencies = [ "getrandom 0.2.8", ] -[[package]] -name = "rand_distr" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32cb0b9bc82b0a0876c2dd994a7e7a2683d3e7390ca40e6886785ef0c7e3ee31" -dependencies = [ - "num-traits", - "rand 0.8.5", -] - [[package]] name = "rand_hc" version = "0.2.0" @@ -2698,7 +2875,7 @@ checksum = "9f9c0c92af03644e4806106281fe2e068ac5bc0ae74a707266d06ea27bccee5f" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -2729,13 +2906,12 @@ checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" [[package]] name = "rfc6979" -version = "0.3.1" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7743f17af12fa0b03b803ba12cd6a8d9483a587e89c69445e3909655c0b9fabb" +checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2" dependencies = [ - "crypto-bigint", "hmac 0.12.1", - "zeroize", + "subtle", ] [[package]] @@ -2783,16 +2959,30 @@ checksum = "3e75f6a532d0fd9f7f13144f392b6ad56a32696bfcd9c78f797f16bbb6f072d6" [[package]] name = "rustix" -version = "0.35.13" +version = "0.36.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "727a1a6d65f786ec22df8a81ca3121107f235970dc1705ed681d3e6e8b9cd5f9" +checksum = "db4165c9963ab29e422d6c26fbc1d37f15bace6b2810221f9d925023480fcf0e" dependencies = [ "bitflags", - "errno", + "errno 0.2.8", "io-lifetimes", "libc", - "linux-raw-sys", - "windows-sys 0.42.0", + "linux-raw-sys 0.1.4", + "windows-sys 0.45.0", +] + +[[package]] +name = "rustix" +version = "0.37.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c348b5dc624ecee40108aa2922fed8bad89d7fcc2b9f8cb18f632898ac4a37f9" +dependencies = [ + "bitflags", + "errno 0.3.0", + "io-lifetimes", + "libc", + "linux-raw-sys 0.3.0", + "windows-sys 0.45.0", ] [[package]] @@ -2840,6 +3030,15 @@ version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde" +[[package]] +name = "safe_arch" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "794821e4ccb0d9f979512f9c1973480123f9bd62a90d74ab0f9426fcf8f4a529" +dependencies = [ + "bytemuck", +] + [[package]] name = "same-file" version = "1.0.6" @@ -2884,7 +3083,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -2972,9 +3171,9 @@ dependencies = [ [[package]] name = "sec1" -version = "0.3.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3be24c1842290c45df0a7bf069e0c268a747ad05a192f2fd7dcfdbc1cba40928" +checksum = "48518a2b5775ba8ca5b46596aae011caa431e6ce7e4a67ead66d92f08884220e" dependencies = [ "base16ct", "der", @@ -3054,9 +3253,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.152" +version = "1.0.159" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb" +checksum = "3c04e8343c3daeec41f58990b9d77068df31209f2af111e059e9fe9646693065" dependencies = [ "serde_derive", ] @@ -3083,13 +3282,13 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.152" +version = "1.0.159" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e" +checksum = "4c614d17805b093df4b147b51339e7e44bf05ef59fba1e45d83500bcfb4d8585" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.11", ] [[package]] @@ -3176,6 +3375,12 @@ name = "signature" version = "1.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c" + +[[package]] +name = "signature" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fe458c98333f9c8152221191a77e2a44e8325d0193484af2e9421a53019e57d" dependencies = [ "digest 0.10.6", "rand_core 0.6.4", @@ -3183,14 +3388,15 @@ dependencies = [ [[package]] name = "simba" -version = "0.5.1" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e82063457853d00243beda9952e910b82593e4b07ae9f721b9278a99a0d3d5c" +checksum = "50582927ed6f77e4ac020c057f37a268fc6aebc29225050365aacbb9deeeddc4" dependencies = [ "approx", "num-complex", "num-traits", "paste", + "wide", ] [[package]] @@ -3430,9 +3636,9 @@ dependencies = [ [[package]] name = "sp-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" +source = "git+https://github.com/paritytech/substrate.git?branch=master#dec0369a35893c2be432e74358c4c7039e1e57be" dependencies = [ - "hash-db", + "hash-db 0.16.0", "log", "parity-scale-codec", "sp-api-proc-macro", @@ -3448,13 +3654,15 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" +source = "git+https://github.com/paritytech/substrate.git?branch=master#dec0369a35893c2be432e74358c4c7039e1e57be" dependencies = [ + "Inflector", "blake2", + "expander", "proc-macro-crate", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -3474,7 +3682,7 @@ dependencies = [ [[package]] name = "sp-application-crypto" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" +source = "git+https://github.com/paritytech/substrate.git?branch=master#dec0369a35893c2be432e74358c4c7039e1e57be" dependencies = [ "parity-scale-codec", "scale-info", @@ -3503,7 +3711,7 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" +source = "git+https://github.com/paritytech/substrate.git?branch=master#dec0369a35893c2be432e74358c4c7039e1e57be" dependencies = [ "integer-sqrt", "num-traits", @@ -3527,7 +3735,7 @@ dependencies = [ "dyn-clonable", "ed25519-dalek", "futures", - "hash-db", + "hash-db 0.15.2", "hash256-std-hasher", "hex", "impl-serde 0.3.2", @@ -3564,16 +3772,17 @@ dependencies = [ [[package]] name = "sp-core" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" +source = "git+https://github.com/paritytech/substrate.git?branch=master#dec0369a35893c2be432e74358c4c7039e1e57be" dependencies = [ "array-bytes", "base58", "bitflags", "blake2", + "bounded-collections", "dyn-clonable", "ed25519-zebra", "futures", - "hash-db", + "hash-db 0.16.0", "hash256-std-hasher", "impl-serde 0.4.0", "lazy_static", @@ -3620,9 +3829,9 @@ dependencies = [ [[package]] name = "sp-core-hashing" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" +source = "git+https://github.com/paritytech/substrate.git?branch=master#dec0369a35893c2be432e74358c4c7039e1e57be" dependencies = [ - "blake2", + "blake2b_simd", "byteorder", "digest 0.10.6", "sha2 0.10.6", @@ -3634,12 +3843,12 @@ dependencies = [ [[package]] name = "sp-core-hashing-proc-macro" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" +source = "git+https://github.com/paritytech/substrate.git?branch=master#dec0369a35893c2be432e74358c4c7039e1e57be" dependencies = [ "proc-macro2", "quote", "sp-core-hashing 5.0.0", - "syn", + "syn 1.0.109", ] [[package]] @@ -3650,17 +3859,17 @@ checksum = "d676664972e22a0796176e81e7bec41df461d1edf52090955cdab55f2c956ff2" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] name = "sp-debug-derive" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" +source = "git+https://github.com/paritytech/substrate.git?branch=master#dec0369a35893c2be432e74358c4c7039e1e57be" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -3678,7 +3887,7 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.13.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" +source = "git+https://github.com/paritytech/substrate.git?branch=master#dec0369a35893c2be432e74358c4c7039e1e57be" dependencies = [ "environmental", "parity-scale-codec", @@ -3689,11 +3898,12 @@ dependencies = [ [[package]] name = "sp-inherents" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" +source = "git+https://github.com/paritytech/substrate.git?branch=master#dec0369a35893c2be432e74358c4c7039e1e57be" dependencies = [ "async-trait", "impl-trait-for-tuples", "parity-scale-codec", + "scale-info", "sp-core 7.0.0", "sp-runtime 7.0.0", "sp-std 5.0.0", @@ -3707,7 +3917,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "935fd3c71bad6811a7984cabb74d323b8ca3107024024c3eabb610e0182ba8d3" dependencies = [ "futures", - "hash-db", + "hash-db 0.15.2", "libsecp256k1", "log", "parity-scale-codec", @@ -3729,7 +3939,7 @@ dependencies = [ [[package]] name = "sp-io" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" +source = "git+https://github.com/paritytech/substrate.git?branch=master#dec0369a35893c2be432e74358c4c7039e1e57be" dependencies = [ "bytes", "ed25519", @@ -3754,7 +3964,7 @@ dependencies = [ [[package]] name = "sp-keyring" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" +source = "git+https://github.com/paritytech/substrate.git?branch=master#dec0369a35893c2be432e74358c4c7039e1e57be" dependencies = [ "lazy_static", "sp-core 7.0.0", @@ -3782,9 +3992,8 @@ dependencies = [ [[package]] name = "sp-keystore" version = "0.13.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" +source = "git+https://github.com/paritytech/substrate.git?branch=master#dec0369a35893c2be432e74358c4c7039e1e57be" dependencies = [ - "async-trait", "futures", "merlin", "parity-scale-codec", @@ -3798,7 +4007,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" +source = "git+https://github.com/paritytech/substrate.git?branch=master#dec0369a35893c2be432e74358c4c7039e1e57be" dependencies = [ "sp-api", "sp-core 7.0.0", @@ -3819,7 +4028,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" +source = "git+https://github.com/paritytech/substrate.git?branch=master#dec0369a35893c2be432e74358c4c7039e1e57be" dependencies = [ "backtrace", "lazy_static", @@ -3852,7 +4061,7 @@ dependencies = [ [[package]] name = "sp-runtime" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" +source = "git+https://github.com/paritytech/substrate.git?branch=master#dec0369a35893c2be432e74358c4c7039e1e57be" dependencies = [ "either", "hash256-std-hasher", @@ -3892,7 +4101,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" +source = "git+https://github.com/paritytech/substrate.git?branch=master#dec0369a35893c2be432e74358c4c7039e1e57be" dependencies = [ "bytes", "impl-trait-for-tuples", @@ -3917,25 +4126,25 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] name = "sp-runtime-interface-proc-macro" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" +source = "git+https://github.com/paritytech/substrate.git?branch=master#dec0369a35893c2be432e74358c4c7039e1e57be" dependencies = [ "Inflector", "proc-macro-crate", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] name = "sp-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" +source = "git+https://github.com/paritytech/substrate.git?branch=master#dec0369a35893c2be432e74358c4c7039e1e57be" dependencies = [ "parity-scale-codec", "scale-info", @@ -3950,7 +4159,7 @@ version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ecee3b33eb78c99997676a571656bcc35db6886abecfddd13e76a73b5871c6c1" dependencies = [ - "hash-db", + "hash-db 0.15.2", "log", "num-traits", "parity-scale-codec", @@ -3965,15 +4174,15 @@ dependencies = [ "thiserror", "tracing", "trie-db 0.23.1", - "trie-root", + "trie-root 0.17.0", ] [[package]] name = "sp-state-machine" version = "0.13.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" +source = "git+https://github.com/paritytech/substrate.git?branch=master#dec0369a35893c2be432e74358c4c7039e1e57be" dependencies = [ - "hash-db", + "hash-db 0.16.0", "log", "parity-scale-codec", "parking_lot 0.12.1", @@ -3997,7 +4206,7 @@ checksum = "14804d6069ee7a388240b665f17908d98386ffb0b5d39f89a4099fc7a2a4c03f" [[package]] name = "sp-std" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" +source = "git+https://github.com/paritytech/substrate.git?branch=master#dec0369a35893c2be432e74358c4c7039e1e57be" [[package]] name = "sp-storage" @@ -4016,7 +4225,7 @@ dependencies = [ [[package]] name = "sp-storage" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" +source = "git+https://github.com/paritytech/substrate.git?branch=master#dec0369a35893c2be432e74358c4c7039e1e57be" dependencies = [ "impl-serde 0.4.0", "parity-scale-codec", @@ -4029,7 +4238,7 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" +source = "git+https://github.com/paritytech/substrate.git?branch=master#dec0369a35893c2be432e74358c4c7039e1e57be" dependencies = [ "async-trait", "futures-timer", @@ -4057,7 +4266,7 @@ dependencies = [ [[package]] name = "sp-tracing" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" +source = "git+https://github.com/paritytech/substrate.git?branch=master#dec0369a35893c2be432e74358c4c7039e1e57be" dependencies = [ "parity-scale-codec", "sp-std 5.0.0", @@ -4072,26 +4281,26 @@ version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6fc34f4f291886914733e083b62708d829f3e6b8d7a7ca7fa8a55a3d7640b0b" dependencies = [ - "hash-db", + "hash-db 0.15.2", "memory-db 0.29.0", "parity-scale-codec", "scale-info", "sp-core 6.0.0", "sp-std 4.0.0", "trie-db 0.23.1", - "trie-root", + "trie-root 0.17.0", ] [[package]] name = "sp-trie" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" +source = "git+https://github.com/paritytech/substrate.git?branch=master#dec0369a35893c2be432e74358c4c7039e1e57be" dependencies = [ "ahash 0.8.3", - "hash-db", - "hashbrown 0.12.3", + "hash-db 0.16.0", + "hashbrown 0.13.2", "lazy_static", - "memory-db 0.31.0", + "memory-db 0.32.0", "nohash-hasher", "parity-scale-codec", "parking_lot 0.12.1", @@ -4101,14 +4310,14 @@ dependencies = [ "sp-std 5.0.0", "thiserror", "tracing", - "trie-db 0.24.0", - "trie-root", + "trie-db 0.27.1", + "trie-root 0.18.0", ] [[package]] name = "sp-version" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" +source = "git+https://github.com/paritytech/substrate.git?branch=master#dec0369a35893c2be432e74358c4c7039e1e57be" dependencies = [ "impl-serde 0.4.0", "parity-scale-codec", @@ -4125,12 +4334,12 @@ dependencies = [ [[package]] name = "sp-version-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" +source = "git+https://github.com/paritytech/substrate.git?branch=master#dec0369a35893c2be432e74358c4c7039e1e57be" dependencies = [ "parity-scale-codec", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -4149,8 +4358,9 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" +source = "git+https://github.com/paritytech/substrate.git?branch=master#dec0369a35893c2be432e74358c4c7039e1e57be" dependencies = [ + "anyhow", "impl-trait-for-tuples", "log", "parity-scale-codec", @@ -4162,7 +4372,7 @@ dependencies = [ [[package]] name = "sp-weights" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.38#18bb7c7c841b101c19a8d1881b893ae8e37de460" +source = "git+https://github.com/paritytech/substrate.git?branch=master#dec0369a35893c2be432e74358c4c7039e1e57be" dependencies = [ "parity-scale-codec", "scale-info", @@ -4182,9 +4392,9 @@ checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" [[package]] name = "spki" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67cf02bbac7a337dc36e4f5a693db6c21e7863f45070f7064577eb4367a3212b" +checksum = "c0445c905640145c7ea8c1993555957f65e7c46d0535b91ba501bc9bfc85522f" dependencies = [ "base64ct", "der", @@ -4224,7 +4434,7 @@ source = "git+https://github.com/ralexstokes/ssz-rs?rev=d18af912abacbf84219be37a dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -4239,19 +4449,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" -[[package]] -name = "statrs" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05bdbb8e4e78216a85785a85d3ec3183144f98d0097b9281802c019bb07a6f05" -dependencies = [ - "approx", - "lazy_static", - "nalgebra", - "num-traits", - "rand 0.8.5", -] - [[package]] name = "strsim" version = "0.10.0" @@ -4277,7 +4474,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn", + "syn 1.0.109", ] [[package]] @@ -4347,7 +4544,7 @@ dependencies = [ "quote", "scale-info", "subxt-metadata", - "syn", + "syn 1.0.109", ] [[package]] @@ -4358,7 +4555,7 @@ dependencies = [ "darling", "proc-macro-error", "subxt-codegen", - "syn", + "syn 1.0.109", ] [[package]] @@ -4383,6 +4580,17 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "syn" +version = "2.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21e3787bb71465627110e7d87ed4faaa36c1f61042ee67badb9e2ef173accc40" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + [[package]] name = "synstructure" version = "0.12.6" @@ -4391,7 +4599,7 @@ checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", "unicode-xid", ] @@ -4416,12 +4624,6 @@ dependencies = [ "winapi-util", ] -[[package]] -name = "textwrap" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" - [[package]] name = "thiserror" version = "1.0.38" @@ -4439,7 +4641,7 @@ checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -4549,7 +4751,7 @@ checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -4650,7 +4852,7 @@ checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -4722,7 +4924,7 @@ version = "0.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d32d034c0d3db64b43c31de38e945f15b40cd4ca6d2dcfc26d4798ce8de4ab83" dependencies = [ - "hash-db", + "hash-db 0.15.2", "hashbrown 0.12.3", "log", "rustc-hex", @@ -4731,12 +4933,12 @@ dependencies = [ [[package]] name = "trie-db" -version = "0.24.0" +version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "004e1e8f92535694b4cb1444dc5a8073ecf0815e3357f729638b9f8fc4062908" +checksum = "767abe6ffed88a1889671a102c2861ae742726f52e0a5a425b92c9fbfa7e9c85" dependencies = [ - "hash-db", - "hashbrown 0.12.3", + "hash-db 0.16.0", + "hashbrown 0.13.2", "log", "rustc-hex", "smallvec 1.10.0", @@ -4748,7 +4950,16 @@ version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a36c5ca3911ed3c9a5416ee6c679042064b93fc637ded67e25f92e68d783891" dependencies = [ - "hash-db", + "hash-db 0.15.2", +] + +[[package]] +name = "trie-root" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4ed310ef5ab98f5fa467900ed906cb9232dd5376597e00fd4cba2a449d06c0b" +dependencies = [ + "hash-db 0.16.0", ] [[package]] @@ -4793,6 +5004,12 @@ dependencies = [ "static_assertions", ] +[[package]] +name = "unicode-bidi" +version = "0.3.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" + [[package]] name = "unicode-ident" version = "1.0.6" @@ -4826,6 +5043,23 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" +[[package]] +name = "url" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", +] + +[[package]] +name = "utf8parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" + [[package]] name = "valuable" version = "0.1.0" @@ -4898,7 +5132,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn", + "syn 1.0.109", "wasm-bindgen-shared", ] @@ -4932,7 +5166,7 @@ checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -5026,18 +5260,19 @@ dependencies = [ [[package]] name = "wasmparser" -version = "0.89.1" +version = "0.100.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab5d3e08b13876f96dd55608d03cd4883a0545884932d5adf11925876c96daef" +checksum = "64b20236ab624147dfbb62cf12a19aaf66af0e41b8398838b66e997d07d269d4" dependencies = [ "indexmap", + "url", ] [[package]] name = "wasmtime" -version = "1.0.2" +version = "6.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ad5af6ba38311282f2a21670d96e78266e8c8e2f38cbcd52c254df6ccbc7731" +checksum = "f6e89f9819523447330ffd70367ef4a18d8c832e24e8150fe054d1d912841632" dependencies = [ "anyhow", "bincode", @@ -5055,23 +5290,23 @@ dependencies = [ "wasmtime-environ", "wasmtime-jit", "wasmtime-runtime", - "windows-sys 0.36.1", + "windows-sys 0.42.0", ] [[package]] name = "wasmtime-asm-macros" -version = "1.0.2" +version = "6.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45de63ddfc8b9223d1adc8f7b2ee5f35d1f6d112833934ad7ea66e4f4339e597" +checksum = "9bd3a5e46c198032da934469f3a6e48649d1f9142438e4fd4617b68a35644b8a" dependencies = [ "cfg-if", ] [[package]] name = "wasmtime-environ" -version = "1.0.2" +version = "6.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebb881c61f4f627b5d45c54e629724974f8a8890d455bcbe634330cc27309644" +checksum = "9a6db9fc52985ba06ca601f2ff0ff1f526c5d724c7ac267b47326304b0c97883" dependencies = [ "anyhow", "cranelift-entity", @@ -5088,9 +5323,9 @@ dependencies = [ [[package]] name = "wasmtime-jit" -version = "1.0.2" +version = "6.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1985c628011fe26adf5e23a5301bdc79b245e0e338f14bb58b39e4e25e4d8681" +checksum = "b77e3a52cd84d0f7f18554afa8060cfe564ccac61e3b0802d3fd4084772fa5f6" dependencies = [ "addr2line 0.17.0", "anyhow", @@ -5101,29 +5336,39 @@ dependencies = [ "log", "object 0.29.0", "rustc-demangle", - "rustix", "serde", "target-lexicon", - "thiserror", "wasmtime-environ", + "wasmtime-jit-icache-coherence", "wasmtime-runtime", - "windows-sys 0.36.1", + "windows-sys 0.42.0", ] [[package]] name = "wasmtime-jit-debug" -version = "1.0.2" +version = "6.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f671b588486f5ccec8c5a3dba6b4c07eac2e66ab8c60e6f4e53717c77f709731" +checksum = "d0245e8a9347017c7185a72e215218a802ff561545c242953c11ba00fccc930f" dependencies = [ "once_cell", ] +[[package]] +name = "wasmtime-jit-icache-coherence" +version = "6.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67d412e9340ab1c83867051d8d1d7c90aa8c9afc91da086088068e2734e25064" +dependencies = [ + "cfg-if", + "libc", + "windows-sys 0.42.0", +] + [[package]] name = "wasmtime-runtime" -version = "1.0.2" +version = "6.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee8f92ad4b61736339c29361da85769ebc200f184361959d1792832e592a1afd" +checksum = "d594e791b5fdd4dbaf8cf7ae62f2e4ff85018ce90f483ca6f42947688e48827d" dependencies = [ "anyhow", "cc", @@ -5132,22 +5377,22 @@ dependencies = [ "libc", "log", "mach", + "memfd", "memoffset", "paste", "rand 0.8.5", - "rustix", - "thiserror", + "rustix 0.36.11", "wasmtime-asm-macros", "wasmtime-environ", "wasmtime-jit-debug", - "windows-sys 0.36.1", + "windows-sys 0.42.0", ] [[package]] name = "wasmtime-types" -version = "1.0.2" +version = "6.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d23d61cb4c46e837b431196dd06abb11731541021916d03476a178b54dc07aeb" +checksum = "a6688d6f96d4dbc1f89fab626c56c1778936d122b5f4ae7a57c2eb42b8d982e2" dependencies = [ "cranelift-entity", "serde", @@ -5184,6 +5429,16 @@ dependencies = [ "webpki", ] +[[package]] +name = "wide" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b689b6c49d6549434bf944e6b0f39238cf63693cb7a147e9d887507fffa3b223" +dependencies = [ + "bytemuck", + "safe_arch", +] + [[package]] name = "winapi" version = "0.3.9" @@ -5215,19 +5470,6 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" -[[package]] -name = "windows-sys" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" -dependencies = [ - "windows_aarch64_msvc 0.36.1", - "windows_i686_gnu 0.36.1", - "windows_i686_msvc 0.36.1", - "windows_x86_64_gnu 0.36.1", - "windows_x86_64_msvc 0.36.1", -] - [[package]] name = "windows-sys" version = "0.42.0" @@ -5235,12 +5477,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" dependencies = [ "windows_aarch64_gnullvm", - "windows_aarch64_msvc 0.42.1", - "windows_i686_gnu 0.42.1", - "windows_i686_msvc 0.42.1", - "windows_x86_64_gnu 0.42.1", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", "windows_x86_64_gnullvm", - "windows_x86_64_msvc 0.42.1", + "windows_x86_64_msvc", ] [[package]] @@ -5259,12 +5501,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7" dependencies = [ "windows_aarch64_gnullvm", - "windows_aarch64_msvc 0.42.1", - "windows_i686_gnu 0.42.1", - "windows_i686_msvc 0.42.1", - "windows_x86_64_gnu 0.42.1", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", "windows_x86_64_gnullvm", - "windows_x86_64_msvc 0.42.1", + "windows_x86_64_msvc", ] [[package]] @@ -5273,48 +5515,24 @@ version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608" -[[package]] -name = "windows_aarch64_msvc" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" - [[package]] name = "windows_aarch64_msvc" version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7" -[[package]] -name = "windows_i686_gnu" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" - [[package]] name = "windows_i686_gnu" version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640" -[[package]] -name = "windows_i686_msvc" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" - [[package]] name = "windows_i686_msvc" version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605" -[[package]] -name = "windows_x86_64_gnu" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" - [[package]] name = "windows_x86_64_gnu" version = "0.42.1" @@ -5327,12 +5545,6 @@ version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463" -[[package]] -name = "windows_x86_64_msvc" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" - [[package]] name = "windows_x86_64_msvc" version = "0.42.1" @@ -5380,6 +5592,6 @@ checksum = "44bf07cb3e50ea2003396695d58bf46bc9887a1f362260446fad6bc4e79bd36c" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", "synstructure", ] diff --git a/parachain/pallets/basic-channel/Cargo.toml b/parachain/pallets/basic-channel/Cargo.toml index 76b59817ee..800451fa21 100644 --- a/parachain/pallets/basic-channel/Cargo.toml +++ b/parachain/pallets/basic-channel/Cargo.toml @@ -10,19 +10,19 @@ repository = "https://github.com/Snowfork/snowbridge" targets = [ "x86_64-unknown-linux-gnu" ] [dependencies] -serde = { version = "1.0.137", optional = true } +serde = { version = "1.0.156", optional = true } codec = { version = "3.1.5", package = "parity-scale-codec", default-features = false, features = [ "derive" ] } -scale-info = { version = "2.2.0", default-features = false, features = [ "derive" ] } +scale-info = { version = "2.3.1", default-features = false, features = [ "derive" ] } hex-literal = { version = "0.3.4", optional = true } rlp = { version = "0.5", default-features = false, optional = true } -frame-benchmarking = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.38", default-features = false, optional = true } -frame-support = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.38", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.38", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.38", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.38", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.38", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.38", default-features = false } +frame-benchmarking = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false, optional = true } +frame-support = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } snowbridge-core = { path = "../../primitives/core", default-features = false } snowbridge-ethereum = { path = "../../primitives/ethereum", default-features = false } @@ -30,8 +30,8 @@ snowbridge-basic-channel-merkle-proof = { path = "merkle-proof", default-feature ethabi = { git = "https://github.com/Snowfork/ethabi-decode.git", package = "ethabi-decode", branch = "master", default-features = false } [dev-dependencies] -frame-benchmarking = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.38" } -sp-keyring = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.38" } +frame-benchmarking = { git = "https://github.com/paritytech/substrate.git", branch = "master" } +sp-keyring = { git = "https://github.com/paritytech/substrate.git", branch = "master" } hex-literal = { version = "0.3.4" } rlp = { version = "0.5" } diff --git a/parachain/pallets/basic-channel/merkle-proof/Cargo.toml b/parachain/pallets/basic-channel/merkle-proof/Cargo.toml index b15083f2c7..2d11815bb2 100644 --- a/parachain/pallets/basic-channel/merkle-proof/Cargo.toml +++ b/parachain/pallets/basic-channel/merkle-proof/Cargo.toml @@ -12,8 +12,8 @@ targets = [ "x86_64-unknown-linux-gnu" ] [dependencies] codec = { version = "3.1.5", package = "parity-scale-codec", default-features = false, features = [ "derive" ] } -sp-core = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.38", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.38", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } [dev-dependencies] hex-literal = { version = "0.3.4" } diff --git a/parachain/pallets/basic-channel/rpc/Cargo.toml b/parachain/pallets/basic-channel/rpc/Cargo.toml index 26b783f255..10533ec60f 100644 --- a/parachain/pallets/basic-channel/rpc/Cargo.toml +++ b/parachain/pallets/basic-channel/rpc/Cargo.toml @@ -12,9 +12,9 @@ targets = [ "x86_64-unknown-linux-gnu" ] codec = { version = "3.1.5", package = "parity-scale-codec", features = [ "derive" ] } jsonrpsee = { version = "0.16.2", features = ["server", "macros"] } -sp-core = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.38" } -sp-runtime = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.38" } -sp-offchain = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.38' } +sp-core = { git = "https://github.com/paritytech/substrate.git", branch = "master" } +sp-runtime = { git = "https://github.com/paritytech/substrate.git", branch = "master" } +sp-offchain = { git = 'https://github.com/paritytech/substrate.git', branch = 'master' } parking_lot = "0.11.0" snowbridge-basic-channel-merkle-proof = { path = "../merkle-proof" } diff --git a/parachain/pallets/basic-channel/src/inbound/mod.rs b/parachain/pallets/basic-channel/src/inbound/mod.rs index 4c4205179d..a3eaf04d67 100644 --- a/parachain/pallets/basic-channel/src/inbound/mod.rs +++ b/parachain/pallets/basic-channel/src/inbound/mod.rs @@ -27,7 +27,6 @@ pub mod pallet { use frame_system::pallet_prelude::*; #[pallet::pallet] - #[pallet::generate_store(pub(super) trait Store)] pub struct Pallet(_); #[pallet::config] diff --git a/parachain/pallets/basic-channel/src/outbound/mod.rs b/parachain/pallets/basic-channel/src/outbound/mod.rs index 25c4fe3d25..56a82cdc97 100644 --- a/parachain/pallets/basic-channel/src/outbound/mod.rs +++ b/parachain/pallets/basic-channel/src/outbound/mod.rs @@ -62,7 +62,7 @@ where // so we can use at most 365000000000 for the commit call // need to rerun benchmarks later to get weight based on the worst case: // MaxMessagesPerCommit=20 and MaxMessagePayloadSize=256 -pub const MINIMUM_WEIGHT_REMAIN_IN_BLOCK: Weight = Weight::from_ref_time(10_000_000_000); +pub const MINIMUM_WEIGHT_REMAIN_IN_BLOCK: Weight = Weight::from_parts(10_000_000_000, 0); pub use pallet::*; @@ -73,7 +73,6 @@ pub mod pallet { use frame_system::pallet_prelude::*; #[pallet::pallet] - #[pallet::generate_store(pub(super) trait Store)] pub struct Pallet(_); #[pallet::config] diff --git a/parachain/pallets/basic-channel/src/outbound/weights.rs b/parachain/pallets/basic-channel/src/outbound/weights.rs index 6dabdc7b50..9f7598b3b9 100644 --- a/parachain/pallets/basic-channel/src/outbound/weights.rs +++ b/parachain/pallets/basic-channel/src/outbound/weights.rs @@ -45,15 +45,15 @@ pub trait WeightInfo { pub struct SnowbridgeWeight(PhantomData); impl WeightInfo for SnowbridgeWeight { fn on_commit_no_messages() -> Weight { - Weight::from_ref_time(5_228_000 as u64) + Weight::from_parts(5_228_000 as u64, 0) .saturating_add(T::DbWeight::get().reads(2)) } fn on_commit(m: u32, p: u32, ) -> Weight { - Weight::from_ref_time(3_294_000 as u64) + Weight::from_parts(3_294_000 as u64, 0) // Standard Error: 31_000 - .saturating_add(Weight::from_ref_time(100_849_000 as u64).saturating_mul(m as u64)) + .saturating_add(Weight::from_parts(100_849_000 as u64, 0).saturating_mul(m as u64)) // Standard Error: 1_000 - .saturating_add(Weight::from_ref_time(3_880_000 as u64).saturating_mul(p as u64)) + .saturating_add(Weight::from_parts(3_880_000 as u64, 0).saturating_mul(p as u64)) .saturating_add(T::DbWeight::get().reads(3 as u64)) .saturating_add(T::DbWeight::get().writes(2 as u64)) } @@ -62,15 +62,15 @@ impl WeightInfo for SnowbridgeWeight { // For backwards compatibility and tests impl WeightInfo for () { fn on_commit_no_messages() -> Weight { - Weight::from_ref_time(5_228_000 as u64) + Weight::from_parts(5_228_000 as u64, 0) .saturating_add(RocksDbWeight::get().reads(2)) } fn on_commit(m: u32, p: u32, ) -> Weight { - Weight::from_ref_time(0 as u64) + Weight::from_parts(0 as u64, 0) // Standard Error: 31_000 - .saturating_add(Weight::from_ref_time(100_849_000 as u64).saturating_mul(m as u64)) + .saturating_add(Weight::from_parts(100_849_000 as u64, 0).saturating_mul(m as u64)) // Standard Error: 1_000 - .saturating_add(Weight::from_ref_time(3_880_000 as u64).saturating_mul(p as u64)) + .saturating_add(Weight::from_parts(3_880_000 as u64, 0).saturating_mul(p as u64)) .saturating_add(RocksDbWeight::get().reads(3 as u64)) .saturating_add(RocksDbWeight::get().writes(2 as u64)) } diff --git a/parachain/pallets/dispatch/Cargo.toml b/parachain/pallets/dispatch/Cargo.toml index 41be684a40..6cab442891 100644 --- a/parachain/pallets/dispatch/Cargo.toml +++ b/parachain/pallets/dispatch/Cargo.toml @@ -12,20 +12,20 @@ targets = [ "x86_64-unknown-linux-gnu" ] [dependencies] serde = { version = "1.0.137", optional = true } codec = { version = "3.1.5", package = "parity-scale-codec", default-features = false, features = [ "derive" ] } -scale-info = { version = "2.2.0", default-features = false, features = [ "derive" ] } +scale-info = { version = "2.3.1", default-features = false, features = [ "derive" ] } -frame-benchmarking = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.38", default-features = false, optional = true } -frame-support = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.38", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.38", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.38", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.38", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.38", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.38", default-features = false } +frame-benchmarking = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false, optional = true } +frame-support = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } snowbridge-core = { path = "../../primitives/core", default-features = false } [dev-dependencies] -sp-keyring = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.38" } +sp-keyring = { git = "https://github.com/paritytech/substrate.git", branch = "master" } hex-literal = { version = "0.3.4" } [features] diff --git a/parachain/pallets/dispatch/src/lib.rs b/parachain/pallets/dispatch/src/lib.rs index 1e32d93521..a87d9586e7 100644 --- a/parachain/pallets/dispatch/src/lib.rs +++ b/parachain/pallets/dispatch/src/lib.rs @@ -52,7 +52,6 @@ pub mod pallet { use frame_system::pallet_prelude::*; #[pallet::pallet] - #[pallet::generate_store(pub(super) trait Store)] pub struct Pallet(_); #[pallet::config] diff --git a/parachain/pallets/ethereum-beacon-client/Cargo.toml b/parachain/pallets/ethereum-beacon-client/Cargo.toml index 1dcc956353..ba7acf6cad 100644 --- a/parachain/pallets/ethereum-beacon-client/Cargo.toml +++ b/parachain/pallets/ethereum-beacon-client/Cargo.toml @@ -13,7 +13,7 @@ targets = ["x86_64-unknown-linux-gnu"] [dependencies] serde = { version = "1.0.137", optional = true } codec = { version = "3.1.5", package = "parity-scale-codec", default-features = false, features = [ "derive" ] } -scale-info = { version = "2.2.0", default-features = false, features = [ "derive" ] } +scale-info = { version = "2.3.1", default-features = false, features = [ "derive" ] } milagro_bls = { git = "https://github.com/Snowfork/milagro_bls", default-features = false } ssz-rs = { git = "https://github.com/ralexstokes/ssz-rs", default-features = false, rev="d18af912abacbf84219be37ab3b42a9abcf10d2a" } ssz-rs-derive = { git = "https://github.com/ralexstokes/ssz-rs", default-features = false, rev="d18af912abacbf84219be37ab3b42a9abcf10d2a" } @@ -21,24 +21,24 @@ byte-slice-cast = { version = "1.2.1", default-features = false } rlp = { version = "0.5", default-features = false } hex-literal = { version = "0.3.4", optional = true } -frame-benchmarking = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.38", default-features = false, optional = true } -frame-support = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.38", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.38", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.38", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.38", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.38", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.38", default-features = false } +frame-benchmarking = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false, optional = true } +frame-support = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } snowbridge-core = { path = "../../primitives/core", default-features = false } snowbridge-ethereum = { path = "../../primitives/ethereum", default-features = false } snowbridge-beacon-primitives = { path = "../../primitives/beacon", default-features = false } [dev-dependencies] -sp-keyring = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.38" } +sp-keyring = { git = "https://github.com/paritytech/substrate.git", branch = "master" } snowbridge-testutils = { path = "../../primitives/testutils" } serde_json = "1.0.68" hex-literal = { version = "0.3.4" } -pallet-timestamp = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.38", default-features = false } +pallet-timestamp = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } [features] default = ["std"] diff --git a/parachain/pallets/ethereum-beacon-client/src/lib.rs b/parachain/pallets/ethereum-beacon-client/src/lib.rs index 23b2c667b9..106b9ab6aa 100644 --- a/parachain/pallets/ethereum-beacon-client/src/lib.rs +++ b/parachain/pallets/ethereum-beacon-client/src/lib.rs @@ -73,7 +73,6 @@ pub mod pallet { use sp_core::U256; #[pallet::pallet] - #[pallet::generate_store(pub(super) trait Store)] pub struct Pallet(_); #[pallet::config] diff --git a/parachain/pallets/ethereum-beacon-client/src/weights.rs b/parachain/pallets/ethereum-beacon-client/src/weights.rs index 1e94f3d4b3..07148f9933 100644 --- a/parachain/pallets/ethereum-beacon-client/src/weights.rs +++ b/parachain/pallets/ethereum-beacon-client/src/weights.rs @@ -42,17 +42,17 @@ pub trait WeightInfo { pub struct SnowbridgeWeight(PhantomData); impl WeightInfo for SnowbridgeWeight { fn sync_committee_period_update() -> Weight { - Weight::from_ref_time(175_039_777_000 as u64) + Weight::from_parts(175_039_777_000 as u64, 0) .saturating_add(T::DbWeight::get().reads(4)) .saturating_add(T::DbWeight::get().writes(2)) } fn import_finalized_header() -> Weight { - Weight::from_ref_time(171_871_518_000 as u64) + Weight::from_parts(171_871_518_000 as u64, 0) .saturating_add(T::DbWeight::get().reads(3)) .saturating_add(T::DbWeight::get().writes(1)) } fn import_execution_header() -> Weight { - Weight::from_ref_time(166_011_885_000 as u64) + Weight::from_parts(166_011_885_000 as u64, 0) .saturating_add(T::DbWeight::get().reads(3)) .saturating_add(T::DbWeight::get().writes(1)) } @@ -61,17 +61,17 @@ impl WeightInfo for SnowbridgeWeight { // For backwards compatibility and tests impl WeightInfo for () { fn sync_committee_period_update() -> Weight { - Weight::from_ref_time(175_039_777_000 as u64) + Weight::from_parts(175_039_777_000 as u64, 0) .saturating_add(RocksDbWeight::get().reads(4)) .saturating_add(RocksDbWeight::get().writes(2)) } fn import_finalized_header() -> Weight { - Weight::from_ref_time(171_871_518_000 as u64) + Weight::from_parts(171_871_518_000 as u64, 0) .saturating_add(RocksDbWeight::get().reads(3)) .saturating_add(RocksDbWeight::get().writes(1)) } fn import_execution_header() -> Weight { - Weight::from_ref_time(166_011_885_000 as u64) + Weight::from_parts(166_011_885_000 as u64, 0) .saturating_add(RocksDbWeight::get().reads(3)) .saturating_add(RocksDbWeight::get().writes(1)) } diff --git a/parachain/pallets/xcm-support/Cargo.toml b/parachain/pallets/xcm-support/Cargo.toml deleted file mode 100644 index 74afe8d402..0000000000 --- a/parachain/pallets/xcm-support/Cargo.toml +++ /dev/null @@ -1,49 +0,0 @@ -[package] -name = "snowbridge-xcm-support" -description = "Snowbridge XCM Support Pallet" -version = "0.1.1" -edition = "2021" -authors = [ "Snowfork " ] -repository = "https://github.com/Snowfork/snowbridge" - -[package.metadata.docs.rs] -targets = [ "x86_64-unknown-linux-gnu" ] - -[dependencies] -codec = { version = "3.1.5", package = "parity-scale-codec", features = [ "derive" ], default-features = false } -scale-info = { version = "2.2.0", default-features = false, features = [ "derive" ] } - -frame-support = { git = "https://github.com/paritytech/substrate.git", default-features = false, branch = "polkadot-v0.9.38" } -frame-system = { git = "https://github.com/paritytech/substrate.git", default-features = false, branch = "polkadot-v0.9.38" } -sp-core = { git = "https://github.com/paritytech/substrate.git", default-features = false, branch = "polkadot-v0.9.38" } -sp-runtime = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.38", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.38", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.38", default-features = false } -pallet-xcm = { git = "https://github.com/paritytech/polkadot.git", branch = "release-v0.9.38", default-features = false } - -xcm = { git = "https://github.com/paritytech/polkadot.git", branch = "release-v0.9.38", default-features = false } -xcm-executor = { git = "https://github.com/paritytech/polkadot.git", branch = "release-v0.9.38", default-features = false } -xcm-builder = { git = "https://github.com/paritytech/polkadot.git", branch = "release-v0.9.38", default-features = false } - -snowbridge-xcm-support-primitives = { path = "../../primitives/xcm-support", default-features = false } - -[dev-dependencies] -serde = { version = "1.0.137" } - -[features] -default = [ "std" ] -std = [ - "codec/std", - "scale-info/std", - "frame-support/std", - "frame-system/std", - "sp-core/std", - "sp-runtime/std", - "sp-std/std", - "sp-io/std", - "pallet-xcm/std", - "xcm/std", - "xcm-executor/std", - "xcm-builder/std", - "snowbridge-xcm-support-primitives/std" -] diff --git a/parachain/pallets/xcm-support/src/lib.rs b/parachain/pallets/xcm-support/src/lib.rs deleted file mode 100644 index e4be610838..0000000000 --- a/parachain/pallets/xcm-support/src/lib.rs +++ /dev/null @@ -1,186 +0,0 @@ -//! # XCMP Support -//! -//! Includes an implementation for the `XcmReserveTransfer` trait, thus enabling -//! withdrawals and deposits to assets via XCMP message execution. - -#![cfg_attr(not(feature = "std"), no_std)] - -pub use pallet::*; - -#[frame_support::pallet] -pub mod pallet { - use frame_support::{ - ensure, log, - pallet_prelude::*, - storage::{with_transaction, TransactionOutcome}, - }; - use frame_system::pallet_prelude::*; - use snowbridge_xcm_support_primitives::{RemoteParachain, TransferInfo, XcmReserveTransfer}; - use sp_core::{H160, H256}; - use sp_runtime::DispatchError; - use sp_std::prelude::*; - use xcm::latest::prelude::*; - use xcm_executor::traits::WeightBounds; - - #[pallet::config] - pub trait Config: frame_system::Config { - type RuntimeEvent: From> + IsType<::RuntimeEvent>; - } - - #[pallet::pallet] - pub struct Pallet(_); - - #[pallet::genesis_config] - pub struct GenesisConfig {} - - #[cfg(feature = "std")] - impl Default for GenesisConfig { - fn default() -> Self { - Self {} - } - } - - #[pallet::genesis_build] - impl GenesisBuild for GenesisConfig { - fn build(&self) {} - } - - #[pallet::error] - pub enum Error { - /// Fee must be greater than zero. - ZeroFeeSpecified, - /// Message was not able to be weighed. - UnweighableMessage, - /// Xcm execution failed during initiation of request. - ExecutionFailed, - } - - #[pallet::hooks] - impl Hooks> for Pallet {} - - #[pallet::event] - #[pallet::generate_deposit(pub(super) fn deposit_event)] - pub enum Event { - /// The transfer was successfully sent to the destination - TransferSent(TransferInfo), - /// The transfer failed. However assets remain on the parachain. - TransferFailed { info: TransferInfo, error: DispatchError }, - } - - #[pallet::call] - impl Pallet {} - - impl Pallet - where - T: pallet_xcm::Config + Config, - { - fn reserve_transfer_unsafe( - asset_id: u128, - recipient: H256, - amount: u128, - destination: RemoteParachain, - ) -> Result<(), Error> { - ensure!(destination.fee > 0u128, Error::::ZeroFeeSpecified); - - let origin_location: MultiLocation = MultiLocation { - parents: 0, - interior: Junctions::X1(Junction::AccountId32 { - network: None, - id: recipient.into(), - }), - }; - - let mut message = Xcm(vec![ - WithdrawAsset( - vec![ - MultiAsset { - id: Concrete(MultiLocation { parents: 1, interior: Junctions::Here }), - fun: Fungible(destination.fee), - }, - MultiAsset { - id: AssetId::Concrete(MultiLocation { - parents: 0, - interior: Junctions::X1(Junction::GeneralIndex(asset_id)), - }), - fun: Fungibility::Fungible(amount), - }, - ] - .into(), - ), - DepositReserveAsset { - assets: MultiAssetFilter::Wild(All), - dest: MultiLocation { - parents: 1, - interior: Junctions::X1(Junction::Parachain(destination.para_id)), - }, - xcm: Xcm(vec![ - BuyExecution { - fees: MultiAsset { - id: Concrete(MultiLocation { - parents: 1, - interior: Junctions::Here, - }), - fun: Fungible(destination.fee), - }, - weight_limit: Unlimited, - }, - DepositAsset { assets: Wild(All), beneficiary: origin_location.clone() }, - ]), - }, - ]); - - let weight = - T::Weigher::weight(&mut message).map_err(|_| Error::::UnweighableMessage)?; - - let hash = message.using_encoded(sp_io::hashing::blake2_256); - - T::XcmExecutor::execute_xcm_in_credit(origin_location, message, hash, weight, weight) - .ensure_complete() - .map_err(|err| { - log::error!("Xcm execution failed. Reason: {:?}", err); - Error::::ExecutionFailed - })?; - - Ok(()) - } - } - - impl XcmReserveTransfer> for Pallet - where - T: pallet_xcm::Config + Config, - T::AccountId: AsRef<[u8; 32]>, - { - fn reserve_transfer( - asset_id: u128, - sender: H160, - recipient: &T::AccountId, - amount: u128, - destination: RemoteParachain, - ) { - let recipient: H256 = recipient.as_ref().into(); - - let result = with_transaction(|| { - let outcome = - Self::reserve_transfer_unsafe(asset_id, recipient, amount, destination); - match outcome { - Ok(()) => TransactionOutcome::Commit(Ok(())), - Err(error) => TransactionOutcome::Rollback(Err(DispatchError::from(error))), - } - }); - - let info = TransferInfo { - asset_id, - sender, - recipient, - amount, - para_id: destination.para_id, - fee: destination.fee, - }; - let event = match result { - Ok(()) => Event::::TransferSent(info), - Err(error) => Event::::TransferFailed { info, error }, - }; - Self::deposit_event(event); - } - } -} diff --git a/parachain/primitives/beacon/Cargo.toml b/parachain/primitives/beacon/Cargo.toml index bde02e630d..cae89bd895 100644 --- a/parachain/primitives/beacon/Cargo.toml +++ b/parachain/primitives/beacon/Cargo.toml @@ -8,15 +8,15 @@ edition = "2021" serde = { version = "1.0.137", optional = true, features = [ "derive" ] } hex = { version = "0.4", default-features = false } codec = { package = "parity-scale-codec", version = "3.1.5", default-features = false } -scale-info = { version = "2.2.0", default-features = false, features = [ "derive" ] } +scale-info = { version = "2.3.1", default-features = false, features = [ "derive" ] } rlp = { version = "0.5", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.38", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.38", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.38", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.38", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.38", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.38", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } snowbridge-ethereum = { path = "../../primitives/ethereum", default-features = false } diff --git a/parachain/primitives/core/Cargo.toml b/parachain/primitives/core/Cargo.toml index c11475b94e..07d921a47b 100644 --- a/parachain/primitives/core/Cargo.toml +++ b/parachain/primitives/core/Cargo.toml @@ -7,14 +7,14 @@ edition = "2021" [dependencies] serde = { version = "1.0.137", optional = true, features = [ "derive" ] } codec = { package = "parity-scale-codec", version = "3.1.5", default-features = false } -scale-info = { version = "2.2.0", default-features = false, features = [ "derive" ] } +scale-info = { version = "2.3.1", default-features = false, features = [ "derive" ] } snowbridge-ethereum = { path = "../ethereum", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.38", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.38", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.38", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.38", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.38", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } [dev-dependencies] hex = { package = "rustc-hex", version = "2.1.0", default-features = false } diff --git a/parachain/primitives/ethereum/Cargo.toml b/parachain/primitives/ethereum/Cargo.toml index 8069a91311..364a17aadc 100644 --- a/parachain/primitives/ethereum/Cargo.toml +++ b/parachain/primitives/ethereum/Cargo.toml @@ -5,10 +5,10 @@ authors = [ "Snowfork " ] edition = "2021" [dependencies] -serde = { version = "1.0.137", optional = true } +serde = { version = "1.0.156", optional = true } serde-big-array = { version = "0.3.2", optional = true, features = [ "const-generics" ] } codec = { package = "parity-scale-codec", version = "3.1.5", default-features = false, features = [ "derive" ] } -scale-info = { version = "2.2.0", default-features = false, features = [ "derive" ] } +scale-info = { version = "2.3.1", default-features = false, features = [ "derive" ] } ethbloom = { version = "0.13.0", default-features = false } ethereum-types = { version = "0.14.1", default-features = false, features = [ "codec", "rlp", "serialize" ] } hex = { package = "rustc-hex", version = "2.1.0", default-features = false } @@ -17,10 +17,10 @@ parity-bytes = { version = "0.1.2", default-features = false } rlp = { version = "0.5", default-features = false } #getrandom = { version = "0.2.1", features = [ "js" ] } -sp-io = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.38", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.38", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.38", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.38", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } ethabi = { git = "https://github.com/snowfork/ethabi-decode.git", package = "ethabi-decode", rev="6f63405bb33ef4365a1c62b72d499fa0f448118e", default-features = false } @@ -28,7 +28,7 @@ ethabi = { git = "https://github.com/snowfork/ethabi-decode.git", package = "eth wasm-bindgen-test = "0.3.19" snowbridge-testutils = { path = "../../primitives/testutils" } rand = "0.8.5" -serde = { version = "1.0", features = [ "derive" ] } +serde = { version = "1.0.156", features = [ "derive" ] } serde_json = "1.0.68" [features] diff --git a/parachain/primitives/xcm-support/Cargo.toml b/parachain/primitives/xcm-support/Cargo.toml deleted file mode 100644 index 6b07004b10..0000000000 --- a/parachain/primitives/xcm-support/Cargo.toml +++ /dev/null @@ -1,20 +0,0 @@ -[package] -name = "snowbridge-xcm-support-primitives" -version = "0.1.1" -authors = [ "Snowfork " ] -edition = "2021" - -[dependencies] -codec = { package = "parity-scale-codec", version = "3.1.5", default-features = false } -scale-info = { version = "2.2.0", default-features = false, features = [ "derive" ] } -serde = { version = "1.0.137", optional = true, features = [ "derive" ] } - -sp-core = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.38", default-features = false } - -[features] -default = [ "std" ] -std = [ - "codec/std", - "scale-info/std", - "serde", -] diff --git a/parachain/primitives/xcm-support/src/lib.rs b/parachain/primitives/xcm-support/src/lib.rs deleted file mode 100644 index c98f5b1ba1..0000000000 --- a/parachain/primitives/xcm-support/src/lib.rs +++ /dev/null @@ -1,51 +0,0 @@ -//! # XCMP Support -//! -//! Includes types and traits which enabling withdrawals and deposits to assets via XCMP message -//! execution. - -#![cfg_attr(not(feature = "std"), no_std)] - -use codec::{Decode, Encode}; -use scale_info::TypeInfo; -use sp_core::{RuntimeDebug, H160, H256}; - -/// Represents a remote parachain by id with a fee that will be used by -/// `XcmReserveTransfer::reserve_transfer` to send an asset to a remote -/// parachain. -#[derive(Encode, Decode, Copy, Clone, PartialEq, Eq, PartialOrd, RuntimeDebug, TypeInfo)] -#[cfg_attr(feature = "std", derive(serde::Serialize, serde::Deserialize))] -pub struct RemoteParachain { - /// The parachain id. - pub para_id: u32, - /// The fee required for XCM execution. - pub fee: u128, -} - -/// Represents information about an XCM transfer. -#[derive(Encode, Decode, Copy, Clone, PartialEq, Eq, PartialOrd, RuntimeDebug, TypeInfo)] -#[cfg_attr(feature = "std", derive(serde::Serialize, serde::Deserialize))] -pub struct TransferInfo { - /// The asset id on our parachain. - pub asset_id: u128, - // The senders Ethereum address. - pub sender: H160, - // The recipient Substrate address. - pub recipient: H256, - // The amount transferred. - pub amount: u128, - /// The destination parachain id. - pub para_id: u32, - /// The fee paid for the xcm request. - pub fee: u128, -} - -/// Transfers an asset to the destination parachain. Transfer failures are emitted by events. -pub trait XcmReserveTransfer { - fn reserve_transfer( - asset_id: u128, - sender: H160, - recipient: &AccountId, - amount: u128, - destination: RemoteParachain, - ); -} diff --git a/parachain/tools/query-events/Cargo.toml b/parachain/tools/query-events/Cargo.toml index c6ea6ccfc1..5892bdd530 100644 --- a/parachain/tools/query-events/Cargo.toml +++ b/parachain/tools/query-events/Cargo.toml @@ -4,10 +4,10 @@ version = "0.1.0" edition = "2021" [dependencies] -serde = "1.0.137" +serde = "1.0.156" serde_json = "1.0.81" serde-hex = "0.1.0" -clap = { version = "3.2.5", features = [ "derive" ] } +clap = { version = "4.1.11", features = [ "derive" ] } subxt = { git = "https://github.com/paritytech/subxt.git", rev = "0b2c31e3038ed061e22d06e0dbb6105e508aecff" } codec = { version = "3.1.5", package = "parity-scale-codec", features = [ "derive" ], default-features = false } tokio = { version = "1.8", features = ["rt-multi-thread", "macros", "time"] }