diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 74fbeca6..a05d8cb1 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -15,6 +15,8 @@ jobs: uses: codota/toolchain@00a8bf2bdcfe93aefd70422d3dec07337959d3a4 with: profile: minimal + - name: Install protobuf + run: sudo apt-get install -y protobuf-compiler - name: Install clippy run: rustup component add clippy - name: Run clippy diff --git a/Cargo.lock b/Cargo.lock index 4af3f63c..e85a1345 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -27,7 +27,7 @@ version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97" dependencies = [ - "gimli 0.27.0", + "gimli 0.27.2", ] [[package]] @@ -36,13 +36,44 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +[[package]] +name = "aead" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fc95d1bdb8e6666b2b217308eeeb09f2d6728d104be3e31916cc74d15420331" +dependencies = [ + "generic-array 0.14.7", +] + [[package]] name = "aead" version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b613b8e1e3cf911a086f53f03bf286f52fd7a7258e4fa606f0ef220d39d8877" dependencies = [ - "generic-array 0.14.6", + "generic-array 0.14.7", + "rand_core 0.6.4", +] + +[[package]] +name = "aead" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0" +dependencies = [ + "crypto-common", + "generic-array 0.14.7", +] + +[[package]] +name = "aes" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "884391ef1066acaa41e766ba8f596341b96e93ce34f9a43e7d24bf0a0eaf0561" +dependencies = [ + "aes-soft", + "aesni", + "cipher 0.2.5", ] [[package]] @@ -51,33 +82,90 @@ version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "cipher 0.3.0", "cpufeatures", "opaque-debug 0.3.0", ] +[[package]] +name = "aes" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "433cfd6710c9986c576a25ca913c39d66a6474107b406f34f91d4a8923395241" +dependencies = [ + "cfg-if", + "cipher 0.4.4", + "cpufeatures", +] + [[package]] name = "aes-gcm" version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df5f85a83a7d8b0442b6aa7b504b8212c1733da07b98aae43d4bc21b2cb3cdf6" dependencies = [ - "aead", - "aes", + "aead 0.4.3", + "aes 0.7.5", "cipher 0.3.0", - "ctr", - "ghash", + "ctr 0.8.0", + "ghash 0.4.4", + "subtle", +] + +[[package]] +name = "aes-gcm" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82e1366e0c69c9f927b1fa5ce2c7bf9eafc8f9268c0b9800729e8b267612447c" +dependencies = [ + "aead 0.5.2", + "aes 0.8.2", + "cipher 0.4.4", + "ctr 0.9.2", + "ghash 0.5.0", "subtle", ] +[[package]] +name = "aes-soft" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be14c7498ea50828a38d0e24a765ed2effe92a705885b57d029cd67d45744072" +dependencies = [ + "cipher 0.2.5", + "opaque-debug 0.3.0", +] + +[[package]] +name = "aesni" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea2e11f5e94c2f7d386164cc2aa1f97823fed6f259e486940a71c174dd01b0ce" +dependencies = [ + "cipher 0.2.5", + "opaque-debug 0.3.0", +] + [[package]] name = "ahash" version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" dependencies = [ - "getrandom 0.2.8", + "getrandom 0.2.9", + "once_cell", + "version_check", +] + +[[package]] +name = "ahash" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" +dependencies = [ + "cfg-if", + "getrandom 0.2.9", "once_cell", "version_check", ] @@ -92,10 +180,13 @@ dependencies = [ ] [[package]] -name = "always-assert" -version = "0.1.2" +name = "aho-corasick" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbf688625d06217d5b1bb0ea9d9c44a1635fd0ee3534466388d18203174f4d11" +checksum = "67fc08ce920c31afb70f013dcce1bfc3a3195de6a228474e45e1f145b36f8d04" +dependencies = [ + "memchr", +] [[package]] name = "android_system_properties" @@ -115,11 +206,60 @@ dependencies = [ "winapi", ] +[[package]] +name = "anstream" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "is-terminal", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d" + +[[package]] +name = "anstyle-parse" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e765fd216e48e067936442276d1d57399e37bce53c264d6fefbe298080cb57ee" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" +dependencies = [ + "windows-sys 0.48.0", +] + +[[package]] +name = "anstyle-wincon" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188" +dependencies = [ + "anstyle", + "windows-sys 0.48.0", +] + [[package]] name = "anyhow" -version = "1.0.66" +version = "1.0.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "216261ddc8289130e551ddcd5ce8a064710c0d064a4d2895c67151c92b5443f6" +checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8" [[package]] name = "approx" @@ -131,19 +271,22 @@ dependencies = [ ] [[package]] -name = "arrayref" -version = "0.3.6" +name = "arc-swap" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544" +checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6" [[package]] -name = "arrayvec" -version = "0.4.12" +name = "array-bytes" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd9fd44efafa8690358b7408d253adf110036b88f55672a933f01d616ad9b1b9" -dependencies = [ - "nodrop", -] +checksum = "f52f63c5c1316a16a4b35eaac8b76a98248961a533f061684cb2a7cb0eafb6c6" + +[[package]] +name = "arrayref" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" [[package]] name = "arrayvec" @@ -158,173 +301,116 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" [[package]] -name = "asn1_der" -version = "0.7.5" +name = "asn1-rs" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e22d1f4b888c298a027c99dc9048015fac177587de20fc30232a057dfbe24a21" +checksum = "30ff05a702273012438132f449575dbc804e27b2f3cbe3069aa237d26c98fa33" +dependencies = [ + "asn1-rs-derive 0.1.0", + "asn1-rs-impl", + "displaydoc", + "nom", + "num-traits", + "rusticata-macros", + "thiserror", + "time 0.3.21", +] [[package]] -name = "assert_matches" -version = "1.5.0" +name = "asn1-rs" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9" +checksum = "7f6fd5ddaf0351dff5b8da21b2fb4ff8e08ddd02857f0bf69c47639106c0fff0" +dependencies = [ + "asn1-rs-derive 0.4.0", + "asn1-rs-impl", + "displaydoc", + "nom", + "num-traits", + "rusticata-macros", + "thiserror", + "time 0.3.21", +] [[package]] -name = "async-attributes" -version = "1.1.2" +name = "asn1-rs-derive" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3203e79f4dd9bdda415ed03cf14dae5a2bf775c683a00f94e9cd1faf0f596e5" +checksum = "db8b7511298d5b7784b40b092d9e9dcd3a627a5707e4b5e507931ab0d44eeebf" dependencies = [ + "proc-macro2", "quote", - "syn", + "syn 1.0.109", + "synstructure", ] [[package]] -name = "async-channel" -version = "1.8.0" +name = "asn1-rs-derive" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf46fee83e5ccffc220104713af3292ff9bc7c64c7de289f66dae8e38d826833" +checksum = "726535892e8eae7e70657b4c8ea93d26b8553afb1ce617caee529ef96d7dee6c" dependencies = [ - "concurrent-queue", - "event-listener", - "futures-core", + "proc-macro2", + "quote", + "syn 1.0.109", + "synstructure", ] [[package]] -name = "async-executor" -version = "1.5.0" +name = "asn1-rs-impl" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17adb73da160dfb475c183343c8cccd80721ea5a605d3eb57125f0a7b7a92d0b" +checksum = "2777730b2039ac0f95f093556e61b6d26cebed5393ca6f152717777cec3a42ed" dependencies = [ - "async-lock", - "async-task", - "concurrent-queue", - "fastrand", - "futures-lite", - "slab", + "proc-macro2", + "quote", + "syn 1.0.109", ] [[package]] -name = "async-global-executor" -version = "2.3.1" +name = "asn1_der" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1b6f5d7df27bd294849f8eec66ecfc63d11814df7a4f5d74168a2394467b776" -dependencies = [ - "async-channel", - "async-executor", - "async-io", - "async-lock", - "blocking", - "futures-lite", - "once_cell", -] +checksum = "155a5a185e42c6b77ac7b88a15143d930a9e9727a5b7b77eed417404ab15c247" [[package]] name = "async-io" -version = "1.12.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c374dda1ed3e7d8f0d9ba58715f924862c63eae6849c92d3a18e7fbde9e2794" +checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" dependencies = [ "async-lock", "autocfg", + "cfg-if", "concurrent-queue", "futures-lite", - "libc", "log", "parking", "polling", + "rustix 0.37.19", "slab", "socket2", "waker-fn", - "windows-sys 0.42.0", ] [[package]] name = "async-lock" -version = "2.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8101efe8695a6c17e02911402145357e718ac92d3ff88ae8419e84b1707b685" -dependencies = [ - "event-listener", - "futures-lite", -] - -[[package]] -name = "async-process" -version = "1.6.0" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6381ead98388605d0d9ff86371043b5aa922a3905824244de40dc263a14fcba4" +checksum = "fa24f727524730b077666307f2734b4a1a1c57acb79193127dcc8914d5242dd7" dependencies = [ - "async-io", - "async-lock", - "autocfg", - "blocking", - "cfg-if 1.0.0", "event-listener", - "futures-lite", - "libc", - "signal-hook", - "windows-sys 0.42.0", -] - -[[package]] -name = "async-std" -version = "1.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62565bb4402e926b29953c785397c6dc0391b7b446e45008b0049eb43cec6f5d" -dependencies = [ - "async-attributes", - "async-channel", - "async-global-executor", - "async-io", - "async-lock", - "async-process", - "crossbeam-utils", - "futures-channel", - "futures-core", - "futures-io", - "futures-lite", - "gloo-timers", - "kv-log-macro", - "log", - "memchr", - "once_cell", - "pin-project-lite 0.2.9", - "pin-utils", - "slab", - "wasm-bindgen-futures", -] - -[[package]] -name = "async-std-resolver" -version = "0.21.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f2f8a4a203be3325981310ab243a28e6e4ea55b6519bffce05d41ab60e09ad8" -dependencies = [ - "async-std", - "async-trait", - "futures-io", - "futures-util", - "pin-utils", - "socket2", - "trust-dns-resolver", ] -[[package]] -name = "async-task" -version = "4.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a40729d2133846d9ed0ea60a8b9541bccddab49cd30f0715a1da672fe9a2524" - [[package]] name = "async-trait" -version = "0.1.59" +version = "0.1.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e6e93155431f3931513b243d371981bb2770112b370c82745a1d19d2f99364" +checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.16", ] [[package]] @@ -342,9 +428,9 @@ dependencies = [ [[package]] name = "atomic-waker" -version = "1.0.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "065374052e7df7ee4047b1160cca5e1467a12351a40b3da123c870ba0b8eda2a" +checksum = "1181e1e0d1fce796a03db1ae795d67167da795f9cf4a39c37589e85ef57f26d3" [[package]] name = "atty" @@ -352,7 +438,7 @@ version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" dependencies = [ - "hermit-abi", + "hermit-abi 0.1.19", "libc", "winapi", ] @@ -377,10 +463,10 @@ checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca" dependencies = [ "addr2line 0.19.0", "cc", - "cfg-if 1.0.0", + "cfg-if", "libc", - "miniz_oxide", - "object 0.30.0", + "miniz_oxide 0.6.2", + "object 0.30.3", "rustc-demangle", ] @@ -408,6 +494,18 @@ version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" +[[package]] +name = "base64" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a" + +[[package]] +name = "base64ct" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" + [[package]] name = "beef" version = "0.5.2" @@ -418,104 +516,19 @@ dependencies = [ ] [[package]] -name = "beefy-gadget" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" -dependencies = [ - "async-trait", - "beefy-primitives", - "fnv", - "futures", - "futures-timer", - "hex", - "log", - "parity-scale-codec", - "parking_lot 0.12.1", - "sc-chain-spec", - "sc-client-api", - "sc-consensus", - "sc-finality-grandpa", - "sc-keystore", - "sc-network", - "sc-network-gossip", - "sc-utils", - "sp-api", - "sp-application-crypto", - "sp-arithmetic", - "sp-blockchain", - "sp-consensus", - "sp-core", - "sp-keystore", - "sp-mmr-primitives", - "sp-runtime", - "substrate-prometheus-endpoint", - "thiserror", - "wasm-timer", -] - -[[package]] -name = "beefy-gadget-rpc" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" -dependencies = [ - "beefy-gadget", - "beefy-primitives", - "futures", - "jsonrpsee", - "log", - "parity-scale-codec", - "parking_lot 0.12.1", - "sc-rpc", - "sc-utils", - "serde", - "sp-core", - "sp-runtime", - "thiserror", -] - -[[package]] -name = "beefy-merkle-tree" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" -dependencies = [ - "beefy-primitives", - "sp-api", -] - -[[package]] -name = "beefy-primitives" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" -dependencies = [ - "parity-scale-codec", - "scale-info", - "sp-api", - "sp-application-crypto", - "sp-core", - "sp-runtime", - "sp-std", -] - -[[package]] -name = "bimap" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc0455254eb5c6964c4545d8bac815e1a1be4f3afe0ae695ea539c12d728d44b" - -[[package]] -name = "bincode" -version = "1.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" +name = "bincode" +version = "1.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" dependencies = [ "serde", ] [[package]] name = "bindgen" -version = "0.59.2" +version = "0.64.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bd2a9a458e8f4304c52c43ebb0cfbd520289f8379a52e329a38afda99bf8eb8" +checksum = "c4243e6031260db77ede97ad86c27e501d646a27ab57b59a574f725d98ab1fb4" dependencies = [ "bitflags", "cexpr", @@ -528,6 +541,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", + "syn 1.0.109", ] [[package]] @@ -565,43 +579,33 @@ dependencies = [ [[package]] name = "blake2" -version = "0.10.5" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b12e5fd123190ce1c2e559308a94c9bacad77907d4c6005d9e58fe1a0689e55e" +checksum = "46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe" dependencies = [ "digest 0.10.6", ] -[[package]] -name = "blake2-rfc" -version = "0.2.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d6d530bdd2d52966a6d03b7a964add7ae1a288d25214066fd4b600f0f796400" -dependencies = [ - "arrayvec 0.4.12", - "constant_time_eq 0.1.5", -] - [[package]] name = "blake2b_simd" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72936ee4afc7f8f736d1c38383b56480b5497b4617b4a77bdbf1d2ababc76127" +checksum = "3c2f0dc9a68c6317d884f97cc36cf5a3d20ba14ce404227df55e1af708ab04bc" dependencies = [ "arrayref", "arrayvec 0.7.2", - "constant_time_eq 0.1.5", + "constant_time_eq", ] [[package]] name = "blake2s_simd" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db539cc2b5f6003621f1cd9ef92d7ded8ea5232c7de0f9faa2de251cd98730d4" +checksum = "6637f448b9e61dfadbdcbae9a885fadee1f3eaffb1f8d3c1965d3ade8bdfd44f" dependencies = [ "arrayref", "arrayvec 0.7.2", - "constant_time_eq 0.1.5", + "constant_time_eq", ] [[package]] @@ -613,8 +617,8 @@ dependencies = [ "arrayref", "arrayvec 0.7.2", "cc", - "cfg-if 1.0.0", - "constant_time_eq 0.2.4", + "cfg-if", + "constant_time_eq", "digest 0.10.6", ] @@ -624,7 +628,7 @@ version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b" dependencies = [ - "block-padding", + "block-padding 0.1.5", "byte-tools", "byteorder", "generic-array 0.12.4", @@ -636,16 +640,26 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" dependencies = [ - "generic-array 0.14.6", + "generic-array 0.14.7", ] [[package]] name = "block-buffer" -version = "0.10.3" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +dependencies = [ + "generic-array 0.14.7", +] + +[[package]] +name = "block-modes" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e" +checksum = "57a0e8073e8baa88212fb5823574c02ebccb395136ba9a164ab89379ec6072f0" dependencies = [ - "generic-array 0.14.6", + "block-padding 0.2.1", + "cipher 0.2.5", ] [[package]] @@ -658,18 +672,10 @@ dependencies = [ ] [[package]] -name = "blocking" -version = "1.3.0" +name = "block-padding" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c67b173a56acffd6d2326fb7ab938ba0b00a71480e14902b2591c87bc5741e8" -dependencies = [ - "async-channel", - "async-lock", - "async-task", - "atomic-waker", - "fastrand", - "futures-lite", -] +checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae" [[package]] name = "bounded-vec" @@ -688,11 +694,12 @@ checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3" [[package]] name = "bstr" -version = "0.2.17" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223" +checksum = "c3d4260bcc2e8fc9df1eac4919a720effeb63a3f0952f5bf4944adfa18897f09" dependencies = [ "memchr", + "serde", ] [[package]] @@ -706,9 +713,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.11.1" +version = "3.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "572f695136211188308f16ad2ca5c851a712c464060ae6974944458eb83880ba" +checksum = "3c6ed94e98ecff0c12dd1b04c15ec0d7d9458ca8fe806cea6f12954efe74c63b" [[package]] name = "byte-slice-cast" @@ -724,9 +731,9 @@ checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" [[package]] name = "bytemuck" -version = "1.12.3" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aaa3a8d9a1ca92e282c96a32d6511b695d7d994d1d102ba85d279f9b2756947f" +checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea" [[package]] name = "byteorder" @@ -736,9 +743,9 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] name = "bytes" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfb24e866b15a1af2a1b663f10c6b6b8f397a84aadb828f12e5b289ec23a3a3c" +checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" [[package]] name = "bzip2-sys" @@ -753,9 +760,9 @@ dependencies = [ [[package]] name = "camino" -version = "1.1.1" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88ad0e1e3e88dd237a156ab9f571021b8a158caa0ae44b1968a241efb5144c1e" +checksum = "c530edf18f37068ac2d977409ed5cd50d53d73bc653c7647b48eb78976ac9ae2" dependencies = [ "serde", ] @@ -777,20 +784,31 @@ checksum = "4acbb09d9ee8e23699b9634375c72795d095bf268439da88562cf9b501f181fa" dependencies = [ "camino", "cargo-platform", - "semver 1.0.14", + "semver 1.0.17", "serde", "serde_json", ] [[package]] name = "cc" -version = "1.0.78" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a20104e2335ce8a659d6dd92a51a767a0c062599c73b343fd152cb401e828c3d" +checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" dependencies = [ "jobserver", ] +[[package]] +name = "ccm" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5aca1a8fbc20b50ac9673ff014abfb2b5f4085ee1a850d408f14a159c5853ac7" +dependencies = [ + "aead 0.3.2", + "cipher 0.2.5", + "subtle", +] + [[package]] name = "cexpr" version = "0.6.0" @@ -809,12 +827,6 @@ dependencies = [ "smallvec", ] -[[package]] -name = "cfg-if" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" - [[package]] name = "cfg-if" version = "1.0.0" @@ -833,7 +845,7 @@ version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5c80e5460aa66fe3b91d40bcbdab953a597b60053e34d684ac6903f863b680a6" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "cipher 0.3.0", "cpufeatures", "zeroize", @@ -845,7 +857,7 @@ version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a18446b09be63d457bbec447509e85f662f32952b035ce892290396bc0b0cff5" dependencies = [ - "aead", + "aead 0.4.3", "chacha20", "cipher 0.3.0", "poly1305", @@ -854,15 +866,15 @@ dependencies = [ [[package]] name = "chrono" -version = "0.4.23" +version = "0.4.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16b0a3d9ed01224b22057780a37bb8c5dbfe1be8ba48678e7bf57ec4b385411f" +checksum = "4e3c5919066adf22df73762e50cffcde3a758f2a848b113b586d1f86728b673b" dependencies = [ "iana-time-zone", "js-sys", "num-integer", "num-traits", - "time", + "time 0.1.45", "wasm-bindgen", "winapi", ] @@ -875,103 +887,97 @@ checksum = "f6ed9c8b2d17acb8110c46f1da5bf4a696d745e1474a16db0cd2b49cd0249bf2" dependencies = [ "core2", "multibase", - "multihash", + "multihash 0.16.3", "serde", "unsigned-varint", ] [[package]] name = "cipher" -version = "0.3.0" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ee52072ec15386f770805afd189a01c8841be8696bed250fa2f13c4c0d6dfb7" +checksum = "12f8e7987cbd042a63249497f41aed09f8e65add917ea6566effbc56578d6801" dependencies = [ - "generic-array 0.14.6", + "generic-array 0.14.7", ] [[package]] name = "cipher" -version = "0.4.3" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1873270f8f7942c191139cb8a40fd228da6c3fd2fc376d7e92d47aa14aeb59e" +checksum = "7ee52072ec15386f770805afd189a01c8841be8696bed250fa2f13c4c0d6dfb7" dependencies = [ - "crypto-common", - "inout", + "generic-array 0.14.7", ] [[package]] -name = "ckb-merkle-mountain-range" -version = "0.3.2" +name = "cipher" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f061f97d64fd1822664bdfb722f7ae5469a97b77567390f7442be5b5dc82a5b" +checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" dependencies = [ - "cfg-if 0.1.10", + "crypto-common", + "inout", ] [[package]] name = "clang-sys" -version = "1.4.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa2e27ae6ab525c3d369ded447057bca5438d86dc3a68f6faafb8269ba82ebf3" +checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f" dependencies = [ "glob", "libc", - "libloading 0.7.4", + "libloading", ] [[package]] name = "clap" -version = "3.2.23" +version = "4.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71655c45cb9845d3270c9d6df84ebe72b4dad3c2ba3f7023ad47c144e4e473a5" +checksum = "34d21f9bf1b425d2968943631ec91202fe5e837264063503708b83013f8fc938" dependencies = [ - "atty", - "bitflags", + "clap_builder", "clap_derive", - "clap_lex", - "indexmap", "once_cell", +] + +[[package]] +name = "clap_builder" +version = "4.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "914c8c79fb560f238ef6429439a30023c862f7a28e688c58f7203f12b29970bd" +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.16", ] [[package]] name = "clap_lex" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" -dependencies = [ - "os_str_bytes", -] - -[[package]] -name = "cmake" -version = "0.1.49" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db34956e100b30725f2eb215f90d4871051239535632f84fea3bc92722c66b7c" -dependencies = [ - "cc", -] +checksum = "8a2dd5a6fe8c6e3502f568a6353e5273bbb15193ad9a89e457b9970798efbea1" [[package]] name = "coarsetime" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "454038500439e141804c655b4cd1bc6a70bcb95cd2bc9463af5661b6956f0e46" +checksum = "a90d114103adbc625300f346d4d09dfb4ab1c4a8df6868435dd903392ecf4354" dependencies = [ "libc", "once_cell", @@ -990,42 +996,31 @@ dependencies = [ ] [[package]] -name = "comfy-table" -version = "6.1.3" +name = "colorchoice" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e621e7e86c46fd8a14c32c6ae3cb95656621b4743a27d0cffedb831d46e7ad21" -dependencies = [ - "strum", - "strum_macros", - "unicode-width", -] +checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" [[package]] name = "concurrent-queue" -version = "2.0.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd7bef69dc86e3c610e4e7aed41035e2a7ed12e72dd7530f61327a6579a4390b" +checksum = "62ec6771ecfa0762d24683ee5a32ad78487a3d3afdc0fb8cae19d2c5deb50b7c" dependencies = [ "crossbeam-utils", ] [[package]] name = "const-oid" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4c78c047431fee22c1a7bb92e00ad095a02a983affe4d8a72e2a2c62c1b94f3" - -[[package]] -name = "constant_time_eq" -version = "0.1.5" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" +checksum = "520fbf3c07483f94e3e3ca9d0cfd913d7718ef2483d2cfd91c0d9e91474ab913" [[package]] name = "constant_time_eq" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3ad85c1f65dc7b37604eb0e89748faf0b9653065f2a8ef69f96a687ec1e9279" +checksum = "13418e745008f7349ec7e449155f419a61b92b58a99cc3616942b926825ec76b" [[package]] name = "convert_case" @@ -1045,9 +1040,9 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" +checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" [[package]] name = "core2" @@ -1064,33 +1059,35 @@ version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eeaa953eaad386a53111e47172c2fedba671e5684c8dd601a5f474f4f118710f" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", ] [[package]] name = "cpufeatures" -version = "0.2.5" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320" +checksum = "3e4c1eaa2012c47becbbad2ab175484c2a84d1185b566fb2cc5b8707343dfe58" dependencies = [ "libc", ] [[package]] name = "cranelift-bforest" -version = "0.85.3" +version = "0.88.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "749d0d6022c9038dccf480bdde2a38d435937335bf2bb0f14e815d94517cdce8" +checksum = "52056f6d0584484b57fa6c1a65c1fcb15f3780d8b6a758426d9e3084169b2ddd" dependencies = [ "cranelift-entity", ] [[package]] name = "cranelift-codegen" -version = "0.85.3" +version = "0.88.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e94370cc7b37bf652ccd8bb8f09bd900997f7ccf97520edfc75554bb5c4abbea" +checksum = "18fed94c8770dc25d01154c3ffa64ed0b3ba9d583736f305fed7beebe5d9cf74" dependencies = [ + "arrayvec 0.7.2", + "bumpalo", "cranelift-bforest", "cranelift-codegen-meta", "cranelift-codegen-shared", @@ -1105,33 +1102,33 @@ dependencies = [ [[package]] name = "cranelift-codegen-meta" -version = "0.85.3" +version = "0.88.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0a3cea8fdab90e44018c5b9a1dfd460d8ee265ac354337150222a354628bdb6" +checksum = "1c451b81faf237d11c7e4f3165eeb6bac61112762c5cfe7b4c0fb7241474358f" dependencies = [ "cranelift-codegen-shared", ] [[package]] name = "cranelift-codegen-shared" -version = "0.85.3" +version = "0.88.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ac72f76f2698598951ab26d8c96eaa854810e693e7dd52523958b5909fde6b2" +checksum = "e7c940133198426d26128f08be2b40b0bd117b84771fd36798969c4d712d81fc" [[package]] name = "cranelift-entity" -version = "0.85.3" +version = "0.88.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09eaeacfcd2356fe0e66b295e8f9d59fdd1ac3ace53ba50de14d628ec902f72d" +checksum = "87a0f1b2fdc18776956370cf8d9b009ded3f855350c480c1c52142510961f352" dependencies = [ "serde", ] [[package]] name = "cranelift-frontend" -version = "0.85.3" +version = "0.88.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dba69c9980d5ffd62c18a2bde927855fcd7c8dc92f29feaf8636052662cbd99c" +checksum = "34897538b36b216cc8dd324e73263596d51b8cf610da6498322838b2546baf8a" dependencies = [ "cranelift-codegen", "log", @@ -1141,15 +1138,15 @@ dependencies = [ [[package]] name = "cranelift-isle" -version = "0.85.3" +version = "0.88.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2920dc1e05cac40304456ed3301fde2c09bd6a9b0210bcfa2f101398d628d5b" +checksum = "1b2629a569fae540f16a76b70afcc87ad7decb38dc28fa6c648ac73b51e78470" [[package]] name = "cranelift-native" -version = "0.85.3" +version = "0.88.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f04dfa45f9b2a6f587c564d6b63388e00cd6589d2df6ea2758cf79e1a13285e6" +checksum = "20937dab4e14d3e225c5adfc9c7106bafd4ac669bdb43027b911ff794c6fb318" dependencies = [ "cranelift-codegen", "libc", @@ -1158,9 +1155,9 @@ dependencies = [ [[package]] name = "cranelift-wasm" -version = "0.85.3" +version = "0.88.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31a46513ae6f26f3f267d8d75b5373d555fbbd1e68681f348d99df43f747ec54" +checksum = "80fc2288957a94fd342a015811479de1837850924166d1f1856d8406e6f3609b" dependencies = [ "cranelift-codegen", "cranelift-entity", @@ -1172,46 +1169,61 @@ dependencies = [ "wasmtime-types", ] +[[package]] +name = "crc" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86ec7a15cbe22e59248fc7eadb1907dab5ba09372595da4d73dd805ed4417dfe" +dependencies = [ + "crc-catalog", +] + +[[package]] +name = "crc-catalog" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cace84e55f07e7301bae1c519df89cdad8cc3cd868413d3fdbdeca9ff3db484" + [[package]] name = "crc32fast" version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", ] [[package]] name = "crossbeam-channel" -version = "0.5.6" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521" +checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "crossbeam-utils", ] [[package]] name = "crossbeam-deque" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "715e8152b692bba2d374b53d4875445368fdf21a94751410af607a5ac677d1fc" +checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "crossbeam-epoch", "crossbeam-utils", ] [[package]] name = "crossbeam-epoch" -version = "0.9.13" +version = "0.9.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01a9af1f4c2ef74bb8aa1f7e19706bc72d03598c8a570bb5de72243c7a9d9d5a" +checksum = "46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695" dependencies = [ "autocfg", - "cfg-if 1.0.0", + "cfg-if", "crossbeam-utils", - "memoffset 0.7.1", + "memoffset 0.8.0", "scopeguard", ] @@ -1221,17 +1233,17 @@ version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d1cfb3ea8a53f37c40dea2c7bedcbd88bdfae54f5e2175d6ecaff1c988353add" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "crossbeam-utils", ] [[package]] name = "crossbeam-utils" -version = "0.8.14" +version = "0.8.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb766fa798726286dbbb842f174001dab8abc7b627a1dd86e0b7222a95d929f" +checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", ] [[package]] @@ -1242,11 +1254,11 @@ checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" [[package]] name = "crypto-bigint" -version = "0.3.2" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03c6a1d5fa1de37e071642dfa44ec552ca5b299adb128fab16138e24b548fd21" +checksum = "ef2b4b23cddf68b89b8f8069890e8c270d54e2d5fe1b143820234805e4cb17ef" dependencies = [ - "generic-array 0.14.6", + "generic-array 0.14.7", "rand_core 0.6.4", "subtle", "zeroize", @@ -1258,7 +1270,8 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" dependencies = [ - "generic-array 0.14.6", + "generic-array 0.14.7", + "rand_core 0.6.4", "typenum", ] @@ -1268,7 +1281,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b584a330336237c1eecd3e94266efb216c56ed91225d634cb2991c5f3fd1aeab" dependencies = [ - "generic-array 0.14.6", + "generic-array 0.14.7", "subtle", ] @@ -1278,7 +1291,7 @@ version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b1d1a86f49236c215f271d40892d5fc950490551400b02ef360692c29815c714" dependencies = [ - "generic-array 0.14.6", + "generic-array 0.14.7", "subtle", ] @@ -1289,7 +1302,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096" dependencies = [ "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -1302,20 +1315,18 @@ dependencies = [ ] [[package]] -name = "cuckoofilter" -version = "0.5.0" +name = "ctr" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b810a8449931679f64cd7eef1bbd0fa315801b6d5d9cdc1ace2804d6529eee18" +checksum = "0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835" dependencies = [ - "byteorder", - "fnv", - "rand 0.7.3", + "cipher 0.4.4", ] [[package]] name = "cumulus-pallet-parachain-system" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.29#2fa95572487cfcf8dbe6941bf93545c39d47f784" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.38#9b4e0247137f158d1a35118197d34adfa58858b7" dependencies = [ "bytes", "cumulus-pallet-parachain-system-proc-macro", @@ -1326,11 +1337,9 @@ dependencies = [ "frame-system", "impl-trait-for-tuples", "log", - "pallet-balances", "parity-scale-codec", - "polkadot-parachain 0.9.29 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.29)", + "polkadot-parachain", "scale-info", - "serde", "sp-core", "sp-externalities", "sp-inherents", @@ -1340,40 +1349,40 @@ dependencies = [ "sp-std", "sp-trie", "sp-version", - "xcm 0.9.29 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.29)", + "xcm", ] [[package]] name = "cumulus-pallet-parachain-system-proc-macro" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.29#2fa95572487cfcf8dbe6941bf93545c39d47f784" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.38#9b4e0247137f158d1a35118197d34adfa58858b7" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] name = "cumulus-primitives-core" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.29#2fa95572487cfcf8dbe6941bf93545c39d47f784" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.38#9b4e0247137f158d1a35118197d34adfa58858b7" dependencies = [ - "frame-support", "parity-scale-codec", - "polkadot-core-primitives 0.9.29 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.29)", - "polkadot-parachain 0.9.29 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.29)", + "polkadot-core-primitives", + "polkadot-parachain", "polkadot-primitives", "sp-api", "sp-runtime", "sp-std", "sp-trie", + "xcm", ] [[package]] name = "cumulus-primitives-parachain-inherent" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.29#2fa95572487cfcf8dbe6941bf93545c39d47f784" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.38#9b4e0247137f158d1a35118197d34adfa58858b7" dependencies = [ "async-trait", "cumulus-primitives-core", @@ -1396,30 +1405,26 @@ dependencies = [ [[package]] name = "cumulus-relay-chain-interface" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.29#2fa95572487cfcf8dbe6941bf93545c39d47f784" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.38#9b4e0247137f158d1a35118197d34adfa58858b7" dependencies = [ "async-trait", "cumulus-primitives-core", - "derive_more", "futures", "jsonrpsee-core", "parity-scale-codec", - "parking_lot 0.12.1", "polkadot-overseer", - "polkadot-service", "sc-client-api", "sp-api", "sp-blockchain", - "sp-core", - "sp-runtime", "sp-state-machine", "thiserror", + "tokio", ] [[package]] name = "cumulus-test-relay-sproof-builder" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.29#2fa95572487cfcf8dbe6941bf93545c39d47f784" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.38#9b4e0247137f158d1a35118197d34adfa58858b7" dependencies = [ "cumulus-primitives-core", "parity-scale-codec", @@ -1457,11 +1462,11 @@ dependencies = [ [[package]] name = "curve25519-dalek" -version = "4.0.0-pre.5" +version = "4.0.0-rc.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67bc65846be335cb20f4e52d49a437b773a2c1fdb42b19fc84e79e6f6771536f" +checksum = "8d4ba9852b42210c7538b75484f9daa0655e9a3ac04f693747bb0f02cf3cfe16" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "fiat-crypto", "packed_simd_2", "platforms", @@ -1471,9 +1476,9 @@ dependencies = [ [[package]] name = "cxx" -version = "1.0.83" +version = "1.0.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdf07d07d6531bfcdbe9b8b739b104610c6508dcc4d63b410585faf338241daf" +checksum = "f61f1b6389c3fe1c316bf8a4dccc90a38208354b330925bce1f74a6c4756eb93" dependencies = [ "cc", "cxxbridge-flags", @@ -1483,9 +1488,9 @@ dependencies = [ [[package]] name = "cxx-build" -version = "1.0.83" +version = "1.0.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2eb5b96ecdc99f72657332953d4d9c50135af1bac34277801cc3937906ebd39" +checksum = "12cee708e8962df2aeb38f594aae5d827c022b6460ac71a7a3e2c3c2aae5a07b" dependencies = [ "cc", "codespan-reporting", @@ -1493,24 +1498,59 @@ dependencies = [ "proc-macro2", "quote", "scratch", - "syn", + "syn 2.0.16", ] [[package]] name = "cxxbridge-flags" -version = "1.0.83" +version = "1.0.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac040a39517fd1674e0f32177648334b0f4074625b5588a64519804ba0553b12" +checksum = "7944172ae7e4068c533afbb984114a56c46e9ccddda550499caa222902c7f7bb" [[package]] name = "cxxbridge-macro" -version = "1.0.83" +version = "1.0.94" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2345488264226bf682893e25de0769f3360aac9957980ec49361b083ddaa5bc5" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.16", +] + +[[package]] +name = "darling" +version = "0.14.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850" +dependencies = [ + "darling_core", + "darling_macro", +] + +[[package]] +name = "darling_core" +version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1362b0ddcfc4eb0a1f57b68bd77dd99f0e826958a96abd0ae9bd092e114ffed6" +checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0" dependencies = [ + "fnv", + "ident_case", "proc-macro2", "quote", - "syn", + "strsim", + "syn 1.0.109", +] + +[[package]] +name = "darling_macro" +version = "0.14.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e" +dependencies = [ + "darling_core", + "quote", + "syn 1.0.109", ] [[package]] @@ -1536,16 +1576,46 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a5bbed42daaa95e780b60a50546aa345b8413a1e46f9a40a12907d3598f038db" dependencies = [ "data-encoding", - "syn", + "syn 1.0.109", ] [[package]] name = "der" -version = "0.5.1" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6919815d73839e7ad218de758883aae3a257ba6759ce7a9992501efbb53d705c" +checksum = "f1a467a65c5e759bce6e65eaf91cc29f466cdc57cb65777bd646872a8a1fd4de" dependencies = [ "const-oid", + "pem-rfc7468", + "zeroize", +] + +[[package]] +name = "der-parser" +version = "7.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe398ac75057914d7d07307bf67dc7f3f574a26783b4fc7805a20ffa9f506e82" +dependencies = [ + "asn1-rs 0.3.1", + "displaydoc", + "nom", + "num-bigint", + "num-traits", + "rusticata-macros", +] + +[[package]] +name = "der-parser" +version = "8.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbd676fbbab537128ef0278adb5576cf363cff6aa22a7b24effe97347cfab61e" +dependencies = [ + "asn1-rs 0.5.2", + "displaydoc", + "nom", + "num-bigint", + "num-traits", + "rusticata-macros", ] [[package]] @@ -1556,7 +1626,49 @@ checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", +] + +[[package]] +name = "derive-syn-parse" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e79116f119dd1dba1abf1f3405f03b9b0e79a27a3883864bfebded8a3dc768cd" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "derive_builder" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d07adf7be193b71cc36b193d0f5fe60b918a3a9db4dad0449f57bcfd519704a3" +dependencies = [ + "derive_builder_macro", +] + +[[package]] +name = "derive_builder_core" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f91d4cfa921f1c05904dc3c57b4a32c38aed3340cce209f3a6fd1478babafc4" +dependencies = [ + "darling", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "derive_builder_macro" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f0314b72bed045f3a68671b3c86328386762c93f82d98c65c3cb5e5f573dd68" +dependencies = [ + "derive_builder_core", + "syn 1.0.109", ] [[package]] @@ -1569,7 +1681,7 @@ dependencies = [ "proc-macro2", "quote", "rustc_version", - "syn", + "syn 1.0.109", ] [[package]] @@ -1578,6 +1690,12 @@ version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" +[[package]] +name = "difflib" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8" + [[package]] name = "digest" version = "0.8.1" @@ -1593,7 +1711,7 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" dependencies = [ - "generic-array 0.14.6", + "generic-array 0.14.7", ] [[package]] @@ -1602,7 +1720,7 @@ version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" dependencies = [ - "block-buffer 0.10.3", + "block-buffer 0.10.4", "crypto-common", "subtle", ] @@ -1622,7 +1740,7 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "339ee130d97a610ea5a5872d2bbb130fdf68884ff09d3028b81bec8a1ac23bbc" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "dirs-sys-next", ] @@ -1649,15 +1767,22 @@ dependencies = [ ] [[package]] -name = "dns-parser" -version = "0.8.0" +name = "displaydoc" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4d33be9473d06f75f58220f71f7a9317aca647dc061dbd3c361b0bef505fbea" +checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ - "byteorder", - "quick-error 1.2.3", + "proc-macro2", + "quote", + "syn 2.0.16", ] +[[package]] +name = "downcast" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1435fa1053d8b2fbbe9be7e97eca7f33d37b28409959813daefc1446a14247f1" + [[package]] name = "downcast-rs" version = "1.2.0" @@ -1666,9 +1791,9 @@ checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" [[package]] name = "dtoa" -version = "1.0.4" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8a6eee2d5d0d113f015688310da018bd1d864d86bd567c8fca9c266889e1bfa" +checksum = "65d09067bfacaa79114679b279d7f5885b53295b1e2cfb4e79c8e4bd3d633169" [[package]] name = "dyn-clonable" @@ -1688,20 +1813,20 @@ checksum = "558e40ea573c374cf53507fd240b7ee2f5477df7cfebdb97323ec61c719399c5" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] name = "dyn-clone" -version = "1.0.9" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f94fa09c2aeea5b8839e414b7b841bf429fd25b9c522116ac97ee87856d88b2" +checksum = "68b0cf012f1230e43cd00ebb729c6bb58707ecfa8ad08b52ef3a4ccd2697fc30" [[package]] name = "ecdsa" -version = "0.13.4" +version = "0.14.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0d69ae62e0ce582d56380743515fefaf1a8c70cec685d9677636d7e30ae9dc9" +checksum = "413301934810f597c1d19ca71c8710e99a3f1ba28a0d2ebc01551a2daeea3c5c" dependencies = [ "der", "elliptic-curve", @@ -1711,9 +1836,9 @@ dependencies = [ [[package]] name = "ed25519" -version = "1.5.2" +version = "1.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e9c280362032ea4203659fc489832d0204ef09f247a0506f170dafcac08c369" +checksum = "91cff35c70bba8a626e3185d8cd48cc11b5437e1a5bcd15b9b5fa3c64b6dfee7" dependencies = [ "signature", ] @@ -1748,22 +1873,26 @@ dependencies = [ [[package]] name = "either" -version = "1.8.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797" +checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" [[package]] name = "elliptic-curve" -version = "0.11.12" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25b477563c2bfed38a3b7a60964c49e058b2510ad3f12ba3483fd8f62c2306d6" +checksum = "e7bb888ab5300a19b8e5bceef25ac745ad065f3c9f7efc6de1b91958110891d3" dependencies = [ "base16ct", "crypto-bigint", "der", + "digest 0.10.6", "ff", - "generic-array 0.14.6", + "generic-array 0.14.7", "group", + "hkdf", + "pem-rfc7468", + "pkcs8", "rand_core 0.6.4", "sec1", "subtle", @@ -1772,55 +1901,24 @@ dependencies = [ [[package]] name = "enum-as-inner" -version = "0.4.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21cdad81446a7f7dc43f6a77409efeb9733d2fa65553efef6018ef257c959b73" +checksum = "c9720bba047d567ffc8a3cba48bf19126600e249ab7f128e9233e6376976a116" dependencies = [ "heck", "proc-macro2", "quote", - "syn", -] - -[[package]] -name = "enumflags2" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e75d4cd21b95383444831539909fbb14b9dc3fdceb2a6f5d36577329a1f55ccb" -dependencies = [ - "enumflags2_derive", -] - -[[package]] -name = "enumflags2_derive" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f58dc3c5e468259f19f2d46304a6b28f1c3d034442e14b322d2b850e36f6d5ae" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "enumn" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "038b1afa59052df211f9efd58f8b1d84c242935ede1c3dbaed26b018a9e06ae2" -dependencies = [ - "proc-macro2", - "quote", - "syn", + "syn 1.0.109", ] [[package]] name = "env_logger" -version = "0.9.3" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a12e6657c4c97ebab115a42dcee77225f7f482cdd841cf7088c657a42e9e00e7" +checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" dependencies = [ - "atty", "humantime", + "is-terminal", "log", "regex", "termcolor", @@ -1843,6 +1941,17 @@ dependencies = [ "winapi", ] +[[package]] +name = "errno" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" +dependencies = [ + "errno-dragonfly", + "libc", + "windows-sys 0.48.0", +] + [[package]] name = "errno-dragonfly" version = "0.1.2" @@ -1890,7 +1999,7 @@ dependencies = [ "fs-err", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -1907,9 +2016,9 @@ checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" [[package]] name = "fastrand" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499" +checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" dependencies = [ "instant", ] @@ -1935,7 +2044,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn", + "syn 1.0.109", "thiserror", ] @@ -1950,9 +2059,9 @@ dependencies = [ [[package]] name = "ff" -version = "0.11.1" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "131655483be284720a17d74ff97592b8e76576dc25563148601df2d7c9080924" +checksum = "d013fc25338cc558c5c2cfbad646908fb23591e2404481826742b651c9af7160" dependencies = [ "rand_core 0.6.4", "subtle", @@ -1960,15 +2069,15 @@ dependencies = [ [[package]] name = "fiat-crypto" -version = "0.1.17" +version = "0.1.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a214f5bb88731d436478f3ae1f8a277b62124089ba9fb67f4f93fb100ef73c90" +checksum = "e825f6987101665dea6ec934c09ec6d721de7bc1bf92248e1d5810c8cd636b77" [[package]] name = "file-per-thread-logger" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21e16290574b39ee41c71aeb90ae960c504ebaf1e2a1c87bd52aa56ed6e1a02f" +checksum = "84f2e425d9790201ba4af4630191feac6dcc98765b118d4d18e91d23c2353866" dependencies = [ "env_logger", "log", @@ -1976,21 +2085,21 @@ dependencies = [ [[package]] name = "filetime" -version = "0.2.19" +version = "0.2.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e884668cd0c7480504233e951174ddc3b382f7c2666e3b7310b5c4e7b0c37f9" +checksum = "5cbc844cecaee9d4443931972e1289c8ff485cb4cc2767cb03ca139ed6885153" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "libc", - "redox_syscall", - "windows-sys 0.42.0", + "redox_syscall 0.2.16", + "windows-sys 0.48.0", ] [[package]] name = "finality-grandpa" -version = "0.16.0" +version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b22349c6a11563a202d95772a68e0fcf56119e74ea8a2a19cf2301460fcd0df5" +checksum = "36530797b9bf31cd4ff126dcfee8170f86b00cfdcea3269d73133cc0415945c3" dependencies = [ "either", "futures", @@ -2017,9 +2126,9 @@ dependencies = [ [[package]] name = "fixed-hash" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfcf0ed7fe52a17a03854ec54a9f76d6d84508d1c0e66bc1793301c73fc8493c" +checksum = "835c052cb0c08c1acf6ffd71c022172e18723949c8282f2b9f27efbc51e64534" dependencies = [ "byteorder", "rand 0.8.5", @@ -2027,15 +2136,6 @@ dependencies = [ "static_assertions", ] -[[package]] -name = "fixed-hash" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "835c052cb0c08c1acf6ffd71c022172e18723949c8282f2b9f27efbc51e64534" -dependencies = [ - "static_assertions", -] - [[package]] name = "fixedbitset" version = "0.4.2" @@ -2044,13 +2144,22 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flate2" -version = "1.0.25" +version = "1.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841" +checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" dependencies = [ "crc32fast", "libz-sys", - "miniz_oxide", + "miniz_oxide 0.7.1", +] + +[[package]] +name = "float-cmp" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4" +dependencies = [ + "num-traits", ] [[package]] @@ -2062,7 +2171,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "fork-tree" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#bcff60a227d455d95b4712b6cb356ce56b1ff672" dependencies = [ "parity-scale-codec", ] @@ -2076,12 +2185,19 @@ dependencies = [ "percent-encoding", ] +[[package]] +name = "fragile" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa" + [[package]] name = "frame-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#bcff60a227d455d95b4712b6cb356ce56b1ff672" dependencies = [ "frame-support", + "frame-support-procedural", "frame-system", "linregress", "log", @@ -2097,109 +2213,16 @@ dependencies = [ "sp-runtime-interface", "sp-std", "sp-storage", -] - -[[package]] -name = "frame-benchmarking-cli" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" -dependencies = [ - "Inflector", - "chrono", - "clap", - "comfy-table", - "frame-benchmarking", - "frame-support", - "frame-system", - "gethostname", - "handlebars", - "hash-db", - "hex", - "itertools", - "kvdb", - "lazy_static", - "linked-hash-map", - "log", - "memory-db", - "parity-scale-codec", - "rand 0.8.5", - "rand_pcg 0.3.1", - "sc-block-builder", - "sc-cli", - "sc-client-api", - "sc-client-db", - "sc-executor", - "sc-service", - "sc-sysinfo", - "serde", - "serde_json", - "serde_nanos", - "sp-api", - "sp-blockchain", - "sp-core", - "sp-database", - "sp-externalities", - "sp-inherents", - "sp-keystore", - "sp-runtime", - "sp-state-machine", - "sp-storage", - "sp-trie", - "tempfile", - "thiserror", - "thousands", -] - -[[package]] -name = "frame-election-provider-solution-type" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" -dependencies = [ - "proc-macro-crate", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "frame-election-provider-support" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" -dependencies = [ - "frame-election-provider-solution-type", - "frame-support", - "frame-system", - "parity-scale-codec", - "scale-info", - "sp-arithmetic", - "sp-npos-elections", - "sp-runtime", - "sp-std", -] - -[[package]] -name = "frame-executive" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" -dependencies = [ - "frame-support", - "frame-system", - "parity-scale-codec", - "scale-info", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", - "sp-tracing", + "static_assertions", ] [[package]] name = "frame-metadata" -version = "15.0.0" +version = "15.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df6bb8542ef006ef0de09a5c4420787d79823c0ed7924225822362fd2bf2ff2d" +checksum = "878babb0b136e731cc77ec2fd883ff02745ff21e6fb662729953d44923df009c" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "parity-scale-codec", "scale-info", "serde", @@ -2208,7 +2231,7 @@ dependencies = [ [[package]] name = "frame-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#bcff60a227d455d95b4712b6cb356ce56b1ff672" dependencies = [ "bitflags", "frame-metadata", @@ -2233,49 +2256,51 @@ dependencies = [ "sp-state-machine", "sp-std", "sp-tracing", + "sp-weights", "tt-call", ] [[package]] name = "frame-support-procedural" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#bcff60a227d455d95b4712b6cb356ce56b1ff672" dependencies = [ "Inflector", "cfg-expr", + "derive-syn-parse", "frame-support-procedural-tools", "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?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#bcff60a227d455d95b4712b6cb356ce56b1ff672" 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?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#bcff60a227d455d95b4712b6cb356ce56b1ff672" 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?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#bcff60a227d455d95b4712b6cb356ce56b1ff672" dependencies = [ "frame-support", "log", @@ -2287,12 +2312,13 @@ dependencies = [ "sp-runtime", "sp-std", "sp-version", + "sp-weights", ] [[package]] name = "frame-system-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#bcff60a227d455d95b4712b6cb356ce56b1ff672" dependencies = [ "frame-benchmarking", "frame-support", @@ -2304,45 +2330,12 @@ dependencies = [ "sp-std", ] -[[package]] -name = "frame-system-rpc-runtime-api" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" -dependencies = [ - "parity-scale-codec", - "sp-api", -] - -[[package]] -name = "frame-try-runtime" -version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" -dependencies = [ - "frame-support", - "parity-scale-codec", - "sp-api", - "sp-runtime", - "sp-std", -] - [[package]] name = "fs-err" version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0845fa252299212f0389d64ba26f34fa32cfe41588355f21ed507c59a0f64541" -[[package]] -name = "fs-swap" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03d47dad3685eceed8488986cad3d5027165ea5edb164331770e2059555f10a5" -dependencies = [ - "lazy_static", - "libc", - "libloading 0.5.2", - "winapi", -] - [[package]] name = "fs2" version = "0.4.3" @@ -2353,12 +2346,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "fs_extra" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2022715d62ab30faffd124d40b76f4134a550a87792276512b18d63272333394" - [[package]] name = "funty" version = "2.0.0" @@ -2367,9 +2354,9 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" [[package]] name = "futures" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38390104763dc37a5145a53c29c63c1290b5d316d6086ec32c293f6736051bb0" +checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" dependencies = [ "futures-channel", "futures-core", @@ -2382,9 +2369,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52ba265a92256105f45b719605a571ffe2d1f0fea3807304b522c1d778f79eed" +checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" dependencies = [ "futures-core", "futures-sink", @@ -2392,15 +2379,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04909a7a7e4633ae6c4a9ab280aeb86da1236243a77b694a49eacd659a4bd3ac" +checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" [[package]] name = "futures-executor" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7acc85df6714c176ab5edf386123fafe217be88c0840ec11f199441134a074e2" +checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" dependencies = [ "futures-core", "futures-task", @@ -2410,15 +2397,15 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00f5fb52a06bdcadeb54e8d3671f8888a39697dcb0b81b23b55174030427f4eb" +checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" [[package]] name = "futures-lite" -version = "1.12.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7694489acd39452c77daa48516b894c153f192c3578d5a839b62c58099fcbf48" +checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" dependencies = [ "fastrand", "futures-core", @@ -2431,13 +2418,13 @@ dependencies = [ [[package]] name = "futures-macro" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdfb8ce053d86b91919aad980c220b1fb8401a9394410e1c289ed7e66b61835d" +checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.16", ] [[package]] @@ -2447,21 +2434,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2411eed028cdf8c8034eaf21f9915f956b6c3abec4d4c7949ee67f0721127bd" dependencies = [ "futures-io", - "rustls", - "webpki", + "rustls 0.20.8", + "webpki 0.22.0", ] [[package]] name = "futures-sink" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39c15cf1a4aa79df40f1bb462fb39676d0ad9e366c2a33b590d7c66f4f81fcf9" +checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" [[package]] name = "futures-task" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ffb393ac5d9a6eaa9d3fdf37ae2776656b706e200c8e16b1bdb227f5198e6ea" +checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" [[package]] name = "futures-timer" @@ -2471,9 +2458,9 @@ checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" [[package]] name = "futures-util" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "197676987abd2f9cadff84926f410af1c183608d36641465df73ae8211dc65d6" +checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" dependencies = [ "futures-channel", "futures-core", @@ -2507,44 +2494,32 @@ dependencies = [ [[package]] name = "generic-array" -version = "0.14.6" +version = "0.14.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" dependencies = [ "typenum", "version_check", ] -[[package]] -name = "gethostname" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1ebd34e35c46e00bb73e81363248d627782724609fe1b6396f553f68fe3862e" -dependencies = [ - "libc", - "winapi", -] - [[package]] name = "getrandom" version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" dependencies = [ - "cfg-if 1.0.0", - "js-sys", + "cfg-if", "libc", "wasi 0.9.0+wasi-snapshot-preview1", - "wasm-bindgen", ] [[package]] name = "getrandom" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" +checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "libc", "wasi 0.11.0+wasi-snapshot-preview1", ] @@ -2556,7 +2531,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1583cc1656d7839fd3732b80cf4f38850336cdb9b8ded1cd399ca62958de3c99" dependencies = [ "opaque-debug 0.3.0", - "polyval", + "polyval 0.5.3", +] + +[[package]] +name = "ghash" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d930750de5717d2dd0b8c0d42c076c0e884c81a73e6cab859bbd2339c71e3e40" +dependencies = [ + "opaque-debug 0.3.0", + "polyval 0.6.0", ] [[package]] @@ -2572,56 +2557,44 @@ dependencies = [ [[package]] name = "gimli" -version = "0.27.0" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dec7af912d60cdbd3677c1af9352ebae6fb8394d165568a2234df0fa00f87793" +checksum = "ad0a93d233ebf96623465aad4046a8d3aa4da22d4f4beba5388838c8a434bbb4" [[package]] name = "glob" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "globset" -version = "0.4.9" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a1e17342619edbc21a964c2afbeb6c820c6a2560032872f397bb97ea127bd0a" +checksum = "029d74589adefde59de1a0c4f4732695c32805624aec7b68d91503d4dba79afc" dependencies = [ - "aho-corasick", + "aho-corasick 0.7.20", "bstr", "fnv", "log", "regex", ] -[[package]] -name = "gloo-timers" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98c4a8d6391675c6b2ee1a6c8d06e8e2d03605c44cec1270675985a4c2a5500b" -dependencies = [ - "futures-channel", - "futures-core", - "js-sys", - "wasm-bindgen", -] - [[package]] name = "gmp-mpfr-sys" -version = "1.4.12" +version = "1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cadbfa1c6e195c872db93b584e63b751f2fc86f59af8d0870d529118e8f1045" +checksum = "5b560063e2ffa8ce9c2ef9bf487f2944a97deca5b8de0b5bcd0ae6437ef8b75f" dependencies = [ "libc", - "winapi", + "windows-sys 0.42.0", ] [[package]] name = "group" -version = "0.11.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc5ac374b108929de78460075f3dc439fa66df9d8fc77e8f12caa5165fcf0c89" +checksum = "5dfbfb3a6cfbd390d5c9564ab283a0349b9b9fcd46a706c1eb10e0db70bfbac7" dependencies = [ "ff", "rand_core 0.6.4", @@ -2630,9 +2603,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.15" +version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f9f29bc9dda355256b2916cf526ab02ce0aeaaaf2bad60d65ef3f12f11dd0f4" +checksum = "d357c7ae988e7d2182f7d7871d0b963962420b0678b0997ce7de72001aeab782" dependencies = [ "bytes", "fnv", @@ -2653,20 +2626,6 @@ version = "1.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" -[[package]] -name = "handlebars" -version = "4.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "433e4ab33f1213cdc25b5fa45c76881240cfe79284cf2b395e8b9e312a30a2fd" -dependencies = [ - "log", - "pest", - "pest_derive", - "serde", - "serde_json", - "thiserror", -] - [[package]] name = "hash-db" version = "0.15.2" @@ -2684,27 +2643,27 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.11.2" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" dependencies = [ - "ahash", + "ahash 0.7.6", ] [[package]] name = "hashbrown" -version = "0.12.3" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" dependencies = [ - "ahash", + "ahash 0.8.3", ] [[package]] name = "heck" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hermit-abi" @@ -2715,6 +2674,21 @@ dependencies = [ "libc", ] +[[package]] +name = "hermit-abi" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" +dependencies = [ + "libc", +] + +[[package]] +name = "hermit-abi" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" + [[package]] name = "hex" version = "0.4.3" @@ -2728,10 +2702,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0" [[package]] -name = "hex_fmt" -version = "0.3.0" +name = "hkdf" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b07f60793ff0a4d9cef0f18e63b5357e06209987153a64648c972c1e5aff336f" +checksum = "791a029f6b9fc27657f6f188ec6e5e43f6911f6f878e0dc5501396e09809d437" +dependencies = [ + "hmac 0.12.1", +] [[package]] name = "hmac" @@ -2754,13 +2731,22 @@ dependencies = [ ] [[package]] -name = "hmac-drbg" -version = "0.3.0" +name = "hmac" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17ea0a1394df5b6574da6e0c1ade9e78868c9fb0a4e5ef4428e32da4676b85b1" +checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" dependencies = [ - "digest 0.9.0", - "generic-array 0.14.6", + "digest 0.10.6", +] + +[[package]] +name = "hmac-drbg" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17ea0a1394df5b6574da6e0c1ade9e78868c9fb0a4e5ef4428e32da4676b85b1" +dependencies = [ + "digest 0.9.0", + "generic-array 0.14.7", "hmac 0.8.1", ] @@ -2777,9 +2763,9 @@ dependencies = [ [[package]] name = "http" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399" +checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" dependencies = [ "bytes", "fnv", @@ -2797,6 +2783,12 @@ dependencies = [ "pin-project-lite 0.2.9", ] +[[package]] +name = "http-range-header" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bfe8eed0a9285ef776bb792479ea3834e8b94e13d615c2f66d03dd50a435a29" + [[package]] name = "httparse" version = "1.8.0" @@ -2817,13 +2809,13 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hydra-dx-math" -version = "7.0.0" -source = "git+https://github.com/galacticcouncil/HydraDX-math?rev=84632c3c7b71e16d53240e4bdc2adc693c941916#84632c3c7b71e16d53240e4bdc2adc693c941916" +version = "7.0.1" +source = "git+https://github.com/galacticcouncil/HydraDX-math?rev=35e5c0775a07e057ed5247ba96dfa254d691f034#35e5c0775a07e057ed5247ba96dfa254d691f034" dependencies = [ "fixed", "num-traits", "parity-scale-codec", - "primitive-types 0.12.1", + "primitive-types", "scale-info", "serde", "sp-arithmetic", @@ -2842,9 +2834,9 @@ dependencies = [ "parity-scale-codec", "sp-runtime", "sp-std", - "xcm 0.9.29 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.29-1)", - "xcm-builder 0.9.29 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.29-1)", - "xcm-executor 0.9.29 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.29-1)", + "xcm", + "xcm-builder", + "xcm-executor", ] [[package]] @@ -2857,15 +2849,14 @@ dependencies = [ "scale-info", "serde", "sp-arithmetic", - "sp-runtime", "sp-std", ] [[package]] name = "hyper" -version = "0.14.23" +version = "0.14.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "034711faac9d2166cb1baf1a2fb0b60b1f277f8492fd72176c17f3515e1abd3c" +checksum = "ab302d72a6f11a3b910431ff93aae7e773078c769f0a3ef15fb9ec692ed147d4" dependencies = [ "bytes", "futures-channel", @@ -2894,7 +2885,7 @@ dependencies = [ "http", "hyper", "log", - "rustls", + "rustls 0.20.8", "rustls-native-certs", "tokio", "tokio-rustls", @@ -2902,28 +2893,33 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.53" +version = "0.1.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765" +checksum = "0722cd7114b7de04316e7ea5456a0bbb20e4adb46fd27a3697adb812cff0f37c" dependencies = [ "android_system_properties", "core-foundation-sys", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "winapi", + "windows 0.48.0", ] [[package]] name = "iana-time-zone-haiku" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" dependencies = [ - "cxx", - "cxx-build", + "cc", ] +[[package]] +name = "ident_case" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + [[package]] name = "idna" version = "0.2.3" @@ -2957,9 +2953,9 @@ dependencies = [ [[package]] name = "if-watch" -version = "1.1.1" +version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "015a7df1eb6dda30df37f34b63ada9b7b352984b0e84de2a20ed526345000791" +checksum = "a9465340214b296cd17a0009acdb890d6160010b8adf8f78a00d0d7ab270f79f" dependencies = [ "async-io", "core-foundation", @@ -2970,7 +2966,8 @@ dependencies = [ "log", "rtnetlink", "system-configuration", - "windows", + "tokio", + "windows 0.34.0", ] [[package]] @@ -2984,9 +2981,9 @@ dependencies = [ [[package]] name = "impl-serde" -version = "0.3.2" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4551f042f3438e64dbd6226b20527fc84a6e1fe65688b58746a2f53623f25f5c" +checksum = "ebc88fc67028ae3db0c853baa36269d398d5f45b6982f95549ff5def78c935cd" dependencies = [ "serde", ] @@ -2999,14 +2996,14 @@ checksum = "11d7a9f6330b71fea57921c9b61c47ee6e84f72d394754eff6163ae67e7395eb" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] name = "indexmap" -version = "1.9.2" +version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ "autocfg", "hashbrown 0.12.3", @@ -3019,7 +3016,7 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" dependencies = [ - "generic-array 0.14.6", + "generic-array 0.14.7", ] [[package]] @@ -3028,7 +3025,7 @@ version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", ] [[package]] @@ -3047,10 +3044,23 @@ dependencies = [ ] [[package]] -name = "io-lifetimes" -version = "0.5.3" +name = "interceptor" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec58677acfea8a15352d42fc87d11d63596ade9239e0a7c9352914417515dbe6" +checksum = "1e8a11ae2da61704edada656798b61c94b35ecac2c58eb955156987d5e6be90b" +dependencies = [ + "async-trait", + "bytes", + "log", + "rand 0.8.5", + "rtcp", + "rtp", + "thiserror", + "tokio", + "waitgroup", + "webrtc-srtp", + "webrtc-util", +] [[package]] name = "io-lifetimes" @@ -3058,6 +3068,17 @@ version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "59ce5ef949d49ee85593fc4d3f3f95ad61657076395cbbce23e2121fc5542074" +[[package]] +name = "io-lifetimes" +version = "1.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220" +dependencies = [ + "hermit-abi 0.3.1", + "libc", + "windows-sys 0.48.0", +] + [[package]] name = "ip_network" version = "0.4.1" @@ -3078,9 +3099,21 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.7.0" +version = "2.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12b6ee2129af8d4fb011108c73d99a1b83a85977f23b82460c0ae2e25bb4b57f" + +[[package]] +name = "is-terminal" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11b0d96e660696543b251e58030cf9787df56da39dab19ad60eae7353040917e" +checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f" +dependencies = [ + "hermit-abi 0.3.1", + "io-lifetimes 1.0.10", + "rustix 0.37.19", + "windows-sys 0.48.0", +] [[package]] name = "itertools" @@ -3093,47 +3126,46 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.4" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc" +checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" [[package]] name = "jobserver" -version = "0.1.25" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "068b1ee6743e4d11fb9c6a1e6064b3693a1b600e7f5f5988047d98b3dc9fb90b" +checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2" dependencies = [ "libc", ] [[package]] name = "js-sys" -version = "0.3.60" +version = "0.3.62" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47" +checksum = "68c16e1bfd491478ab155fd8b4896b86f9ede344949b641e61501e07c2b8b4d5" dependencies = [ "wasm-bindgen", ] [[package]] name = "jsonrpsee" -version = "0.15.1" +version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bd0d559d5e679b1ab2f869b486a11182923863b1b3ee8b421763cdd707b783a" +checksum = "7d291e3a5818a2384645fd9756362e6d89cf0541b0b916fa7702ea4a9833608e" dependencies = [ "jsonrpsee-core", - "jsonrpsee-http-server", "jsonrpsee-proc-macros", + "jsonrpsee-server", "jsonrpsee-types", - "jsonrpsee-ws-server", "tracing", ] [[package]] name = "jsonrpsee-core" -version = "0.15.1" +version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3dc3e9cf2ba50b7b1d7d76a667619f82846caa39e8e8daa8a4962d74acaddca" +checksum = "a4e70b4439a751a5de7dd5ed55eacff78ebf4ffe0fc009cb1ebb11417f5b536b" dependencies = [ "anyhow", "arrayvec 0.7.2", @@ -3142,10 +3174,8 @@ dependencies = [ "futures-channel", "futures-util", "globset", - "http", "hyper", "jsonrpsee-types", - "lazy_static", "parking_lot 0.12.1", "rand 0.8.5", "rustc-hash", @@ -3155,44 +3185,48 @@ dependencies = [ "thiserror", "tokio", "tracing", - "unicase", ] [[package]] -name = "jsonrpsee-http-server" -version = "0.15.1" +name = "jsonrpsee-proc-macros" +version = "0.16.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baa6da1e4199c10d7b1d0a6e5e8bd8e55f351163b6f4b3cbb044672a69bd4c1c" +dependencies = [ + "heck", + "proc-macro-crate", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "jsonrpsee-server" +version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03802f0373a38c2420c70b5144742d800b509e2937edc4afb116434f07120117" +checksum = "1fb69dad85df79527c019659a992498d03f8495390496da2f07e6c24c2b356fc" dependencies = [ "futures-channel", "futures-util", + "http", "hyper", "jsonrpsee-core", "jsonrpsee-types", "serde", "serde_json", + "soketto", "tokio", + "tokio-stream", + "tokio-util", + "tower", "tracing", - "tracing-futures", -] - -[[package]] -name = "jsonrpsee-proc-macros" -version = "0.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd67957d4280217247588ac86614ead007b301ca2fa9f19c19f880a536f029e3" -dependencies = [ - "proc-macro-crate", - "proc-macro2", - "quote", - "syn", ] [[package]] name = "jsonrpsee-types" -version = "0.15.1" +version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e290bba767401b646812f608c099b922d8142603c9e73a50fb192d3ac86f4a0d" +checksum = "5bd522fe1ce3702fd94812965d7bb7a3364b1c9aba743944c5a00529aae80f8c" dependencies = [ "anyhow", "beef", @@ -3202,89 +3236,54 @@ dependencies = [ "tracing", ] -[[package]] -name = "jsonrpsee-ws-server" -version = "0.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d488ba74fb369e5ab68926feb75a483458b88e768d44319f37e4ecad283c7325" -dependencies = [ - "futures-channel", - "futures-util", - "http", - "jsonrpsee-core", - "jsonrpsee-types", - "serde_json", - "soketto", - "tokio", - "tokio-stream", - "tokio-util", - "tracing", - "tracing-futures", -] - [[package]] name = "k256" -version = "0.10.4" +version = "0.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19c3a5e0a0b8450278feda242592512e09f61c72e018b8cd5c859482802daf2d" +checksum = "72c1e0b51e7ec0a97369623508396067a486bd0cbed95a2659a4b863d28cfc8b" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "ecdsa", "elliptic-curve", - "sec1", + "sha2 0.10.6", ] [[package]] name = "keccak" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3afef3b6eff9ce9d8ff9b3601125eec7f0c8cbac7abd14f355d053fa56c98768" +checksum = "8f6d5ed8676d904364de097082f4e7d240b571b67989ced0240f08b7f966f940" dependencies = [ "cpufeatures", ] -[[package]] -name = "kv-log-macro" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0de8b303297635ad57c9f5059fd9cee7a47f8e8daa09df0fcd07dd39fb22977f" -dependencies = [ - "log", -] - [[package]] name = "kvdb" -version = "0.11.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a301d8ecb7989d4a6e2c57a49baca77d353bdbf879909debe3f375fe25d61f86" +checksum = "e7d770dcb02bf6835887c3a979b5107a04ff4bbde97a5f0928d27404a155add9" dependencies = [ - "parity-util-mem", "smallvec", ] [[package]] name = "kvdb-memorydb" -version = "0.11.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ece7e668abd21387aeb6628130a6f4c802787f014fa46bc83221448322250357" +checksum = "bf7a85fe66f9ff9cd74e169fdd2c94c6e1e74c412c99a73b4df3200b5d3760b2" dependencies = [ "kvdb", - "parity-util-mem", "parking_lot 0.12.1", ] [[package]] name = "kvdb-rocksdb" -version = "0.15.2" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca7fbdfd71cd663dceb0faf3367a99f8cf724514933e9867cec4995b6027cbc1" +checksum = "2182b8219fee6bd83aacaab7344e840179ae079d5216aa4e249b4d704646a844" dependencies = [ - "fs-swap", "kvdb", - "log", "num_cpus", - "owning_ref", - "parity-util-mem", "parking_lot 0.12.1", "regex", "rocksdb", @@ -3308,19 +3307,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.138" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db6d7e329c562c5dfab7a46a2afabc8b987ab9a4834c9d1ca04dc54c1546cef8" - -[[package]] -name = "libloading" -version = "0.5.2" +version = "0.2.144" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2b111a074963af1d37a139918ac6d49ad1d0d5e47f72fd55388619691a7d753" -dependencies = [ - "cc", - "winapi", -] +checksum = "2b00cc1c228a6782d0f076e7b232802e0c5689d41bb5df366f2a6b6621cfdfe1" [[package]] name = "libloading" @@ -3328,7 +3317,7 @@ version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "winapi", ] @@ -3346,22 +3335,17 @@ checksum = "348108ab3fba42ec82ff6e9564fc4ca0247bdccdc68dd8af9764bbc79c3c8ffb" [[package]] name = "libp2p" -version = "0.46.1" +version = "0.50.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81327106887e42d004fbdab1fef93675be2e2e07c1b95fce45e2cc813485611d" +checksum = "9c7b0104790be871edcf97db9bd2356604984e623a08d825c3f27852290266b8" dependencies = [ "bytes", "futures", "futures-timer", - "getrandom 0.2.8", + "getrandom 0.2.9", "instant", - "lazy_static", - "libp2p-autonat", - "libp2p-core", - "libp2p-deflate", + "libp2p-core 0.38.0", "libp2p-dns", - "libp2p-floodsub", - "libp2p-gossipsub", "libp2p-identify", "libp2p-kad", "libp2p-mdns", @@ -3369,49 +3353,25 @@ dependencies = [ "libp2p-mplex", "libp2p-noise", "libp2p-ping", - "libp2p-plaintext", - "libp2p-pnet", - "libp2p-relay", - "libp2p-rendezvous", + "libp2p-quic", "libp2p-request-response", "libp2p-swarm", - "libp2p-swarm-derive", "libp2p-tcp", - "libp2p-uds", "libp2p-wasm-ext", + "libp2p-webrtc", "libp2p-websocket", "libp2p-yamux", - "multiaddr", + "multiaddr 0.16.0", "parking_lot 0.12.1", "pin-project", - "rand 0.7.3", "smallvec", ] -[[package]] -name = "libp2p-autonat" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4decc51f3573653a9f4ecacb31b1b922dd20c25a6322bb15318ec04287ec46f9" -dependencies = [ - "async-trait", - "futures", - "futures-timer", - "instant", - "libp2p-core", - "libp2p-request-response", - "libp2p-swarm", - "log", - "prost", - "prost-build", - "rand 0.8.5", -] - [[package]] name = "libp2p-core" -version = "0.34.0" +version = "0.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbf9b94cefab7599b2d3dff2f93bee218c6621d68590b23ede4485813cbcece6" +checksum = "b6a8fcd392ff67af6cc3f03b1426c41f7f26b6b9aff2dc632c1c56dd649e571f" dependencies = [ "asn1_der", "bs58", @@ -3421,19 +3381,18 @@ dependencies = [ "futures", "futures-timer", "instant", - "lazy_static", - "libsecp256k1", "log", - "multiaddr", - "multihash", + "multiaddr 0.16.0", + "multihash 0.16.3", "multistream-select", + "once_cell", "parking_lot 0.12.1", "pin-project", "prost", "prost-build", "rand 0.8.5", - "ring", "rw-stream-sink", + "sec1", "sha2 0.10.6", "smallvec", "thiserror", @@ -3443,103 +3402,91 @@ dependencies = [ ] [[package]] -name = "libp2p-deflate" -version = "0.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0183dc2a3da1fbbf85e5b6cf51217f55b14f5daea0c455a9536eef646bfec71" -dependencies = [ - "flate2", - "futures", - "libp2p-core", -] - -[[package]] -name = "libp2p-dns" -version = "0.34.0" +name = "libp2p-core" +version = "0.39.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6cbf54723250fa5d521383be789bf60efdabe6bacfb443f87da261019a49b4b5" +checksum = "3c1df63c0b582aa434fb09b2d86897fa2b419ffeccf934b36f87fcedc8e835c2" dependencies = [ - "async-std-resolver", + "either", + "fnv", "futures", - "libp2p-core", + "futures-timer", + "instant", + "libp2p-identity", "log", + "multiaddr 0.17.1", + "multihash 0.17.0", + "multistream-select", + "once_cell", "parking_lot 0.12.1", + "pin-project", + "quick-protobuf", + "rand 0.8.5", + "rw-stream-sink", "smallvec", - "trust-dns-resolver", + "thiserror", + "unsigned-varint", + "void", ] [[package]] -name = "libp2p-floodsub" -version = "0.37.0" +name = "libp2p-dns" +version = "0.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98a4b6ffd53e355775d24b76f583fdda54b3284806f678499b57913adb94f231" +checksum = "8e42a271c1b49f789b92f7fc87749fa79ce5c7bdc88cbdfacb818a4bca47fec5" dependencies = [ - "cuckoofilter", - "fnv", "futures", - "libp2p-core", - "libp2p-swarm", + "libp2p-core 0.38.0", "log", - "prost", - "prost-build", - "rand 0.7.3", + "parking_lot 0.12.1", "smallvec", + "trust-dns-resolver", ] [[package]] -name = "libp2p-gossipsub" -version = "0.39.0" +name = "libp2p-identify" +version = "0.41.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74b4b888cfbeb1f5551acd3aa1366e01bf88ede26cc3c4645d0d2d004d5ca7b0" +checksum = "c052d0026f4817b44869bfb6810f4e1112f43aec8553f2cb38881c524b563abf" dependencies = [ "asynchronous-codec", - "base64", - "byteorder", - "bytes", - "fnv", "futures", - "hex_fmt", - "instant", - "libp2p-core", + "futures-timer", + "libp2p-core 0.38.0", "libp2p-swarm", "log", - "prometheus-client", + "lru 0.8.1", "prost", "prost-build", - "rand 0.7.3", - "regex", - "sha2 0.10.6", + "prost-codec", "smallvec", - "unsigned-varint", - "wasm-timer", + "thiserror", + "void", ] [[package]] -name = "libp2p-identify" -version = "0.37.0" +name = "libp2p-identity" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c50b585518f8efd06f93ac2f976bd672e17cdac794644b3117edd078e96bda06" +checksum = "9e2d584751cecb2aabaa56106be6be91338a60a0f4e420cf2af639204f596fc1" dependencies = [ - "asynchronous-codec", - "futures", - "futures-timer", - "libp2p-core", - "libp2p-swarm", + "bs58", + "ed25519-dalek", "log", - "lru 0.7.8", - "prost", - "prost-build", - "prost-codec", - "smallvec", + "multiaddr 0.17.1", + "multihash 0.17.0", + "quick-protobuf", + "rand 0.8.5", + "sha2 0.10.6", "thiserror", - "void", + "zeroize", ] [[package]] name = "libp2p-kad" -version = "0.38.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "740862893bb5f06ac24acc9d49bdeadc3a5e52e51818a30a25c1f3519da2c851" +checksum = "2766dcd2be8c87d5e1f35487deb22d765f49c6ae1251b3633efe3b25698bd3d2" dependencies = [ "arrayvec 0.7.2", "asynchronous-codec", @@ -3549,12 +3496,12 @@ dependencies = [ "futures", "futures-timer", "instant", - "libp2p-core", + "libp2p-core 0.38.0", "libp2p-swarm", "log", "prost", "prost-build", - "rand 0.7.3", + "rand 0.8.5", "sha2 0.10.6", "smallvec", "thiserror", @@ -3565,278 +3512,257 @@ dependencies = [ [[package]] name = "libp2p-mdns" -version = "0.38.0" +version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66e5e5919509603281033fd16306c61df7a4428ce274b67af5e14b07de5cdcb2" +checksum = "04f378264aade9872d6ccd315c0accc18be3a35d15fc1b9c36e5b6f983b62b5b" dependencies = [ - "async-io", "data-encoding", - "dns-parser", "futures", "if-watch", - "lazy_static", - "libp2p-core", + "libp2p-core 0.38.0", "libp2p-swarm", "log", "rand 0.8.5", "smallvec", "socket2", + "tokio", + "trust-dns-proto", "void", ] [[package]] name = "libp2p-metrics" -version = "0.7.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef8aff4a1abef42328fbb30b17c853fff9be986dc39af17ee39f9c5f755c5e0c" +checksum = "5ad8a64f29da86005c86a4d2728b8a0719e9b192f4092b609fd8790acb9dec55" dependencies = [ - "libp2p-core", - "libp2p-gossipsub", + "libp2p-core 0.38.0", "libp2p-identify", "libp2p-kad", "libp2p-ping", - "libp2p-relay", "libp2p-swarm", "prometheus-client", ] [[package]] name = "libp2p-mplex" -version = "0.34.0" +version = "0.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61fd1b20638ec209c5075dfb2e8ce6a7ea4ec3cd3ad7b77f7a477c06d53322e2" +checksum = "03805b44107aa013e7cbbfa5627b31c36cbedfdfb00603c0311998882bc4bace" dependencies = [ "asynchronous-codec", "bytes", "futures", - "libp2p-core", + "libp2p-core 0.38.0", "log", "nohash-hasher", "parking_lot 0.12.1", - "rand 0.7.3", + "rand 0.8.5", "smallvec", "unsigned-varint", ] [[package]] name = "libp2p-noise" -version = "0.37.0" +version = "0.41.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "762408cb5d84b49a600422d7f9a42c18012d8da6ebcd570f9a4a4290ba41fb6f" +checksum = "a978cb57efe82e892ec6f348a536bfbd9fee677adbe5689d7a93ad3a9bffbf2e" dependencies = [ "bytes", "curve25519-dalek 3.2.0", "futures", - "lazy_static", - "libp2p-core", + "libp2p-core 0.38.0", "log", + "once_cell", "prost", "prost-build", "rand 0.8.5", "sha2 0.10.6", "snow", "static_assertions", - "x25519-dalek", + "thiserror", + "x25519-dalek 1.1.1", "zeroize", ] [[package]] name = "libp2p-ping" -version = "0.37.0" +version = "0.41.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "100a6934ae1dbf8a693a4e7dd1d730fd60b774dafc45688ed63b554497c6c925" +checksum = "929fcace45a112536e22b3dcfd4db538723ef9c3cb79f672b98be2cc8e25f37f" dependencies = [ "futures", "futures-timer", "instant", - "libp2p-core", + "libp2p-core 0.38.0", "libp2p-swarm", "log", - "rand 0.7.3", + "rand 0.8.5", "void", ] [[package]] -name = "libp2p-plaintext" -version = "0.34.0" +name = "libp2p-quic" +version = "0.7.0-alpha" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be27bf0820a6238a4e06365b096d428271cce85a129cf16f2fe9eb1610c4df86" +checksum = "01e7c867e95c8130667b24409d236d37598270e6da69b3baf54213ba31ffca59" dependencies = [ - "asynchronous-codec", "bytes", "futures", - "libp2p-core", + "futures-timer", + "if-watch", + "libp2p-core 0.38.0", + "libp2p-tls", "log", - "prost", - "prost-build", - "unsigned-varint", - "void", -] - -[[package]] -name = "libp2p-pnet" -version = "0.22.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de160c5631696cea22be326c19bd9d306e254c4964945263aea10f25f6e0864e" -dependencies = [ - "futures", - "log", - "pin-project", - "rand 0.8.5", - "salsa20", - "sha3", -] - -[[package]] -name = "libp2p-relay" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4931547ee0cce03971ccc1733ff05bb0c4349fd89120a39e9861e2bbe18843c3" -dependencies = [ - "asynchronous-codec", - "bytes", - "either", - "futures", - "futures-timer", - "instant", - "libp2p-core", - "libp2p-swarm", - "log", - "pin-project", - "prost", - "prost-build", - "prost-codec", - "rand 0.8.5", - "smallvec", - "static_assertions", - "thiserror", - "void", -] - -[[package]] -name = "libp2p-rendezvous" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9511c9672ba33284838e349623319c8cad2d18cfad243ae46c6b7e8a2982ea4e" -dependencies = [ - "asynchronous-codec", - "bimap", - "futures", - "futures-timer", - "instant", - "libp2p-core", - "libp2p-swarm", - "log", - "prost", - "prost-build", - "rand 0.8.5", - "sha2 0.10.6", - "thiserror", - "unsigned-varint", - "void", + "parking_lot 0.12.1", + "quinn-proto", + "rand 0.8.5", + "rustls 0.20.8", + "thiserror", + "tokio", ] [[package]] name = "libp2p-request-response" -version = "0.19.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "508a189e2795d892c8f5c1fa1e9e0b1845d32d7b0b249dbf7b05b18811361843" +checksum = "3236168796727bfcf4927f766393415361e2c644b08bedb6a6b13d957c9a4884" dependencies = [ "async-trait", "bytes", "futures", "instant", - "libp2p-core", + "libp2p-core 0.38.0", "libp2p-swarm", "log", - "rand 0.7.3", + "rand 0.8.5", "smallvec", "unsigned-varint", ] [[package]] name = "libp2p-swarm" -version = "0.37.0" +version = "0.41.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95ac5be6c2de2d1ff3f7693fda6faf8a827b1f3e808202277783fea9f527d114" +checksum = "b2a35472fe3276b3855c00f1c032ea8413615e030256429ad5349cdf67c6e1a0" dependencies = [ "either", "fnv", "futures", "futures-timer", "instant", - "libp2p-core", + "libp2p-core 0.38.0", + "libp2p-swarm-derive", "log", "pin-project", - "rand 0.7.3", + "rand 0.8.5", "smallvec", "thiserror", + "tokio", "void", ] [[package]] name = "libp2p-swarm-derive" -version = "0.28.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f54a64b6957249e0ce782f8abf41d97f69330d02bf229f0672d864f0650cc76" +checksum = "9d527d5827582abd44a6d80c07ff8b50b4ee238a8979e05998474179e79dc400" dependencies = [ + "heck", "quote", - "syn", + "syn 1.0.109", ] [[package]] name = "libp2p-tcp" -version = "0.34.0" +version = "0.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a6771dc19aa3c65d6af9a8c65222bfc8fcd446630ddca487acd161fa6096f3b" +checksum = "b4b257baf6df8f2df39678b86c578961d48cc8b68642a12f0f763f56c8e5858d" dependencies = [ - "async-io", "futures", "futures-timer", "if-watch", - "ipnet", "libc", - "libp2p-core", + "libp2p-core 0.38.0", "log", "socket2", + "tokio", ] [[package]] -name = "libp2p-uds" -version = "0.33.0" +name = "libp2p-tls" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d125e3e5f0d58f3c6ac21815b20cf4b6a88b8db9dc26368ea821838f4161fd4d" +checksum = "ff08d13d0dc66e5e9ba6279c1de417b84fa0d0adc3b03e5732928c180ec02781" dependencies = [ - "async-std", "futures", - "libp2p-core", - "log", + "futures-rustls", + "libp2p-core 0.39.2", + "libp2p-identity", + "rcgen 0.10.0", + "ring", + "rustls 0.20.8", + "thiserror", + "webpki 0.22.0", + "x509-parser 0.14.0", + "yasna", ] [[package]] name = "libp2p-wasm-ext" -version = "0.34.0" +version = "0.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec894790eec3c1608f8d1a8a0bdf0dbeb79ed4de2dce964222011c2896dfa05a" +checksum = "1bb1a35299860e0d4b3c02a3e74e3b293ad35ae0cee8a056363b0c862d082069" dependencies = [ "futures", "js-sys", - "libp2p-core", + "libp2p-core 0.38.0", "parity-send-wrapper", "wasm-bindgen", "wasm-bindgen-futures", ] +[[package]] +name = "libp2p-webrtc" +version = "0.4.0-alpha" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdb6cd86dd68cba72308ea05de1cebf3ba0ae6e187c40548167955d4e3970f6a" +dependencies = [ + "async-trait", + "asynchronous-codec", + "bytes", + "futures", + "futures-timer", + "hex", + "if-watch", + "libp2p-core 0.38.0", + "libp2p-noise", + "log", + "multihash 0.16.3", + "prost", + "prost-build", + "prost-codec", + "rand 0.8.5", + "rcgen 0.9.3", + "serde", + "stun", + "thiserror", + "tinytemplate", + "tokio", + "tokio-util", + "webrtc", +] + [[package]] name = "libp2p-websocket" -version = "0.36.0" +version = "0.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9808e57e81be76ff841c106b4c5974fb4d41a233a7bdd2afbf1687ac6def3818" +checksum = "1d705506030d5c0aaf2882437c70dab437605f21c5f9811978f694e6917a3b54" dependencies = [ "either", "futures", "futures-rustls", - "libp2p-core", + "libp2p-core 0.38.0", "log", "parking_lot 0.12.1", "quicksink", @@ -3848,12 +3774,13 @@ dependencies = [ [[package]] name = "libp2p-yamux" -version = "0.38.0" +version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6dea686217a06072033dc025631932810e2f6ad784e4fafa42e27d311c7a81c" +checksum = "4f63594a0aa818642d9d4915c791945053877253f08a3626f13416b5cd928a29" dependencies = [ "futures", - "libp2p-core", + "libp2p-core 0.38.0", + "log", "parking_lot 0.12.1", "thiserror", "yamux", @@ -3861,9 +3788,9 @@ dependencies = [ [[package]] name = "librocksdb-sys" -version = "0.6.1+6.28.2" +version = "0.8.3+7.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81bc587013734dadb7cf23468e531aa120788b87243648be42e2d3a072186291" +checksum = "557b255ff04123fcc176162f56ed0c9cd42d8f357cf55b3fabeb60f7413741b3" dependencies = [ "bindgen", "bzip2-sys", @@ -3881,7 +3808,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95b09eff1b35ed3b33b877ced3a691fc7a481919c7e29c53c906226fcf55e2a1" dependencies = [ "arrayref", - "base64", + "base64 0.13.1", "digest 0.9.0", "hmac-drbg", "libsecp256k1-core", @@ -3924,9 +3851,9 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.1.8" +version = "1.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9702761c3935f8cc2f101793272e202c72b99da8f4224a19ddcf1279a6450bbf" +checksum = "56ee889ecc9568871456d42f603d6a0ce59ff328d291063a45cbdf0036baf6db" dependencies = [ "cc", "pkg-config", @@ -3935,9 +3862,9 @@ dependencies = [ [[package]] name = "link-cplusplus" -version = "1.0.7" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9272ab7b96c9046fbc5bc56c06c117cb639fe2d509df0c421cad82d2915cf369" +checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5" dependencies = [ "cc", ] @@ -3969,15 +3896,15 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.0.42" +version = "0.0.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5284f00d480e1c39af34e72f8ad60b94f47007e3481cd3b731c1d67190ddc7b7" +checksum = "d4d2456c373231a208ad294c33dc5bff30051eafd954cd4caae83a712b12854d" [[package]] name = "linux-raw-sys" -version = "0.0.46" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4d2456c373231a208ad294c33dc5bff30051eafd954cd4caae83a712b12854d" +checksum = "ece97ea872ece730aed82664c424eb4c8291e1ff2480247ccf7409044bc6479f" [[package]] name = "lock_api" @@ -3995,26 +3922,25 @@ version = "0.4.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" dependencies = [ - "cfg-if 1.0.0", - "value-bag", + "cfg-if", ] [[package]] name = "lru" -version = "0.7.8" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e999beba7b6e8345721bd280141ed958096a2e4abdf74f67ff4ce49b4b54e47a" +checksum = "b6e8aaa3f231bb4bd57b84b2d5dc3ae7f350265df8aa96492e0bc394a1571909" dependencies = [ "hashbrown 0.12.3", ] [[package]] name = "lru" -version = "0.8.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6e8aaa3f231bb4bd57b84b2d5dc3ae7f350265df8aa96492e0bc394a1571909" +checksum = "71e7d46de488603ffdd5f30afbc64fbba2378214a2c3a2fb83abf3d33126df17" dependencies = [ - "hashbrown 0.12.3", + "hashbrown 0.13.2", ] [[package]] @@ -4072,19 +3998,29 @@ dependencies = [ [[package]] name = "matches" -version = "0.1.9" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" +checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" [[package]] name = "matrixmultiply" -version = "0.3.2" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "add85d4dd35074e6fedc608f8c8f513a3548619a9024b751949ef0e8e45a4d84" +checksum = "090126dc04f95dc0d1c1c91f61bdd474b3930ca064c1edc8a849da2c6cbe1e77" dependencies = [ + "autocfg", "rawpointer", ] +[[package]] +name = "md-5" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6365506850d44bff6e2fbcb5176cf63650e48bd45ef2fe2665ae1570e0f4b9ca" +dependencies = [ + "digest 0.10.6", +] + [[package]] name = "memchr" version = "2.5.0" @@ -4093,18 +4029,18 @@ checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" [[package]] name = "memfd" -version = "0.4.1" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6627dc657574b49d6ad27105ed671822be56e0d2547d413bfbf3e8d8fa92e7a" +checksum = "ffc89ccdc6e10d6907450f753537ebc5c5d3460d2e4e62ea74bd571db62c0f9e" dependencies = [ - "libc", + "rustix 0.37.19", ] [[package]] name = "memmap2" -version = "0.5.8" +version = "0.5.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b182332558b18d807c4ce1ca8ca983b34c3ee32765e47b3f0f69b90355cc1dc" +checksum = "83faa42c0a078c393f6b29d5db232d8be22776a891f8f56e5284faee4a20b327" dependencies = [ "libc", ] @@ -4128,30 +4064,29 @@ dependencies = [ ] [[package]] -name = "memory-db" -version = "0.29.0" +name = "memoffset" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6566c70c1016f525ced45d7b7f97730a2bafb037c788211d0c186ef5b2189f0a" +checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" dependencies = [ - "hash-db", - "hashbrown 0.12.3", - "parity-util-mem", + "autocfg", ] [[package]] -name = "memory-lru" -version = "0.1.1" +name = "memory-db" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce95ae042940bad7e312857b929ee3d11b8f799a80cb7b9c7ec5125516906395" +checksum = "5e0c7cba9ce19ac7ffd2053ac9f49843bbd3f4318feedfd74e85c19d5fb0ba66" dependencies = [ - "lru 0.8.1", + "hash-db", + "hashbrown 0.12.3", ] [[package]] name = "memory_units" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71d96e3f3c0b6325d8ccd83c33b28acb183edcb6c67938ba104ec546854b0882" +checksum = "8452105ba047068f40ff7093dd1d9da90898e63dd61736462e9cdda6a90ad3c3" [[package]] name = "merlin" @@ -4191,35 +4126,84 @@ dependencies = [ "adler", ] +[[package]] +name = "miniz_oxide" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +dependencies = [ + "adler", +] + [[package]] name = "mio" -version = "0.8.5" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5d732bc30207a6423068df043e3d02e0735b155ad7ce1a6f76fe2baa5b158de" +checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9" dependencies = [ "libc", "log", "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.42.0", + "windows-sys 0.45.0", ] [[package]] -name = "more-asserts" -version = "0.2.2" +name = "mockall" +version = "0.11.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c84490118f2ee2d74570d114f3d0493cbf02790df303d2707606c3e14e07c96" +dependencies = [ + "cfg-if", + "downcast", + "fragile", + "lazy_static", + "mockall_derive", + "predicates", + "predicates-tree", +] + +[[package]] +name = "mockall_derive" +version = "0.11.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7843ec2de400bcbc6a6328c958dc38e5359da6e93e72e37bc5246bf1ae776389" +checksum = "22ce75669015c4f47b289fd4d4f56e894e4c96003ffdf3ac51313126f94c6cbb" +dependencies = [ + "cfg-if", + "proc-macro2", + "quote", + "syn 1.0.109", +] [[package]] name = "multiaddr" -version = "0.14.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c580bfdd8803cce319b047d239559a22f809094aaea4ac13902a1fdcfcd4261" +checksum = "a4aebdb21e90f81d13ed01dc84123320838e53963c2ca94b60b305d3fa64f31e" +dependencies = [ + "arrayref", + "byteorder", + "data-encoding", + "multibase", + "multihash 0.16.3", + "percent-encoding", + "serde", + "static_assertions", + "unsigned-varint", + "url", +] + +[[package]] +name = "multiaddr" +version = "0.17.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b36f567c7099511fa8612bbbb52dda2419ce0bdbacf31714e3a5ffdb766d3bd" dependencies = [ "arrayref", - "bs58", "byteorder", "data-encoding", - "multihash", + "log", + "multibase", + "multihash 0.17.0", "percent-encoding", "serde", "static_assertions", @@ -4255,6 +4239,17 @@ dependencies = [ "unsigned-varint", ] +[[package]] +name = "multihash" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "835d6ff01d610179fbce3de1694d007e500bf33a7f29689838941d6bf783ae40" +dependencies = [ + "core2", + "multihash-derive", + "unsigned-varint", +] + [[package]] name = "multihash-derive" version = "0.8.0" @@ -4265,7 +4260,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn", + "syn 1.0.109", "synstructure", ] @@ -4277,9 +4272,9 @@ checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" [[package]] name = "multistream-select" -version = "0.11.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "363a84be6453a70e63513660f4894ef815daf88e3356bffcda9ca27d810ce83b" +checksum = "c8552ab875c1313b97b8d20cb857b9fd63e2d1d6a0a1b53ce9821e575405f27a" dependencies = [ "bytes", "futures", @@ -4299,7 +4294,7 @@ dependencies = [ "matrixmultiply", "nalgebra-macros", "num-complex", - "num-rational 0.4.1", + "num-rational", "num-traits", "rand 0.8.5", "rand_distr", @@ -4315,7 +4310,7 @@ checksum = "01fcc0b8149b4632adc89ac3b7b31a12fb6099a0317a4eb2ebff574ef7de7218" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -4361,9 +4356,9 @@ dependencies = [ [[package]] name = "netlink-packet-utils" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25af9cf0dc55498b7bd94a1508af7a78706aa0ab715a73c5169273e03c84845e" +checksum = "0ede8a08c71ad5a95cdd0e4e52facd37190977039a4704eb82a283f713747d34" dependencies = [ "anyhow", "byteorder", @@ -4388,15 +4383,15 @@ dependencies = [ [[package]] name = "netlink-sys" -version = "0.8.3" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92b654097027250401127914afb37cb1f311df6610a9891ff07a757e94199027" +checksum = "6471bf08e7ac0135876a9581bf3217ef0333c191c128d34878079f42ee150411" dependencies = [ - "async-io", "bytes", "futures", "libc", "log", + "tokio", ] [[package]] @@ -4406,15 +4401,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" dependencies = [ "bitflags", - "cfg-if 1.0.0", + "cfg-if", "libc", + "memoffset 0.6.5", ] [[package]] -name = "nodrop" -version = "0.1.14" +name = "nix" +version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb" +checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a" +dependencies = [ + "bitflags", + "cfg-if", + "libc", + "memoffset 0.7.1", + "pin-utils", + "static_assertions", +] [[package]] name = "nohash-hasher" @@ -4424,19 +4428,25 @@ checksum = "2bf50223579dc7cdcfb3bfcacf7069ff68243f8c363f62ffa99cf000a6b9c451" [[package]] name = "nom" -version = "7.1.1" +version = "7.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8903e5a29a317527874d0402f867152a3d21c908bb0b933e416c65e301d4c36" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" dependencies = [ "memchr", "minimal-lexical", ] +[[package]] +name = "normalize-line-endings" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be" + [[package]] name = "num-bigint" -version = "0.2.6" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "090c7f9998ee0ff65aa5b723e4009f7b217707f1fb5ea551329cc4d6231fb304" +checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" dependencies = [ "autocfg", "num-integer", @@ -4445,9 +4455,9 @@ dependencies = [ [[package]] name = "num-complex" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ae39348c8bc5fbd7f40c727a9925f03517afd2ab27d46702108b6a7e5414c19" +checksum = "02e0d21255c828d6f128a1e41534206671e8c3ea0c62f32291e808dc82cff17d" dependencies = [ "num-traits", ] @@ -4472,18 +4482,6 @@ dependencies = [ "num-traits", ] -[[package]] -name = "num-rational" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c000134b5dbf44adc5cb772486d335293351644b801551abe8f75c84cfa4aef" -dependencies = [ - "autocfg", - "num-bigint", - "num-integer", - "num-traits", -] - [[package]] name = "num-rational" version = "0.4.1" @@ -4491,6 +4489,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" dependencies = [ "autocfg", + "num-bigint", "num-integer", "num-traits", ] @@ -4507,40 +4506,58 @@ dependencies = [ [[package]] name = "num_cpus" -version = "1.14.0" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6058e64324c71e02bc2b150e4f3bc8286db6c83092132ffa3f6b1eab0f9def5" +checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" dependencies = [ - "hermit-abi", + "hermit-abi 0.2.6", "libc", ] [[package]] name = "object" -version = "0.28.4" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e42c982f2d955fac81dd7e1d0e1426a7d702acd9c98d19ab01083a6a0328c424" +checksum = "21158b2c33aa6d4561f1c0a6ea283ca92bc54802a93b263e910746d679a7eb53" dependencies = [ "crc32fast", - "hashbrown 0.11.2", + "hashbrown 0.12.3", "indexmap", "memchr", ] [[package]] name = "object" -version = "0.30.0" +version = "0.30.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "239da7f290cfa979f43f85a8efeee9a8a76d0827c356d37f9d3d7254d6b537fb" +checksum = "ea86265d3d3dcb6a27fc51bd29a4bf387fae9d2986b823079d4986af253eb439" dependencies = [ "memchr", ] +[[package]] +name = "oid-registry" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38e20717fa0541f39bd146692035c37bedfa532b3e5071b35761082407546b2a" +dependencies = [ + "asn1-rs 0.3.1", +] + +[[package]] +name = "oid-registry" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9bedf36ffb6ba96c2eb7144ef6270557b52e54b20c0a8e1eb2ff99a6c6959bff" +dependencies = [ + "asn1-rs 0.5.2", +] + [[package]] name = "once_cell" -version = "1.16.0" +version = "1.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860" +checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" [[package]] name = "opaque-debug" @@ -4562,8 +4579,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "orchestra" -version = "0.0.1" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.29#94078b44fb6c9767bf60ffcaaa3be40681be5a76" +version = "0.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17e7d5b6bb115db09390bed8842c94180893dd83df3dfce7354f2a2aa090a4ee" dependencies = [ "async-trait", "dyn-clonable", @@ -4578,8 +4596,9 @@ dependencies = [ [[package]] name = "orchestra-proc-macro" -version = "0.0.1" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.29#94078b44fb6c9767bf60ffcaaa3be40681be5a76" +version = "0.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2af4dabb2286b0be0e9711d2d24e25f6217048b71210cffd3daddc3b5c84e1f" dependencies = [ "expander 0.0.6", "itertools", @@ -4587,7 +4606,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -4602,7 +4621,7 @@ dependencies = [ [[package]] name = "orml-currencies" version = "0.4.1-dev" -source = "git+https://github.com/open-web3-stack/open-runtime-module-library?branch=polkadot-v0.9.29#44fda4432b71f49ee59a650cf4775db895ab97af" +source = "git+https://github.com/open-web3-stack/open-runtime-module-library?branch=polkadot-v0.9.38#241d5cdc98cca53b8cf990853943c9ae1193a70e" dependencies = [ "frame-support", "frame-system", @@ -4619,7 +4638,7 @@ dependencies = [ [[package]] name = "orml-tokens" version = "0.4.1-dev" -source = "git+https://github.com/open-web3-stack/open-runtime-module-library?branch=polkadot-v0.9.29#44fda4432b71f49ee59a650cf4775db895ab97af" +source = "git+https://github.com/open-web3-stack/open-runtime-module-library?branch=polkadot-v0.9.38#241d5cdc98cca53b8cf990853943c9ae1193a70e" dependencies = [ "frame-support", "frame-system", @@ -4634,7 +4653,7 @@ dependencies = [ [[package]] name = "orml-traits" version = "0.4.1-dev" -source = "git+https://github.com/open-web3-stack/open-runtime-module-library?branch=polkadot-v0.9.29#44fda4432b71f49ee59a650cf4775db895ab97af" +source = "git+https://github.com/open-web3-stack/open-runtime-module-library?branch=polkadot-v0.9.38#241d5cdc98cca53b8cf990853943c9ae1193a70e" dependencies = [ "frame-support", "impl-trait-for-tuples", @@ -4643,16 +4662,17 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", + "sp-core", "sp-io", "sp-runtime", "sp-std", - "xcm 0.9.29 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.29)", + "xcm", ] [[package]] name = "orml-utilities" version = "0.4.1-dev" -source = "git+https://github.com/open-web3-stack/open-runtime-module-library?branch=polkadot-v0.9.29#44fda4432b71f49ee59a650cf4775db895ab97af" +source = "git+https://github.com/open-web3-stack/open-runtime-module-library?branch=polkadot-v0.9.38#241d5cdc98cca53b8cf990853943c9ae1193a70e" dependencies = [ "frame-support", "parity-scale-codec", @@ -4663,12 +4683,6 @@ dependencies = [ "sp-std", ] -[[package]] -name = "os_str_bytes" -version = "6.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee" - [[package]] name = "output_vt100" version = "0.1.3" @@ -4679,12 +4693,25 @@ dependencies = [ ] [[package]] -name = "owning_ref" -version = "0.4.1" +name = "p256" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ff55baddef9e4ad00f88b6c743a2a8062d4c6ade126c2a528644b8e444d52ce" +checksum = "51f44edd08f51e2ade572f141051021c5af22677e42b7dd28a88155151c33594" dependencies = [ - "stable_deref_trait", + "ecdsa", + "elliptic-curve", + "sha2 0.10.6", +] + +[[package]] +name = "p384" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfc8c5bf642dde52bb9e87c0ecd8ca5a76faac2eeed98dedb7c717997e1080aa" +dependencies = [ + "ecdsa", + "elliptic-curve", + "sha2 0.10.6", ] [[package]] @@ -4693,13 +4720,13 @@ version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1914cd452d8fccd6f9db48147b29fd4ae05bea9dc5d9ad578509f72415de282" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "libm 0.1.4", ] [[package]] name = "pallet-asset-registry" -version = "2.1.0" +version = "2.1.1" dependencies = [ "frame-benchmarking", "frame-support", @@ -4708,7 +4735,7 @@ dependencies = [ "hydradx-traits", "orml-traits", "parity-scale-codec", - "primitive-types 0.12.1", + "primitive-types", "scale-info", "serde", "sp-api", @@ -4719,13 +4746,13 @@ dependencies = [ "sp-std", "substrate-wasm-builder", "test-utils", - "xcm 0.9.29 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.29-1)", + "xcm", ] [[package]] name = "pallet-aura" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#bcff60a227d455d95b4712b6cb356ce56b1ff672" dependencies = [ "frame-support", "frame-system", @@ -4739,140 +4766,171 @@ dependencies = [ ] [[package]] -name = "pallet-authority-discovery" +name = "pallet-balances" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#bcff60a227d455d95b4712b6cb356ce56b1ff672" dependencies = [ + "frame-benchmarking", "frame-support", "frame-system", - "pallet-session", + "log", "parity-scale-codec", "scale-info", - "sp-application-crypto", - "sp-authority-discovery", "sp-runtime", "sp-std", ] [[package]] -name = "pallet-authorship" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +name = "pallet-collator-rewards" +version = "1.0.4" dependencies = [ + "frame-benchmarking", "frame-support", "frame-system", - "impl-trait-for-tuples", + "frame-system-benchmarking", + "log", + "orml-tokens", + "orml-traits", + "pallet-aura", + "pallet-balances", + "pallet-session", "parity-scale-codec", "scale-info", - "sp-authorship", + "serde", + "sp-arithmetic", + "sp-consensus-aura", + "sp-core", + "sp-io", "sp-runtime", + "sp-staking", "sp-std", + "substrate-wasm-builder", ] [[package]] -name = "pallet-babe" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +name = "pallet-currencies" +version = "1.2.1" dependencies = [ - "frame-benchmarking", "frame-support", "frame-system", - "log", - "pallet-authorship", - "pallet-session", - "pallet-timestamp", + "orml-tokens", + "orml-traits", + "orml-utilities", + "pallet-balances", "parity-scale-codec", "scale-info", - "sp-application-crypto", - "sp-consensus-babe", - "sp-consensus-vrf", + "serde", + "sp-core", "sp-io", "sp-runtime", - "sp-session", - "sp-staking", "sp-std", ] [[package]] -name = "pallet-bags-list" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +name = "pallet-duster" +version = "3.2.2" dependencies = [ - "frame-election-provider-support", + "frame-benchmarking", "frame-support", "frame-system", - "log", + "frame-system-benchmarking", + "hydradx-traits", + "lazy_static", + "orml-tokens", + "orml-traits", + "pallet-balances", + "pallet-currencies", "parity-scale-codec", "scale-info", + "serde", + "sp-core", + "sp-io", "sp-runtime", "sp-std", + "substrate-wasm-builder", ] [[package]] -name = "pallet-balances" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +name = "pallet-ema-oracle" +version = "1.0.3" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", + "frame-system-benchmarking", + "hydra-dx-math", + "hydradx-traits", "log", "parity-scale-codec", + "pretty_assertions", + "proptest", + "rug", "scale-info", - "sp-runtime", + "serde", + "sp-arithmetic", + "sp-core", + "sp-io", "sp-std", ] [[package]] -name = "pallet-beefy" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +name = "pallet-faucet" +version = "0.2.3" dependencies = [ - "beefy-primitives", "frame-support", "frame-system", - "pallet-session", + "orml-tokens", + "orml-traits", "parity-scale-codec", "scale-info", "serde", + "sp-core", + "sp-io", "sp-runtime", "sp-std", + "test-utils", ] [[package]] -name = "pallet-beefy-mmr" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +name = "pallet-liquidity-mining" +version = "4.2.2" dependencies = [ - "beefy-merkle-tree", - "beefy-primitives", + "fixed", "frame-support", "frame-system", - "hex", - "log", - "pallet-beefy", - "pallet-mmr", - "pallet-session", + "hydra-dx-math", + "hydradx-traits", + "orml-currencies", + "orml-tokens", + "orml-traits", + "pallet-balances", "parity-scale-codec", + "pretty_assertions", + "proptest", + "rand 0.8.5", "scale-info", - "serde", + "sp-arithmetic", "sp-core", "sp-io", "sp-runtime", "sp-std", + "test-utils", ] [[package]] -name = "pallet-bounties" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +name = "pallet-nft" +version = "7.1.1" dependencies = [ + "frame-benchmarking", "frame-support", "frame-system", - "log", - "pallet-treasury", + "hydradx-traits", + "orml-utilities", + "pallet-balances", + "pallet-uniques", "parity-scale-codec", "scale-info", + "serde", "sp-core", "sp-io", "sp-runtime", @@ -4880,197 +4938,196 @@ dependencies = [ ] [[package]] -name = "pallet-child-bounties" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +name = "pallet-otc" +version = "1.0.1" dependencies = [ + "frame-benchmarking", "frame-support", "frame-system", - "log", - "pallet-bounties", - "pallet-treasury", + "hydradx-traits", + "orml-tokens", + "orml-traits", "parity-scale-codec", + "pretty_assertions", + "proptest", "scale-info", + "sp-api", "sp-core", "sp-io", "sp-runtime", "sp-std", + "test-utils", ] [[package]] -name = "pallet-collator-rewards" -version = "1.0.3" +name = "pallet-price-oracle" +version = "0.3.3" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", "frame-system-benchmarking", - "log", - "orml-tokens", - "orml-traits", - "pallet-aura", - "pallet-balances", - "pallet-session", + "hydradx-traits", "parity-scale-codec", "scale-info", "serde", - "sp-arithmetic", - "sp-consensus-aura", "sp-core", "sp-io", - "sp-runtime", - "sp-staking", "sp-std", - "substrate-wasm-builder", + "test-utils", ] [[package]] -name = "pallet-collective" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +name = "pallet-relaychain-info" +version = "0.3.3" dependencies = [ - "frame-benchmarking", + "cumulus-pallet-parachain-system", + "cumulus-primitives-core", "frame-support", "frame-system", - "log", "parity-scale-codec", "scale-info", - "sp-core", - "sp-io", - "sp-runtime", + "sp-api", "sp-std", ] [[package]] -name = "pallet-currencies" -version = "1.2.0" +name = "pallet-route-executor" +version = "1.0.3" dependencies = [ + "frame-benchmarking", "frame-support", "frame-system", + "frame-system-benchmarking", + "hydradx-adapters", + "hydradx-traits", "orml-tokens", "orml-traits", - "orml-utilities", "pallet-balances", + "pallet-currencies", "parity-scale-codec", + "pretty_assertions", "scale-info", "serde", "sp-core", "sp-io", "sp-runtime", "sp-std", + "test-utils", ] [[package]] -name = "pallet-democracy" +name = "pallet-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#bcff60a227d455d95b4712b6cb356ce56b1ff672" dependencies = [ - "frame-benchmarking", "frame-support", "frame-system", + "impl-trait-for-tuples", + "log", + "pallet-timestamp", "parity-scale-codec", "scale-info", - "serde", + "sp-core", "sp-io", "sp-runtime", + "sp-session", + "sp-staking", "sp-std", + "sp-trie", ] [[package]] -name = "pallet-duster" -version = "3.2.1" +name = "pallet-stableswap" +version = "1.1.1" dependencies = [ + "bitflags", "frame-benchmarking", "frame-support", "frame-system", - "frame-system-benchmarking", + "hydra-dx-math", "hydradx-traits", - "lazy_static", "orml-tokens", "orml-traits", - "pallet-balances", - "pallet-currencies", "parity-scale-codec", + "proptest", "scale-info", - "serde", + "sp-api", "sp-core", "sp-io", "sp-runtime", "sp-std", - "substrate-wasm-builder", + "sp-tracing", ] [[package]] -name = "pallet-election-provider-multi-phase" +name = "pallet-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#bcff60a227d455d95b4712b6cb356ce56b1ff672" dependencies = [ "frame-benchmarking", - "frame-election-provider-support", "frame-support", "frame-system", "log", "parity-scale-codec", - "rand 0.7.3", "scale-info", - "sp-arithmetic", - "sp-core", + "sp-inherents", "sp-io", - "sp-npos-elections", "sp-runtime", "sp-std", - "static_assertions", - "strum", + "sp-timestamp", ] [[package]] -name = "pallet-elections-phragmen" -version = "5.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +name = "pallet-transaction-multi-payment" +version = "9.0.1" dependencies = [ "frame-support", "frame-system", - "log", + "hydradx-traits", + "orml-tokens", + "orml-traits", + "pallet-balances", + "pallet-currencies", + "pallet-transaction-payment", "parity-scale-codec", "scale-info", + "sp-api", "sp-core", "sp-io", - "sp-npos-elections", "sp-runtime", "sp-std", + "test-utils", ] [[package]] -name = "pallet-ema-oracle" -version = "1.0.3" +name = "pallet-transaction-pause" +version = "0.1.3" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", "frame-system-benchmarking", - "hydra-dx-math", - "hydradx-traits", - "log", + "orml-tokens", + "orml-traits", + "pallet-balances", "parity-scale-codec", - "pretty_assertions", - "proptest", - "rug", "scale-info", - "serde", - "sp-arithmetic", + "smallvec", + "sp-api", "sp-core", "sp-io", + "sp-runtime", "sp-std", ] [[package]] -name = "pallet-faucet" -version = "0.2.2" +name = "pallet-transaction-payment" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#bcff60a227d455d95b4712b6cb356ce56b1ff672" dependencies = [ "frame-support", "frame-system", - "orml-tokens", - "orml-traits", "parity-scale-codec", "scale-info", "serde", @@ -5078,1441 +5135,277 @@ dependencies = [ "sp-io", "sp-runtime", "sp-std", - "test-utils", ] [[package]] -name = "pallet-grandpa" +name = "pallet-uniques" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#bcff60a227d455d95b4712b6cb356ce56b1ff672" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", "log", - "pallet-authorship", - "pallet-session", "parity-scale-codec", "scale-info", - "sp-application-crypto", - "sp-core", - "sp-finality-grandpa", - "sp-io", "sp-runtime", - "sp-session", - "sp-staking", - "sp-std", -] - -[[package]] -name = "pallet-identity" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" -dependencies = [ - "enumflags2", - "frame-benchmarking", - "frame-support", - "frame-system", - "parity-scale-codec", - "scale-info", - "sp-io", - "sp-runtime", - "sp-std", -] - -[[package]] -name = "pallet-im-online" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" -dependencies = [ - "frame-support", - "frame-system", - "log", - "pallet-authorship", - "parity-scale-codec", - "scale-info", - "sp-application-crypto", - "sp-core", - "sp-io", - "sp-runtime", - "sp-staking", - "sp-std", -] - -[[package]] -name = "pallet-indices" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" -dependencies = [ - "frame-support", - "frame-system", - "parity-scale-codec", - "scale-info", - "sp-core", - "sp-io", - "sp-keyring", - "sp-runtime", - "sp-std", -] - -[[package]] -name = "pallet-liquidity-mining" -version = "4.2.0" -dependencies = [ - "fixed", - "frame-support", - "frame-system", - "hydra-dx-math", - "hydradx-traits", - "orml-currencies", - "orml-tokens", - "orml-traits", - "pallet-balances", - "parity-scale-codec", - "pretty_assertions", - "proptest", - "rand 0.8.5", - "scale-info", - "sp-arithmetic", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", - "test-utils", -] - -[[package]] -name = "pallet-membership" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" -dependencies = [ - "frame-benchmarking", - "frame-support", - "frame-system", - "log", - "parity-scale-codec", - "scale-info", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", -] - -[[package]] -name = "pallet-mmr" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" -dependencies = [ - "ckb-merkle-mountain-range", - "frame-benchmarking", - "frame-support", - "frame-system", - "parity-scale-codec", - "scale-info", - "sp-core", - "sp-io", - "sp-mmr-primitives", - "sp-runtime", - "sp-std", -] - -[[package]] -name = "pallet-mmr-rpc" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" -dependencies = [ - "jsonrpsee", - "parity-scale-codec", - "serde", - "sp-api", - "sp-blockchain", - "sp-core", - "sp-mmr-primitives", - "sp-runtime", -] - -[[package]] -name = "pallet-multisig" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" -dependencies = [ - "frame-support", - "frame-system", - "parity-scale-codec", - "scale-info", - "sp-io", - "sp-runtime", - "sp-std", -] - -[[package]] -name = "pallet-nft" -version = "7.1.0" -dependencies = [ - "frame-benchmarking", - "frame-support", - "frame-system", - "hydradx-traits", - "orml-utilities", - "pallet-balances", - "pallet-uniques", - "parity-scale-codec", - "scale-info", - "serde", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", - "syn", -] - -[[package]] -name = "pallet-nomination-pools" -version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" -dependencies = [ - "frame-support", - "frame-system", - "log", - "parity-scale-codec", - "scale-info", - "sp-core", - "sp-io", - "sp-runtime", - "sp-staking", - "sp-std", -] - -[[package]] -name = "pallet-nomination-pools-runtime-api" -version = "1.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" -dependencies = [ - "parity-scale-codec", - "sp-api", - "sp-std", -] - -[[package]] -name = "pallet-offences" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" -dependencies = [ - "frame-support", - "frame-system", - "log", - "pallet-balances", - "parity-scale-codec", - "scale-info", - "serde", - "sp-runtime", - "sp-staking", - "sp-std", -] - -[[package]] -name = "pallet-otc" -version = "1.0.1" -dependencies = [ - "frame-benchmarking", - "frame-support", - "frame-system", - "hydradx-traits", - "orml-tokens", - "orml-traits", - "parity-scale-codec", - "pretty_assertions", - "proptest", - "scale-info", - "sp-api", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", - "test-utils", -] - -[[package]] -name = "pallet-preimage" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" -dependencies = [ - "frame-benchmarking", - "frame-support", - "frame-system", - "parity-scale-codec", - "scale-info", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", -] - -[[package]] -name = "pallet-price-oracle" -version = "0.3.2" -dependencies = [ - "frame-benchmarking", - "frame-support", - "frame-system", - "frame-system-benchmarking", - "hydradx-traits", - "parity-scale-codec", - "scale-info", - "serde", - "sp-core", - "sp-io", - "sp-std", - "test-utils", -] - -[[package]] -name = "pallet-proxy" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" -dependencies = [ - "frame-support", - "frame-system", - "parity-scale-codec", - "scale-info", - "sp-io", - "sp-runtime", - "sp-std", -] - -[[package]] -name = "pallet-relaychain-info" -version = "0.3.2" -dependencies = [ - "cumulus-pallet-parachain-system", - "cumulus-primitives-core", - "frame-support", - "frame-system", - "parity-scale-codec", - "scale-info", - "sp-api", - "sp-std", -] - -[[package]] -name = "pallet-route-executor" -version = "1.0.2" -dependencies = [ - "frame-benchmarking", - "frame-support", - "frame-system", - "frame-system-benchmarking", - "hydradx-adapters", - "hydradx-traits", - "orml-tokens", - "orml-traits", - "pallet-balances", - "pallet-currencies", - "parity-scale-codec", - "pretty_assertions", - "scale-info", - "serde", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", - "test-utils", -] - -[[package]] -name = "pallet-scheduler" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" -dependencies = [ - "frame-benchmarking", - "frame-support", - "frame-system", - "log", - "parity-scale-codec", - "scale-info", - "sp-io", - "sp-runtime", - "sp-std", -] - -[[package]] -name = "pallet-session" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" -dependencies = [ - "frame-support", - "frame-system", - "impl-trait-for-tuples", - "log", - "pallet-timestamp", - "parity-scale-codec", - "scale-info", - "sp-core", - "sp-io", - "sp-runtime", - "sp-session", - "sp-staking", - "sp-std", - "sp-trie", -] - -[[package]] -name = "pallet-stableswap" -version = "1.1.0" -dependencies = [ - "bitflags", - "frame-benchmarking", - "frame-support", - "frame-system", - "hydra-dx-math", - "hydradx-traits", - "orml-tokens", - "orml-traits", - "parity-scale-codec", - "proptest", - "scale-info", - "sp-api", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", - "sp-tracing", -] - -[[package]] -name = "pallet-staking" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" -dependencies = [ - "frame-election-provider-support", - "frame-support", - "frame-system", - "log", - "pallet-authorship", - "pallet-session", - "parity-scale-codec", - "scale-info", - "serde", - "sp-application-crypto", - "sp-io", - "sp-runtime", - "sp-staking", - "sp-std", -] - -[[package]] -name = "pallet-staking-reward-curve" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" -dependencies = [ - "proc-macro-crate", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "pallet-timestamp" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" -dependencies = [ - "frame-benchmarking", - "frame-support", - "frame-system", - "log", - "parity-scale-codec", - "scale-info", - "sp-inherents", - "sp-runtime", - "sp-std", - "sp-timestamp", -] - -[[package]] -name = "pallet-tips" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" -dependencies = [ - "frame-support", - "frame-system", - "log", - "pallet-treasury", - "parity-scale-codec", - "scale-info", - "serde", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", -] - -[[package]] -name = "pallet-transaction-multi-payment" -version = "9.0.0" -dependencies = [ - "frame-support", - "frame-system", - "hydradx-traits", - "orml-tokens", - "orml-traits", - "pallet-balances", - "pallet-currencies", - "pallet-transaction-payment", - "parity-scale-codec", - "scale-info", - "sp-api", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", - "test-utils", -] - -[[package]] -name = "pallet-transaction-pause" -version = "0.1.2" -dependencies = [ - "frame-benchmarking", - "frame-support", - "frame-system", - "frame-system-benchmarking", - "orml-tokens", - "orml-traits", - "pallet-balances", - "parity-scale-codec", - "scale-info", - "smallvec", - "sp-api", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", -] - -[[package]] -name = "pallet-transaction-payment" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" -dependencies = [ - "frame-support", - "frame-system", - "parity-scale-codec", - "scale-info", - "serde", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", -] - -[[package]] -name = "pallet-transaction-payment-rpc" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" -dependencies = [ - "jsonrpsee", - "pallet-transaction-payment-rpc-runtime-api", - "parity-scale-codec", - "sp-api", - "sp-blockchain", - "sp-core", - "sp-rpc", - "sp-runtime", -] - -[[package]] -name = "pallet-transaction-payment-rpc-runtime-api" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" -dependencies = [ - "pallet-transaction-payment", - "parity-scale-codec", - "sp-api", - "sp-runtime", -] - -[[package]] -name = "pallet-treasury" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" -dependencies = [ - "frame-support", - "frame-system", - "impl-trait-for-tuples", - "pallet-balances", - "parity-scale-codec", - "scale-info", - "serde", - "sp-runtime", - "sp-std", -] - -[[package]] -name = "pallet-uniques" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" -dependencies = [ - "frame-benchmarking", - "frame-support", - "frame-system", - "log", - "parity-scale-codec", - "scale-info", - "sp-runtime", - "sp-std", -] - -[[package]] -name = "pallet-utility" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" -dependencies = [ - "frame-support", - "frame-system", - "parity-scale-codec", - "scale-info", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", -] - -[[package]] -name = "pallet-vesting" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" -dependencies = [ - "frame-support", - "frame-system", - "log", - "parity-scale-codec", - "scale-info", - "sp-runtime", - "sp-std", -] - -[[package]] -name = "pallet-xcm" -version = "0.9.29" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.29#94078b44fb6c9767bf60ffcaaa3be40681be5a76" -dependencies = [ - "frame-support", - "frame-system", - "log", - "parity-scale-codec", - "scale-info", - "serde", - "sp-core", - "sp-runtime", - "sp-std", - "xcm 0.9.29 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.29)", - "xcm-executor 0.9.29 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.29)", -] - -[[package]] -name = "parity-db" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c8fdb726a43661fa54b43e7114e6b88b2289cae388eb3ad766d9d1754d83fce" -dependencies = [ - "blake2-rfc", - "crc32fast", - "fs2", - "hex", - "libc", - "log", - "lz4", - "memmap2", - "parking_lot 0.12.1", - "rand 0.8.5", - "snap", -] - -[[package]] -name = "parity-scale-codec" -version = "3.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "366e44391a8af4cfd6002ef6ba072bae071a96aafca98d7d448a34c5dca38b6a" -dependencies = [ - "arrayvec 0.7.2", - "bitvec", - "byte-slice-cast", - "bytes", - "impl-trait-for-tuples", - "parity-scale-codec-derive", - "serde", -] - -[[package]] -name = "parity-scale-codec-derive" -version = "3.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9299338969a3d2f491d65f140b00ddec470858402f888af98e8642fb5e8965cd" -dependencies = [ - "proc-macro-crate", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "parity-send-wrapper" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa9777aa91b8ad9dd5aaa04a9b6bcb02c7f1deb952fca5a66034d5e63afc5c6f" - -[[package]] -name = "parity-util-mem" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c32561d248d352148124f036cac253a644685a21dc9fea383eb4907d7bd35a8f" -dependencies = [ - "cfg-if 1.0.0", - "hashbrown 0.12.3", - "impl-trait-for-tuples", - "parity-util-mem-derive", - "parking_lot 0.12.1", - "primitive-types 0.11.1", - "smallvec", - "winapi", -] - -[[package]] -name = "parity-util-mem-derive" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f557c32c6d268a07c921471619c0295f5efad3a0e76d4f97a05c091a51d110b2" -dependencies = [ - "proc-macro2", - "syn", - "synstructure", -] - -[[package]] -name = "parity-wasm" -version = "0.32.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16ad52817c4d343339b3bc2e26861bd21478eda0b7509acf83505727000512ac" -dependencies = [ - "byteorder", -] - -[[package]] -name = "parity-wasm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be5e13c266502aadf83426d87d81a0f5d1ef45b8027f5a471c360abfe4bfae92" - -[[package]] -name = "parking" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "427c3892f9e783d91cc128285287e70a59e206ca452770ece88a76f7a3eddd72" - -[[package]] -name = "parking_lot" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" -dependencies = [ - "instant", - "lock_api", - "parking_lot_core 0.8.6", -] - -[[package]] -name = "parking_lot" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" -dependencies = [ - "lock_api", - "parking_lot_core 0.9.5", -] - -[[package]] -name = "parking_lot_core" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" -dependencies = [ - "cfg-if 1.0.0", - "instant", - "libc", - "redox_syscall", - "smallvec", - "winapi", + "sp-std", ] [[package]] -name = "parking_lot_core" -version = "0.9.5" +name = "parity-db" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ff9f3fef3968a3ec5945535ed654cb38ff72d7495a25619e2247fb15a2ed9ba" +checksum = "bd4572a52711e2ccff02b4973ec7e4a5b5c23387ebbfbd6cd42b34755714cefc" dependencies = [ - "cfg-if 1.0.0", + "blake2", + "crc32fast", + "fs2", + "hex", "libc", - "redox_syscall", - "smallvec", - "windows-sys 0.42.0", -] - -[[package]] -name = "paste" -version = "1.0.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf1c2c742266c2f1041c914ba65355a83ae8747b05f208319784083583494b4b" - -[[package]] -name = "pbkdf2" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "216eaa586a190f0a738f2f918511eecfa90f13295abec0e457cdebcceda80cbd" -dependencies = [ - "crypto-mac 0.8.0", -] - -[[package]] -name = "pbkdf2" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d95f5254224e617595d2cc3cc73ff0a5eaf2637519e25f03388154e9378b6ffa" -dependencies = [ - "crypto-mac 0.11.1", -] - -[[package]] -name = "peeking_take_while" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" - -[[package]] -name = "percent-encoding" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" - -[[package]] -name = "pest" -version = "2.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc8bed3549e0f9b0a2a78bf7c0018237a2cdf085eecbbc048e52612438e4e9d0" -dependencies = [ - "thiserror", - "ucd-trie", -] - -[[package]] -name = "pest_derive" -version = "2.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdc078600d06ff90d4ed238f0119d84ab5d43dbaad278b0e33a8820293b32344" -dependencies = [ - "pest", - "pest_generator", -] - -[[package]] -name = "pest_generator" -version = "2.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28a1af60b1c4148bb269006a750cff8e2ea36aff34d2d96cf7be0b14d1bed23c" -dependencies = [ - "pest", - "pest_meta", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "pest_meta" -version = "2.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fec8605d59fc2ae0c6c1aefc0c7c7a9769732017c0ce07f7a9cfffa7b4404f20" -dependencies = [ - "once_cell", - "pest", - "sha1", -] - -[[package]] -name = "petgraph" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6d5014253a1331579ce62aa67443b4a658c5e7dd03d4bc6d302b94474888143" -dependencies = [ - "fixedbitset", - "indexmap", -] - -[[package]] -name = "pin-project" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad29a609b6bcd67fee905812e544992d216af9d755757c05ed2d0e15a74c6ecc" -dependencies = [ - "pin-project-internal", -] - -[[package]] -name = "pin-project-internal" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "pin-project-lite" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "257b64915a082f7811703966789728173279bdebb956b143dbcd23f6f970a777" - -[[package]] -name = "pin-project-lite" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" - -[[package]] -name = "pin-utils" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" - -[[package]] -name = "pkg-config" -version = "0.3.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" - -[[package]] -name = "platforms" -version = "3.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3d7ddaed09e0eb771a79ab0fd64609ba0afb0a8366421957936ad14cbd13630" - -[[package]] -name = "polkadot-approval-distribution" -version = "0.9.29" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.29#94078b44fb6c9767bf60ffcaaa3be40681be5a76" -dependencies = [ - "futures", - "polkadot-node-network-protocol", - "polkadot-node-primitives", - "polkadot-node-subsystem", - "polkadot-node-subsystem-util", - "polkadot-primitives", - "rand 0.8.5", - "tracing-gum", -] - -[[package]] -name = "polkadot-availability-bitfield-distribution" -version = "0.9.29" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.29#94078b44fb6c9767bf60ffcaaa3be40681be5a76" -dependencies = [ - "futures", - "polkadot-node-network-protocol", - "polkadot-node-subsystem", - "polkadot-node-subsystem-util", - "polkadot-primitives", - "rand 0.8.5", - "tracing-gum", -] - -[[package]] -name = "polkadot-availability-distribution" -version = "0.9.29" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.29#94078b44fb6c9767bf60ffcaaa3be40681be5a76" -dependencies = [ - "derive_more", - "fatality", - "futures", - "lru 0.7.8", - "parity-scale-codec", - "polkadot-erasure-coding", - "polkadot-node-network-protocol", - "polkadot-node-primitives", - "polkadot-node-subsystem", - "polkadot-node-subsystem-util", - "polkadot-primitives", - "rand 0.8.5", - "sp-core", - "sp-keystore", - "thiserror", - "tracing-gum", -] - -[[package]] -name = "polkadot-availability-recovery" -version = "0.9.29" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.29#94078b44fb6c9767bf60ffcaaa3be40681be5a76" -dependencies = [ - "fatality", - "futures", - "lru 0.7.8", - "parity-scale-codec", - "polkadot-erasure-coding", - "polkadot-node-network-protocol", - "polkadot-node-primitives", - "polkadot-node-subsystem", - "polkadot-node-subsystem-util", - "polkadot-primitives", - "rand 0.8.5", - "sc-network", - "thiserror", - "tracing-gum", -] - -[[package]] -name = "polkadot-client" -version = "0.9.29" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.29#94078b44fb6c9767bf60ffcaaa3be40681be5a76" -dependencies = [ - "beefy-primitives", - "frame-benchmarking", - "frame-benchmarking-cli", - "frame-system", - "frame-system-rpc-runtime-api", - "pallet-transaction-payment", - "pallet-transaction-payment-rpc-runtime-api", - "polkadot-core-primitives 0.9.29 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.29)", - "polkadot-node-core-parachains-inherent", - "polkadot-primitives", - "polkadot-runtime", - "polkadot-runtime-common", - "sc-client-api", - "sc-consensus", - "sc-executor", - "sc-service", - "sp-api", - "sp-authority-discovery", - "sp-block-builder", - "sp-blockchain", - "sp-consensus", - "sp-consensus-babe", - "sp-core", - "sp-finality-grandpa", - "sp-inherents", - "sp-keyring", - "sp-mmr-primitives", - "sp-offchain", - "sp-runtime", - "sp-session", - "sp-storage", - "sp-timestamp", - "sp-transaction-pool", -] - -[[package]] -name = "polkadot-collator-protocol" -version = "0.9.29" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.29#94078b44fb6c9767bf60ffcaaa3be40681be5a76" -dependencies = [ - "always-assert", - "fatality", - "futures", - "futures-timer", - "polkadot-node-network-protocol", - "polkadot-node-primitives", - "polkadot-node-subsystem", - "polkadot-node-subsystem-util", - "polkadot-primitives", - "sp-core", - "sp-keystore", - "sp-runtime", - "thiserror", - "tracing-gum", -] - -[[package]] -name = "polkadot-core-primitives" -version = "0.9.29" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.29#94078b44fb6c9767bf60ffcaaa3be40681be5a76" -dependencies = [ - "parity-scale-codec", - "parity-util-mem", - "scale-info", - "sp-core", - "sp-runtime", - "sp-std", + "log", + "lz4", + "memmap2", + "parking_lot 0.12.1", + "rand 0.8.5", + "siphasher", + "snap", ] [[package]] -name = "polkadot-core-primitives" -version = "0.9.29" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.29-1#19d59ae2d7735a05c7e208ddd89e39e0a2ec4033" +name = "parity-scale-codec" +version = "3.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ddb756ca205bd108aee3c62c6d3c994e1df84a59b9d6d4a5ea42ee1fd5a9a28" dependencies = [ - "parity-scale-codec", - "parity-util-mem", - "scale-info", - "sp-core", - "sp-runtime", - "sp-std", + "arrayvec 0.7.2", + "bitvec", + "byte-slice-cast", + "bytes", + "impl-trait-for-tuples", + "parity-scale-codec-derive", + "serde", ] [[package]] -name = "polkadot-dispute-distribution" -version = "0.9.29" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.29#94078b44fb6c9767bf60ffcaaa3be40681be5a76" +name = "parity-scale-codec-derive" +version = "3.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86b26a931f824dd4eca30b3e43bb4f31cd5f0d3a403c5f5ff27106b805bfde7b" dependencies = [ - "derive_more", - "fatality", - "futures", - "lru 0.7.8", - "parity-scale-codec", - "polkadot-erasure-coding", - "polkadot-node-network-protocol", - "polkadot-node-primitives", - "polkadot-node-subsystem", - "polkadot-node-subsystem-util", - "polkadot-primitives", - "sc-network", - "sp-application-crypto", - "sp-keystore", - "thiserror", - "tracing-gum", + "proc-macro-crate", + "proc-macro2", + "quote", + "syn 1.0.109", ] [[package]] -name = "polkadot-erasure-coding" -version = "0.9.29" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.29#94078b44fb6c9767bf60ffcaaa3be40681be5a76" -dependencies = [ - "parity-scale-codec", - "polkadot-node-primitives", - "polkadot-primitives", - "reed-solomon-novelpoly", - "sp-core", - "sp-trie", - "thiserror", -] +name = "parity-send-wrapper" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa9777aa91b8ad9dd5aaa04a9b6bcb02c7f1deb952fca5a66034d5e63afc5c6f" [[package]] -name = "polkadot-gossip-support" -version = "0.9.29" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.29#94078b44fb6c9767bf60ffcaaa3be40681be5a76" -dependencies = [ - "futures", - "futures-timer", - "polkadot-node-network-protocol", - "polkadot-node-subsystem", - "polkadot-node-subsystem-util", - "polkadot-primitives", - "rand 0.8.5", - "rand_chacha 0.3.1", - "sc-network", - "sp-application-crypto", - "sp-core", - "sp-keystore", - "tracing-gum", -] +name = "parity-wasm" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1ad0aff30c1da14b1254fcb2af73e1fa9a28670e584a626f53a369d0e157304" [[package]] -name = "polkadot-network-bridge" -version = "0.9.29" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.29#94078b44fb6c9767bf60ffcaaa3be40681be5a76" +name = "parking" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14f2252c834a40ed9bb5422029649578e63aa341ac401f74e719dd1afda8394e" + +[[package]] +name = "parking_lot" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" dependencies = [ - "always-assert", - "async-trait", - "bytes", - "fatality", - "futures", - "parity-scale-codec", - "parking_lot 0.12.1", - "polkadot-node-network-protocol", - "polkadot-node-subsystem", - "polkadot-node-subsystem-util", - "polkadot-overseer", - "polkadot-primitives", - "sc-network", - "sc-network-common", - "sp-consensus", - "thiserror", - "tracing-gum", + "instant", + "lock_api", + "parking_lot_core 0.8.6", ] [[package]] -name = "polkadot-node-collation-generation" -version = "0.9.29" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.29#94078b44fb6c9767bf60ffcaaa3be40681be5a76" +name = "parking_lot" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" dependencies = [ - "futures", - "parity-scale-codec", - "polkadot-erasure-coding", - "polkadot-node-primitives", - "polkadot-node-subsystem", - "polkadot-node-subsystem-util", - "polkadot-primitives", - "sp-core", - "sp-maybe-compressed-blob", - "thiserror", - "tracing-gum", + "lock_api", + "parking_lot_core 0.9.7", ] [[package]] -name = "polkadot-node-core-approval-voting" -version = "0.9.29" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.29#94078b44fb6c9767bf60ffcaaa3be40681be5a76" +name = "parking_lot_core" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" dependencies = [ - "bitvec", - "derive_more", - "futures", - "futures-timer", - "kvdb", - "lru 0.7.8", - "merlin", - "parity-scale-codec", - "polkadot-node-jaeger", - "polkadot-node-primitives", - "polkadot-node-subsystem", - "polkadot-node-subsystem-util", - "polkadot-overseer", - "polkadot-primitives", - "sc-keystore", - "schnorrkel", - "sp-application-crypto", - "sp-consensus", - "sp-consensus-slots", - "sp-runtime", - "thiserror", - "tracing-gum", + "cfg-if", + "instant", + "libc", + "redox_syscall 0.2.16", + "smallvec", + "winapi", ] [[package]] -name = "polkadot-node-core-av-store" -version = "0.9.29" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.29#94078b44fb6c9767bf60ffcaaa3be40681be5a76" +name = "parking_lot_core" +version = "0.9.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521" dependencies = [ - "bitvec", - "futures", - "futures-timer", - "kvdb", - "parity-scale-codec", - "polkadot-erasure-coding", - "polkadot-node-primitives", - "polkadot-node-subsystem", - "polkadot-node-subsystem-util", - "polkadot-overseer", - "polkadot-primitives", - "thiserror", - "tracing-gum", + "cfg-if", + "libc", + "redox_syscall 0.2.16", + "smallvec", + "windows-sys 0.45.0", ] [[package]] -name = "polkadot-node-core-backing" -version = "0.9.29" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.29#94078b44fb6c9767bf60ffcaaa3be40681be5a76" +name = "paste" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f746c4065a8fa3fe23974dd82f15431cc8d40779821001404d10d2e79ca7d79" + +[[package]] +name = "pbkdf2" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d95f5254224e617595d2cc3cc73ff0a5eaf2637519e25f03388154e9378b6ffa" dependencies = [ - "bitvec", - "fatality", - "futures", - "polkadot-erasure-coding", - "polkadot-node-primitives", - "polkadot-node-subsystem", - "polkadot-node-subsystem-util", - "polkadot-primitives", - "polkadot-statement-table", - "sp-keystore", - "thiserror", - "tracing-gum", + "crypto-mac 0.11.1", ] [[package]] -name = "polkadot-node-core-bitfield-signing" -version = "0.9.29" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.29#94078b44fb6c9767bf60ffcaaa3be40681be5a76" +name = "pbkdf2" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917" dependencies = [ - "futures", - "polkadot-node-subsystem", - "polkadot-node-subsystem-util", - "polkadot-primitives", - "sp-keystore", - "thiserror", - "tracing-gum", - "wasm-timer", + "digest 0.10.6", ] [[package]] -name = "polkadot-node-core-candidate-validation" -version = "0.9.29" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.29#94078b44fb6c9767bf60ffcaaa3be40681be5a76" +name = "peeking_take_while" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" + +[[package]] +name = "pem" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8835c273a76a90455d7344889b0964598e3316e2a79ede8e36f16bdcf2228b8" dependencies = [ - "async-trait", - "futures", - "parity-scale-codec", - "polkadot-node-core-pvf", - "polkadot-node-primitives", - "polkadot-node-subsystem", - "polkadot-node-subsystem-util", - "polkadot-parachain 0.9.29 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.29)", - "polkadot-primitives", - "sp-maybe-compressed-blob", - "tracing-gum", + "base64 0.13.1", ] [[package]] -name = "polkadot-node-core-chain-api" -version = "0.9.29" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.29#94078b44fb6c9767bf60ffcaaa3be40681be5a76" +name = "pem-rfc7468" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24d159833a9105500e0398934e205e0773f0b27529557134ecfc51c27646adac" dependencies = [ - "futures", - "polkadot-node-subsystem", - "polkadot-node-subsystem-util", - "polkadot-primitives", - "sc-client-api", - "sc-consensus-babe", - "sp-blockchain", - "tracing-gum", + "base64ct", ] [[package]] -name = "polkadot-node-core-chain-selection" -version = "0.9.29" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.29#94078b44fb6c9767bf60ffcaaa3be40681be5a76" +name = "percent-encoding" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" + +[[package]] +name = "petgraph" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4dd7d28ee937e54fe3080c91faa1c3a46c06de6252988a7f4592ba2310ef22a4" dependencies = [ - "futures", - "futures-timer", - "kvdb", - "parity-scale-codec", - "polkadot-node-primitives", - "polkadot-node-subsystem", - "polkadot-node-subsystem-util", - "polkadot-primitives", - "thiserror", - "tracing-gum", + "fixedbitset", + "indexmap", ] [[package]] -name = "polkadot-node-core-dispute-coordinator" -version = "0.9.29" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.29#94078b44fb6c9767bf60ffcaaa3be40681be5a76" +name = "pin-project" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c95a7476719eab1e366eaf73d0260af3021184f18177925b07f54b30089ceead" dependencies = [ - "fatality", - "futures", - "kvdb", - "lru 0.7.8", - "parity-scale-codec", - "polkadot-node-primitives", - "polkadot-node-subsystem", - "polkadot-node-subsystem-util", - "polkadot-primitives", - "sc-keystore", - "thiserror", - "tracing-gum", + "pin-project-internal", ] [[package]] -name = "polkadot-node-core-parachains-inherent" -version = "0.9.29" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.29#94078b44fb6c9767bf60ffcaaa3be40681be5a76" +name = "pin-project-internal" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39407670928234ebc5e6e580247dd567ad73a3578460c5990f9503df207e8f07" dependencies = [ - "async-trait", - "futures", - "futures-timer", - "polkadot-node-subsystem", - "polkadot-primitives", - "sp-blockchain", - "sp-inherents", - "sp-runtime", - "thiserror", - "tracing-gum", + "proc-macro2", + "quote", + "syn 2.0.16", ] [[package]] -name = "polkadot-node-core-provisioner" -version = "0.9.29" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.29#94078b44fb6c9767bf60ffcaaa3be40681be5a76" +name = "pin-project-lite" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "257b64915a082f7811703966789728173279bdebb956b143dbcd23f6f970a777" + +[[package]] +name = "pin-project-lite" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "pkcs8" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9eca2c590a5f85da82668fa685c09ce2888b9430e83299debf1f34b65fd4a4ba" dependencies = [ - "bitvec", - "fatality", - "futures", - "futures-timer", - "polkadot-node-primitives", - "polkadot-node-subsystem", - "polkadot-node-subsystem-util", - "polkadot-primitives", - "rand 0.8.5", - "thiserror", - "tracing-gum", + "der", + "spki", ] [[package]] -name = "polkadot-node-core-pvf" -version = "0.9.29" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.29#94078b44fb6c9767bf60ffcaaa3be40681be5a76" -dependencies = [ - "always-assert", - "assert_matches", - "async-process", - "async-std", - "futures", - "futures-timer", - "parity-scale-codec", - "pin-project", - "polkadot-core-primitives 0.9.29 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.29)", - "polkadot-node-subsystem-util", - "polkadot-parachain 0.9.29 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.29)", - "rand 0.8.5", - "rayon", - "sc-executor", - "sc-executor-common", - "sc-executor-wasmtime", - "slotmap", - "sp-core", - "sp-externalities", - "sp-io", - "sp-maybe-compressed-blob", - "sp-tracing", - "sp-wasm-interface", - "tempfile", - "tracing-gum", -] +name = "pkg-config" +version = "0.3.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" [[package]] -name = "polkadot-node-core-pvf-checker" -version = "0.9.29" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.29#94078b44fb6c9767bf60ffcaaa3be40681be5a76" -dependencies = [ - "futures", - "polkadot-node-primitives", - "polkadot-node-subsystem", - "polkadot-node-subsystem-util", - "polkadot-overseer", - "polkadot-primitives", - "sp-keystore", - "thiserror", - "tracing-gum", -] +name = "platforms" +version = "3.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3d7ddaed09e0eb771a79ab0fd64609ba0afb0a8366421957936ad14cbd13630" [[package]] -name = "polkadot-node-core-runtime-api" -version = "0.9.29" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.29#94078b44fb6c9767bf60ffcaaa3be40681be5a76" +name = "polkadot-core-primitives" +version = "0.9.38" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#097ffd245c42aeff28cf80f8a3568e1bee2e7da7" dependencies = [ - "futures", - "memory-lru", - "parity-util-mem", - "polkadot-node-subsystem", - "polkadot-node-subsystem-types", - "polkadot-node-subsystem-util", - "polkadot-primitives", - "sp-consensus-babe", - "tracing-gum", + "parity-scale-codec", + "scale-info", + "sp-core", + "sp-runtime", + "sp-std", ] [[package]] name = "polkadot-node-jaeger" -version = "0.9.29" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.29#94078b44fb6c9767bf60ffcaaa3be40681be5a76" +version = "0.9.38" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#097ffd245c42aeff28cf80f8a3568e1bee2e7da7" dependencies = [ - "async-std", "lazy_static", "log", "mick-jaeger", @@ -6523,12 +5416,13 @@ dependencies = [ "sc-network", "sp-core", "thiserror", + "tokio", ] [[package]] name = "polkadot-node-metrics" -version = "0.9.29" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.29#94078b44fb6c9767bf60ffcaaa3be40681be5a76" +version = "0.9.38" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#097ffd245c42aeff28cf80f8a3568e1bee2e7da7" dependencies = [ "bs58", "futures", @@ -6546,8 +5440,8 @@ dependencies = [ [[package]] name = "polkadot-node-network-protocol" -version = "0.9.29" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.29#94078b44fb6c9767bf60ffcaaa3be40681be5a76" +version = "0.9.38" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#097ffd245c42aeff28cf80f8a3568e1bee2e7da7" dependencies = [ "async-trait", "derive_more", @@ -6561,6 +5455,7 @@ dependencies = [ "rand 0.8.5", "sc-authority-discovery", "sc-network", + "sc-network-common", "strum", "thiserror", "tracing-gum", @@ -6568,13 +5463,13 @@ dependencies = [ [[package]] name = "polkadot-node-primitives" -version = "0.9.29" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.29#94078b44fb6c9767bf60ffcaaa3be40681be5a76" +version = "0.9.38" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#097ffd245c42aeff28cf80f8a3568e1bee2e7da7" dependencies = [ "bounded-vec", "futures", "parity-scale-codec", - "polkadot-parachain 0.9.29 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.29)", + "polkadot-parachain", "polkadot-primitives", "schnorrkel", "serde", @@ -6588,20 +5483,10 @@ dependencies = [ "zstd", ] -[[package]] -name = "polkadot-node-subsystem" -version = "0.9.29" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.29#94078b44fb6c9767bf60ffcaaa3be40681be5a76" -dependencies = [ - "polkadot-node-jaeger", - "polkadot-node-subsystem-types", - "polkadot-overseer", -] - [[package]] name = "polkadot-node-subsystem-types" -version = "0.9.29" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.29#94078b44fb6c9767bf60ffcaaa3be40681be5a76" +version = "0.9.38" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#097ffd245c42aeff28cf80f8a3568e1bee2e7da7" dependencies = [ "async-trait", "derive_more", @@ -6621,50 +5506,16 @@ dependencies = [ "thiserror", ] -[[package]] -name = "polkadot-node-subsystem-util" -version = "0.9.29" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.29#94078b44fb6c9767bf60ffcaaa3be40681be5a76" -dependencies = [ - "async-trait", - "derive_more", - "fatality", - "futures", - "itertools", - "kvdb", - "lru 0.7.8", - "parity-db", - "parity-scale-codec", - "parity-util-mem", - "parking_lot 0.11.2", - "pin-project", - "polkadot-node-jaeger", - "polkadot-node-metrics", - "polkadot-node-network-protocol", - "polkadot-node-primitives", - "polkadot-node-subsystem", - "polkadot-overseer", - "polkadot-primitives", - "prioritized-metered-channel", - "rand 0.8.5", - "sp-application-crypto", - "sp-core", - "sp-keystore", - "thiserror", - "tracing-gum", -] - [[package]] name = "polkadot-overseer" -version = "0.9.29" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.29#94078b44fb6c9767bf60ffcaaa3be40681be5a76" +version = "0.9.38" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#097ffd245c42aeff28cf80f8a3568e1bee2e7da7" dependencies = [ "async-trait", "futures", "futures-timer", - "lru 0.7.8", + "lru 0.9.0", "orchestra", - "parity-util-mem", "parking_lot 0.12.1", "polkadot-node-metrics", "polkadot-node-network-protocol", @@ -6674,421 +5525,56 @@ dependencies = [ "sc-client-api", "sp-api", "sp-core", + "tikv-jemalloc-ctl", "tracing-gum", ] [[package]] name = "polkadot-parachain" -version = "0.9.29" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.29#94078b44fb6c9767bf60ffcaaa3be40681be5a76" -dependencies = [ - "derive_more", - "frame-support", - "parity-scale-codec", - "parity-util-mem", - "polkadot-core-primitives 0.9.29 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.29)", - "scale-info", - "serde", - "sp-core", - "sp-runtime", - "sp-std", -] - -[[package]] -name = "polkadot-parachain" -version = "0.9.29" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.29-1#19d59ae2d7735a05c7e208ddd89e39e0a2ec4033" -dependencies = [ - "derive_more", - "frame-support", - "parity-scale-codec", - "parity-util-mem", - "polkadot-core-primitives 0.9.29 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.29-1)", - "scale-info", - "serde", - "sp-core", - "sp-runtime", - "sp-std", -] - -[[package]] -name = "polkadot-primitives" -version = "0.9.29" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.29#94078b44fb6c9767bf60ffcaaa3be40681be5a76" -dependencies = [ - "bitvec", - "frame-system", - "hex-literal", - "parity-scale-codec", - "parity-util-mem", - "polkadot-core-primitives 0.9.29 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.29)", - "polkadot-parachain 0.9.29 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.29)", - "scale-info", - "serde", - "sp-api", - "sp-application-crypto", - "sp-arithmetic", - "sp-authority-discovery", - "sp-consensus-slots", - "sp-core", - "sp-inherents", - "sp-io", - "sp-keystore", - "sp-runtime", - "sp-staking", - "sp-std", - "sp-trie", - "sp-version", -] - -[[package]] -name = "polkadot-rpc" -version = "0.9.29" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.29#94078b44fb6c9767bf60ffcaaa3be40681be5a76" -dependencies = [ - "beefy-gadget", - "beefy-gadget-rpc", - "jsonrpsee", - "pallet-mmr-rpc", - "pallet-transaction-payment-rpc", - "polkadot-primitives", - "sc-chain-spec", - "sc-client-api", - "sc-consensus-babe", - "sc-consensus-babe-rpc", - "sc-consensus-epochs", - "sc-finality-grandpa", - "sc-finality-grandpa-rpc", - "sc-rpc", - "sc-sync-state-rpc", - "sc-transaction-pool-api", - "sp-api", - "sp-block-builder", - "sp-blockchain", - "sp-consensus", - "sp-consensus-babe", - "sp-keystore", - "sp-runtime", - "substrate-frame-rpc-system", - "substrate-state-trie-migration-rpc", -] - -[[package]] -name = "polkadot-runtime" -version = "0.9.29" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.29#94078b44fb6c9767bf60ffcaaa3be40681be5a76" -dependencies = [ - "beefy-primitives", - "bitvec", - "frame-election-provider-support", - "frame-executive", - "frame-support", - "frame-system", - "frame-system-rpc-runtime-api", - "frame-try-runtime", - "log", - "pallet-authority-discovery", - "pallet-authorship", - "pallet-babe", - "pallet-bags-list", - "pallet-balances", - "pallet-bounties", - "pallet-child-bounties", - "pallet-collective", - "pallet-democracy", - "pallet-election-provider-multi-phase", - "pallet-elections-phragmen", - "pallet-grandpa", - "pallet-identity", - "pallet-im-online", - "pallet-indices", - "pallet-membership", - "pallet-multisig", - "pallet-nomination-pools", - "pallet-nomination-pools-runtime-api", - "pallet-offences", - "pallet-preimage", - "pallet-proxy", - "pallet-scheduler", - "pallet-session", - "pallet-staking", - "pallet-staking-reward-curve", - "pallet-timestamp", - "pallet-tips", - "pallet-transaction-payment", - "pallet-transaction-payment-rpc-runtime-api", - "pallet-treasury", - "pallet-utility", - "pallet-vesting", - "pallet-xcm", - "parity-scale-codec", - "polkadot-primitives", - "polkadot-runtime-common", - "polkadot-runtime-constants", - "polkadot-runtime-parachains", - "rustc-hex", - "scale-info", - "serde", - "serde_derive", - "smallvec", - "sp-api", - "sp-authority-discovery", - "sp-block-builder", - "sp-consensus-babe", - "sp-core", - "sp-inherents", - "sp-io", - "sp-mmr-primitives", - "sp-npos-elections", - "sp-offchain", - "sp-runtime", - "sp-session", - "sp-staking", - "sp-std", - "sp-transaction-pool", - "sp-version", - "static_assertions", - "substrate-wasm-builder", - "xcm 0.9.29 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.29)", - "xcm-builder 0.9.29 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.29)", - "xcm-executor 0.9.29 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.29)", -] - -[[package]] -name = "polkadot-runtime-common" -version = "0.9.29" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.29#94078b44fb6c9767bf60ffcaaa3be40681be5a76" -dependencies = [ - "beefy-primitives", - "bitvec", - "frame-election-provider-support", - "frame-support", - "frame-system", - "impl-trait-for-tuples", - "libsecp256k1", - "log", - "pallet-authorship", - "pallet-bags-list", - "pallet-balances", - "pallet-beefy-mmr", - "pallet-election-provider-multi-phase", - "pallet-session", - "pallet-staking", - "pallet-timestamp", - "pallet-transaction-payment", - "pallet-treasury", - "pallet-vesting", - "parity-scale-codec", - "polkadot-primitives", - "polkadot-runtime-parachains", - "rustc-hex", - "scale-info", - "serde", - "serde_derive", - "slot-range-helper", - "sp-api", - "sp-core", - "sp-inherents", - "sp-io", - "sp-npos-elections", - "sp-runtime", - "sp-session", - "sp-staking", - "sp-std", - "static_assertions", - "xcm 0.9.29 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.29)", -] - -[[package]] -name = "polkadot-runtime-constants" -version = "0.9.29" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.29#94078b44fb6c9767bf60ffcaaa3be40681be5a76" -dependencies = [ - "frame-support", - "polkadot-primitives", - "polkadot-runtime-common", - "smallvec", - "sp-runtime", -] - -[[package]] -name = "polkadot-runtime-metrics" -version = "0.9.29" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.29#94078b44fb6c9767bf60ffcaaa3be40681be5a76" -dependencies = [ - "bs58", - "parity-scale-codec", - "polkadot-primitives", - "sp-std", - "sp-tracing", -] - -[[package]] -name = "polkadot-runtime-parachains" -version = "0.9.29" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.29#94078b44fb6c9767bf60ffcaaa3be40681be5a76" +version = "0.9.38" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#097ffd245c42aeff28cf80f8a3568e1bee2e7da7" dependencies = [ - "bitflags", - "bitvec", "derive_more", "frame-support", - "frame-system", - "log", - "pallet-authority-discovery", - "pallet-authorship", - "pallet-babe", - "pallet-balances", - "pallet-session", - "pallet-staking", - "pallet-timestamp", - "pallet-vesting", - "parity-scale-codec", - "polkadot-primitives", - "polkadot-runtime-metrics", - "rand 0.8.5", - "rand_chacha 0.3.1", - "rustc-hex", + "parity-scale-codec", + "polkadot-core-primitives", "scale-info", "serde", - "sp-api", "sp-core", - "sp-inherents", - "sp-io", - "sp-keystore", "sp-runtime", - "sp-session", - "sp-staking", "sp-std", - "xcm 0.9.29 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.29)", - "xcm-executor 0.9.29 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.29)", ] [[package]] -name = "polkadot-service" -version = "0.9.29" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.29#94078b44fb6c9767bf60ffcaaa3be40681be5a76" +name = "polkadot-primitives" +version = "0.9.38" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#097ffd245c42aeff28cf80f8a3568e1bee2e7da7" dependencies = [ - "async-trait", - "beefy-gadget", - "beefy-primitives", - "frame-support", - "frame-system-rpc-runtime-api", - "futures", + "bitvec", "hex-literal", - "kvdb", - "kvdb-rocksdb", - "lru 0.7.8", - "pallet-babe", - "pallet-im-online", - "pallet-staking", - "pallet-transaction-payment-rpc-runtime-api", - "parity-db", - "polkadot-approval-distribution", - "polkadot-availability-bitfield-distribution", - "polkadot-availability-distribution", - "polkadot-availability-recovery", - "polkadot-client", - "polkadot-collator-protocol", - "polkadot-dispute-distribution", - "polkadot-gossip-support", - "polkadot-network-bridge", - "polkadot-node-collation-generation", - "polkadot-node-core-approval-voting", - "polkadot-node-core-av-store", - "polkadot-node-core-backing", - "polkadot-node-core-bitfield-signing", - "polkadot-node-core-candidate-validation", - "polkadot-node-core-chain-api", - "polkadot-node-core-chain-selection", - "polkadot-node-core-dispute-coordinator", - "polkadot-node-core-parachains-inherent", - "polkadot-node-core-provisioner", - "polkadot-node-core-pvf-checker", - "polkadot-node-core-runtime-api", - "polkadot-node-network-protocol", - "polkadot-node-primitives", - "polkadot-node-subsystem", - "polkadot-node-subsystem-types", - "polkadot-node-subsystem-util", - "polkadot-overseer", - "polkadot-parachain 0.9.29 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.29)", - "polkadot-primitives", - "polkadot-rpc", - "polkadot-runtime", - "polkadot-runtime-constants", - "polkadot-runtime-parachains", - "polkadot-statement-distribution", - "sc-authority-discovery", - "sc-basic-authorship", - "sc-block-builder", - "sc-chain-spec", - "sc-client-api", - "sc-client-db", - "sc-consensus", - "sc-consensus-babe", - "sc-consensus-slots", - "sc-executor", - "sc-finality-grandpa", - "sc-keystore", - "sc-network", - "sc-network-common", - "sc-offchain", - "sc-service", - "sc-sync-state-rpc", - "sc-sysinfo", - "sc-telemetry", - "sc-transaction-pool", + "parity-scale-codec", + "polkadot-core-primitives", + "polkadot-parachain", + "scale-info", "serde", - "serde_json", "sp-api", + "sp-application-crypto", + "sp-arithmetic", "sp-authority-discovery", - "sp-block-builder", - "sp-blockchain", - "sp-consensus", - "sp-consensus-babe", + "sp-consensus-slots", "sp-core", - "sp-finality-grandpa", "sp-inherents", "sp-io", "sp-keystore", - "sp-offchain", "sp-runtime", - "sp-session", - "sp-state-machine", - "sp-storage", - "sp-timestamp", - "sp-transaction-pool", - "sp-trie", - "substrate-prometheus-endpoint", - "thiserror", - "tracing-gum", -] - -[[package]] -name = "polkadot-statement-distribution" -version = "0.9.29" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.29#94078b44fb6c9767bf60ffcaaa3be40681be5a76" -dependencies = [ - "arrayvec 0.5.2", - "fatality", - "futures", - "indexmap", - "parity-scale-codec", - "polkadot-node-network-protocol", - "polkadot-node-primitives", - "polkadot-node-subsystem", - "polkadot-node-subsystem-util", - "polkadot-primitives", - "sp-keystore", "sp-staking", - "thiserror", - "tracing-gum", + "sp-std", ] [[package]] name = "polkadot-statement-table" -version = "0.9.29" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.29#94078b44fb6c9767bf60ffcaaa3be40681be5a76" +version = "0.9.38" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#097ffd245c42aeff28cf80f8a3568e1bee2e7da7" dependencies = [ "parity-scale-codec", "polkadot-primitives", @@ -7097,16 +5583,18 @@ dependencies = [ [[package]] name = "polling" -version = "2.5.2" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22122d5ec4f9fe1b3916419b76be1e80bcb93f618d071d2edf841b137b2a2bd6" +checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" dependencies = [ "autocfg", - "cfg-if 1.0.0", + "bitflags", + "cfg-if", + "concurrent-queue", "libc", "log", - "wepoll-ffi", - "windows-sys 0.42.0", + "pin-project-lite 0.2.9", + "windows-sys 0.48.0", ] [[package]] @@ -7117,7 +5605,7 @@ checksum = "048aeb476be11a4b6ca432ca569e375810de9294ae78f4774e78ea98a9246ede" dependencies = [ "cpufeatures", "opaque-debug 0.3.0", - "universal-hash", + "universal-hash 0.4.1", ] [[package]] @@ -7126,10 +5614,22 @@ version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8419d2b623c7c0896ff2d5d96e2cb4ede590fed28fcc34934f4c33c036e620a1" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", + "cpufeatures", + "opaque-debug 0.3.0", + "universal-hash 0.4.1", +] + +[[package]] +name = "polyval" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ef234e08c11dfcb2e56f79fd70f6f2eb7f025c0ce2333e82f4f0518ecad30c6" +dependencies = [ + "cfg-if", "cpufeatures", "opaque-debug 0.3.0", - "universal-hash", + "universal-hash 0.5.0", ] [[package]] @@ -7138,6 +5638,36 @@ version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" +[[package]] +name = "predicates" +version = "2.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59230a63c37f3e18569bdb90e4a89cbf5bf8b06fea0b84e65ea10cc4df47addd" +dependencies = [ + "difflib", + "float-cmp", + "itertools", + "normalize-line-endings", + "predicates-core", + "regex", +] + +[[package]] +name = "predicates-core" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b794032607612e7abeb4db69adb4e33590fa6cf1149e95fd7cb00e634b92f174" + +[[package]] +name = "predicates-tree" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "368ba315fb8c5052ab692e68a0eefec6ec57b23a36959c14496f0b0df2c0cecf" +dependencies = [ + "predicates-core", + "termtree", +] + [[package]] name = "pretty_assertions" version = "1.3.0" @@ -7151,16 +5681,13 @@ dependencies = [ ] [[package]] -name = "primitive-types" -version = "0.11.1" +name = "prettyplease" +version = "0.1.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e28720988bff275df1f51b171e1b2a18c30d194c4d2b61defdacecd625a5d94a" +checksum = "6c8646e95016a7a6c4adea95bafa8a16baab64b583356217f2c85db4a39d9a86" dependencies = [ - "fixed-hash 0.7.0", - "impl-codec", - "impl-serde", - "scale-info", - "uint", + "proc-macro2", + "syn 1.0.109", ] [[package]] @@ -7169,14 +5696,18 @@ version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9f3486ccba82358b11a77516035647c34ba167dfa53312630de83b12bd4f3d66" dependencies = [ - "fixed-hash 0.8.0", + "fixed-hash", + "impl-codec", + "impl-serde", + "scale-info", "uint", ] [[package]] name = "prioritized-metered-channel" version = "0.2.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.29#94078b44fb6c9767bf60ffcaaa3be40681be5a76" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "382698e48a268c832d0b181ed438374a6bb708a82a8ca273bb0f61c74cf209c4" dependencies = [ "coarsetime", "crossbeam-queue", @@ -7190,13 +5721,12 @@ dependencies = [ [[package]] name = "proc-macro-crate" -version = "1.2.1" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eda0fc3b0fb7c975631757e14d9049da17374063edb6ebbcbc54d880d4fe94e9" +checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" dependencies = [ "once_cell", - "thiserror", - "toml", + "toml_edit", ] [[package]] @@ -7208,7 +5738,7 @@ dependencies = [ "proc-macro-error-attr", "proc-macro2", "quote", - "syn", + "syn 1.0.109", "version_check", ] @@ -7225,9 +5755,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.47" +version = "1.0.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725" +checksum = "c4ec6d5fe0b140acb27c9a0444118cf55bfbb4e0b259739429abb4521dd67c16" dependencies = [ "unicode-ident", ] @@ -7238,7 +5768,7 @@ version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "449811d15fbdf5ceb5c1144416066429cf82316e2ec8ce0c1f6f8a02e7bbcf8c" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "fnv", "lazy_static", "memchr", @@ -7248,32 +5778,32 @@ dependencies = [ [[package]] name = "prometheus-client" -version = "0.16.0" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac1abe0255c04d15f571427a2d1e00099016506cf3297b53853acd2b7eb87825" +checksum = "83cd1b99916654a69008fd66b4f9397fbe08e6e51dfe23d4417acf5d3b8cb87c" dependencies = [ "dtoa", "itoa", - "owning_ref", + "parking_lot 0.12.1", "prometheus-client-derive-text-encode", ] [[package]] name = "prometheus-client-derive-text-encode" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8e12d01b9d66ad9eb4529c57666b6263fc1993cb30261d83ead658fdd932652" +checksum = "66a455fbcb954c1a7decf3c586e860fd7889cddf4b8e164be736dbac95a953cd" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] name = "proptest" -version = "1.0.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e0d9cc07f18492d879586c92b485def06bc850da3118075cd45d50e9c95b0e5" +checksum = "29f1b898011ce9595050a68e60f90bad083ff2987a695a42357134c8381fba70" dependencies = [ "bit-set", "bitflags", @@ -7284,16 +5814,17 @@ dependencies = [ "rand 0.8.5", "rand_chacha 0.3.1", "rand_xorshift", - "regex-syntax", + "regex-syntax 0.6.29", "rusty-fork", "tempfile", + "unarray", ] [[package]] name = "prost" -version = "0.10.4" +version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71adf41db68aa0daaefc69bb30bcd68ded9b9abaad5d1fbb6304c4fb390e083e" +checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd" dependencies = [ "bytes", "prost-derive", @@ -7301,31 +5832,31 @@ dependencies = [ [[package]] name = "prost-build" -version = "0.10.4" +version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ae5a4388762d5815a9fc0dea33c56b021cdc8dde0c55e0c9ca57197254b0cab" +checksum = "119533552c9a7ffacc21e099c24a0ac8bb19c2a2a3f363de84cd9b844feab270" dependencies = [ "bytes", - "cfg-if 1.0.0", - "cmake", "heck", "itertools", "lazy_static", "log", "multimap", "petgraph", + "prettyplease", "prost", "prost-types", "regex", + "syn 1.0.109", "tempfile", "which", ] [[package]] name = "prost-codec" -version = "0.1.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00af1e92c33b4813cc79fda3f2dbf56af5169709be0202df730e9ebc3e4cd007" +checksum = "0dc34979ff898b6e141106178981ce2596c387ea6e62533facfc61a37fc879c0" dependencies = [ "asynchronous-codec", "bytes", @@ -7336,24 +5867,23 @@ dependencies = [ [[package]] name = "prost-derive" -version = "0.10.1" +version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b670f45da57fb8542ebdbb6105a925fe571b67f9e7ed9f47a06a84e72b4e7cc" +checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4" dependencies = [ "anyhow", "itertools", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] name = "prost-types" -version = "0.10.1" +version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d0a014229361011dc8e69c8a1ec6c2e8d0f2af7c91e3ea3f5b2170298461e68" +checksum = "213622a1460818959ac1181aaeb2dc9c7f63df720db7d788b3e24eacd1983e13" dependencies = [ - "bytes", "prost", ] @@ -7378,6 +5908,15 @@ version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" +[[package]] +name = "quick-protobuf" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d6da84cc204722a989e01ba2f6e1e276e190f22263d0cb6ce8526fcdb0d2e1f" +dependencies = [ + "byteorder", +] + [[package]] name = "quicksink" version = "0.1.2" @@ -7389,11 +5928,29 @@ dependencies = [ "pin-project-lite 0.1.12", ] +[[package]] +name = "quinn-proto" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67c10f662eee9c94ddd7135043e544f3c82fa839a1e7b865911331961b53186c" +dependencies = [ + "bytes", + "rand 0.8.5", + "ring", + "rustc-hash", + "rustls 0.20.8", + "slab", + "thiserror", + "tinyvec", + "tracing", + "webpki 0.22.0", +] + [[package]] name = "quote" -version = "1.0.21" +version = "1.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179" +checksum = "8f4f29d145265ec1c483c7c654450edde0bfe043d3938d6972630663356d9500" dependencies = [ "proc-macro2", ] @@ -7415,7 +5972,6 @@ dependencies = [ "rand_chacha 0.2.2", "rand_core 0.5.1", "rand_hc", - "rand_pcg 0.2.1", ] [[package]] @@ -7464,7 +6020,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.8", + "getrandom 0.2.9", ] [[package]] @@ -7486,15 +6042,6 @@ dependencies = [ "rand_core 0.5.1", ] -[[package]] -name = "rand_pcg" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429" -dependencies = [ - "rand_core 0.5.1", -] - [[package]] name = "rand_pcg" version = "0.3.1" @@ -7521,9 +6068,9 @@ checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3" [[package]] name = "rayon" -version = "1.6.1" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6db3a213adf02b3bcfd2d3846bb41cb22857d131789e01df434fb7e7bc0759b7" +checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" dependencies = [ "either", "rayon-core", @@ -7531,9 +6078,9 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.10.1" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cac410af5d00ab6884528b4ab69d1e8e146e8d471201800fa1b4524126de6ad3" +checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" dependencies = [ "crossbeam-channel", "crossbeam-deque", @@ -7541,6 +6088,31 @@ dependencies = [ "num_cpus", ] +[[package]] +name = "rcgen" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6413f3de1edee53342e6138e75b56d32e7bc6e332b3bd62d497b1929d4cfbcdd" +dependencies = [ + "pem", + "ring", + "time 0.3.21", + "x509-parser 0.13.2", + "yasna", +] + +[[package]] +name = "rcgen" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffbe84efe2f38dea12e9bfc1f65377fdf03e53a18cb3b995faedf7934c7e785b" +dependencies = [ + "pem", + "ring", + "time 0.3.21", + "yasna", +] + [[package]] name = "redox_syscall" version = "0.2.16" @@ -7551,54 +6123,50 @@ dependencies = [ ] [[package]] -name = "redox_users" -version = "0.4.3" +name = "redox_syscall" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" dependencies = [ - "getrandom 0.2.8", - "redox_syscall", - "thiserror", + "bitflags", ] [[package]] -name = "reed-solomon-novelpoly" -version = "1.0.0" +name = "redox_users" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bd8f48b2066e9f69ab192797d66da804d1935bf22763204ed3675740cb0f221" +checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" dependencies = [ - "derive_more", - "fs-err", - "itertools", - "static_init", + "getrandom 0.2.9", + "redox_syscall 0.2.16", "thiserror", ] [[package]] name = "ref-cast" -version = "1.0.13" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53b15debb4f9d60d767cd8ca9ef7abb2452922f3214671ff052defc7f3502c44" +checksum = "f43faa91b1c8b36841ee70e97188a869d37ae21759da6846d4be66de5bf7b12c" dependencies = [ "ref-cast-impl", ] [[package]] name = "ref-cast-impl" -version = "1.0.13" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abfa8511e9e94fd3de6585a3d3cd00e01ed556dc9814829280af0e8dc72a8f36" +checksum = "8d2275aab483050ab2a7364c1a46604865ee7d6906684e08db0f090acf74f9e7" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.16", ] [[package]] name = "regalloc2" -version = "0.2.3" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a8d23b35d7177df3b9d31ed8a9ab4bf625c668be77a319d4f5efd4a5257701c" +checksum = "d43a209257d978ef079f3d446331d0f1794f5e0fc19b306a199983857833a779" dependencies = [ "fxhash", "log", @@ -7608,13 +6176,13 @@ dependencies = [ [[package]] name = "regex" -version = "1.7.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a" +checksum = "af83e617f331cc6ae2da5443c602dfa5af81e517212d9d611a5b3ba1777b5370" dependencies = [ - "aho-corasick", + "aho-corasick 1.0.1", "memchr", - "regex-syntax", + "regex-syntax 0.7.1", ] [[package]] @@ -7623,35 +6191,20 @@ version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" dependencies = [ - "regex-syntax", + "regex-syntax 0.6.29", ] [[package]] name = "regex-syntax" -version = "0.6.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" - -[[package]] -name = "region" -version = "2.2.0" +version = "0.6.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "877e54ea2adcd70d80e9179344c97f93ef0dffd6b03e1f4529e6e83ab2fa9ae0" -dependencies = [ - "bitflags", - "libc", - "mach", - "winapi", -] +checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] -name = "remove_dir_all" -version = "0.5.3" +name = "regex-syntax" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" -dependencies = [ - "winapi", -] +checksum = "a5996294f19bd3aae0453a862ad728f60e6600695733dd5df01da90c54363a3c" [[package]] name = "resolv-conf" @@ -7665,12 +6218,12 @@ dependencies = [ [[package]] name = "rfc6979" -version = "0.1.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96ef608575f6392792f9ecf7890c00086591d29a83910939d430753f7c050525" +checksum = "7743f17af12fa0b03b803ba12cd6a8d9483a587e89c69445e3909655c0b9fabb" dependencies = [ "crypto-bigint", - "hmac 0.11.0", + "hmac 0.12.1", "zeroize", ] @@ -7691,9 +6244,9 @@ dependencies = [ [[package]] name = "rocksdb" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "620f4129485ff1a7128d184bc687470c21c7951b64779ebc9cfdad3dcd920290" +checksum = "7e9562ea1d70c0cc63a34a22d977753b50cca91cc6b6527750463bd5dd8697bc" dependencies = [ "libc", "librocksdb-sys", @@ -7710,19 +6263,30 @@ dependencies = [ "winapi", ] +[[package]] +name = "rtcp" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1919efd6d4a6a85d13388f9487549bb8e359f17198cc03ffd72f79b553873691" +dependencies = [ + "bytes", + "thiserror", + "webrtc-util", +] + [[package]] name = "rtnetlink" version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "322c53fd76a18698f1c27381d58091de3a043d356aa5bd0d510608b565f469a0" dependencies = [ - "async-global-executor", "futures", "log", "netlink-packet-route", "netlink-proto", - "nix", + "nix 0.24.3", "thiserror", + "tokio", ] [[package]] @@ -7735,11 +6299,25 @@ dependencies = [ "winapi", ] +[[package]] +name = "rtp" +version = "0.6.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2a095411ff00eed7b12e4c6a118ba984d113e1079582570d56a5ee723f11f80" +dependencies = [ + "async-trait", + "bytes", + "rand 0.8.5", + "serde", + "thiserror", + "webrtc-util", +] + [[package]] name = "rug" -version = "1.18.0" +version = "1.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55313a5bab6820d1439c0266db37f8084e50618d35d16d81f692eee14d8b01b9" +checksum = "555e8b44763d034526db899c88cd56ccc4486cd38b444c8aa0e79d4e70ae5a34" dependencies = [ "az", "gmp-mpfr-sys", @@ -7750,9 +6328,9 @@ dependencies = [ [[package]] name = "rustc-demangle" -version = "0.1.21" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" [[package]] name = "rustc-hash" @@ -7772,47 +6350,69 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ - "semver 1.0.14", + "semver 1.0.17", +] + +[[package]] +name = "rusticata-macros" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "faf0c4a6ece9950b9abdb62b1cfcf2a68b3b67a10ba445b3bb85be2a293d0632" +dependencies = [ + "nom", ] [[package]] name = "rustix" -version = "0.33.7" +version = "0.35.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "938a344304321a9da4973b9ff4f9f8db9caf4597dfd9dda6a60b523340a0fff0" +checksum = "727a1a6d65f786ec22df8a81ca3121107f235970dc1705ed681d3e6e8b9cd5f9" dependencies = [ "bitflags", - "errno", - "io-lifetimes 0.5.3", + "errno 0.2.8", + "io-lifetimes 0.7.5", "libc", - "linux-raw-sys 0.0.42", - "winapi", + "linux-raw-sys 0.0.46", + "windows-sys 0.42.0", ] [[package]] name = "rustix" -version = "0.35.13" +version = "0.37.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acf8729d8542766f1b2cf77eb034d52f40d375bb8b615d0b147089946e16613d" +dependencies = [ + "bitflags", + "errno 0.3.1", + "io-lifetimes 1.0.10", + "libc", + "linux-raw-sys 0.3.7", + "windows-sys 0.48.0", +] + +[[package]] +name = "rustls" +version = "0.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "727a1a6d65f786ec22df8a81ca3121107f235970dc1705ed681d3e6e8b9cd5f9" +checksum = "35edb675feee39aec9c99fa5ff985081995a06d594114ae14cbe797ad7b7a6d7" dependencies = [ - "bitflags", - "errno", - "io-lifetimes 0.7.5", - "libc", - "linux-raw-sys 0.0.46", - "windows-sys 0.42.0", + "base64 0.13.1", + "log", + "ring", + "sct 0.6.1", + "webpki 0.21.4", ] [[package]] name = "rustls" -version = "0.20.7" +version = "0.20.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "539a2bfe908f471bfa933876bd1eb6a19cf2176d375f82ef7f99530a40e48c2c" +checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f" dependencies = [ "log", "ring", - "sct", - "webpki", + "sct 0.7.0", + "webpki 0.22.0", ] [[package]] @@ -7829,18 +6429,18 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0864aeff53f8c05aa08d86e5ef839d3dfcf07aeba2db32f12db0ef716e87bd55" +checksum = "d194b56d58803a43635bdc398cd17e383d6f71f9182b9a192c127ca42494a59b" dependencies = [ - "base64", + "base64 0.21.0", ] [[package]] name = "rustversion" -version = "1.0.9" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97477e48b4cf8603ad5f7aaf897467cf42ab4218a38ef76fb14c2d6773a6d6a8" +checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06" [[package]] name = "rusty-fork" @@ -7867,18 +6467,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09" - -[[package]] -name = "salsa20" -version = "0.10.2" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97a22f5af31f73a954c10289c93e8a50cc23d971e80ee446f1f6f7137a088213" -dependencies = [ - "cipher 0.4.3", -] +checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" [[package]] name = "same-file" @@ -7892,7 +6483,7 @@ dependencies = [ [[package]] name = "sc-allocator" version = "4.1.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#bcff60a227d455d95b4712b6cb356ce56b1ff672" dependencies = [ "log", "sp-core", @@ -7903,7 +6494,7 @@ dependencies = [ [[package]] name = "sc-authority-discovery" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#bcff60a227d455d95b4712b6cb356ce56b1ff672" dependencies = [ "async-trait", "futures", @@ -7914,7 +6505,7 @@ dependencies = [ "parity-scale-codec", "prost", "prost-build", - "rand 0.7.3", + "rand 0.8.5", "sc-client-api", "sc-network-common", "sp-api", @@ -7927,33 +6518,10 @@ dependencies = [ "thiserror", ] -[[package]] -name = "sc-basic-authorship" -version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" -dependencies = [ - "futures", - "futures-timer", - "log", - "parity-scale-codec", - "sc-block-builder", - "sc-client-api", - "sc-proposer-metrics", - "sc-telemetry", - "sc-transaction-pool-api", - "sp-api", - "sp-blockchain", - "sp-consensus", - "sp-core", - "sp-inherents", - "sp-runtime", - "substrate-prometheus-endpoint", -] - [[package]] name = "sc-block-builder" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#bcff60a227d455d95b4712b6cb356ce56b1ff672" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -7969,11 +6537,9 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#bcff60a227d455d95b4712b6cb356ce56b1ff672" dependencies = [ - "impl-trait-for-tuples", "memmap2", - "parity-scale-codec", "sc-chain-spec-derive", "sc-network-common", "sc-telemetry", @@ -7986,35 +6552,36 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#bcff60a227d455d95b4712b6cb356ce56b1ff672" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] name = "sc-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#bcff60a227d455d95b4712b6cb356ce56b1ff672" dependencies = [ + "array-bytes", "chrono", "clap", "fdlimit", "futures", - "hex", "libp2p", "log", "names", "parity-scale-codec", - "rand 0.7.3", + "rand 0.8.5", "regex", "rpassword", "sc-client-api", "sc-client-db", "sc-keystore", "sc-network", + "sc-network-common", "sc-service", "sc-telemetry", "sc-tracing", @@ -8036,11 +6603,10 @@ dependencies = [ [[package]] name = "sc-client-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#bcff60a227d455d95b4712b6cb356ce56b1ff672" dependencies = [ "fnv", "futures", - "hash-db", "log", "parity-scale-codec", "parking_lot 0.12.1", @@ -8057,14 +6623,13 @@ dependencies = [ "sp-runtime", "sp-state-machine", "sp-storage", - "sp-trie", "substrate-prometheus-endpoint", ] [[package]] name = "sc-client-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#bcff60a227d455d95b4712b6cb356ce56b1ff672" dependencies = [ "hash-db", "kvdb", @@ -8077,6 +6642,7 @@ dependencies = [ "parking_lot 0.12.1", "sc-client-api", "sc-state-db", + "schnellru", "sp-arithmetic", "sp-blockchain", "sp-core", @@ -8089,13 +6655,14 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#bcff60a227d455d95b4712b6cb356ce56b1ff672" dependencies = [ "async-trait", "futures", "futures-timer", "libp2p", "log", + "mockall", "parking_lot 0.12.1", "sc-client-api", "sc-utils", @@ -8110,127 +6677,23 @@ dependencies = [ "thiserror", ] -[[package]] -name = "sc-consensus-babe" -version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" -dependencies = [ - "async-trait", - "fork-tree", - "futures", - "log", - "merlin", - "num-bigint", - "num-rational 0.2.4", - "num-traits", - "parity-scale-codec", - "parking_lot 0.12.1", - "rand 0.7.3", - "sc-client-api", - "sc-consensus", - "sc-consensus-epochs", - "sc-consensus-slots", - "sc-keystore", - "sc-telemetry", - "schnorrkel", - "serde", - "sp-api", - "sp-application-crypto", - "sp-block-builder", - "sp-blockchain", - "sp-consensus", - "sp-consensus-babe", - "sp-consensus-slots", - "sp-consensus-vrf", - "sp-core", - "sp-inherents", - "sp-io", - "sp-keystore", - "sp-runtime", - "sp-version", - "substrate-prometheus-endpoint", - "thiserror", -] - -[[package]] -name = "sc-consensus-babe-rpc" -version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" -dependencies = [ - "futures", - "jsonrpsee", - "sc-consensus-babe", - "sc-consensus-epochs", - "sc-rpc-api", - "serde", - "sp-api", - "sp-application-crypto", - "sp-blockchain", - "sp-consensus", - "sp-consensus-babe", - "sp-core", - "sp-keystore", - "sp-runtime", - "thiserror", -] - -[[package]] -name = "sc-consensus-epochs" -version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" -dependencies = [ - "fork-tree", - "parity-scale-codec", - "sc-client-api", - "sc-consensus", - "sp-blockchain", - "sp-runtime", -] - -[[package]] -name = "sc-consensus-slots" -version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" -dependencies = [ - "async-trait", - "futures", - "futures-timer", - "log", - "parity-scale-codec", - "sc-client-api", - "sc-consensus", - "sc-telemetry", - "sp-arithmetic", - "sp-blockchain", - "sp-consensus", - "sp-consensus-slots", - "sp-core", - "sp-inherents", - "sp-runtime", - "sp-state-machine", - "sp-timestamp", - "thiserror", -] - [[package]] name = "sc-executor" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#bcff60a227d455d95b4712b6cb356ce56b1ff672" dependencies = [ - "lazy_static", - "lru 0.7.8", + "lru 0.8.1", "parity-scale-codec", "parking_lot 0.12.1", "sc-executor-common", "sc-executor-wasmi", + "sc-executor-wasmtime", "sp-api", "sp-core", - "sp-core-hashing-proc-macro", "sp-externalities", "sp-io", "sp-panic-handler", "sp-runtime-interface", - "sp-tasks", "sp-trie", "sp-version", "sp-wasm-interface", @@ -8241,13 +6704,10 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#bcff60a227d455d95b4712b6cb356ce56b1ff672" dependencies = [ - "environmental", - "parity-scale-codec", "sc-allocator", "sp-maybe-compressed-blob", - "sp-sandbox", "sp-wasm-interface", "thiserror", "wasm-instrument", @@ -8257,14 +6717,12 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#bcff60a227d455d95b4712b6cb356ce56b1ff672" dependencies = [ "log", - "parity-scale-codec", "sc-allocator", "sc-executor-common", "sp-runtime-interface", - "sp-sandbox", "sp-wasm-interface", "wasmi", ] @@ -8272,99 +6730,31 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#bcff60a227d455d95b4712b6cb356ce56b1ff672" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "libc", "log", "once_cell", - "parity-scale-codec", - "parity-wasm 0.42.2", - "rustix 0.33.7", "rustix 0.35.13", "sc-allocator", "sc-executor-common", "sp-runtime-interface", - "sp-sandbox", "sp-wasm-interface", "wasmtime", ] -[[package]] -name = "sc-finality-grandpa" -version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" -dependencies = [ - "ahash", - "async-trait", - "dyn-clone", - "finality-grandpa", - "fork-tree", - "futures", - "futures-timer", - "hex", - "log", - "parity-scale-codec", - "parking_lot 0.12.1", - "rand 0.8.5", - "sc-block-builder", - "sc-chain-spec", - "sc-client-api", - "sc-consensus", - "sc-keystore", - "sc-network", - "sc-network-common", - "sc-network-gossip", - "sc-telemetry", - "sc-utils", - "serde_json", - "sp-api", - "sp-application-crypto", - "sp-arithmetic", - "sp-blockchain", - "sp-consensus", - "sp-core", - "sp-finality-grandpa", - "sp-keystore", - "sp-runtime", - "substrate-prometheus-endpoint", - "thiserror", -] - -[[package]] -name = "sc-finality-grandpa-rpc" -version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" -dependencies = [ - "finality-grandpa", - "futures", - "jsonrpsee", - "log", - "parity-scale-codec", - "sc-client-api", - "sc-finality-grandpa", - "sc-rpc", - "serde", - "serde_json", - "sp-blockchain", - "sp-core", - "sp-runtime", - "thiserror", -] - [[package]] name = "sc-informant" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#bcff60a227d455d95b4712b6cb356ce56b1ff672" dependencies = [ "ansi_term", "futures", "futures-timer", "log", - "parity-util-mem", "sc-client-api", "sc-network-common", - "sc-transaction-pool-api", "sp-blockchain", "sp-runtime", ] @@ -8372,10 +6762,10 @@ dependencies = [ [[package]] name = "sc-keystore" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#bcff60a227d455d95b4712b6cb356ce56b1ff672" dependencies = [ + "array-bytes", "async-trait", - "hex", "parking_lot 0.12.1", "serde_json", "sp-application-crypto", @@ -8387,31 +6777,25 @@ dependencies = [ [[package]] name = "sc-network" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#bcff60a227d455d95b4712b6cb356ce56b1ff672" dependencies = [ + "array-bytes", "async-trait", "asynchronous-codec", - "bitflags", + "backtrace", "bytes", - "cid", "either", "fnv", - "fork-tree", "futures", "futures-timer", - "hex", "ip_network", "libp2p", - "linked-hash-map", - "linked_hash_set", "log", - "lru 0.7.8", + "lru 0.8.1", "parity-scale-codec", "parking_lot 0.12.1", "pin-project", - "prost", - "prost-build", - "rand 0.7.3", + "rand 0.8.5", "sc-block-builder", "sc-client-api", "sc-consensus", @@ -8429,58 +6813,61 @@ dependencies = [ "substrate-prometheus-endpoint", "thiserror", "unsigned-varint", - "void", "zeroize", ] [[package]] -name = "sc-network-common" +name = "sc-network-bitswap" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#bcff60a227d455d95b4712b6cb356ce56b1ff672" dependencies = [ - "async-trait", - "bitflags", - "bytes", + "cid", "futures", "libp2p", - "parity-scale-codec", + "log", + "prost", "prost-build", - "sc-consensus", - "sc-peerset", - "serde", - "smallvec", + "sc-client-api", + "sc-network-common", "sp-blockchain", - "sp-consensus", - "sp-finality-grandpa", "sp-runtime", "thiserror", + "unsigned-varint", ] [[package]] -name = "sc-network-gossip" +name = "sc-network-common" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#bcff60a227d455d95b4712b6cb356ce56b1ff672" dependencies = [ - "ahash", + "async-trait", + "bitflags", + "bytes", "futures", "futures-timer", "libp2p", - "log", - "lru 0.7.8", - "sc-network-common", + "linked_hash_set", + "parity-scale-codec", + "prost-build", + "sc-consensus", "sc-peerset", + "serde", + "smallvec", + "sp-blockchain", + "sp-consensus", + "sp-finality-grandpa", "sp-runtime", "substrate-prometheus-endpoint", - "tracing", + "thiserror", ] [[package]] name = "sc-network-light" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#bcff60a227d455d95b4712b6cb356ce56b1ff672" dependencies = [ + "array-bytes", "futures", - "hex", "libp2p", "log", "parity-scale-codec", @@ -8498,14 +6885,16 @@ dependencies = [ [[package]] name = "sc-network-sync" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#bcff60a227d455d95b4712b6cb356ce56b1ff672" dependencies = [ + "array-bytes", + "async-trait", "fork-tree", "futures", - "hex", "libp2p", "log", - "lru 0.7.8", + "lru 0.8.1", + "mockall", "parity-scale-codec", "prost", "prost-build", @@ -8513,6 +6902,7 @@ dependencies = [ "sc-consensus", "sc-network-common", "sc-peerset", + "sc-utils", "smallvec", "sp-arithmetic", "sp-blockchain", @@ -8520,19 +6910,39 @@ dependencies = [ "sp-core", "sp-finality-grandpa", "sp-runtime", + "substrate-prometheus-endpoint", "thiserror", ] +[[package]] +name = "sc-network-transactions" +version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#bcff60a227d455d95b4712b6cb356ce56b1ff672" +dependencies = [ + "array-bytes", + "futures", + "libp2p", + "log", + "parity-scale-codec", + "pin-project", + "sc-network-common", + "sc-peerset", + "sc-utils", + "sp-consensus", + "sp-runtime", + "substrate-prometheus-endpoint", +] + [[package]] name = "sc-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#bcff60a227d455d95b4712b6cb356ce56b1ff672" dependencies = [ + "array-bytes", "bytes", "fnv", "futures", "futures-timer", - "hex", "hyper", "hyper-rustls", "libp2p", @@ -8540,7 +6950,7 @@ dependencies = [ "once_cell", "parity-scale-codec", "parking_lot 0.12.1", - "rand 0.7.3", + "rand 0.8.5", "sc-client-api", "sc-network-common", "sc-peerset", @@ -8556,7 +6966,7 @@ dependencies = [ [[package]] name = "sc-peerset" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#bcff60a227d455d95b4712b6cb356ce56b1ff672" dependencies = [ "futures", "libp2p", @@ -8566,22 +6976,12 @@ dependencies = [ "wasm-timer", ] -[[package]] -name = "sc-proposer-metrics" -version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" -dependencies = [ - "log", - "substrate-prometheus-endpoint", -] - [[package]] name = "sc-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#bcff60a227d455d95b4712b6cb356ce56b1ff672" dependencies = [ "futures", - "hash-db", "jsonrpsee", "log", "parity-scale-codec", @@ -8603,18 +7003,16 @@ dependencies = [ "sp-runtime", "sp-session", "sp-version", + "tokio", ] [[package]] name = "sc-rpc-api" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#bcff60a227d455d95b4712b6cb356ce56b1ff672" dependencies = [ - "futures", "jsonrpsee", - "log", "parity-scale-codec", - "parking_lot 0.12.1", "sc-chain-spec", "sc-transaction-pool-api", "scale-info", @@ -8623,7 +7021,6 @@ dependencies = [ "sp-core", "sp-rpc", "sp-runtime", - "sp-tracing", "sp-version", "thiserror", ] @@ -8631,34 +7028,60 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#bcff60a227d455d95b4712b6cb356ce56b1ff672" dependencies = [ - "futures", + "http", "jsonrpsee", "log", "serde_json", "substrate-prometheus-endpoint", "tokio", + "tower", + "tower-http", +] + +[[package]] +name = "sc-rpc-spec-v2" +version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#bcff60a227d455d95b4712b6cb356ce56b1ff672" +dependencies = [ + "array-bytes", + "futures", + "futures-util", + "hex", + "jsonrpsee", + "log", + "parity-scale-codec", + "parking_lot 0.12.1", + "sc-chain-spec", + "sc-client-api", + "sc-transaction-pool-api", + "serde", + "sp-api", + "sp-blockchain", + "sp-core", + "sp-runtime", + "sp-version", + "thiserror", + "tokio-stream", ] [[package]] name = "sc-service" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#bcff60a227d455d95b4712b6cb356ce56b1ff672" dependencies = [ "async-trait", "directories", "exit-future", "futures", "futures-timer", - "hash-db", "jsonrpsee", "log", "parity-scale-codec", - "parity-util-mem", "parking_lot 0.12.1", "pin-project", - "rand 0.7.3", + "rand 0.8.5", "sc-block-builder", "sc-chain-spec", "sc-client-api", @@ -8668,12 +7091,16 @@ dependencies = [ "sc-informant", "sc-keystore", "sc-network", + "sc-network-bitswap", "sc-network-common", "sc-network-light", "sc-network-sync", + "sc-network-transactions", "sc-offchain", "sc-rpc", "sc-rpc-server", + "sc-rpc-spec-v2", + "sc-storage-monitor", "sc-sysinfo", "sc-telemetry", "sc-tracing", @@ -8683,23 +7110,20 @@ dependencies = [ "serde", "serde_json", "sp-api", - "sp-application-crypto", - "sp-block-builder", "sp-blockchain", "sp-consensus", "sp-core", "sp-externalities", - "sp-inherents", "sp-keystore", "sp-runtime", "sp-session", "sp-state-machine", "sp-storage", - "sp-tracing", "sp-transaction-pool", "sp-transaction-storage-proof", "sp-trie", "sp-version", + "static_init", "substrate-prometheus-endpoint", "tempfile", "thiserror", @@ -8711,46 +7135,40 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#bcff60a227d455d95b4712b6cb356ce56b1ff672" dependencies = [ "log", "parity-scale-codec", - "parity-util-mem", - "parity-util-mem-derive", "parking_lot 0.12.1", - "sc-client-api", "sp-core", ] [[package]] -name = "sc-sync-state-rpc" -version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +name = "sc-storage-monitor" +version = "0.1.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#bcff60a227d455d95b4712b6cb356ce56b1ff672" dependencies = [ - "jsonrpsee", - "parity-scale-codec", - "sc-chain-spec", - "sc-client-api", - "sc-consensus-babe", - "sc-consensus-epochs", - "sc-finality-grandpa", - "serde", - "serde_json", - "sp-blockchain", - "sp-runtime", + "clap", + "futures", + "log", + "nix 0.26.2", + "sc-client-db", + "sc-utils", + "sp-core", "thiserror", + "tokio", ] [[package]] name = "sc-sysinfo" version = "6.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#bcff60a227d455d95b4712b6cb356ce56b1ff672" dependencies = [ "futures", "libc", "log", - "rand 0.7.3", - "rand_pcg 0.2.1", + "rand 0.8.5", + "rand_pcg", "regex", "sc-telemetry", "serde", @@ -8763,7 +7181,7 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#bcff60a227d455d95b4712b6cb356ce56b1ff672" dependencies = [ "chrono", "futures", @@ -8771,7 +7189,8 @@ dependencies = [ "log", "parking_lot 0.12.1", "pin-project", - "rand 0.7.3", + "rand 0.8.5", + "sc-utils", "serde", "serde_json", "thiserror", @@ -8781,7 +7200,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#bcff60a227d455d95b4712b6cb356ce56b1ff672" dependencies = [ "ansi_term", "atty", @@ -8812,25 +7231,26 @@ dependencies = [ [[package]] name = "sc-tracing-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#bcff60a227d455d95b4712b6cb356ce56b1ff672" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] name = "sc-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#bcff60a227d455d95b4712b6cb356ce56b1ff672" dependencies = [ + "async-trait", "futures", "futures-timer", "linked-hash-map", "log", + "num-traits", "parity-scale-codec", - "parity-util-mem", "parking_lot 0.12.1", "sc-client-api", "sc-transaction-pool-api", @@ -8849,8 +7269,9 @@ dependencies = [ [[package]] name = "sc-transaction-pool-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#bcff60a227d455d95b4712b6cb356ce56b1ff672" dependencies = [ + "async-trait", "futures", "log", "serde", @@ -8862,8 +7283,9 @@ dependencies = [ [[package]] name = "sc-utils" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#bcff60a227d455d95b4712b6cb356ce56b1ff672" dependencies = [ + "backtrace", "futures", "futures-timer", "lazy_static", @@ -8874,12 +7296,12 @@ dependencies = [ [[package]] name = "scale-info" -version = "2.3.1" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "001cf62ece89779fd16105b5f515ad0e5cedcd5440d3dd806bb067978e7c3608" +checksum = "dfdef77228a4c05dc94211441595746732131ad7f6530c6c18f045da7b7ab937" dependencies = [ "bitvec", - "cfg-if 1.0.0", + "cfg-if", "derive_more", "parity-scale-codec", "scale-info-derive", @@ -8888,24 +7310,34 @@ dependencies = [ [[package]] name = "scale-info-derive" -version = "2.3.1" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "303959cf613a6f6efd19ed4b4ad5bf79966a13352716299ad532cfb115f4205c" +checksum = "53012eae69e5aa5c14671942a5dd47de59d4cdcff8532a6dd0e081faf1119482" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] name = "schannel" -version = "0.1.20" +version = "0.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88d6731146462ea25d9244b2ed5fd1d716d25c52e4d54aa4fb0f3c4e9854dbe2" +checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3" dependencies = [ - "lazy_static", - "windows-sys 0.36.1", + "windows-sys 0.42.0", +] + +[[package]] +name = "schnellru" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "772575a524feeb803e5b0fcbc6dd9f367e579488197c94c6e4023aad2305774d" +dependencies = [ + "ahash 0.8.3", + "cfg-if", + "hashbrown 0.13.2", ] [[package]] @@ -8934,9 +7366,19 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" [[package]] name = "scratch" -version = "1.0.2" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8132065adcfd6e02db789d9285a0deb2f3fcb04002865ab67d5fb103533898" +checksum = "1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1" + +[[package]] +name = "sct" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b362b83898e0e69f38515b82ee15aa80636befe47c3b6d3d89a911e78fc228ce" +dependencies = [ + "ring", + "untrusted", +] [[package]] name = "sct" @@ -8948,23 +7390,37 @@ dependencies = [ "untrusted", ] +[[package]] +name = "sdp" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d22a5ef407871893fd72b4562ee15e4742269b173959db4b8df6f538c414e13" +dependencies = [ + "rand 0.8.5", + "substring", + "thiserror", + "url", +] + [[package]] name = "sec1" -version = "0.2.1" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08da66b8b0965a5555b6bd6639e68ccba85e1e2506f5fbb089e93f8a04e1a2d1" +checksum = "3be24c1842290c45df0a7bf069e0c268a747ad05a192f2fd7dcfdbc1cba40928" dependencies = [ + "base16ct", "der", - "generic-array 0.14.6", + "generic-array 0.14.7", + "pkcs8", "subtle", "zeroize", ] [[package]] name = "secp256k1" -version = "0.24.2" +version = "0.24.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9512ffd81e3a3503ed401f79c33168b9148c75038956039166cd750eaa037c3" +checksum = "6b1629c9c557ef9b293568b338dddfc8208c98a18c59d722a9d53f859d9c9b62" dependencies = [ "secp256k1-sys", ] @@ -8989,9 +7445,9 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.7.0" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bc1bb97804af6631813c55739f771071e0f2ed33ee20b68c86ec505d906356c" +checksum = "ca2855b3715770894e67cbfa3df957790aa0c9edc3bf06efa1a84d77fa0839d1" dependencies = [ "bitflags", "core-foundation", @@ -9002,9 +7458,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.6.1" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0160a13a177a45bfb43ce71c01580998474f556ad854dcbca936dd2841a5c556" +checksum = "f51d0c0d83bec45f16480d0ce0058397a69e48fcdc52d1dc8855fb68acbd31a7" dependencies = [ "core-foundation-sys", "libc", @@ -9021,9 +7477,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.14" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e25dfac463d778e353db5be2449d1cce89bd6fd23c9f1ea21310ce6e5a1b29c4" +checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" dependencies = [ "serde", ] @@ -9036,44 +7492,35 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.147" +version = "1.0.163" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d193d69bae983fc11a79df82342761dfbf28a99fc8d203dca4c3c1b590948965" +checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.147" +version = "1.0.163" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f1d362ca8fc9c3e3a7484440752472d68a6caa98f1ab81d99b5dfe517cec852" +checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.16", ] [[package]] name = "serde_json" -version = "1.0.89" +version = "1.0.96" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "020ff22c755c2ed3f8cf162dbb41a7268d934702f3ed3631656ea597e08fc3db" +checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1" dependencies = [ "itoa", "ryu", "serde", ] -[[package]] -name = "serde_nanos" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e44969a61f5d316be20a42ff97816efb3b407a924d06824c3d8a49fa8450de0e" -dependencies = [ - "serde", -] - [[package]] name = "sha-1" version = "0.9.8" @@ -9081,7 +7528,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "99cd6713db3cf16b6c84e06321e049a9b9f699826e16096d23bbcc44d15d51a6" dependencies = [ "block-buffer 0.9.0", - "cfg-if 1.0.0", + "cfg-if", "cpufeatures", "digest 0.9.0", "opaque-debug 0.3.0", @@ -9093,7 +7540,7 @@ version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "cpufeatures", "digest 0.10.6", ] @@ -9117,7 +7564,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" dependencies = [ "block-buffer 0.9.0", - "cfg-if 1.0.0", + "cfg-if", "cpufeatures", "digest 0.9.0", "opaque-debug 0.3.0", @@ -9129,16 +7576,16 @@ version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "cpufeatures", "digest 0.10.6", ] [[package]] name = "sha3" -version = "0.10.6" +version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdf0c33fae925bdc080598b84bc15c55e7b9a4a43b3c704da051f977469691c9" +checksum = "75872d278a8f37ef87fa0ddbda7802605cb18344497949862c0d4dcb291eba60" dependencies = [ "digest 0.10.6", "keccak", @@ -9159,32 +7606,22 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" -[[package]] -name = "signal-hook" -version = "0.3.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a253b5e89e2698464fc26b545c9edceb338e18a89effeeecfea192c3025be29d" -dependencies = [ - "libc", - "signal-hook-registry", -] - [[package]] name = "signal-hook-registry" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0" +checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" dependencies = [ "libc", ] [[package]] name = "signature" -version = "1.4.0" +version = "1.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02658e48d89f2bec991f9a78e69cfa4c316f8d6a6c4ec12fae1aeb263d486788" +checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c" dependencies = [ - "digest 0.9.0", + "digest 0.10.6", "rand_core 0.6.4", ] @@ -9201,40 +7638,25 @@ dependencies = [ ] [[package]] -name = "slab" -version = "0.4.7" +name = "siphasher" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef" -dependencies = [ - "autocfg", -] +checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" [[package]] -name = "slice-group-by" -version = "0.3.0" +name = "slab" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03b634d87b960ab1a38c4fe143b508576f075e7c978bfad18217645ebfdfa2ec" - -[[package]] -name = "slot-range-helper" -version = "0.9.29" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.29#94078b44fb6c9767bf60ffcaaa3be40681be5a76" +checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" dependencies = [ - "enumn", - "parity-scale-codec", - "paste", - "sp-runtime", - "sp-std", + "autocfg", ] [[package]] -name = "slotmap" -version = "1.0.6" +name = "slice-group-by" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1e08e261d0e8f5c43123b7adf3e4ca1690d655377ac93a03b2c9d3e98de1342" -dependencies = [ - "version_check", -] +checksum = "826167069c09b99d56f31e9ae5c99049e932a98c9dc2dac47645b08dbbf76ba7" [[package]] name = "smallvec" @@ -9250,14 +7672,14 @@ checksum = "5e9f0ab6ef7eb7353d9119c170a436d1bf248eea575ac42d19d12f4e34130831" [[package]] name = "snow" -version = "0.9.0" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "774d05a3edae07ce6d68ea6984f3c05e9bba8927e3dd591e3b479e5b03213d0d" +checksum = "5ccba027ba85743e09d15c03296797cad56395089b832b48b5a5217880f57733" dependencies = [ - "aes-gcm", + "aes-gcm 0.9.4", "blake2", "chacha20poly1305", - "curve25519-dalek 4.0.0-pre.5", + "curve25519-dalek 4.0.0-rc.1", "rand_core 0.6.4", "ring", "rustc_version", @@ -9267,9 +7689,9 @@ dependencies = [ [[package]] name = "socket2" -version = "0.4.7" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd" +checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" dependencies = [ "libc", "winapi", @@ -9281,10 +7703,11 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "41d1c5305e39e09653383c2c7244f2f78b3bcae37cf50c64cb4789c9f5096ec2" dependencies = [ - "base64", + "base64 0.13.1", "bytes", "flate2", "futures", + "http", "httparse", "log", "rand 0.8.5", @@ -9294,7 +7717,7 @@ dependencies = [ [[package]] name = "sp-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#bcff60a227d455d95b4712b6cb356ce56b1ff672" dependencies = [ "hash-db", "log", @@ -9312,19 +7735,19 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#bcff60a227d455d95b4712b6cb356ce56b1ff672" dependencies = [ "blake2", "proc-macro-crate", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] name = "sp-application-crypto" -version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +version = "7.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#bcff60a227d455d95b4712b6cb356ce56b1ff672" dependencies = [ "parity-scale-codec", "scale-info", @@ -9336,15 +7759,14 @@ dependencies = [ [[package]] name = "sp-arithmetic" -version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +version = "6.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#bcff60a227d455d95b4712b6cb356ce56b1ff672" dependencies = [ "integer-sqrt", "num-traits", "parity-scale-codec", "scale-info", "serde", - "sp-debug-derive", "sp-std", "static_assertions", ] @@ -9352,7 +7774,7 @@ dependencies = [ [[package]] name = "sp-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#bcff60a227d455d95b4712b6cb356ce56b1ff672" dependencies = [ "parity-scale-codec", "scale-info", @@ -9362,22 +7784,10 @@ dependencies = [ "sp-std", ] -[[package]] -name = "sp-authorship" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" -dependencies = [ - "async-trait", - "parity-scale-codec", - "sp-inherents", - "sp-runtime", - "sp-std", -] - [[package]] name = "sp-block-builder" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#bcff60a227d455d95b4712b6cb356ce56b1ff672" dependencies = [ "parity-scale-codec", "sp-api", @@ -9389,11 +7799,11 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#bcff60a227d455d95b4712b6cb356ce56b1ff672" dependencies = [ "futures", "log", - "lru 0.7.8", + "lru 0.8.1", "parity-scale-codec", "parking_lot 0.12.1", "sp-api", @@ -9407,11 +7817,10 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#bcff60a227d455d95b4712b6cb356ce56b1ff672" dependencies = [ "async-trait", "futures", - "futures-timer", "log", "parity-scale-codec", "sp-core", @@ -9426,7 +7835,7 @@ dependencies = [ [[package]] name = "sp-consensus-aura" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#bcff60a227d455d95b4712b6cb356ce56b1ff672" dependencies = [ "async-trait", "parity-scale-codec", @@ -9444,7 +7853,7 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#bcff60a227d455d95b4712b6cb356ce56b1ff672" dependencies = [ "async-trait", "merlin", @@ -9467,13 +7876,11 @@ dependencies = [ [[package]] name = "sp-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#bcff60a227d455d95b4712b6cb356ce56b1ff672" dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-arithmetic", - "sp-runtime", "sp-std", "sp-timestamp", ] @@ -9481,7 +7888,7 @@ dependencies = [ [[package]] name = "sp-consensus-vrf" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#bcff60a227d455d95b4712b6cb356ce56b1ff672" dependencies = [ "parity-scale-codec", "scale-info", @@ -9493,30 +7900,27 @@ dependencies = [ [[package]] name = "sp-core" -version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +version = "7.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#bcff60a227d455d95b4712b6cb356ce56b1ff672" dependencies = [ + "array-bytes", "base58", "bitflags", - "blake2-rfc", - "byteorder", + "blake2", "dyn-clonable", "ed25519-zebra", "futures", "hash-db", "hash256-std-hasher", - "hex", "impl-serde", "lazy_static", "libsecp256k1", "log", "merlin", - "num-traits", "parity-scale-codec", - "parity-util-mem", "parking_lot 0.12.1", - "primitive-types 0.11.1", - "rand 0.7.3", + "primitive-types", + "rand 0.8.5", "regex", "scale-info", "schnorrkel", @@ -9533,14 +7937,13 @@ dependencies = [ "substrate-bip39", "thiserror", "tiny-bip39", - "wasmi", "zeroize", ] [[package]] name = "sp-core-hashing" -version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +version = "5.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#bcff60a227d455d95b4712b6cb356ce56b1ff672" dependencies = [ "blake2", "byteorder", @@ -9554,18 +7957,18 @@ dependencies = [ [[package]] name = "sp-core-hashing-proc-macro" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#bcff60a227d455d95b4712b6cb356ce56b1ff672" dependencies = [ "proc-macro2", "quote", "sp-core-hashing", - "syn", + "syn 1.0.109", ] [[package]] name = "sp-database" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#bcff60a227d455d95b4712b6cb356ce56b1ff672" dependencies = [ "kvdb", "parking_lot 0.12.1", @@ -9573,18 +7976,18 @@ dependencies = [ [[package]] name = "sp-debug-derive" -version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +version = "5.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#bcff60a227d455d95b4712b6cb356ce56b1ff672" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] name = "sp-externalities" -version = "0.12.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +version = "0.13.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#bcff60a227d455d95b4712b6cb356ce56b1ff672" dependencies = [ "environmental", "parity-scale-codec", @@ -9595,7 +7998,7 @@ dependencies = [ [[package]] name = "sp-finality-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#bcff60a227d455d95b4712b6cb356ce56b1ff672" dependencies = [ "finality-grandpa", "log", @@ -9613,7 +8016,7 @@ dependencies = [ [[package]] name = "sp-inherents" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#bcff60a227d455d95b4712b6cb356ce56b1ff672" dependencies = [ "async-trait", "impl-trait-for-tuples", @@ -9626,16 +8029,16 @@ dependencies = [ [[package]] name = "sp-io" -version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +version = "7.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#bcff60a227d455d95b4712b6cb356ce56b1ff672" dependencies = [ "bytes", + "ed25519", + "ed25519-dalek", "futures", - "hash-db", "libsecp256k1", "log", "parity-scale-codec", - "parking_lot 0.12.1", "secp256k1", "sp-core", "sp-externalities", @@ -9645,15 +8048,14 @@ dependencies = [ "sp-std", "sp-tracing", "sp-trie", - "sp-wasm-interface", "tracing", "tracing-core", ] [[package]] name = "sp-keyring" -version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +version = "7.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#bcff60a227d455d95b4712b6cb356ce56b1ff672" dependencies = [ "lazy_static", "sp-core", @@ -9663,8 +8065,8 @@ dependencies = [ [[package]] name = "sp-keystore" -version = "0.12.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +version = "0.13.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#bcff60a227d455d95b4712b6cb356ce56b1ff672" dependencies = [ "async-trait", "futures", @@ -9679,47 +8081,18 @@ dependencies = [ ] [[package]] -name = "sp-maybe-compressed-blob" -version = "4.1.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" -dependencies = [ - "thiserror", - "zstd", -] - -[[package]] -name = "sp-mmr-primitives" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" -dependencies = [ - "log", - "parity-scale-codec", - "serde", - "sp-api", - "sp-core", - "sp-debug-derive", - "sp-runtime", - "sp-std", -] - -[[package]] -name = "sp-npos-elections" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" -dependencies = [ - "parity-scale-codec", - "scale-info", - "serde", - "sp-arithmetic", - "sp-core", - "sp-runtime", - "sp-std", +name = "sp-maybe-compressed-blob" +version = "4.1.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#bcff60a227d455d95b4712b6cb356ce56b1ff672" +dependencies = [ + "thiserror", + "zstd", ] [[package]] name = "sp-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#bcff60a227d455d95b4712b6cb356ce56b1ff672" dependencies = [ "sp-api", "sp-core", @@ -9728,8 +8101,8 @@ dependencies = [ [[package]] name = "sp-panic-handler" -version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +version = "5.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#bcff60a227d455d95b4712b6cb356ce56b1ff672" dependencies = [ "backtrace", "lazy_static", @@ -9739,7 +8112,7 @@ dependencies = [ [[package]] name = "sp-rpc" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#bcff60a227d455d95b4712b6cb356ce56b1ff672" dependencies = [ "rustc-hash", "serde", @@ -9748,17 +8121,16 @@ dependencies = [ [[package]] name = "sp-runtime" -version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +version = "7.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#bcff60a227d455d95b4712b6cb356ce56b1ff672" dependencies = [ "either", "hash256-std-hasher", "impl-trait-for-tuples", "log", "parity-scale-codec", - "parity-util-mem", "paste", - "rand 0.7.3", + "rand 0.8.5", "scale-info", "serde", "sp-application-crypto", @@ -9766,17 +8138,18 @@ dependencies = [ "sp-core", "sp-io", "sp-std", + "sp-weights", ] [[package]] name = "sp-runtime-interface" -version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +version = "7.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#bcff60a227d455d95b4712b6cb356ce56b1ff672" dependencies = [ "bytes", "impl-trait-for-tuples", "parity-scale-codec", - "primitive-types 0.11.1", + "primitive-types", "sp-externalities", "sp-runtime-interface-proc-macro", "sp-std", @@ -9788,34 +8161,20 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" -version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +version = "6.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#bcff60a227d455d95b4712b6cb356ce56b1ff672" dependencies = [ "Inflector", "proc-macro-crate", "proc-macro2", "quote", - "syn", -] - -[[package]] -name = "sp-sandbox" -version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" -dependencies = [ - "log", - "parity-scale-codec", - "sp-core", - "sp-io", - "sp-std", - "sp-wasm-interface", - "wasmi", + "syn 1.0.109", ] [[package]] name = "sp-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#bcff60a227d455d95b4712b6cb356ce56b1ff672" dependencies = [ "parity-scale-codec", "scale-info", @@ -9829,25 +8188,25 @@ dependencies = [ [[package]] name = "sp-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#bcff60a227d455d95b4712b6cb356ce56b1ff672" dependencies = [ "parity-scale-codec", "scale-info", + "sp-core", "sp-runtime", "sp-std", ] [[package]] name = "sp-state-machine" -version = "0.12.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +version = "0.13.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#bcff60a227d455d95b4712b6cb356ce56b1ff672" dependencies = [ "hash-db", "log", - "num-traits", "parity-scale-codec", "parking_lot 0.12.1", - "rand 0.7.3", + "rand 0.8.5", "smallvec", "sp-core", "sp-externalities", @@ -9856,18 +8215,17 @@ dependencies = [ "sp-trie", "thiserror", "tracing", - "trie-root", ] [[package]] name = "sp-std" -version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +version = "5.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#bcff60a227d455d95b4712b6cb356ce56b1ff672" [[package]] name = "sp-storage" -version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +version = "7.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#bcff60a227d455d95b4712b6cb356ce56b1ff672" dependencies = [ "impl-serde", "parity-scale-codec", @@ -9877,29 +8235,15 @@ dependencies = [ "sp-std", ] -[[package]] -name = "sp-tasks" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" -dependencies = [ - "log", - "sp-core", - "sp-externalities", - "sp-io", - "sp-runtime-interface", - "sp-std", -] - [[package]] name = "sp-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#bcff60a227d455d95b4712b6cb356ce56b1ff672" dependencies = [ "async-trait", "futures-timer", "log", "parity-scale-codec", - "sp-api", "sp-inherents", "sp-runtime", "sp-std", @@ -9908,8 +8252,8 @@ dependencies = [ [[package]] name = "sp-tracing" -version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +version = "6.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#bcff60a227d455d95b4712b6cb356ce56b1ff672" dependencies = [ "parity-scale-codec", "sp-std", @@ -9921,7 +8265,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#bcff60a227d455d95b4712b6cb356ce56b1ff672" dependencies = [ "sp-api", "sp-runtime", @@ -9930,7 +8274,7 @@ dependencies = [ [[package]] name = "sp-transaction-storage-proof" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#bcff60a227d455d95b4712b6cb356ce56b1ff672" dependencies = [ "async-trait", "log", @@ -9945,19 +8289,19 @@ dependencies = [ [[package]] name = "sp-trie" -version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +version = "7.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#bcff60a227d455d95b4712b6cb356ce56b1ff672" dependencies = [ - "ahash", + "ahash 0.8.3", "hash-db", "hashbrown 0.12.3", "lazy_static", - "lru 0.7.8", "memory-db", "nohash-hasher", "parity-scale-codec", "parking_lot 0.12.1", "scale-info", + "schnellru", "sp-core", "sp-std", "thiserror", @@ -9969,11 +8313,11 @@ dependencies = [ [[package]] name = "sp-version" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#bcff60a227d455d95b4712b6cb356ce56b1ff672" dependencies = [ "impl-serde", "parity-scale-codec", - "parity-wasm 0.42.2", + "parity-wasm", "scale-info", "serde", "sp-core-hashing-proc-macro", @@ -9986,18 +8330,18 @@ dependencies = [ [[package]] name = "sp-version-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#bcff60a227d455d95b4712b6cb356ce56b1ff672" dependencies = [ "parity-scale-codec", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] name = "sp-wasm-interface" -version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +version = "7.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#bcff60a227d455d95b4712b6cb356ce56b1ff672" dependencies = [ "impl-trait-for-tuples", "log", @@ -10007,17 +8351,42 @@ dependencies = [ "wasmtime", ] +[[package]] +name = "sp-weights" +version = "4.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#bcff60a227d455d95b4712b6cb356ce56b1ff672" +dependencies = [ + "parity-scale-codec", + "scale-info", + "serde", + "smallvec", + "sp-arithmetic", + "sp-core", + "sp-debug-derive", + "sp-std", +] + [[package]] name = "spin" version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" +[[package]] +name = "spki" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67cf02bbac7a337dc36e4f5a693db6c21e7863f45070f7064577eb4367a3212b" +dependencies = [ + "base64ct", + "der", +] + [[package]] name = "ss58-registry" -version = "1.36.0" +version = "1.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23d92659e7d18d82b803824a9ba5a6022cff101c3491d027c1c1d8d30e749284" +checksum = "eb47a8ad42e5fc72d5b1eb104a5546937eaf39843499948bb666d6e93c62423b" dependencies = [ "Inflector", "num-format", @@ -10042,27 +8411,30 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] name = "static_init" -version = "0.5.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11b73400442027c4adedda20a9f9b7945234a5bd8d5f7e86da22bd5d0622369c" +checksum = "8a2a1c578e98c1c16fc3b8ec1328f7659a500737d7a0c6d625e73e830ff9c1f6" dependencies = [ + "bitflags", "cfg_aliases", "libc", "parking_lot 0.11.2", + "parking_lot_core 0.8.6", "static_init_macro", + "winapi", ] [[package]] name = "static_init_macro" -version = "0.5.0" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2261c91034a1edc3fc4d1b80e89d82714faede0515c14a75da10cb941546bbf" +checksum = "70a2595fc3aa78f2d0e45dd425b22282dd863273761cc77780914b2cf3003acf" dependencies = [ "cfg_aliases", "memchr", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -10103,7 +8475,26 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn", + "syn 1.0.109", +] + +[[package]] +name = "stun" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7e94b1ec00bad60e6410e058b52f1c66de3dc5fe4d62d09b3e52bb7d3b73e25" +dependencies = [ + "base64 0.13.1", + "crc", + "lazy_static", + "md-5", + "rand 0.8.5", + "ring", + "subtle", + "thiserror", + "tokio", + "url", + "webrtc-util", ] [[package]] @@ -10119,33 +8510,11 @@ dependencies = [ "zeroize", ] -[[package]] -name = "substrate-frame-rpc-system" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" -dependencies = [ - "frame-system-rpc-runtime-api", - "futures", - "jsonrpsee", - "log", - "parity-scale-codec", - "sc-client-api", - "sc-rpc-api", - "sc-transaction-pool-api", - "serde_json", - "sp-api", - "sp-block-builder", - "sp-blockchain", - "sp-core", - "sp-runtime", -] - [[package]] name = "substrate-prometheus-endpoint" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#bcff60a227d455d95b4712b6cb356ce56b1ff672" dependencies = [ - "futures-util", "hyper", "log", "prometheus", @@ -10153,31 +8522,10 @@ dependencies = [ "tokio", ] -[[package]] -name = "substrate-state-trie-migration-rpc" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" -dependencies = [ - "jsonrpsee", - "log", - "parity-scale-codec", - "sc-client-api", - "sc-rpc-api", - "scale-info", - "serde", - "sp-core", - "sp-io", - "sp-runtime", - "sp-state-machine", - "sp-std", - "sp-trie", - "trie-db", -] - [[package]] name = "substrate-wasm-builder" version = "5.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.38#bcff60a227d455d95b4712b6cb356ce56b1ff672" dependencies = [ "ansi_term", "build-helper", @@ -10188,7 +8536,16 @@ dependencies = [ "tempfile", "toml", "walkdir", - "wasm-gc-api", + "wasm-opt", +] + +[[package]] +name = "substring" +version = "1.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ee6433ecef213b2e72f587ef64a2f5943e7cd16fbd82dbe8bc07486c534c86" +dependencies = [ + "autocfg", ] [[package]] @@ -10199,9 +8556,20 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" [[package]] name = "syn" -version = "1.0.99" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58dbef6ec655055e20b86b15a8cc6d439cca19b667537ac6a1369572d151ab13" +checksum = "a6f671d4b5ffdb8eadec19c0ae67fe2639df8684bd7bc4b83d986b8db549cf01" dependencies = [ "proc-macro2", "quote", @@ -10216,7 +8584,7 @@ checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", "unicode-xid", ] @@ -10249,79 +8617,73 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "target-lexicon" -version = "0.12.5" +version = "0.12.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9410d0f6853b1d94f0e519fb95df60f29d2c1eff2d921ffdf01a4c8a3b54f12d" +checksum = "fd1ba337640d60c3e96bc6f0638a939b9c9a7f2c316a1598c279828b3d1dc8c5" [[package]] name = "tempfile" -version = "3.3.0" +version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" +checksum = "b9fbec84f381d5795b08656e4912bec604d162bff9291d6189a78f4c8ab87998" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "fastrand", - "libc", - "redox_syscall", - "remove_dir_all", - "winapi", + "redox_syscall 0.3.5", + "rustix 0.37.19", + "windows-sys 0.45.0", ] [[package]] name = "termcolor" -version = "1.1.3" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" +checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" dependencies = [ "winapi-util", ] +[[package]] +name = "termtree" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" + [[package]] name = "test-utils" -version = "1.1.0" +version = "1.1.1" dependencies = [ "frame-system", "pretty_assertions", ] -[[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.37" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e" +checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.37" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb" +checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.16", ] -[[package]] -name = "thousands" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bf63baf9f5039dadc247375c29eb13706706cfde997d0330d05aa63a77d8820" - [[package]] name = "thread_local" -version = "1.1.4" +version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5516c27b78311c50bf42c071425c560ac799b11c30b31f87e3081965fe5e0180" +checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" dependencies = [ + "cfg-if", "once_cell", ] @@ -10347,14 +8709,24 @@ dependencies = [ "threadpool", ] +[[package]] +name = "tikv-jemalloc-ctl" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e37706572f4b151dff7a0146e040804e9c26fe3a3118591112f05cf12a4216c1" +dependencies = [ + "libc", + "paste", + "tikv-jemalloc-sys", +] + [[package]] name = "tikv-jemalloc-sys" -version = "0.4.3+5.2.1-patched.2" +version = "0.5.3+5.3.0-patched" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1792ccb507d955b46af42c123ea8863668fae24d03721e40cad6a41773dbb49" +checksum = "a678df20055b43e57ef8cddde41cdfda9a3c1a060b67f4c5836dfb1d78543ba8" dependencies = [ "cc", - "fs_extra", "libc", ] @@ -10369,25 +8741,62 @@ dependencies = [ "winapi", ] +[[package]] +name = "time" +version = "0.3.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f3403384eaacbca9923fa06940178ac13e4edb725486d70e8e15881d0c836cc" +dependencies = [ + "itoa", + "serde", + "time-core", + "time-macros", +] + +[[package]] +name = "time-core" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" + +[[package]] +name = "time-macros" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "372950940a5f07bf38dbe211d7283c9e6d7327df53794992d293e534c733d09b" +dependencies = [ + "time-core", +] + [[package]] name = "tiny-bip39" -version = "0.8.2" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffc59cb9dfc85bb312c3a78fd6aa8a8582e310b0fa885d5bb877f6dcc601839d" +checksum = "62cc94d358b5a1e84a5cb9109f559aa3c4d634d2b1b4de3d0fa4adc7c78e2861" dependencies = [ "anyhow", - "hmac 0.8.1", + "hmac 0.12.1", "once_cell", - "pbkdf2 0.4.0", - "rand 0.7.3", + "pbkdf2 0.11.0", + "rand 0.8.5", "rustc-hash", - "sha2 0.9.9", + "sha2 0.10.6", "thiserror", "unicode-normalization", "wasm-bindgen", "zeroize", ] +[[package]] +name = "tinytemplate" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc" +dependencies = [ + "serde", + "serde_json", +] + [[package]] name = "tinyvec" version = "1.6.0" @@ -10399,20 +8808,19 @@ dependencies = [ [[package]] name = "tinyvec_macros" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.23.0" +version = "1.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eab6d665857cc6ca78d6e80303a02cea7a7851e85dfbd77cbdc09bd129f1ef46" +checksum = "0aa32867d44e6f2ce3385e89dceb990188b8bb0fb25b0cf576647a6f98ac5105" dependencies = [ "autocfg", "bytes", "libc", - "memchr", "mio", "num_cpus", "parking_lot 0.12.1", @@ -10420,18 +8828,18 @@ dependencies = [ "signal-hook-registry", "socket2", "tokio-macros", - "windows-sys 0.42.0", + "windows-sys 0.48.0", ] [[package]] name = "tokio-macros" -version = "1.8.2" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8" +checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.16", ] [[package]] @@ -10440,45 +8848,98 @@ version = "0.23.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" dependencies = [ - "rustls", + "rustls 0.20.8", "tokio", - "webpki", + "webpki 0.22.0", ] [[package]] name = "tokio-stream" -version = "0.1.11" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d660770404473ccd7bc9f8b28494a811bc18542b915c0855c51e8f419d5223ce" +checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" dependencies = [ "futures-core", "pin-project-lite 0.2.9", "tokio", + "tokio-util", ] [[package]] name = "tokio-util" -version = "0.7.4" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bb2e075f03b3d66d8d8785356224ba688d2906a371015e225beeb65ca92c740" +checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" dependencies = [ "bytes", "futures-core", "futures-io", "futures-sink", "pin-project-lite 0.2.9", - "tokio", - "tracing", + "tokio", + "tracing", +] + +[[package]] +name = "toml" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_datetime" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622" + +[[package]] +name = "toml_edit" +version = "0.19.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "239410c8609e8125456927e6707163a3b1fdb40561e4b803bc041f466ccfdc13" +dependencies = [ + "indexmap", + "toml_datetime", + "winnow", +] + +[[package]] +name = "tower" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" +dependencies = [ + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "tower-http" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f873044bf02dd1e8239e9c1293ea39dad76dc594ec16185d0a1bf31d8dc8d858" +dependencies = [ + "bitflags", + "bytes", + "futures-core", + "futures-util", + "http", + "http-body", + "http-range-header", + "pin-project-lite 0.2.9", + "tower-layer", + "tower-service", ] [[package]] -name = "toml" -version = "0.5.10" +name = "tower-layer" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1333c76748e868a4d9d1017b5ab53171dfd095f70c712fdb4653a406547f598f" -dependencies = [ - "serde", -] +checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" [[package]] name = "tower-service" @@ -10492,7 +8953,8 @@ version = "0.1.37" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", + "log", "pin-project-lite 0.2.9", "tracing-attributes", "tracing-core", @@ -10500,20 +8962,20 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a" +checksum = "0f57e3ca2a01450b1a921183a9c9cbfda207fd822cef4ccb00a65402cbba7a74" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.16", ] [[package]] name = "tracing-core" -version = "0.1.30" +version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a" +checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" dependencies = [ "once_cell", "valuable", @@ -10531,8 +8993,8 @@ dependencies = [ [[package]] name = "tracing-gum" -version = "0.9.29" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.29#94078b44fb6c9767bf60ffcaaa3be40681be5a76" +version = "0.9.38" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#097ffd245c42aeff28cf80f8a3568e1bee2e7da7" dependencies = [ "polkadot-node-jaeger", "polkadot-primitives", @@ -10542,14 +9004,14 @@ dependencies = [ [[package]] name = "tracing-gum-proc-macro" -version = "0.9.29" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.29#94078b44fb6c9767bf60ffcaaa3be40681be5a76" +version = "0.9.38" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#097ffd245c42aeff28cf80f8a3568e1bee2e7da7" dependencies = [ "expander 0.0.6", "proc-macro-crate", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -10620,12 +9082,12 @@ dependencies = [ [[package]] name = "trust-dns-proto" -version = "0.21.2" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c31f240f59877c3d4bb3b3ea0ec5a6a0cff07323580ff8c7a605cd7d08b255d" +checksum = "4f7f83d1e4a0e4358ac54c5c3681e5d7da5efc5a7a632c90bb6d6669ddd9bc26" dependencies = [ "async-trait", - "cfg-if 1.0.0", + "cfg-if", "data-encoding", "enum-as-inner", "futures-channel", @@ -10634,44 +9096,66 @@ dependencies = [ "idna 0.2.3", "ipnet", "lazy_static", - "log", "rand 0.8.5", "smallvec", + "socket2", "thiserror", "tinyvec", + "tokio", + "tracing", "url", ] [[package]] name = "trust-dns-resolver" -version = "0.21.2" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4ba72c2ea84515690c9fcef4c6c660bb9df3036ed1051686de84605b74fd558" +checksum = "aff21aa4dcefb0a1afbfac26deb0adc93888c7d295fb63ab273ef276ba2b7cfe" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "futures-util", "ipconfig", "lazy_static", - "log", "lru-cache", "parking_lot 0.12.1", "resolv-conf", "smallvec", "thiserror", + "tokio", + "tracing", "trust-dns-proto", ] [[package]] name = "try-lock" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" +checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" [[package]] name = "tt-call" -version = "1.0.8" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4f195fd851901624eee5a58c4bb2b4f06399148fcd0ed336e6f1cb60a9881df" + +[[package]] +name = "turn" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e66dcbec4290c69dd03c57e76c2469ea5c7ce109c6dd4351c13055cf71ea055" +checksum = "4712ee30d123ec7ae26d1e1b218395a16c87cdbaf4b3925d170d684af62ea5e8" +dependencies = [ + "async-trait", + "base64 0.13.1", + "futures", + "log", + "md-5", + "rand 0.8.5", + "ring", + "stun", + "thiserror", + "tokio", + "webrtc-util", +] [[package]] name = "twox-hash" @@ -10679,7 +9163,7 @@ version = "1.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "digest 0.10.6", "rand 0.8.5", "static_assertions", @@ -10691,12 +9175,6 @@ version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" -[[package]] -name = "ucd-trie" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e79c4d996edb816c91e4308506774452e55e95c3c9de07b6729e17e15a5ef81" - [[package]] name = "uint" version = "0.9.5" @@ -10710,25 +9188,22 @@ dependencies = [ ] [[package]] -name = "unicase" -version = "2.6.0" +name = "unarray" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" -dependencies = [ - "version_check", -] +checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94" [[package]] name = "unicode-bidi" -version = "0.3.8" +version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992" +checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-ident" -version = "1.0.5" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3" +checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" [[package]] name = "unicode-normalization" @@ -10757,7 +9232,17 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9f214e8f697e925001e66ec2c6e37a4ef93f0f78c2eed7814394e10c62025b05" dependencies = [ - "generic-array 0.14.6", + "generic-array 0.14.7", + "subtle", +] + +[[package]] +name = "universal-hash" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d3160b73c9a19f7e2939a2fdad446c57c1bbbbf4d919d3213ff1267a580d8b5" +dependencies = [ + "crypto-common", "subtle", ] @@ -10791,21 +9276,26 @@ dependencies = [ ] [[package]] -name = "valuable" -version = "0.1.0" +name = "utf8parse" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] -name = "value-bag" -version = "1.0.0-alpha.9" +name = "uuid" +version = "1.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2209b78d1249f7e6f3293657c9779fe31ced465df091bbd433a1cf88e916ec55" +checksum = "345444e32442451b267fc254ae85a209c64be56d2890e601a0c37ff0c3c5ecd2" dependencies = [ - "ctor", - "version_check", + "getrandom 0.2.9", ] +[[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + [[package]] name = "vcpkg" version = "0.2.15" @@ -10833,6 +9323,15 @@ dependencies = [ "libc", ] +[[package]] +name = "waitgroup" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1f50000a783467e6c0200f9d10642f4bc424e39efc1b770203e88b488f79292" +dependencies = [ + "atomic-waker", +] + [[package]] name = "waker-fn" version = "1.1.0" @@ -10841,12 +9340,11 @@ checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" [[package]] name = "walkdir" -version = "2.3.2" +version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" +checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" dependencies = [ "same-file", - "winapi", "winapi-util", ] @@ -10880,36 +9378,36 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.83" +version = "0.2.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268" +checksum = "5b6cb788c4e39112fbe1822277ef6fb3c55cd86b95cb3d3c4c1c9597e4ac74b4" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.83" +version = "0.2.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142" +checksum = "35e522ed4105a9d626d885b35d62501b30d9666283a5c8be12c14a8bdafe7822" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn", + "syn 2.0.16", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.33" +version = "0.4.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23639446165ca5a5de86ae1d8896b737ae80319560fbaa4c2887b7da6e7ebd7d" +checksum = "083abe15c5d88556b77bdf7aef403625be9e327ad37c62c4e4129af740168163" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "js-sys", "wasm-bindgen", "web-sys", @@ -10917,9 +9415,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.83" +version = "0.2.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810" +checksum = "358a79a0cb89d21db8120cbfb91392335913e4890665b1a7981d9e956903b434" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -10927,41 +9425,71 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.83" +version = "0.2.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c" +checksum = "4783ce29f09b9d93134d41297aded3a712b7b979e9c6f28c32cb88c973a94869" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.16", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.83" +version = "0.2.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f" +checksum = "a901d592cafaa4d711bc324edfaff879ac700b19c3dfd60058d2b445be2691eb" [[package]] -name = "wasm-gc-api" -version = "0.1.11" +name = "wasm-instrument" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0c32691b6c7e6c14e7f8fd55361a9088b507aa49620fcd06c09b3a1082186b9" +checksum = "aa1dafb3e60065305741e83db35c6c2584bb3725b692b5b66148a38d72ace6cd" dependencies = [ - "log", - "parity-wasm 0.32.0", - "rustc-demangle", + "parity-wasm", ] [[package]] -name = "wasm-instrument" -version = "0.1.1" +name = "wasm-opt" +version = "0.111.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84a303793cbc01fb96551badfc7367db6007396bba6bac97936b3c8b6f7fdb41" +dependencies = [ + "anyhow", + "libc", + "strum", + "strum_macros", + "tempfile", + "thiserror", + "wasm-opt-cxx-sys", + "wasm-opt-sys", +] + +[[package]] +name = "wasm-opt-cxx-sys" +version = "0.111.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9c9deb56f8a9f2ec177b3bd642a8205621835944ed5da55f2388ef216aca5a4" +dependencies = [ + "anyhow", + "cxx", + "cxx-build", + "wasm-opt-sys", +] + +[[package]] +name = "wasm-opt-sys" +version = "0.111.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "962e5b0401bbb6c887f54e69b8c496ea36f704df65db73e81fd5ff8dc3e63a9f" +checksum = "4432e28b542738a9776cedf92e8a99d8991c7b4667ee2c7ccddfb479dd2856a7" dependencies = [ - "parity-wasm 0.42.2", + "anyhow", + "cc", + "cxx", + "cxx-build", + "regex", ] [[package]] @@ -10981,58 +9509,63 @@ dependencies = [ [[package]] name = "wasmi" -version = "0.9.1" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca00c5147c319a8ec91ec1a0edbec31e566ce2c9cc93b3f9bb86a9efd0eb795d" +checksum = "06c326c93fbf86419608361a2c925a31754cf109da1b8b55737070b4d6669422" dependencies = [ - "downcast-rs", - "libc", - "libm 0.2.6", - "memory_units", - "num-rational 0.2.4", - "num-traits", - "parity-wasm 0.42.2", + "parity-wasm", "wasmi-validation", + "wasmi_core", ] [[package]] name = "wasmi-validation" -version = "0.4.1" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "165343ecd6c018fc09ebcae280752702c9a2ef3e6f8d02f1cfcbdb53ef6d7937" +checksum = "91ff416ad1ff0c42e5a926ed5d5fab74c0f098749aa0ad8b2a34b982ce0e867b" dependencies = [ - "parity-wasm 0.42.2", + "parity-wasm", +] + +[[package]] +name = "wasmi_core" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57d20cb3c59b788653d99541c646c561c9dd26506f25c0cebfe810659c54c6d7" +dependencies = [ + "downcast-rs", + "libm 0.2.6", + "memory_units", + "num-rational", + "num-traits", ] [[package]] name = "wasmparser" -version = "0.85.0" +version = "0.89.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "570460c58b21e9150d2df0eaaedbb7816c34bcec009ae0dcc976e40ba81463e7" +checksum = "ab5d3e08b13876f96dd55608d03cd4883a0545884932d5adf11925876c96daef" dependencies = [ "indexmap", ] [[package]] name = "wasmtime" -version = "0.38.3" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f50eadf868ab6a04b7b511460233377d0bfbb92e417b2f6a98b98fef2e098f5" +checksum = "4ad5af6ba38311282f2a21670d96e78266e8c8e2f38cbcd52c254df6ccbc7731" dependencies = [ "anyhow", - "backtrace", "bincode", - "cfg-if 1.0.0", + "cfg-if", "indexmap", - "lazy_static", "libc", "log", - "object 0.28.4", + "object 0.29.0", "once_cell", "paste", "psm", "rayon", - "region", "serde", "target-lexicon", "wasmparser", @@ -11041,34 +9574,43 @@ dependencies = [ "wasmtime-environ", "wasmtime-jit", "wasmtime-runtime", - "winapi", + "windows-sys 0.36.1", +] + +[[package]] +name = "wasmtime-asm-macros" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45de63ddfc8b9223d1adc8f7b2ee5f35d1f6d112833934ad7ea66e4f4339e597" +dependencies = [ + "cfg-if", ] [[package]] name = "wasmtime-cache" -version = "0.38.3" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1df23c642e1376892f3b72f311596976979cbf8b85469680cdd3a8a063d12a2" +checksum = "bcd849399d17d2270141cfe47fa0d91ee52d5f8ea9b98cf7ddde0d53e5f79882" dependencies = [ "anyhow", - "base64", + "base64 0.13.1", "bincode", "directories-next", "file-per-thread-logger", "log", - "rustix 0.33.7", + "rustix 0.35.13", "serde", "sha2 0.9.9", "toml", - "winapi", + "windows-sys 0.36.1", "zstd", ] [[package]] name = "wasmtime-cranelift" -version = "0.38.3" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f264ff6b4df247d15584f2f53d009fbc90032cfdc2605b52b961bffc71b6eccd" +checksum = "4bd91339b742ff20bfed4532a27b73c86b5bcbfedd6bea2dcdf2d64471e1b5c6" dependencies = [ "anyhow", "cranelift-codegen", @@ -11078,8 +9620,7 @@ dependencies = [ "cranelift-wasm", "gimli 0.26.2", "log", - "more-asserts", - "object 0.28.4", + "object 0.29.0", "target-lexicon", "thiserror", "wasmparser", @@ -11088,17 +9629,16 @@ dependencies = [ [[package]] name = "wasmtime-environ" -version = "0.38.3" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "839d2820e4b830f4b9e7aa08d4c0acabf4a5036105d639f6dfa1c6891c73bdc6" +checksum = "ebb881c61f4f627b5d45c54e629724974f8a8890d455bcbe634330cc27309644" dependencies = [ "anyhow", "cranelift-entity", "gimli 0.26.2", "indexmap", "log", - "more-asserts", - "object 0.28.4", + "object 0.29.0", "serde", "target-lexicon", "thiserror", @@ -11108,122 +9648,330 @@ dependencies = [ [[package]] name = "wasmtime-jit" -version = "0.38.3" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef0a0bcbfa18b946d890078ba0e1bc76bcc53eccfb40806c0020ec29dcd1bd49" +checksum = "1985c628011fe26adf5e23a5301bdc79b245e0e338f14bb58b39e4e25e4d8681" dependencies = [ "addr2line 0.17.0", "anyhow", "bincode", - "cfg-if 1.0.0", + "cfg-if", "cpp_demangle", "gimli 0.26.2", "log", - "object 0.28.4", - "region", + "object 0.29.0", "rustc-demangle", - "rustix 0.33.7", + "rustix 0.35.13", "serde", "target-lexicon", "thiserror", - "wasmtime-environ", - "wasmtime-jit-debug", - "wasmtime-runtime", - "winapi", + "wasmtime-environ", + "wasmtime-jit-debug", + "wasmtime-runtime", + "windows-sys 0.36.1", +] + +[[package]] +name = "wasmtime-jit-debug" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f671b588486f5ccec8c5a3dba6b4c07eac2e66ab8c60e6f4e53717c77f709731" +dependencies = [ + "object 0.29.0", + "once_cell", + "rustix 0.35.13", +] + +[[package]] +name = "wasmtime-runtime" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee8f92ad4b61736339c29361da85769ebc200f184361959d1792832e592a1afd" +dependencies = [ + "anyhow", + "cc", + "cfg-if", + "indexmap", + "libc", + "log", + "mach", + "memfd", + "memoffset 0.6.5", + "paste", + "rand 0.8.5", + "rustix 0.35.13", + "thiserror", + "wasmtime-asm-macros", + "wasmtime-environ", + "wasmtime-jit-debug", + "windows-sys 0.36.1", +] + +[[package]] +name = "wasmtime-types" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d23d61cb4c46e837b431196dd06abb11731541021916d03476a178b54dc07aeb" +dependencies = [ + "cranelift-entity", + "serde", + "thiserror", + "wasmparser", +] + +[[package]] +name = "web-sys" +version = "0.3.62" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16b5f940c7edfdc6d12126d98c9ef4d1b3d470011c47c76a6581df47ad9ba721" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "webpki" +version = "0.21.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "webpki" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "webpki-roots" +version = "0.22.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87" +dependencies = [ + "webpki 0.22.0", +] + +[[package]] +name = "webrtc" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d3bc9049bdb2cea52f5fd4f6f728184225bdb867ed0dc2410eab6df5bdd67bb" +dependencies = [ + "arc-swap", + "async-trait", + "bytes", + "hex", + "interceptor", + "lazy_static", + "log", + "rand 0.8.5", + "rcgen 0.9.3", + "regex", + "ring", + "rtcp", + "rtp", + "rustls 0.19.1", + "sdp", + "serde", + "serde_json", + "sha2 0.10.6", + "stun", + "thiserror", + "time 0.3.21", + "tokio", + "turn", + "url", + "waitgroup", + "webrtc-data", + "webrtc-dtls", + "webrtc-ice", + "webrtc-mdns", + "webrtc-media", + "webrtc-sctp", + "webrtc-srtp", + "webrtc-util", +] + +[[package]] +name = "webrtc-data" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ef36a4d12baa6e842582fe9ec16a57184ba35e1a09308307b67d43ec8883100" +dependencies = [ + "bytes", + "derive_builder", + "log", + "thiserror", + "tokio", + "webrtc-sctp", + "webrtc-util", ] [[package]] -name = "wasmtime-jit-debug" -version = "0.38.3" +name = "webrtc-dtls" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f4779d976206c458edd643d1ac622b6c37e4a0800a8b1d25dfbf245ac2f2cac" +checksum = "942be5bd85f072c3128396f6e5a9bfb93ca8c1939ded735d177b7bcba9a13d05" dependencies = [ - "lazy_static", - "object 0.28.4", - "rustix 0.33.7", + "aes 0.6.0", + "aes-gcm 0.10.1", + "async-trait", + "bincode", + "block-modes", + "byteorder", + "ccm", + "curve25519-dalek 3.2.0", + "der-parser 8.2.0", + "elliptic-curve", + "hkdf", + "hmac 0.12.1", + "log", + "oid-registry 0.6.1", + "p256", + "p384", + "rand 0.8.5", + "rand_core 0.6.4", + "rcgen 0.9.3", + "ring", + "rustls 0.19.1", + "sec1", + "serde", + "sha1", + "sha2 0.10.6", + "signature", + "subtle", + "thiserror", + "tokio", + "webpki 0.21.4", + "webrtc-util", + "x25519-dalek 2.0.0-pre.1", + "x509-parser 0.13.2", ] [[package]] -name = "wasmtime-runtime" -version = "0.38.3" +name = "webrtc-ice" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7eb6ffa169eb5dcd18ac9473c817358cd57bc62c244622210566d473397954a" +checksum = "465a03cc11e9a7d7b4f9f99870558fe37a102b65b93f8045392fef7c67b39e80" dependencies = [ - "anyhow", - "backtrace", - "cc", - "cfg-if 1.0.0", - "indexmap", - "libc", + "arc-swap", + "async-trait", + "crc", "log", - "mach", - "memfd", - "memoffset 0.6.5", - "more-asserts", "rand 0.8.5", - "region", - "rustix 0.33.7", + "serde", + "serde_json", + "stun", "thiserror", - "wasmtime-environ", - "wasmtime-jit-debug", - "winapi", + "tokio", + "turn", + "url", + "uuid", + "waitgroup", + "webrtc-mdns", + "webrtc-util", ] [[package]] -name = "wasmtime-types" -version = "0.38.3" +name = "webrtc-mdns" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d932b0ac5336f7308d869703dd225610a6a3aeaa8e968c52b43eed96cefb1c2" +checksum = "f08dfd7a6e3987e255c4dbe710dde5d94d0f0574f8a21afa95d171376c143106" dependencies = [ - "cranelift-entity", - "serde", + "log", + "socket2", "thiserror", - "wasmparser", + "tokio", + "webrtc-util", ] [[package]] -name = "web-sys" -version = "0.3.60" +name = "webrtc-media" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcda906d8be16e728fd5adc5b729afad4e444e106ab28cd1c7256e54fa61510f" +checksum = "f72e1650a8ae006017d1a5280efb49e2610c19ccc3c0905b03b648aee9554991" dependencies = [ - "js-sys", - "wasm-bindgen", + "byteorder", + "bytes", + "rand 0.8.5", + "rtp", + "thiserror", ] [[package]] -name = "webpki" -version = "0.22.0" +name = "webrtc-sctp" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" +checksum = "0d47adcd9427eb3ede33d5a7f3424038f63c965491beafcc20bc650a2f6679c0" dependencies = [ - "ring", - "untrusted", + "arc-swap", + "async-trait", + "bytes", + "crc", + "log", + "rand 0.8.5", + "thiserror", + "tokio", + "webrtc-util", ] [[package]] -name = "webpki-roots" -version = "0.22.6" +name = "webrtc-srtp" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87" +checksum = "6183edc4c1c6c0175f8812eefdce84dfa0aea9c3ece71c2bf6ddd3c964de3da5" dependencies = [ - "webpki", + "aead 0.4.3", + "aes 0.7.5", + "aes-gcm 0.9.4", + "async-trait", + "byteorder", + "bytes", + "ctr 0.8.0", + "hmac 0.11.0", + "log", + "rtcp", + "rtp", + "sha-1", + "subtle", + "thiserror", + "tokio", + "webrtc-util", ] [[package]] -name = "wepoll-ffi" -version = "0.1.2" +name = "webrtc-util" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d743fdedc5c64377b5fc2bc036b01c7fd642205a0d96356034ae3404d49eb7fb" +checksum = "93f1db1727772c05cf7a2cfece52c3aca8045ca1e176cd517d323489aa3c6d87" dependencies = [ + "async-trait", + "bitflags", + "bytes", "cc", + "ipnet", + "lazy_static", + "libc", + "log", + "nix 0.24.3", + "rand 0.8.5", + "thiserror", + "tokio", + "winapi", ] [[package]] name = "which" -version = "4.3.0" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c831fbbee9e129a8cf93e7747a82da9d95ba8e16621cae60ec2cdc849bacb7b" +checksum = "2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269" dependencies = [ "either", "libc", @@ -11280,6 +10028,15 @@ dependencies = [ "windows_x86_64_msvc 0.34.0", ] +[[package]] +name = "windows" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +dependencies = [ + "windows-targets 0.48.0", +] + [[package]] name = "windows-sys" version = "0.36.1" @@ -11299,20 +10056,74 @@ version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc 0.42.0", - "windows_i686_gnu 0.42.0", - "windows_i686_msvc 0.42.0", - "windows_x86_64_gnu 0.42.0", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc 0.42.0", + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", +] + +[[package]] +name = "windows-sys" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +dependencies = [ + "windows-targets 0.42.2", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.0", +] + +[[package]] +name = "windows-targets" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +dependencies = [ + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", +] + +[[package]] +name = "windows-targets" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" +dependencies = [ + "windows_aarch64_gnullvm 0.48.0", + "windows_aarch64_msvc 0.48.0", + "windows_i686_gnu 0.48.0", + "windows_i686_msvc 0.48.0", + "windows_x86_64_gnu 0.48.0", + "windows_x86_64_gnullvm 0.48.0", + "windows_x86_64_msvc 0.48.0", ] [[package]] name = "windows_aarch64_gnullvm" -version = "0.42.0" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e" +checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" [[package]] name = "windows_aarch64_msvc" @@ -11328,9 +10139,15 @@ checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" [[package]] name = "windows_aarch64_msvc" -version = "0.42.0" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" [[package]] name = "windows_i686_gnu" @@ -11346,9 +10163,15 @@ checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" [[package]] name = "windows_i686_gnu" -version = "0.42.0" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7" +checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" [[package]] name = "windows_i686_msvc" @@ -11364,9 +10187,15 @@ checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" [[package]] name = "windows_i686_msvc" -version = "0.42.0" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246" +checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" [[package]] name = "windows_x86_64_gnu" @@ -11382,15 +10211,27 @@ checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" [[package]] name = "windows_x86_64_gnu" -version = "0.42.0" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed" +checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" [[package]] name = "windows_x86_64_gnullvm" -version = "0.42.0" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" [[package]] name = "windows_x86_64_msvc" @@ -11406,9 +10247,24 @@ checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" [[package]] name = "windows_x86_64_msvc" -version = "0.42.0" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" + +[[package]] +name = "winnow" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5" +checksum = "61de7bac303dc551fe038e2b3cef0f571087a47571ea6e79a87692ac99b99699" +dependencies = [ + "memchr", +] [[package]] name = "winreg" @@ -11440,95 +10296,96 @@ dependencies = [ ] [[package]] -name = "xcm" -version = "0.9.29" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.29#94078b44fb6c9767bf60ffcaaa3be40681be5a76" +name = "x25519-dalek" +version = "2.0.0-pre.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5da623d8af10a62342bcbbb230e33e58a63255a58012f8653c578e54bab48df" dependencies = [ - "derivative", - "impl-trait-for-tuples", - "log", - "parity-scale-codec", - "scale-info", - "sp-runtime", - "xcm-procedural 0.9.29 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.29)", + "curve25519-dalek 3.2.0", + "rand_core 0.6.4", + "zeroize", ] [[package]] -name = "xcm" -version = "0.9.29" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.29-1#19d59ae2d7735a05c7e208ddd89e39e0a2ec4033" +name = "x509-parser" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fb9bace5b5589ffead1afb76e43e34cff39cd0f3ce7e170ae0c29e53b88eb1c" dependencies = [ - "derivative", - "impl-trait-for-tuples", - "log", - "parity-scale-codec", - "scale-info", - "sp-runtime", - "xcm-procedural 0.9.29 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.29-1)", + "asn1-rs 0.3.1", + "base64 0.13.1", + "data-encoding", + "der-parser 7.0.0", + "lazy_static", + "nom", + "oid-registry 0.4.0", + "ring", + "rusticata-macros", + "thiserror", + "time 0.3.21", ] [[package]] -name = "xcm-builder" -version = "0.9.29" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.29#94078b44fb6c9767bf60ffcaaa3be40681be5a76" +name = "x509-parser" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0ecbeb7b67ce215e40e3cc7f2ff902f94a223acf44995934763467e7b1febc8" dependencies = [ - "frame-support", - "frame-system", - "log", - "pallet-transaction-payment", - "parity-scale-codec", - "polkadot-parachain 0.9.29 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.29)", - "scale-info", - "sp-arithmetic", - "sp-io", - "sp-runtime", - "sp-std", - "xcm 0.9.29 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.29)", - "xcm-executor 0.9.29 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.29)", + "asn1-rs 0.5.2", + "base64 0.13.1", + "data-encoding", + "der-parser 8.2.0", + "lazy_static", + "nom", + "oid-registry 0.6.1", + "rusticata-macros", + "thiserror", + "time 0.3.21", ] [[package]] -name = "xcm-builder" -version = "0.9.29" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.29-1#19d59ae2d7735a05c7e208ddd89e39e0a2ec4033" +name = "xcm" +version = "0.9.38" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#097ffd245c42aeff28cf80f8a3568e1bee2e7da7" dependencies = [ - "frame-support", - "frame-system", + "derivative", + "impl-trait-for-tuples", "log", - "pallet-transaction-payment", "parity-scale-codec", - "polkadot-parachain 0.9.29 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.29-1)", "scale-info", - "sp-arithmetic", - "sp-io", - "sp-runtime", - "sp-std", - "xcm 0.9.29 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.29-1)", - "xcm-executor 0.9.29 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.29-1)", + "serde", + "sp-core", + "sp-weights", + "xcm-procedural", ] [[package]] -name = "xcm-executor" -version = "0.9.29" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.29#94078b44fb6c9767bf60ffcaaa3be40681be5a76" +name = "xcm-builder" +version = "0.9.38" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#097ffd245c42aeff28cf80f8a3568e1bee2e7da7" dependencies = [ "frame-support", + "frame-system", "impl-trait-for-tuples", "log", + "pallet-transaction-payment", "parity-scale-codec", + "polkadot-parachain", + "scale-info", "sp-arithmetic", - "sp-core", "sp-io", "sp-runtime", "sp-std", - "xcm 0.9.29 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.29)", + "xcm", + "xcm-executor", ] [[package]] name = "xcm-executor" -version = "0.9.29" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.29-1#19d59ae2d7735a05c7e208ddd89e39e0a2ec4033" +version = "0.9.38" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#097ffd245c42aeff28cf80f8a3568e1bee2e7da7" dependencies = [ + "environmental", "frame-benchmarking", "frame-support", "impl-trait-for-tuples", @@ -11539,29 +10396,19 @@ dependencies = [ "sp-io", "sp-runtime", "sp-std", - "xcm 0.9.29 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.29-1)", -] - -[[package]] -name = "xcm-procedural" -version = "0.9.29" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.29#94078b44fb6c9767bf60ffcaaa3be40681be5a76" -dependencies = [ - "Inflector", - "proc-macro2", - "quote", - "syn", + "sp-weights", + "xcm", ] [[package]] name = "xcm-procedural" -version = "0.9.29" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.29-1#19d59ae2d7735a05c7e208ddd89e39e0a2ec4033" +version = "0.9.38" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.38#097ffd245c42aeff28cf80f8a3568e1bee2e7da7" dependencies = [ "Inflector", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -11584,25 +10431,33 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" +[[package]] +name = "yasna" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e17bb3549cc1321ae1296b9cdc2698e2b6cb1992adfa19a8c72e5b7a738f44cd" +dependencies = [ + "time 0.3.21", +] + [[package]] name = "zeroize" -version = "1.5.7" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c394b5bd0c6f669e7275d9c20aa90ae064cb22e75a1cad54e1b34088034b149f" +checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9" dependencies = [ "zeroize_derive", ] [[package]] name = "zeroize_derive" -version = "1.3.3" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44bf07cb3e50ea2003396695d58bf46bc9887a1f362260446fad6bc4e79bd36c" +checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn", - "synstructure", + "syn 2.0.16", ] [[package]] @@ -11626,10 +10481,11 @@ dependencies = [ [[package]] name = "zstd-sys" -version = "2.0.4+zstd.1.5.2" +version = "2.0.8+zstd.1.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fa202f2ef00074143e219d15b62ffc317d17cc33909feac471c044087cad7b0" +checksum = "5556e6ee25d32df2586c098bbfa278803692a20d0ab9565e049480d52707ec8c" dependencies = [ "cc", "libc", + "pkg-config", ] diff --git a/Cargo.toml b/Cargo.toml index 49f22681..89acc2e3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -8,7 +8,6 @@ members = [ "price-oracle", "route-executor", "transaction-multi-payment", - "nft", "asset-registry", "adapters", "collator-rewards", @@ -19,6 +18,8 @@ members = [ "stableswap", "test-utils", "duster", + "nft", + "ema-oracle", "otc", ] diff --git a/adapters/Cargo.toml b/adapters/Cargo.toml index d7aeef9d..849e6311 100644 --- a/adapters/Cargo.toml +++ b/adapters/Cargo.toml @@ -8,7 +8,7 @@ license = "Apache 2.0" repository = "https://github.com/galacticcouncil/warehouse/tree/master/adapters" [dependencies] -codec = { default-features = false, features = ["derive"], package = "parity-scale-codec", version = "3.1.5" } +codec = { default-features = false, features = ["derive"], package = "parity-scale-codec", version = "3.4.0" } log = { version = "0.4.17", default-features = false } # HydraDX dependencies @@ -16,14 +16,14 @@ hydradx-traits = { path="../traits", default-features = false } pallet-transaction-multi-payment = { path = "../transaction-multi-payment", default-features = false } # Substrate dependencies -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false } # Polkadot dependencies -polkadot-xcm = { package = "xcm", git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.29-1", default-features = false } -xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.29-1", default-features = false } -xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.29-1", default-features = false } +polkadot-xcm = { package = "xcm", git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.38", default-features = false } +xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.38", default-features = false } +xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.38", default-features = false } [dev-dependencies] lazy_static = { features = ["spin_no_std"], version = "1.4.0" } diff --git a/adapters/src/inspect.rs b/adapters/src/inspect.rs index 1e4b19a1..8e0e42f2 100644 --- a/adapters/src/inspect.rs +++ b/adapters/src/inspect.rs @@ -78,4 +78,12 @@ where MultiCurrency::can_withdraw(asset, who, amount) } } + + fn asset_exists(asset: Self::AssetId) -> bool { + if GetNativeCurrencyId::get() == asset { + true + } else { + MultiCurrency::asset_exists(asset) + } + } } diff --git a/adapters/src/lib.rs b/adapters/src/lib.rs index d66daf9d..bd690bc9 100644 --- a/adapters/src/lib.rs +++ b/adapters/src/lib.rs @@ -17,11 +17,10 @@ #![cfg_attr(not(feature = "std"), no_std)] -use frame_support::weights::WeightToFee; +use frame_support::weights::{Weight, WeightToFee}; use hydradx_traits::NativePriceOracle; use pallet_transaction_multi_payment::DepositFee; use polkadot_xcm::latest::prelude::*; -use polkadot_xcm::latest::Weight; use sp_runtime::traits::Get; use sp_runtime::{ traits::{AtLeast32BitUnsigned, Convert, Saturating, Zero}, @@ -81,7 +80,7 @@ impl< if let Some(asset) = payment.fungible_assets_iter().next() { ConvertCurrency::convert(asset.clone()) .and_then(|currency| AcceptedCurrencyPrices::price(currency)) - .and_then(|price| match asset.id.clone() { + .and_then(|price| match asset.id { Concrete(location) => Some((location, price)), _ => None, }) @@ -130,10 +129,10 @@ impl< weight, payment ); let (asset_loc, price) = self.get_asset_and_price(&payment).ok_or(XcmError::AssetNotFound)?; - let fee = ConvertWeightToFee::weight_to_fee(&frame_support::weights::Weight::from_ref_time(weight)); + let fee = ConvertWeightToFee::weight_to_fee(&weight); let converted_fee = price.checked_mul_int(fee).ok_or(XcmError::Overflow)?; let amount: u128 = converted_fee.try_into().map_err(|_| XcmError::Overflow)?; - let required = (Concrete(asset_loc.clone()), amount).into(); + let required = (Concrete(asset_loc), amount).into(); let unused = payment.checked_sub(required).map_err(|_| XcmError::TooExpensive)?; self.weight = self.weight.saturating_add(weight); let key = (asset_loc, price); @@ -154,15 +153,15 @@ impl< ); let weight = weight.min(self.weight); self.weight -= weight; // Will not underflow because of `min()` above. - let fee = ConvertWeightToFee::weight_to_fee(&frame_support::weights::Weight::from_ref_time(weight)); + let fee = ConvertWeightToFee::weight_to_fee(&weight); if let Some(((asset_loc, price), amount)) = self.paid_assets.iter_mut().next() { let converted_fee: u128 = price.saturating_mul_int(fee).saturated_into(); let refund = converted_fee.min(*amount); *amount -= refund; // Will not underflow because of `min()` above. - let refund_asset = asset_loc.clone(); + let refund_asset = *asset_loc; if amount.is_zero() { - let key = (asset_loc.clone(), *price); + let key = (*asset_loc, *price); self.paid_assets.remove(&key); } Some((Concrete(refund_asset), refund).into()) @@ -195,7 +194,7 @@ impl< { fn drop(&mut self) { for ((asset_loc, _), amount) in self.paid_assets.iter() { - Revenue::take_revenue((asset_loc.clone(), *amount).into()); + Revenue::take_revenue((*asset_loc, *amount).into()); } } } diff --git a/adapters/src/tests.rs b/adapters/src/tests.rs index 1131b60f..4f832e5e 100644 --- a/adapters/src/tests.rs +++ b/adapters/src/tests.rs @@ -17,7 +17,7 @@ use super::*; use codec::{Decode, Encode}; -use frame_support::weights::IdentityFee; +use frame_support::{weights::IdentityFee, BoundedVec}; use sp_runtime::{traits::One, DispatchResult, FixedU128}; use sp_std::cell::RefCell; use sp_std::collections::btree_set::BTreeSet; @@ -51,7 +51,8 @@ impl Convert> for MockConvert { fn convert(id: AssetId) -> Option { match id { CORE_ASSET_ID | TEST_ASSET_ID | CHEAP_ASSET_ID | OVERFLOW_ASSET_ID => { - Some(MultiLocation::new(0, X1(GeneralKey(id.encode().try_into().unwrap())))) + let junction = Junction::from(BoundedVec::try_from(id.encode()).unwrap()); + Some(polkadot_xcm::v3::MultiLocation::new(0, X1(junction))) } _ => None, } @@ -63,9 +64,9 @@ impl Convert> for MockConvert { match location { MultiLocation { parents: 0, - interior: X1(GeneralKey(key)), + interior: X1(GeneralKey { data, .. }), } => { - if let Ok(currency_id) = AssetId::decode(&mut &key[..]) { + if let Ok(currency_id) = AssetId::decode(&mut &data[..]) { // we currently have only one native asset match currency_id { CORE_ASSET_ID | TEST_ASSET_ID | CHEAP_ASSET_ID | OVERFLOW_ASSET_ID => Some(currency_id), @@ -182,21 +183,21 @@ fn can_buy_weight() { let mut trader = Trader::new(); let core_payment: MultiAsset = (Concrete(core_id), 1_000_000).into(); - let res = dbg!(trader.buy_weight(1_000_000, core_payment.clone().into())); + let res = dbg!(trader.buy_weight(Weight::from_ref_time(1_000_000), core_payment.clone().into())); assert!(res .expect("buy_weight should succeed because payment == weight") .is_empty()); ExpectRevenue::register_expected_asset(core_payment); let test_payment: MultiAsset = (Concrete(test_id), 500_000).into(); - let res = dbg!(trader.buy_weight(1_000_000, test_payment.clone().into())); + let res = dbg!(trader.buy_weight(Weight::from_ref_time(1_000_000), test_payment.clone().into())); assert!(res .expect("buy_weight should succeed because payment == 0.5 * weight") .is_empty()); ExpectRevenue::register_expected_asset(test_payment); let cheap_payment: MultiAsset = (Concrete(cheap_id), 4_000_000).into(); - let res = dbg!(trader.buy_weight(1_000_000, cheap_payment.clone().into())); + let res = dbg!(trader.buy_weight(Weight::from_ref_time(1_000_000), cheap_payment.clone().into())); assert!(res .expect("buy_weight should succeed because payment == 4 * weight") .is_empty()); @@ -216,13 +217,13 @@ fn can_buy_twice() { { let mut trader = Trader::new(); - let payment1: MultiAsset = (Concrete(core_id.clone()), 1_000_000).into(); - let res = dbg!(trader.buy_weight(1_000_000, payment1.into())); + let payment1: MultiAsset = (Concrete(core_id), 1_000_000).into(); + let res = dbg!(trader.buy_weight(Weight::from_ref_time(1_000_000), payment1.into())); assert!(res .expect("buy_weight should succeed because payment == weight") .is_empty()); - let payment2: MultiAsset = (Concrete(core_id.clone()), 1_000_000).into(); - let res = dbg!(trader.buy_weight(1_000_000, payment2.into())); + let payment2: MultiAsset = (Concrete(core_id), 1_000_000).into(); + let res = dbg!(trader.buy_weight(Weight::from_ref_time(1_000_000), payment2.into())); assert!(res .expect("buy_weight should succeed because payment == weight") .is_empty()); @@ -241,7 +242,7 @@ fn cannot_buy_with_too_few_tokens() { let mut trader = Trader::new(); let payment: MultiAsset = (Concrete(core_id), 69).into(); - let res = dbg!(trader.buy_weight(1_000_000, payment.into())); + let res = dbg!(trader.buy_weight(Weight::from_ref_time(1_000_000), payment.into())); assert_eq!(res, Err(XcmError::TooExpensive)); } @@ -249,11 +250,11 @@ fn cannot_buy_with_too_few_tokens() { fn cannot_buy_with_unknown_token() { type Trader = MultiCurrencyTrader, MockOracle, MockConvert, ()>; - let unknown_token = GeneralKey(9876u32.encode().try_into().unwrap()); + let unknown_token = Junction::from(BoundedVec::try_from(9876u32.encode()).unwrap()); let mut trader = Trader::new(); let payment: MultiAsset = (Concrete(unknown_token.into()), 1_000_000).into(); - let res = dbg!(trader.buy_weight(1_000_000, payment.into())); + let res = dbg!(trader.buy_weight(Weight::from_ref_time(1_000_000), payment.into())); assert_eq!(res, Err(XcmError::AssetNotFound)); } @@ -261,11 +262,11 @@ fn cannot_buy_with_unknown_token() { fn cannot_buy_with_non_fungible() { type Trader = MultiCurrencyTrader, MockOracle, MockConvert, ()>; - let unknown_token = GeneralKey(9876u32.encode().try_into().unwrap()); + let unknown_token = Junction::from(BoundedVec::try_from(9876u32.encode()).unwrap()); let mut trader = Trader::new(); let payment: MultiAsset = (Concrete(unknown_token.into()), NonFungible(AssetInstance::Undefined)).into(); - let res = dbg!(trader.buy_weight(1_000_000, payment.into())); + let res = dbg!(trader.buy_weight(Weight::from_ref_time(1_000_000), payment.into())); assert_eq!(res, Err(XcmError::AssetNotFound)); } @@ -290,7 +291,7 @@ fn overflow_errors() { let amount = 1_000; let payment: MultiAsset = (Concrete(overflow_id), amount).into(); - let weight = 1_000; + let weight = Weight::from_ref_time(1_000); let res = dbg!(trader.buy_weight(weight, payment.into())); assert_eq!(res, Err(XcmError::Overflow)); } @@ -307,7 +308,7 @@ fn refunds_first_asset_completely() { { let mut trader = Trader::new(); - let weight = 1_000_000; + let weight = Weight::from_ref_time(1_000_000); let tokens = 1_000_000; let core_payment: MultiAsset = (Concrete(core_id), tokens).into(); let res = dbg!(trader.buy_weight(weight, core_payment.clone().into())); @@ -324,7 +325,7 @@ fn does_not_refund_if_empty() { type Trader = MultiCurrencyTrader, MockOracle, MockConvert, ()>; let mut trader = Trader::new(); - assert_eq!(trader.refund_weight(100), None); + assert_eq!(trader.refund_weight(Weight::from_ref_time(100)), None); } #[test] @@ -340,7 +341,7 @@ fn needs_multiple_refunds_for_multiple_currencies() { { let mut trader = Trader::new(); - let weight = 1_000_000; + let weight = Weight::from_ref_time(1_000_000); let core_payment: MultiAsset = (Concrete(core_id), 1_000_000).into(); let res = dbg!(trader.buy_weight(weight, core_payment.clone().into())); assert!(res diff --git a/asset-registry/Cargo.toml b/asset-registry/Cargo.toml index 622ead22..858f6410 100644 --- a/asset-registry/Cargo.toml +++ b/asset-registry/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "pallet-asset-registry" -version = "2.1.0" +version = "2.1.1" description = "Pallet for asset registry management" authors = ["GalacticCouncil"] edition = "2021" @@ -11,36 +11,36 @@ repository = "https://github.com/galacticcouncil/warehouse" targets = ["x86_64-unknown-linux-gnu"] [build-dependencies] -substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29" } +substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" } [dependencies] -codec = { default-features = false, features = ["derive", "max-encoded-len"], package = "parity-scale-codec", version = "3.1.5" } +codec = { default-features = false, features = ["derive", "max-encoded-len"], package = "parity-scale-codec", version = "3.4.0" } scale-info = { version = "2.1.2", default-features = false, features = ["derive"] } primitive-types = { default-features = false, version = "0.12.0" } serde = { features = ["derive"], optional = true, version = "1.0.137" } # ORML dependencies -orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.29", default-features = false } +orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.38", default-features = false } # Substrate dependencies -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29", default-features = false } -sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false } +sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false } # HydraDX dependencies hydradx-traits = { path = "../traits", default-features = false } # Optionals -frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29", default-features = false, optional = true } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29", default-features = false, optional = true } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29", default-features = false, optional = true } +frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false, optional = true } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false, optional = true } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false, optional = true } [dev-dependencies] -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29", default-features = false } -polkadot-xcm = { package = "xcm", git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.29-1", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false } +polkadot-xcm = { package = "xcm", git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.38", default-features = false } test-utils = { path = "../test-utils", default-features = false } [features] diff --git a/asset-registry/src/lib.rs b/asset-registry/src/lib.rs index 5d80662a..c4f3c572 100644 --- a/asset-registry/src/lib.rs +++ b/asset-registry/src/lib.rs @@ -58,10 +58,10 @@ pub mod pallet { #[pallet::config] pub trait Config: frame_system::Config { - type Event: From> + IsType<::Event>; + type RuntimeEvent: From> + IsType<::RuntimeEvent>; /// The origin which can work with asset-registry. - type RegistryOrigin: EnsureOrigin; + type RegistryOrigin: EnsureOrigin; /// Asset type type AssetId: Parameter @@ -248,6 +248,7 @@ pub mod pallet { /// Adds mapping between `name` and assigned `asset_id` so asset id can be retrieved by name too (Note: this approach is used in AMM implementation (xyk)) /// /// Emits 'Registered` event when successful. + #[pallet::call_index(0)] #[pallet::weight(::WeightInfo::register())] pub fn register( origin: OriginFor, @@ -301,6 +302,7 @@ pub mod pallet { /// Emits `Updated` event when successful. // TODO: No tests + #[pallet::call_index(1)] #[pallet::weight(::WeightInfo::update())] pub fn update( origin: OriginFor, @@ -349,6 +351,7 @@ pub mod pallet { /// - `decimals`: The number of decimals this asset uses to represent one unit. /// /// Emits `MetadataSet` event when successful. + #[pallet::call_index(2)] #[pallet::weight(::WeightInfo::set_metadata())] pub fn set_metadata( origin: OriginFor, @@ -385,6 +388,7 @@ pub mod pallet { /// Mainly used in XCM. /// /// Emits `LocationSet` event when successful. + #[pallet::call_index(3)] #[pallet::weight(::WeightInfo::set_location())] pub fn set_location( origin: OriginFor, diff --git a/asset-registry/src/mock.rs b/asset-registry/src/mock.rs index 52b0257d..5dee8911 100644 --- a/asset-registry/src/mock.rs +++ b/asset-registry/src/mock.rs @@ -27,7 +27,7 @@ use sp_runtime::{ use frame_support::traits::{Everything, GenesisBuild}; -use polkadot_xcm::v0::MultiLocation; +use polkadot_xcm::v3::MultiLocation; use crate::{self as asset_registry, Config}; @@ -61,8 +61,8 @@ impl system::Config for Test { type BaseCallFilter = Everything; type BlockWeights = (); type BlockLength = (); - type Origin = Origin; - type Call = Call; + type RuntimeOrigin = RuntimeOrigin; + type RuntimeCall = RuntimeCall; type Index = u64; type BlockNumber = u64; type Hash = H256; @@ -70,7 +70,7 @@ impl system::Config for Test { type AccountId = u64; type Lookup = IdentityLookup; type Header = Header; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type DbWeight = (); type Version = (); @@ -87,17 +87,11 @@ impl system::Config for Test { use codec::{Decode, Encode}; use scale_info::TypeInfo; -#[derive(Debug, Encode, Decode, Clone, PartialEq, Eq, TypeInfo)] +#[derive(Debug, Default, Encode, Decode, Clone, PartialEq, Eq, TypeInfo)] pub struct AssetLocation(pub MultiLocation); -impl Default for AssetLocation { - fn default() -> Self { - AssetLocation(MultiLocation::Null) - } -} - impl Config for Test { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type RegistryOrigin = frame_system::EnsureRoot; type AssetId = u32; type Balance = Balance; @@ -153,6 +147,6 @@ pub fn new_test_ext() -> sp_io::TestExternalities { ext } -pub fn expect_events(e: Vec) { - test_utils::expect_events::(e); +pub fn expect_events(e: Vec) { + test_utils::expect_events::(e); } diff --git a/asset-registry/src/tests.rs b/asset-registry/src/tests.rs index 7add3868..0098ac51 100644 --- a/asset-registry/src/tests.rs +++ b/asset-registry/src/tests.rs @@ -16,13 +16,14 @@ // limitations under the License. use super::Error; +use crate::mock::AssetId as RegistryAssetId; use crate::mock::*; use crate::types::{AssetDetails, AssetMetadata, AssetType, Metadata}; use crate::Event; use codec::Encode; use frame_support::{assert_noop, assert_ok, BoundedVec}; use orml_traits::GetByKey; -use polkadot_xcm::v0::{Junction::*, MultiLocation::*}; +use polkadot_xcm::v3::prelude::*; use sp_std::convert::TryInto; #[test] @@ -34,7 +35,7 @@ fn register_asset_works() { assert_noop!( AssetRegistryPallet::register( - Origin::root(), + RuntimeOrigin::root(), too_long.to_vec(), AssetType::Token, ed, @@ -48,7 +49,7 @@ fn register_asset_works() { let name: Vec = b"HDX".to_vec(); assert_ok!(AssetRegistryPallet::register( - Origin::root(), + RuntimeOrigin::root(), name.clone(), AssetType::Token, ed, @@ -81,7 +82,7 @@ fn register_asset_works() { ); assert_noop!( - AssetRegistryPallet::register(Origin::root(), name, AssetType::Token, ed, None, None, None), + AssetRegistryPallet::register(RuntimeOrigin::root(), name, AssetType::Token, ed, None, None, None), Error::::AssetAlreadyRegistered ); }); @@ -145,12 +146,12 @@ fn location_mapping_works() { ed, None, )); - let asset_id: AssetId = + let asset_id: RegistryAssetId = AssetRegistryPallet::get_or_create_asset(b"HDX".to_vec(), AssetType::Token, ed, None).unwrap(); crate::Assets::::insert( asset_id, - AssetDetails::> { + AssetDetails::> { name: bn, asset_type: AssetType::Token, existential_deposit: ed, @@ -158,14 +159,11 @@ fn location_mapping_works() { }, ); - let asset_location = AssetLocation(X3( - Parent, - Parachain(200), - GeneralKey(asset_id.encode().try_into().unwrap()), - )); + let key = Junction::from(BoundedVec::try_from(asset_id.encode()).unwrap()); + let asset_location = AssetLocation(MultiLocation::new(0, X2(Parachain(200), key))); assert_ok!(AssetRegistryPallet::set_location( - Origin::root(), + RuntimeOrigin::root(), asset_id, asset_location.clone() )); @@ -188,7 +186,7 @@ fn location_mapping_works() { // asset location for the native asset cannot be changed assert_noop!( AssetRegistryPallet::set_location( - Origin::root(), + RuntimeOrigin::root(), ::NativeAssetId::get(), asset_location ), @@ -265,7 +263,7 @@ fn set_metadata_works() { let b_symbol: BoundedVec::StringLimit> = b"xDOT".to_vec().try_into().unwrap(); assert_ok!(AssetRegistryPallet::set_metadata( - Origin::root(), + RuntimeOrigin::root(), dot_id, b"xDOT".to_vec(), 12u8 @@ -287,7 +285,7 @@ fn set_metadata_works() { ); assert_ok!(AssetRegistryPallet::set_metadata( - Origin::root(), + RuntimeOrigin::root(), dot_id, b"xDOT".to_vec(), 30u8 @@ -302,12 +300,12 @@ fn set_metadata_works() { ); assert_noop!( - AssetRegistryPallet::set_metadata(Origin::root(), dot_id, b"JUST_TOO_LONG".to_vec(), 30u8), + AssetRegistryPallet::set_metadata(RuntimeOrigin::root(), dot_id, b"JUST_TOO_LONG".to_vec(), 30u8), Error::::TooLong ); assert_noop!( - AssetRegistryPallet::set_metadata(Origin::root(), 100, b"NONE".to_vec(), 30u8), + AssetRegistryPallet::set_metadata(RuntimeOrigin::root(), 100, b"NONE".to_vec(), 30u8), Error::::AssetNotFound ); }); @@ -318,16 +316,16 @@ fn update_asset() { new_test_ext().execute_with(|| { let ed = 1_000_000u128; - let btc_asset_id: AssetId = + let btc_asset_id: RegistryAssetId = AssetRegistryPallet::get_or_create_asset(b"BTC".to_vec(), AssetType::Token, ed, None).unwrap(); - let usd_asset_id: AssetId = + let usd_asset_id: RegistryAssetId = AssetRegistryPallet::get_or_create_asset(b"USD".to_vec(), AssetType::Token, ed, None).unwrap(); let next_asset_id = AssetRegistryPallet::next_asset_id().unwrap(); // set a new name and type for an existing asset assert_ok!(AssetRegistryPallet::update( - Origin::root(), + RuntimeOrigin::root(), btc_asset_id, b"superBTC".to_vec(), AssetType::Token, @@ -362,7 +360,7 @@ fn update_asset() { // cannot set existing name for an existing asset assert_noop!( (AssetRegistryPallet::update( - Origin::root(), + RuntimeOrigin::root(), usd_asset_id, b"superBTC".to_vec(), AssetType::Token, @@ -373,13 +371,19 @@ fn update_asset() { // cannot set a new name for a non-existent asset assert_noop!( - (AssetRegistryPallet::update(Origin::root(), next_asset_id, b"VOID".to_vec(), AssetType::Token, None)), + (AssetRegistryPallet::update( + RuntimeOrigin::root(), + next_asset_id, + b"VOID".to_vec(), + AssetType::Token, + None + )), Error::::AssetNotFound ); // corner case: change the name and also the type for an existing asset (token -> pool share) assert_ok!(AssetRegistryPallet::update( - Origin::root(), + RuntimeOrigin::root(), btc_asset_id, b"BTCUSD".to_vec(), AssetType::PoolShare(btc_asset_id, usd_asset_id), @@ -388,7 +392,7 @@ fn update_asset() { // Update ED assert_ok!(AssetRegistryPallet::update( - Origin::root(), + RuntimeOrigin::root(), btc_asset_id, b"BTCUSD".to_vec(), AssetType::PoolShare(btc_asset_id, usd_asset_id), @@ -409,7 +413,7 @@ fn update_asset() { // corner case: change the name and also the type for an existing asset (pool share -> token) assert_ok!(AssetRegistryPallet::update( - Origin::root(), + RuntimeOrigin::root(), btc_asset_id, b"superBTC".to_vec(), AssetType::Token, @@ -465,7 +469,7 @@ fn register_asset_should_work_when_asset_is_provided() { .build() .execute_with(|| { assert_ok!(AssetRegistryPallet::register( - Origin::root(), + RuntimeOrigin::root(), b"asset_id".to_vec(), AssetType::Token, 1_000_000, @@ -492,7 +496,7 @@ fn register_asset_should_fail_when_provided_asset_is_native_asset() { ExtBuilder::default().build().execute_with(|| { assert_noop!( AssetRegistryPallet::register( - Origin::root(), + RuntimeOrigin::root(), b"asset_id".to_vec(), AssetType::Token, 1_000_000, @@ -509,7 +513,7 @@ fn register_asset_should_fail_when_provided_asset_is_native_asset() { fn register_asset_should_fail_when_provided_asset_is_already_registered() { ExtBuilder::default().build().execute_with(|| { assert_ok!(AssetRegistryPallet::register( - Origin::root(), + RuntimeOrigin::root(), b"asset_id".to_vec(), AssetType::Token, 1_000_000, @@ -519,7 +523,7 @@ fn register_asset_should_fail_when_provided_asset_is_already_registered() { )); assert_noop!( AssetRegistryPallet::register( - Origin::root(), + RuntimeOrigin::root(), b"asset_id_2".to_vec(), AssetType::Token, 1_000_000, @@ -540,7 +544,7 @@ fn register_asset_should_fail_when_provided_asset_is_outside_reserved_range() { .execute_with(|| { assert_noop!( AssetRegistryPallet::register( - Origin::root(), + RuntimeOrigin::root(), b"asset_id".to_vec(), AssetType::Token, 1_000_000, @@ -553,7 +557,7 @@ fn register_asset_should_fail_when_provided_asset_is_outside_reserved_range() { assert_noop!( AssetRegistryPallet::register( - Origin::root(), + RuntimeOrigin::root(), b"asset_id".to_vec(), AssetType::Token, 1_000_000, @@ -569,9 +573,9 @@ fn register_asset_should_fail_when_provided_asset_is_outside_reserved_range() { #[test] fn register_asset_should_work_when_metadata_is_provided() { ExtBuilder::default().build().execute_with(|| { - let asset_id: AssetId = 10; + let asset_id: RegistryAssetId = 10; assert_ok!(AssetRegistryPallet::register( - Origin::root(), + RuntimeOrigin::root(), b"asset_id".to_vec(), AssetType::Token, 1_000_000, @@ -608,16 +612,13 @@ fn register_asset_should_work_when_metadata_is_provided() { #[test] fn register_asset_should_work_when_location_is_provided() { ExtBuilder::default().build().execute_with(|| { - let asset_id: AssetId = 10; + let asset_id: RegistryAssetId = 10; - let asset_location = AssetLocation(X3( - Parent, - Parachain(200), - GeneralKey(asset_id.encode().try_into().unwrap()), - )); + let key = Junction::from(BoundedVec::try_from(asset_id.encode()).unwrap()); + let asset_location = AssetLocation(MultiLocation::new(0, X2(Parachain(200), key))); assert_ok!(AssetRegistryPallet::register( - Origin::root(), + RuntimeOrigin::root(), b"asset_id".to_vec(), AssetType::Token, 1_000_000, @@ -649,16 +650,13 @@ fn register_asset_should_work_when_location_is_provided() { #[test] fn register_asset_should_work_when_all_optional_are_provided() { ExtBuilder::default().build().execute_with(|| { - let asset_id: AssetId = 10; + let asset_id: RegistryAssetId = 10; - let asset_location = AssetLocation(X3( - Parent, - Parachain(200), - GeneralKey(asset_id.encode().try_into().unwrap()), - )); + let key = Junction::from(BoundedVec::try_from(asset_id.encode()).unwrap()); + let asset_location = AssetLocation(MultiLocation::new(0, X2(Parachain(200), key))); assert_ok!(AssetRegistryPallet::register( - Origin::root(), + RuntimeOrigin::root(), b"asset_id".to_vec(), AssetType::Token, 1_000_000, diff --git a/collator-rewards/Cargo.toml b/collator-rewards/Cargo.toml index 25413afd..6e43740e 100644 --- a/collator-rewards/Cargo.toml +++ b/collator-rewards/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "pallet-collator-rewards" -version = "1.0.3" +version = "1.0.4" description = "Pallet for collator rewards" authors = ["GalacticCouncil"] edition = "2021" @@ -11,37 +11,37 @@ repository = "https://github.com/galacticcouncil/warehouse" targets = ["x86_64-unknown-linux-gnu"] [build-dependencies] -substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29" } +substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" } [dependencies] log = { default-features = false, version = "0.4.17" } -codec = { default-features = false, features = ["derive"], package = "parity-scale-codec", version = "3.1.5" } +codec = { default-features = false, features = ["derive"], package = "parity-scale-codec", version = "3.4.0" } scale-info = { version = "2.1.2", default-features = false, features = ["derive"] } serde = { features = ["derive"], optional = true, version = "1.0.137" } # Substrate dependencies -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29", default-features = false } -sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29", default-features = false } -sp-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29", default-features = false } -pallet-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false } +sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false } +sp-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false } +pallet-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false } # ORML dependencies -orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.29", default-features = false } +orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.38", default-features = false } # Optionals -frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29", default-features = false, optional = true } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29", default-features = false, optional = true } +frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false, optional = true } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false, optional = true } [dev-dependencies] -orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.29", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29", default-features = false } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29", default-features = false } -sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29", default-features = false } -pallet-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29", default-features = false } +orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.38", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false } +sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false } +pallet-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false } [features] default = ["std"] diff --git a/collator-rewards/src/lib.rs b/collator-rewards/src/lib.rs index 9093979d..325b66f5 100644 --- a/collator-rewards/src/lib.rs +++ b/collator-rewards/src/lib.rs @@ -50,7 +50,7 @@ pub mod pallet { #[pallet::config] pub trait Config: frame_system::Config { - type Event: From> + IsType<::Event>; + type RuntimeEvent: From> + IsType<::RuntimeEvent>; /// Balance type type Balance: Parameter diff --git a/collator-rewards/src/mock.rs b/collator-rewards/src/mock.rs index ce36bf02..b7fcdaad 100644 --- a/collator-rewards/src/mock.rs +++ b/collator-rewards/src/mock.rs @@ -60,8 +60,8 @@ impl system::Config for Test { type BaseCallFilter = Everything; type BlockWeights = (); type BlockLength = (); - type Origin = Origin; - type Call = Call; + type RuntimeOrigin = RuntimeOrigin; + type RuntimeCall = RuntimeCall; type Index = u64; type BlockNumber = u64; type Hash = H256; @@ -69,7 +69,7 @@ impl system::Config for Test { type AccountId = AccountId; type Lookup = IdentityLookup; type Header = Header; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type DbWeight = (); type Version = (); @@ -90,19 +90,17 @@ parameter_type_with_key! { } impl orml_tokens::Config for Test { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Balance = Balance; type Amount = Amount; type CurrencyId = AssetId; type WeightInfo = (); type ExistentialDeposits = ExistentialDeposits; - type OnDust = (); type MaxLocks = (); type DustRemovalWhitelist = Nothing; - type OnNewTokenAccount = (); - type OnKilledTokenAccount = (); type ReserveIdentifier = (); type MaxReserves = MaxReserves; + type CurrencyHooks = (); } parameter_types! { @@ -113,7 +111,7 @@ parameter_types! { impl pallet_balances::Config for Test { type MaxLocks = (); type Balance = Balance; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type DustRemoval = (); type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; @@ -149,7 +147,7 @@ impl SessionManager for MockSessionManager { } impl Config for Test { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Balance = Balance; type CurrencyId = AssetId; type Currency = Tokens; diff --git a/collator-rewards/src/tests.rs b/collator-rewards/src/tests.rs index 73695808..6c355b21 100644 --- a/collator-rewards/src/tests.rs +++ b/collator-rewards/src/tests.rs @@ -59,22 +59,22 @@ fn reward_collator_on_end_session_should_work() { assert_eq!(Tokens::free_balance(NATIVE_TOKEN, &BOB), COLLATOR_REWARD); assert_eq!(Tokens::free_balance(NATIVE_TOKEN, &DAVE), COLLATOR_REWARD); - frame_system::Pallet::::assert_has_event(mock::Event::CollatorRewards(Event::CollatorRewarded { + frame_system::Pallet::::assert_has_event(mock::RuntimeEvent::CollatorRewards(Event::CollatorRewarded { who: ALICE, amount: COLLATOR_REWARD, currency: NATIVE_TOKEN, })); - frame_system::Pallet::::assert_has_event(mock::Event::CollatorRewards(Event::CollatorRewarded { + frame_system::Pallet::::assert_has_event(mock::RuntimeEvent::CollatorRewards(Event::CollatorRewarded { who: BOB, amount: COLLATOR_REWARD, currency: NATIVE_TOKEN, })); - frame_system::Pallet::::assert_has_event(mock::Event::CollatorRewards(Event::CollatorRewarded { + frame_system::Pallet::::assert_has_event(mock::RuntimeEvent::CollatorRewards(Event::CollatorRewarded { who: CHARLIE, amount: COLLATOR_REWARD, currency: NATIVE_TOKEN, })); - frame_system::Pallet::::assert_has_event(mock::Event::CollatorRewards(Event::CollatorRewarded { + frame_system::Pallet::::assert_has_event(mock::RuntimeEvent::CollatorRewards(Event::CollatorRewarded { who: DAVE, amount: COLLATOR_REWARD, currency: NATIVE_TOKEN, diff --git a/currencies/Cargo.toml b/currencies/Cargo.toml index ba951655..c1b2147f 100644 --- a/currencies/Cargo.toml +++ b/currencies/Cargo.toml @@ -3,28 +3,28 @@ name = "pallet-currencies" description = "Provide `MultiCurrency` implementation using `pallet-balances` and `orml-tokens` module." repository = "https://github.com/open-web3-stack/open-runtime-module-library/tree/master/currencies" license = "Apache-2.0" -version = "1.2.0" +version = "1.2.1" authors = ["Laminar Developers "] edition = "2021" [dependencies] scale-info = { version = "2.1.2", default-features = false, features = ["derive"] } serde = { version = "1.0.137", optional = true } -codec = { package = "parity-scale-codec", version = "3.1.5", default-features = false } +codec = { package = "parity-scale-codec", version = "3.4.0", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false } -orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.29", default-features = false } -orml-utilities = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.29", default-features = false } +orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.38", default-features = false } +orml-utilities = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.38", default-features = false } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29" } -orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.29" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" } +orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.38" } [features] default = ["std"] diff --git a/currencies/src/fungibles.rs b/currencies/src/fungibles.rs index 8a46055e..cf8e9eef 100644 --- a/currencies/src/fungibles.rs +++ b/currencies/src/fungibles.rs @@ -69,6 +69,14 @@ where .into() } } + + fn asset_exists(asset: Self::AssetId) -> bool { + if asset == T::GetNativeCurrencyId::get() { + true + } else { + >::asset_exists(asset.into()) + } + } } impl fungibles::Mutate for FungibleCurrencies diff --git a/currencies/src/lib.rs b/currencies/src/lib.rs index 4f486828..6d4267d8 100644 --- a/currencies/src/lib.rs +++ b/currencies/src/lib.rs @@ -88,7 +88,7 @@ pub mod module { #[pallet::config] pub trait Config: frame_system::Config { - type Event: From> + IsType<::Event>; + type RuntimeEvent: From> + IsType<::RuntimeEvent>; type MultiCurrency: TransferAll + MultiCurrencyExtended @@ -160,6 +160,7 @@ pub mod module { /// /// The dispatch origin for this call must be `Signed` by the /// transactor. + #[pallet::call_index(0)] #[pallet::weight(T::WeightInfo::transfer_non_native_currency())] pub fn transfer( origin: OriginFor, @@ -177,6 +178,7 @@ pub mod module { /// /// The dispatch origin for this call must be `Signed` by the /// transactor. + #[pallet::call_index(1)] #[pallet::weight(T::WeightInfo::transfer_native_currency())] pub fn transfer_native_currency( origin: OriginFor, @@ -199,6 +201,7 @@ pub mod module { /// update amount of account `who` under `currency_id`. /// /// The dispatch origin of this call must be _Root_. + #[pallet::call_index(2)] #[pallet::weight(T::WeightInfo::update_balance_non_native_currency())] pub fn update_balance( origin: OriginFor, diff --git a/currencies/src/mock.rs b/currencies/src/mock.rs index a8bb578d..5bee1bda 100644 --- a/currencies/src/mock.rs +++ b/currencies/src/mock.rs @@ -20,8 +20,8 @@ use crate as currencies; pub type AccountId = AccountId32; impl frame_system::Config for Runtime { - type Origin = Origin; - type Call = Call; + type RuntimeOrigin = RuntimeOrigin; + type RuntimeCall = RuntimeCall; type Index = u64; type BlockNumber = u64; type Hash = H256; @@ -29,7 +29,7 @@ impl frame_system::Config for Runtime { type AccountId = AccountId; type Lookup = IdentityLookup; type Header = Header; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type BlockHashCount = ConstU64<250>; type BlockWeights = (); type BlockLength = (); @@ -52,7 +52,7 @@ type Balance = u64; impl pallet_balances::Config for Runtime { type Balance = Balance; type DustRemoval = (); - type Event = Event; + type RuntimeEvent = RuntimeEvent; type ExistentialDeposit = ConstU64<2>; type AccountStore = frame_system::Pallet; type MaxLocks = (); @@ -74,19 +74,18 @@ parameter_types! { pub type ReserveIdentifier = [u8; 8]; impl orml_tokens::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Balance = Balance; type Amount = i64; type CurrencyId = CurrencyId; type WeightInfo = (); type ExistentialDeposits = ExistentialDeposits; - type OnDust = orml_tokens::TransferDust; + type CurrencyHooks = (); + //type OnDust = orml_tokens::TransferDust; // TODO: implement the hook type MaxLocks = ConstU32<100_000>; type MaxReserves = ConstU32<100_000>; type ReserveIdentifier = ReserveIdentifier; type DustRemovalWhitelist = Nothing; - type OnNewTokenAccount = (); - type OnKilledTokenAccount = (); } pub const NATIVE_CURRENCY_ID: CurrencyId = 1; @@ -97,7 +96,7 @@ parameter_types! { } impl Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type MultiCurrency = Tokens; type NativeCurrency = AdaptedBasicCurrency; type GetNativeCurrencyId = GetNativeCurrencyId; diff --git a/currencies/src/tests.rs b/currencies/src/tests.rs index 6f444040..82881f8e 100644 --- a/currencies/src/tests.rs +++ b/currencies/src/tests.rs @@ -4,7 +4,7 @@ use super::*; use frame_support::{assert_noop, assert_ok}; -use mock::{Event, *}; +use mock::{RuntimeEvent, *}; use sp_runtime::traits::BadOrigin; #[test] @@ -321,14 +321,14 @@ fn update_balance_call_should_work() { .build() .execute_with(|| { assert_ok!(Currencies::update_balance( - Origin::root(), + RuntimeOrigin::root(), ALICE, NATIVE_CURRENCY_ID, -10 )); assert_eq!(NativeCurrency::free_balance(&ALICE), 90); assert_eq!(Currencies::free_balance(X_TOKEN_ID, &ALICE), 100); - assert_ok!(Currencies::update_balance(Origin::root(), ALICE, X_TOKEN_ID, 10)); + assert_ok!(Currencies::update_balance(RuntimeOrigin::root(), ALICE, X_TOKEN_ID, 10)); assert_eq!(Currencies::free_balance(X_TOKEN_ID, &ALICE), 110); }); } @@ -354,7 +354,7 @@ fn call_event_should_work() { assert_ok!(Currencies::transfer(Some(ALICE).into(), BOB, X_TOKEN_ID, 50)); assert_eq!(Currencies::free_balance(X_TOKEN_ID, &ALICE), 50); assert_eq!(Currencies::free_balance(X_TOKEN_ID, &BOB), 150); - System::assert_last_event(Event::Currencies(crate::Event::Transferred { + System::assert_last_event(RuntimeEvent::Currencies(crate::Event::Transferred { currency_id: X_TOKEN_ID, from: ALICE, to: BOB, @@ -366,7 +366,7 @@ fn call_event_should_work() { )); assert_eq!(Currencies::free_balance(X_TOKEN_ID, &ALICE), 40); assert_eq!(Currencies::free_balance(X_TOKEN_ID, &BOB), 160); - System::assert_last_event(Event::Currencies(crate::Event::Transferred { + System::assert_last_event(RuntimeEvent::Currencies(crate::Event::Transferred { currency_id: X_TOKEN_ID, from: ALICE, to: BOB, @@ -377,7 +377,7 @@ fn call_event_should_work() { X_TOKEN_ID, &ALICE, 100 )); assert_eq!(Currencies::free_balance(X_TOKEN_ID, &ALICE), 140); - System::assert_last_event(Event::Currencies(crate::Event::Deposited { + System::assert_last_event(RuntimeEvent::Currencies(crate::Event::Deposited { currency_id: X_TOKEN_ID, who: ALICE, amount: 100, @@ -387,7 +387,7 @@ fn call_event_should_work() { X_TOKEN_ID, &ALICE, 20 )); assert_eq!(Currencies::free_balance(X_TOKEN_ID, &ALICE), 120); - System::assert_last_event(Event::Currencies(crate::Event::Withdrawn { + System::assert_last_event(RuntimeEvent::Currencies(crate::Event::Withdrawn { currency_id: X_TOKEN_ID, who: ALICE, amount: 20, diff --git a/currencies/src/tests_fungibles.rs b/currencies/src/tests_fungibles.rs index 460fd6a0..bbbf61a8 100644 --- a/currencies/src/tests_fungibles.rs +++ b/currencies/src/tests_fungibles.rs @@ -42,6 +42,10 @@ fn fungibles_inspect_trait_should_work() { assert_ok!(FungibleCurrencies::::can_withdraw(NATIVE_CURRENCY_ID, &ALICE, 1).into_result()); assert_ok!(FungibleCurrencies::::can_withdraw(X_TOKEN_ID, &BOB, 1).into_result()); + + assert!(FungibleCurrencies::::asset_exists(NATIVE_CURRENCY_ID)); + assert!(FungibleCurrencies::::asset_exists(X_TOKEN_ID)); + assert!(!FungibleCurrencies::::asset_exists(100)); }); } diff --git a/duster/Cargo.toml b/duster/Cargo.toml index 85e1d465..2c1d64f9 100644 --- a/duster/Cargo.toml +++ b/duster/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "pallet-duster" -version = "3.2.1" +version = "3.2.2" description = "Account duster" authors = ["GalacticCouncil"] edition = "2021" @@ -12,35 +12,35 @@ repository = "https://github.com/galacticcouncil/warehouse" targets = ["x86_64-unknown-linux-gnu"] [build-dependencies] -substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29" } +substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" } [dependencies] -codec = { default-features = false, features = ["derive"], package = "parity-scale-codec", version = "3.1.5" } +codec = { default-features = false, features = ["derive"], package = "parity-scale-codec", version = "3.4.0" } scale-info = { version = "2.1.1", default-features = false, features = ["derive"] } serde = { features = ["derive"], optional = true, version = "1.0.136" } hydradx-traits = { path="../traits", default-features = false } # ORML dependencies -orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.29", default-features = false } +orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.38", default-features = false } # Substrate dependencies -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false } # Optionals -frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29", default-features = false, optional = true } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29", default-features = false, optional = true } +frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false, optional = true } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false, optional = true } [dev-dependencies] lazy_static = { features = ["spin_no_std"], version = "1.4.0" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29", default-features = false } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false } pallet-currencies = { path="../currencies", default-features = false } -orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.29", default-features = false } +orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.38", default-features = false } [features] default = ["std"] diff --git a/duster/src/lib.rs b/duster/src/lib.rs index 812217cf..5a12150d 100644 --- a/duster/src/lib.rs +++ b/duster/src/lib.rs @@ -49,7 +49,12 @@ pub mod pallet { use frame_support::sp_runtime::traits::AtLeast32BitUnsigned; use frame_system::pallet_prelude::{BlockNumberFor, OriginFor}; + /// The current storage version. + const STORAGE_VERSION: StorageVersion = StorageVersion::new(1); + #[pallet::pallet] + #[pallet::generate_store(pub(super) trait Store)] + #[pallet::storage_version(STORAGE_VERSION)] #[pallet::without_storage_info] pub struct Pallet(_); @@ -73,7 +78,7 @@ pub mod pallet { #[pallet::config] pub trait Config: frame_system::Config { - type Event: From> + IsType<::Event>; + type RuntimeEvent: From> + IsType<::RuntimeEvent>; /// Balance type type Balance: Parameter @@ -118,7 +123,7 @@ pub mod pallet { type NativeCurrencyId: Get; /// The origin which can manage whiltelist. - type BlacklistUpdateOrigin: EnsureOrigin; + type BlacklistUpdateOrigin: EnsureOrigin; /// Weight information for extrinsics in this module. type WeightInfo: WeightInfo; @@ -213,6 +218,7 @@ pub mod pallet { /// be dusted, the remaining balance is transferred to selected account (usually treasury). /// /// Caller is rewarded with chosen reward in native currency. + #[pallet::call_index(0)] #[pallet::weight(::WeightInfo::dust_account())] pub fn dust_account(origin: OriginFor, account: T::AccountId, currency_id: T::CurrencyId) -> DispatchResult { let who = ensure_signed(origin)?; @@ -244,6 +250,7 @@ pub mod pallet { /// Add account to list of non-dustable account. Account whihc are excluded from udsting. /// If such account should be dusted - `AccountBlacklisted` error is returned. /// Only root can perform this action. + #[pallet::call_index(1)] #[pallet::weight(::WeightInfo::add_nondustable_account())] pub fn add_nondustable_account(origin: OriginFor, account: T::AccountId) -> DispatchResult { T::BlacklistUpdateOrigin::ensure_origin(origin)?; @@ -256,6 +263,7 @@ pub mod pallet { } /// Remove account from list of non-dustable accounts. That means account can be dusted again. + #[pallet::call_index(2)] #[pallet::weight(::WeightInfo::remove_nondustable_account())] pub fn remove_nondustable_account(origin: OriginFor, account: T::AccountId) -> DispatchResult { T::BlacklistUpdateOrigin::ensure_origin(origin)?; @@ -306,7 +314,7 @@ impl Pallet { } } -use orml_traits::OnDust; +use orml_traits::currency::OnDust; use sp_std::marker::PhantomData; pub struct DusterWhitelist(PhantomData); diff --git a/duster/src/migration.rs b/duster/src/migration.rs index 64adb792..1c1c4b3c 100644 --- a/duster/src/migration.rs +++ b/duster/src/migration.rs @@ -19,7 +19,6 @@ use crate::Config; use frame_support::weights::Weight; use sp_std::vec::Vec; -/// Storage names are changed from Classes to Collections and from Instances to Items. pub mod v1 { use super::*; use frame_support::log; diff --git a/duster/src/mock.rs b/duster/src/mock.rs index 88921cab..e9aede88 100644 --- a/duster/src/mock.rs +++ b/duster/src/mock.rs @@ -83,8 +83,8 @@ impl system::Config for Test { type BaseCallFilter = Everything; type BlockWeights = (); type BlockLength = (); - type Origin = Origin; - type Call = Call; + type RuntimeOrigin = RuntimeOrigin; + type RuntimeCall = RuntimeCall; type Index = u64; type BlockNumber = u64; type Hash = H256; @@ -92,7 +92,7 @@ impl system::Config for Test { type AccountId = u64; type Lookup = IdentityLookup; type Header = Header; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type DbWeight = (); type Version = (); @@ -123,7 +123,7 @@ parameter_type_with_key! { } impl Config for Test { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Balance = Balance; type Amount = Amount; type CurrencyId = AssetId; @@ -136,23 +136,21 @@ impl Config for Test { } impl orml_tokens::Config for Test { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Balance = Balance; type Amount = Amount; type CurrencyId = AssetId; type WeightInfo = (); type ExistentialDeposits = ExistentialDeposits; - type OnDust = (); type MaxLocks = (); type DustRemovalWhitelist = Nothing; - type OnNewTokenAccount = (); - type OnKilledTokenAccount = (); type ReserveIdentifier = (); type MaxReserves = (); + type CurrencyHooks = (); } impl pallet_currencies::Config for Test { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type MultiCurrency = Tokens; type NativeCurrency = BasicCurrencyAdapter; type GetNativeCurrencyId = NativeCurrencyId; @@ -162,7 +160,7 @@ impl pallet_currencies::Config for Test { impl pallet_balances::Config for Test { type MaxLocks = MaxLocks; type Balance = Balance; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type DustRemoval = (); type ExistentialDeposit = NativeExistentialDeposit; type AccountStore = System; diff --git a/duster/src/tests.rs b/duster/src/tests.rs index d07d9454..e05497df 100644 --- a/duster/src/tests.rs +++ b/duster/src/tests.rs @@ -1,7 +1,7 @@ use super::*; use crate::mock::{ - AssetId, Currencies, Duster, Event as TestEvent, ExtBuilder, Origin, System, Test, Tokens, ALICE, BOB, DUSTER, - KILLED, TREASURY, + AssetId, Currencies, Duster, ExtBuilder, RuntimeEvent as TestEvent, RuntimeOrigin, System, Test, Tokens, ALICE, + BOB, DUSTER, KILLED, TREASURY, }; use frame_support::{assert_noop, assert_ok}; @@ -14,7 +14,7 @@ fn dust_account_works() { .with_balance(*ALICE, 1, 100) .build() .execute_with(|| { - assert_ok!(Duster::dust_account(Origin::signed(*DUSTER), *ALICE, 1)); + assert_ok!(Duster::dust_account(RuntimeOrigin::signed(*DUSTER), *ALICE, 1)); assert_eq!(Tokens::free_balance(1, &*TREASURY), 100); for (who, _, _) in orml_tokens::Accounts::::iter() { @@ -31,9 +31,14 @@ fn reward_duster_can_fail() { .with_balance(*ALICE, 1, 100) .build() .execute_with(|| { - assert_ok!(Currencies::transfer(Origin::signed(*TREASURY), *BOB, 0, 1_000_000)); - - assert_ok!(Duster::dust_account(Origin::signed(*DUSTER), *ALICE, 1)); + assert_ok!(Currencies::transfer( + RuntimeOrigin::signed(*TREASURY), + *BOB, + 0, + 1_000_000 + )); + + assert_ok!(Duster::dust_account(RuntimeOrigin::signed(*DUSTER), *ALICE, 1)); assert_eq!(Tokens::free_balance(1, &*TREASURY), 100); for (who, _, _) in orml_tokens::Accounts::::iter() { @@ -51,7 +56,7 @@ fn dust_account_with_sufficient_balance_fails() { .build() .execute_with(|| { assert_noop!( - Duster::dust_account(Origin::signed(*DUSTER), *ALICE, 1), + Duster::dust_account(RuntimeOrigin::signed(*DUSTER), *ALICE, 1), Error::::BalanceSufficient ); assert_eq!(Tokens::free_balance(1, &*TREASURY), 0); @@ -65,7 +70,7 @@ fn dust_account_with_exact_dust_fails() { .build() .execute_with(|| { assert_noop!( - Duster::dust_account(Origin::signed(*DUSTER), *ALICE, 1), + Duster::dust_account(RuntimeOrigin::signed(*DUSTER), *ALICE, 1), Error::::BalanceSufficient ); assert_eq!(Tokens::free_balance(1, &*TREASURY), 0); @@ -76,7 +81,7 @@ fn dust_account_with_exact_dust_fails() { fn dust_nonexisting_account_fails() { ExtBuilder::default().build().execute_with(|| { assert_noop!( - Duster::dust_account(Origin::signed(*DUSTER), 123456, 1), + Duster::dust_account(RuntimeOrigin::signed(*DUSTER), 123456, 1), Error::::ZeroBalance ); // Fails with zero balance because total_balance for non-existing account returns default value = Zero. assert_eq!(Tokens::free_balance(1, &*TREASURY), 0); @@ -87,7 +92,7 @@ fn dust_nonexisting_account_fails() { fn dust_treasury_account_fails() { ExtBuilder::default().build().execute_with(|| { assert_noop!( - Duster::dust_account(Origin::signed(*DUSTER), *TREASURY, 1), + Duster::dust_account(RuntimeOrigin::signed(*DUSTER), *TREASURY, 1), Error::::AccountBlacklisted ); }); @@ -111,7 +116,11 @@ fn dust_account_native_works() { assert!(KILLED.with(|r| r.borrow().is_empty())); - assert_ok!(Duster::dust_account(Origin::signed(*DUSTER), *ALICE, currency_id)); + assert_ok!(Duster::dust_account( + RuntimeOrigin::signed(*DUSTER), + *ALICE, + currency_id + )); assert_eq!(Currencies::free_balance(currency_id, &*TREASURY), 990_500); assert_eq!(Currencies::free_balance(0, &*DUSTER), 110_000); @@ -161,13 +170,13 @@ fn native_existential_deposit() { ext.execute_with(|| { let currency_id: AssetId = 2; - assert_ok!(Currencies::transfer(Origin::signed(*DUSTER), *ALICE, 2, 20_000)); - assert_ok!(Currencies::transfer(Origin::signed(*DUSTER), *ALICE, 0, 600)); - assert_ok!(Currencies::transfer(Origin::signed(*ALICE), *DUSTER, 0, 300)); + assert_ok!(Currencies::transfer(RuntimeOrigin::signed(*DUSTER), *ALICE, 2, 20_000)); + assert_ok!(Currencies::transfer(RuntimeOrigin::signed(*DUSTER), *ALICE, 0, 600)); + assert_ok!(Currencies::transfer(RuntimeOrigin::signed(*ALICE), *DUSTER, 0, 300)); assert_eq!(Currencies::free_balance(0, &*ALICE), 300); - assert_ok!(Duster::dust_account(Origin::signed(*DUSTER), *ALICE, 0)); + assert_ok!(Duster::dust_account(RuntimeOrigin::signed(*DUSTER), *ALICE, 0)); assert_eq!(Currencies::free_balance(0, &*ALICE), 0); @@ -235,7 +244,7 @@ fn native_existential_deposit() { // Transfer all remaining tokens from Alice accounts - should kill the account - assert_ok!(Currencies::transfer(Origin::signed(*ALICE), *DUSTER, 2, 20_000)); + assert_ok!(Currencies::transfer(RuntimeOrigin::signed(*ALICE), *DUSTER, 2, 20_000)); assert_eq!(KILLED.with(|r| r.borrow().clone()), vec![*ALICE]); @@ -257,17 +266,17 @@ fn native_existential_deposit() { fn add_nondustable_account_works() { ExtBuilder::default().build().execute_with(|| { assert_noop!( - Duster::add_nondustable_account(Origin::signed(*DUSTER), *ALICE), + Duster::add_nondustable_account(RuntimeOrigin::signed(*DUSTER), *ALICE), BadOrigin ); assert!(Duster::blacklisted(*ALICE).is_none()); - assert_ok!(Duster::add_nondustable_account(Origin::root(), *ALICE)); + assert_ok!(Duster::add_nondustable_account(RuntimeOrigin::root(), *ALICE)); assert!(Duster::blacklisted(*ALICE).is_some()); - assert_ok!(Duster::add_nondustable_account(Origin::root(), *ALICE)); + assert_ok!(Duster::add_nondustable_account(RuntimeOrigin::root(), *ALICE)); assert!(Duster::blacklisted(*ALICE).is_some()); }); @@ -279,32 +288,32 @@ fn remove_nondustable_account_works() { .with_native_balance(*ALICE, 500) .build() .execute_with(|| { - assert_ok!(Duster::add_nondustable_account(Origin::root(), *ALICE)); + assert_ok!(Duster::add_nondustable_account(RuntimeOrigin::root(), *ALICE)); assert!(Duster::blacklisted(*ALICE).is_some()); - assert_ok!(Duster::add_nondustable_account(Origin::root(), *ALICE)); + assert_ok!(Duster::add_nondustable_account(RuntimeOrigin::root(), *ALICE)); // Dust dont work now assert_noop!( - Duster::dust_account(Origin::signed(*DUSTER), *ALICE, 1), + Duster::dust_account(RuntimeOrigin::signed(*DUSTER), *ALICE, 1), Error::::AccountBlacklisted ); assert_noop!( - Duster::remove_nondustable_account(Origin::signed(*DUSTER), *ALICE), + Duster::remove_nondustable_account(RuntimeOrigin::signed(*DUSTER), *ALICE), BadOrigin ); //remove non-existing account assert_noop!( - Duster::remove_nondustable_account(Origin::root(), 1234556), + Duster::remove_nondustable_account(RuntimeOrigin::root(), 1234556), Error::::AccountNotBlacklisted ); - assert_ok!(Duster::remove_nondustable_account(Origin::root(), *ALICE)); + assert_ok!(Duster::remove_nondustable_account(RuntimeOrigin::root(), *ALICE)); assert!(Duster::blacklisted(*ALICE).is_none()); // We can dust again - assert_ok!(Duster::dust_account(Origin::signed(*DUSTER), *ALICE, 0),); + assert_ok!(Duster::dust_account(RuntimeOrigin::signed(*DUSTER), *ALICE, 0),); }); } diff --git a/ema-oracle/Cargo.toml b/ema-oracle/Cargo.toml index 2857a854..16f8e55e 100644 --- a/ema-oracle/Cargo.toml +++ b/ema-oracle/Cargo.toml @@ -13,20 +13,20 @@ targets = ['x86_64-unknown-linux-gnu'] [dependencies] serde = {features = ['derive'], optional = true, version = '1.0.136'} scale-info = { version = "2.1.2", default-features = false, features = ["derive"] } -codec = { package = 'parity-scale-codec', version = '3.2.1', default-features = false, features = ['derive', "max-encoded-len"] } +codec = { package = 'parity-scale-codec', version = '3.4.0', default-features = false, features = ['derive', "max-encoded-len"] } # HydraDX dependencies hydradx-traits = { path = "../traits", default-features = false } -hydra-dx-math = { git = "https://github.com/galacticcouncil/HydraDX-math", rev = "84632c3c7b71e16d53240e4bdc2adc693c941916", default-features = false } +hydra-dx-math = { git = "https://github.com/galacticcouncil/HydraDX-math", rev = "35e5c0775a07e057ed5247ba96dfa254d691f034", default-features = false } # Substrate dependencies -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29", default-features = false, optional = true } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29", default-features = false } -frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29", default-features = false, optional = true } -sp-arithmetic = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.29", default-features = false } -sp-core = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.29", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29", default-features = false } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false, optional = true } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false } +frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false, optional = true } +sp-arithmetic = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.38", default-features = false } +sp-core = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.38", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false } log = { version = "0.4.14", default-features = false } @@ -34,7 +34,7 @@ log = { version = "0.4.14", default-features = false } pretty_assertions = "1.3.0" proptest = "1.0.0" rug = { version = "1.17.0", features = ["num-traits"] } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" } [features] default = ['std'] diff --git a/ema-oracle/src/lib.rs b/ema-oracle/src/lib.rs index 7fa1bbc8..77a6e85f 100644 --- a/ema-oracle/src/lib.rs +++ b/ema-oracle/src/lib.rs @@ -114,7 +114,7 @@ pub mod pallet { #[pallet::config] pub trait Config: frame_system::Config { - type Event: From> + IsType<::Event>; + type RuntimeEvent: From> + IsType<::RuntimeEvent>; /// Weight information for the extrinsics. type WeightInfo: WeightInfo; diff --git a/ema-oracle/src/tests/mock.rs b/ema-oracle/src/tests/mock.rs index 42fccdcc..9df7ff28 100644 --- a/ema-oracle/src/tests/mock.rs +++ b/ema-oracle/src/tests/mock.rs @@ -88,8 +88,8 @@ impl frame_system::Config for Test { type BaseCallFilter = Everything; type BlockWeights = (); type BlockLength = (); - type Origin = Origin; - type Call = Call; + type RuntimeOrigin = RuntimeOrigin; + type RuntimeCall = RuntimeCall; type Index = u64; type BlockNumber = BlockNumber; type Hash = H256; @@ -97,7 +97,7 @@ impl frame_system::Config for Test { type AccountId = u64; type Lookup = IdentityLookup; type Header = Header; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type DbWeight = (); type Version = (); @@ -129,7 +129,7 @@ parameter_types! { } impl Config for Test { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type WeightInfo = (); type BlockNumberProvider = System; type SupportedPeriods = SupportedPeriods; diff --git a/ema-oracle/src/tests/mod.rs b/ema-oracle/src/tests/mod.rs index bf3130d4..269f2ba7 100644 --- a/ema-oracle/src/tests/mod.rs +++ b/ema-oracle/src/tests/mod.rs @@ -20,8 +20,8 @@ mod mock; use super::*; pub use mock::{ - BlockNumber, EmaOracle, Event as TestEvent, ExtBuilder, Origin, System, Test, ACA, DOT, HDX, ORACLE_ENTRY_1, - ORACLE_ENTRY_2, + BlockNumber, EmaOracle, ExtBuilder, RuntimeEvent as TestEvent, RuntimeOrigin, System, Test, ACA, DOT, HDX, + ORACLE_ENTRY_1, ORACLE_ENTRY_2, }; use frame_support::{assert_noop, assert_ok}; diff --git a/faucet/Cargo.toml b/faucet/Cargo.toml index 17ee7db9..815d0cd5 100644 --- a/faucet/Cargo.toml +++ b/faucet/Cargo.toml @@ -1,6 +1,6 @@ [package] name = 'pallet-faucet' -version = '0.2.2' +version = '0.2.3' description = 'Simple token faucet to dispence resource on dev chain' authors = ['GalacticCouncil'] edition = '2021' @@ -8,23 +8,23 @@ license = 'Apache 2.0' repository = "https://github.com/galacticcouncil/warehouse/tree/master/faucet" [dependencies] -codec = { default-features = false, features = ["derive"], package = "parity-scale-codec", version = "3.1.5" } +codec = { default-features = false, features = ["derive"], package = "parity-scale-codec", version = "3.4.0" } scale-info = { version = "2.1.2", default-features = false, features = ["derive"] } serde = { features = ["derive"], optional = true, version = "1.0.137" } # ORML dependencies -orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.29", default-features = false } -orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.29", default-features = false } +orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.38", default-features = false } +orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.38", default-features = false } # Substrate dependencies -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29", default-features = false } -frame-system= { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false } +frame-system= { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false } [dev-dependencies] -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false } test-utils = { path = "../test-utils", default-features = false } [features] diff --git a/faucet/src/lib.rs b/faucet/src/lib.rs index 0edb8407..b7abc09e 100644 --- a/faucet/src/lib.rs +++ b/faucet/src/lib.rs @@ -18,10 +18,7 @@ #![cfg_attr(not(feature = "std"), no_std)] #![allow(clippy::unused_unit)] -use frame_support::{ - ensure, - weights::{DispatchClass, Pays}, -}; +use frame_support::ensure; use frame_system::ensure_signed; use orml_traits::{MultiCurrency, MultiCurrencyExtended}; use sp_std::vec::Vec; @@ -57,7 +54,7 @@ pub mod pallet { #[pallet::config] pub trait Config: frame_system::Config { - type Event: From> + IsType<::Event>; + type RuntimeEvent: From> + IsType<::RuntimeEvent>; type Currency: MultiCurrencyExtended; } @@ -128,6 +125,7 @@ pub mod pallet { #[pallet::call] impl Pallet { + #[pallet::call_index(0)] #[pallet::weight((0, DispatchClass::Normal, Pays::No))] pub fn rampage_mint(origin: OriginFor, asset: AssetId, amount: Balance) -> DispatchResultWithPostInfo { let who = ensure_signed(origin)?; @@ -143,6 +141,7 @@ pub mod pallet { Ok(().into()) } + #[pallet::call_index(1)] #[pallet::weight((0, DispatchClass::Normal, Pays::No))] pub fn mint(origin: OriginFor) -> DispatchResultWithPostInfo { let who = ensure_signed(origin)?; diff --git a/faucet/src/mock.rs b/faucet/src/mock.rs index 25df2d93..f785b9ee 100644 --- a/faucet/src/mock.rs +++ b/faucet/src/mock.rs @@ -54,8 +54,8 @@ impl system::Config for Test { type BaseCallFilter = Everything; type BlockWeights = (); type BlockLength = (); - type Origin = Origin; - type Call = Call; + type RuntimeOrigin = RuntimeOrigin; + type RuntimeCall = RuntimeCall; type Index = u64; type BlockNumber = u64; type Hash = H256; @@ -63,7 +63,7 @@ impl system::Config for Test { type AccountId = u64; type Lookup = IdentityLookup; type Header = Header; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type DbWeight = (); type Version = (); @@ -90,23 +90,21 @@ parameter_types! { } impl orml_tokens::Config for Test { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Balance = Balance; type Amount = Amount; type CurrencyId = AssetId; type WeightInfo = (); type ExistentialDeposits = ExistentialDeposits; - type OnDust = (); type MaxLocks = (); type DustRemovalWhitelist = Nothing; - type OnNewTokenAccount = (); - type OnKilledTokenAccount = (); type ReserveIdentifier = (); type MaxReserves = MaxReserves; + type CurrencyHooks = (); } impl Config for Test { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Currency = Currency; } @@ -171,6 +169,6 @@ impl ExtBuilder { } } -pub fn expect_events(e: Vec) { - test_utils::expect_events::(e) +pub fn expect_events(e: Vec) { + test_utils::expect_events::(e) } diff --git a/faucet/src/tests.rs b/faucet/src/tests.rs index bccca1b5..2404bd54 100644 --- a/faucet/src/tests.rs +++ b/faucet/src/tests.rs @@ -16,7 +16,7 @@ // limitations under the License. use super::*; -use crate::mock::{expect_events, Currency, ExtBuilder, Faucet, Origin, System, Test, ALICE, HDX}; +use crate::mock::{expect_events, Currency, ExtBuilder, Faucet, RuntimeOrigin, System, Test, ALICE, HDX}; use frame_support::traits::OnFinalize; use frame_support::{assert_noop, assert_ok}; @@ -27,7 +27,7 @@ fn rampage_mints() { System::set_block_number(1); //For event emitting //Act - assert_ok!(Faucet::rampage_mint(Origin::signed(ALICE), HDX, 1000)); + assert_ok!(Faucet::rampage_mint(RuntimeOrigin::signed(ALICE), HDX, 1000)); //Assert assert_eq!(Currency::free_balance(HDX, &ALICE), 2000); @@ -49,7 +49,7 @@ fn mints() { assert_eq!(Currency::free_balance(2000, &ALICE), 0); //Act - assert_ok!(Faucet::mint(Origin::signed(ALICE))); + assert_ok!(Faucet::mint(RuntimeOrigin::signed(ALICE))); //Assert assert_eq!(Currency::free_balance(2000, &ALICE), 1_000_000_000_000_000); @@ -64,7 +64,7 @@ fn mints() { fn rampage_disabled() { ExtBuilder::default().build_live().execute_with(|| { assert_noop!( - Faucet::rampage_mint(Origin::signed(ALICE), HDX, 1000), + Faucet::rampage_mint(RuntimeOrigin::signed(ALICE), HDX, 1000), Error::::RampageMintNotAllowed ); }); @@ -73,20 +73,20 @@ fn rampage_disabled() { #[test] fn mint_limit() { ExtBuilder::default().build_live().execute_with(|| { - assert_ok!(Faucet::mint(Origin::signed(ALICE))); - assert_ok!(Faucet::mint(Origin::signed(ALICE))); - assert_ok!(Faucet::mint(Origin::signed(ALICE))); - assert_ok!(Faucet::mint(Origin::signed(ALICE))); - assert_ok!(Faucet::mint(Origin::signed(ALICE))); + assert_ok!(Faucet::mint(RuntimeOrigin::signed(ALICE))); + assert_ok!(Faucet::mint(RuntimeOrigin::signed(ALICE))); + assert_ok!(Faucet::mint(RuntimeOrigin::signed(ALICE))); + assert_ok!(Faucet::mint(RuntimeOrigin::signed(ALICE))); + assert_ok!(Faucet::mint(RuntimeOrigin::signed(ALICE))); assert_noop!( - Faucet::mint(Origin::signed(ALICE)), + Faucet::mint(RuntimeOrigin::signed(ALICE)), Error::::MaximumMintLimitReached ); >::on_finalize(1); - assert_ok!(Faucet::mint(Origin::signed(ALICE))); + assert_ok!(Faucet::mint(RuntimeOrigin::signed(ALICE))); assert_eq!(Currency::free_balance(2000, &ALICE), 6_000_000_000_000_000); }); diff --git a/liquidity-mining/Cargo.toml b/liquidity-mining/Cargo.toml index 95162da0..29015262 100644 --- a/liquidity-mining/Cargo.toml +++ b/liquidity-mining/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "pallet-liquidity-mining" -version = "4.2.0" +version = "4.2.2" description = "Liquidity mining" authors = ["GalacticCouncil"] edition = "2021" @@ -12,30 +12,30 @@ repository = "https://github.com/galacticcouncil/warehouse" targets = ["x86_64-unknown-linux-gnu"] [dependencies] -codec = { package = "parity-scale-codec", version = "3.1.5", features = ["derive", "max-encoded-len"], default-features = false } +codec = { package = "parity-scale-codec", version = "3.4.0", features = ["derive", "max-encoded-len"], default-features = false } scale-info = { version = "2.1.2", default-features = false, features = ["derive"] } -sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29", default-features = false } +sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false } # ORML dependencies -orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.29", default-features = false } +orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.38", default-features = false } # HydraDX dependencies hydradx-traits = { path = "../traits", default-features = false } -hydra-dx-math = { git = "https://github.com/galacticcouncil/HydraDX-math", rev = "84632c3c7b71e16d53240e4bdc2adc693c941916", default-features = false } +hydra-dx-math = { git = "https://github.com/galacticcouncil/HydraDX-math", rev = "35e5c0775a07e057ed5247ba96dfa254d691f034", default-features = false } # Substrate dependencies -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false } [dev-dependencies] test-utils = { path="../test-utils" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29" } -orml-currencies = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.29" } -orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.29" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" } +orml-currencies = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.38" } +orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.38" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" } # This can be updated to lates after rust update(>=1.61) fixed = { version = "=1.15.0", default-features = false } proptest = "1.0.0" diff --git a/liquidity-mining/src/lib.rs b/liquidity-mining/src/lib.rs index f9258a51..36f1a4c9 100644 --- a/liquidity-mining/src/lib.rs +++ b/liquidity-mining/src/lib.rs @@ -119,8 +119,9 @@ use hydradx_traits::{liquidity_mining::PriceAdjustment, pools::DustRemovalAccoun use orml_traits::{GetByKey, MultiCurrency}; use scale_info::TypeInfo; use sp_arithmetic::{ + fixed_point::FixedU128, traits::{CheckedAdd, CheckedDiv, CheckedSub}, - FixedU128, Perquintill, + Perquintill, }; use sp_std::{ convert::{From, Into, TryInto}, @@ -170,7 +171,7 @@ pub mod pallet { #[pallet::config] pub trait Config: frame_system::Config + TypeInfo { - type Event: From> + IsType<::Event>; + type RuntimeEvent: From> + IsType<::RuntimeEvent>; /// Asset type. type AssetId: Parameter + Member + Copy + MaybeSerializeDeserialize + MaxEncodedLen + Into; diff --git a/liquidity-mining/src/tests/mock.rs b/liquidity-mining/src/tests/mock.rs index 5644a2da..4dba37c4 100644 --- a/liquidity-mining/src/tests/mock.rs +++ b/liquidity-mining/src/tests/mock.rs @@ -152,8 +152,8 @@ impl system::Config for Test { type BlockWeights = (); type BlockLength = (); type DbWeight = (); - type Origin = Origin; - type Call = Call; + type RuntimeOrigin = RuntimeOrigin; + type RuntimeCall = RuntimeCall; type Index = u64; type BlockNumber = BlockNumber; type Hash = H256; @@ -161,7 +161,7 @@ impl system::Config for Test { type AccountId = AccountId; type Lookup = IdentityLookup; type Header = Header; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type Version = (); type PalletInfo = PalletInfo; @@ -282,7 +282,7 @@ parameter_types! { } impl Config for Test { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type AssetId = AssetId; type MultiCurrency = Tokens; type PalletId = LMPalletId; @@ -306,7 +306,7 @@ parameter_types! { } impl Config for Test { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type AssetId = AssetId; type MultiCurrency = Tokens; type PalletId = LMPalletId2; @@ -326,7 +326,7 @@ parameter_types! { } impl Config for Test { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type AssetId = AssetId; type MultiCurrency = Tokens; type PalletId = LMPalletId3; @@ -349,7 +349,7 @@ parameter_types! { impl pallet_balances::Config for Test { type Balance = Balance; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type DustRemoval = (); type ExistentialDeposit = ExistentialDeposit; type AccountStore = frame_system::Pallet; @@ -360,19 +360,17 @@ impl pallet_balances::Config for Test { } impl orml_tokens::Config for Test { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Balance = Balance; type Amount = Amount; type CurrencyId = AssetId; type WeightInfo = (); type ExistentialDeposits = AssetRegistry; - type OnDust = (); type MaxLocks = MaxLocks; type DustRemovalWhitelist = Whitelist; - type OnKilledTokenAccount = (); - type OnNewTokenAccount = (); type MaxReserves = ConstU32<100_000>; type ReserveIdentifier = (); + type CurrencyHooks = (); } pub struct DummyOraclePriceAdjustment; diff --git a/liquidity-mining/src/tests/mod.rs b/liquidity-mining/src/tests/mod.rs index 22b734d2..a4021d4c 100644 --- a/liquidity-mining/src/tests/mod.rs +++ b/liquidity-mining/src/tests/mod.rs @@ -18,8 +18,8 @@ use super::*; use mock::{ asset_pair_to_map_key, set_block_number, with_transaction, AccountId, AssetId, AssetPair, Balance, BlockNumber, - ExtBuilder, LiquidityMining, Origin, Test, Tokens, TransactionOutcome, Whitelist, ACA, ACA_FARM, ACA_KSM_AMM, - ACA_KSM_SHARE_ID, ACCOUNT_WITH_1M, ALICE, AMM_POOLS, BOB, BSX, BSX_ACA_AMM, BSX_ACA_SHARE_ID, + ExtBuilder, LiquidityMining, RuntimeOrigin as Origin, Test, Tokens, TransactionOutcome, Whitelist, ACA, ACA_FARM, + ACA_KSM_AMM, ACA_KSM_SHARE_ID, ACCOUNT_WITH_1M, ALICE, AMM_POOLS, BOB, BSX, BSX_ACA_AMM, BSX_ACA_SHARE_ID, BSX_ACA_YIELD_FARM_ID, BSX_DOT_AMM, BSX_DOT_SHARE_ID, BSX_DOT_YIELD_FARM_ID, BSX_ETH_AMM, BSX_ETH_SHARE_ID, BSX_FARM, BSX_HDX_AMM, BSX_HDX_SHARE_ID, BSX_KSM_AMM, BSX_KSM_SHARE_ID, BSX_KSM_YIELD_FARM_ID, BSX_TKN1_AMM, BSX_TKN1_SHARE_ID, BSX_TKN2_AMM, BSX_TKN2_SHARE_ID, CHARLIE, DAVE, DOT, ETH, EVE, GC, GC_FARM, HDX, diff --git a/liquidity-mining/src/tests/tests.rs b/liquidity-mining/src/tests/tests.rs index b03af7c0..e87aa885 100644 --- a/liquidity-mining/src/tests/tests.rs +++ b/liquidity-mining/src/tests/tests.rs @@ -719,7 +719,7 @@ fn sync_global_farm_should_work() { .unwrap(); if r.is_zero() && updated_at != current_period { - frame_system::Pallet::::assert_has_event(mock::Event::LiquidityMining( + frame_system::Pallet::::assert_has_event(mock::RuntimeEvent::LiquidityMining( Event::AllRewardsDistributed { global_farm_id: *id }, )); } @@ -734,7 +734,7 @@ fn sync_global_farm_should_work() { assert_eq!(global_farm, expected_global_farm); if updated_at != current_period { - frame_system::Pallet::::assert_has_event(mock::Event::LiquidityMining( + frame_system::Pallet::::assert_has_event(mock::RuntimeEvent::LiquidityMining( Event::GlobalFarmAccRPZUpdated { global_farm_id: *id, accumulated_rpz: *expected_accumulated_rpz, @@ -1273,7 +1273,7 @@ fn sync_yield_farm_should_work() { ); if current_period != yield_farm_updated_at && !yield_farm_total_valued_shares.is_zero() { - frame_system::Pallet::::assert_has_event(mock::Event::LiquidityMining( + frame_system::Pallet::::assert_has_event(mock::RuntimeEvent::LiquidityMining( Event::YieldFarmAccRPVSUpdated { global_farm_id: global_farm_0.id, yield_farm_id: yield_farm_0.id, @@ -2125,8 +2125,8 @@ fn sync_global_farm_should_emit_all_rewards_distributed_when_reward_is_zero() { Balance::zero() ); - frame_system::Pallet::::assert_has_event(mock::Event::LiquidityMining(Event::AllRewardsDistributed { - global_farm_id, - })); + frame_system::Pallet::::assert_has_event(mock::RuntimeEvent::LiquidityMining( + Event::AllRewardsDistributed { global_farm_id }, + )); }); } diff --git a/liquidity-mining/src/tests/update_global_farm.rs b/liquidity-mining/src/tests/update_global_farm.rs index 68f7d4f3..edbad116 100644 --- a/liquidity-mining/src/tests/update_global_farm.rs +++ b/liquidity-mining/src/tests/update_global_farm.rs @@ -45,7 +45,7 @@ fn update_global_farm_price_adjustment_should_work() { }, ); - frame_system::Pallet::::assert_has_event(mock::Event::LiquidityMining( + frame_system::Pallet::::assert_has_event(mock::RuntimeEvent::LiquidityMining( Event::GlobalFarmAccRPZUpdated { global_farm_id: global_farm_0.id, accumulated_rpz: FixedU128::from_inner(491_000_000_000_000_000_000_u128), @@ -71,7 +71,7 @@ fn update_global_farm_price_adjustment_in_same_period_should_work() { new_price_adjustment )); - frame_system::Pallet::::assert_has_event(mock::Event::LiquidityMining( + frame_system::Pallet::::assert_has_event(mock::RuntimeEvent::LiquidityMining( Event::GlobalFarmAccRPZUpdated { global_farm_id: GC_FARM, accumulated_rpz: FixedU128::from_inner(41_000_000_000_000_000_000_u128), diff --git a/nft/Cargo.toml b/nft/Cargo.toml index 660f28b3..984b8633 100644 --- a/nft/Cargo.toml +++ b/nft/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "pallet-nft" -version = "7.1.0" +version = "7.1.1" description = "A generic NFT pallet for managing non-fungible tokens" authors = ["GalacticCoucil"] edition = "2021" @@ -12,32 +12,29 @@ repository = "https://github.com/galacticcouncil/warehouse" targets = ["x86_64-unknown-linux-gnu"] [dependencies] -codec = { default-features = false, features = ["derive"], package = "parity-scale-codec", version = "3.1.5" } +codec = { default-features = false, features = ["derive"], package = "parity-scale-codec", version = "3.4.0" } scale-info = { version = "2.1.2", default-features = false, features = ["derive"] } serde = { version = "1.0.137", optional = true, features = ["derive"] } -# TODO: this is just a temporary fix of https://github.com/paritytech/substrate/issues/12304 -syn = "=1.0.99" - # Substrate dependencies -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29", default-features = false, optional = true } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29", default-features = false } -pallet-uniques = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29", default-features = false } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false, optional = true } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false } +pallet-uniques = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false } # ORML dependencies -orml-utilities = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.29", default-features = false } +orml-utilities = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.38", default-features = false } # HydraDX traits hydradx-traits = { path = "../traits", default-features = false } [dev-dependencies] -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29", default-features = false } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false } [features] default = ["std"] diff --git a/nft/src/lib.rs b/nft/src/lib.rs index adefbf70..6083cc7b 100644 --- a/nft/src/lib.rs +++ b/nft/src/lib.rs @@ -72,7 +72,7 @@ pub mod pallet { #[pallet::config] pub trait Config: frame_system::Config + pallet_uniques::Config { - type Event: From> + IsType<::Event>; + type RuntimeEvent: From> + IsType<::RuntimeEvent>; type WeightInfo: WeightInfo; type NftCollectionId: Member + Parameter @@ -124,6 +124,7 @@ pub mod pallet { /// - `metadata`: Arbitrary data about a collection, e.g. IPFS hash or name. /// /// Emits CollectionCreated event + #[pallet::call_index(0)] #[pallet::weight(::WeightInfo::create_collection())] pub fn create_collection( origin: OriginFor, @@ -150,6 +151,7 @@ pub mod pallet { /// - `collection_id`: The collection of the asset to be minted. /// - `item_id`: The item of the asset to be minted. /// - `metadata`: Arbitrary data about an item, e.g. IPFS hash or symbol. + #[pallet::call_index(1)] #[pallet::weight(::WeightInfo::mint())] pub fn mint( origin: OriginFor, @@ -181,6 +183,7 @@ pub mod pallet { /// - `collection_id`: The collection of the asset to be transferred. /// - `item_id`: The instance of the asset to be transferred. /// - `dest`: The account to receive ownership of the asset. + #[pallet::call_index(2)] #[pallet::weight(::WeightInfo::transfer())] pub fn transfer( origin: OriginFor, @@ -210,6 +213,7 @@ pub mod pallet { /// - `origin`: The NFT owner. /// - `collection_id`: The collection of the asset to be burned. /// - `item_id`: The instance of the asset to be burned. + #[pallet::call_index(3)] #[pallet::weight(::WeightInfo::burn())] pub fn burn(origin: OriginFor, collection_id: T::NftCollectionId, item_id: T::NftItemId) -> DispatchResult { let sender = ensure_signed(origin)?; @@ -233,6 +237,7 @@ pub mod pallet { /// Parameters: /// - `origin`: The collection owner. /// - `collection_id`: The identifier of the asset collection to be destroyed. + #[pallet::call_index(4)] #[pallet::weight(::WeightInfo::destroy_collection())] pub fn destroy_collection(origin: OriginFor, collection_id: T::NftCollectionId) -> DispatchResult { let sender = ensure_signed(origin)?; @@ -480,18 +485,23 @@ impl Inspect for Pallet { } impl InspectEnumerable for Pallet { + type CollectionsIterator = Box::NftCollectionId>>; + type ItemsIterator = Box::NftItemId>>; + type OwnedIterator = Box::NftCollectionId, ::NftItemId)>>; + type OwnedInCollectionIterator = Box::NftItemId>>; + /// Returns an iterator of the collections in existence. - fn collections() -> Box> { + fn collections() -> Self::CollectionsIterator { Box::new(Collections::::iter_keys()) } /// Returns an iterator of the items of a `collection` in existence. - fn items(collection: &Self::CollectionId) -> Box> { + fn items(collection: &Self::CollectionId) -> Self::ItemsIterator { Box::new(Items::::iter_key_prefix(collection)) } /// Returns an iterator of the items of all collections owned by `who`. - fn owned(who: &T::AccountId) -> Box> { + fn owned(who: &T::AccountId) -> Self::OwnedIterator { Box::new( pallet_uniques::Pallet::::owned(who) .map(|(collection_id, item_id)| (collection_id.into(), item_id.into())), @@ -499,10 +509,7 @@ impl InspectEnumerable for Pallet { } /// Returns an iterator of the items of `collection` owned by `who`. - fn owned_in_collection( - collection: &Self::CollectionId, - who: &T::AccountId, - ) -> Box> { + fn owned_in_collection(collection: &Self::CollectionId, who: &T::AccountId) -> Self::OwnedInCollectionIterator { Box::new( pallet_uniques::Pallet::::owned_in_collection( &(Into::<::CollectionId>::into(*collection)), diff --git a/nft/src/mock.rs b/nft/src/mock.rs index f57bd17d..c0e11f4f 100644 --- a/nft/src/mock.rs +++ b/nft/src/mock.rs @@ -86,7 +86,7 @@ impl NftPermission for NftTestPermissions { } impl Config for Test { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type WeightInfo = pallet_nft::weights::BasiliskWeight; type NftCollectionId = CollectionId; type NftItemId = ItemId; @@ -107,7 +107,7 @@ parameter_types! { } impl pallet_uniques::Config for Test { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type CollectionId = CollectionId; type ItemId = ItemId; type Currency = Balances; @@ -137,8 +137,8 @@ impl frame_system::Config for Test { type BlockWeights = (); type BlockLength = (); type DbWeight = (); - type Origin = Origin; - type Call = Call; + type RuntimeOrigin = RuntimeOrigin; + type RuntimeCall = RuntimeCall; type Index = u64; type BlockNumber = u64; type Hash = H256; @@ -146,7 +146,7 @@ impl frame_system::Config for Test { type AccountId = AccountId; type Lookup = IdentityLookup; type Header = Header; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type Version = (); type PalletInfo = PalletInfo; @@ -165,7 +165,7 @@ parameter_types! { } impl pallet_balances::Config for Test { type Balance = Balance; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type DustRemoval = (); type ExistentialDeposit = ExistentialDeposit; type AccountStore = frame_system::Pallet; @@ -211,6 +211,6 @@ impl ExtBuilder { } } -pub fn expect_events(e: Vec) { +pub fn expect_events(e: Vec) { e.into_iter().for_each(frame_system::Pallet::::assert_has_event); } diff --git a/nft/src/tests.rs b/nft/src/tests.rs index fd21090d..1889614e 100644 --- a/nft/src/tests.rs +++ b/nft/src/tests.rs @@ -29,7 +29,7 @@ fn create_collection_works() { b"metadata".to_vec().try_into().unwrap(); assert_ok!(NFTPallet::create_collection( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), COLLECTION_ID_0, Default::default(), // Marketplace metadata.clone() @@ -53,7 +53,7 @@ fn create_collection_works() { // not allowed in Permissions assert_noop!( NFTPallet::create_collection( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), COLLECTION_ID_2, CollectionType::LiquidityMining, metadata.clone() @@ -64,7 +64,7 @@ fn create_collection_works() { // existing collection ID assert_noop!( NFTPallet::create_collection( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), COLLECTION_ID_0, CollectionType::Marketplace, metadata.clone() @@ -75,7 +75,7 @@ fn create_collection_works() { // reserved collection ID assert_noop!( NFTPallet::create_collection( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), COLLECTION_ID_RESERVED, CollectionType::Marketplace, metadata @@ -105,7 +105,7 @@ fn mint_works() { )); assert_ok!(NFTPallet::mint( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), COLLECTION_ID_0, ITEM_ID_0, metadata.clone() @@ -127,25 +127,40 @@ fn mint_works() { // duplicate item assert_noop!( - NFTPallet::mint(Origin::signed(ALICE), COLLECTION_ID_0, ITEM_ID_0, metadata.clone()), + NFTPallet::mint( + RuntimeOrigin::signed(ALICE), + COLLECTION_ID_0, + ITEM_ID_0, + metadata.clone() + ), pallet_uniques::Error::::AlreadyExists ); // not allowed in Permissions assert_noop!( - NFTPallet::mint(Origin::signed(ALICE), COLLECTION_ID_1, ITEM_ID_0, metadata.clone()), + NFTPallet::mint( + RuntimeOrigin::signed(ALICE), + COLLECTION_ID_1, + ITEM_ID_0, + metadata.clone() + ), Error::::NotPermitted ); // not owner assert_noop!( - NFTPallet::mint(Origin::signed(BOB), COLLECTION_ID_0, ITEM_ID_1, metadata.clone()), + NFTPallet::mint(RuntimeOrigin::signed(BOB), COLLECTION_ID_0, ITEM_ID_1, metadata.clone()), Error::::NotPermitted ); // invalid collection ID assert_noop!( - NFTPallet::mint(Origin::signed(ALICE), NON_EXISTING_COLLECTION_ID, ITEM_ID_0, metadata), + NFTPallet::mint( + RuntimeOrigin::signed(ALICE), + NON_EXISTING_COLLECTION_ID, + ITEM_ID_0, + metadata + ), Error::::CollectionUnknown ); }); @@ -174,24 +189,24 @@ fn transfer_works() { // not existing assert_noop!( - NFTPallet::transfer(Origin::signed(CHARLIE), COLLECTION_ID_2, ITEM_ID_0, ALICE), + NFTPallet::transfer(RuntimeOrigin::signed(CHARLIE), COLLECTION_ID_2, ITEM_ID_0, ALICE), Error::::CollectionUnknown ); // not owner assert_noop!( - NFTPallet::transfer(Origin::signed(CHARLIE), COLLECTION_ID_0, ITEM_ID_0, ALICE), + NFTPallet::transfer(RuntimeOrigin::signed(CHARLIE), COLLECTION_ID_0, ITEM_ID_0, ALICE), Error::::NotPermitted ); // not allowed in Permissions assert_noop!( - NFTPallet::transfer(Origin::signed(ALICE), COLLECTION_ID_1, ITEM_ID_0, BOB), + NFTPallet::transfer(RuntimeOrigin::signed(ALICE), COLLECTION_ID_1, ITEM_ID_0, BOB), Error::::NotPermitted ); assert_ok!(NFTPallet::transfer( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), COLLECTION_ID_0, ITEM_ID_0, ALICE @@ -199,7 +214,7 @@ fn transfer_works() { assert_eq!(NFTPallet::owner(&COLLECTION_ID_0, &ITEM_ID_0).unwrap(), ALICE); assert_ok!(NFTPallet::transfer( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), COLLECTION_ID_0, ITEM_ID_0, BOB @@ -239,17 +254,21 @@ fn burn_works() { // not owner assert_noop!( - NFTPallet::burn(Origin::signed(BOB), COLLECTION_ID_0, ITEM_ID_0), + NFTPallet::burn(RuntimeOrigin::signed(BOB), COLLECTION_ID_0, ITEM_ID_0), Error::::NotPermitted ); // not allowed in Permissions assert_noop!( - NFTPallet::burn(Origin::signed(ALICE), COLLECTION_ID_1, ITEM_ID_0), + NFTPallet::burn(RuntimeOrigin::signed(ALICE), COLLECTION_ID_1, ITEM_ID_0), Error::::NotPermitted ); - assert_ok!(NFTPallet::burn(Origin::signed(ALICE), COLLECTION_ID_0, ITEM_ID_0)); + assert_ok!(NFTPallet::burn( + RuntimeOrigin::signed(ALICE), + COLLECTION_ID_0, + ITEM_ID_0 + )); assert!(!>::contains_key(COLLECTION_ID_0, ITEM_ID_0)); expect_events(vec![crate::Event::ItemBurned { @@ -261,7 +280,7 @@ fn burn_works() { // not existing assert_noop!( - NFTPallet::burn(Origin::signed(ALICE), COLLECTION_ID_0, ITEM_ID_0), + NFTPallet::burn(RuntimeOrigin::signed(ALICE), COLLECTION_ID_0, ITEM_ID_0), Error::::ItemUnknown ); }); @@ -289,24 +308,27 @@ fn destroy_collection_works() { // existing item assert_noop!( - NFTPallet::destroy_collection(Origin::signed(ALICE), COLLECTION_ID_0), + NFTPallet::destroy_collection(RuntimeOrigin::signed(ALICE), COLLECTION_ID_0), Error::::TokenCollectionNotEmpty ); assert_ok!(NFTPallet::do_burn(ALICE, COLLECTION_ID_0, ITEM_ID_0)); // not allowed in Permissions assert_noop!( - NFTPallet::destroy_collection(Origin::signed(ALICE), COLLECTION_ID_1), + NFTPallet::destroy_collection(RuntimeOrigin::signed(ALICE), COLLECTION_ID_1), Error::::NotPermitted ); // not owner assert_noop!( - NFTPallet::destroy_collection(Origin::signed(CHARLIE), COLLECTION_ID_0), + NFTPallet::destroy_collection(RuntimeOrigin::signed(CHARLIE), COLLECTION_ID_0), pallet_uniques::Error::::NoPermission ); - assert_ok!(NFTPallet::destroy_collection(Origin::signed(ALICE), COLLECTION_ID_0)); + assert_ok!(NFTPallet::destroy_collection( + RuntimeOrigin::signed(ALICE), + COLLECTION_ID_0 + )); assert_eq!(NFTPallet::collections(COLLECTION_ID_0), None); expect_events(vec![crate::Event::CollectionDestroyed { @@ -317,7 +339,7 @@ fn destroy_collection_works() { // not existing assert_noop!( - NFTPallet::destroy_collection(Origin::signed(ALICE), COLLECTION_ID_0), + NFTPallet::destroy_collection(RuntimeOrigin::signed(ALICE), COLLECTION_ID_0), Error::::CollectionUnknown ); }); diff --git a/otc/Cargo.toml b/otc/Cargo.toml index 5a5ff9ac..f5040a98 100644 --- a/otc/Cargo.toml +++ b/otc/Cargo.toml @@ -9,31 +9,31 @@ repository = "https://github.com/galacticcouncil/Hydradx-node" [dependencies] # parity -codec = { package = "parity-scale-codec", version = "3.1.5", features = ["derive", "max-encoded-len"], default-features = false } +codec = { package = "parity-scale-codec", version = "3.4.0", features = ["derive", "max-encoded-len"], default-features = false } scale-info = { version = "2.1.2", default-features = false, features = ["derive"] } # primitives -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29", default-features = false} +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false} # FRAME -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false } # HydraDX dependencies hydradx-traits = { path = "../traits", default-features = false } # ORML dependencies -orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.29", default-features = false } +orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.38", default-features = false } # Optional imports for benchmarking -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29", default-features = false , optional = true} +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false , optional = true} [dev-dependencies] -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29", default-features = false } -orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.29", default-features = false, features=["std"]} +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false } +orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.38", default-features = false, features=["std"]} proptest = "1.0.0" pretty_assertions = "1.2.1" test-utils = { path = "../test-utils", default-features = false } diff --git a/otc/src/lib.rs b/otc/src/lib.rs index 156f4ed7..ca71869d 100644 --- a/otc/src/lib.rs +++ b/otc/src/lib.rs @@ -98,7 +98,7 @@ pub mod pallet { Balance = Balance, >; - type Event: From> + IsType<::Event>; + type RuntimeEvent: From> + IsType<::RuntimeEvent>; type ExistentialDeposits: GetByKey; @@ -190,6 +190,7 @@ pub mod pallet { /// /// Events: /// - `Placed` event when successful. + #[pallet::call_index(0)] #[pallet::weight(::WeightInfo::place_order())] pub fn place_order( origin: OriginFor, @@ -248,6 +249,7 @@ pub mod pallet { /// /// Events: /// `PartiallyFilled` event when successful. + #[pallet::call_index(1)] #[pallet::weight(::WeightInfo::partial_fill_order())] pub fn partial_fill_order(origin: OriginFor, order_id: OrderId, amount_in: Balance) -> DispatchResult { let who = ensure_signed(origin)?; @@ -287,6 +289,7 @@ pub mod pallet { /// /// Events: /// `Filled` event when successful. + #[pallet::call_index(2)] #[pallet::weight(::WeightInfo::fill_order())] pub fn fill_order(origin: OriginFor, order_id: OrderId) -> DispatchResult { let who = ensure_signed(origin)?; @@ -315,6 +318,7 @@ pub mod pallet { /// - caller is order owner /// /// Emits `Cancelled` event when successful. + #[pallet::call_index(3)] #[pallet::weight(::WeightInfo::cancel_order())] pub fn cancel_order(origin: OriginFor, order_id: OrderId) -> DispatchResult { let who = ensure_signed(origin)?; diff --git a/otc/src/tests/cancel_order.rs b/otc/src/tests/cancel_order.rs index 117e8060..eb89745c 100644 --- a/otc/src/tests/cancel_order.rs +++ b/otc/src/tests/cancel_order.rs @@ -25,7 +25,7 @@ fn cancel_order_should_work() { ExtBuilder::default().build().execute_with(|| { // Arrange assert_ok!(OTC::place_order( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), DAI, HDX, 20 * ONE, @@ -34,7 +34,7 @@ fn cancel_order_should_work() { )); // Act - assert_ok!(OTC::cancel_order(Origin::signed(ALICE), 0)); + assert_ok!(OTC::cancel_order(RuntimeOrigin::signed(ALICE), 0)); // Assert let order = OTC::orders(0); @@ -51,7 +51,7 @@ fn cancel_order_should_throw_error_when_order_does_not_exist() { ExtBuilder::default().build().execute_with(|| { // Act assert_noop!( - OTC::cancel_order(Origin::signed(ALICE), 0), + OTC::cancel_order(RuntimeOrigin::signed(ALICE), 0), Error::::OrderNotFound ); }); @@ -62,7 +62,7 @@ fn cancel_order_should_throw_error_when_called_by_non_owner() { ExtBuilder::default().build().execute_with(|| { // Arrange assert_ok!(OTC::place_order( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), DAI, HDX, 20 * ONE, @@ -71,7 +71,10 @@ fn cancel_order_should_throw_error_when_called_by_non_owner() { )); // Act - assert_noop!(OTC::cancel_order(Origin::signed(BOB), 0), Error::::Forbidden); + assert_noop!( + OTC::cancel_order(RuntimeOrigin::signed(BOB), 0), + Error::::Forbidden + ); // Assert let order = OTC::orders(0); diff --git a/otc/src/tests/fill_order.rs b/otc/src/tests/fill_order.rs index 556af59a..a0b5cf47 100644 --- a/otc/src/tests/fill_order.rs +++ b/otc/src/tests/fill_order.rs @@ -25,7 +25,7 @@ fn complete_fill_order_should_work() { ExtBuilder::default().build().execute_with(|| { // Arrange assert_ok!(OTC::place_order( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), DAI, HDX, 20 * ONE, @@ -41,7 +41,7 @@ fn complete_fill_order_should_work() { // Act let amount = 20 * ONE; - assert_ok!(OTC::fill_order(Origin::signed(BOB), 0)); + assert_ok!(OTC::fill_order(RuntimeOrigin::signed(BOB), 0)); // Assert let order = OTC::orders(0); @@ -77,7 +77,7 @@ fn complete_fill_order_should_work_when_order_is_not_partially_fillable() { ExtBuilder::default().build().execute_with(|| { // Arrange assert_ok!(OTC::place_order( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), DAI, HDX, 20 * ONE, @@ -93,7 +93,7 @@ fn complete_fill_order_should_work_when_order_is_not_partially_fillable() { // Act let amount = 20 * ONE; - assert_ok!(OTC::fill_order(Origin::signed(BOB), 0)); + assert_ok!(OTC::fill_order(RuntimeOrigin::signed(BOB), 0)); // Assert let order = OTC::orders(0); @@ -129,7 +129,7 @@ fn complete_fill_order_should_work_when_there_are_multiple_orders() { ExtBuilder::default().build().execute_with(|| { // Arrange assert_ok!(OTC::place_order( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), DAI, HDX, 20 * ONE, @@ -138,7 +138,7 @@ fn complete_fill_order_should_work_when_there_are_multiple_orders() { )); assert_ok!(OTC::place_order( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), DAI, HDX, 10 * ONE, @@ -154,7 +154,7 @@ fn complete_fill_order_should_work_when_there_are_multiple_orders() { // Act let amount = 20 * ONE; - assert_ok!(OTC::fill_order(Origin::signed(BOB), 0)); + assert_ok!(OTC::fill_order(RuntimeOrigin::signed(BOB), 0)); // Assert let order = OTC::orders(0); @@ -193,7 +193,7 @@ fn fill_order_should_throw_error_when_insufficient_balance() { ExtBuilder::default().build().execute_with(|| { // Arrange assert_ok!(OTC::place_order( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), DAI, HDX, 200 * ONE, @@ -209,7 +209,7 @@ fn fill_order_should_throw_error_when_insufficient_balance() { let bob_dai_balance_before = Tokens::free_balance(DAI, &BOB); // Act - assert_noop!(OTC::fill_order(Origin::signed(BOB), 0), BalanceTooLow::); + assert_noop!(OTC::fill_order(RuntimeOrigin::signed(BOB), 0), BalanceTooLow::); // Assert let alice_free_hdx_balance_after = Tokens::free_balance(HDX, &ALICE); diff --git a/otc/src/tests/invariants.rs b/otc/src/tests/invariants.rs index 02c58aea..d8289103 100644 --- a/otc/src/tests/invariants.rs +++ b/otc/src/tests/invariants.rs @@ -94,7 +94,7 @@ proptest! { .build() .execute_with(|| { OTC::place_order( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), DAI, HDX, initial_amount_in, @@ -104,7 +104,7 @@ proptest! { let initial_price = FixedU128::from_rational(initial_amount_out, initial_amount_in); - OTC::partial_fill_order(Origin::signed(BOB), 0, amount_fill).unwrap(); + OTC::partial_fill_order(RuntimeOrigin::signed(BOB), 0, amount_fill).unwrap(); let order = OTC::orders(0).unwrap(); let new_price = FixedU128::from_rational(order.amount_out, order.amount_in); diff --git a/otc/src/tests/mock.rs b/otc/src/tests/mock.rs index 1438d1f9..4e0124e8 100644 --- a/otc/src/tests/mock.rs +++ b/otc/src/tests/mock.rs @@ -83,7 +83,7 @@ impl Config for Test { type AssetId = AssetId; type AssetRegistry = DummyRegistry; type Currency = Tokens; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type ExistentialDeposits = ExistentialDeposits; type ExistentialDepositMultiplier = ExistentialDepositMultiplier; type WeightInfo = (); @@ -99,8 +99,8 @@ impl system::Config for Test { type BaseCallFilter = Everything; type BlockWeights = (); type BlockLength = (); - type Origin = Origin; - type Call = Call; + type RuntimeOrigin = RuntimeOrigin; + type RuntimeCall = RuntimeCall; type Index = u64; type BlockNumber = u64; type Hash = H256; @@ -108,7 +108,7 @@ impl system::Config for Test { type AccountId = u64; type Lookup = IdentityLookup; type Header = Header; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type DbWeight = (); type Version = (); @@ -123,19 +123,17 @@ impl system::Config for Test { } impl orml_tokens::Config for Test { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Balance = Balance; type Amount = Amount; type CurrencyId = AssetId; type WeightInfo = (); type ExistentialDeposits = ExistentialDeposits; - type OnDust = (); type MaxLocks = (); type DustRemovalWhitelist = Nothing; - type OnNewTokenAccount = (); - type OnKilledTokenAccount = (); type ReserveIdentifier = NamedReserveIdentifier; type MaxReserves = MaxReserves; + type CurrencyHooks = (); } pub struct DummyRegistry(sp_std::marker::PhantomData); @@ -236,8 +234,8 @@ thread_local! { pub static DUMMYTHREADLOCAL: RefCell = RefCell::new(100); } -pub fn expect_events(e: Vec) { - test_utils::expect_events::(e); +pub fn expect_events(e: Vec) { + test_utils::expect_events::(e); } pub fn precision(asset_id: AssetId) -> u32 { diff --git a/otc/src/tests/partial_fill_order.rs b/otc/src/tests/partial_fill_order.rs index d9d6bcfb..0cdacdd9 100644 --- a/otc/src/tests/partial_fill_order.rs +++ b/otc/src/tests/partial_fill_order.rs @@ -25,7 +25,7 @@ fn partial_fill_order_should_work_when_order_is_partially_fillable() { ExtBuilder::default().build().execute_with(|| { // Arrange assert_ok!(OTC::place_order( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), DAI, HDX, 20 * ONE, @@ -42,7 +42,7 @@ fn partial_fill_order_should_work_when_order_is_partially_fillable() { // Act let amount = 5 * ONE; - assert_ok!(OTC::partial_fill_order(Origin::signed(BOB), 0, amount)); + assert_ok!(OTC::partial_fill_order(RuntimeOrigin::signed(BOB), 0, amount)); // Assert let expected_amount_out = 25_000_000_000_000_u128; @@ -87,7 +87,7 @@ fn partial_fill_order_should_throw_error_when_order_is_not_partially_fillable() ExtBuilder::default().build().execute_with(|| { // Arrange assert_ok!(OTC::place_order( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), DAI, HDX, 20 * ONE, @@ -105,7 +105,7 @@ fn partial_fill_order_should_throw_error_when_order_is_not_partially_fillable() // Act let amount = 5 * ONE; assert_noop!( - OTC::partial_fill_order(Origin::signed(BOB), 0, amount), + OTC::partial_fill_order(RuntimeOrigin::signed(BOB), 0, amount), Error::::OrderNotPartiallyFillable ); @@ -133,7 +133,7 @@ fn partial_fill_order_should_throw_error_when_fill_is_complete() { ExtBuilder::default().build().execute_with(|| { // Arrange assert_ok!(OTC::place_order( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), DAI, HDX, 20 * ONE, @@ -151,7 +151,7 @@ fn partial_fill_order_should_throw_error_when_fill_is_complete() { // Act let amount = 20 * ONE; assert_noop!( - OTC::partial_fill_order(Origin::signed(BOB), 0, amount), + OTC::partial_fill_order(RuntimeOrigin::signed(BOB), 0, amount), Error::::OrderAmountTooSmall ); @@ -179,7 +179,7 @@ fn partial_fill_order_should_throw_error_when_remaining_amounts_are_too_low() { ExtBuilder::default().build().execute_with(|| { // Arrange assert_ok!(OTC::place_order( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), DAI, HDX, 20 * ONE, @@ -197,7 +197,7 @@ fn partial_fill_order_should_throw_error_when_remaining_amounts_are_too_low() { // Act let amount = 16 * ONE; assert_noop!( - OTC::partial_fill_order(Origin::signed(BOB), 0, amount), + OTC::partial_fill_order(RuntimeOrigin::signed(BOB), 0, amount), Error::::OrderAmountTooSmall ); @@ -225,7 +225,7 @@ fn fill_order_should_throw_error_when_insufficient_balance() { ExtBuilder::default().build().execute_with(|| { // Arrange assert_ok!(OTC::place_order( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), DAI, HDX, 200 * ONE, @@ -243,7 +243,7 @@ fn fill_order_should_throw_error_when_insufficient_balance() { // Act let amount = 110 * ONE; assert_noop!( - OTC::partial_fill_order(Origin::signed(BOB), 0, amount), + OTC::partial_fill_order(RuntimeOrigin::signed(BOB), 0, amount), BalanceTooLow:: ); @@ -271,7 +271,7 @@ fn partial_fill_order_should_throw_error_when_amount_is_larger_than_order() { ExtBuilder::default().build().execute_with(|| { // Arrange assert_ok!(OTC::place_order( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), DAI, HDX, 20 * ONE, @@ -289,7 +289,7 @@ fn partial_fill_order_should_throw_error_when_amount_is_larger_than_order() { // Act let amount = 30 * ONE; assert_noop!( - OTC::partial_fill_order(Origin::signed(BOB), 0, amount), + OTC::partial_fill_order(RuntimeOrigin::signed(BOB), 0, amount), Error::::MathError ); diff --git a/otc/src/tests/place_order.rs b/otc/src/tests/place_order.rs index a294fc8c..c2bc0186 100644 --- a/otc/src/tests/place_order.rs +++ b/otc/src/tests/place_order.rs @@ -25,7 +25,7 @@ fn place_order_should_work() { ExtBuilder::default().build().execute_with(|| { // Act assert_ok!(OTC::place_order( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), DAI, HDX, 20 * ONE, @@ -67,7 +67,7 @@ fn place_order_should_work_when_user_has_multiple_orders() { ExtBuilder::default().build().execute_with(|| { // Act assert_ok!(OTC::place_order( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), DAI, HDX, 20 * ONE, @@ -76,7 +76,7 @@ fn place_order_should_work_when_user_has_multiple_orders() { )); assert_ok!(OTC::place_order( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), DAI, HDX, 10 * ONE, @@ -97,7 +97,7 @@ fn place_order_should_throw_error_when_amount_is_higher_than_balance() { ExtBuilder::default().build().execute_with(|| { // Act assert_noop!( - OTC::place_order(Origin::signed(ALICE), DAI, HDX, 20 * ONE, 100_000 * ONE, true), + OTC::place_order(RuntimeOrigin::signed(ALICE), DAI, HDX, 20 * ONE, 100_000 * ONE, true), BalanceTooLow:: ); }); @@ -108,7 +108,7 @@ fn place_order_should_throw_error_when_asset_out_is_not_registered() { ExtBuilder::default().build().execute_with(|| { // Act assert_noop!( - OTC::place_order(Origin::signed(ALICE), DAI, DOGE, 20 * ONE, 100 * ONE, true), + OTC::place_order(RuntimeOrigin::signed(ALICE), DAI, DOGE, 20 * ONE, 100 * ONE, true), BalanceTooLow:: ); }); @@ -119,7 +119,7 @@ fn place_order_should_throw_error_when_asset_in_is_not_registered() { ExtBuilder::default().build().execute_with(|| { // Act assert_noop!( - OTC::place_order(Origin::signed(ALICE), DOGE, HDX, 20 * ONE, 100 * ONE, true), + OTC::place_order(RuntimeOrigin::signed(ALICE), DOGE, HDX, 20 * ONE, 100 * ONE, true), Error::::AssetNotRegistered ); }); @@ -130,7 +130,7 @@ fn place_order_should_throw_error_when_amount_in_is_too_low() { ExtBuilder::default().build().execute_with(|| { // Act assert_noop!( - OTC::place_order(Origin::signed(ALICE), DAI, HDX, 4 * ONE, 100 * ONE, true), + OTC::place_order(RuntimeOrigin::signed(ALICE), DAI, HDX, 4 * ONE, 100 * ONE, true), Error::::OrderAmountTooSmall ); }); @@ -141,7 +141,7 @@ fn place_order_should_throw_error_when_amount_out_is_too_low() { ExtBuilder::default().build().execute_with(|| { // Act assert_noop!( - OTC::place_order(Origin::signed(ALICE), DAI, HDX, 20 * ONE, 4 * ONE, true), + OTC::place_order(RuntimeOrigin::signed(ALICE), DAI, HDX, 20 * ONE, 4 * ONE, true), Error::::OrderAmountTooSmall ); }); diff --git a/price-oracle/Cargo.toml b/price-oracle/Cargo.toml index 40a9801e..b7a2bfa2 100644 --- a/price-oracle/Cargo.toml +++ b/price-oracle/Cargo.toml @@ -1,6 +1,6 @@ [package] name = 'pallet-price-oracle' -version = '0.3.2' +version = '0.3.3' description = 'Price oracle for AMM pools' authors = ['GalacticCouncil'] edition = '2021' @@ -11,7 +11,7 @@ repository = 'https://github.com/galacticcouncil/warehouse' targets = ['x86_64-unknown-linux-gnu'] [dependencies] -codec = { default-features = false, features = ["derive"], package = "parity-scale-codec", version = "3.1.5" } +codec = { default-features = false, features = ["derive"], package = "parity-scale-codec", version = "3.4.0" } serde = {features = ['derive'], optional = true, version = '1.0.137'} scale-info = { version = "2.1.2", default-features = false, features = ["derive"] } @@ -19,15 +19,15 @@ scale-info = { version = "2.1.2", default-features = false, features = ["derive" hydradx-traits = { path = "../traits", default-features = false } # Substrate dependencies -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29", default-features = false, optional = true } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29", default-features = false } -frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29", default-features = false, optional = true } -sp-core = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.29", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29", default-features = false } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false, optional = true } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false } +frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false, optional = true } +sp-core = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.38", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false } [dev-dependencies] -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false } test-utils = { path = "../test-utils", default-features = false } [features] diff --git a/price-oracle/src/lib.rs b/price-oracle/src/lib.rs index 5aa83110..399f97ae 100644 --- a/price-oracle/src/lib.rs +++ b/price-oracle/src/lib.rs @@ -60,7 +60,7 @@ pub mod pallet { #[pallet::config] pub trait Config: frame_system::Config { - type Event: From> + IsType<::Event>; + type RuntimeEvent: From> + IsType<::RuntimeEvent>; /// Weight information for the extrinsics. type WeightInfo: WeightInfo; diff --git a/price-oracle/src/mock.rs b/price-oracle/src/mock.rs index 2a8ca2dd..6d61c8f5 100644 --- a/price-oracle/src/mock.rs +++ b/price-oracle/src/mock.rs @@ -71,8 +71,8 @@ impl frame_system::Config for Test { type BaseCallFilter = Everything; type BlockWeights = (); type BlockLength = (); - type Origin = Origin; - type Call = Call; + type RuntimeOrigin = RuntimeOrigin; + type RuntimeCall = RuntimeCall; type Index = u64; type BlockNumber = u64; type Hash = H256; @@ -80,7 +80,7 @@ impl frame_system::Config for Test { type AccountId = u64; type Lookup = IdentityLookup; type Header = Header; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type DbWeight = (); type Version = (); @@ -117,7 +117,7 @@ impl Get<(u32, u32)> for ExchangeFee { } impl Config for Test { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type WeightInfo = (); } diff --git a/price-oracle/src/tests.rs b/price-oracle/src/tests.rs index 21cda51a..ae665b46 100644 --- a/price-oracle/src/tests.rs +++ b/price-oracle/src/tests.rs @@ -17,8 +17,8 @@ use super::*; pub use crate::mock::{ - Event as TestEvent, ExtBuilder, Origin, PriceOracle, System, Test, ACA, DOT, ETH, HDX, ORACLE_ENTRY_1, - ORACLE_ENTRY_2, + ExtBuilder, PriceOracle, RuntimeEvent as TestEvent, RuntimeOrigin, System, Test, ACA, DOT, ETH, HDX, + ORACLE_ENTRY_1, ORACLE_ENTRY_2, }; use frame_support::{ assert_noop, assert_ok, diff --git a/relaychain-info/Cargo.toml b/relaychain-info/Cargo.toml index 560b3453..39936a7a 100644 --- a/relaychain-info/Cargo.toml +++ b/relaychain-info/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "pallet-relaychain-info" -version = "0.3.2" +version = "0.3.3" description = "Relaychain info pallet provides various support features for a parachain" authors = ["GalacticCouncil"] edition = "2021" @@ -8,17 +8,17 @@ license = "Apache 2.0" repository = "https://github.com/galacticcouncil/warehouse/tree/master/relaychain-info" [dependencies] -codec = { default-features = false, features = ["derive"], package = "parity-scale-codec", version = "3.1.5" } +codec = { default-features = false, features = ["derive"], package = "parity-scale-codec", version = "3.4.0" } scale-info = { version = "2.1.2", default-features = false, features = ["derive"] } # Substrate dependencies -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29", default-features = false } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false } -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.29", default-features = false } -cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.29", default-features = false } +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.38", default-features = false } +cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.38", default-features = false } [features] default = ["std"] diff --git a/relaychain-info/src/lib.rs b/relaychain-info/src/lib.rs index 978395a6..606feb27 100644 --- a/relaychain-info/src/lib.rs +++ b/relaychain-info/src/lib.rs @@ -37,7 +37,7 @@ pub mod pallet { #[pallet::config] pub trait Config: frame_system::Config { - type Event: From> + IsType<::Event>; + type RuntimeEvent: From> + IsType<::RuntimeEvent>; /// Provider of relay chain block number type RelaychainBlockNumberProvider: BlockNumberProvider; diff --git a/route-executor/Cargo.toml b/route-executor/Cargo.toml index 4354f0d6..0383b6a7 100644 --- a/route-executor/Cargo.toml +++ b/route-executor/Cargo.toml @@ -1,6 +1,6 @@ [package] name = 'pallet-route-executor' -version = '1.0.2' +version = '1.0.3' description = 'A pallet to execute a route containing a sequence of trades' authors = ['GalacticCouncil'] edition = '2021' @@ -8,7 +8,7 @@ license = 'Apache 2.0' repository = "https://github.com/galacticcouncil/warehouse/tree/master/route-executor" [dependencies] -codec = { default-features = false, features = ["derive"], package = "parity-scale-codec", version = "3.1.5" } +codec = { default-features = false, features = ["derive"], package = "parity-scale-codec", version = "3.4.0" } scale-info = { version = "2.1.2", default-features = false, features = ["derive"] } serde = { features = ["derive"], optional = true, version = "1.0.137" } @@ -16,22 +16,22 @@ serde = { features = ["derive"], optional = true, version = "1.0.137" } hydradx-traits = { path = "../traits", default-features = false } # ORML dependencies -orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.29", default-features = false } +orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.38", default-features = false } # Substrate dependencies -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29", default-features = false, optional = true } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29", default-features = false } -frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29", default-features = false, optional = true } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29", default-features = false } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false, optional = true } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false } +frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false, optional = true } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false } [dev-dependencies] -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false } pretty_assertions = "1.2.1" -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29" } -orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.29", default-features = false } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" } +orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.38", default-features = false } pallet-currencies = { path = "../currencies", default-features = false } hydradx-adapters = { path = "../adapters", default-features = false } test-utils = { path = "../test-utils", default-features = false } @@ -50,5 +50,6 @@ std = [ 'frame-support/std', 'frame-system/std', 'orml-tokens/std', + "hydradx-adapters/std", ] try-runtime = ["frame-support/try-runtime"] diff --git a/route-executor/src/lib.rs b/route-executor/src/lib.rs index b37450cf..1d53ab32 100644 --- a/route-executor/src/lib.rs +++ b/route-executor/src/lib.rs @@ -60,7 +60,7 @@ pub mod pallet { #[pallet::config] pub trait Config: frame_system::Config { - type Event: From> + IsType<::Event>; + type RuntimeEvent: From> + IsType<::RuntimeEvent>; /// Asset id type type AssetId: Parameter + Member + Copy + MaybeSerializeDeserialize; @@ -84,7 +84,7 @@ pub mod pallet { /// Handlers for AMM pools to calculate and execute trades type AMM: TradeExecution< - ::Origin, + ::RuntimeOrigin, Self::AccountId, Self::AssetId, Self::Balance, @@ -136,6 +136,7 @@ pub mod pallet { /// - `route`: Series of [`Trade`] to be executed. A [`Trade`] specifies the asset pair (`asset_in`, `asset_out`) and the AMM (`pool`) in which the trade is executed. /// /// Emits `RouteExecuted` when successful. + #[pallet::call_index(0)] #[pallet::weight(::WeightInfo::sell(route.len() as u32))] #[transactional] pub fn sell( @@ -214,6 +215,7 @@ pub mod pallet { /// - `route`: Series of [`Trade`] to be executed. A [`Trade`] specifies the asset pair (`asset_in`, `asset_out`) and the AMM (`pool`) in which the trade is executed. /// /// Emits `RouteExecuted` when successful. + #[pallet::call_index(1)] #[pallet::weight(::WeightInfo::buy(route.len() as u32))] #[transactional] pub fn buy( diff --git a/route-executor/src/tests/buy.rs b/route-executor/src/tests/buy.rs index e23b36da..bf0dcd23 100644 --- a/route-executor/src/tests/buy.rs +++ b/route-executor/src/tests/buy.rs @@ -34,7 +34,7 @@ fn buy_should_work_when_route_has_single_trade() { //Act assert_ok!(Router::buy( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), BSX, AUSD, amount_to_buy, @@ -72,7 +72,7 @@ fn buy_should_work_when_route_has_single_trade_without_native_balance() { //Act assert_ok!(Router::buy( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), AUSD, KSM, amount_to_buy, @@ -116,7 +116,7 @@ fn buy_should_fail_when_max_limit_for_trade_reached() { //Act and Assert assert_noop!( - Router::buy(Origin::signed(ALICE), BSX, RMRK, 10, 5, trades), + Router::buy(RuntimeOrigin::signed(ALICE), BSX, RMRK, 10, 5, trades), Error::::MaxTradesExceeded ); }); @@ -136,7 +136,7 @@ fn buy_should_fail_when_route_has_single_trade_producing_calculation_error() { //Act and Assert assert_noop!( Router::buy( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), BSX, AUSD, INVALID_CALCULATION_AMOUNT, @@ -176,7 +176,7 @@ fn buy_should_when_route_has_multiple_trades_with_same_pool_type() { //Act assert_ok!(Router::buy( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), BSX, KSM, amount_to_buy, @@ -229,7 +229,7 @@ fn buy_should_work_when_route_has_multiple_trades_with_different_pool_type() { //Act assert_ok!(Router::buy( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), BSX, KSM, amount_to_buy, @@ -277,7 +277,7 @@ fn buy_should_work_when_first_trade_is_not_supported_in_the_first_pool() { //Act assert_ok!(Router::buy( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), BSX, KSM, amount_to_buy, @@ -307,7 +307,7 @@ fn buy_should_fail_when_called_with_non_signed_origin() { //Act and Assert assert_noop!( - Router::buy(Origin::none(), BSX, AUSD, amount_to_buy, limit, trades), + Router::buy(RuntimeOrigin::none(), BSX, AUSD, amount_to_buy, limit, trades), BadOrigin ); }); @@ -324,7 +324,7 @@ fn buy_should_fail_when_route_has_no_trades() { //Act and Assert assert_noop!( - Router::buy(Origin::signed(ALICE), BSX, AUSD, 10, 5, trades), + Router::buy(RuntimeOrigin::signed(ALICE), BSX, AUSD, 10, 5, trades), Error::::RouteHasNoTrades ); }); @@ -344,7 +344,7 @@ fn buy_should_fail_when_max_limit_to_spend_is_reached() { //Act and Assert assert_noop!( - Router::buy(Origin::signed(ALICE), BSX, AUSD, amount_to_buy, limit, trades), + Router::buy(RuntimeOrigin::signed(ALICE), BSX, AUSD, amount_to_buy, limit, trades), Error::::TradingLimitReached ); }); diff --git a/route-executor/src/tests/mock.rs b/route-executor/src/tests/mock.rs index df7dc346..544610ae 100644 --- a/route-executor/src/tests/mock.rs +++ b/route-executor/src/tests/mock.rs @@ -65,8 +65,8 @@ impl system::Config for Test { type BaseCallFilter = Everything; type BlockWeights = (); type BlockLength = (); - type Origin = Origin; - type Call = Call; + type RuntimeOrigin = RuntimeOrigin; + type RuntimeCall = RuntimeCall; type Index = u64; type BlockNumber = u64; type Hash = H256; @@ -74,7 +74,7 @@ impl system::Config for Test { type AccountId = u64; type Lookup = IdentityLookup; type Header = Header; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type DbWeight = (); type Version = (); @@ -97,19 +97,17 @@ parameter_type_with_key! { } impl orml_tokens::Config for Test { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Balance = Balance; type Amount = Amount; type CurrencyId = AssetId; type WeightInfo = (); type ExistentialDeposits = ExistentialDeposits; - type OnDust = (); type MaxLocks = (); type DustRemovalWhitelist = Nothing; - type OnNewTokenAccount = (); - type OnKilledTokenAccount = (); type ReserveIdentifier = (); type MaxReserves = (); + type CurrencyHooks = (); } parameter_types! { @@ -120,7 +118,7 @@ parameter_types! { impl pallet_balances::Config for Test { type MaxLocks = (); type Balance = Balance; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type DustRemoval = (); type ExistentialDeposit = ExistentialDeposit; type AccountStore = frame_system::Pallet; @@ -130,7 +128,7 @@ impl pallet_balances::Config for Test { } impl pallet_currencies::Config for Test { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type MultiCurrency = Tokens; type NativeCurrency = BasicCurrencyAdapter; type GetNativeCurrencyId = NativeCurrencyId; @@ -145,7 +143,7 @@ parameter_types! { } impl Config for Test { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type AssetId = AssetId; type Balance = Balance; type MaxNumberOfTrades = MaxNumberOfTrades; @@ -304,10 +302,20 @@ macro_rules! impl_fake_executor { let amount_out = $sell_calculation_result; - Currencies::transfer(Origin::signed(ASSET_PAIR_ACCOUNT), ALICE, asset_out, amount_out) - .map_err(|e| ExecutorError::Error(e))?; - Currencies::transfer(Origin::signed(ALICE), ASSET_PAIR_ACCOUNT, asset_in, amount_in) - .map_err(|e| ExecutorError::Error(e))?; + Currencies::transfer( + RuntimeOrigin::signed(ASSET_PAIR_ACCOUNT), + ALICE, + asset_out, + amount_out, + ) + .map_err(|e| ExecutorError::Error(e))?; + Currencies::transfer( + RuntimeOrigin::signed(ALICE), + ASSET_PAIR_ACCOUNT, + asset_in, + amount_in, + ) + .map_err(|e| ExecutorError::Error(e))?; Ok(()) } @@ -330,10 +338,20 @@ macro_rules! impl_fake_executor { let amount_in = $buy_calculation_result; - Currencies::transfer(Origin::signed(ASSET_PAIR_ACCOUNT), ALICE, asset_out, amount_out) - .map_err(|e| ExecutorError::Error(e))?; - Currencies::transfer(Origin::signed(ALICE), ASSET_PAIR_ACCOUNT, asset_in, amount_in) - .map_err(|e| ExecutorError::Error(e))?; + Currencies::transfer( + RuntimeOrigin::signed(ASSET_PAIR_ACCOUNT), + ALICE, + asset_out, + amount_out, + ) + .map_err(|e| ExecutorError::Error(e))?; + Currencies::transfer( + RuntimeOrigin::signed(ALICE), + ASSET_PAIR_ACCOUNT, + asset_in, + amount_in, + ) + .map_err(|e| ExecutorError::Error(e))?; Ok(()) } @@ -379,6 +397,6 @@ pub fn assert_executed_buy_trades(expected_trades: Vec<(PoolType, Balan }); } -pub fn expect_events(e: Vec) { - test_utils::expect_events::(e); +pub fn expect_events(e: Vec) { + test_utils::expect_events::(e); } diff --git a/route-executor/src/tests/sell.rs b/route-executor/src/tests/sell.rs index 464dbee9..aae6ff80 100644 --- a/route-executor/src/tests/sell.rs +++ b/route-executor/src/tests/sell.rs @@ -34,7 +34,7 @@ fn sell_should_work_when_route_has_single_trade() { //Act assert_ok!(Router::sell( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), BSX, AUSD, amount_to_sell, @@ -72,7 +72,7 @@ fn sell_should_work_when_route_has_single_trade_without_native_balance() { //Act assert_ok!(Router::sell( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), KSM, AUSD, amount_to_sell, @@ -99,7 +99,7 @@ fn sell_should_fail_when_route_has_single_trade_producing_calculation_error() { //Act and Assert assert_noop!( Router::sell( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), BSX, AUSD, INVALID_CALCULATION_AMOUNT, @@ -136,7 +136,7 @@ fn sell_should_work_when_route_has_multiple_trades_with_same_pooltype() { //Act assert_ok!(Router::sell( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), BSX, KSM, amount_to_sell, @@ -185,7 +185,7 @@ fn sell_should_work_when_route_has_multiple_trades_with_different_pool_type() { //Act assert_ok!(Router::sell( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), BSX, KSM, amount_to_sell, @@ -230,7 +230,7 @@ fn sell_should_work_when_first_trade_is_not_supported_in_the_first_pool() { //Act assert_ok!(Router::sell( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), BSX, KSM, amount_to_sell, @@ -276,7 +276,7 @@ fn sell_should_fail_when_max_limit_for_trade_reached() { //Act and Assert assert_noop!( - Router::sell(Origin::signed(ALICE), BSX, SDN, 10, 5, trades), + Router::sell(RuntimeOrigin::signed(ALICE), BSX, SDN, 10, 5, trades), Error::::MaxTradesExceeded ); }); @@ -292,7 +292,7 @@ fn sell_should_fail_when_called_with_non_signed_origin() { //Act and Assert assert_noop!( - Router::sell(Origin::none(), BSX, AUSD, amount_to_sell, limit, trades), + Router::sell(RuntimeOrigin::none(), BSX, AUSD, amount_to_sell, limit, trades), BadOrigin ); }); @@ -306,7 +306,7 @@ fn sell_should_fail_when_route_has_no_trades() { //Act and Assert assert_noop!( - Router::sell(Origin::signed(ALICE), BSX, AUSD, 10, 5, trades), + Router::sell(RuntimeOrigin::signed(ALICE), BSX, AUSD, 10, 5, trades), Error::::RouteHasNoTrades ); }); @@ -322,7 +322,7 @@ fn sell_should_fail_when_caller_has_not_enough_balance() { ExtBuilder::default().build().execute_with(|| { //Act and Assert assert_noop!( - Router::sell(Origin::signed(ALICE), BSX, AUSD, amount_to_sell, limit, trades), + Router::sell(RuntimeOrigin::signed(ALICE), BSX, AUSD, amount_to_sell, limit, trades), Error::::InsufficientBalance ); }); @@ -339,7 +339,7 @@ fn sell_should_fail_when_min_limit_to_receive_is_not_reached() { //Act and Assert assert_noop!( - Router::sell(Origin::signed(ALICE), BSX, AUSD, amount_to_sell, limit, trades), + Router::sell(RuntimeOrigin::signed(ALICE), BSX, AUSD, amount_to_sell, limit, trades), Error::::TradingLimitReached ); }); diff --git a/stableswap/Cargo.toml b/stableswap/Cargo.toml index 3c41a949..f20b13ea 100644 --- a/stableswap/Cargo.toml +++ b/stableswap/Cargo.toml @@ -1,6 +1,6 @@ [package] name = 'pallet-stableswap' -version = '1.1.0' +version = '1.1.1' description = 'AMM for correlated assets' authors = ['GalacticCouncil'] edition = '2021' @@ -16,34 +16,34 @@ bitflags = "1.3.2" # parity scale-info = { version = "2.1.2", default-features = false, features = ["derive"] } -codec = { default-features = false, features = ["derive"], package = "parity-scale-codec", version = "3.1.5" } +codec = { default-features = false, features = ["derive"], package = "parity-scale-codec", version = "3.4.0" } # primitives -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29", default-features = false} -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false} +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false } # FRAME -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false } # Math -hydra-dx-math = { git = "https://github.com/galacticcouncil/HydraDX-math", rev = "84632c3c7b71e16d53240e4bdc2adc693c941916", default-features = false } +hydra-dx-math = { git = "https://github.com/galacticcouncil/HydraDX-math", rev = "35e5c0775a07e057ed5247ba96dfa254d691f034", default-features = false } # HydraDX dependencies hydradx-traits = { path = "../traits", default-features = false } # ORML dependencies -orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.29", default-features = false } +orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.38", default-features = false } # Optional imports for benchmarking -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29", default-features = false, optional = true} +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false, optional = true} [dev-dependencies] -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29" } -sp-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29", default-features = false} -orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.29", default-features = false, features=["std"]} +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" } +sp-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false} +orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.38", default-features = false, features=["std"]} proptest = "1.0.0" [features] diff --git a/stableswap/src/benchmarks.rs b/stableswap/src/benchmarks.rs index 1f7dfc49..17ecf3e2 100644 --- a/stableswap/src/benchmarks.rs +++ b/stableswap/src/benchmarks.rs @@ -60,7 +60,7 @@ benchmarks! { let caller: T::AccountId = account("caller", 0, 1); let successful_origin = T::AuthorityOrigin::try_successful_origin().unwrap(); - }: _(successful_origin, pool_id, asset_ids, amplification, trade_fee, withdraw_fee) + }: _(successful_origin, pool_id, asset_ids, amplification, trade_fee, withdraw_fee) verify { assert!(>::get(pool_id).is_some()); } @@ -345,7 +345,7 @@ benchmarks! { )?; let asset_tradability_old = crate::Pallet::::asset_tradability(pool_id, asset_to_change,); - }: _(successful_origin, pool_id, asset_to_change, Tradability::FROZEN) + }: _(successful_origin, pool_id, asset_to_change, Tradability::FROZEN) verify { let asset_tradability_new = crate::Pallet::::asset_tradability(pool_id, asset_to_change,); assert_ne!(asset_tradability_old, asset_tradability_new); @@ -390,7 +390,7 @@ benchmarks! { let amplification_new = Some(200_u16); let trade_fee_new = Some(Permill::from_percent(50)); let withdraw_fee_new = Some(Permill::from_percent(40)); - }: _(successful_origin, pool_id, amplification_new, trade_fee_new, withdraw_fee_new) + }: _(successful_origin, pool_id, amplification_new, trade_fee_new, withdraw_fee_new) verify { let pool = crate::Pallet::::pools(pool_id).unwrap(); assert_eq!(pool.amplification, amplification_new.unwrap()); diff --git a/stableswap/src/lib.rs b/stableswap/src/lib.rs index 294207f6..d8996469 100644 --- a/stableswap/src/lib.rs +++ b/stableswap/src/lib.rs @@ -95,7 +95,7 @@ pub mod pallet { #[pallet::config] pub trait Config: frame_system::Config { /// The overarching event type. - type Event: From> + IsType<::Event>; + type RuntimeEvent: From> + IsType<::RuntimeEvent>; /// Identifier for the class of asset. type AssetId: Member @@ -118,7 +118,7 @@ pub mod pallet { type AssetRegistry: Registry, Balance, DispatchError>; /// The origin which can create a new pool - type AuthorityOrigin: EnsureOrigin; + type AuthorityOrigin: EnsureOrigin; /// Minimum pool liquidity #[pallet::constant] @@ -300,6 +300,7 @@ pub mod pallet { /// - `withdraw_fee`: fee to be applied when removing liquidity /// /// Emits `PoolCreated` event if successful. + #[pallet::call_index(0)] #[pallet::weight(::WeightInfo::create_pool())] #[transactional] pub fn create_pool( @@ -341,6 +342,7 @@ pub mod pallet { /// - `withdraw_fee`: new withdraw fee or None /// /// Emits `PoolUpdated` event if successful. + #[pallet::call_index(1)] #[pallet::weight(::WeightInfo::update_pool())] #[transactional] pub fn update_pool( @@ -393,6 +395,7 @@ pub mod pallet { /// - `assets`: asset id and liquidity amount provided /// /// Emits `LiquidityAdded` event when successful. + #[pallet::call_index(2)] #[pallet::weight(::WeightInfo::add_liquidity())] #[transactional] pub fn add_liquidity( @@ -429,6 +432,7 @@ pub mod pallet { /// - 'share_amount': amount of shares to withdraw /// /// Emits `LiquidityRemoved` event when successful. + #[pallet::call_index(3)] #[pallet::weight(::WeightInfo::remove_liquidity_one_asset())] #[transactional] pub fn remove_liquidity_one_asset( @@ -505,6 +509,7 @@ pub mod pallet { /// /// Emits `SellExecuted` event when successful. /// + #[pallet::call_index(4)] #[pallet::weight(::WeightInfo::sell())] #[transactional] pub fn sell( @@ -568,6 +573,7 @@ pub mod pallet { /// /// Emits `BuyExecuted` event when successful. /// + #[pallet::call_index(5)] #[pallet::weight(::WeightInfo::buy())] #[transactional] pub fn buy( @@ -619,6 +625,7 @@ pub mod pallet { Ok(()) } + #[pallet::call_index(6)] #[pallet::weight(::WeightInfo::set_asset_tradable_state())] #[transactional] pub fn set_asset_tradable_state( diff --git a/stableswap/src/tests/add_liquidity.rs b/stableswap/src/tests/add_liquidity.rs index 5c6c22d2..4757ce66 100644 --- a/stableswap/src/tests/add_liquidity.rs +++ b/stableswap/src/tests/add_liquidity.rs @@ -25,7 +25,7 @@ fn add_initial_liquidity_should_work_when_called_first_time() { let amplification: u16 = 100; assert_ok!(Stableswap::create_pool( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), pool_id, vec![asset_a, asset_b], amplification, @@ -38,7 +38,7 @@ fn add_initial_liquidity_should_work_when_called_first_time() { let pool_account = AccountIdConstructor::from_assets(&vec![asset_a, asset_b], None); assert_ok!(Stableswap::add_liquidity( - Origin::signed(BOB), + RuntimeOrigin::signed(BOB), pool_id, vec![ AssetLiquidity { @@ -80,7 +80,7 @@ fn add_initial_liquidity_should_fail_when_lp_has_insufficient_balance() { let amplification: u16 = 100; assert_ok!(Stableswap::create_pool( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), pool_id, vec![asset_a, asset_b], amplification, @@ -94,7 +94,7 @@ fn add_initial_liquidity_should_fail_when_lp_has_insufficient_balance() { assert_noop!( Stableswap::add_liquidity( - Origin::signed(BOB), + RuntimeOrigin::signed(BOB), pool_id, vec![ AssetLiquidity { @@ -162,7 +162,7 @@ fn add_liquidity_should_work_when_initial_liquidity_has_been_provided() { let pool_account = AccountIdConstructor::from_assets(&vec![asset_a, asset_b], None); assert_ok!(Stableswap::add_liquidity( - Origin::signed(BOB), + RuntimeOrigin::signed(BOB), pool_id, vec![ AssetLiquidity { @@ -229,7 +229,7 @@ fn add_liquidity_should_work_when_order_is_not_sorted() { let pool_account = AccountIdConstructor::from_assets(&vec![asset_a, asset_b], None); assert_ok!(Stableswap::add_liquidity( - Origin::signed(BOB), + RuntimeOrigin::signed(BOB), pool_id, vec![ AssetLiquidity { @@ -294,7 +294,7 @@ fn add_liquidity_should_fail_when_providing_insufficient_liquidity() { assert_noop!( Stableswap::add_liquidity( - Origin::signed(BOB), + RuntimeOrigin::signed(BOB), pool_id, vec![ AssetLiquidity { @@ -367,7 +367,7 @@ fn add_liquidity_should_work_when_providing_one_asset_only() { let amount_added = 200 * ONE; assert_ok!(Stableswap::add_liquidity( - Origin::signed(BOB), + RuntimeOrigin::signed(BOB), pool_id, vec![AssetLiquidity { asset_id: asset_a, @@ -436,7 +436,7 @@ fn add_liquidity_should_fail_when_providing_one_asset_not_in_pool() { assert_noop!( Stableswap::add_liquidity( - Origin::signed(BOB), + RuntimeOrigin::signed(BOB), pool_id, vec![ AssetLiquidity { diff --git a/stableswap/src/tests/creation.rs b/stableswap/src/tests/creation.rs index a3545da0..8dccafd3 100644 --- a/stableswap/src/tests/creation.rs +++ b/stableswap/src/tests/creation.rs @@ -19,7 +19,7 @@ fn create_two_asset_pool_should_work_when_assets_are_registered() { .build() .execute_with(|| { assert_ok!(Stableswap::create_pool( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), pool_id, vec![asset_a, asset_b], 100u16, @@ -57,7 +57,7 @@ fn create_multi_asset_pool_should_work_when_assets_are_registered() { .build() .execute_with(|| { assert_ok!(Stableswap::create_pool( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), pool_id, vec![asset_a, asset_b, asset_c, asset_d], 100u16, @@ -88,7 +88,7 @@ fn create_pool_should_store_assets_correctly_when_input_is_not_sorted() { let amplification: u16 = 100; assert_ok!(Stableswap::create_pool( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), pool_id, vec![asset_c, asset_d, asset_b, asset_a], amplification, @@ -120,7 +120,7 @@ fn create_pool_should_fail_when_same_assets_is_specified() { assert_noop!( Stableswap::create_pool( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), pool_id, vec![asset_a, 3, 4, asset_a], amplification, @@ -141,7 +141,7 @@ fn create_pool_should_fail_when_share_asset_is_not_registered() { assert_noop!( Stableswap::create_pool( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), pool_id, vec![asset_a, 3, 4], amplification, @@ -165,7 +165,7 @@ fn create_pool_should_fail_when_share_asset_is_among_assets() { assert_noop!( Stableswap::create_pool( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), pool_id, vec![asset_a, pool_id], amplification, @@ -191,7 +191,7 @@ fn create_pool_should_fail_when_asset_is_not_registered() { assert_noop!( Stableswap::create_pool( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), pool_id, vec![not_registered, registered], amplification, @@ -203,7 +203,7 @@ fn create_pool_should_fail_when_asset_is_not_registered() { assert_noop!( Stableswap::create_pool( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), pool_id, vec![registered, not_registered], amplification, @@ -230,7 +230,7 @@ fn create_pool_should_when_same_pool_already_exists() { let amplification: u16 = 100; assert_ok!(Stableswap::create_pool( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), pool_id, vec![asset_a, asset_b], amplification, @@ -240,7 +240,7 @@ fn create_pool_should_when_same_pool_already_exists() { assert_noop!( Stableswap::create_pool( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), pool_id, vec![asset_a, asset_b], amplification, @@ -269,7 +269,7 @@ fn create_pool_should_fail_when_amplification_is_incorrect() { assert_noop!( Stableswap::create_pool( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), pool_id, vec![asset_a, asset_b], amplification_min, @@ -281,7 +281,7 @@ fn create_pool_should_fail_when_amplification_is_incorrect() { assert_noop!( Stableswap::create_pool( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), pool_id, vec![asset_a, asset_b], amplification_max, diff --git a/stableswap/src/tests/invariants.rs b/stableswap/src/tests/invariants.rs index ad68351e..f4502cfd 100644 --- a/stableswap/src/tests/invariants.rs +++ b/stableswap/src/tests/invariants.rs @@ -89,7 +89,7 @@ proptest! { let asset_b_reserve = Tokens::free_balance(asset_b, &pool_account); assert_ok!(Stableswap::add_liquidity( - Origin::signed(BOB), + RuntimeOrigin::signed(BOB), pool_id, vec![AssetLiquidity{ asset_id: asset_a, @@ -165,7 +165,7 @@ proptest! { let d_prev = calculate_d::<128u8>(&[asset_a_reserve,asset_b_reserve], amplification.into()).unwrap(); assert_ok!(Stableswap::sell( - Origin::signed(BOB), + RuntimeOrigin::signed(BOB), pool_id, asset_a, asset_b, @@ -234,7 +234,7 @@ proptest! { let d_prev = calculate_d::<128u8>(&[asset_a_reserve,asset_b_reserve], amplification.into()).unwrap(); assert_ok!(Stableswap::buy( - Origin::signed(BOB), + RuntimeOrigin::signed(BOB), pool_id, asset_b, asset_a, diff --git a/stableswap/src/tests/mock.rs b/stableswap/src/tests/mock.rs index d0105379..dd2c8ff0 100644 --- a/stableswap/src/tests/mock.rs +++ b/stableswap/src/tests/mock.rs @@ -87,8 +87,8 @@ impl frame_system::Config for Test { type BaseCallFilter = frame_support::traits::Everything; type BlockWeights = (); type BlockLength = (); - type Origin = Origin; - type Call = Call; + type RuntimeOrigin = RuntimeOrigin; + type RuntimeCall = RuntimeCall; type Index = u64; type BlockNumber = u64; type Hash = H256; @@ -96,7 +96,7 @@ impl frame_system::Config for Test { type AccountId = AccountId; type Lookup = IdentityLookup; type Header = Header; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type BlockHashCount = ConstU64<250>; type DbWeight = (); type Version = (); @@ -117,15 +117,13 @@ parameter_type_with_key! { } impl orml_tokens::Config for Test { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Balance = Balance; type Amount = i128; type CurrencyId = AssetId; type WeightInfo = (); type ExistentialDeposits = ExistentialDeposits; - type OnDust = (); - type OnNewTokenAccount = (); - type OnKilledTokenAccount = (); + type CurrencyHooks = (); type MaxLocks = (); type MaxReserves = (); type ReserveIdentifier = (); @@ -141,7 +139,7 @@ parameter_types! { } impl Config for Test { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type AssetId = AssetId; type Currency = Tokens; type ShareAccountId = AccountIdConstructor; @@ -240,7 +238,7 @@ impl ExtBuilder { }); assert_ok!(Stableswap::create_pool( - Origin::signed(who), + RuntimeOrigin::signed(who), pool_id, pool.assets.clone().into(), pool.amplification, @@ -253,7 +251,7 @@ impl ExtBuilder { if initial_liquid.assets.len() as u128 > Balance::zero() { assert_ok!(Stableswap::add_liquidity( - Origin::signed(initial_liquid.account), + RuntimeOrigin::signed(initial_liquid.account), pool_id, initial_liquid.assets )); diff --git a/stableswap/src/tests/remove_liquidity.rs b/stableswap/src/tests/remove_liquidity.rs index 46e0de44..42078174 100644 --- a/stableswap/src/tests/remove_liquidity.rs +++ b/stableswap/src/tests/remove_liquidity.rs @@ -56,7 +56,7 @@ fn remove_liquidity_should_work_when_withdrawing_all_shares() { let pool_account = AccountIdConstructor::from_assets(&vec![asset_a, asset_b], None); assert_ok!(Stableswap::add_liquidity( - Origin::signed(BOB), + RuntimeOrigin::signed(BOB), pool_id, vec![AssetLiquidity { asset_id: asset_a, @@ -67,7 +67,7 @@ fn remove_liquidity_should_work_when_withdrawing_all_shares() { let shares = Tokens::free_balance(pool_id, &BOB); assert_ok!(Stableswap::remove_liquidity_one_asset( - Origin::signed(BOB), + RuntimeOrigin::signed(BOB), pool_id, asset_c, shares, @@ -133,7 +133,7 @@ fn remove_liquidity_should_apply_fee_when_withdrawing_all_shares() { let pool_account = AccountIdConstructor::from_assets(&vec![asset_a, asset_b], None); assert_ok!(Stableswap::add_liquidity( - Origin::signed(BOB), + RuntimeOrigin::signed(BOB), pool_id, vec![AssetLiquidity { asset_id: asset_a, @@ -144,7 +144,7 @@ fn remove_liquidity_should_apply_fee_when_withdrawing_all_shares() { let shares = Tokens::free_balance(pool_id, &BOB); assert_ok!(Stableswap::remove_liquidity_one_asset( - Origin::signed(BOB), + RuntimeOrigin::signed(BOB), pool_id, asset_c, shares, @@ -163,7 +163,7 @@ fn remove_liquidity_should_apply_fee_when_withdrawing_all_shares() { fn remove_liquidity_should_fail_when_shares_is_zero() { ExtBuilder::default().build().execute_with(|| { assert_noop!( - Stableswap::remove_liquidity_one_asset(Origin::signed(ALICE), 0u32, 1u32, 0u128), + Stableswap::remove_liquidity_one_asset(RuntimeOrigin::signed(ALICE), 0u32, 1u32, 0u128), Error::::InvalidAssetAmount ); }); @@ -177,7 +177,7 @@ fn remove_liquidity_should_fail_when_shares_is_insufficient() { .build() .execute_with(|| { assert_noop!( - Stableswap::remove_liquidity_one_asset(Origin::signed(BOB), pool_id, 1u32, 200 * ONE), + Stableswap::remove_liquidity_one_asset(RuntimeOrigin::signed(BOB), pool_id, 1u32, 200 * ONE), Error::::InsufficientShares ); }); @@ -192,7 +192,7 @@ fn remove_liquidity_should_fail_when_remaining_shares_is_below_min_limit() { .execute_with(|| { assert_noop!( Stableswap::remove_liquidity_one_asset( - Origin::signed(BOB), + RuntimeOrigin::signed(BOB), pool_id, 1u32, 100 * ONE - MinimumLiquidity::get() + 1 @@ -210,7 +210,7 @@ fn remove_liquidity_should_fail_when_pool_does_not_exists() { .build() .execute_with(|| { assert_noop!( - Stableswap::remove_liquidity_one_asset(Origin::signed(BOB), pool_id, 1u32, 100 * ONE), + Stableswap::remove_liquidity_one_asset(RuntimeOrigin::signed(BOB), pool_id, 1u32, 100 * ONE), Error::::PoolNotFound ); }); @@ -266,7 +266,7 @@ fn remove_liquidity_should_fail_when_requested_asset_not_in_pool() { let amount_added = 200 * ONE; assert_ok!(Stableswap::add_liquidity( - Origin::signed(BOB), + RuntimeOrigin::signed(BOB), pool_id, vec![AssetLiquidity { asset_id: asset_a, @@ -277,7 +277,7 @@ fn remove_liquidity_should_fail_when_requested_asset_not_in_pool() { let shares = Tokens::free_balance(pool_id, &BOB); assert_noop!( - Stableswap::remove_liquidity_one_asset(Origin::signed(BOB), pool_id, asset_d, shares,), + Stableswap::remove_liquidity_one_asset(RuntimeOrigin::signed(BOB), pool_id, asset_d, shares,), Error::::AssetNotInPool ); }); @@ -332,7 +332,7 @@ fn remove_liquidity_should_fail_when_remaining_shares_below_min_liquidity() { let amount_added = 200 * ONE; assert_ok!(Stableswap::add_liquidity( - Origin::signed(BOB), + RuntimeOrigin::signed(BOB), pool_id, vec![AssetLiquidity { asset_id: asset_a, @@ -344,7 +344,7 @@ fn remove_liquidity_should_fail_when_remaining_shares_below_min_liquidity() { assert_noop!( Stableswap::remove_liquidity_one_asset( - Origin::signed(BOB), + RuntimeOrigin::signed(BOB), pool_id, asset_c, shares - MinimumLiquidity::get() + 1, @@ -412,7 +412,7 @@ fn verify_remove_liquidity_against_research_impl() { let pool_account = AccountIdConstructor::from_assets(&vec![asset_a, asset_b, asset_c, asset_d], None); assert_ok!(Stableswap::add_liquidity( - Origin::signed(BOB), + RuntimeOrigin::signed(BOB), pool_id, vec![AssetLiquidity { asset_id: asset_a, @@ -423,7 +423,7 @@ fn verify_remove_liquidity_against_research_impl() { let shares = Tokens::free_balance(pool_id, &BOB); assert_ok!(Stableswap::remove_liquidity_one_asset( - Origin::signed(BOB), + RuntimeOrigin::signed(BOB), pool_id, asset_b, shares, diff --git a/stableswap/src/tests/trades.rs b/stableswap/src/tests/trades.rs index 27d0e735..2b53aa2c 100644 --- a/stableswap/src/tests/trades.rs +++ b/stableswap/src/tests/trades.rs @@ -41,7 +41,7 @@ fn sell_should_work_when_correct_input_provided() { let pool_id = get_pool_id_at(0); assert_ok!(Stableswap::sell( - Origin::signed(BOB), + RuntimeOrigin::signed(BOB), pool_id, asset_a, asset_b, @@ -95,7 +95,7 @@ fn buy_should_work_when_correct_input_provided() { let pool_id = get_pool_id_at(0); assert_ok!(Stableswap::buy( - Origin::signed(BOB), + RuntimeOrigin::signed(BOB), pool_id, asset_b, asset_a, @@ -150,7 +150,7 @@ fn sell_with_fee_should_work_when_correct_input_provided() { let pool_id = get_pool_id_at(0); assert_ok!(Stableswap::sell( - Origin::signed(BOB), + RuntimeOrigin::signed(BOB), pool_id, asset_a, asset_b, @@ -208,7 +208,7 @@ fn sell_should_work_when_fee_is_small() { let pool_id = get_pool_id_at(0); assert_ok!(Stableswap::sell( - Origin::signed(BOB), + RuntimeOrigin::signed(BOB), pool_id, asset_a, asset_b, @@ -266,7 +266,7 @@ fn buy_should_work_when_fee_is_set() { let pool_id = get_pool_id_at(0); assert_ok!(Stableswap::buy( - Origin::signed(BOB), + RuntimeOrigin::signed(BOB), pool_id, asset_b, asset_a, @@ -329,30 +329,51 @@ fn sell_should_fail_when_insufficient_amount_is_provided() { let pool_id = get_pool_id_at(0); assert_noop!( - Stableswap::sell(Origin::signed(BOB), pool_id, asset_a, asset_b, 30, 25 * ONE,), + Stableswap::sell(RuntimeOrigin::signed(BOB), pool_id, asset_a, asset_b, 30, 25 * ONE,), Error::::InsufficientTradingAmount ); assert_noop!( - Stableswap::sell(Origin::signed(BOB), pool_id, asset_a, asset_b, 30000 * ONE, 25 * ONE,), + Stableswap::sell( + RuntimeOrigin::signed(BOB), + pool_id, + asset_a, + asset_b, + 30000 * ONE, + 25 * ONE, + ), Error::::InsufficientBalance ); assert_noop!( - Stableswap::sell(Origin::signed(BOB), pool_id + 1, asset_a, asset_b, 30 * ONE, 25 * ONE,), + Stableswap::sell( + RuntimeOrigin::signed(BOB), + pool_id + 1, + asset_a, + asset_b, + 30 * ONE, + 25 * ONE, + ), Error::::PoolNotFound ); assert_noop!( - Stableswap::sell(Origin::signed(BOB), pool_id, 3000, asset_b, 30 * ONE, 25 * ONE,), + Stableswap::sell(RuntimeOrigin::signed(BOB), pool_id, 3000, asset_b, 30 * ONE, 25 * ONE,), Error::::AssetNotInPool ); assert_noop!( - Stableswap::sell(Origin::signed(BOB), pool_id, asset_a, 3000, 30 * ONE, 25 * ONE,), + Stableswap::sell(RuntimeOrigin::signed(BOB), pool_id, asset_a, 3000, 30 * ONE, 25 * ONE,), Error::::AssetNotInPool ); assert_noop!( - Stableswap::sell(Origin::signed(BOB), pool_id, asset_a, asset_b, 30 * ONE, 250 * ONE,), + Stableswap::sell( + RuntimeOrigin::signed(BOB), + pool_id, + asset_a, + asset_b, + 30 * ONE, + 250 * ONE, + ), Error::::BuyLimitNotReached ); }); @@ -398,36 +419,64 @@ fn buy_should_fail_when_insufficient_amount_is_provided() { let pool_id = get_pool_id_at(0); assert_noop!( - Stableswap::buy(Origin::signed(BOB), pool_id, asset_a, asset_b, 30, 25 * ONE,), + Stableswap::buy(RuntimeOrigin::signed(BOB), pool_id, asset_a, asset_b, 30, 25 * ONE,), Error::::InsufficientTradingAmount ); assert_noop!( - Stableswap::buy(Origin::signed(BOB), pool_id, asset_a, asset_b, 30000 * ONE, 25 * ONE,), + Stableswap::buy( + RuntimeOrigin::signed(BOB), + pool_id, + asset_a, + asset_b, + 30000 * ONE, + 25 * ONE, + ), Error::::InsufficientLiquidity ); assert_noop!( - Stableswap::buy(Origin::signed(BOB), pool_id, asset_a, asset_b, 90 * ONE, 30000 * ONE,), + Stableswap::buy( + RuntimeOrigin::signed(BOB), + pool_id, + asset_a, + asset_b, + 90 * ONE, + 30000 * ONE, + ), Error::::InsufficientBalance ); assert_noop!( - Stableswap::buy(Origin::signed(BOB), pool_id + 1, asset_a, asset_b, 30 * ONE, 25 * ONE,), + Stableswap::buy( + RuntimeOrigin::signed(BOB), + pool_id + 1, + asset_a, + asset_b, + 30 * ONE, + 25 * ONE, + ), Error::::PoolNotFound ); assert_noop!( - Stableswap::buy(Origin::signed(BOB), pool_id, 3000, asset_b, 30 * ONE, 25 * ONE,), + Stableswap::buy(RuntimeOrigin::signed(BOB), pool_id, 3000, asset_b, 30 * ONE, 25 * ONE,), Error::::AssetNotInPool ); assert_noop!( - Stableswap::buy(Origin::signed(BOB), pool_id, asset_a, 3000, 30 * ONE, 25 * ONE,), + Stableswap::buy(RuntimeOrigin::signed(BOB), pool_id, asset_a, 3000, 30 * ONE, 25 * ONE,), Error::::AssetNotInPool ); assert_noop!( - Stableswap::buy(Origin::signed(BOB), pool_id, asset_a, asset_b, 30 * ONE, 10 * ONE,), + Stableswap::buy( + RuntimeOrigin::signed(BOB), + pool_id, + asset_a, + asset_b, + 30 * ONE, + 10 * ONE, + ), Error::::SellLimitExceeded ); }); diff --git a/stableswap/src/tests/update_pool.rs b/stableswap/src/tests/update_pool.rs index b1b9e844..2133fc6e 100644 --- a/stableswap/src/tests/update_pool.rs +++ b/stableswap/src/tests/update_pool.rs @@ -18,7 +18,7 @@ fn update_pool_should_work_when_all_parames_are_updated() { .build() .execute_with(|| { assert_ok!(Stableswap::create_pool( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), pool_id, vec![asset_a, asset_b], 100u16, @@ -27,7 +27,7 @@ fn update_pool_should_work_when_all_parames_are_updated() { )); assert_ok!(Stableswap::update_pool( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), pool_id, Some(55u16), Some(Permill::from_percent(10)), @@ -60,7 +60,7 @@ fn update_pool_should_work_when_only_amplification_is_updated() { .build() .execute_with(|| { assert_ok!(Stableswap::create_pool( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), pool_id, vec![asset_a, asset_b], 100u16, @@ -69,7 +69,7 @@ fn update_pool_should_work_when_only_amplification_is_updated() { )); assert_ok!(Stableswap::update_pool( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), pool_id, Some(55u16), None, @@ -102,7 +102,7 @@ fn update_pool_should_work_when_only_trade_fee_is_updated() { .build() .execute_with(|| { assert_ok!(Stableswap::create_pool( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), pool_id, vec![asset_a, asset_b], 100u16, @@ -111,7 +111,7 @@ fn update_pool_should_work_when_only_trade_fee_is_updated() { )); assert_ok!(Stableswap::update_pool( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), pool_id, None, Some(Permill::from_percent(20)), @@ -144,7 +144,7 @@ fn update_pool_should_work_when_only_withdraw_fee_is_updated() { .build() .execute_with(|| { assert_ok!(Stableswap::create_pool( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), pool_id, vec![asset_a, asset_b], 100u16, @@ -153,7 +153,7 @@ fn update_pool_should_work_when_only_withdraw_fee_is_updated() { )); assert_ok!(Stableswap::update_pool( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), pool_id, None, None, @@ -186,7 +186,7 @@ fn update_pool_should_work_when_only_fees_is_updated() { .build() .execute_with(|| { assert_ok!(Stableswap::create_pool( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), pool_id, vec![asset_a, asset_b], 100u16, @@ -195,7 +195,7 @@ fn update_pool_should_work_when_only_fees_is_updated() { )); assert_ok!(Stableswap::update_pool( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), pool_id, None, Some(Permill::from_percent(11)), @@ -228,7 +228,7 @@ fn update_pool_should_fail_when_nothing_is_to_update() { .build() .execute_with(|| { assert_ok!(Stableswap::create_pool( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), pool_id, vec![asset_a, asset_b], 100u16, @@ -237,7 +237,7 @@ fn update_pool_should_fail_when_nothing_is_to_update() { )); assert_noop!( - Stableswap::update_pool(Origin::signed(ALICE), pool_id, None, None, None), + Stableswap::update_pool(RuntimeOrigin::signed(ALICE), pool_id, None, None, None), Error::::NothingToUpdate ); @@ -267,7 +267,7 @@ fn update_pool_should_fail_when_pool_does_not_exists() { let pool_id = retrieve_current_asset_id(); assert_noop!( - Stableswap::update_pool(Origin::signed(ALICE), pool_id, Some(100u16), None, None), + Stableswap::update_pool(RuntimeOrigin::signed(ALICE), pool_id, Some(100u16), None, None), Error::::PoolNotFound ); }); @@ -287,7 +287,7 @@ fn update_pool_should_fail_when_amplification_is_outside_allowed_range() { .build() .execute_with(|| { assert_ok!(Stableswap::create_pool( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), pool_id, vec![asset_a, asset_b], 100u16, @@ -296,7 +296,7 @@ fn update_pool_should_fail_when_amplification_is_outside_allowed_range() { )); assert_noop!( - Stableswap::update_pool(Origin::signed(ALICE), pool_id, Some(20_000u16), None, None), + Stableswap::update_pool(RuntimeOrigin::signed(ALICE), pool_id, Some(20_000u16), None, None), Error::::InvalidAmplification ); }); diff --git a/stableswap/src/trade_execution.rs b/stableswap/src/trade_execution.rs index 37d829b7..48586182 100644 --- a/stableswap/src/trade_execution.rs +++ b/stableswap/src/trade_execution.rs @@ -2,7 +2,7 @@ use crate::{Balance, Config, Pallet}; use hydradx_traits::router::{ExecutorError, PoolType, TradeExecution}; use sp_runtime::DispatchError; -impl TradeExecution for Pallet { +impl TradeExecution for Pallet { type Error = DispatchError; fn calculate_sell( @@ -40,7 +40,7 @@ impl TradeExecution for } fn execute_sell( - who: T::Origin, + who: T::RuntimeOrigin, pool_type: PoolType, asset_in: T::AssetId, asset_out: T::AssetId, @@ -56,7 +56,7 @@ impl TradeExecution for } fn execute_buy( - who: T::Origin, + who: T::RuntimeOrigin, pool_type: PoolType, asset_in: T::AssetId, asset_out: T::AssetId, diff --git a/test-utils/Cargo.toml b/test-utils/Cargo.toml index c814c9fb..0153c2dd 100644 --- a/test-utils/Cargo.toml +++ b/test-utils/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "test-utils" -version = "1.1.0" +version = "1.1.1" description = "Utility functions for testing pallets" authors = ["GalacticCouncil"] edition = "2021" @@ -11,7 +11,7 @@ repository = "https://github.com/galacticcouncil/warehouse" targets = ["x86_64-unknown-linux-gnu"] [dependencies] -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false } pretty_assertions = { version= "1.3.0", default-features = false, features = ["alloc"] } diff --git a/test-utils/src/lib.rs b/test-utils/src/lib.rs index 54a7091a..1b7041c8 100644 --- a/test-utils/src/lib.rs +++ b/test-utils/src/lib.rs @@ -3,7 +3,7 @@ use pretty_assertions::assert_eq; pub fn expect_events(e: Vec) where - Vec: FromIterator<::Event>, + Vec: FromIterator<::RuntimeEvent>, { let last_events: Vec = last_events::(e.len()); assert_eq!(last_events, e); @@ -12,7 +12,7 @@ where pub fn last_events(n: usize) -> Vec where TRuntime: Config, - Vec: FromIterator<::Event>, + Vec: FromIterator<::RuntimeEvent>, { frame_system::Pallet::::events() .into_iter() diff --git a/traits/Cargo.toml b/traits/Cargo.toml index c3ecfbf7..92a98b36 100644 --- a/traits/Cargo.toml +++ b/traits/Cargo.toml @@ -8,16 +8,15 @@ license = "Apache 2.0" repository = "https://github.com/galacticcouncil/warehouse/tree/master/traits" [dependencies] -codec = { default-features = false, features = ["derive"], package = "parity-scale-codec", version = "3.1.5" } +codec = { default-features = false, features = ["derive"], package = "parity-scale-codec", version = "3.4.0" } scale-info = { version = "2.1.2", default-features = false, features = ["derive"] } serde = { features = ["derive"], optional = true, version = "1.0.137" } impl-trait-for-tuples = "0.2.2" -sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29", default-features = false } +sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false } # Substrate dependencies -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false } [features] default = ["std"] diff --git a/transaction-multi-payment/Cargo.toml b/transaction-multi-payment/Cargo.toml index 232ad4a6..b0a29ac1 100644 --- a/transaction-multi-payment/Cargo.toml +++ b/transaction-multi-payment/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "pallet-transaction-multi-payment" -version = "9.0.0" +version = "9.0.1" description = "Transaction multi currency payment support module" authors = ["GalacticCoucil"] edition = "2021" @@ -11,29 +11,29 @@ repository = "https://github.com/galacticcouncil/warehouse" targets = ["x86_64-unknown-linux-gnu"] [dependencies] -codec = { default-features = false, features = ["derive"], package = "parity-scale-codec", version = "3.1.5" } +codec = { default-features = false, features = ["derive"], package = "parity-scale-codec", version = "3.4.0" } scale-info = { version = "2.1.2", default-features = false, features = ["derive"] } # ORML dependencies -orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.29", default-features = false } +orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.38", default-features = false } # HydraDX traits hydradx-traits = { path = "../traits", default-features = false } # Substrate dependencies -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29", default-features = false } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29", default-features = false } -pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false } +pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false } [dev-dependencies] pallet-currencies = { path = "../currencies", default-features = false } -orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.29", default-features = false, features=["std"]} -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29", default-features = false, features=["std"] } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29", default-features = false } +orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.38", default-features = false, features=["std"]} +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false, features=["std"] } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false } test-utils = { path = "../test-utils", default-features = false } [features] diff --git a/transaction-multi-payment/src/lib.rs b/transaction-multi-payment/src/lib.rs index d51ebc39..f8fbb265 100644 --- a/transaction-multi-payment/src/lib.rs +++ b/transaction-multi-payment/src/lib.rs @@ -29,12 +29,7 @@ mod mock; mod tests; mod traits; -use frame_support::{ - dispatch::DispatchResult, - ensure, - traits::Get, - weights::{Weight, WeightToFee}, -}; +use frame_support::{dispatch::DispatchResult, ensure, traits::Get, weights::Weight}; use frame_system::ensure_signed; use sp_runtime::{ traits::{DispatchInfoOf, One, PostDispatchInfoOf, Saturating, Zero}, @@ -68,6 +63,7 @@ pub use pallet::*; pub mod pallet { use super::*; use frame_support::pallet_prelude::*; + use frame_support::weights::WeightToFee; use frame_system::pallet_prelude::OriginFor; #[pallet::pallet] @@ -102,10 +98,10 @@ pub mod pallet { #[pallet::config] pub trait Config: frame_system::Config + pallet_transaction_payment::Config { /// Because this pallet emits events, it depends on the runtime's definition of an event. - type Event: From> + IsType<::Event>; + type RuntimeEvent: From> + IsType<::RuntimeEvent>; /// The origin which can add/remove accepted currencies - type AcceptedCurrencyOrigin: EnsureOrigin; + type AcceptedCurrencyOrigin: EnsureOrigin; /// Multi Currency type Currencies: MultiCurrency; @@ -235,6 +231,7 @@ pub mod pallet { /// When currency is set, fixed fee is withdrawn from the account to pay for the currency change /// /// Emits `CurrencySet` event when successful. + #[pallet::call_index(0)] #[pallet::weight(::WeightInfo::set_currency())] pub fn set_currency(origin: OriginFor, currency: AssetIdOf) -> DispatchResult { let who = ensure_signed(origin)?; @@ -261,6 +258,7 @@ pub mod pallet { /// Currency must not be already accepted. Core asset id cannot be explicitly added. /// /// Emits `CurrencyAdded` event when successful. + #[pallet::call_index(1)] #[pallet::weight(::WeightInfo::add_currency())] pub fn add_currency(origin: OriginFor, currency: AssetIdOf, price: Price) -> DispatchResult { T::AcceptedCurrencyOrigin::ensure_origin(origin)?; @@ -284,6 +282,7 @@ pub mod pallet { /// Core asset cannot be removed. /// /// Emits `CurrencyRemoved` when successful. + #[pallet::call_index(2)] #[pallet::weight(::WeightInfo::remove_currency())] pub fn remove_currency(origin: OriginFor, currency: AssetIdOf) -> DispatchResult { T::AcceptedCurrencyOrigin::ensure_origin(origin)?; @@ -357,7 +356,7 @@ where MC::Balance: FixedPointOperand, FR: Get, DF: DepositFee, - ::Call: IsSubType>, + ::RuntimeCall: IsSubType>, BalanceOf: FixedPointOperand, { type LiquidityInfo = Option, Price>>; @@ -368,8 +367,8 @@ where /// Note: The `fee` already includes the `tip`. fn withdraw_fee( who: &T::AccountId, - call: &T::Call, - _info: &DispatchInfoOf, + call: &T::RuntimeCall, + _info: &DispatchInfoOf, fee: Self::Balance, _tip: Self::Balance, ) -> Result { @@ -406,8 +405,8 @@ where /// Note: The `fee` already includes the `tip`. fn correct_and_deposit_fee( who: &T::AccountId, - _dispatch_info: &DispatchInfoOf, - _post_info: &PostDispatchInfoOf, + _dispatch_info: &DispatchInfoOf, + _post_info: &PostDispatchInfoOf, corrected_fee: Self::Balance, tip: Self::Balance, already_withdrawn: Self::LiquidityInfo, diff --git a/transaction-multi-payment/src/mock.rs b/transaction-multi-payment/src/mock.rs index acf77367..2678f52c 100644 --- a/transaction-multi-payment/src/mock.rs +++ b/transaction-multi-payment/src/mock.rs @@ -20,12 +20,14 @@ pub use crate as multi_payment; use crate::{Config, TransferFees}; use frame_support::{ + dispatch::DispatchClass, parameter_types, traits::{Everything, GenesisBuild, Get, Nothing}, - weights::{DispatchClass, IdentityFee, Weight}, + weights::{IdentityFee, Weight}, }; use frame_system as system; use hydradx_traits::{pools::SpotPriceProvider, AssetPairAccountIdFor}; +use orml_traits::currency::MutationHooks; use orml_traits::parameter_type_with_key; use pallet_currencies::BasicCurrencyAdapter; use sp_core::H256; @@ -101,18 +103,18 @@ parameter_types! { pub const FeeReceiver: AccountId = FEE_RECEIVER; pub RuntimeBlockWeights: system::limits::BlockWeights = system::limits::BlockWeights::builder() - .base_block(Weight::from_ref_time(10)) + .base_block(Weight::from_ref_time(0)) .for_class(DispatchClass::all(), |weights| { weights.base_extrinsic = ExtrinsicBaseWeight::get(); }) .for_class(DispatchClass::Normal, |weights| { - weights.max_total = Some(NORMAL_DISPATCH_RATIO * MAX_BLOCK_WEIGHT); + weights.max_total = (NORMAL_DISPATCH_RATIO * MAX_BLOCK_WEIGHT).set_proof_size(u64::MAX).into(); }) .for_class(DispatchClass::Operational, |weights| { - weights.max_total = Some(MAX_BLOCK_WEIGHT); - weights.reserved = Some( - MAX_BLOCK_WEIGHT - NORMAL_DISPATCH_RATIO * MAX_BLOCK_WEIGHT - ); + weights.max_total = (NORMAL_DISPATCH_RATIO * MAX_BLOCK_WEIGHT).set_proof_size(u64::MAX).into(); + }) + .for_class(DispatchClass::Operational, |weights| { + weights.max_total = MAX_BLOCK_WEIGHT.set_proof_size(u64::MAX).into(); }) .avg_block_initialization(Perbill::from_percent(0)) .build_or_panic(); @@ -124,8 +126,8 @@ impl system::Config for Test { type BaseCallFilter = Everything; type BlockWeights = RuntimeBlockWeights; type BlockLength = (); - type Origin = Origin; - type Call = Call; + type RuntimeOrigin = RuntimeOrigin; + type RuntimeCall = RuntimeCall; type Index = u64; type BlockNumber = u64; type Hash = H256; @@ -133,7 +135,7 @@ impl system::Config for Test { type AccountId = u64; type Lookup = IdentityLookup; type Header = Header; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type DbWeight = (); type Version = (); @@ -148,7 +150,7 @@ impl system::Config for Test { } impl Config for Test { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type AcceptedCurrencyOrigin = frame_system::EnsureRoot; type Currencies = Currencies; type SpotPriceProvider = SpotPrice; @@ -162,7 +164,7 @@ impl pallet_balances::Config for Test { /// The type for recording an account's balance. type Balance = Balance; /// The ubiquitous event type. - type Event = Event; + type RuntimeEvent = RuntimeEvent; type DustRemoval = (); type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; @@ -172,7 +174,7 @@ impl pallet_balances::Config for Test { } impl pallet_transaction_payment::Config for Test { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type OnChargeTransaction = TransferFees, FeeReceiver>; type LengthToFee = IdentityFee; type OperationalFeeMultiplier = (); @@ -223,24 +225,34 @@ parameter_types! { pub const MaxReserves: u32 = 50; } +pub struct CurrencyHooks; +impl MutationHooks for CurrencyHooks { + type OnDust = (); + type OnSlash = (); + type PreDeposit = (); + type PostDeposit = (); + type PreTransfer = (); + type PostTransfer = (); + type OnNewTokenAccount = AddTxAssetOnAccount; + type OnKilledTokenAccount = RemoveTxAssetOnKilled; +} + impl orml_tokens::Config for Test { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Balance = Balance; type Amount = Amount; type CurrencyId = AssetId; type WeightInfo = (); type ExistentialDeposits = ExistentialDeposits; - type OnDust = (); type MaxLocks = (); type DustRemovalWhitelist = Nothing; - type OnNewTokenAccount = AddTxAssetOnAccount; - type OnKilledTokenAccount = RemoveTxAssetOnKilled; type ReserveIdentifier = (); type MaxReserves = MaxReserves; + type CurrencyHooks = CurrencyHooks; } impl pallet_currencies::Config for Test { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type MultiCurrency = Tokens; type NativeCurrency = BasicCurrencyAdapter; type GetNativeCurrencyId = HdxAssetId; @@ -338,6 +350,6 @@ impl ExtBuilder { } } -pub fn expect_events(e: Vec) { - test_utils::expect_events::(e); +pub fn expect_events(e: Vec) { + test_utils::expect_events::(e); } diff --git a/transaction-multi-payment/src/tests.rs b/transaction-multi-payment/src/tests.rs index 371406ce..b2ecbb53 100644 --- a/transaction-multi-payment/src/tests.rs +++ b/transaction-multi-payment/src/tests.rs @@ -20,15 +20,17 @@ use crate::{AcceptedCurrencies, AcceptedCurrencyPrice, Event, PaymentInfo, Price use frame_support::{ assert_noop, assert_ok, + dispatch::{DispatchInfo, PostDispatchInfo}, sp_runtime::traits::{BadOrigin, SignedExtension}, traits::Hooks, - weights::{DispatchInfo, PostDispatchInfo, Weight}, + weights::Weight, }; use orml_traits::MultiCurrency; use pallet_balances::Call as BalancesCall; use pallet_transaction_payment::ChargeTransactionPayment; -const CALL: &::Call = &Call::Balances(BalancesCall::transfer { dest: 2, value: 69 }); +const CALL: &::RuntimeCall = + &RuntimeCall::Balances(BalancesCall::transfer { dest: 2, value: 69 }); #[test] fn on_initialize_should_fill_storage_with_prices() { @@ -87,7 +89,7 @@ fn on_finalize_should_remove_prices_from_storage() { fn set_unsupported_currency() { ExtBuilder::default().build().execute_with(|| { assert_noop!( - PaymentPallet::set_currency(Origin::signed(BOB), UNSUPPORTED_CURRENCY), + PaymentPallet::set_currency(RuntimeOrigin::signed(BOB), UNSUPPORTED_CURRENCY), Error::::UnsupportedCurrency ); @@ -98,7 +100,7 @@ fn set_unsupported_currency() { #[test] fn set_supported_currency_without_spot_price_should_charge_fee_in_correct_currency() { ExtBuilder::default().base_weight(5).build().execute_with(|| { - let call = &Call::PaymentPallet(crate::Call::set_currency { + let call = &RuntimeCall::PaymentPallet(crate::Call::set_currency { currency: SUPPORTED_CURRENCY, }); @@ -127,7 +129,7 @@ fn set_supported_currency_without_spot_price_should_charge_fee_in_correct_curren #[test] fn set_supported_currency_with_spot_price_should_charge_fee_in_correct_currency() { ExtBuilder::default().base_weight(5).build().execute_with(|| { - let call = &Call::PaymentPallet(crate::Call::set_currency { + let call = &RuntimeCall::PaymentPallet(crate::Call::set_currency { currency: SUPPORTED_CURRENCY_WITH_PRICE, }); @@ -159,7 +161,7 @@ fn set_supported_currency_with_spot_price_should_charge_fee_in_correct_currency( #[test] fn set_native_currency() { ExtBuilder::default().build().execute_with(|| { - assert_ok!(PaymentPallet::set_currency(Origin::signed(ALICE), HDX),); + assert_ok!(PaymentPallet::set_currency(RuntimeOrigin::signed(ALICE), HDX),); assert_eq!(PaymentPallet::get_currency(ALICE), Some(HDX)); }); @@ -267,16 +269,20 @@ fn fee_payment_non_native_insufficient_balance() { #[test] fn add_new_accepted_currency() { ExtBuilder::default().base_weight(5).build().execute_with(|| { - assert_ok!(PaymentPallet::add_currency(Origin::root(), 100, Price::from_float(1.1))); + assert_ok!(PaymentPallet::add_currency( + RuntimeOrigin::root(), + 100, + Price::from_float(1.1) + )); expect_events(vec![Event::CurrencyAdded { asset_id: 100 }.into()]); assert_eq!(PaymentPallet::currencies(100), Some(Price::from_float(1.1))); assert_noop!( - PaymentPallet::add_currency(Origin::signed(ALICE), 1000, Price::from_float(1.2)), + PaymentPallet::add_currency(RuntimeOrigin::signed(ALICE), 1000, Price::from_float(1.2)), BadOrigin ); assert_noop!( - PaymentPallet::add_currency(Origin::root(), 100, Price::from(10)), + PaymentPallet::add_currency(RuntimeOrigin::root(), 100, Price::from(10)), Error::::AlreadyAccepted ); assert_eq!(PaymentPallet::currencies(100), Some(Price::from_float(1.1))); @@ -286,23 +292,26 @@ fn add_new_accepted_currency() { #[test] fn removed_accepted_currency() { ExtBuilder::default().base_weight(5).build().execute_with(|| { - assert_ok!(PaymentPallet::add_currency(Origin::root(), 100, Price::from(3))); + assert_ok!(PaymentPallet::add_currency(RuntimeOrigin::root(), 100, Price::from(3))); assert_eq!(PaymentPallet::currencies(100), Some(Price::from(3))); - assert_noop!(PaymentPallet::remove_currency(Origin::signed(ALICE), 100), BadOrigin); + assert_noop!( + PaymentPallet::remove_currency(RuntimeOrigin::signed(ALICE), 100), + BadOrigin + ); assert_noop!( - PaymentPallet::remove_currency(Origin::root(), 1000), + PaymentPallet::remove_currency(RuntimeOrigin::root(), 1000), Error::::UnsupportedCurrency ); - assert_ok!(PaymentPallet::remove_currency(Origin::root(), 100)); + assert_ok!(PaymentPallet::remove_currency(RuntimeOrigin::root(), 100)); expect_events(vec![Event::CurrencyRemoved { asset_id: 100 }.into()]); assert_eq!(PaymentPallet::currencies(100), None); assert_noop!( - PaymentPallet::remove_currency(Origin::root(), 100), + PaymentPallet::remove_currency(RuntimeOrigin::root(), 100), Error::::UnsupportedCurrency ); }); @@ -313,7 +322,10 @@ fn account_currency_works() { ExtBuilder::default().build().execute_with(|| { assert_eq!(PaymentPallet::account_currency(&ALICE), HDX); - assert_ok!(PaymentPallet::set_currency(Origin::signed(ALICE), SUPPORTED_CURRENCY)); + assert_ok!(PaymentPallet::set_currency( + RuntimeOrigin::signed(ALICE), + SUPPORTED_CURRENCY + )); expect_events(vec![Event::CurrencySet { account_id: ALICE, asset_id: SUPPORTED_CURRENCY, @@ -322,7 +334,7 @@ fn account_currency_works() { assert_eq!(PaymentPallet::account_currency(&ALICE), SUPPORTED_CURRENCY); - assert_ok!(PaymentPallet::set_currency(Origin::signed(ALICE), HDX)); + assert_ok!(PaymentPallet::set_currency(RuntimeOrigin::signed(ALICE), HDX)); assert_eq!(PaymentPallet::account_currency(&ALICE), HDX); }); } @@ -790,7 +802,10 @@ fn fee_payment_in_unregistered_currency() { let len = 1000; let info = info_from_weight(Weight::from_ref_time(5)); - assert_ok!(PaymentPallet::remove_currency(Origin::root(), SUPPORTED_CURRENCY)); + assert_ok!(PaymentPallet::remove_currency( + RuntimeOrigin::root(), + SUPPORTED_CURRENCY + )); assert!(ChargeTransactionPayment::::from(0) .pre_dispatch(&CHARLIE, CALL, &info, len) diff --git a/transaction-pause/Cargo.toml b/transaction-pause/Cargo.toml index 19c807bf..05b2934c 100644 --- a/transaction-pause/Cargo.toml +++ b/transaction-pause/Cargo.toml @@ -1,28 +1,28 @@ [package] name = "pallet-transaction-pause" -version = "0.1.2" +version = "0.1.3" authors = ["Acala Developers", "GalacticCouncil"] edition = "2021" [dependencies] -codec = { package = "parity-scale-codec", version = "3.1.5", default-features = false } +codec = { package = "parity-scale-codec", version = "3.4.0", default-features = false } scale-info = { version = "2.1.2", default-features = false, features = ["derive"] } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false } # Optionals -frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29", default-features = false, optional = true } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29", default-features = false, optional = true } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29", default-features = false, optional = true } +frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false, optional = true } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false, optional = true } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false, optional = true } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29" } -orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.29", default-features = false, features=["std"]} -orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.29", default-features = false, features=["std"]} +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" } +orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.38", default-features = false, features=["std"]} +orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.38", default-features = false, features=["std"]} smallvec = "1.9.0" [features] diff --git a/transaction-pause/src/benchmarking.rs b/transaction-pause/src/benchmarking.rs index 5a6b7748..6b9d6251 100644 --- a/transaction-pause/src/benchmarking.rs +++ b/transaction-pause/src/benchmarking.rs @@ -26,15 +26,15 @@ use frame_support::assert_ok; benchmarks! { pause_transaction { - let origin = T::UpdateOrigin::successful_origin(); + let origin = T::UpdateOrigin::try_successful_origin().unwrap(); }: { assert_ok!(crate::Pallet::::pause_transaction(origin, b"Balances".to_vec(), b"transfer".to_vec())); } unpause_transaction { - let origin = T::UpdateOrigin::successful_origin(); + let origin = T::UpdateOrigin::try_successful_origin().unwrap(); crate::Pallet::::pause_transaction(origin, b"Balances".to_vec(), b"transfer".to_vec())?; - let origin = T::UpdateOrigin::successful_origin(); + let origin = T::UpdateOrigin::try_successful_origin().unwrap(); }:{ assert_ok!(crate::Pallet::::unpause_transaction(origin, b"Balances".to_vec(), b"transfer".to_vec())); } diff --git a/transaction-pause/src/lib.rs b/transaction-pause/src/lib.rs index 90bf7336..5380b3da 100644 --- a/transaction-pause/src/lib.rs +++ b/transaction-pause/src/lib.rs @@ -42,10 +42,10 @@ pub mod pallet { #[pallet::config] pub trait Config: frame_system::Config { - type Event: From> + IsType<::Event>; + type RuntimeEvent: From> + IsType<::RuntimeEvent>; /// The origin which may set filter. - type UpdateOrigin: EnsureOrigin; + type UpdateOrigin: EnsureOrigin; /// Weight information for the extrinsics in this module. type WeightInfo: WeightInfo; @@ -90,6 +90,7 @@ pub mod pallet { #[pallet::call] impl Pallet { + #[pallet::call_index(0)] #[pallet::weight(T::WeightInfo::pause_transaction())] pub fn pause_transaction(origin: OriginFor, pallet_name: Vec, function_name: Vec) -> DispatchResult { T::UpdateOrigin::ensure_origin(origin)?; @@ -113,6 +114,7 @@ pub mod pallet { Ok(()) } + #[pallet::call_index(1)] #[pallet::weight(T::WeightInfo::unpause_transaction())] pub fn unpause_transaction( origin: OriginFor, @@ -132,11 +134,11 @@ pub mod pallet { } pub struct PausedTransactionFilter(sp_std::marker::PhantomData); -impl Contains for PausedTransactionFilter +impl Contains for PausedTransactionFilter where - ::Call: GetCallMetadata, + ::RuntimeCall: GetCallMetadata, { - fn contains(call: &T::Call) -> bool { + fn contains(call: &T::RuntimeCall) -> bool { let CallMetadata { function_name, pallet_name, diff --git a/transaction-pause/src/mock.rs b/transaction-pause/src/mock.rs index f541886d..b4b184c7 100644 --- a/transaction-pause/src/mock.rs +++ b/transaction-pause/src/mock.rs @@ -43,16 +43,16 @@ mod transaction_pause { } impl frame_system::Config for Runtime { - type Origin = Origin; + type RuntimeOrigin = RuntimeOrigin; type Index = u64; type BlockNumber = u64; - type Call = Call; + type RuntimeCall = RuntimeCall; type Hash = H256; type Hashing = ::sp_runtime::traits::BlakeTwo256; type AccountId = AccountId; type Lookup = IdentityLookup; type Header = Header; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type BlockHashCount = ConstU64<250>; type BlockWeights = (); type BlockLength = (); @@ -72,7 +72,7 @@ impl frame_system::Config for Runtime { impl pallet_balances::Config for Runtime { type Balance = Balance; type DustRemoval = (); - type Event = Event; + type RuntimeEvent = RuntimeEvent; type ExistentialDeposit = ConstU128<10>; type AccountStore = System; type MaxLocks = (); @@ -92,19 +92,17 @@ parameter_types! { } impl orml_tokens::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Balance = Balance; type Amount = Amount; type CurrencyId = CurrencyId; type WeightInfo = (); type ExistentialDeposits = ExistentialDeposits; - type OnDust = (); type MaxLocks = (); type DustRemovalWhitelist = Nothing; - type OnNewTokenAccount = (); - type OnKilledTokenAccount = (); type ReserveIdentifier = (); type MaxReserves = MaxReserves; + type CurrencyHooks = (); } ord_parameter_types! { @@ -112,7 +110,7 @@ ord_parameter_types! { } impl Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type UpdateOrigin = EnsureSignedBy; type WeightInfo = (); } diff --git a/transaction-pause/src/tests.rs b/transaction-pause/src/tests.rs index 78340534..758d2d91 100644 --- a/transaction-pause/src/tests.rs +++ b/transaction-pause/src/tests.rs @@ -22,16 +22,17 @@ use super::*; use frame_support::{assert_noop, assert_ok}; -use mock::{Event, *}; +use mock::{RuntimeEvent as Event, *}; use sp_runtime::traits::BadOrigin; -const BALANCE_TRANSFER: &::Call = - &mock::Call::Balances(pallet_balances::Call::transfer { dest: ALICE, value: 10 }); -const TOKENS_TRANSFER: &::Call = &mock::Call::Tokens(orml_tokens::Call::transfer { - dest: ALICE, - currency_id: AUSD, - amount: 10, -}); +const BALANCE_TRANSFER: &::RuntimeCall = + &mock::RuntimeCall::Balances(pallet_balances::Call::transfer { dest: ALICE, value: 10 }); +const TOKENS_TRANSFER: &::RuntimeCall = + &mock::RuntimeCall::Tokens(orml_tokens::Call::transfer { + dest: ALICE, + currency_id: AUSD, + amount: 10, + }); #[test] fn pause_transaction_work() { @@ -39,7 +40,7 @@ fn pause_transaction_work() { System::set_block_number(1); assert_noop!( - TransactionPause::pause_transaction(Origin::signed(5), b"Balances".to_vec(), b"transfer".to_vec()), + TransactionPause::pause_transaction(RuntimeOrigin::signed(5), b"Balances".to_vec(), b"transfer".to_vec()), BadOrigin ); @@ -48,7 +49,7 @@ fn pause_transaction_work() { None ); assert_ok!(TransactionPause::pause_transaction( - Origin::signed(1), + RuntimeOrigin::signed(1), b"Balances".to_vec(), b"transfer".to_vec() )); @@ -63,7 +64,7 @@ fn pause_transaction_work() { assert_noop!( TransactionPause::pause_transaction( - Origin::signed(1), + RuntimeOrigin::signed(1), b"TransactionPause".to_vec(), b"pause_transaction".to_vec() ), @@ -71,14 +72,14 @@ fn pause_transaction_work() { ); assert_noop!( TransactionPause::pause_transaction( - Origin::signed(1), + RuntimeOrigin::signed(1), b"TransactionPause".to_vec(), b"some_other_call".to_vec() ), Error::::CannotPause ); assert_ok!(TransactionPause::pause_transaction( - Origin::signed(1), + RuntimeOrigin::signed(1), b"OtherPallet".to_vec(), b"pause_transaction".to_vec() )); @@ -91,7 +92,7 @@ fn unpause_transaction_work() { System::set_block_number(1); assert_ok!(TransactionPause::pause_transaction( - Origin::signed(1), + RuntimeOrigin::signed(1), b"Balances".to_vec(), b"transfer".to_vec() )); @@ -101,12 +102,12 @@ fn unpause_transaction_work() { ); assert_noop!( - TransactionPause::unpause_transaction(Origin::signed(5), b"Balances".to_vec(), b"transfer".to_vec()), + TransactionPause::unpause_transaction(RuntimeOrigin::signed(5), b"Balances".to_vec(), b"transfer".to_vec()), BadOrigin ); assert_ok!(TransactionPause::unpause_transaction( - Origin::signed(1), + RuntimeOrigin::signed(1), b"Balances".to_vec(), b"transfer".to_vec() )); @@ -127,24 +128,24 @@ fn paused_transaction_filter_work() { assert!(!PausedTransactionFilter::::contains(BALANCE_TRANSFER)); assert!(!PausedTransactionFilter::::contains(TOKENS_TRANSFER)); assert_ok!(TransactionPause::pause_transaction( - Origin::signed(1), + RuntimeOrigin::signed(1), b"Balances".to_vec(), b"transfer".to_vec() )); assert_ok!(TransactionPause::pause_transaction( - Origin::signed(1), + RuntimeOrigin::signed(1), b"Tokens".to_vec(), b"transfer".to_vec() )); assert!(PausedTransactionFilter::::contains(BALANCE_TRANSFER)); assert!(PausedTransactionFilter::::contains(TOKENS_TRANSFER)); assert_ok!(TransactionPause::unpause_transaction( - Origin::signed(1), + RuntimeOrigin::signed(1), b"Balances".to_vec(), b"transfer".to_vec() )); assert_ok!(TransactionPause::unpause_transaction( - Origin::signed(1), + RuntimeOrigin::signed(1), b"Tokens".to_vec(), b"transfer".to_vec() ));