From fbf0178972d498076d6aa7b36cffe8ad484bc9a2 Mon Sep 17 00:00:00 2001 From: Cheng JIANG Date: Sun, 26 Sep 2021 12:40:24 +0800 Subject: [PATCH] try nightly-07-29 toolchain --- .github/workflows/ci.yml | 2 +- .github/workflows/coverage.yml | 4 +- .github/workflows/rustdoc.yml | 2 +- Cargo.lock | 1925 +++++++++++----------- Makefile | 2 +- config.yml | 2 +- docs/DEVELOPER-GUIDE.md | 2 +- node/parallel/Cargo.toml | 100 +- node/parallel/src/client.rs | 4 +- node/parallel/src/rpc.rs | 4 +- pallets/amm/Cargo.toml | 22 +- pallets/amm/src/benchmarking.rs | 4 +- pallets/amm/src/lib.rs | 57 +- pallets/amm/src/mock.rs | 12 +- pallets/amm/src/pool_structs.rs | 4 +- pallets/currency-adapter/Cargo.toml | 6 +- pallets/currency-adapter/src/lib.rs | 14 +- pallets/liquid-staking-v2/Cargo.toml | 18 +- pallets/liquid-staking-v2/src/lib.rs | 2 +- pallets/liquid-staking-v2/src/mock.rs | 20 +- pallets/liquid-staking/Cargo.toml | 62 +- pallets/liquid-staking/src/lib.rs | 10 +- pallets/liquid-staking/src/mock.rs | 75 +- pallets/liquid-staking/src/relaychain.rs | 43 +- pallets/liquidation/Cargo.toml | 14 +- pallets/liquidation/src/lib.rs | 4 +- pallets/loans/Cargo.toml | 24 +- pallets/loans/rpc/Cargo.toml | 8 +- pallets/loans/rpc/runtime-api/Cargo.toml | 4 +- pallets/loans/src/benchmarking.rs | 12 +- pallets/loans/src/lib.rs | 25 +- pallets/loans/src/mock.rs | 18 +- pallets/nominee-election/Cargo.toml | 12 +- pallets/prices/Cargo.toml | 20 +- pallets/prices/src/lib.rs | 40 +- pallets/prices/src/mock.rs | 30 +- pallets/router/Cargo.toml | 40 +- pallets/router/src/benchmarking.rs | 6 +- pallets/router/src/lib.rs | 15 +- pallets/router/src/mock.rs | 17 +- pallets/router/src/tests.rs | 4 +- primitives/Cargo.toml | 20 +- primitives/src/currency.rs | 14 +- primitives/src/lib.rs | 20 +- primitives/src/tokens.rs | 16 +- runtime/heiko/Cargo.toml | 123 +- runtime/heiko/src/lib.rs | 121 +- runtime/parallel/Cargo.toml | 123 +- runtime/parallel/src/lib.rs | 121 +- runtime/vanilla/Cargo.toml | 123 +- runtime/vanilla/src/lib.rs | 125 +- rust-toolchain | 2 +- 52 files changed, 1752 insertions(+), 1745 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e899fd1a9c..01ae6e90f7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,7 +20,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - rust: [1.53.0] + rust: [nightly-2021-07-29] # Steps represent a sequence of tasks that will be executed as part of the job steps: diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index ce50163afe..a0ad3b6740 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -14,7 +14,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - rust: [1.53.0] + rust: [nightly-2021-07-29] steps: - name: Checkout Repository @@ -68,7 +68,7 @@ jobs: - name: Generate code coverage run: | - cargo +1.53.0 tarpaulin --verbose --no-fail-fast -p pallet-loans -p pallet-liquid-staking -p pallet-liquid-staking-v2 -p pallet-nominee-election -p pallet-prices -p pallet-liquidation --timeout 300 --out Xml + cargo +nightly-2021-07-29 tarpaulin --verbose --no-fail-fast -p pallet-loans -p pallet-liquid-staking -p pallet-liquid-staking-v2 -p pallet-nominee-election -p pallet-prices -p pallet-liquidation --timeout 300 --out Xml - name: Upload To Codecov.io uses: codecov/codecov-action@v1 diff --git a/.github/workflows/rustdoc.yml b/.github/workflows/rustdoc.yml index 7a3cb9f58d..b77d4781cf 100644 --- a/.github/workflows/rustdoc.yml +++ b/.github/workflows/rustdoc.yml @@ -13,7 +13,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - rust: [1.53.0] + rust: [nightly-2021-07-29] steps: - name: Checkout Repository diff --git a/Cargo.lock b/Cargo.lock index 9f8c8ca7b9..12b974ce6f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -18,7 +18,16 @@ version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e7a2e47a1fbe209ee101dd6d61285226744c6c8d3c21c8dc878ba6cb9f467f3a" dependencies = [ - "gimli", + "gimli 0.24.0", +] + +[[package]] +name = "addr2line" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e61f2b7f93d2c7d2b08263acaa4a363b3e276806c68af6134c44f523bf1aacd" +dependencies = [ + "gimli 0.25.0", ] [[package]] @@ -29,64 +38,39 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "aead" -version = "0.3.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fc95d1bdb8e6666b2b217308eeeb09f2d6728d104be3e31916cc74d15420331" +checksum = "0b613b8e1e3cf911a086f53f03bf286f52fd7a7258e4fa606f0ef220d39d8877" dependencies = [ "generic-array 0.14.4", ] [[package]] name = "aes" -version = "0.5.0" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd2bc6d3f370b5666245ff421e231cba4353df936e26986d2918e61a8fd6aef6" +checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8" dependencies = [ - "aes-soft", - "aesni", - "block-cipher", + "cfg-if 1.0.0", + "cipher", + "cpufeatures", + "opaque-debug 0.3.0", ] [[package]] name = "aes-gcm" -version = "0.7.0" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0301c9e9c443494d970a07885e8cf3e587bae8356a1d5abd0999068413f7205f" +checksum = "df5f85a83a7d8b0442b6aa7b504b8212c1733da07b98aae43d4bc21b2cb3cdf6" dependencies = [ "aead", "aes", - "block-cipher", + "cipher", + "ctr", "ghash", - "subtle 2.4.1", -] - -[[package]] -name = "aes-soft" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63dd91889c49327ad7ef3b500fd1109dbd3c509a03db0d4a9ce413b79f575cb6" -dependencies = [ - "block-cipher", - "byteorder", - "opaque-debug 0.3.0", -] - -[[package]] -name = "aesni" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a6fe808308bb07d393e2ea47780043ec47683fcf19cf5efc8ca51c50cc8c68a" -dependencies = [ - "block-cipher", - "opaque-debug 0.3.0", + "subtle", ] -[[package]] -name = "ahash" -version = "0.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "739f4a8db6605981345c5654f3a85b056ce52f37a39d34da03f25bf2151ea16e" - [[package]] name = "ahash" version = "0.7.4" @@ -124,7 +108,7 @@ checksum = "629ddaf5b2675d9a27e9521a88870f8edea113e4a83d6d5178268b0d70e9a9a3" dependencies = [ "proc-macro2 1.0.29", "quote 1.0.9", - "syn 1.0.74", + "syn 1.0.77", ] [[package]] @@ -164,9 +148,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.42" +version = "1.0.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "595d3cfa7a60d4555cb5067b99f07142a08ea778de5cf993f7b75c7d8fabc486" +checksum = "61604a8f862e1d5c3229fdd78f8b02c68dcf73a4c4b05fd636d12240aaa242c1" [[package]] name = "approx" @@ -223,7 +207,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a3203e79f4dd9bdda415ed03cf14dae5a2bf775c683a00f94e9cd1faf0f596e5" dependencies = [ "quote 1.0.9", - "syn 1.0.74", + "syn 1.0.77", ] [[package]] @@ -281,7 +265,7 @@ dependencies = [ "parking", "polling", "slab", - "socket2 0.4.0", + "socket2 0.4.2", "waker-fn", "winapi 0.3.9", ] @@ -306,9 +290,9 @@ dependencies = [ [[package]] name = "async-process" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8f38756dd9ac84671c428afbf7c9f7495feff9ec5b0710f17100098e5b354ac" +checksum = "b21b63ab5a0db0369deb913540af2892750e42d949faacc7a61495ac418a1692" dependencies = [ "async-io", "blocking", @@ -323,9 +307,9 @@ dependencies = [ [[package]] name = "async-std" -version = "1.9.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9f06685bad74e0570f5213741bea82158279a4103d988e57bfada11ad230341" +checksum = "f8056f1455169ab86dd47b47391e4ab0cbd25410a70e9fe675544f49bafaf952" dependencies = [ "async-attributes", "async-channel", @@ -372,13 +356,13 @@ checksum = "e91831deabf0d6d7ec49552e489aed63b7456a7a3c46cff62adad428110b0af0" [[package]] name = "async-trait" -version = "0.1.50" +version = "0.1.51" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b98e84bbb4cbcdd97da190ba0c58a1bb0de2c1fdf67d159e192ed766aeca722" +checksum = "44318e776df68115a881de9a8fd1b9e53368d7a4a5ce4cc48517da3393233a5e" dependencies = [ "proc-macro2 1.0.29", "quote 1.0.9", - "syn 1.0.74", + "syn 1.0.77", ] [[package]] @@ -387,7 +371,7 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb4401f0a3622dad2e0763fa79e0eb328bc70fb7dccfdd645341f00d671247d6" dependencies = [ - "bytes 1.0.1", + "bytes 1.1.0", "futures-sink", "futures-util", "memchr", @@ -400,7 +384,7 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0de5164e5edbf51c45fb8c2d9664ae1c095cce1b265ecf7569093c0d66ef690" dependencies = [ - "bytes 1.0.1", + "bytes 1.1.0", "futures-sink", "futures-util", "memchr", @@ -441,16 +425,16 @@ checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" [[package]] name = "backtrace" -version = "0.3.60" +version = "0.3.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7815ea54e4d821e791162e078acbebfd6d8c8939cd559c9335dceb1c8ca7282" +checksum = "e7a905d892734eea339e896738c14b9afce22b5318f64b951e70bf3844419b01" dependencies = [ - "addr2line", + "addr2line 0.16.0", "cc", "cfg-if 1.0.0", "libc", "miniz_oxide", - "object 0.25.3", + "object 0.26.2", "rustc-demangle", ] @@ -464,7 +448,7 @@ dependencies = [ "proc-macro-error 0.4.12", "proc-macro2 1.0.29", "quote 1.0.9", - "syn 1.0.74", + "syn 1.0.77", ] [[package]] @@ -503,7 +487,7 @@ dependencies = [ [[package]] name = "beefy-gadget" version = "0.1.0" -source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=polkadot-v0.9.9#f40c0ab7b327e874d5c8d699bfa5d762f1759ee0" +source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=polkadot-v0.9.10#9954b61657dc8899a21b4f2501ee6bd3b7a2dc23" dependencies = [ "beefy-primitives", "fnv", @@ -511,7 +495,7 @@ dependencies = [ "hex", "log", "parity-scale-codec", - "parking_lot 0.11.1", + "parking_lot 0.11.2", "sc-client-api", "sc-keystore", "sc-network", @@ -533,7 +517,7 @@ dependencies = [ [[package]] name = "beefy-gadget-rpc" version = "0.1.0" -source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=polkadot-v0.9.9#f40c0ab7b327e874d5c8d699bfa5d762f1759ee0" +source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=polkadot-v0.9.10#9954b61657dc8899a21b4f2501ee6bd3b7a2dc23" dependencies = [ "beefy-gadget", "beefy-primitives", @@ -554,12 +538,12 @@ dependencies = [ [[package]] name = "beefy-merkle-tree" version = "0.1.0" -source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=polkadot-v0.9.9#f40c0ab7b327e874d5c8d699bfa5d762f1759ee0" +source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=polkadot-v0.9.10#9954b61657dc8899a21b4f2501ee6bd3b7a2dc23" [[package]] name = "beefy-primitives" version = "0.1.0" -source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=polkadot-v0.9.9#f40c0ab7b327e874d5c8d699bfa5d762f1759ee0" +source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=polkadot-v0.9.10#9954b61657dc8899a21b4f2501ee6bd3b7a2dc23" dependencies = [ "parity-scale-codec", "sp-api", @@ -580,9 +564,9 @@ dependencies = [ [[package]] name = "bindgen" -version = "0.59.0" +version = "0.59.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b2ce639ee22f41a6ea0a3061e9bea9f690cf0c6ffc1ada0a3a599778f99ccba" +checksum = "453c49e5950bb0eb63bb3df640e31618846c89d5b7faa54040d76e98e0134375" dependencies = [ "bitflags", "cexpr", @@ -599,9 +583,9 @@ dependencies = [ [[package]] name = "bitflags" -version = "1.2.1" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitvec" @@ -629,9 +613,9 @@ dependencies = [ [[package]] name = "blake2" -version = "0.9.1" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10a5720225ef5daecf08657f23791354e1685a8c91a4c60c7f3d3b2892f978f4" +checksum = "0a4e37d16930f5459780f5621038b6382b9bb37c19016f39fb6b5808d831f174" dependencies = [ "crypto-mac 0.8.0", "digest 0.9.0", @@ -707,15 +691,6 @@ dependencies = [ "generic-array 0.14.4", ] -[[package]] -name = "block-cipher" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f337a3e6da609650eb74e02bc9fac7b735049f7623ab12f2e4c719316fcc7e80" -dependencies = [ - "generic-array 0.14.4", -] - [[package]] name = "block-padding" version = "0.1.5" @@ -748,7 +723,7 @@ dependencies = [ [[package]] name = "bp-header-chain" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.10#aeea9b7bd81919e014f7621f6c4b2eb9709d918f" dependencies = [ "finality-grandpa", "frame-support", @@ -763,7 +738,7 @@ dependencies = [ [[package]] name = "bp-message-dispatch" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.10#aeea9b7bd81919e014f7621f6c4b2eb9709d918f" dependencies = [ "bp-runtime", "frame-support", @@ -774,7 +749,7 @@ dependencies = [ [[package]] name = "bp-messages" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.10#aeea9b7bd81919e014f7621f6c4b2eb9709d918f" dependencies = [ "bitvec 0.20.4", "bp-runtime", @@ -789,7 +764,7 @@ dependencies = [ [[package]] name = "bp-polkadot-core" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.10#aeea9b7bd81919e014f7621f6c4b2eb9709d918f" dependencies = [ "bp-messages", "bp-runtime", @@ -806,7 +781,7 @@ dependencies = [ [[package]] name = "bp-rialto" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.10#aeea9b7bd81919e014f7621f6c4b2eb9709d918f" dependencies = [ "bp-messages", "bp-runtime", @@ -821,7 +796,7 @@ dependencies = [ [[package]] name = "bp-rococo" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.10#aeea9b7bd81919e014f7621f6c4b2eb9709d918f" dependencies = [ "bp-messages", "bp-polkadot-core", @@ -838,7 +813,7 @@ dependencies = [ [[package]] name = "bp-runtime" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.10#aeea9b7bd81919e014f7621f6c4b2eb9709d918f" dependencies = [ "frame-support", "hash-db", @@ -855,7 +830,7 @@ dependencies = [ [[package]] name = "bp-test-utils" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.10#aeea9b7bd81919e014f7621f6c4b2eb9709d918f" dependencies = [ "bp-header-chain", "ed25519-dalek", @@ -870,7 +845,7 @@ dependencies = [ [[package]] name = "bp-wococo" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.10#aeea9b7bd81919e014f7621f6c4b2eb9709d918f" dependencies = [ "bp-messages", "bp-polkadot-core", @@ -885,7 +860,7 @@ dependencies = [ [[package]] name = "bridge-runtime-common" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.10#aeea9b7bd81919e014f7621f6c4b2eb9709d918f" dependencies = [ "bp-message-dispatch", "bp-messages", @@ -912,9 +887,9 @@ checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3" [[package]] name = "bstr" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90682c8d613ad3373e66de8c6411e0ae2ab2571e879d2efbf73558cc66f21279" +checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223" dependencies = [ "memchr", ] @@ -930,15 +905,15 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.7.0" +version = "3.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c59e7af012c713f529e7a3ee57ce9b31ddd858d4b512923602f74608b009631" +checksum = "d9df67f7bf9ef8498769f994239c45613ef0c5899415fb58e9add412d2c1a538" [[package]] name = "byte-slice-cast" -version = "1.0.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65c1bf4a04a88c54f589125563643d773f3254b5c38571395e2b591c693bbc81" +checksum = "ca0796d76a983651b4a0ddda16203032759f2fd9103d9181f7c65c06ee8872e6" [[package]] name = "byte-tools" @@ -971,9 +946,9 @@ checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38" [[package]] name = "bytes" -version = "1.0.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b700ce4376041dcd0a327fd0097c41095743c4c8af8887265942faf1100bd040" +checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8" [[package]] name = "cache-padded" @@ -983,18 +958,18 @@ checksum = "631ae5198c9be5e753e5cc215e1bd73c2b466a3565173db433f52bb9d3e66dba" [[package]] name = "camino" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4648c6d00a709aa069a236adcaae4f605a6241c72bf5bee79331a4b625921a9" +checksum = "52d74260d9bf6944e2208aa46841b4b8f0d7ffc0849a06837b2f510337f86b2b" dependencies = [ "serde", ] [[package]] name = "cargo-platform" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0226944a63d1bf35a3b5f948dd7c59e263db83695c9e8bffc4037de02e30f1d7" +checksum = "cbdb825da8a5df079a43676dbe042702f1707b1109f713a01420fbb4cc71fa27" dependencies = [ "serde", ] @@ -1015,9 +990,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.69" +version = "1.0.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e70cc2f62c6ce1868963827bd677764c62d07c3d9a3e1fb1177ee1a9ab199eb2" +checksum = "d26a6ce4b6a484fa3edb70f7efa6fc430fd2b87285fe8b84304fd0936faa0dc0" dependencies = [ "jobserver", ] @@ -1051,24 +1026,26 @@ checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" [[package]] name = "chacha20" -version = "0.5.0" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "244fbce0d47e97e8ef2f63b81d5e05882cb518c68531eb33194990d7b7e85845" +checksum = "f08493fa7707effc63254c66c6ea908675912493cd67952eda23c09fae2610b1" dependencies = [ - "stream-cipher", + "cfg-if 1.0.0", + "cipher", + "cpufeatures", "zeroize", ] [[package]] name = "chacha20poly1305" -version = "0.6.0" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bf18d374d66df0c05cdddd528a7db98f78c28e2519b120855c4f84c5027b1f5" +checksum = "b6547abe025f4027edacd9edaa357aded014eecec42a5070d9b885c3c334aba2" dependencies = [ "aead", "chacha20", + "cipher", "poly1305", - "stream-cipher", "zeroize", ] @@ -1092,33 +1069,33 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff0e3bc0b6446b3f9663c1a6aba6ef06c5aeaa1bc92bd18077be337198ab9768" dependencies = [ "multibase", - "multihash", + "multihash 0.13.2", "unsigned-varint 0.5.1", ] [[package]] name = "cipher" -version = "0.2.5" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12f8e7987cbd042a63249497f41aed09f8e65add917ea6566effbc56578d6801" +checksum = "7ee52072ec15386f770805afd189a01c8841be8696bed250fa2f13c4c0d6dfb7" dependencies = [ "generic-array 0.14.4", ] [[package]] name = "ckb-merkle-mountain-range" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e486fe53bb9f2ca0f58cb60e8679a5354fd6687a839942ef0a75967250289ca6" +checksum = "4f061f97d64fd1822664bdfb722f7ae5469a97b77567390f7442be5b5dc82a5b" dependencies = [ "cfg-if 0.1.10", ] [[package]] name = "clang-sys" -version = "1.2.0" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "853eda514c284c2287f4bf20ae614f8781f40a81d32ecda6e91449304dfe077c" +checksum = "10612c0ec0e0a1ff0e97980647cb058a6e7aedb913d01d009c406b8b7d0b26ee" dependencies = [ "glob", "libc", @@ -1213,19 +1190,13 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.1.5" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66c99696f6c9dd7f35d486b9d04d7e6e202aa3e8c40d553f2fdf5e7e0c6a71ef" +checksum = "95059428f66df56b63431fdb4e1947ed2190586af5c5a8a8b71122bdf5a7f469" dependencies = [ "libc", ] -[[package]] -name = "cpuid-bool" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcb25d077389e53838a8158c8e99174c5a9d902dee4904320db714f3c653ffba" - [[package]] name = "cranelift-bforest" version = "0.74.0" @@ -1245,7 +1216,7 @@ dependencies = [ "cranelift-codegen-meta", "cranelift-codegen-shared", "cranelift-entity", - "gimli", + "gimli 0.24.0", "log", "regalloc", "serde", @@ -1312,7 +1283,7 @@ dependencies = [ "cranelift-codegen", "cranelift-entity", "cranelift-frontend", - "itertools 0.10.1", + "itertools", "log", "serde", "smallvec 1.6.1", @@ -1341,9 +1312,9 @@ dependencies = [ [[package]] name = "crossbeam-deque" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f02af974daeee82218205558e51ec8768b48cf524bd01d550abe5573a608285" +checksum = "c20ff29ded3204c5106278a81a38f4b482636ed4fa1e6cfbeef193291beb29ed" dependencies = [ "crossbeam-epoch 0.8.2", "crossbeam-utils 0.7.2", @@ -1352,9 +1323,9 @@ dependencies = [ [[package]] name = "crossbeam-deque" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94af6efb46fef72616855b036a624cf27ba656ffc9be1b9a3c931cfc7749a9a9" +checksum = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e" dependencies = [ "cfg-if 1.0.0", "crossbeam-epoch 0.9.5", @@ -1429,22 +1400,22 @@ checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" [[package]] name = "crypto-mac" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4434400df11d95d556bac068ddfedd482915eb18fe8bea89bc80b6e4b1c179e5" +checksum = "b584a330336237c1eecd3e94266efb216c56ed91225d634cb2991c5f3fd1aeab" dependencies = [ - "generic-array 0.12.4", - "subtle 1.0.0", + "generic-array 0.14.4", + "subtle", ] [[package]] name = "crypto-mac" -version = "0.8.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b584a330336237c1eecd3e94266efb216c56ed91225d634cb2991c5f3fd1aeab" +checksum = "b1d1a86f49236c215f271d40892d5fc950490551400b02ef360692c29815c714" dependencies = [ "generic-array 0.14.4", - "subtle 2.4.1", + "subtle", ] [[package]] @@ -1458,12 +1429,21 @@ dependencies = [ [[package]] name = "ctor" -version = "0.1.20" +version = "0.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e98e2ad1a782e33928b96fc3948e7c355e5af34ba4de7670fe8bac2a3b2006d" +checksum = "ccc0a48a9b826acdf4028595adc9db92caea352f7af011a3034acd172a52a0aa" dependencies = [ "quote 1.0.9", - "syn 1.0.74", + "syn 1.0.77", +] + +[[package]] +name = "ctr" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "049bb91fb4aaf0e3c7efa6cd5ef877dbbbd15b39dad06d9948de4ec8a75761ea" +dependencies = [ + "cipher", ] [[package]] @@ -1480,7 +1460,7 @@ dependencies = [ [[package]] name = "cumulus-client-cli" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.9#fd80849dde5c209c20a996cfcc5aaacd4666dcbe" +source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.10#fa116cfbfb470a8114fc02f9d2e3c0a5ab6c7193" dependencies = [ "sc-cli", "sc-service", @@ -1490,7 +1470,7 @@ dependencies = [ [[package]] name = "cumulus-client-collator" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.9#fd80849dde5c209c20a996cfcc5aaacd4666dcbe" +source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.10#fa116cfbfb470a8114fc02f9d2e3c0a5ab6c7193" dependencies = [ "cumulus-client-consensus-common", "cumulus-client-network", @@ -1514,7 +1494,7 @@ dependencies = [ [[package]] name = "cumulus-client-consensus-aura" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.9#fd80849dde5c209c20a996cfcc5aaacd4666dcbe" +source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.10#fa116cfbfb470a8114fc02f9d2e3c0a5ab6c7193" dependencies = [ "async-trait", "cumulus-client-consensus-common", @@ -1545,7 +1525,7 @@ dependencies = [ [[package]] name = "cumulus-client-consensus-common" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.9#fd80849dde5c209c20a996cfcc5aaacd4666dcbe" +source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.10#fa116cfbfb470a8114fc02f9d2e3c0a5ab6c7193" dependencies = [ "async-trait", "dyn-clone", @@ -1570,7 +1550,7 @@ dependencies = [ [[package]] name = "cumulus-client-network" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.9#fd80849dde5c209c20a996cfcc5aaacd4666dcbe" +source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.10#fa116cfbfb470a8114fc02f9d2e3c0a5ab6c7193" dependencies = [ "derive_more 0.99.16", "futures 0.3.17", @@ -1594,7 +1574,7 @@ dependencies = [ [[package]] name = "cumulus-client-pov-recovery" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.9#fd80849dde5c209c20a996cfcc5aaacd4666dcbe" +source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.10#fa116cfbfb470a8114fc02f9d2e3c0a5ab6c7193" dependencies = [ "cumulus-primitives-core", "futures 0.3.17", @@ -1618,7 +1598,7 @@ dependencies = [ [[package]] name = "cumulus-client-service" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.9#fd80849dde5c209c20a996cfcc5aaacd4666dcbe" +source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.10#fa116cfbfb470a8114fc02f9d2e3c0a5ab6c7193" dependencies = [ "cumulus-client-collator", "cumulus-client-consensus-common", @@ -1647,7 +1627,7 @@ dependencies = [ [[package]] name = "cumulus-pallet-aura-ext" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.9#fd80849dde5c209c20a996cfcc5aaacd4666dcbe" +source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.10#fa116cfbfb470a8114fc02f9d2e3c0a5ab6c7193" dependencies = [ "frame-executive", "frame-support", @@ -1664,7 +1644,7 @@ dependencies = [ [[package]] name = "cumulus-pallet-dmp-queue" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.9#fd80849dde5c209c20a996cfcc5aaacd4666dcbe" +source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.10#fa116cfbfb470a8114fc02f9d2e3c0a5ab6c7193" dependencies = [ "cumulus-primitives-core", "frame-support", @@ -1683,7 +1663,7 @@ dependencies = [ [[package]] name = "cumulus-pallet-parachain-system" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.9#fd80849dde5c209c20a996cfcc5aaacd4666dcbe" +source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.10#fa116cfbfb470a8114fc02f9d2e3c0a5ab6c7193" dependencies = [ "cumulus-pallet-parachain-system-proc-macro", "cumulus-primitives-core", @@ -1711,18 +1691,18 @@ dependencies = [ [[package]] name = "cumulus-pallet-parachain-system-proc-macro" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.9#fd80849dde5c209c20a996cfcc5aaacd4666dcbe" +source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.10#fa116cfbfb470a8114fc02f9d2e3c0a5ab6c7193" dependencies = [ - "proc-macro-crate 1.0.0", + "proc-macro-crate 1.1.0", "proc-macro2 1.0.29", "quote 1.0.9", - "syn 1.0.74", + "syn 1.0.77", ] [[package]] name = "cumulus-pallet-xcm" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.9#fd80849dde5c209c20a996cfcc5aaacd4666dcbe" +source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.10#fa116cfbfb470a8114fc02f9d2e3c0a5ab6c7193" dependencies = [ "cumulus-primitives-core", "frame-support", @@ -1738,7 +1718,7 @@ dependencies = [ [[package]] name = "cumulus-pallet-xcmp-queue" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.9#fd80849dde5c209c20a996cfcc5aaacd4666dcbe" +source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.10#fa116cfbfb470a8114fc02f9d2e3c0a5ab6c7193" dependencies = [ "cumulus-primitives-core", "frame-support", @@ -1756,7 +1736,7 @@ dependencies = [ [[package]] name = "cumulus-primitives-core" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.9#fd80849dde5c209c20a996cfcc5aaacd4666dcbe" +source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.10#fa116cfbfb470a8114fc02f9d2e3c0a5ab6c7193" dependencies = [ "frame-support", "impl-trait-for-tuples", @@ -1774,7 +1754,7 @@ dependencies = [ [[package]] name = "cumulus-primitives-parachain-inherent" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.9#fd80849dde5c209c20a996cfcc5aaacd4666dcbe" +source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.10#fa116cfbfb470a8114fc02f9d2e3c0a5ab6c7193" dependencies = [ "async-trait", "cumulus-primitives-core", @@ -1795,7 +1775,7 @@ dependencies = [ [[package]] name = "cumulus-primitives-timestamp" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.9#fd80849dde5c209c20a996cfcc5aaacd4666dcbe" +source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.10#fa116cfbfb470a8114fc02f9d2e3c0a5ab6c7193" dependencies = [ "cumulus-primitives-core", "sp-inherents", @@ -1806,7 +1786,7 @@ dependencies = [ [[package]] name = "cumulus-primitives-utility" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.9#fd80849dde5c209c20a996cfcc5aaacd4666dcbe" +source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.10#fa116cfbfb470a8114fc02f9d2e3c0a5ab6c7193" dependencies = [ "cumulus-primitives-core", "frame-support", @@ -1824,7 +1804,7 @@ dependencies = [ [[package]] name = "cumulus-test-relay-sproof-builder" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.9#fd80849dde5c209c20a996cfcc5aaacd4666dcbe" +source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.10#fa116cfbfb470a8114fc02f9d2e3c0a5ab6c7193" dependencies = [ "cumulus-primitives-core", "parity-scale-codec", @@ -1843,20 +1823,20 @@ dependencies = [ "byteorder", "digest 0.8.1", "rand_core 0.5.1", - "subtle 2.4.1", + "subtle", "zeroize", ] [[package]] name = "curve25519-dalek" -version = "3.1.0" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "639891fde0dbea823fc3d798a0fdf9d2f9440a42d64a78ab3488b0ca025117b3" +checksum = "0b9fdf9972b2bd6af2d913799d9ebc165ea4d2e65878e329d9c6b372c4491b61" dependencies = [ "byteorder", "digest 0.9.0", "rand_core 0.5.1", - "subtle 2.4.1", + "subtle", "zeroize", ] @@ -1883,7 +1863,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a5bbed42daaa95e780b60a50546aa345b8413a1e46f9a40a12907d3598f038db" dependencies = [ "data-encoding", - "syn 1.0.74", + "syn 1.0.77", ] [[package]] @@ -1894,7 +1874,7 @@ checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" dependencies = [ "proc-macro2 1.0.29", "quote 1.0.9", - "syn 1.0.74", + "syn 1.0.77", ] [[package]] @@ -1921,7 +1901,7 @@ dependencies = [ "proc-macro2 1.0.29", "quote 1.0.9", "rustc_version 0.3.3", - "syn 1.0.74", + "syn 1.0.77", ] [[package]] @@ -2017,7 +1997,7 @@ checksum = "558e40ea573c374cf53507fd240b7ee2f5477df7cfebdb97323ec61c719399c5" dependencies = [ "proc-macro2 1.0.29", "quote 1.0.9", - "syn 1.0.74", + "syn 1.0.77", ] [[package]] @@ -2041,11 +2021,11 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c762bae6dcaf24c4c84667b8579785430908723d5c889f469d76a41d59cc7a9d" dependencies = [ - "curve25519-dalek 3.1.0", + "curve25519-dalek 3.2.0", "ed25519", "rand 0.7.3", "serde", - "sha2 0.9.5", + "sha2 0.9.8", "zeroize", ] @@ -2064,7 +2044,7 @@ dependencies = [ "heck", "proc-macro2 1.0.29", "quote 1.0.9", - "syn 1.0.74", + "syn 1.0.77", ] [[package]] @@ -2084,7 +2064,7 @@ checksum = "946ee94e3dbf58fdd324f9ce245c7b238d46a66f00e86a020b71996349e46cce" dependencies = [ "proc-macro2 1.0.29", "quote 1.0.9", - "syn 1.0.74", + "syn 1.0.77", ] [[package]] @@ -2095,7 +2075,7 @@ checksum = "4e58b112d5099aa0857c5d05f0eacab86406dd8c0f85fe5d320a13256d29ecf4" dependencies = [ "proc-macro2 1.0.29", "quote 1.0.9", - "syn 1.0.74", + "syn 1.0.77", ] [[package]] @@ -2220,7 +2200,7 @@ checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4" dependencies = [ "proc-macro2 1.0.29", "quote 1.0.9", - "syn 1.0.74", + "syn 1.0.77", "synstructure", ] @@ -2266,9 +2246,9 @@ dependencies = [ [[package]] name = "finality-grandpa" -version = "0.14.1" +version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74a1bfdcc776e63e49f741c7ce6116fa1b887e8ac2e3ccb14dd4aa113e54feb9" +checksum = "e8ac3ff5224ef91f3c97e03eb1de2db82743427e91aaa5ac635f454f0b164f5a" dependencies = [ "either", "futures 0.3.17", @@ -2276,7 +2256,8 @@ dependencies = [ "log", "num-traits", "parity-scale-codec", - "parking_lot 0.11.1", + "parking_lot 0.11.2", + "scale-info 1.0.0", ] [[package]] @@ -2299,9 +2280,9 @@ checksum = "37ab347416e802de484e4d03c7316c48f1ecb56574dfd4a46a80f173ce1de04d" [[package]] name = "flate2" -version = "1.0.20" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd3aec53de10fe96d7d8c565eb17f2c687bb5518a2ec453b5b1252964526abe0" +checksum = "1e6988e897c1c9c485f43b47a529cef42fde0547f9d8d41a7062518f1d8fc53f" dependencies = [ "cfg-if 1.0.0", "crc32fast", @@ -2319,7 +2300,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "fork-tree" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "parity-scale-codec", ] @@ -2337,7 +2318,7 @@ dependencies = [ [[package]] name = "frame-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "frame-support", "frame-system", @@ -2356,7 +2337,7 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "Inflector", "chrono", @@ -2382,7 +2363,7 @@ dependencies = [ [[package]] name = "frame-election-provider-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "frame-support", "frame-system", @@ -2395,7 +2376,7 @@ dependencies = [ [[package]] name = "frame-executive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "frame-support", "frame-system", @@ -2410,7 +2391,7 @@ dependencies = [ [[package]] name = "frame-metadata" version = "14.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "parity-scale-codec", "serde", @@ -2421,7 +2402,7 @@ dependencies = [ [[package]] name = "frame-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "bitflags", "frame-metadata", @@ -2447,41 +2428,41 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "Inflector", "frame-support-procedural-tools", "proc-macro2 1.0.29", "quote 1.0.9", - "syn 1.0.74", + "syn 1.0.77", ] [[package]] name = "frame-support-procedural-tools" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "frame-support-procedural-tools-derive", - "proc-macro-crate 1.0.0", + "proc-macro-crate 1.1.0", "proc-macro2 1.0.29", "quote 1.0.9", - "syn 1.0.74", + "syn 1.0.77", ] [[package]] name = "frame-support-procedural-tools-derive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "proc-macro2 1.0.29", "quote 1.0.9", - "syn 1.0.74", + "syn 1.0.77", ] [[package]] name = "frame-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "frame-support", "impl-trait-for-tuples", @@ -2498,7 +2479,7 @@ dependencies = [ [[package]] name = "frame-system-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "frame-benchmarking", "frame-support", @@ -2512,7 +2493,7 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "parity-scale-codec", "sp-api", @@ -2521,7 +2502,7 @@ dependencies = [ [[package]] name = "frame-try-runtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "frame-support", "parity-scale-codec", @@ -2676,7 +2657,7 @@ dependencies = [ "proc-macro-hack", "proc-macro2 1.0.29", "quote 1.0.9", - "syn 1.0.74", + "syn 1.0.77", ] [[package]] @@ -2785,9 +2766,9 @@ dependencies = [ [[package]] name = "ghash" -version = "0.3.1" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97304e4cd182c3846f7575ced3890c53012ce534ad9114046b0a9e00bb30a375" +checksum = "1583cc1656d7839fd3732b80cf4f38850336cdb9b8ded1cd399ca62958de3c99" dependencies = [ "opaque-debug 0.3.0", "polyval", @@ -2804,6 +2785,12 @@ dependencies = [ "stable_deref_trait", ] +[[package]] +name = "gimli" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0a01e0497841a3b2db4f8afa483cce65f7e96a3498bd6c541734792aeac8fe7" + [[package]] name = "glob" version = "0.3.0" @@ -2865,7 +2852,7 @@ dependencies = [ "futures-core", "futures-sink", "futures-util", - "http 0.2.4", + "http 0.2.5", "indexmap", "slab", "tokio 0.2.25", @@ -2903,22 +2890,13 @@ dependencies = [ "crunchy", ] -[[package]] -name = "hashbrown" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04" -dependencies = [ - "ahash 0.4.7", -] - [[package]] name = "hashbrown" version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" dependencies = [ - "ahash 0.7.4", + "ahash", ] [[package]] @@ -2953,7 +2931,6 @@ dependencies = [ "orml-oracle", "orml-oracle-rpc-runtime-api", "orml-traits", - "orml-unknown-tokens", "orml-utilities", "orml-vesting", "orml-xcm", @@ -3036,16 +3013,6 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b07f60793ff0a4d9cef0f18e63b5357e06209987153a64648c972c1e5aff336f" -[[package]] -name = "hmac" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dcb5e64cda4c23119ab41ba960d1e170a774c8e4b9d9e6a9bc18aabf5e59695" -dependencies = [ - "crypto-mac 0.7.0", - "digest 0.8.1", -] - [[package]] name = "hmac" version = "0.8.1" @@ -3057,14 +3024,13 @@ dependencies = [ ] [[package]] -name = "hmac-drbg" -version = "0.2.0" +name = "hmac" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6e570451493f10f6581b48cdd530413b63ea9e780f544bfd3bdcaa0d89d1a7b" +checksum = "2a2a2320eb7ec0ebe8da8f744d7812d9fc4cb4d09344ac01898dbcb6a20ae69b" dependencies = [ - "digest 0.8.1", - "generic-array 0.12.4", - "hmac 0.7.1", + "crypto-mac 0.11.1", + "digest 0.9.0", ] [[package]] @@ -3102,11 +3068,11 @@ dependencies = [ [[package]] name = "http" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "527e8c9ac747e28542699a951517aa9a6945af506cd1f2e1b53a576c17b6cc11" +checksum = "1323096b05d41827dadeaee54c9981958c0f94e670bc94ed80037d1a7b8b186b" dependencies = [ - "bytes 1.0.1", + "bytes 1.1.0", "fnv", "itoa", ] @@ -3130,25 +3096,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13d5ff830006f7646652e057693569bfe0d51760c0085a071769d142a205111b" dependencies = [ "bytes 0.5.6", - "http 0.2.4", + "http 0.2.5", ] [[package]] name = "http-body" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60daa14be0e0786db0f03a9e57cb404c9d756eed2b6c62b9ea98ec5743ec75a9" +checksum = "399c583b2979440c60be0821a6199eca73bc3c8dcd9d070d75ac726e2c6186e5" dependencies = [ - "bytes 1.0.1", - "http 0.2.4", + "bytes 1.1.0", + "http 0.2.5", "pin-project-lite 0.2.7", ] [[package]] name = "httparse" -version = "1.4.1" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3a87b616e37e93c22fb19bcd386f02f3af5ea98a25670ad0fce773de23c5e68" +checksum = "acd94fdbe1d4ff688b67b04eee2e17bd50995534a61539e45adfefb45e5e5503" [[package]] name = "httpdate" @@ -3218,7 +3184,7 @@ dependencies = [ "futures-core", "futures-util", "h2 0.2.7", - "http 0.2.4", + "http 0.2.5", "http-body 0.3.1", "httparse", "httpdate 0.3.2", @@ -3233,21 +3199,21 @@ dependencies = [ [[package]] name = "hyper" -version = "0.14.11" +version = "0.14.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b61cf2d1aebcf6e6352c97b81dc2244ca29194be1b276f5d8ad5c6330fffb11" +checksum = "15d1cfb9e4f68655fa04c01f59edb405b6074a0f7118ea881e5026e4a1cd8593" dependencies = [ - "bytes 1.0.1", + "bytes 1.1.0", "futures-channel", "futures-core", "futures-util", - "http 0.2.4", - "http-body 0.4.2", + "http 0.2.5", + "http-body 0.4.3", "httparse", "httpdate 1.0.1", "itoa", "pin-project-lite 0.2.7", - "tokio 1.9.0", + "tokio 1.12.0", "tower-service", "tracing", "want 0.3.0", @@ -3295,9 +3261,9 @@ dependencies = [ [[package]] name = "if-addrs" -version = "0.6.5" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28538916eb3f3976311f5dfbe67b5362d0add1293d0a9cad17debf86f8e3aa48" +checksum = "c9a83ec4af652890ac713ffd8dc859e650420a5ef47f7b9be29b6664ab50fbc8" dependencies = [ "if-addrs-sys", "libc", @@ -3365,7 +3331,7 @@ checksum = "d5dacb10c5b3bb92d46ba347505a9041e676bb20ad220101326bffb0c93031ee" dependencies = [ "proc-macro2 1.0.29", "quote 1.0.9", - "syn 1.0.74", + "syn 1.0.77", ] [[package]] @@ -3375,17 +3341,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc633605454125dec4b66843673f01c7df2b89479b32e0ed634e43a91cff62a5" dependencies = [ "autocfg", - "hashbrown 0.11.2", + "hashbrown", "serde", ] [[package]] name = "instant" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bee0328b1209d157ef001c94dd85b4f8f64139adb0eac2659f4b08382b2f474d" +checksum = "716d3d89f35ac6a34fd0eed635395f4c3b76fa889338a4632e5231a8684216bd" dependencies = [ "cfg-if 1.0.0", + "js-sys", + "wasm-bindgen", + "web-sys", ] [[package]] @@ -3446,15 +3415,6 @@ version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "68f2d64f2edebec4ce84ad108148e67e1064789bee435edc5b60ad398714a3a9" -[[package]] -name = "itertools" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b" -dependencies = [ - "either", -] - [[package]] name = "itertools" version = "0.10.1" @@ -3466,24 +3426,24 @@ dependencies = [ [[package]] name = "itoa" -version = "0.4.7" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736" +checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" [[package]] name = "jobserver" -version = "0.1.22" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "972f5ae5d1cb9c6ae417789196c803205313edde988685da5e3aae0827b9e7fd" +checksum = "af25a77299a7f711a01975c35a6a424eb6862092cc2d6c72c4ed6cbc56dfc1fa" dependencies = [ "libc", ] [[package]] name = "js-sys" -version = "0.3.51" +version = "0.3.55" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83bdfbace3a0e81a4253f73b49e960b053e396a11012cbd49b9b74d6a2b67062" +checksum = "7cc9ffccd38c451a86bf13657df244e9c3f37493cce8e5e21e940963777acc84" dependencies = [ "wasm-bindgen", ] @@ -3535,7 +3495,7 @@ dependencies = [ "proc-macro-crate 0.1.5", "proc-macro2 1.0.29", "quote 1.0.9", - "syn 1.0.74", + "syn 1.0.77", ] [[package]] @@ -3612,29 +3572,29 @@ dependencies = [ [[package]] name = "jsonrpsee-proc-macros" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f37924e16300e249a52a22cabb5632f846dc9760b39355f5e8bc70cd23dc6300" +checksum = "8edb341d35279b59c79d7fe9e060a51aec29d45af99cc7c72ea7caa350fa71a4" dependencies = [ "Inflector", "bae", - "proc-macro-crate 1.0.0", + "proc-macro-crate 1.1.0", "proc-macro2 1.0.29", "quote 1.0.9", - "syn 1.0.74", + "syn 1.0.77", ] [[package]] name = "jsonrpsee-types" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d67724d368c59e08b557a516cf8fcc51100e7a708850f502e1044b151fe89788" +checksum = "4cc738fd55b676ada3271ef7c383a14a0867a2a88b0fa941311bf5fc0a29d498" dependencies = [ "async-trait", "beef", "futures-channel", "futures-util", - "hyper 0.14.11", + "hyper 0.14.13", "log", "serde", "serde_json", @@ -3644,9 +3604,9 @@ dependencies = [ [[package]] name = "jsonrpsee-ws-client" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e2834b6e7f57ce9a4412ed4d6dc95125d2c8612e68f86b9d9a07369164e4198" +checksum = "9841352dbecf4c2ed5dc71698df9f1660262ae4e0b610e968602529bdbcf7b30" dependencies = [ "async-trait", "fnv", @@ -3684,8 +3644,8 @@ dependencies = [ [[package]] name = "kusama-runtime" -version = "0.9.9-1" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" +version = "0.9.10" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.10#aeea9b7bd81919e014f7621f6c4b2eb9709d918f" dependencies = [ "beefy-primitives", "bitvec 0.20.4", @@ -3793,7 +3753,7 @@ checksum = "c3b6b85fc643f5acd0bffb2cc8a6d150209379267af0d41db72170021841f9f5" dependencies = [ "kvdb", "parity-util-mem", - "parking_lot 0.11.1", + "parking_lot 0.11.2", ] [[package]] @@ -3808,7 +3768,7 @@ dependencies = [ "num_cpus", "owning_ref", "parity-util-mem", - "parking_lot 0.11.1", + "parking_lot 0.11.2", "regex", "rocksdb", "smallvec 1.6.1", @@ -3828,9 +3788,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.98" +version = "0.2.102" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "320cfe77175da3a483efed4bc0adc1968ca050b098ce4f2f1c13a56626128790" +checksum = "a2a5ac8f984bfcf3a823267e5fde638acc3325f6496633a5da6bb6eb2171e103" [[package]] name = "libloading" @@ -3860,12 +3820,12 @@ checksum = "c7d73b3f436185384286bd8098d17ec07c9a7d2388a6599f824d8502b529702a" [[package]] name = "libp2p" -version = "0.37.1" +version = "0.39.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08053fbef67cd777049ef7a95ebaca2ece370b4ed7712c3fa404d69a88cb741b" +checksum = "9004c06878ef8f3b4b4067e69a140d87ed20bf777287f82223e49713b36ee433" dependencies = [ "atomic", - "bytes 1.0.1", + "bytes 1.1.0", "futures 0.3.17", "lazy_static", "libp2p-core", @@ -3890,8 +3850,8 @@ dependencies = [ "libp2p-wasm-ext", "libp2p-websocket", "libp2p-yamux", - "parity-multiaddr", - "parking_lot 0.11.1", + "multiaddr", + "parking_lot 0.11.2", "pin-project 1.0.8", "smallvec 1.6.1", "wasm-timer", @@ -3899,9 +3859,9 @@ dependencies = [ [[package]] name = "libp2p-core" -version = "0.28.3" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "554d3e7e9e65f939d66b75fd6a4c67f258fe250da61b91f46c545fc4a89b51d9" +checksum = "af9b4abdeaa420593a297c8592f63fad4234f4b88dc9343b8fd8e736c35faa59" dependencies = [ "asn1_der", "bs58", @@ -3911,19 +3871,19 @@ dependencies = [ "futures 0.3.17", "futures-timer 3.0.2", "lazy_static", - "libsecp256k1 0.3.5", + "libsecp256k1 0.5.0", "log", - "multihash", + "multiaddr", + "multihash 0.14.0", "multistream-select", - "parity-multiaddr", - "parking_lot 0.11.1", + "parking_lot 0.11.2", "pin-project 1.0.8", "prost", "prost-build", "rand 0.7.3", "ring", "rw-stream-sink", - "sha2 0.9.5", + "sha2 0.9.8", "smallvec 1.6.1", "thiserror", "unsigned-varint 0.7.0", @@ -3933,9 +3893,9 @@ dependencies = [ [[package]] name = "libp2p-deflate" -version = "0.28.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2181a641cd15f9b6ba71b1335800f309012a0a97a29ffaabbbf40e9d3d58f08" +checksum = "66097fccc0b7f8579f90a03ea76ba6196332ea049fd07fd969490a06819dcdc8" dependencies = [ "flate2", "futures 0.3.17", @@ -3944,9 +3904,9 @@ dependencies = [ [[package]] name = "libp2p-dns" -version = "0.28.1" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62e63dab8b5ff35e0c101a3e51e843ba782c07bbb1682f5fd827622e0d02b98b" +checksum = "58ff08b3196b85a17f202d80589e93b1660a574af67275706657fdc762e42c32" dependencies = [ "async-std-resolver", "futures 0.3.17", @@ -3958,9 +3918,9 @@ dependencies = [ [[package]] name = "libp2p-floodsub" -version = "0.29.0" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48a9b570f6766301d9c4aa00fce3554cad1598e2f466debbc4dde909028417cf" +checksum = "404eca8720967179dac7a5b4275eb91f904a53859c69ca8d018560ad6beb214f" dependencies = [ "cuckoofilter", "fnv", @@ -3976,14 +3936,14 @@ dependencies = [ [[package]] name = "libp2p-gossipsub" -version = "0.30.1" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7b0c8506a6ec3344b9e706d7c7a6dba826f8ede735cfe13dde12a8c263c4af9" +checksum = "b1cc48709bcbc3a3321f08a73560b4bbb4166a7d56f6fdb615bc775f4f91058e" dependencies = [ "asynchronous-codec 0.6.0", "base64 0.13.0", "byteorder", - "bytes 1.0.1", + "bytes 1.1.0", "fnv", "futures 0.3.17", "hex_fmt", @@ -3994,7 +3954,7 @@ dependencies = [ "prost-build", "rand 0.7.3", "regex", - "sha2 0.9.5", + "sha2 0.9.8", "smallvec 1.6.1", "unsigned-varint 0.7.0", "wasm-timer", @@ -4002,9 +3962,9 @@ dependencies = [ [[package]] name = "libp2p-identify" -version = "0.29.0" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f668f00efd9883e8b7bcc582eaf0164615792608f886f6577da18bcbeea0a46" +checksum = "a7b61f6cf07664fb97016c318c4d4512b3dd4cc07238607f3f0163245f99008e" dependencies = [ "futures 0.3.17", "libp2p-core", @@ -4018,13 +3978,13 @@ dependencies = [ [[package]] name = "libp2p-kad" -version = "0.30.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b07312ebe5ee4fd2404447a0609814574df55c65d4e20838b957bbd34907d820" +checksum = "50ed78489c87924235665a0ab345b298ee34dff0f7ad62c0ba6608b2144fb75e" dependencies = [ "arrayvec 0.5.2", "asynchronous-codec 0.6.0", - "bytes 1.0.1", + "bytes 1.1.0", "either", "fnv", "futures 0.3.17", @@ -4034,7 +3994,7 @@ dependencies = [ "prost", "prost-build", "rand 0.7.3", - "sha2 0.9.5", + "sha2 0.9.8", "smallvec 1.6.1", "uint", "unsigned-varint 0.7.0", @@ -4044,9 +4004,9 @@ dependencies = [ [[package]] name = "libp2p-mdns" -version = "0.30.2" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4efa70c1c3d2d91237f8546e27aeb85e287d62c066a7b4f3ea6a696d43ced714" +checksum = "a29e6cbc2a24b8471b6567e580a0e8e7b70a6d0f0ea2be0844d1e842d7d4fa33" dependencies = [ "async-io", "data-encoding", @@ -4059,23 +4019,23 @@ dependencies = [ "log", "rand 0.8.4", "smallvec 1.6.1", - "socket2 0.4.0", + "socket2 0.4.2", "void", ] [[package]] name = "libp2p-mplex" -version = "0.28.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85e9b544335d1ed30af71daa96edbefadef6f19c7a55f078b9fc92c87163105d" +checksum = "313d9ea526c68df4425f580024e67a9d3ffd49f2c33de5154b1f5019816f7a99" dependencies = [ "asynchronous-codec 0.6.0", - "bytes 1.0.1", + "bytes 1.1.0", "futures 0.3.17", "libp2p-core", "log", "nohash-hasher", - "parking_lot 0.11.1", + "parking_lot 0.11.2", "rand 0.7.3", "smallvec 1.6.1", "unsigned-varint 0.7.0", @@ -4083,20 +4043,20 @@ dependencies = [ [[package]] name = "libp2p-noise" -version = "0.30.0" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36db0f0db3b0433f5b9463f1c0cd9eadc0a3734a9170439ce501ff99733a88bd" +checksum = "3f1db7212f342b6ba7c981cc40e31f76e9e56cb48e65fa4c142ecaca5839523e" dependencies = [ - "bytes 1.0.1", - "curve25519-dalek 3.1.0", + "bytes 1.1.0", + "curve25519-dalek 3.2.0", "futures 0.3.17", "lazy_static", "libp2p-core", "log", "prost", "prost-build", - "rand 0.7.3", - "sha2 0.9.5", + "rand 0.8.4", + "sha2 0.9.8", "snow", "static_assertions", "x25519-dalek", @@ -4105,9 +4065,9 @@ dependencies = [ [[package]] name = "libp2p-ping" -version = "0.29.0" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf4bfaffac63bf3c7ec11ed9d8879d455966ddea7e78ee14737f0b6dce0d1cd1" +checksum = "2482cfd9eb0b7a0baaf3e7b329dc4f2785181a161b1a47b7192f8d758f54a439" dependencies = [ "futures 0.3.17", "libp2p-core", @@ -4120,12 +4080,12 @@ dependencies = [ [[package]] name = "libp2p-plaintext" -version = "0.28.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c8c37b4d2a075b4be8442760a5f8c037180f0c8dd5b5734b9978ab868b3aa11" +checksum = "13b4783e5423870b9a5c199f65a7a3bc66d86ab56b2b9beebf3c338d889cf8e4" dependencies = [ "asynchronous-codec 0.6.0", - "bytes 1.0.1", + "bytes 1.1.0", "futures 0.3.17", "libp2p-core", "log", @@ -4137,9 +4097,9 @@ dependencies = [ [[package]] name = "libp2p-pnet" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ce3374f3b28162db9d3442c9347c4f14cb01e8290052615c7d341d40eae0599" +checksum = "07cb4dd4b917e5b40ddefe49b96b07adcd8d342e0317011d175b7b2bb1dcc974" dependencies = [ "futures 0.3.17", "log", @@ -4151,12 +4111,12 @@ dependencies = [ [[package]] name = "libp2p-relay" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b8786aca3f18671d8776289706a5521f6c9124a820f69e358de214b9939440d" +checksum = "0133f6cfd81cdc16e716de2982e012c62e6b9d4f12e41967b3ee361051c622aa" dependencies = [ "asynchronous-codec 0.6.0", - "bytes 1.0.1", + "bytes 1.1.0", "futures 0.3.17", "futures-timer 3.0.2", "libp2p-core", @@ -4174,12 +4134,12 @@ dependencies = [ [[package]] name = "libp2p-request-response" -version = "0.11.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cdbe172f08e6d0f95fa8634e273d4c4268c4063de2e33e7435194b0130c62e3" +checksum = "06cdae44b6821466123af93cbcdec7c9e6ba9534a8af9cdc296446d39416d241" dependencies = [ "async-trait", - "bytes 1.0.1", + "bytes 1.1.0", "futures 0.3.17", "libp2p-core", "libp2p-swarm", @@ -4194,9 +4154,9 @@ dependencies = [ [[package]] name = "libp2p-swarm" -version = "0.29.0" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e04d8e1eef675029ec728ba14e8d0da7975d84b6679b699b4ae91a1de9c3a92" +checksum = "7083861341e1555467863b4cd802bea1e8c4787c0f7b5110097d0f1f3248f9a9" dependencies = [ "either", "futures 0.3.17", @@ -4210,19 +4170,19 @@ dependencies = [ [[package]] name = "libp2p-swarm-derive" -version = "0.23.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "365b0a699fea5168676840567582a012ea297b1ca02eee467e58301b9c9c5eed" +checksum = "ab8cb308d4fc854869f5abb54fdab0833d2cf670d407c745849dc47e6e08d79c" dependencies = [ "quote 1.0.9", - "syn 1.0.74", + "syn 1.0.77", ] [[package]] name = "libp2p-tcp" -version = "0.28.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b1a27d21c477951799e99d5c105d78868258502ce092988040a808d5a19bbd9" +checksum = "79edd26b6b4bb5feee210dcda562dca186940dfecb0024b979c3f50824b3bf28" dependencies = [ "async-io", "futures 0.3.17", @@ -4232,14 +4192,14 @@ dependencies = [ "libc", "libp2p-core", "log", - "socket2 0.4.0", + "socket2 0.4.2", ] [[package]] name = "libp2p-uds" -version = "0.28.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffd6564bb3b7ff203661ccbb69003c2b551e34cef974f2d6c6a28306a12170b5" +checksum = "280e793440dd4e9f273d714f4497325c72cddb0fe85a49f9a03c88f41dd20182" dependencies = [ "async-std", "futures 0.3.17", @@ -4249,9 +4209,9 @@ dependencies = [ [[package]] name = "libp2p-wasm-ext" -version = "0.28.2" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2d413e4cf9b8e5dfbcd2a60d3dc5a3391308bdb463684093d4f67137b7113de" +checksum = "f553b7140fad3d7a76f50497b0ea591e26737d9607428a75509fc191e4d1b1f6" dependencies = [ "futures 0.3.17", "js-sys", @@ -4263,9 +4223,9 @@ dependencies = [ [[package]] name = "libp2p-websocket" -version = "0.29.0" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cace60995ef6f637e4752cccbb2590f6bc358e8741a0d066307636c69a4b3a74" +checksum = "ddf99dcbf5063e9d59087f61b1e85c686ceab2f5abedb472d32288065c0e5e27" dependencies = [ "either", "futures 0.3.17", @@ -4281,13 +4241,13 @@ dependencies = [ [[package]] name = "libp2p-yamux" -version = "0.32.0" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f35da42cfc6d5cb0dcf3ad6881bc68d146cdf38f98655e09e33fbba4d13eabc4" +checksum = "214cc0dd9c37cbed27f0bb1eba0c41bbafdb93a8be5e9d6ae1e6b4b42cd044bf" dependencies = [ "futures 0.3.17", "libp2p-core", - "parking_lot 0.11.1", + "parking_lot 0.11.2", "thiserror", "yamux", ] @@ -4306,17 +4266,20 @@ dependencies = [ [[package]] name = "libsecp256k1" -version = "0.3.5" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fc1e2c808481a63dc6da2074752fdd4336a3c8fcc68b83db6f1fd5224ae7962" +checksum = "bd1137239ab33b41aa9637a88a28249e5e70c40a42ccc92db7f12cc356c1fcd7" dependencies = [ "arrayref", - "crunchy", - "digest 0.8.1", - "hmac-drbg 0.2.0", + "base64 0.12.3", + "digest 0.9.0", + "hmac-drbg", + "libsecp256k1-core", + "libsecp256k1-gen-ecmult", + "libsecp256k1-gen-genmult", "rand 0.7.3", - "sha2 0.8.2", - "subtle 2.4.1", + "serde", + "sha2 0.9.8", "typenum", ] @@ -4329,13 +4292,13 @@ dependencies = [ "arrayref", "base64 0.12.3", "digest 0.9.0", - "hmac-drbg 0.3.0", + "hmac-drbg", "libsecp256k1-core", "libsecp256k1-gen-ecmult", "libsecp256k1-gen-genmult", "rand 0.7.3", "serde", - "sha2 0.9.5", + "sha2 0.9.8", "typenum", ] @@ -4347,7 +4310,7 @@ checksum = "d0f6ab710cec28cef759c5f18671a27dae2a5f952cdaaee1d8e2908cb2478a80" dependencies = [ "crunchy", "digest 0.9.0", - "subtle 2.4.1", + "subtle", ] [[package]] @@ -4396,9 +4359,9 @@ dependencies = [ [[package]] name = "linregress" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e6e407dadb4ca4b31bc69c27aff00e7ca4534fdcee855159b039a7cebb5f395" +checksum = "d6c601a85f5ecd1aba625247bca0031585fb1c446461b142878a16f8245ddeb8" dependencies = [ "nalgebra", "statrs", @@ -4415,9 +4378,9 @@ dependencies = [ [[package]] name = "lock_api" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0382880606dff6d15c9476c416d18690b72742aa7b605bb6dd6ec9030fbf07eb" +checksum = "712a4d093c9976e24e7dbca41db895dabcbac38eb5f4045393d17a95bdfb1109" dependencies = [ "scopeguard", ] @@ -4434,11 +4397,11 @@ dependencies = [ [[package]] name = "lru" -version = "0.6.5" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f374d42cdfc1d7dbf3d3dec28afab2eb97ffbf43a3234d795b5986dbf4b90ba" +checksum = "7ea2d928b485416e8908cff2d97d621db22b27f7b3b6729e438bcf42c671ba91" dependencies = [ - "hashbrown 0.9.1", + "hashbrown", ] [[package]] @@ -4482,9 +4445,9 @@ dependencies = [ [[package]] name = "matches" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" +checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" [[package]] name = "matrixmultiply" @@ -4503,9 +4466,9 @@ checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" [[package]] name = "memchr" -version = "2.4.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b16bd47d9e329435e309c58469fe0791c2d0d1ba96ec0954152a5ae2b04387dc" +checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a" [[package]] name = "memmap2" @@ -4541,7 +4504,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "de006e09d04fc301a5f7e817b75aa49801c4479a8af753764416b085337ddcc5" dependencies = [ "hash-db", - "hashbrown 0.11.2", + "hashbrown", "parity-util-mem", ] @@ -4574,8 +4537,8 @@ dependencies = [ [[package]] name = "metered-channel" -version = "0.9.9-1" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" +version = "0.9.10" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.10#aeea9b7bd81919e014f7621f6c4b2eb9709d918f" dependencies = [ "derive_more 0.99.16", "futures 0.3.17", @@ -4610,7 +4573,7 @@ checksum = "54999f917cd092b13904737e26631aa2b2b88d625db68e4bab461dcd8006c788" dependencies = [ "proc-macro2 1.0.29", "quote 1.0.9", - "syn 1.0.74", + "syn 1.0.77", ] [[package]] @@ -4704,6 +4667,24 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0debeb9fcf88823ea64d64e4a815ab1643f33127d995978e099942ce38f25238" +[[package]] +name = "multiaddr" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48ee4ea82141951ac6379f964f71b20876d43712bea8faf6dd1a375e08a46499" +dependencies = [ + "arrayref", + "bs58", + "byteorder", + "data-encoding", + "multihash 0.14.0", + "percent-encoding 2.1.0", + "serde", + "static_assertions", + "unsigned-varint 0.7.0", + "url 2.2.2", +] + [[package]] name = "multibase" version = "0.8.0" @@ -4727,22 +4708,35 @@ dependencies = [ "digest 0.9.0", "generic-array 0.14.4", "multihash-derive", - "sha2 0.9.5", + "sha2 0.9.8", "sha3", "unsigned-varint 0.5.1", ] +[[package]] +name = "multihash" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "752a61cd890ff691b4411423d23816d5866dd5621e4d1c5687a53b94b5a979d8" +dependencies = [ + "digest 0.9.0", + "generic-array 0.14.4", + "multihash-derive", + "sha2 0.9.8", + "unsigned-varint 0.7.0", +] + [[package]] name = "multihash-derive" version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "424f6e86263cd5294cbd7f1e95746b95aca0e0d66bff31e5a40d6baa87b4aa99" dependencies = [ - "proc-macro-crate 1.0.0", + "proc-macro-crate 1.1.0", "proc-macro-error 1.0.4", "proc-macro2 1.0.29", "quote 1.0.9", - "syn 1.0.74", + "syn 1.0.77", "synstructure", ] @@ -4758,7 +4752,7 @@ version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7d91ec0a2440aaff5f78ec35631a7027d50386c6163aa975f7caa0d5da4b6ff8" dependencies = [ - "bytes 1.0.1", + "bytes 1.1.0", "futures 0.3.17", "log", "pin-project 1.0.8", @@ -4792,7 +4786,7 @@ checksum = "01fcc0b8149b4632adc89ac3b7b31a12fb6099a0317a4eb2ebff574ef7de7218" dependencies = [ "proc-macro2 1.0.29", "quote 1.0.9", - "syn 1.0.74", + "syn 1.0.77", ] [[package]] @@ -4924,9 +4918,9 @@ dependencies = [ [[package]] name = "object" -version = "0.25.3" +version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a38f2be3697a57b4060074ff41b44c16870d916ad7877c17696e063257482bc7" +checksum = "39f37e50073ccad23b6d09bcb5b263f4e76d3bb6038e4a3c08e52162ffa8abc2" dependencies = [ "memchr", ] @@ -4937,7 +4931,7 @@ version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56" dependencies = [ - "parking_lot 0.11.1", + "parking_lot 0.11.2", ] [[package]] @@ -4970,7 +4964,7 @@ dependencies = [ [[package]] name = "orml-oracle" version = "0.4.1-dev" -source = "git+https://github.com/open-web3-stack/open-runtime-module-library.git#65f1734ee8438e1b667a2e8148f6f68c717ad2b2" +source = "git+https://github.com/open-web3-stack/open-runtime-module-library.git?branch=sw/xcm-v1#f1353021595525f8faa0c860e14da59afb200118" dependencies = [ "frame-support", "frame-system", @@ -4987,7 +4981,7 @@ dependencies = [ [[package]] name = "orml-oracle-rpc" version = "0.4.1-dev" -source = "git+https://github.com/open-web3-stack/open-runtime-module-library.git#65f1734ee8438e1b667a2e8148f6f68c717ad2b2" +source = "git+https://github.com/open-web3-stack/open-runtime-module-library.git?branch=sw/xcm-v1#f1353021595525f8faa0c860e14da59afb200118" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -5002,7 +4996,7 @@ dependencies = [ [[package]] name = "orml-oracle-rpc-runtime-api" version = "0.4.1-dev" -source = "git+https://github.com/open-web3-stack/open-runtime-module-library.git#65f1734ee8438e1b667a2e8148f6f68c717ad2b2" +source = "git+https://github.com/open-web3-stack/open-runtime-module-library.git?branch=sw/xcm-v1#f1353021595525f8faa0c860e14da59afb200118" dependencies = [ "parity-scale-codec", "sp-api", @@ -5012,7 +5006,7 @@ dependencies = [ [[package]] name = "orml-traits" version = "0.4.1-dev" -source = "git+https://github.com/open-web3-stack/open-runtime-module-library.git#65f1734ee8438e1b667a2e8148f6f68c717ad2b2" +source = "git+https://github.com/open-web3-stack/open-runtime-module-library.git?branch=sw/xcm-v1#f1353021595525f8faa0c860e14da59afb200118" dependencies = [ "frame-support", "impl-trait-for-tuples", @@ -5026,24 +5020,10 @@ dependencies = [ "xcm", ] -[[package]] -name = "orml-unknown-tokens" -version = "0.4.1-dev" -source = "git+https://github.com/open-web3-stack/open-runtime-module-library.git#65f1734ee8438e1b667a2e8148f6f68c717ad2b2" -dependencies = [ - "frame-support", - "frame-system", - "orml-xcm-support", - "parity-scale-codec", - "serde", - "sp-std", - "xcm", -] - [[package]] name = "orml-utilities" version = "0.4.1-dev" -source = "git+https://github.com/open-web3-stack/open-runtime-module-library.git#65f1734ee8438e1b667a2e8148f6f68c717ad2b2" +source = "git+https://github.com/open-web3-stack/open-runtime-module-library.git?branch=sw/xcm-v1#f1353021595525f8faa0c860e14da59afb200118" dependencies = [ "frame-support", "parity-scale-codec", @@ -5056,7 +5036,7 @@ dependencies = [ [[package]] name = "orml-vesting" version = "0.4.1-dev" -source = "git+https://github.com/open-web3-stack/open-runtime-module-library.git#65f1734ee8438e1b667a2e8148f6f68c717ad2b2" +source = "git+https://github.com/open-web3-stack/open-runtime-module-library.git?branch=sw/xcm-v1#f1353021595525f8faa0c860e14da59afb200118" dependencies = [ "frame-support", "frame-system", @@ -5070,7 +5050,7 @@ dependencies = [ [[package]] name = "orml-xcm" version = "0.4.1-dev" -source = "git+https://github.com/open-web3-stack/open-runtime-module-library.git#65f1734ee8438e1b667a2e8148f6f68c717ad2b2" +source = "git+https://github.com/open-web3-stack/open-runtime-module-library.git?branch=sw/xcm-v1#f1353021595525f8faa0c860e14da59afb200118" dependencies = [ "frame-support", "frame-system", @@ -5083,7 +5063,7 @@ dependencies = [ [[package]] name = "orml-xcm-support" version = "0.4.1-dev" -source = "git+https://github.com/open-web3-stack/open-runtime-module-library.git#65f1734ee8438e1b667a2e8148f6f68c717ad2b2" +source = "git+https://github.com/open-web3-stack/open-runtime-module-library.git?branch=sw/xcm-v1#f1353021595525f8faa0c860e14da59afb200118" dependencies = [ "frame-support", "orml-traits", @@ -5097,7 +5077,7 @@ dependencies = [ [[package]] name = "orml-xtokens" version = "0.4.1-dev" -source = "git+https://github.com/open-web3-stack/open-runtime-module-library.git#65f1734ee8438e1b667a2e8148f6f68c717ad2b2" +source = "git+https://github.com/open-web3-stack/open-runtime-module-library.git?branch=sw/xcm-v1#f1353021595525f8faa0c860e14da59afb200118" dependencies = [ "cumulus-primitives-core", "frame-support", @@ -5145,7 +5125,7 @@ dependencies = [ [[package]] name = "pallet-assets" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "frame-benchmarking", "frame-support", @@ -5158,7 +5138,7 @@ dependencies = [ [[package]] name = "pallet-aura" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "frame-support", "frame-system", @@ -5174,7 +5154,7 @@ dependencies = [ [[package]] name = "pallet-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "frame-support", "frame-system", @@ -5189,7 +5169,7 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "frame-support", "frame-system", @@ -5203,7 +5183,7 @@ dependencies = [ [[package]] name = "pallet-babe" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "frame-benchmarking", "frame-support", @@ -5226,7 +5206,7 @@ dependencies = [ [[package]] name = "pallet-balances" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "frame-benchmarking", "frame-support", @@ -5240,14 +5220,14 @@ dependencies = [ [[package]] name = "pallet-beefy" version = "0.1.0" -source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=polkadot-v0.9.9#f40c0ab7b327e874d5c8d699bfa5d762f1759ee0" +source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=polkadot-v0.9.10#9954b61657dc8899a21b4f2501ee6bd3b7a2dc23" dependencies = [ "beefy-primitives", "frame-support", "frame-system", "pallet-session", "parity-scale-codec", - "scale-info", + "scale-info 0.10.0", "serde", "sp-runtime", "sp-std", @@ -5256,7 +5236,7 @@ dependencies = [ [[package]] name = "pallet-beefy-mmr" version = "0.1.0" -source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=polkadot-v0.9.9#f40c0ab7b327e874d5c8d699bfa5d762f1759ee0" +source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=polkadot-v0.9.10#9954b61657dc8899a21b4f2501ee6bd3b7a2dc23" dependencies = [ "beefy-merkle-tree", "beefy-primitives", @@ -5270,7 +5250,7 @@ dependencies = [ "pallet-mmr-primitives", "pallet-session", "parity-scale-codec", - "scale-info", + "scale-info 0.10.0", "serde", "sp-core", "sp-io", @@ -5281,7 +5261,7 @@ dependencies = [ [[package]] name = "pallet-bounties" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "frame-benchmarking", "frame-support", @@ -5295,7 +5275,7 @@ dependencies = [ [[package]] name = "pallet-bridge-dispatch" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.10#aeea9b7bd81919e014f7621f6c4b2eb9709d918f" dependencies = [ "bp-message-dispatch", "bp-runtime", @@ -5311,7 +5291,7 @@ dependencies = [ [[package]] name = "pallet-bridge-grandpa" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.10#aeea9b7bd81919e014f7621f6c4b2eb9709d918f" dependencies = [ "bp-header-chain", "bp-runtime", @@ -5332,7 +5312,7 @@ dependencies = [ [[package]] name = "pallet-bridge-messages" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.10#aeea9b7bd81919e014f7621f6c4b2eb9709d918f" dependencies = [ "bitvec 0.20.4", "bp-message-dispatch", @@ -5353,7 +5333,7 @@ dependencies = [ [[package]] name = "pallet-collator-selection" version = "3.0.0" -source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.9#fd80849dde5c209c20a996cfcc5aaacd4666dcbe" +source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.10#fa116cfbfb470a8114fc02f9d2e3c0a5ab6c7193" dependencies = [ "frame-benchmarking", "frame-support", @@ -5371,7 +5351,7 @@ dependencies = [ [[package]] name = "pallet-collective" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "frame-benchmarking", "frame-support", @@ -5398,7 +5378,7 @@ dependencies = [ [[package]] name = "pallet-democracy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "frame-benchmarking", "frame-support", @@ -5413,7 +5393,7 @@ dependencies = [ [[package]] name = "pallet-election-provider-multi-phase" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5434,7 +5414,7 @@ dependencies = [ [[package]] name = "pallet-elections-phragmen" version = "5.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "frame-benchmarking", "frame-support", @@ -5451,7 +5431,7 @@ dependencies = [ [[package]] name = "pallet-gilt" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "frame-benchmarking", "frame-support", @@ -5465,7 +5445,7 @@ dependencies = [ [[package]] name = "pallet-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "frame-benchmarking", "frame-support", @@ -5487,7 +5467,7 @@ dependencies = [ [[package]] name = "pallet-identity" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "enumflags2", "frame-benchmarking", @@ -5502,7 +5482,7 @@ dependencies = [ [[package]] name = "pallet-im-online" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "frame-benchmarking", "frame-support", @@ -5521,7 +5501,7 @@ dependencies = [ [[package]] name = "pallet-indices" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "frame-benchmarking", "frame-support", @@ -5661,7 +5641,7 @@ dependencies = [ [[package]] name = "pallet-membership" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "frame-benchmarking", "frame-support", @@ -5676,7 +5656,7 @@ dependencies = [ [[package]] name = "pallet-mmr" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "ckb-merkle-mountain-range", "frame-benchmarking", @@ -5693,7 +5673,7 @@ dependencies = [ [[package]] name = "pallet-mmr-primitives" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "frame-support", "frame-system", @@ -5709,7 +5689,7 @@ dependencies = [ [[package]] name = "pallet-mmr-rpc" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -5727,7 +5707,7 @@ dependencies = [ [[package]] name = "pallet-multisig" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "frame-benchmarking", "frame-support", @@ -5742,7 +5722,7 @@ dependencies = [ [[package]] name = "pallet-nicks" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "frame-support", "frame-system", @@ -5769,7 +5749,7 @@ dependencies = [ [[package]] name = "pallet-offences" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "frame-support", "frame-system", @@ -5785,7 +5765,7 @@ dependencies = [ [[package]] name = "pallet-offences-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5824,7 +5804,7 @@ dependencies = [ [[package]] name = "pallet-proxy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "frame-benchmarking", "frame-support", @@ -5839,7 +5819,7 @@ dependencies = [ [[package]] name = "pallet-recovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "enumflags2", "frame-support", @@ -5872,7 +5852,7 @@ dependencies = [ [[package]] name = "pallet-scheduler" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "frame-benchmarking", "frame-support", @@ -5887,7 +5867,7 @@ dependencies = [ [[package]] name = "pallet-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "frame-support", "frame-system", @@ -5907,7 +5887,7 @@ dependencies = [ [[package]] name = "pallet-session-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "frame-benchmarking", "frame-support", @@ -5923,7 +5903,7 @@ dependencies = [ [[package]] name = "pallet-society" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "frame-support", "frame-system", @@ -5936,7 +5916,7 @@ dependencies = [ [[package]] name = "pallet-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5960,18 +5940,18 @@ dependencies = [ [[package]] name = "pallet-staking-reward-curve" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ - "proc-macro-crate 1.0.0", + "proc-macro-crate 1.1.0", "proc-macro2 1.0.29", "quote 1.0.9", - "syn 1.0.74", + "syn 1.0.77", ] [[package]] name = "pallet-staking-reward-fn" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "log", "sp-arithmetic", @@ -5980,7 +5960,7 @@ dependencies = [ [[package]] name = "pallet-sudo" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "frame-support", "frame-system", @@ -5993,7 +5973,7 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "frame-benchmarking", "frame-support", @@ -6011,7 +5991,7 @@ dependencies = [ [[package]] name = "pallet-tips" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "frame-benchmarking", "frame-support", @@ -6026,7 +6006,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "frame-support", "frame-system", @@ -6042,7 +6022,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -6059,7 +6039,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "pallet-transaction-payment", "parity-scale-codec", @@ -6070,7 +6050,7 @@ dependencies = [ [[package]] name = "pallet-treasury" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "frame-benchmarking", "frame-support", @@ -6086,7 +6066,7 @@ dependencies = [ [[package]] name = "pallet-utility" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "frame-benchmarking", "frame-support", @@ -6101,7 +6081,7 @@ dependencies = [ [[package]] name = "pallet-vesting" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "enumflags2", "frame-benchmarking", @@ -6114,8 +6094,8 @@ dependencies = [ [[package]] name = "pallet-xcm" -version = "0.9.9-1" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" +version = "0.9.10" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.10#aeea9b7bd81919e014f7621f6c4b2eb9709d918f" dependencies = [ "frame-support", "frame-system", @@ -6131,7 +6111,7 @@ dependencies = [ [[package]] name = "parachain-info" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.9#fd80849dde5c209c20a996cfcc5aaacd4666dcbe" +source = "git+https://github.com/paritytech/cumulus.git?branch=polkadot-v0.9.10#fa116cfbfb470a8114fc02f9d2e3c0a5ab6c7193" dependencies = [ "cumulus-primitives-core", "frame-support", @@ -6250,7 +6230,6 @@ dependencies = [ "orml-oracle", "orml-oracle-rpc-runtime-api", "orml-traits", - "orml-unknown-tokens", "orml-utilities", "orml-vesting", "orml-xcm", @@ -6322,33 +6301,15 @@ dependencies = [ "libc", "log", "memmap2", - "parking_lot 0.11.1", + "parking_lot 0.11.2", "rand 0.8.4", ] -[[package]] -name = "parity-multiaddr" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58341485071825827b7f03cf7efd1cb21e6a709bea778fb50227fd45d2f361b4" -dependencies = [ - "arrayref", - "bs58", - "byteorder", - "data-encoding", - "multihash", - "percent-encoding 2.1.0", - "serde", - "static_assertions", - "unsigned-varint 0.7.0", - "url 2.2.2", -] - [[package]] name = "parity-scale-codec" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8975095a2a03bbbdc70a74ab11a4f76a6d0b84680d87c68d722531b0ac28e8a9" +checksum = "e11263a97373b43da4b426edbb52ef99a7b51e2d9752ef56a7f8b356f48495a5" dependencies = [ "arrayvec 0.7.1", "bitvec 0.20.4", @@ -6360,14 +6321,14 @@ dependencies = [ [[package]] name = "parity-scale-codec-derive" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40dbbfef7f0a1143c5b06e0d76a6278e25dac0bc1af4be51a0fbb73f07e7ad09" +checksum = "b157dc92b3db2bae522afb31b3843e91ae097eb01d66c72dda66a2e86bc3ca14" dependencies = [ - "proc-macro-crate 1.0.0", + "proc-macro-crate 1.1.0", "proc-macro2 1.0.29", "quote 1.0.9", - "syn 1.0.74", + "syn 1.0.77", ] [[package]] @@ -6397,17 +6358,17 @@ dependencies = [ [[package]] name = "parity-util-mem" -version = "0.10.0" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ad6f1acec69b95caf435bbd158d486e5a0a44fcf51531e84922c59ff09e8457" +checksum = "6f4cb4e169446179cbc6b8b6320cc9fca49bd2e94e8db25f25f200a8ea774770" dependencies = [ "cfg-if 1.0.0", "ethereum-types", - "hashbrown 0.11.2", + "hashbrown", "impl-trait-for-tuples", "lru", "parity-util-mem-derive", - "parking_lot 0.11.1", + "parking_lot 0.11.2", "primitive-types", "smallvec 1.6.1", "winapi 0.3.9", @@ -6420,7 +6381,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f557c32c6d268a07c921471619c0295f5efad3a0e76d4f97a05c091a51d110b2" dependencies = [ "proc-macro2 1.0.29", - "syn 1.0.74", + "syn 1.0.77", "synstructure", ] @@ -6486,13 +6447,13 @@ dependencies = [ [[package]] name = "parking_lot" -version = "0.11.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d7744ac029df22dca6284efe4e898991d28e3085c706c972bcd7da4a27a15eb" +checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" dependencies = [ "instant", - "lock_api 0.4.4", - "parking_lot_core 0.8.3", + "lock_api 0.4.5", + "parking_lot_core 0.8.5", ] [[package]] @@ -6526,14 +6487,14 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.8.3" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa7a782938e745763fe6907fc6ba86946d72f49fe7e21de074e08128a99fb018" +checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216" dependencies = [ "cfg-if 1.0.0", "instant", "libc", - "redox_syscall 0.2.9", + "redox_syscall 0.2.10", "smallvec 1.6.1", "winapi 0.3.9", ] @@ -6546,21 +6507,20 @@ checksum = "acbf547ad0c65e31259204bd90935776d1c693cec2f4ff7abb7a1bbbd40dfe58" [[package]] name = "pbkdf2" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "006c038a43a45995a9670da19e67600114740e8511d4333bf97a56e66a7542d9" +checksum = "216eaa586a190f0a738f2f918511eecfa90f13295abec0e457cdebcceda80cbd" dependencies = [ - "byteorder", - "crypto-mac 0.7.0", + "crypto-mac 0.8.0", ] [[package]] name = "pbkdf2" -version = "0.4.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "216eaa586a190f0a738f2f918511eecfa90f13295abec0e457cdebcceda80cbd" +checksum = "d95f5254224e617595d2cc3cc73ff0a5eaf2637519e25f03388154e9378b6ffa" dependencies = [ - "crypto-mac 0.8.0", + "crypto-mac 0.11.1", ] [[package]] @@ -6616,7 +6576,7 @@ dependencies = [ "pest_meta", "proc-macro2 1.0.29", "quote 1.0.9", - "syn 1.0.74", + "syn 1.0.77", ] [[package]] @@ -6666,7 +6626,7 @@ checksum = "3be26700300be6d9d23264c73211d8190e755b6b5ca7a1b28230025511b52a5e" dependencies = [ "proc-macro2 1.0.29", "quote 1.0.9", - "syn 1.0.74", + "syn 1.0.77", ] [[package]] @@ -6677,7 +6637,7 @@ checksum = "6e8fe8163d14ce7f0cdac2e040116f22eac817edabff0be91e8aff7e9accf389" dependencies = [ "proc-macro2 1.0.29", "quote 1.0.9", - "syn 1.0.74", + "syn 1.0.77", ] [[package]] @@ -6700,9 +6660,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkg-config" -version = "0.3.19" +version = "0.3.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3831453b3449ceb48b6d9c7ad7c96d5ea673e9b470a1dc578c2ce6521230884c" +checksum = "7c9b1041b4387893b91ee6746cddfc28516aff326a3519fb2adf820932c5e6cb" [[package]] name = "platforms" @@ -6712,8 +6672,8 @@ checksum = "989d43012e2ca1c4a02507c67282691a0a3207f9dc67cec596b43fe925b3d325" [[package]] name = "polkadot-approval-distribution" -version = "0.9.9-1" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" +version = "0.9.10" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.10#aeea9b7bd81919e014f7621f6c4b2eb9709d918f" dependencies = [ "futures 0.3.17", "polkadot-node-network-protocol", @@ -6726,8 +6686,8 @@ dependencies = [ [[package]] name = "polkadot-availability-bitfield-distribution" -version = "0.9.9-1" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" +version = "0.9.10" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.10#aeea9b7bd81919e014f7621f6c4b2eb9709d918f" dependencies = [ "futures 0.3.17", "polkadot-node-network-protocol", @@ -6739,9 +6699,10 @@ dependencies = [ [[package]] name = "polkadot-availability-distribution" -version = "0.9.9-1" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" +version = "0.9.10" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.10#aeea9b7bd81919e014f7621f6c4b2eb9709d918f" dependencies = [ + "derive_more 0.99.16", "futures 0.3.17", "lru", "parity-scale-codec", @@ -6762,8 +6723,8 @@ dependencies = [ [[package]] name = "polkadot-availability-recovery" -version = "0.9.9-1" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" +version = "0.9.10" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.10#aeea9b7bd81919e014f7621f6c4b2eb9709d918f" dependencies = [ "futures 0.3.17", "lru", @@ -6781,8 +6742,8 @@ dependencies = [ [[package]] name = "polkadot-cli" -version = "0.9.9-1" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" +version = "0.9.10" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.10#aeea9b7bd81919e014f7621f6c4b2eb9709d918f" dependencies = [ "frame-benchmarking-cli", "futures 0.3.17", @@ -6801,8 +6762,8 @@ dependencies = [ [[package]] name = "polkadot-client" -version = "0.9.9-1" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" +version = "0.9.10" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.10#aeea9b7bd81919e014f7621f6c4b2eb9709d918f" dependencies = [ "beefy-primitives", "frame-benchmarking", @@ -6831,10 +6792,11 @@ dependencies = [ [[package]] name = "polkadot-collator-protocol" -version = "0.9.9-1" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" +version = "0.9.10" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.10#aeea9b7bd81919e014f7621f6c4b2eb9709d918f" dependencies = [ "always-assert", + "derive_more 0.99.16", "futures 0.3.17", "futures-timer 3.0.2", "polkadot-node-network-protocol", @@ -6851,8 +6813,8 @@ dependencies = [ [[package]] name = "polkadot-core-primitives" -version = "0.9.9-1" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" +version = "0.9.10" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.10#aeea9b7bd81919e014f7621f6c4b2eb9709d918f" dependencies = [ "parity-scale-codec", "parity-util-mem", @@ -6863,9 +6825,10 @@ dependencies = [ [[package]] name = "polkadot-dispute-distribution" -version = "0.9.9-1" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" +version = "0.9.10" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.10#aeea9b7bd81919e014f7621f6c4b2eb9709d918f" dependencies = [ + "derive_more 0.99.16", "futures 0.3.17", "lru", "parity-scale-codec", @@ -6887,8 +6850,8 @@ dependencies = [ [[package]] name = "polkadot-erasure-coding" -version = "0.9.9-1" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" +version = "0.9.10" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.10#aeea9b7bd81919e014f7621f6c4b2eb9709d918f" dependencies = [ "parity-scale-codec", "polkadot-node-primitives", @@ -6901,8 +6864,8 @@ dependencies = [ [[package]] name = "polkadot-gossip-support" -version = "0.9.9-1" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" +version = "0.9.10" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.10#aeea9b7bd81919e014f7621f6c4b2eb9709d918f" dependencies = [ "futures 0.3.17", "polkadot-node-network-protocol", @@ -6919,13 +6882,13 @@ dependencies = [ [[package]] name = "polkadot-network-bridge" -version = "0.9.9-1" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" +version = "0.9.10" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.10#aeea9b7bd81919e014f7621f6c4b2eb9709d918f" dependencies = [ "async-trait", "futures 0.3.17", "parity-scale-codec", - "parking_lot 0.11.1", + "parking_lot 0.11.2", "polkadot-node-network-protocol", "polkadot-node-subsystem", "polkadot-node-subsystem-util", @@ -6933,14 +6896,13 @@ dependencies = [ "polkadot-primitives", "sc-network", "sp-consensus", - "strum", "tracing", ] [[package]] name = "polkadot-node-collation-generation" -version = "0.9.9-1" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" +version = "0.9.10" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.10#aeea9b7bd81919e014f7621f6c4b2eb9709d918f" dependencies = [ "futures 0.3.17", "parity-scale-codec", @@ -6957,8 +6919,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-approval-voting" -version = "0.9.9-1" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" +version = "0.9.10" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.10#aeea9b7bd81919e014f7621f6c4b2eb9709d918f" dependencies = [ "bitvec 0.20.4", "derive_more 0.99.16", @@ -6987,8 +6949,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-av-store" -version = "0.9.9-1" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" +version = "0.9.10" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.10#aeea9b7bd81919e014f7621f6c4b2eb9709d918f" dependencies = [ "bitvec 0.20.4", "futures 0.3.17", @@ -7007,8 +6969,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-backing" -version = "0.9.9-1" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" +version = "0.9.10" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.10#aeea9b7bd81919e014f7621f6c4b2eb9709d918f" dependencies = [ "bitvec 0.20.4", "futures 0.3.17", @@ -7025,8 +6987,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-bitfield-signing" -version = "0.9.9-1" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" +version = "0.9.10" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.10#aeea9b7bd81919e014f7621f6c4b2eb9709d918f" dependencies = [ "futures 0.3.17", "polkadot-node-subsystem", @@ -7040,8 +7002,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-candidate-validation" -version = "0.9.9-1" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" +version = "0.9.10" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.10#aeea9b7bd81919e014f7621f6c4b2eb9709d918f" dependencies = [ "async-trait", "futures 0.3.17", @@ -7058,8 +7020,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-chain-api" -version = "0.9.9-1" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" +version = "0.9.10" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.10#aeea9b7bd81919e014f7621f6c4b2eb9709d918f" dependencies = [ "futures 0.3.17", "polkadot-node-subsystem", @@ -7073,8 +7035,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-chain-selection" -version = "0.9.9-1" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" +version = "0.9.10" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.10#aeea9b7bd81919e014f7621f6c4b2eb9709d918f" dependencies = [ "futures 0.3.17", "futures-timer 3.0.2", @@ -7090,8 +7052,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-dispute-coordinator" -version = "0.9.9-1" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" +version = "0.9.10" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.10#aeea9b7bd81919e014f7621f6c4b2eb9709d918f" dependencies = [ "bitvec 0.20.4", "derive_more 0.99.16", @@ -7109,8 +7071,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-dispute-participation" -version = "0.9.9-1" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" +version = "0.9.10" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.10#aeea9b7bd81919e014f7621f6c4b2eb9709d918f" dependencies = [ "futures 0.3.17", "polkadot-node-primitives", @@ -7122,8 +7084,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-parachains-inherent" -version = "0.9.9-1" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" +version = "0.9.10" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.10#aeea9b7bd81919e014f7621f6c4b2eb9709d918f" dependencies = [ "async-trait", "futures 0.3.17", @@ -7139,8 +7101,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-provisioner" -version = "0.9.9-1" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" +version = "0.9.10" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.10#aeea9b7bd81919e014f7621f6c4b2eb9709d918f" dependencies = [ "bitvec 0.20.4", "futures 0.3.17", @@ -7154,8 +7116,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-pvf" -version = "0.9.9-1" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" +version = "0.9.10" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.10#aeea9b7bd81919e014f7621f6c4b2eb9709d918f" dependencies = [ "always-assert", "assert_matches", @@ -7184,8 +7146,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-runtime-api" -version = "0.9.9-1" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" +version = "0.9.10" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.10#aeea9b7bd81919e014f7621f6c4b2eb9709d918f" dependencies = [ "futures 0.3.17", "memory-lru", @@ -7202,15 +7164,15 @@ dependencies = [ [[package]] name = "polkadot-node-jaeger" -version = "0.9.9-1" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" +version = "0.9.10" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.10#aeea9b7bd81919e014f7621f6c4b2eb9709d918f" dependencies = [ "async-std", "lazy_static", "log", "mick-jaeger", "parity-scale-codec", - "parking_lot 0.11.1", + "parking_lot 0.11.2", "polkadot-node-primitives", "polkadot-primitives", "sc-network", @@ -7220,8 +7182,8 @@ dependencies = [ [[package]] name = "polkadot-node-metrics" -version = "0.9.9-1" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" +version = "0.9.10" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.10#aeea9b7bd81919e014f7621f6c4b2eb9709d918f" dependencies = [ "async-trait", "futures 0.3.17", @@ -7236,10 +7198,11 @@ dependencies = [ [[package]] name = "polkadot-node-network-protocol" -version = "0.9.9-1" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" +version = "0.9.10" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.10#aeea9b7bd81919e014f7621f6c4b2eb9709d918f" dependencies = [ "async-trait", + "derive_more 0.99.16", "futures 0.3.17", "parity-scale-codec", "polkadot-node-jaeger", @@ -7253,8 +7216,8 @@ dependencies = [ [[package]] name = "polkadot-node-primitives" -version = "0.9.9-1" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" +version = "0.9.10" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.10#aeea9b7bd81919e014f7621f6c4b2eb9709d918f" dependencies = [ "futures 0.3.17", "parity-scale-codec", @@ -7277,8 +7240,8 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem" -version = "0.9.9-1" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" +version = "0.9.10" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.10#aeea9b7bd81919e014f7621f6c4b2eb9709d918f" dependencies = [ "polkadot-node-jaeger", "polkadot-node-subsystem-types", @@ -7287,8 +7250,8 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem-types" -version = "0.9.9-1" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" +version = "0.9.10" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.10#aeea9b7bd81919e014f7621f6c4b2eb9709d918f" dependencies = [ "async-std", "async-trait", @@ -7299,7 +7262,7 @@ dependencies = [ "log", "mick-jaeger", "parity-scale-codec", - "parking_lot 0.11.1", + "parking_lot 0.11.2", "pin-project 1.0.8", "polkadot-node-jaeger", "polkadot-node-network-protocol", @@ -7317,13 +7280,14 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem-util" -version = "0.9.9-1" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" +version = "0.9.10" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.10#aeea9b7bd81919e014f7621f6c4b2eb9709d918f" dependencies = [ "async-trait", + "derive_more 0.99.16", "futures 0.3.17", "futures-timer 3.0.2", - "itertools 0.10.1", + "itertools", "lru", "metered-channel", "parity-scale-codec", @@ -7347,14 +7311,14 @@ dependencies = [ [[package]] name = "polkadot-overseer" -version = "0.9.9-1" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" +version = "0.9.10" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.10#aeea9b7bd81919e014f7621f6c4b2eb9709d918f" dependencies = [ "async-trait", "futures 0.3.17", "futures-timer 3.0.2", "lru", - "parking_lot 0.11.1", + "parking_lot 0.11.2", "polkadot-node-metrics", "polkadot-node-network-protocol", "polkadot-node-primitives", @@ -7369,19 +7333,19 @@ dependencies = [ [[package]] name = "polkadot-overseer-all-subsystems-gen" -version = "0.9.9-1" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" +version = "0.9.10" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.10#aeea9b7bd81919e014f7621f6c4b2eb9709d918f" dependencies = [ "assert_matches", "proc-macro2 1.0.29", "quote 1.0.9", - "syn 1.0.74", + "syn 1.0.77", ] [[package]] name = "polkadot-overseer-gen" -version = "0.9.9-1" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" +version = "0.9.10" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.10#aeea9b7bd81919e014f7621f6c4b2eb9709d918f" dependencies = [ "async-trait", "futures 0.3.17", @@ -7397,19 +7361,19 @@ dependencies = [ [[package]] name = "polkadot-overseer-gen-proc-macro" -version = "0.9.9-1" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" +version = "0.9.10" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.10#aeea9b7bd81919e014f7621f6c4b2eb9709d918f" dependencies = [ - "proc-macro-crate 1.0.0", + "proc-macro-crate 1.1.0", "proc-macro2 1.0.29", "quote 1.0.9", - "syn 1.0.74", + "syn 1.0.77", ] [[package]] name = "polkadot-parachain" -version = "0.9.9-1" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" +version = "0.9.10" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.10#aeea9b7bd81919e014f7621f6c4b2eb9709d918f" dependencies = [ "derive_more 0.99.16", "frame-support", @@ -7424,8 +7388,8 @@ dependencies = [ [[package]] name = "polkadot-primitives" -version = "0.9.9-1" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" +version = "0.9.10" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.10#aeea9b7bd81919e014f7621f6c4b2eb9709d918f" dependencies = [ "bitvec 0.20.4", "frame-system", @@ -7454,8 +7418,8 @@ dependencies = [ [[package]] name = "polkadot-rpc" -version = "0.9.9-1" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" +version = "0.9.10" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.10#aeea9b7bd81919e014f7621f6c4b2eb9709d918f" dependencies = [ "beefy-gadget", "beefy-gadget-rpc", @@ -7487,8 +7451,8 @@ dependencies = [ [[package]] name = "polkadot-runtime" -version = "0.9.9-1" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" +version = "0.9.10" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.10#aeea9b7bd81919e014f7621f6c4b2eb9709d918f" dependencies = [ "beefy-primitives", "bitvec 0.20.4", @@ -7562,8 +7526,8 @@ dependencies = [ [[package]] name = "polkadot-runtime-common" -version = "0.9.9-1" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" +version = "0.9.10" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.10#aeea9b7bd81919e014f7621f6c4b2eb9709d918f" dependencies = [ "bitvec 0.20.4", "frame-benchmarking", @@ -7605,8 +7569,8 @@ dependencies = [ [[package]] name = "polkadot-runtime-parachains" -version = "0.9.9-1" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" +version = "0.9.10" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.10#aeea9b7bd81919e014f7621f6c4b2eb9709d918f" dependencies = [ "bitflags", "bitvec 0.20.4", @@ -7644,8 +7608,8 @@ dependencies = [ [[package]] name = "polkadot-service" -version = "0.9.9-1" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" +version = "0.9.10" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.10#aeea9b7bd81919e014f7621f6c4b2eb9709d918f" dependencies = [ "async-trait", "beefy-gadget", @@ -7683,6 +7647,7 @@ dependencies = [ "polkadot-node-core-parachains-inherent", "polkadot-node-core-provisioner", "polkadot-node-core-runtime-api", + "polkadot-node-network-protocol", "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-node-subsystem-util", @@ -7740,10 +7705,11 @@ dependencies = [ [[package]] name = "polkadot-statement-distribution" -version = "0.9.9-1" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" +version = "0.9.10" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.10#aeea9b7bd81919e014f7621f6c4b2eb9709d918f" dependencies = [ "arrayvec 0.5.2", + "derive_more 0.99.16", "futures 0.3.17", "indexmap", "parity-scale-codec", @@ -7752,7 +7718,6 @@ dependencies = [ "polkadot-node-subsystem", "polkadot-node-subsystem-util", "polkadot-primitives", - "sc-network", "sp-keystore", "sp-staking", "thiserror", @@ -7761,8 +7726,8 @@ dependencies = [ [[package]] name = "polkadot-statement-table" -version = "0.9.9-1" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" +version = "0.9.10" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.10#aeea9b7bd81919e014f7621f6c4b2eb9709d918f" dependencies = [ "parity-scale-codec", "polkadot-primitives", @@ -7784,21 +7749,23 @@ dependencies = [ [[package]] name = "poly1305" -version = "0.6.2" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b7456bc1ad2d4cf82b3a016be4c2ac48daf11bf990c1603ebd447fe6f30fca8" +checksum = "048aeb476be11a4b6ca432ca569e375810de9294ae78f4774e78ea98a9246ede" dependencies = [ - "cpuid-bool", + "cpufeatures", + "opaque-debug 0.3.0", "universal-hash", ] [[package]] name = "polyval" -version = "0.4.5" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eebcc4aa140b9abd2bc40d9c3f7ccec842679cd79045ac3a7ac698c1a064b7cd" +checksum = "8419d2b623c7c0896ff2d5d96e2cb4ede590fed28fcc34934f4c33c036e620a1" dependencies = [ - "cpuid-bool", + "cfg-if 1.0.0", + "cpufeatures", "opaque-debug 0.3.0", "universal-hash", ] @@ -7833,9 +7800,9 @@ dependencies = [ [[package]] name = "proc-macro-crate" -version = "1.0.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41fdbd1df62156fbc5945f4762632564d7d038153091c3fcf1067f6aef7cff92" +checksum = "1ebace6889caf889b4d3f76becee12e90353f2b8c7d875534a71e5742f8f6f83" dependencies = [ "thiserror", "toml", @@ -7850,7 +7817,7 @@ dependencies = [ "proc-macro-error-attr 0.4.12", "proc-macro2 1.0.29", "quote 1.0.9", - "syn 1.0.74", + "syn 1.0.77", "version_check", ] @@ -7863,7 +7830,7 @@ dependencies = [ "proc-macro-error-attr 1.0.4", "proc-macro2 1.0.29", "quote 1.0.9", - "syn 1.0.74", + "syn 1.0.77", "version_check", ] @@ -7875,7 +7842,7 @@ checksum = "8a5b4b77fdb63c1eca72173d68d24501c54ab1269409f6b672c85deb18af69de" dependencies = [ "proc-macro2 1.0.29", "quote 1.0.9", - "syn 1.0.74", + "syn 1.0.77", "syn-mid", "version_check", ] @@ -7930,30 +7897,30 @@ dependencies = [ "cfg-if 1.0.0", "fnv", "lazy_static", - "parking_lot 0.11.1", + "parking_lot 0.11.2", "regex", "thiserror", ] [[package]] name = "prost" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e6984d2f1a23009bd270b8bb56d0926810a3d483f59c987d77969e9d8e840b2" +checksum = "de5e2533f59d08fcf364fd374ebda0692a70bd6d7e66ef97f306f45c6c5d8020" dependencies = [ - "bytes 1.0.1", + "bytes 1.1.0", "prost-derive", ] [[package]] name = "prost-build" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32d3ebd75ac2679c2af3a92246639f9fcc8a442ee420719cc4fe195b98dd5fa3" +checksum = "355f634b43cdd80724ee7848f95770e7e70eefa6dcf14fea676216573b8fd603" dependencies = [ - "bytes 1.0.1", + "bytes 1.1.0", "heck", - "itertools 0.9.0", + "itertools", "log", "multimap", "petgraph", @@ -7965,41 +7932,41 @@ dependencies = [ [[package]] name = "prost-derive" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "169a15f3008ecb5160cba7d37bcd690a7601b6d30cfb87a117d45e59d52af5d4" +checksum = "600d2f334aa05acb02a755e217ef1ab6dea4d51b58b7846588b747edec04efba" dependencies = [ "anyhow", - "itertools 0.9.0", + "itertools", "proc-macro2 1.0.29", "quote 1.0.9", - "syn 1.0.74", + "syn 1.0.77", ] [[package]] name = "prost-types" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b518d7cdd93dab1d1122cf07fa9a60771836c668dde9d9e2a139f957f0d9f1bb" +checksum = "603bbd6394701d13f3f25aada59c7de9d35a6a5887cfc156181234a44002771b" dependencies = [ - "bytes 1.0.1", + "bytes 1.1.0", "prost", ] [[package]] name = "psm" -version = "0.1.13" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21ff0279b4a85e576b97e4a21d13e437ebcd56612706cde5d3f0d5c9399490c0" +checksum = "cd136ff4382c4753fc061cb9e4712ab2af263376b95bbd5bd8cd50c020b78e69" dependencies = [ "cc", ] [[package]] name = "pwasm-utils" -version = "0.18.1" +version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0c1a2f10b47d446372a4f397c58b329aaea72b2daf9395a623a411cb8ccb54f" +checksum = "880b3384fb00b8f6ecccd5d358b93bd2201900ae3daad213791d1864f6441f5c" dependencies = [ "byteorder", "log", @@ -8163,9 +8130,9 @@ dependencies = [ [[package]] name = "rand_distr" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "051b398806e42b9cd04ad9ec8f81e355d0a382c543ac6672c62f5a5b452ef142" +checksum = "964d548f8e7d12e102ef183a0de7e98180c9f8729f555897a857b96e48122d2f" dependencies = [ "num-traits", "rand 0.8.4", @@ -8211,7 +8178,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c06aca804d41dbc8ba42dfd964f0d01334eceb64314b9ecf7c5fad5188a06d90" dependencies = [ "autocfg", - "crossbeam-deque 0.8.0", + "crossbeam-deque 0.8.1", "either", "rayon-core", ] @@ -8223,7 +8190,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d78120e2c850279833f1dd3582f730c4ab53ed95aeaaaa862a2a5c71b1656d8e" dependencies = [ "crossbeam-channel", - "crossbeam-deque 0.8.0", + "crossbeam-deque 0.8.1", "crossbeam-utils 0.8.5", "lazy_static", "num_cpus", @@ -8246,9 +8213,9 @@ checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" [[package]] name = "redox_syscall" -version = "0.2.9" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ab49abadf3f9e1c4bc499e8845e152ad87d2ad2d30371841171169e9d75feee" +checksum = "8383f39639269cde97d255a32bdb68c047337295414940c68bdd30c2e13203ff" dependencies = [ "bitflags", ] @@ -8260,7 +8227,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "528532f3d801c87aec9def2add9ca802fe569e44a544afe633765267840abe64" dependencies = [ "getrandom 0.2.3", - "redox_syscall 0.2.9", + "redox_syscall 0.2.10", ] [[package]] @@ -8271,7 +8238,7 @@ checksum = "3bd8f48b2066e9f69ab192797d66da804d1935bf22763204ed3675740cb0f221" dependencies = [ "derive_more 0.99.16", "fs-err", - "itertools 0.10.1", + "itertools", "static_init", "thiserror", ] @@ -8293,7 +8260,7 @@ checksum = "4c38e3aecd2b21cb3959637b883bb3714bc7e43f0268b9a29d3743ee3e55cdd2" dependencies = [ "proc-macro2 1.0.29", "quote 1.0.9", - "syn 1.0.74", + "syn 1.0.77", ] [[package]] @@ -8349,7 +8316,7 @@ dependencies = [ [[package]] name = "remote-externalities" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "env_logger 0.8.4", "hex", @@ -8385,9 +8352,9 @@ dependencies = [ [[package]] name = "retain_mut" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9c17925a9027d298a4603d286befe3f9dc0e8ed02523141914eb628798d6e5b" +checksum = "448296241d034b96c11173591deaa1302f2c17b56092106c1f92c1bc0183a8c9" [[package]] name = "ring" @@ -8406,11 +8373,11 @@ dependencies = [ [[package]] name = "rlp" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e54369147e3e7796c9b885c7304db87ca3d09a0a98f72843d532868675bbfba8" +checksum = "999508abb0ae792aabed2460c45b89106d97fe4adac593bdaef433c2605847b5" dependencies = [ - "bytes 1.0.1", + "bytes 1.1.0", "rustc-hex", ] @@ -8426,8 +8393,8 @@ dependencies = [ [[package]] name = "rococo-runtime" -version = "0.9.9-1" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" +version = "0.9.10" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.10#aeea9b7bd81919e014f7621f6c4b2eb9709d918f" dependencies = [ "beefy-primitives", "bp-messages", @@ -8508,9 +8475,9 @@ dependencies = [ [[package]] name = "rustc-demangle" -version = "0.1.20" +version = "0.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dead70b0b5e03e9c814bcb6b01e03e68f7c57a80aa48c72ec92152ab3e818d49" +checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342" [[package]] name = "rustc-hash" @@ -8589,7 +8556,7 @@ dependencies = [ "openssl-probe", "rustls 0.19.1", "schannel", - "security-framework 2.3.1", + "security-framework 2.4.2", ] [[package]] @@ -8621,9 +8588,9 @@ checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" [[package]] name = "salsa20" -version = "0.7.2" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "399f290ffc409596022fce5ea5d4138184be4784f2b28c62c59f0d8389059a15" +checksum = "ecbd2eb639fd7cab5804a0837fe373cc2172d15437e804c054a9fb885cb923b0" dependencies = [ "cipher", ] @@ -8640,7 +8607,7 @@ dependencies = [ [[package]] name = "sc-allocator" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "log", "sp-core", @@ -8651,7 +8618,7 @@ dependencies = [ [[package]] name = "sc-authority-discovery" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "async-trait", "derive_more 0.99.16", @@ -8680,7 +8647,7 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "futures 0.3.17", "futures-timer 3.0.2", @@ -8703,7 +8670,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -8719,7 +8686,7 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -8735,18 +8702,18 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ - "proc-macro-crate 1.0.0", + "proc-macro-crate 1.1.0", "proc-macro2 1.0.29", "quote 1.0.9", - "syn 1.0.74", + "syn 1.0.77", ] [[package]] name = "sc-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "chrono", "fdlimit", @@ -8784,7 +8751,7 @@ dependencies = [ [[package]] name = "sc-client-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "derive_more 0.99.16", "fnv", @@ -8794,7 +8761,7 @@ dependencies = [ "lazy_static", "log", "parity-scale-codec", - "parking_lot 0.11.1", + "parking_lot 0.11.2", "sc-executor", "sc-transaction-pool-api", "sp-api", @@ -8818,7 +8785,7 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "blake2-rfc", "hash-db", @@ -8830,7 +8797,7 @@ dependencies = [ "parity-db", "parity-scale-codec", "parity-util-mem", - "parking_lot 0.11.1", + "parking_lot 0.11.2", "sc-client-api", "sc-executor", "sc-state-db", @@ -8847,14 +8814,14 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "async-trait", "futures 0.3.17", "futures-timer 3.0.2", "libp2p", "log", - "parking_lot 0.11.1", + "parking_lot 0.11.2", "sc-client-api", "serde", "sp-api", @@ -8872,7 +8839,7 @@ dependencies = [ [[package]] name = "sc-consensus-aura" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "async-trait", "derive_more 0.99.16", @@ -8904,7 +8871,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "async-trait", "derive_more 0.99.16", @@ -8917,7 +8884,7 @@ dependencies = [ "num-rational 0.2.4", "num-traits", "parity-scale-codec", - "parking_lot 0.11.1", + "parking_lot 0.11.2", "pdqselect", "rand 0.7.3", "retain_mut", @@ -8951,7 +8918,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "derive_more 0.99.16", "futures 0.3.17", @@ -8975,7 +8942,7 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "fork-tree", "parity-scale-codec", @@ -8988,7 +8955,7 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "async-trait", "futures 0.3.17", @@ -9017,7 +8984,7 @@ dependencies = [ [[package]] name = "sc-consensus-uncles" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "sc-client-api", "sp-authorship", @@ -9028,15 +8995,15 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "derive_more 0.99.16", "lazy_static", - "libsecp256k1 0.3.5", + "libsecp256k1 0.6.0", "log", "parity-scale-codec", "parity-wasm 0.42.2", - "parking_lot 0.11.1", + "parking_lot 0.11.2", "sc-executor-common", "sc-executor-wasmi", "sc-executor-wasmtime", @@ -9057,7 +9024,7 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "derive_more 0.99.16", "parity-scale-codec", @@ -9074,7 +9041,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "log", "parity-scale-codec", @@ -9089,7 +9056,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "cfg-if 1.0.0", "libc", @@ -9109,7 +9076,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "async-trait", "derive_more 0.99.16", @@ -9121,7 +9088,7 @@ dependencies = [ "linked-hash-map", "log", "parity-scale-codec", - "parking_lot 0.11.1", + "parking_lot 0.11.2", "pin-project 1.0.8", "rand 0.8.4", "sc-block-builder", @@ -9150,7 +9117,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "derive_more 0.99.16", "finality-grandpa", @@ -9174,7 +9141,7 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "ansi_term 0.12.1", "futures 0.3.17", @@ -9192,7 +9159,7 @@ dependencies = [ [[package]] name = "sc-keystore" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "async-trait", "derive_more 0.99.16", @@ -9200,24 +9167,24 @@ dependencies = [ "futures-util", "hex", "merlin", - "parking_lot 0.11.1", + "parking_lot 0.11.2", "rand 0.7.3", "serde_json", "sp-application-crypto", "sp-core", "sp-keystore", - "subtle 2.4.1", + "subtle", ] [[package]] name = "sc-light" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "hash-db", "lazy_static", "parity-scale-codec", - "parking_lot 0.11.1", + "parking_lot 0.11.2", "sc-client-api", "sc-executor", "sp-api", @@ -9231,14 +9198,14 @@ dependencies = [ [[package]] name = "sc-network" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "async-std", "async-trait", "asynchronous-codec 0.5.0", "bitflags", "bs58", - "bytes 1.0.1", + "bytes 1.1.0", "cid", "derive_more 0.99.16", "either", @@ -9256,7 +9223,7 @@ dependencies = [ "lru", "nohash-hasher", "parity-scale-codec", - "parking_lot 0.11.1", + "parking_lot 0.11.2", "pin-project 1.0.8", "prost", "prost-build", @@ -9286,7 +9253,7 @@ dependencies = [ [[package]] name = "sc-network-gossip" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "futures 0.3.17", "futures-timer 3.0.2", @@ -9303,7 +9270,7 @@ dependencies = [ [[package]] name = "sc-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "bytes 0.5.6", "fnv", @@ -9315,7 +9282,7 @@ dependencies = [ "log", "num_cpus", "parity-scale-codec", - "parking_lot 0.11.1", + "parking_lot 0.11.2", "rand 0.7.3", "sc-client-api", "sc-keystore", @@ -9331,7 +9298,7 @@ dependencies = [ [[package]] name = "sc-peerset" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "futures 0.3.17", "libp2p", @@ -9344,7 +9311,7 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "log", "substrate-prometheus-endpoint", @@ -9353,7 +9320,7 @@ dependencies = [ [[package]] name = "sc-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "futures 0.3.17", "hash-db", @@ -9361,7 +9328,7 @@ dependencies = [ "jsonrpc-pubsub", "log", "parity-scale-codec", - "parking_lot 0.11.1", + "parking_lot 0.11.2", "sc-block-builder", "sc-chain-spec", "sc-client-api", @@ -9388,7 +9355,7 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "derive_more 0.99.16", "futures 0.3.17", @@ -9398,7 +9365,7 @@ dependencies = [ "jsonrpc-pubsub", "log", "parity-scale-codec", - "parking_lot 0.11.1", + "parking_lot 0.11.2", "sc-chain-spec", "sc-transaction-pool-api", "serde", @@ -9413,7 +9380,7 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "futures 0.1.31", "jsonrpc-core", @@ -9431,7 +9398,7 @@ dependencies = [ [[package]] name = "sc-service" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "async-trait", "directories", @@ -9446,7 +9413,7 @@ dependencies = [ "log", "parity-scale-codec", "parity-util-mem", - "parking_lot 0.11.1", + "parking_lot 0.11.2", "pin-project 1.0.8", "rand 0.7.3", "sc-block-builder", @@ -9499,13 +9466,13 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "log", "parity-scale-codec", "parity-util-mem", "parity-util-mem-derive", - "parking_lot 0.11.1", + "parking_lot 0.11.2", "sc-client-api", "sp-core", "thiserror", @@ -9514,7 +9481,7 @@ dependencies = [ [[package]] name = "sc-sync-state-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -9536,13 +9503,13 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "chrono", "futures 0.3.17", "libp2p", "log", - "parking_lot 0.11.1", + "parking_lot 0.11.2", "pin-project 1.0.8", "rand 0.7.3", "serde", @@ -9556,7 +9523,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "ansi_term 0.12.1", "atty", @@ -9564,7 +9531,7 @@ dependencies = [ "lazy_static", "log", "once_cell", - "parking_lot 0.11.1", + "parking_lot 0.11.2", "regex", "rustc-hash", "sc-client-api", @@ -9593,18 +9560,18 @@ dependencies = [ [[package]] name = "sc-tracing-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ - "proc-macro-crate 1.0.0", + "proc-macro-crate 1.1.0", "proc-macro2 1.0.29", "quote 1.0.9", - "syn 1.0.74", + "syn 1.0.77", ] [[package]] name = "sc-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "derive_more 0.99.16", "futures 0.3.17", @@ -9613,7 +9580,7 @@ dependencies = [ "log", "parity-scale-codec", "parity-util-mem", - "parking_lot 0.11.1", + "parking_lot 0.11.2", "retain_mut", "sc-client-api", "sc-transaction-pool-api", @@ -9633,7 +9600,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "derive_more 0.99.16", "futures 0.3.17", @@ -9655,7 +9622,20 @@ dependencies = [ "cfg-if 1.0.0", "derive_more 0.99.16", "parity-scale-codec", - "scale-info-derive", + "scale-info-derive 0.7.0", +] + +[[package]] +name = "scale-info" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c55b744399c25532d63a0d2789b109df8d46fc93752d46b0782991a931a782f" +dependencies = [ + "bitvec 0.20.4", + "cfg-if 1.0.0", + "derive_more 0.99.16", + "parity-scale-codec", + "scale-info-derive 1.0.0", ] [[package]] @@ -9664,10 +9644,22 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b648fa291891a4c80187a25532f6a7d96b82c70353e30b868b14632b8fe043d6" dependencies = [ - "proc-macro-crate 1.0.0", + "proc-macro-crate 1.1.0", "proc-macro2 1.0.29", "quote 1.0.9", - "syn 1.0.74", + "syn 1.0.77", +] + +[[package]] +name = "scale-info-derive" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baeb2780690380592f86205aa4ee49815feb2acad8c2f59e6dd207148c3f1fcd" +dependencies = [ + "proc-macro-crate 1.1.0", + "proc-macro2 1.0.29", + "quote 1.0.9", + "syn 1.0.77", ] [[package]] @@ -9694,7 +9686,7 @@ dependencies = [ "rand 0.7.3", "rand_core 0.5.1", "sha2 0.8.2", - "subtle 2.4.1", + "subtle", "zeroize", ] @@ -9744,15 +9736,15 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.3.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23a2ac85147a3a11d77ecf1bc7166ec0b92febfa4461c37944e180f319ece467" +checksum = "525bc1abfda2e1998d152c45cf13e696f76d0a4972310b22fac1658b05df7c87" dependencies = [ "bitflags", "core-foundation 0.9.1", "core-foundation-sys 0.8.2", "libc", - "security-framework-sys 2.3.0", + "security-framework-sys 2.4.2", ] [[package]] @@ -9767,9 +9759,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.3.0" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e4effb91b4b8b6fb7732e670b6cee160278ff8e6bf485c7805d9e319d76e284" +checksum = "a9dd14d83160b528b7bfd66439110573efcfbe281b17fc2ca9f39f550d619c7e" dependencies = [ "core-foundation-sys 0.8.2", "libc", @@ -9835,14 +9827,14 @@ checksum = "d7bc1a1ab1961464eae040d96713baa5a724a8152c1222492465b54322ec508b" dependencies = [ "proc-macro2 1.0.29", "quote 1.0.9", - "syn 1.0.74", + "syn 1.0.77", ] [[package]] name = "serde_json" -version = "1.0.64" +version = "1.0.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "799e97dc9fdae36a5c8b8f2cae9ce2ee9fdce2058c57a93e6099d919fd982f79" +checksum = "0f690853975602e1bfe1ccbf50504d67174e3bcf340f23b5ea9992e0587a52d8" dependencies = [ "itoa", "ryu", @@ -9863,9 +9855,9 @@ dependencies = [ [[package]] name = "sha-1" -version = "0.9.7" +version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a0c8611594e2ab4ebbf06ec7cbbf0a99450b8570e96cbf5188b5d5f6ef18d81" +checksum = "99cd6713db3cf16b6c84e06321e049a9b9f699826e16096d23bbcc44d15d51a6" dependencies = [ "block-buffer 0.9.0", "cfg-if 1.0.0", @@ -9888,9 +9880,9 @@ dependencies = [ [[package]] name = "sha2" -version = "0.9.5" +version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b362ae5752fd2137731f9fa25fd4d9058af34666ca1966fb969119cc35719f12" +checksum = "b69f9a4c9740d74c5baa3fd2e547f9525fa8088a8a958e0ca2409a514e33f5fa" dependencies = [ "block-buffer 0.9.0", "cfg-if 1.0.0", @@ -9913,24 +9905,24 @@ dependencies = [ [[package]] name = "sharded-slab" -version = "0.1.1" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79c719719ee05df97490f80a45acfc99e5a30ce98a1e4fb67aee422745ae14e3" +checksum = "740223c51853f3145fe7c90360d2d4232f2b62e3449489c207eccde818979982" dependencies = [ "lazy_static", ] [[package]] name = "shlex" -version = "1.0.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42a568c8f2cd051a4d283bd6eb0343ac214c1b0f1ac19f93e1175b2dee38c73d" +checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" [[package]] name = "signal-hook" -version = "0.3.9" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "470c5a6397076fae0094aaf06a08e6ba6f37acb77d3b1b91ea92b4d6c8650c39" +checksum = "9c98891d737e271a2954825ef19e46bd16bdb98e2746f2eec4f7a4ef7946efd1" dependencies = [ "libc", "signal-hook-registry", @@ -9965,9 +9957,9 @@ dependencies = [ [[package]] name = "slab" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f173ac3d1a7e3b28003f40de0b5ce7fe2710f9b9dc3fc38664cebee46b3b6527" +checksum = "c307a32c1c5c437f38c7fd45d753050587732ba8628319fbdf12a7e289ccc590" [[package]] name = "slog" @@ -9980,8 +9972,8 @@ dependencies = [ [[package]] name = "slot-range-helper" -version = "0.9.9-1" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" +version = "0.9.10" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.10#aeea9b7bd81919e014f7621f6c4b2eb9709d918f" dependencies = [ "enumn", "parity-scale-codec", @@ -9992,9 +9984,9 @@ dependencies = [ [[package]] name = "slotmap" -version = "1.0.5" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a952280edbecfb1d4bd3cf2dbc309dc6ab523e53487c438ae21a6df09fe84bc4" +checksum = "e1e08e261d0e8f5c43123b7adf3e4ca1690d655377ac93a03b2c9d3e98de1342" dependencies = [ "version_check", ] @@ -10016,19 +10008,19 @@ checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e" [[package]] name = "snow" -version = "0.7.2" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "795dd7aeeee24468e5a32661f6d27f7b5cbed802031b2d7640c7b10f8fb2dd50" +checksum = "6142f7c25e94f6fd25a32c3348ec230df9109b463f59c8c7acc4bd34936babb7" dependencies = [ "aes-gcm", "blake2", "chacha20poly1305", - "rand 0.7.3", - "rand_core 0.5.1", + "rand 0.8.4", + "rand_core 0.6.3", "ring", - "rustc_version 0.2.3", - "sha2 0.9.5", - "subtle 2.4.1", + "rustc_version 0.3.3", + "sha2 0.9.8", + "subtle", "x25519-dalek", ] @@ -10045,9 +10037,9 @@ dependencies = [ [[package]] name = "socket2" -version = "0.4.0" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e3dfc207c526015c632472a77be09cf1b6e46866581aecae5cc38fb4235dea2" +checksum = "5dc90fe6c7be1a323296982db1836d1ea9e47b6839496dde9a541bc496df3516" dependencies = [ "libc", "winapi 0.3.9", @@ -10066,7 +10058,7 @@ dependencies = [ "httparse", "log", "rand 0.7.3", - "sha-1 0.9.7", + "sha-1 0.9.8", ] [[package]] @@ -10076,18 +10068,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a74e48087dbeed4833785c2f3352b59140095dc192dce966a3bfc155020a439f" dependencies = [ "base64 0.13.0", - "bytes 1.0.1", + "bytes 1.1.0", "futures 0.3.17", "httparse", "log", "rand 0.8.4", - "sha-1 0.9.7", + "sha-1 0.9.8", ] [[package]] name = "sp-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "hash-db", "log", @@ -10104,19 +10096,19 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "blake2-rfc", - "proc-macro-crate 1.0.0", + "proc-macro-crate 1.1.0", "proc-macro2 1.0.29", "quote 1.0.9", - "syn 1.0.74", + "syn 1.0.77", ] [[package]] name = "sp-application-crypto" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "parity-scale-codec", "serde", @@ -10128,7 +10120,7 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "integer-sqrt", "num-traits", @@ -10142,7 +10134,7 @@ dependencies = [ [[package]] name = "sp-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "parity-scale-codec", "sp-api", @@ -10154,7 +10146,7 @@ dependencies = [ [[package]] name = "sp-authorship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "async-trait", "parity-scale-codec", @@ -10166,7 +10158,7 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "parity-scale-codec", "sp-api", @@ -10178,13 +10170,13 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "futures 0.3.17", "log", "lru", "parity-scale-codec", - "parking_lot 0.11.1", + "parking_lot 0.11.2", "sp-api", "sp-consensus", "sp-database", @@ -10196,14 +10188,14 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "async-trait", "futures 0.3.17", "futures-timer 3.0.2", "log", "parity-scale-codec", - "parking_lot 0.11.1", + "parking_lot 0.11.2", "serde", "sp-api", "sp-core", @@ -10222,7 +10214,7 @@ dependencies = [ [[package]] name = "sp-consensus-aura" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "async-trait", "parity-scale-codec", @@ -10239,7 +10231,7 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "async-trait", "merlin", @@ -10261,7 +10253,7 @@ dependencies = [ [[package]] name = "sp-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "parity-scale-codec", "sp-arithmetic", @@ -10271,7 +10263,7 @@ dependencies = [ [[package]] name = "sp-consensus-vrf" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "parity-scale-codec", "schnorrkel", @@ -10283,7 +10275,7 @@ dependencies = [ [[package]] name = "sp-core" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "base58", "blake2-rfc", @@ -10296,20 +10288,20 @@ dependencies = [ "hex", "impl-serde", "lazy_static", - "libsecp256k1 0.3.5", + "libsecp256k1 0.6.0", "log", "merlin", "num-traits", "parity-scale-codec", "parity-util-mem", - "parking_lot 0.11.1", + "parking_lot 0.11.2", "primitive-types", "rand 0.7.3", "regex", "schnorrkel", "secrecy", "serde", - "sha2 0.9.5", + "sha2 0.9.8", "sp-debug-derive", "sp-externalities", "sp-runtime-interface", @@ -10327,26 +10319,26 @@ dependencies = [ [[package]] name = "sp-database" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "kvdb", - "parking_lot 0.11.1", + "parking_lot 0.11.2", ] [[package]] name = "sp-debug-derive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "proc-macro2 1.0.29", "quote 1.0.9", - "syn 1.0.74", + "syn 1.0.77", ] [[package]] name = "sp-externalities" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "environmental", "parity-scale-codec", @@ -10357,7 +10349,7 @@ dependencies = [ [[package]] name = "sp-finality-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "finality-grandpa", "log", @@ -10374,7 +10366,7 @@ dependencies = [ [[package]] name = "sp-inherents" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "async-trait", "impl-trait-for-tuples", @@ -10388,14 +10380,14 @@ dependencies = [ [[package]] name = "sp-io" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "futures 0.3.17", "hash-db", - "libsecp256k1 0.3.5", + "libsecp256k1 0.6.0", "log", "parity-scale-codec", - "parking_lot 0.11.1", + "parking_lot 0.11.2", "sp-core", "sp-externalities", "sp-keystore", @@ -10413,7 +10405,7 @@ dependencies = [ [[package]] name = "sp-keyring" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "lazy_static", "sp-core", @@ -10424,14 +10416,14 @@ dependencies = [ [[package]] name = "sp-keystore" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "async-trait", "derive_more 0.99.16", "futures 0.3.17", "merlin", "parity-scale-codec", - "parking_lot 0.11.1", + "parking_lot 0.11.2", "schnorrkel", "serde", "sp-core", @@ -10441,7 +10433,7 @@ dependencies = [ [[package]] name = "sp-maybe-compressed-blob" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "ruzstd", "zstd", @@ -10450,31 +10442,31 @@ dependencies = [ [[package]] name = "sp-npos-elections" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "parity-scale-codec", "serde", "sp-arithmetic", "sp-core", - "sp-npos-elections-compact", + "sp-npos-elections-solution-type", "sp-std", ] [[package]] -name = "sp-npos-elections-compact" +name = "sp-npos-elections-solution-type" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ - "proc-macro-crate 1.0.0", + "proc-macro-crate 1.1.0", "proc-macro2 1.0.29", "quote 1.0.9", - "syn 1.0.74", + "syn 1.0.77", ] [[package]] name = "sp-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "sp-api", "sp-core", @@ -10484,7 +10476,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "backtrace", ] @@ -10492,7 +10484,7 @@ dependencies = [ [[package]] name = "sp-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "rustc-hash", "serde", @@ -10503,7 +10495,7 @@ dependencies = [ [[package]] name = "sp-runtime" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "either", "hash256-std-hasher", @@ -10524,7 +10516,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -10541,19 +10533,19 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "Inflector", - "proc-macro-crate 1.0.0", + "proc-macro-crate 1.1.0", "proc-macro2 1.0.29", "quote 1.0.9", - "syn 1.0.74", + "syn 1.0.77", ] [[package]] name = "sp-serializer" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "serde", "serde_json", @@ -10562,7 +10554,7 @@ dependencies = [ [[package]] name = "sp-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "parity-scale-codec", "sp-api", @@ -10575,7 +10567,7 @@ dependencies = [ [[package]] name = "sp-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "parity-scale-codec", "sp-runtime", @@ -10585,13 +10577,13 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "hash-db", "log", "num-traits", "parity-scale-codec", - "parking_lot 0.11.1", + "parking_lot 0.11.2", "rand 0.7.3", "smallvec 1.6.1", "sp-core", @@ -10608,12 +10600,12 @@ dependencies = [ [[package]] name = "sp-std" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" [[package]] name = "sp-storage" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "impl-serde", "parity-scale-codec", @@ -10626,7 +10618,7 @@ dependencies = [ [[package]] name = "sp-tasks" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "log", "sp-core", @@ -10639,7 +10631,7 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "async-trait", "futures-timer 3.0.2", @@ -10656,7 +10648,7 @@ dependencies = [ [[package]] name = "sp-tracing" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "erased-serde", "log", @@ -10674,7 +10666,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "sp-api", "sp-runtime", @@ -10683,7 +10675,7 @@ dependencies = [ [[package]] name = "sp-transaction-storage-proof" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "async-trait", "log", @@ -10698,7 +10690,7 @@ dependencies = [ [[package]] name = "sp-trie" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "hash-db", "memory-db", @@ -10712,7 +10704,7 @@ dependencies = [ [[package]] name = "sp-utils" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "futures 0.3.17", "futures-core", @@ -10724,7 +10716,7 @@ dependencies = [ [[package]] name = "sp-version" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "impl-serde", "parity-scale-codec", @@ -10739,19 +10731,19 @@ dependencies = [ [[package]] name = "sp-version-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "parity-scale-codec", - "proc-macro-crate 1.0.0", + "proc-macro-crate 1.1.0", "proc-macro2 1.0.29", "quote 1.0.9", - "syn 1.0.74", + "syn 1.0.77", ] [[package]] name = "sp-wasm-interface" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -10785,7 +10777,7 @@ checksum = "11b73400442027c4adedda20a9f9b7945234a5bd8d5f7e86da22bd5d0622369c" dependencies = [ "cfg_aliases", "libc", - "parking_lot 0.11.1", + "parking_lot 0.11.2", "static_init_macro", ] @@ -10799,7 +10791,7 @@ dependencies = [ "memchr", "proc-macro2 1.0.29", "quote 1.0.9", - "syn 1.0.74", + "syn 1.0.77", ] [[package]] @@ -10815,16 +10807,6 @@ dependencies = [ "rand 0.8.4", ] -[[package]] -name = "stream-cipher" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c80e15f898d8d8f25db24c253ea615cc14acf418ff307822995814e7d42cfa89" -dependencies = [ - "block-cipher", - "generic-array 0.14.4", -] - [[package]] name = "string" version = "0.2.1" @@ -10842,9 +10824,9 @@ checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" [[package]] name = "structopt" -version = "0.3.22" +version = "0.3.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69b041cdcb67226aca307e6e7be44c8806423d83e018bd662360a93dabce4d71" +checksum = "bf9d950ef167e25e0bdb073cf1d68e9ad2795ac826f2f3f59647817cf23c0bfa" dependencies = [ "clap", "lazy_static", @@ -10853,15 +10835,15 @@ dependencies = [ [[package]] name = "structopt-derive" -version = "0.4.15" +version = "0.4.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7813934aecf5f51a54775e00068c237de98489463968231a51746bbbc03f9c10" +checksum = "134d838a2c9943ac3125cf6df165eda53493451b719f3255b2a26b85f772d0ba" dependencies = [ "heck", "proc-macro-error 1.0.4", "proc-macro2 1.0.29", "quote 1.0.9", - "syn 1.0.74", + "syn 1.0.77", ] [[package]] @@ -10882,26 +10864,26 @@ dependencies = [ "heck", "proc-macro2 1.0.29", "quote 1.0.9", - "syn 1.0.74", + "syn 1.0.77", ] [[package]] name = "substrate-bip39" -version = "0.4.2" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bed6646a0159b9935b5d045611560eeef842b78d7adc3ba36f5ca325a13a0236" +checksum = "49eee6965196b32f882dd2ee85a92b1dbead41b04e53907f269de3b0dc04733c" dependencies = [ - "hmac 0.7.1", - "pbkdf2 0.3.0", + "hmac 0.11.0", + "pbkdf2 0.8.0", "schnorrkel", - "sha2 0.8.2", + "sha2 0.9.8", "zeroize", ] [[package]] name = "substrate-build-script-utils" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "platforms", ] @@ -10909,7 +10891,7 @@ dependencies = [ [[package]] name = "substrate-frame-rpc-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "frame-system-rpc-runtime-api", "futures 0.3.17", @@ -10932,7 +10914,7 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "async-std", "derive_more 0.99.16", @@ -10946,7 +10928,7 @@ dependencies = [ [[package]] name = "substrate-wasm-builder" version = "5.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "ansi_term 0.12.1", "atty", @@ -10959,12 +10941,6 @@ dependencies = [ "wasm-gc-api", ] -[[package]] -name = "subtle" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d67a5a62ba6e01cb2192ff309324cb4875d0c451d55fe2319433abe7a05a8ee" - [[package]] name = "subtle" version = "2.4.1" @@ -10984,9 +10960,9 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.74" +version = "1.0.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1873d832550d4588c3dbc20f01361ab00bfe741048f71e3fecf145a7cc18b29c" +checksum = "5239bc68e0fef57495900cfea4e8dc75596d9a319d7e16b1e0a440d24e6fe0a0" dependencies = [ "proc-macro2 1.0.29", "quote 1.0.9", @@ -11001,7 +10977,7 @@ checksum = "baa8e7560a164edb1621a55d18a0c59abf49d360f47aa7b821061dd7eea7fac9" dependencies = [ "proc-macro2 1.0.29", "quote 1.0.9", - "syn 1.0.74", + "syn 1.0.77", ] [[package]] @@ -11012,7 +10988,7 @@ checksum = "474aaa926faa1603c40b7885a9eaea29b444d1cb2850cb7c0e37bb1a4182f4fa" dependencies = [ "proc-macro2 1.0.29", "quote 1.0.9", - "syn 1.0.74", + "syn 1.0.77", "unicode-xid 0.2.2", ] @@ -11030,9 +11006,9 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "target-lexicon" -version = "0.12.1" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0652da4c4121005e9ed22b79f6c5f2d9e2752906b53a33e9490489ba421a6fb" +checksum = "d9bffcddbc2458fa3e6058414599e3c838a022abae82e5c67b4f7f80298d5bff" [[package]] name = "tempfile" @@ -11043,7 +11019,7 @@ dependencies = [ "cfg-if 1.0.0", "libc", "rand 0.8.4", - "redox_syscall 0.2.9", + "redox_syscall 0.2.10", "remove_dir_all", "winapi 0.3.9", ] @@ -11068,22 +11044,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.26" +version = "1.0.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93119e4feac1cbe6c798c34d3a53ea0026b0b1de6a120deef895137c0529bfe2" +checksum = "602eca064b2d83369e2b2f34b09c70b605402801927c65c11071ac911d299b88" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.26" +version = "1.0.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "060d69a0afe7796bf42e9e2ff91f5ee691fb15c53d38b4b62a9a53eb23164745" +checksum = "bad553cc2c78e8de258400763a647e80e6d1b31ee237275d756f6836d204494c" dependencies = [ "proc-macro2 1.0.29", "quote 1.0.9", - "syn 1.0.74", + "syn 1.0.77", ] [[package]] @@ -11130,17 +11106,18 @@ dependencies = [ [[package]] name = "tiny-bip39" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9e44c4759bae7f1032e286a7ef990bd9ed23fe831b7eeba0beb97484c2e59b8" +checksum = "524daa5624d9d4ffb5a0625971d35205b882111daa6b6338a7a6c578a3c36928" dependencies = [ "anyhow", "hmac 0.8.1", "once_cell", + "parking_lot 0.11.2", "pbkdf2 0.4.0", "rand 0.7.3", "rustc-hash", - "sha2 0.9.5", + "sha2 0.9.8", "thiserror", "unicode-normalization", "zeroize", @@ -11157,9 +11134,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.3.1" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "848a1e1181b9f6753b5e96a092749e29b11d19ede67dfbbd6c7dc7e0f49b5338" +checksum = "f83b2a3d4d9091d0abd7eba4dc2710b1718583bd4d8992e2190720ea38f391f7" dependencies = [ "tinyvec_macros", ] @@ -11219,9 +11196,9 @@ dependencies = [ [[package]] name = "tokio" -version = "1.9.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b7b349f11a7047e6d1276853e612d152f5e8a352c61917887cc2169e2366b4c" +checksum = "c2c2416fdedca8443ae44b4527de1ea633af61d8f7169ffa6e72c5b53d24efcc" dependencies = [ "autocfg", "pin-project-lite 0.2.7", @@ -11299,7 +11276,7 @@ checksum = "e44da00bfc73a25f814cd8d7e57a68a5c31b74b3152a0a1d1f590c97ed06265a" dependencies = [ "proc-macro2 1.0.29", "quote 1.0.9", - "syn 1.0.74", + "syn 1.0.77", ] [[package]] @@ -11397,7 +11374,7 @@ version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df720b6581784c118f0eb4310796b12b1d242a7eb95f716a8367855325c25f89" dependencies = [ - "crossbeam-deque 0.7.3", + "crossbeam-deque 0.7.4", "crossbeam-queue", "crossbeam-utils 0.7.2", "futures 0.1.31", @@ -11485,9 +11462,9 @@ checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6" [[package]] name = "tracing" -version = "0.1.26" +version = "0.1.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09adeb8c97449311ccd28a427f96fb563e7fd31aabf994189879d9da2394b89d" +checksum = "84f96e095c0c82419687c20ddf5cb3eadb61f4e1405923c9dc8e53a1adacbda8" dependencies = [ "cfg-if 1.0.0", "log", @@ -11498,20 +11475,20 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.15" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c42e6fa53307c8a17e4ccd4dc81cf5ec38db9209f59b222210375b54ee40d1e2" +checksum = "98863d0dd09fa59a1b79c6750ad80dbda6b75f4e71c437a6a1a8cb91a8bcbd77" dependencies = [ "proc-macro2 1.0.29", "quote 1.0.9", - "syn 1.0.74", + "syn 1.0.77", ] [[package]] name = "tracing-core" -version = "0.1.18" +version = "0.1.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9ff14f98b1a4b289c6248a023c1c2fa1491062964e9fed67ab29c4e4da4a052" +checksum = "46125608c26121c81b0c6d693eab5a420e416da7e43c426d2e8f7df8da8a3acf" dependencies = [ "lazy_static", ] @@ -11549,9 +11526,9 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.2.19" +version = "0.2.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab69019741fca4d98be3c62d2b75254528b5432233fd8a4d2739fec20278de48" +checksum = "fdd0568dbfe3baf7048b7908d2b32bca0d81cd56bec6d2a8f894b01d74f86be3" dependencies = [ "ansi_term 0.12.1", "chrono", @@ -11576,7 +11553,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9eac131e334e81b6b3be07399482042838adcd7957aa0010231d0813e39e02fa" dependencies = [ "hash-db", - "hashbrown 0.11.2", + "hashbrown", "log", "rustc-hex", "smallvec 1.6.1", @@ -11627,7 +11604,7 @@ dependencies = [ "lazy_static", "log", "lru-cache", - "parking_lot 0.11.1", + "parking_lot 0.11.2", "resolv-conf", "smallvec 1.6.1", "thiserror", @@ -11643,7 +11620,7 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" [[package]] name = "try-runtime-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.10#47ed70a3cb50f64b0691c63d2ec2cc80553a2dee" dependencies = [ "frame-try-runtime", "log", @@ -11667,20 +11644,20 @@ dependencies = [ [[package]] name = "twox-hash" -version = "1.6.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04f8ab788026715fa63b31960869617cba39117e520eb415b0139543e325ab59" +checksum = "1f559b464de2e2bdabcac6a210d12e9b5a5973c251e102c44c585c71d51bd78e" dependencies = [ - "cfg-if 0.1.10", - "rand 0.3.23", + "cfg-if 1.0.0", + "rand 0.8.4", "static_assertions", ] [[package]] name = "typenum" -version = "1.13.0" +version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "879f6906492a7cd215bfa4cf595b600146ccfac0c79bcbd1f3000162af5e8b06" +checksum = "b63708a265f51345575b27fe43f9500ad611579e764c79edbc2037b1121959ec" [[package]] name = "ucd-trie" @@ -11711,12 +11688,9 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eeb8be209bb1c96b7c177c7420d26e04eccacb0eeae6b980e35fcb74678107e0" -dependencies = [ - "matches", -] +checksum = "246f4c42e67e7a4e3c6106ff716a5d067d4132a642840b242e357e468a2a0085" [[package]] name = "unicode-normalization" @@ -11735,9 +11709,9 @@ checksum = "8895849a949e7845e06bd6dc1aa51731a103c42707010a5b591c0038fb73385b" [[package]] name = "unicode-width" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3" +checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973" [[package]] name = "unicode-xid" @@ -11758,7 +11732,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9f214e8f697e925001e66ec2c6e37a4ef93f0f78c2eed7814394e10c62025b05" dependencies = [ "generic-array 0.14.4", - "subtle 2.4.1", + "subtle", ] [[package]] @@ -11774,7 +11748,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "35581ff83d4101e58b582e607120c7f5ffb17e632a980b1f38334d76b36908b2" dependencies = [ "asynchronous-codec 0.5.0", - "bytes 1.0.1", + "bytes 1.1.0", "futures-io", "futures-util", ] @@ -11786,7 +11760,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5f8d425fafb8cd76bc3f22aace4af471d3156301d7508f2107e98fbeae10bc7f" dependencies = [ "asynchronous-codec 0.6.0", - "bytes 1.0.1", + "bytes 1.1.0", "futures-io", "futures-util", ] @@ -11853,7 +11827,6 @@ dependencies = [ "orml-oracle", "orml-oracle-rpc-runtime-api", "orml-traits", - "orml-unknown-tokens", "orml-utilities", "orml-vesting", "orml-xcm", @@ -11988,9 +11961,9 @@ checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" [[package]] name = "wasm-bindgen" -version = "0.2.74" +version = "0.2.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54ee1d4ed486f78874278e63e4069fc1ab9f6a18ca492076ffb90c5eb2997fd" +checksum = "632f73e236b219150ea279196e54e610f5dbafa5d61786303d4da54f84e47fce" dependencies = [ "cfg-if 1.0.0", "wasm-bindgen-macro", @@ -11998,24 +11971,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.74" +version = "0.2.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b33f6a0694ccfea53d94db8b2ed1c3a8a4c86dd936b13b9f0a15ec4a451b900" +checksum = "a317bf8f9fba2476b4b2c85ef4c4af8ff39c3c7f0cdfeed4f82c34a880aa837b" dependencies = [ "bumpalo", "lazy_static", "log", "proc-macro2 1.0.29", "quote 1.0.9", - "syn 1.0.74", + "syn 1.0.77", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.24" +version = "0.4.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fba7978c679d53ce2d0ac80c8c175840feb849a161664365d1287b41f2e67f1" +checksum = "8e8d7523cb1f2a4c96c1317ca690031b714a51cc14e05f712446691f413f5d39" dependencies = [ "cfg-if 1.0.0", "js-sys", @@ -12025,9 +11998,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.74" +version = "0.2.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "088169ca61430fe1e58b8096c24975251700e7b1f6fd91cc9d59b04fb9b18bd4" +checksum = "d56146e7c495528bf6587663bea13a8eb588d39b36b679d83972e1a2dbbdacf9" dependencies = [ "quote 1.0.9", "wasm-bindgen-macro-support", @@ -12035,22 +12008,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.74" +version = "0.2.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be2241542ff3d9f241f5e2cb6dd09b37efe786df8851c54957683a49f0987a97" +checksum = "7803e0eea25835f8abdc585cd3021b3deb11543c6fe226dcd30b228857c5c5ab" dependencies = [ "proc-macro2 1.0.29", "quote 1.0.9", - "syn 1.0.74", + "syn 1.0.77", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.74" +version = "0.2.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7cff876b8f18eed75a66cf49b65e7f967cb354a7aa16003fb55dbfd25b44b4f" +checksum = "0237232789cf037d5480773fe568aac745bfe2afbc11a863e97901780a6b47cc" [[package]] name = "wasm-gc-api" @@ -12071,7 +12044,7 @@ checksum = "be0ecb0db480561e9a7642b5d3e4187c128914e58aa84330b9493e3eb68c5e7f" dependencies = [ "futures 0.3.17", "js-sys", - "parking_lot 0.11.1", + "parking_lot 0.11.2", "pin-utils", "wasm-bindgen", "wasm-bindgen-futures", @@ -12080,9 +12053,9 @@ dependencies = [ [[package]] name = "wasmi" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2ee05bba3d1d994652079893941a2ef9324d2b58a63c31b40678fb7eddd7a5a" +checksum = "ca00c5147c319a8ec91ec1a0edbec31e566ce2c9cc93b3f9bb86a9efd0eb795d" dependencies = [ "downcast-rs", "libc", @@ -12095,9 +12068,9 @@ dependencies = [ [[package]] name = "wasmi-validation" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb8e860796d8be48efef530b60eebf84e74a88bce107374fffb0da97d504b8" +checksum = "165343ecd6c018fc09ebcae280752702c9a2ef3e6f8d02f1cfcbdb53ef6d7937" dependencies = [ "parity-wasm 0.42.2", ] @@ -12154,7 +12127,7 @@ dependencies = [ "libc", "log", "serde", - "sha2 0.9.5", + "sha2 0.9.8", "toml", "winapi 0.3.9", "zstd", @@ -12182,7 +12155,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c5d2a763e7a6fc734218e0e463196762a4f409c483063d81e0e85f96343b2e0a" dependencies = [ "anyhow", - "gimli", + "gimli 0.24.0", "more-asserts", "object 0.24.0", "target-lexicon", @@ -12201,7 +12174,7 @@ dependencies = [ "cranelift-codegen", "cranelift-entity", "cranelift-wasm", - "gimli", + "gimli 0.24.0", "indexmap", "log", "more-asserts", @@ -12216,7 +12189,7 @@ version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4d4539ea734422b7c868107e2187d7746d8affbcaa71916d72639f53757ad707" dependencies = [ - "addr2line", + "addr2line 0.15.2", "anyhow", "cfg-if 1.0.0", "cranelift-codegen", @@ -12224,7 +12197,7 @@ dependencies = [ "cranelift-frontend", "cranelift-native", "cranelift-wasm", - "gimli", + "gimli 0.24.0", "log", "more-asserts", "object 0.24.0", @@ -12299,9 +12272,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.51" +version = "0.3.55" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e828417b379f3df7111d3a2a9e5753706cae29c41f7c4029ee9fd77f3e09e582" +checksum = "38eb105f1c59d9eaa6b5cdc92b859d85b926e82cb2e0945cd0c9259faa6fe9fb" dependencies = [ "js-sys", "wasm-bindgen", @@ -12337,8 +12310,8 @@ dependencies = [ [[package]] name = "westend-runtime" -version = "0.9.9-1" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" +version = "0.9.10" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.10#aeea9b7bd81919e014f7621f6c4b2eb9709d918f" dependencies = [ "beefy-primitives", "bitvec 0.20.4", @@ -12419,11 +12392,12 @@ dependencies = [ [[package]] name = "which" -version = "4.1.0" +version = "4.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b55551e42cbdf2ce2bedd2203d0cc08dba002c27510f86dab6d0ce304cba3dfe" +checksum = "ea187a8ef279bc014ec368c27a920da2024d2a711109bfbe3440585d5cf27ad9" dependencies = [ "either", + "lazy_static", "libc", ] @@ -12503,30 +12477,31 @@ checksum = "85e60b0d1b5f99db2556934e21937020776a5d31520bf169e851ac44e6420214" [[package]] name = "x25519-dalek" -version = "1.1.1" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a0c105152107e3b96f6a00a65e86ce82d9b125230e1c4302940eca58ff71f4f" +checksum = "2392b6b94a576b4e2bf3c5b2757d63f10ada8020a2e4d08ac849ebcf6ea8e077" dependencies = [ - "curve25519-dalek 3.1.0", + "curve25519-dalek 3.2.0", "rand_core 0.5.1", "zeroize", ] [[package]] name = "xcm" -version = "0.9.9-1" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" +version = "0.9.10" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.10#aeea9b7bd81919e014f7621f6c4b2eb9709d918f" dependencies = [ "derivative", "impl-trait-for-tuples", "log", "parity-scale-codec", + "xcm-procedural", ] [[package]] name = "xcm-builder" -version = "0.9.9-1" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" +version = "0.9.10" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.10#aeea9b7bd81919e014f7621f6c4b2eb9709d918f" dependencies = [ "frame-support", "frame-system", @@ -12544,8 +12519,8 @@ dependencies = [ [[package]] name = "xcm-executor" -version = "0.9.9-1" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" +version = "0.9.10" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.10#aeea9b7bd81919e014f7621f6c4b2eb9709d918f" dependencies = [ "frame-support", "impl-trait-for-tuples", @@ -12559,10 +12534,20 @@ dependencies = [ "xcm", ] +[[package]] +name = "xcm-procedural" +version = "0.1.0" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.10#aeea9b7bd81919e014f7621f6c4b2eb9709d918f" +dependencies = [ + "proc-macro2 1.0.29", + "quote 1.0.9", + "syn 1.0.77", +] + [[package]] name = "xcm-simulator" -version = "0.9.9-1" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" +version = "0.9.10" +source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.10#aeea9b7bd81919e014f7621f6c4b2eb9709d918f" dependencies = [ "frame-support", "parity-scale-codec", @@ -12585,29 +12570,29 @@ dependencies = [ "futures 0.3.17", "log", "nohash-hasher", - "parking_lot 0.11.1", + "parking_lot 0.11.2", "rand 0.8.4", "static_assertions", ] [[package]] name = "zeroize" -version = "1.4.1" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "377db0846015f7ae377174787dd452e1c5f5a9050bc6f954911d01f116daa0cd" +checksum = "4756f7db3f7b5574938c3eb1c117038b8e07f95ee6718c0efad4ac21508f1efd" dependencies = [ "zeroize_derive", ] [[package]] name = "zeroize_derive" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2c1e130bebaeab2f23886bf9acbaca14b092408c452543c857f66399cd6dab1" +checksum = "bdff2024a851a322b08f179173ae2ba620445aef1e838f0c196820eade4ae0c7" dependencies = [ "proc-macro2 1.0.29", "quote 1.0.9", - "syn 1.0.74", + "syn 1.0.77", "synstructure", ] diff --git a/Makefile b/Makefile index a1f746a9f4..f7e649c6d2 100644 --- a/Makefile +++ b/Makefile @@ -79,7 +79,7 @@ shutdown: .PHONY: launch launch: shutdown - docker image pull parallelfinance/polkadot:v0.9.9-1 + docker image pull parallelfinance/polkadot:v0.9.10 docker image pull parallelfinance/parallel-dapp:latest docker image pull parallelfinance/stake-client:latest parachain-launch generate $(LAUNCH_CONFIG) && (cp -r keystore* output || true) && cp docker-compose.override.yml output && docker-compose -f output/docker-compose.yml -f output/docker-compose.override.yml up -d --build diff --git a/config.yml b/config.yml index 5ca632a299..51670b0a05 100644 --- a/config.yml +++ b/config.yml @@ -1,5 +1,5 @@ relaychain: - image: parallelfinance/polkadot:v0.9.9-1 + image: parallelfinance/polkadot:v0.9.10 chain: westend-local runtimeGenesisConfig: configuration: diff --git a/docs/DEVELOPER-GUIDE.md b/docs/DEVELOPER-GUIDE.md index 446bf45c5f..7192ad0984 100644 --- a/docs/DEVELOPER-GUIDE.md +++ b/docs/DEVELOPER-GUIDE.md @@ -31,7 +31,7 @@ make help ### Local Testnet -Polkadot (v0.9.9-1 branch) +Polkadot (v0.9.10 branch) ``` cargo build --release diff --git a/node/parallel/Cargo.toml b/node/parallel/Cargo.toml index c6085c3aa9..c1e460bba0 100644 --- a/node/parallel/Cargo.toml +++ b/node/parallel/Cargo.toml @@ -15,8 +15,8 @@ targets = ['x86_64-unknown-linux-gnu'] [dependencies] codec = { package = 'parity-scale-codec', version = '2.2.0' } derive_more = '0.15.0' -frame-benchmarking = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9' } -frame-benchmarking-cli = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9' } +frame-benchmarking = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10' } +frame-benchmarking-cli = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10' } hex-literal = '0.3.1' jsonrpc-core = '15.1.0' log = '0.4.13' @@ -25,68 +25,68 @@ primitives = { package = 'parallel-primitives', path = '../../primitives' } heiko-runtime = { path = '../../runtime/heiko' } pallet-loans-rpc = { path = '../../pallets/loans/rpc' } -pallet-transaction-payment-rpc = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9' } -pallet-transaction-payment-rpc-runtime-api = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9' } +pallet-transaction-payment-rpc = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10' } +pallet-transaction-payment-rpc-runtime-api = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10' } parallel-runtime = { path = '../../runtime/parallel' } vanilla-runtime = { path = '../../runtime/vanilla' } -sc-basic-authorship = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9' } -sc-chain-spec = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9' } -sc-cli = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', features = ['wasmtime'] } -sc-client-api = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9' } -sc-consensus = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9' } -sc-executor = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', features = ['wasmtime'] } -sc-keystore = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9' } -sc-rpc = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9' } -sc-rpc-api = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9' } -sc-service = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', features = ['wasmtime'] } -sc-telemetry = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9' } -sc-tracing = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9' } -sc-transaction-pool = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9' } -sc-transaction-pool-api = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9' } +sc-basic-authorship = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10' } +sc-chain-spec = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10' } +sc-cli = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', features = ['wasmtime'] } +sc-client-api = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10' } +sc-consensus = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10' } +sc-executor = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', features = ['wasmtime'] } +sc-keystore = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10' } +sc-rpc = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10' } +sc-rpc-api = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10' } +sc-service = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', features = ['wasmtime'] } +sc-telemetry = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10' } +sc-tracing = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10' } +sc-transaction-pool = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10' } +sc-transaction-pool-api = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10' } -frame-system-rpc-runtime-api = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9' } -try-runtime-cli = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', optional = true } +frame-system-rpc-runtime-api = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10' } +try-runtime-cli = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', optional = true } serde = { version = '1.0.119', features = ['derive'] } serde_json = '1.0.64' structopt = '0.3.8' -orml-oracle-rpc = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', default-features = false } -substrate-frame-rpc-system = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9' } +orml-oracle-rpc = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', branch = 'sw/xcm-v1', default-features = false } +substrate-frame-rpc-system = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10' } -sp-api = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9' } -sp-block-builder = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9' } -sp-blockchain = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9' } -sp-consensus = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9' } -sp-consensus-aura = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9' } -sp-core = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9' } -sp-inherents = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9' } -sp-keystore = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9' } -sp-offchain = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9' } -sp-runtime = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9' } -sp-session = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9' } -sp-std = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } -sp-storage = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9' } -sp-timestamp = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9' } -sp-transaction-pool = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9' } -sp-trie = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9' } +sp-api = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10' } +sp-block-builder = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10' } +sp-blockchain = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10' } +sp-consensus = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10' } +sp-consensus-aura = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10' } +sp-core = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10' } +sp-inherents = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10' } +sp-keystore = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10' } +sp-offchain = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10' } +sp-runtime = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10' } +sp-session = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10' } +sp-std = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } +sp-storage = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10' } +sp-timestamp = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10' } +sp-transaction-pool = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10' } +sp-trie = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10' } -cumulus-client-cli = { git = 'https://github.com/paritytech/cumulus.git', branch = 'polkadot-v0.9.9' } -cumulus-client-collator = { git = 'https://github.com/paritytech/cumulus.git', branch = 'polkadot-v0.9.9' } -cumulus-client-consensus-aura = { git = 'https://github.com/paritytech/cumulus.git', branch = 'polkadot-v0.9.9' } -cumulus-client-network = { git = 'https://github.com/paritytech/cumulus.git', branch = 'polkadot-v0.9.9' } -cumulus-client-service = { git = 'https://github.com/paritytech/cumulus.git', branch = 'polkadot-v0.9.9' } -cumulus-primitives-core = { git = 'https://github.com/paritytech/cumulus.git', branch = 'polkadot-v0.9.9' } -cumulus-primitives-parachain-inherent = { git = 'https://github.com/paritytech/cumulus.git', branch = 'polkadot-v0.9.9' } +cumulus-client-cli = { git = 'https://github.com/paritytech/cumulus.git', branch = 'polkadot-v0.9.10' } +cumulus-client-collator = { git = 'https://github.com/paritytech/cumulus.git', branch = 'polkadot-v0.9.10' } +cumulus-client-consensus-aura = { git = 'https://github.com/paritytech/cumulus.git', branch = 'polkadot-v0.9.10' } +cumulus-client-network = { git = 'https://github.com/paritytech/cumulus.git', branch = 'polkadot-v0.9.10' } +cumulus-client-service = { git = 'https://github.com/paritytech/cumulus.git', branch = 'polkadot-v0.9.10' } +cumulus-primitives-core = { git = 'https://github.com/paritytech/cumulus.git', branch = 'polkadot-v0.9.10' } +cumulus-primitives-parachain-inherent = { git = 'https://github.com/paritytech/cumulus.git', branch = 'polkadot-v0.9.10' } -polkadot-cli = { git = 'https://github.com/paritytech/polkadot.git', branch = 'release-v0.9.9' } -polkadot-parachain = { git = 'https://github.com/paritytech/polkadot.git', branch = 'release-v0.9.9' } -polkadot-primitives = { git = 'https://github.com/paritytech/polkadot.git', branch = 'release-v0.9.9' } -polkadot-service = { git = 'https://github.com/paritytech/polkadot.git', branch = 'release-v0.9.9' } +polkadot-cli = { git = 'https://github.com/paritytech/polkadot.git', branch = 'release-v0.9.10' } +polkadot-parachain = { git = 'https://github.com/paritytech/polkadot.git', branch = 'release-v0.9.10' } +polkadot-primitives = { git = 'https://github.com/paritytech/polkadot.git', branch = 'release-v0.9.10' } +polkadot-service = { git = 'https://github.com/paritytech/polkadot.git', branch = 'release-v0.9.10' } [build-dependencies] -substrate-build-script-utils = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9' } +substrate-build-script-utils = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10' } [[bin]] name = 'parallel' diff --git a/node/parallel/src/client.rs b/node/parallel/src/client.rs index 61786a10c8..fe8da4ea88 100644 --- a/node/parallel/src/client.rs +++ b/node/parallel/src/client.rs @@ -40,7 +40,7 @@ pub trait RuntimeApiCollection: + sp_block_builder::BlockBuilder + frame_system_rpc_runtime_api::AccountNonceApi + pallet_transaction_payment_rpc_runtime_api::TransactionPaymentApi - + orml_oracle_rpc::OracleRuntimeApi + + orml_oracle_rpc::OracleRuntimeApi + sp_consensus_aura::AuraApi + sp_api::Metadata + sp_offchain::OffchainWorkerApi @@ -59,7 +59,7 @@ where + sp_block_builder::BlockBuilder + frame_system_rpc_runtime_api::AccountNonceApi + pallet_transaction_payment_rpc_runtime_api::TransactionPaymentApi - + orml_oracle_rpc::OracleRuntimeApi + + orml_oracle_rpc::OracleRuntimeApi + sp_consensus_aura::AuraApi + sp_api::Metadata + sp_offchain::OffchainWorkerApi diff --git a/node/parallel/src/rpc.rs b/node/parallel/src/rpc.rs index e0359e22db..938244a25c 100644 --- a/node/parallel/src/rpc.rs +++ b/node/parallel/src/rpc.rs @@ -3,7 +3,7 @@ use std::sync::Arc; use crate::client::Block; -use primitives::{AccountId, AssetId, Balance, DataProviderId, Index, TimeStampedPrice}; +use primitives::{AccountId, Balance, CurrencyId, DataProviderId, Index, TimeStampedPrice}; pub use sc_rpc_api::DenyUnsafe; use sc_transaction_pool_api::TransactionPool; use sp_api::ProvideRuntimeApi; @@ -30,7 +30,7 @@ where C: Send + Sync + 'static, C::Api: substrate_frame_rpc_system::AccountNonceApi, C::Api: pallet_transaction_payment_rpc::TransactionPaymentRuntimeApi, - C::Api: orml_oracle_rpc::OracleRuntimeApi, + C::Api: orml_oracle_rpc::OracleRuntimeApi, C::Api: pallet_loans_rpc::LoansRuntimeApi, C::Api: BlockBuilder, P: TransactionPool + 'static, diff --git a/pallets/amm/Cargo.toml b/pallets/amm/Cargo.toml index b5f03c5a97..fad10cdbcd 100644 --- a/pallets/amm/Cargo.toml +++ b/pallets/amm/Cargo.toml @@ -9,21 +9,21 @@ targets = ['x86_64-unknown-linux-gnu'] [dependencies] codec = { package = 'parity-scale-codec', version = '2.0.0', features = ['max-encoded-len'], default-features = false } -frame-benchmarking = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false, optional = true } -frame-support = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.9', default-features = false } -frame-system = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.9', default-features = false } -pallet-assets = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.9', default-features = false } +frame-benchmarking = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false, optional = true } +frame-support = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.10', default-features = false } +frame-system = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.10', default-features = false } +pallet-assets = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.10', default-features = false } primitives = { package = 'parallel-primitives', path = '../../primitives', default-features = false } serde = { version = '1', features = ['derive'], optional = true } -sp-arithmetic = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.9', default-features = false } -sp-runtime = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.9', default-features = false } -sp-std = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.9', default-features = false } +sp-arithmetic = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.10', default-features = false } +sp-runtime = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.10', default-features = false } +sp-std = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.10', default-features = false } [dev-dependencies] -pallet-balances = { branch = 'polkadot-v0.9.9', git = 'https://github.com/paritytech/substrate' } -sp-core = { branch = 'polkadot-v0.9.9', git = 'https://github.com/paritytech/substrate' } -sp-io = { branch = 'polkadot-v0.9.9', git = 'https://github.com/paritytech/substrate' } -pallet-currency-adapter = { path = '../currency-adapter' } +pallet-balances = { branch = 'polkadot-v0.9.10', git = 'https://github.com/paritytech/substrate' } +pallet-currency-adapter = { path = '../currency-adapter' } +sp-core = { branch = 'polkadot-v0.9.10', git = 'https://github.com/paritytech/substrate' } +sp-io = { branch = 'polkadot-v0.9.10', git = 'https://github.com/paritytech/substrate' } [features] default = ['std'] diff --git a/pallets/amm/src/benchmarking.rs b/pallets/amm/src/benchmarking.rs index 9cff90153c..4d55ec8aed 100644 --- a/pallets/amm/src/benchmarking.rs +++ b/pallets/amm/src/benchmarking.rs @@ -14,8 +14,8 @@ use primitives::tokens; use primitives::tokens::*; use sp_std::prelude::*; -const BASE_ASSET: AssetId = XDOT; -const QUOTE_ASSET: AssetId = DOT; +const BASE_ASSET: CurrencyId = XDOT; +const QUOTE_ASSET: CurrencyId = DOT; const INITIAL_AMOUNT: u128 = 1000_000_000_000_000; fn assert_last_event, I: 'static>(generic_event: >::Event) { diff --git a/pallets/amm/src/lib.rs b/pallets/amm/src/lib.rs index 3de324ce05..e736cae92b 100644 --- a/pallets/amm/src/lib.rs +++ b/pallets/amm/src/lib.rs @@ -43,7 +43,7 @@ use frame_support::{ }; use frame_system::{ensure_signed, pallet_prelude::OriginFor, RawOrigin}; use pool_structs::PoolLiquidityAmount; -use primitives::{AssetId, Balance, Rate}; +use primitives::{Balance, CurrencyId, Rate}; use sp_runtime::{ traits::{AccountIdConversion, IntegerSquareRoot, StaticLookup}, ArithmeticError, DispatchError, Perbill, @@ -55,19 +55,19 @@ pub mod pallet { use super::*; use frame_support::traits::tokens::fungibles; use frame_system::ensure_root; - use primitives::AssetId; + use primitives::CurrencyId; #[pallet::config] pub trait Config: - frame_system::Config + pallet_assets::Config + frame_system::Config + pallet_assets::Config { type Event: From> + IsType<::Event>; /// Currency type for deposit/withdraw assets to/from amm /// module - type Assets: fungibles::Inspect - + fungibles::Mutate - + fungibles::Transfer; + type Assets: fungibles::Inspect + + fungibles::Mutate + + fungibles::Transfer; #[pallet::constant] type PalletId: Get; @@ -116,13 +116,13 @@ pub mod pallet { pub enum Event, I: 'static = ()> { /// Add liquidity into pool /// [sender, currency_id, currency_id] - LiquidityAdded(T::AccountId, AssetId, AssetId), + LiquidityAdded(T::AccountId, CurrencyId, CurrencyId), /// Remove liquidity from pool /// [sender, currency_id, currency_id] - LiquidityRemoved(T::AccountId, AssetId, AssetId), + LiquidityRemoved(T::AccountId, CurrencyId, CurrencyId), /// Trade using liquidity /// [trader, currency_id_in, currency_id_out, rate_out_for_in] - Trade(T::AccountId, AssetId, AssetId, Rate), + Trade(T::AccountId, CurrencyId, CurrencyId, Rate), } #[pallet::hooks] @@ -142,8 +142,8 @@ pub mod pallet { _, ( NMapKey, - NMapKey, - NMapKey, + NMapKey, + NMapKey, ), PoolLiquidityAmount, ValueQuery, @@ -156,9 +156,9 @@ pub mod pallet { pub type Pools, I: 'static = ()> = StorageDoubleMap< _, Twox64Concat, - AssetId, + CurrencyId, Twox64Concat, - AssetId, + CurrencyId, PoolLiquidityAmount, OptionQuery, >; @@ -177,10 +177,10 @@ pub mod pallet { #[transactional] pub fn add_liquidity( origin: OriginFor, - pool: (AssetId, AssetId), + pool: (CurrencyId, CurrencyId), liquidity_amounts: (Balance, Balance), minimum_amounts: (Balance, Balance), - asset_id: AssetId, + asset_id: CurrencyId, ) -> DispatchResultWithPostInfo { let who = ensure_signed(origin)?; let (is_inverted, base_asset, quote_asset) = Self::get_upper_currency(pool.0, pool.1); @@ -301,7 +301,7 @@ pub mod pallet { #[transactional] pub fn remove_liquidity( origin: OriginFor, - pool: (AssetId, AssetId), + pool: (CurrencyId, CurrencyId), ownership_to_remove: Balance, ) -> DispatchResult { let who = ensure_signed(origin)?; @@ -385,7 +385,7 @@ pub mod pallet { #[transactional] pub fn force_create_pool( origin: OriginFor, - pool: (AssetId, AssetId), + pool: (CurrencyId, CurrencyId), liquidity_amounts: (Balance, Balance), lptoken_receiver: T::AccountId, asset_id: T::AssetId, @@ -438,7 +438,10 @@ impl, I: 'static> Pallet { T::PalletId::get().into_account() } - pub fn get_upper_currency(curr_a: AssetId, curr_b: AssetId) -> (bool, AssetId, AssetId) { + pub fn get_upper_currency( + curr_a: CurrencyId, + curr_b: CurrencyId, + ) -> (bool, CurrencyId, CurrencyId) { if curr_a > curr_b { (false, curr_a, curr_b) } else { @@ -455,9 +458,9 @@ impl, I: 'static> Pallet { fn mint_transfer_liquidity( who: T::AccountId, ownership: u128, - currency_asset: AssetId, - base_asset: AssetId, - quote_asset: AssetId, + currency_asset: CurrencyId, + base_asset: CurrencyId, + quote_asset: CurrencyId, base_amount: Balance, quote_amount: Balance, ) -> DispatchResult { @@ -473,8 +476,8 @@ impl, I: 'static> Pallet { fn insert_into_liquidity_providers( lptoken_receiver: &T::AccountId, asset_id: T::AssetId, - base_asset: &AssetId, - quote_asset: &AssetId, + base_asset: &CurrencyId, + quote_asset: &CurrencyId, amm_pool: PoolLiquidityAmount, ) -> DispatchResult { LiquidityProviders::::insert( @@ -496,11 +499,11 @@ impl, I: 'static> Pallet { fn add_new_liquidity( asset_id: T::AssetId, who: T::AccountId, - base_asset: AssetId, - quote_asset: AssetId, + base_asset: CurrencyId, + quote_asset: CurrencyId, base_amount: u128, quote_amount: u128, - currency_asset: AssetId, + currency_asset: CurrencyId, pool_liquidity_amount: &mut Option, ) -> DispatchResult { ensure!( @@ -534,7 +537,7 @@ impl, I: 'static> Pallet { impl, I: 'static> primitives::AMM for Pallet { fn trade( who: &T::AccountId, - pair: (AssetId, AssetId), + pair: (CurrencyId, CurrencyId), amount_in: Balance, minimum_amount_out: Balance, ) -> Result { diff --git a/pallets/amm/src/mock.rs b/pallets/amm/src/mock.rs index 2002d53ce8..c0f3e5779b 100644 --- a/pallets/amm/src/mock.rs +++ b/pallets/amm/src/mock.rs @@ -3,7 +3,7 @@ use crate as pallet_amm; use codec::{Decode, Encode, MaxEncodedLen}; use frame_support::{parameter_types, PalletId}; use frame_system::{self as system, EnsureRoot}; -use primitives::{tokens, AssetId, Balance}; +use primitives::{tokens, Balance, CurrencyId}; #[cfg(feature = "std")] use serde::{Deserialize, Serialize}; use sp_core::H256; @@ -13,9 +13,9 @@ use sp_runtime::{ Perbill, RuntimeDebug, }; -pub const DOT: AssetId = tokens::DOT; -pub const XDOT: AssetId = tokens::XDOT; -pub const HKO: AssetId = tokens::HKO; +pub const DOT: CurrencyId = tokens::DOT; +pub const XDOT: CurrencyId = tokens::XDOT; +pub const HKO: CurrencyId = tokens::HKO; pub const ALICE: AccountId = AccountId(1); pub const BOB: AccountId = AccountId(2); @@ -190,13 +190,13 @@ impl pallet_amm::Config for Test { } parameter_types! { - pub const NativeCurrency: AssetId = 0; + pub const NativeCurrencyId: CurrencyId = 0; } impl pallet_currency_adapter::Config for Test { type Assets = Assets; type Balances = Balances; - type GetNativeCurrencyId = NativeCurrency; + type GetNativeCurrencyId = NativeCurrencyId; } // Build genesis storage according to the mock runtime. diff --git a/pallets/amm/src/pool_structs.rs b/pallets/amm/src/pool_structs.rs index f7cfa02639..a0c5e44e18 100644 --- a/pallets/amm/src/pool_structs.rs +++ b/pallets/amm/src/pool_structs.rs @@ -15,7 +15,7 @@ // Groups common pool related structures use codec::{Decode, Encode}; -use primitives::{AssetId, Balance, Rate}; +use primitives::{Balance, CurrencyId, Rate}; #[cfg(feature = "std")] use serde::{Deserialize, Serialize}; use sp_runtime::{ @@ -45,7 +45,7 @@ pub struct AmountEvaluation { pub struct PoolLiquidityAmount { pub base_amount: Balance, pub quote_amount: Balance, - pub pool_assets: AssetId, + pub pool_assets: CurrencyId, } impl Default for PoolLiquidityAmount { diff --git a/pallets/currency-adapter/Cargo.toml b/pallets/currency-adapter/Cargo.toml index f3ce506b8a..a355b2fa5a 100644 --- a/pallets/currency-adapter/Cargo.toml +++ b/pallets/currency-adapter/Cargo.toml @@ -9,10 +9,10 @@ targets = ['x86_64-unknown-linux-gnu'] [dependencies] codec = { package = 'parity-scale-codec', version = '2.2.0', features = ['max-encoded-len'], default-features = false } -frame-support = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.9', default-features = false } -frame-system = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.9', default-features = false } +frame-support = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.10', default-features = false } +frame-system = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.10', default-features = false } primitives = { package = 'parallel-primitives', path = '../../primitives', default-features = false } -sp-runtime = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.9', default-features = false } +sp-runtime = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.10', default-features = false } [features] default = ['std'] diff --git a/pallets/currency-adapter/src/lib.rs b/pallets/currency-adapter/src/lib.rs index 07db735419..954e595098 100644 --- a/pallets/currency-adapter/src/lib.rs +++ b/pallets/currency-adapter/src/lib.rs @@ -33,27 +33,27 @@ use frame_support::{ Get, }, }; -use primitives::{AssetId, Balance}; +use primitives::{Balance, CurrencyId}; use sp_runtime::DispatchError; #[frame_support::pallet] pub mod pallet { use super::*; use frame_support::traits::tokens::fungible; - use primitives::AssetId; + use primitives::CurrencyId; #[pallet::config] pub trait Config: frame_system::Config { - type Assets: Transfers - + Inspects - + Mutates; + type Assets: Transfers + + Inspects + + Mutates; type Balances: fungible::Inspect + fungible::Mutate + fungible::Transfer; #[pallet::constant] - type GetNativeCurrencyId: Get; + type GetNativeCurrencyId: Get; } #[pallet::pallet] @@ -64,7 +64,7 @@ pub mod pallet { } impl Inspects for Pallet { - type AssetId = AssetId; + type AssetId = CurrencyId; type Balance = Balance; fn total_issuance(asset: Self::AssetId) -> Self::Balance { diff --git a/pallets/liquid-staking-v2/Cargo.toml b/pallets/liquid-staking-v2/Cargo.toml index 0b826d362f..d38e1ddfbd 100644 --- a/pallets/liquid-staking-v2/Cargo.toml +++ b/pallets/liquid-staking-v2/Cargo.toml @@ -9,21 +9,21 @@ targets = ['x86_64-unknown-linux-gnu'] [dependencies] codec = { package = 'parity-scale-codec', version = '2.0.0', features = ['max-encoded-len'], default-features = false } -frame-support = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } -frame-system = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } -orml-traits = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', default-features = false } -pallet-assets = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } -sp-runtime = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } -sp-std = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } -xcm = { git = 'https://github.com/paritytech/polkadot.git', branch = 'release-v0.9.9', default-features = false } +frame-support = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } +frame-system = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } +orml-traits = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', branch = 'sw/xcm-v1', default-features = false } +pallet-assets = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } +sp-runtime = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } +sp-std = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } +xcm = { git = 'https://github.com/paritytech/polkadot.git', branch = 'release-v0.9.10', default-features = false } # parallel pallets primitives = { package = 'parallel-primitives', path = '../../primitives', default-features = false } [dev-dependencies] -pallet-balances = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } +pallet-balances = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } serde = { version = '1' } -sp-core = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } +sp-core = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } [features] default = ['std'] diff --git a/pallets/liquid-staking-v2/src/lib.rs b/pallets/liquid-staking-v2/src/lib.rs index 64d2da7495..11e9ebd51c 100644 --- a/pallets/liquid-staking-v2/src/lib.rs +++ b/pallets/liquid-staking-v2/src/lib.rs @@ -56,7 +56,7 @@ mod pallet { ArithmeticError, FixedPointNumber, FixedPointOperand, }; use sp_std::vec::Vec; - use xcm::v0::MultiLocation; + use xcm::latest::prelude::*; use primitives::{EraIndex, Rate, Ratio}; diff --git a/pallets/liquid-staking-v2/src/mock.rs b/pallets/liquid-staking-v2/src/mock.rs index 04e814985d..7d5b04b7c7 100644 --- a/pallets/liquid-staking-v2/src/mock.rs +++ b/pallets/liquid-staking-v2/src/mock.rs @@ -15,7 +15,7 @@ use sp_runtime::{ traits::{BlakeTwo256, IdentityLookup, One}, }; -use xcm::v0::{Junction, MultiAsset, MultiLocation}; +use xcm::latest::prelude::*; use primitives::{tokens::*, Balance, Rate, Ratio}; @@ -23,7 +23,7 @@ type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic; type Block = frame_system::mocking::MockBlock; type BlockNumber = u64; type AccountId = u64; -type AssetId = u32; +type CurrencyId = u32; parameter_types! { pub const BlockHashCount: u64 = 250; @@ -84,7 +84,7 @@ parameter_types! { impl pallet_assets::Config for Test { type Event = Event; type Balance = Balance; - type AssetId = AssetId; + type AssetId = CurrencyId; type Currency = Balances; type ForceOrigin = EnsureRoot; type AssetDeposit = AssetDeposit; @@ -117,12 +117,10 @@ pub type UpdateOrigin = EnsureSignedBy; parameter_types! { pub const StakingPalletId: PalletId = PalletId(*b"par/lqsk"); pub const BaseXcmWeight: Weight = 0; - pub const Agent: MultiLocation = MultiLocation::X2( - Junction::Parent, - Junction::AccountId32 { - network: xcm::v0::NetworkId::Any, - id: [0; 32] - }); + pub Agent: MultiLocation = MultiLocation::new(1, Junctions::X1(Junction::AccountId32 { + network: xcm::v0::NetworkId::Any, + id: [0; 32] + })); pub const PeriodBasis: BlockNumber = 5u64; } @@ -156,10 +154,10 @@ pub const ALICE: AccountId = 1u64; pub const BOB: AccountId = 2u64; pub struct MockXcmTransfer; -impl XcmTransfer for MockXcmTransfer { +impl XcmTransfer for MockXcmTransfer { fn transfer( _who: AccountId, - _currency_id: AssetId, + _currency_id: CurrencyId, _amount: Balance, _to: MultiLocation, _dest_weight: Weight, diff --git a/pallets/liquid-staking/Cargo.toml b/pallets/liquid-staking/Cargo.toml index 3028a9ef84..4a72b426c4 100644 --- a/pallets/liquid-staking/Cargo.toml +++ b/pallets/liquid-staking/Cargo.toml @@ -9,46 +9,46 @@ targets = ['x86_64-unknown-linux-gnu'] [dependencies] codec = { package = 'parity-scale-codec', version = '2.0.0', features = ['max-encoded-len'], default-features = false } -frame-support = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } -frame-system = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } -orml-traits = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', default-features = false } -pallet-assets = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } -sp-runtime = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } -sp-std = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } -xcm = { git = 'https://github.com/paritytech/polkadot.git', branch = 'release-v0.9.9', default-features = false } +frame-support = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } +frame-system = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } +orml-traits = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', branch = 'sw/xcm-v1', default-features = false } +pallet-assets = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } +sp-runtime = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } +sp-std = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } +xcm = { git = 'https://github.com/paritytech/polkadot.git', branch = 'release-v0.9.10', default-features = false } # parallel pallets primitives = { package = 'parallel-primitives', path = '../../primitives', default-features = false } [dev-dependencies] -pallet-babe = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9' } -pallet-balances = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9' } -pallet-session = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9' } -pallet-staking = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9' } -pallet-timestamp = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9' } -pallet-utility = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9' } +pallet-babe = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10' } +pallet-balances = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10' } +pallet-session = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10' } +pallet-staking = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10' } +pallet-timestamp = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10' } +pallet-utility = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10' } serde = { version = '1' } -sp-core = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9' } -sp-io = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9' } +sp-core = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10' } +sp-io = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10' } -pallet-xcm = { git = 'https://github.com/paritytech/polkadot.git', branch = 'release-v0.9.9' } -polkadot-core-primitives = { git = 'https://github.com/paritytech/polkadot.git', branch = 'release-v0.9.9' } -polkadot-parachain = { git = 'https://github.com/paritytech/polkadot.git', branch = 'release-v0.9.9' } -polkadot-runtime-parachains = { git = 'https://github.com/paritytech/polkadot.git', branch = 'release-v0.9.9' } -westend-runtime = { git = 'https://github.com/paritytech/polkadot.git', branch = 'release-v0.9.9' } -xcm-builder = { git = 'https://github.com/paritytech/polkadot.git', branch = 'release-v0.9.9' } -xcm-executor = { git = 'https://github.com/paritytech/polkadot.git', branch = 'release-v0.9.9' } -xcm-simulator = { git = 'https://github.com/paritytech/polkadot.git', branch = 'release-v0.9.9' } +pallet-xcm = { git = 'https://github.com/paritytech/polkadot.git', branch = 'release-v0.9.10' } +polkadot-core-primitives = { git = 'https://github.com/paritytech/polkadot.git', branch = 'release-v0.9.10' } +polkadot-parachain = { git = 'https://github.com/paritytech/polkadot.git', branch = 'release-v0.9.10' } +polkadot-runtime-parachains = { git = 'https://github.com/paritytech/polkadot.git', branch = 'release-v0.9.10' } +westend-runtime = { git = 'https://github.com/paritytech/polkadot.git', branch = 'release-v0.9.10' } +xcm-builder = { git = 'https://github.com/paritytech/polkadot.git', branch = 'release-v0.9.10' } +xcm-executor = { git = 'https://github.com/paritytech/polkadot.git', branch = 'release-v0.9.10' } +xcm-simulator = { git = 'https://github.com/paritytech/polkadot.git', branch = 'release-v0.9.10' } -cumulus-pallet-dmp-queue = { git = 'https://github.com/paritytech/cumulus', branch = 'polkadot-v0.9.9' } -cumulus-pallet-parachain-system = { git = 'https://github.com/paritytech/cumulus', branch = 'polkadot-v0.9.9' } -cumulus-pallet-xcm = { git = 'https://github.com/paritytech/cumulus', branch = 'polkadot-v0.9.9' } -cumulus-pallet-xcmp-queue = { git = 'https://github.com/paritytech/cumulus', branch = 'polkadot-v0.9.9' } -cumulus-primitives-core = { git = 'https://github.com/paritytech/cumulus', branch = 'polkadot-v0.9.9' } -parachain-info = { git = 'https://github.com/paritytech/cumulus', branch = 'polkadot-v0.9.9' } +cumulus-pallet-dmp-queue = { git = 'https://github.com/paritytech/cumulus', branch = 'polkadot-v0.9.10' } +cumulus-pallet-parachain-system = { git = 'https://github.com/paritytech/cumulus', branch = 'polkadot-v0.9.10' } +cumulus-pallet-xcm = { git = 'https://github.com/paritytech/cumulus', branch = 'polkadot-v0.9.10' } +cumulus-pallet-xcmp-queue = { git = 'https://github.com/paritytech/cumulus', branch = 'polkadot-v0.9.10' } +cumulus-primitives-core = { git = 'https://github.com/paritytech/cumulus', branch = 'polkadot-v0.9.10' } +parachain-info = { git = 'https://github.com/paritytech/cumulus', branch = 'polkadot-v0.9.10' } -orml-xcm-support = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git' } -orml-xtokens = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git' } +orml-xcm-support = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', branch = 'sw/xcm-v1' } +orml-xtokens = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', branch = 'sw/xcm-v1' } [features] default = ['std', 'westend'] diff --git a/pallets/liquid-staking/src/lib.rs b/pallets/liquid-staking/src/lib.rs index 10e0aaae19..6ec8a864f8 100644 --- a/pallets/liquid-staking/src/lib.rs +++ b/pallets/liquid-staking/src/lib.rs @@ -56,7 +56,7 @@ mod pallet { ArithmeticError, FixedPointNumber, FixedPointOperand, }; use sp_std::vec::Vec; - use xcm::v0::{Junction, MultiLocation, NetworkId, SendXcm}; + use xcm::latest::prelude::*; use primitives::{DerivativeProvider, EraIndex, Rate, Ratio}; @@ -480,12 +480,12 @@ mod pallet { Self::account_id(), Self::staking_currency().ok_or(Error::::StakingCurrencyNotSet)?, bond_amount, - MultiLocation::X2( - Junction::Parent, - Junction::AccountId32 { + MultiLocation::new( + 1, + Junctions::X1(Junction::AccountId32 { network: NetworkId::Any, id: T::RelayAgent::get().into(), - }, + }), ), T::BaseXcmWeight::get(), )?; diff --git a/pallets/liquid-staking/src/mock.rs b/pallets/liquid-staking/src/mock.rs index b3bbd22d6f..55751c2bc4 100644 --- a/pallets/liquid-staking/src/mock.rs +++ b/pallets/liquid-staking/src/mock.rs @@ -21,26 +21,20 @@ use sp_runtime::{ AccountId32, MultiAddress::Id, }; -pub use xcm::v0::{ - Error as XcmError, - Junction::{self, GeneralKey, Parachain, Parent}, - MultiAsset, - MultiLocation::{self, X1, X2, X3}, - NetworkId, Xcm, -}; +pub use xcm::latest::prelude::*; pub use xcm_builder::{ AccountId32Aliases, AllowTopLevelPaidExecutionFrom, AllowUnpaidExecutionFrom, ChildParachainAsNative, ChildParachainConvertsVia, ChildSystemParachainAsSuperuser, - CurrencyAdapter as XcmCurrencyAdapter, EnsureXcmOrigin, FixedRateOfConcreteFungible, - FixedWeightBounds, IsConcrete, LocationInverter, NativeAsset, ParentAsSuperuser, - ParentIsDefault, RelayChainAsNative, SiblingParachainAsNative, SiblingParachainConvertsVia, + CurrencyAdapter as XcmCurrencyAdapter, EnsureXcmOrigin, FixedRateOfFungible, FixedWeightBounds, + IsConcrete, LocationInverter, NativeAsset, ParentAsSuperuser, ParentIsDefault, + RelayChainAsNative, SiblingParachainAsNative, SiblingParachainConvertsVia, SignedAccountId32AsNative, SignedToAccountId32, SovereignSignedViaLocation, TakeWeightCredit, }; use xcm_executor::{Config, XcmExecutor}; use xcm_simulator::{decl_test_network, decl_test_parachain, decl_test_relay_chain}; pub type AccountId = AccountId32; -pub type AssetId = u32; +pub type CurrencyId = u32; pub use westend_runtime; parameter_types! { @@ -62,7 +56,7 @@ impl cumulus_pallet_parachain_system::Config for Test { impl parachain_info::Config for Test {} parameter_types! { - pub const DotLocation: MultiLocation = MultiLocation::X1(Parent); + pub DotLocation: MultiLocation = MultiLocation::parent(); pub const RelayNetwork: NetworkId = NetworkId::Kusama; pub RelayChainOrigin: Origin = cumulus_pallet_xcm::Origin::Relay.into(); pub Ancestry: MultiLocation = Parachain(ParachainInfo::parachain_id().into()).into(); @@ -84,12 +78,12 @@ pub type XcmOriginToCallOrigin = ( parameter_types! { pub const UnitWeightCost: Weight = 1; - pub DotPerSecond: (MultiLocation, u128) = (X1(Parent), 1); + pub DotPerSecond: (AssetId, u128) = (AssetId::Concrete(MultiLocation::parent()), 1); } pub type LocalAssetTransactor = MultiCurrencyAdapter< Assets, - IsNativeConcrete, + IsNativeConcrete, AccountId, LocationToAccountId, CurrencyIdConvert, @@ -109,14 +103,16 @@ impl Config for XcmConfig { type LocationInverter = LocationInverter; type Barrier = Barrier; type Weigher = FixedWeightBounds; - type Trader = FixedRateOfConcreteFungible; + type Trader = FixedRateOfFungible; type ResponseHandler = (); + type SubscriptionService = PolkadotXcm; } impl cumulus_pallet_xcmp_queue::Config for Test { type Event = Event; type XcmExecutor = XcmExecutor; type ChannelInfo = ParachainSystem; + type VersionWrapper = (); } impl cumulus_pallet_dmp_queue::Config for Test { @@ -146,27 +142,33 @@ impl pallet_xcm::Config for Test { } pub struct CurrencyIdConvert; -impl Convert> for CurrencyIdConvert { - fn convert(id: AssetId) -> Option { +impl Convert> for CurrencyIdConvert { + fn convert(id: CurrencyId) -> Option { match id { - DOT => Some(X1(Parent)), - XDOT => Some(X3( - Parent, - Parachain(ParachainInfo::parachain_id().into()), - GeneralKey(b"xDOT".to_vec()), + DOT => Some(MultiLocation::parent()), + XDOT => Some(MultiLocation::new( + 1, + X2( + Parachain(ParachainInfo::parachain_id().into()), + GeneralKey(b"xDOT".to_vec()), + ), )), _ => None, } } } -impl Convert> for CurrencyIdConvert { - fn convert(location: MultiLocation) -> Option { +impl Convert> for CurrencyIdConvert { + fn convert(location: MultiLocation) -> Option { match location { - X1(Parent) => Some(DOT), - X3(Parent, Parachain(id), GeneralKey(key)) - if ParaId::from(id) == ParachainInfo::parachain_id() && key == b"xDOT".to_vec() => - { + MultiLocation { + parents: 1, + interior: Here, + } => Some(DOT), + MultiLocation { + parents: 1, + interior: X2(Parachain(id), GeneralKey(key)), + } if ParaId::from(id) == ParachainInfo::parachain_id() && key == b"xDOT".to_vec() => { Some(XDOT) } _ => None, @@ -174,9 +176,13 @@ impl Convert> for CurrencyIdConvert { } } -impl Convert> for CurrencyIdConvert { - fn convert(a: MultiAsset) -> Option { - if let MultiAsset::ConcreteFungible { id, amount: _ } = a { +impl Convert> for CurrencyIdConvert { + fn convert(a: MultiAsset) -> Option { + if let MultiAsset { + id: AssetId::Concrete(id), + fun: _, + } = a + { Self::convert(id) } else { None @@ -195,20 +201,21 @@ impl Convert for AccountIdToMultiLocation { } parameter_types! { - pub SelfLocation: MultiLocation = X2(Parent, Parachain(ParachainInfo::parachain_id().into())); + pub SelfLocation: MultiLocation = MultiLocation::new(1, X1(Parachain(ParachainInfo::parachain_id().into()))); pub const BaseXcmWeight: Weight = 100_000_000; } impl orml_xtokens::Config for Test { type Event = Event; type Balance = Balance; - type CurrencyId = AssetId; + type CurrencyId = CurrencyId; type CurrencyIdConvert = CurrencyIdConvert; type AccountIdToMultiLocation = AccountIdToMultiLocation; type SelfLocation = SelfLocation; type XcmExecutor = XcmExecutor; type Weigher = FixedWeightBounds; type BaseXcmWeight = BaseXcmWeight; + type LocationInverter = LocationInverter; } type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic; @@ -329,7 +336,7 @@ parameter_types! { impl pallet_assets::Config for Test { type Event = Event; type Balance = Balance; - type AssetId = AssetId; + type AssetId = CurrencyId; type Currency = Balances; type ForceOrigin = EnsureRoot; type AssetDeposit = AssetDeposit; diff --git a/pallets/liquid-staking/src/relaychain.rs b/pallets/liquid-staking/src/relaychain.rs index 6b7c1c5ef3..63570f1f4b 100644 --- a/pallets/liquid-staking/src/relaychain.rs +++ b/pallets/liquid-staking/src/relaychain.rs @@ -4,15 +4,7 @@ use super::{pallet::*, types::*, BalanceOf, Config, Pallet}; use frame_support::pallet_prelude::*; use sp_runtime::{traits::StaticLookup, DispatchResult}; use sp_std::prelude::*; -use xcm::{ - v0::{ - Junction, MultiAsset, MultiLocation, NetworkId, - Order::{BuyExecution, DepositAsset}, - OriginKind, SendXcm, - Xcm::{self, Transact, WithdrawAsset}, - }, - DoubleEncoded, -}; +use xcm::{latest::prelude::*, DoubleEncoded}; impl Pallet where @@ -48,7 +40,7 @@ where let msg = Self::xcm_message(call.encode().into()); - match T::XcmSender::send_xcm(MultiLocation::X1(Junction::Parent), msg) { + match T::XcmSender::send_xcm(MultiLocation::parent(), msg) { Ok(()) => { Self::deposit_event(Event::::BondCallSent(controller, value, payee)); } @@ -80,7 +72,7 @@ where let msg = Self::xcm_message(call.encode().into()); - match T::XcmSender::send_xcm(MultiLocation::X1(Junction::Parent), msg) { + match T::XcmSender::send_xcm(MultiLocation::parent(), msg) { Ok(()) => { Self::deposit_event(Event::::BondExtraCallSent(value)); } @@ -104,7 +96,7 @@ where let msg = Self::xcm_message(call.encode().into()); - match T::XcmSender::send_xcm(MultiLocation::X1(Junction::Parent), msg) { + match T::XcmSender::send_xcm(MultiLocation::parent(), msg) { Ok(()) => { Self::deposit_event(Event::::UnbondCallSent(value)); } @@ -128,7 +120,7 @@ where let msg = Self::xcm_message(call.encode().into()); - match T::XcmSender::send_xcm(MultiLocation::X1(Junction::Parent), msg) { + match T::XcmSender::send_xcm(MultiLocation::parent(), msg) { Ok(()) => { Self::deposit_event(Event::::RebondCallSent(value)); } @@ -167,7 +159,7 @@ where let msg = Self::xcm_message(call.encode().into()); - match T::XcmSender::send_xcm(MultiLocation::X1(Junction::Parent), msg) { + match T::XcmSender::send_xcm(MultiLocation::parent(), msg) { Ok(()) => { Self::deposit_event(Event::::WithdrawUnbondedCallSent(num_slashing_spans)); } @@ -196,7 +188,7 @@ where ))); let msg = Self::xcm_message(call.encode().into()); - match T::XcmSender::send_xcm(MultiLocation::X1(Junction::Parent), msg) { + match T::XcmSender::send_xcm(MultiLocation::parent(), msg) { Ok(()) => { Self::deposit_event(Event::::NominateCallSent(targets)); } @@ -217,7 +209,7 @@ where let msg = Self::xcm_message(call.encode().into()); - match T::XcmSender::send_xcm(MultiLocation::X1(Junction::Parent), msg) { + match T::XcmSender::send_xcm(MultiLocation::parent(), msg) { Ok(()) => { Self::deposit_event(Event::::PayoutStakersCallSent(validator_stash, era)); } @@ -229,29 +221,30 @@ where } fn xcm_message(call: DoubleEncoded<()>) -> Xcm<()> { + let asset: MultiAsset = (MultiLocation::here(), 1_000_000_000_000).into(); + WithdrawAsset { - assets: vec![MultiAsset::ConcreteFungible { - id: MultiLocation::Null, - amount: 1_000_000_000_000, - }], + assets: MultiAssets::from(asset.clone()), effects: vec![ BuyExecution { - fees: MultiAsset::All, + fees: asset, weight: 800_000_000, debt: 600_000_000, halt_on_error: false, - xcm: vec![Transact { + instructions: vec![Transact { origin_type: OriginKind::SovereignAccount, require_weight_at_most: 100_000_000_000, call, }], }, DepositAsset { - assets: vec![MultiAsset::All], - dest: MultiLocation::X1(Junction::AccountId32 { + assets: All.into(), + max_assets: u32::max_value(), + beneficiary: X1(Junction::AccountId32 { network: NetworkId::Any, id: T::RelayAgent::get().into(), - }), + }) + .into(), }, ], } diff --git a/pallets/liquidation/Cargo.toml b/pallets/liquidation/Cargo.toml index 66e6d20a47..2489b8190b 100644 --- a/pallets/liquidation/Cargo.toml +++ b/pallets/liquidation/Cargo.toml @@ -9,15 +9,15 @@ targets = ['x86_64-unknown-linux-gnu'] [dependencies] codec = { package = 'parity-scale-codec', version = '2.2.0', default-features = false } -frame-support = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } -frame-system = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } +frame-support = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } +frame-system = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } serde = { package = 'alt_serde', version = '1', default-features = false, features = ['derive'] } serde_json = { package = 'alt_serde_json', version = '1', default-features = false, features = ['alloc'] } -sp-core = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } -sp-io = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } -sp-keystore = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', optional = true } -sp-runtime = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } -sp-std = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } +sp-core = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } +sp-io = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } +sp-keystore = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', optional = true } +sp-runtime = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } +sp-std = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } pallet-loans = { path = '../loans', default-features = false } primitives = { package = 'parallel-primitives', path = '../../primitives', default-features = false } diff --git a/pallets/liquidation/src/lib.rs b/pallets/liquidation/src/lib.rs index 37e0fd2dc4..d7946c3174 100644 --- a/pallets/liquidation/src/lib.rs +++ b/pallets/liquidation/src/lib.rs @@ -72,8 +72,8 @@ struct BorrowMisc { /// The miscellaneous information when transforming collateral records. #[derive(Clone, Debug)] -struct CollateralMisc { - currency: AssetId, +struct CollateralMisc { + currency: CurrencyId, amount: Balance, value: FixedU128, } diff --git a/pallets/loans/Cargo.toml b/pallets/loans/Cargo.toml index c11fc8349f..94fd311372 100644 --- a/pallets/loans/Cargo.toml +++ b/pallets/loans/Cargo.toml @@ -9,23 +9,23 @@ targets = ['x86_64-unknown-linux-gnu'] [dependencies] codec = { package = 'parity-scale-codec', version = '2.2.0', default-features = false } -frame-benchmarking = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false, optional = true } -frame-support = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } -frame-system = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } -orml-traits = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', default-features = false } -orml-utilities = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', default-features = false } -pallet-assets = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } -pallet-balances = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } -pallet-timestamp = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } +frame-benchmarking = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false, optional = true } +frame-support = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } +frame-system = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } +orml-traits = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', branch = 'sw/xcm-v1', default-features = false } +orml-utilities = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', branch = 'sw/xcm-v1', default-features = false } +pallet-assets = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } +pallet-balances = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } +pallet-timestamp = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } primitives = { package = 'parallel-primitives', path = '../../primitives', default-features = false } serde = { version = '1', features = ['derive'], optional = true } -sp-runtime = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } -sp-std = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } +sp-runtime = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } +sp-std = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } [dev-dependencies] -sp-core = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } -sp-io = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } +sp-core = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } +sp-io = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } [features] diff --git a/pallets/loans/rpc/Cargo.toml b/pallets/loans/rpc/Cargo.toml index 78061750af..c8d3cbdaf8 100644 --- a/pallets/loans/rpc/Cargo.toml +++ b/pallets/loans/rpc/Cargo.toml @@ -11,9 +11,9 @@ jsonrpc-core-client = '15.0.0' jsonrpc-derive = '15.0.0' primitives = { package = 'parallel-primitives', path = '../../../primitives', default-features = false } serde = { version = '1.0.124', features = ['derive'] } -sp-api = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.9' } -sp-blockchain = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.9' } -sp-core = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.9' } -sp-runtime = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.9' } +sp-api = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.10' } +sp-blockchain = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.10' } +sp-core = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.10' } +sp-runtime = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.10' } pallet-loans-rpc-runtime-api = { path = 'runtime-api', default-features = false, version = '3.0.0' } diff --git a/pallets/loans/rpc/runtime-api/Cargo.toml b/pallets/loans/rpc/runtime-api/Cargo.toml index ddff657252..d4c51c31c9 100644 --- a/pallets/loans/rpc/runtime-api/Cargo.toml +++ b/pallets/loans/rpc/runtime-api/Cargo.toml @@ -7,8 +7,8 @@ version = '3.0.0' [dependencies] codec = { package = 'parity-scale-codec', version = '2.2.0', default-features = false, features = ['derive'] } primitives = { package = 'parallel-primitives', path = '../../../../primitives', default-features = false } -sp-api = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.9', default-features = false } -sp-runtime = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } +sp-api = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.10', default-features = false } +sp-runtime = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } [features] default = ['std'] diff --git a/pallets/loans/src/benchmarking.rs b/pallets/loans/src/benchmarking.rs index e077b5a4d4..8ab0a83e11 100644 --- a/pallets/loans/src/benchmarking.rs +++ b/pallets/loans/src/benchmarking.rs @@ -8,13 +8,13 @@ use crate::Pallet as Loans; use frame_benchmarking::{account, benchmarks, impl_benchmark_test_suite, whitelisted_caller}; use frame_support::assert_ok; use frame_system::{self, RawOrigin as SystemOrigin}; -use primitives::{AssetIdentifier, Balance}; +use primitives::{Balance, CurrencyId}; use sp_std::prelude::*; const SEED: u32 = 0; -const DOT: AssetId = 0; -const KSM: AssetId = 1; -const UNKNOWN: AssetId = 5; +const DOT: CurrencyId = 0; +const KSM: CurrencyId = 1; +const UNKNOWN: CurrencyId = 5; const MARKET_MOCK: Market = Market { close_factor: Ratio::from_percent(50), @@ -38,7 +38,7 @@ const PENDING_MARKET_MOCK: Market = { const INITIAL_AMOUNT: u32 = 500_000_000; fn transfer_initial_balance< - T: Config + pallet_assets::Config, + T: Config + pallet_assets::Config, >( caller: T::AccountId, ) where @@ -98,7 +98,7 @@ benchmarks! { where BalanceOf: FixedPointOperand, AssetIdOf: AtLeast32BitUnsigned, - T: pallet_assets::Config + T: pallet_assets::Config } add_market { diff --git a/pallets/loans/src/lib.rs b/pallets/loans/src/lib.rs index 57e6535d45..b41343ce5d 100644 --- a/pallets/loans/src/lib.rs +++ b/pallets/loans/src/lib.rs @@ -23,6 +23,7 @@ #![cfg_attr(not(feature = "std"), no_std)] pub use crate::rate_model::*; + use frame_support::{ log, pallet_prelude::*, @@ -35,7 +36,7 @@ use frame_support::{ }; use frame_system::pallet_prelude::*; pub use pallet::*; -use primitives::{AssetId, Liquidity, Price, PriceFeeder, Rate, Ratio, Shortfall, Timestamp}; +use primitives::{CurrencyId, Liquidity, Price, PriceFeeder, Rate, Ratio, Shortfall, Timestamp}; use sp_runtime::{ traits::{ AccountIdConversion, AtLeast32BitUnsigned, CheckedAdd, CheckedDiv, CheckedMul, CheckedSub, @@ -44,10 +45,12 @@ use sp_runtime::{ ArithmeticError, FixedPointNumber, FixedPointOperand, FixedU128, SaturatedConversion, }; use sp_std::{convert::TryInto, result::Result}; + pub use types::{BorrowSnapshot, Deposits, EarnedSnapshot, Market, MarketState}; pub use weights::WeightInfo; mod benchmarking; + #[cfg(test)] mod mock; #[cfg(test)] @@ -128,7 +131,7 @@ pub mod pallet { /// Currency's oracle price not ready PriceOracleNotReady, /// Invalid asset id - InvalidAssetId, + InvalidCurrencyId, /// Market does not exist MarketDoesNotExist, /// Market already exists @@ -139,7 +142,7 @@ pub mod pallet { #[pallet::event] #[pallet::generate_deposit(pub (crate) fn deposit_event)] - #[pallet::metadata(T::AccountId = "AccountId", AssetIdOf = "AssetId", BalanceOf = "Balance")] + #[pallet::metadata(T::AccountId = "AccountId", AssetIdOf = "CurrencyId", BalanceOf = "Balance")] pub enum Event { /// Enable collateral for certain asset /// [sender, asset_id] @@ -196,21 +199,21 @@ pub mod pallet { StorageMap<_, Blake2_128Concat, AssetIdOf, BalanceOf, ValueQuery>; /// Total amount of outstanding borrows of the underlying in this market - /// AssetId -> Balance + /// CurrencyId -> Balance #[pallet::storage] #[pallet::getter(fn total_borrows)] pub type TotalBorrows = StorageMap<_, Blake2_128Concat, AssetIdOf, BalanceOf, ValueQuery>; /// Total amount of reserves of the underlying held in this market - /// AssetId -> Balance + /// CurrencyId -> Balance #[pallet::storage] #[pallet::getter(fn total_reserves)] pub type TotalReserves = StorageMap<_, Blake2_128Concat, AssetIdOf, BalanceOf, ValueQuery>; /// Mapping of account addresses to outstanding borrow balances - /// AssetId -> Owner -> BorrowSnapshot + /// CurrencyId -> Owner -> BorrowSnapshot #[pallet::storage] #[pallet::getter(fn account_borrows)] pub type AccountBorrows = StorageDoubleMap< @@ -238,7 +241,7 @@ pub mod pallet { >; /// Mapping of account addresses to total deposit interest accrual - /// AssetId -> Owner -> EarnedSnapshot + /// CurrencyId -> Owner -> EarnedSnapshot #[pallet::storage] #[pallet::getter(fn account_earned)] pub type AccountEarned = StorageDoubleMap< @@ -252,7 +255,7 @@ pub mod pallet { >; /// Accumulator of the total earned interest rate since the opening of the market - /// AssetId -> u128 + /// CurrencyId -> u128 #[pallet::storage] #[pallet::getter(fn borrow_index)] pub type BorrowIndex = @@ -291,7 +294,7 @@ pub mod pallet { pub borrow_index: Rate, pub exchange_rate: Rate, pub last_block_timestamp: Timestamp, - pub markets: Vec<(AssetId, Market)>, + pub markets: Vec<(CurrencyId, Market)>, } #[cfg(feature = "std")] @@ -1277,9 +1280,9 @@ where } pub fn get_price(asset_id: AssetIdOf) -> Result { - let id: AssetId = asset_id + let id: CurrencyId = asset_id .try_into() - .map_err(|_| Error::::InvalidAssetId)?; + .map_err(|_| Error::::InvalidCurrencyId)?; let (price, _) = T::PriceFeeder::get_price(&id).ok_or(Error::::PriceOracleNotReady)?; if price.is_zero() { return Err(Error::::PriceOracleNotReady.into()); diff --git a/pallets/loans/src/mock.rs b/pallets/loans/src/mock.rs index e6970d502e..c817ad42a2 100644 --- a/pallets/loans/src/mock.rs +++ b/pallets/loans/src/mock.rs @@ -17,7 +17,7 @@ use super::*; use frame_support::{construct_runtime, parameter_types, PalletId}; use frame_system::EnsureRoot; -use primitives::{AssetId, Balance, Price, PriceDetail, PriceFeeder, Rate}; +use primitives::{Balance, CurrencyId, Price, PriceDetail, PriceFeeder, Rate}; use sp_core::H256; use sp_runtime::{testing::Header, traits::IdentityLookup}; @@ -79,10 +79,10 @@ pub const ALICE: AccountId = 1; pub const BOB: AccountId = 2; pub const CHARLIE: AccountId = 3; -pub const DOT: AssetId = 0; -pub const KSM: AssetId = 1; -pub const USDT: AssetId = 3; -pub const XDOT: AssetId = 4; +pub const DOT: CurrencyId = 0; +pub const KSM: CurrencyId = 1; +pub const USDT: CurrencyId = 3; +pub const XDOT: CurrencyId = 4; parameter_types! { pub const MinimumPeriod: u64 = 5; @@ -116,7 +116,7 @@ pub struct MockPriceFeeder; impl MockPriceFeeder { thread_local! { - pub static PRICES: RefCell>> = { + pub static PRICES: RefCell>> = { RefCell::new( vec![DOT, KSM, USDT, XDOT] .iter() @@ -126,7 +126,7 @@ impl MockPriceFeeder { }; } - pub fn set_price(asset_id: AssetId, price: Price) { + pub fn set_price(asset_id: CurrencyId, price: Price) { Self::PRICES.with(|prices| { prices.borrow_mut().insert(asset_id, Some((price, 1u64))); }); @@ -142,7 +142,7 @@ impl MockPriceFeeder { } impl PriceFeeder for MockPriceFeeder { - fn get_price(asset_id: &AssetId) -> Option { + fn get_price(asset_id: &CurrencyId) -> Option { Self::PRICES.with(|prices| *prices.borrow().get(asset_id).unwrap()) } } @@ -158,7 +158,7 @@ parameter_types! { impl pallet_assets::Config for Test { type Event = Event; type Balance = Balance; - type AssetId = AssetIdentifier; + type AssetId = CurrencyId; type Currency = Balances; type ForceOrigin = EnsureRoot; type AssetDeposit = AssetDeposit; diff --git a/pallets/nominee-election/Cargo.toml b/pallets/nominee-election/Cargo.toml index 169964fe34..01c21a3666 100644 --- a/pallets/nominee-election/Cargo.toml +++ b/pallets/nominee-election/Cargo.toml @@ -6,15 +6,15 @@ version = '3.0.0' [dependencies] codec = { package = 'parity-scale-codec', version = '2.2.0', default-features = false } -frame-support = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.9', default-features = false } -frame-system = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.9', default-features = false } +frame-support = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.10', default-features = false } +frame-system = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.10', default-features = false } serde = { version = '1.0.124', optional = true } -sp-runtime = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.9', default-features = false } -sp-std = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.9', default-features = false } +sp-runtime = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.10', default-features = false } +sp-std = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.10', default-features = false } [dev-dependencies] -sp-core = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.9', default-features = false } -sp-io = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.9', default-features = false } +sp-core = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.10', default-features = false } +sp-io = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.10', default-features = false } [features] default = ['std'] diff --git a/pallets/prices/Cargo.toml b/pallets/prices/Cargo.toml index a4b4c6c953..385ce19150 100644 --- a/pallets/prices/Cargo.toml +++ b/pallets/prices/Cargo.toml @@ -6,21 +6,21 @@ version = '3.0.0' [dependencies] codec = { package = 'parity-scale-codec', version = '2.2.0', default-features = false } -frame-support = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.9', default-features = false } -frame-system = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.9', default-features = false } -orml-oracle = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', default-features = false } -orml-traits = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', default-features = false } +frame-support = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.10', default-features = false } +frame-system = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.10', default-features = false } +orml-oracle = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', branch = 'sw/xcm-v1', default-features = false } +orml-traits = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', branch = 'sw/xcm-v1', default-features = false } primitives = { package = 'parallel-primitives', path = '../../primitives', default-features = false } serde = { version = '1.0.124', optional = true } -sp-runtime = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.9', default-features = false } -sp-std = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.9', default-features = false } +sp-runtime = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.10', default-features = false } +sp-std = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.10', default-features = false } [dev-dependencies] -sp-core = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.9', default-features = false } -sp-io = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.9', default-features = false } +sp-core = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.10', default-features = false } +sp-io = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.10', default-features = false } [features] -default = ['std'] -std = [ +default = ['std'] +std = [ 'serde', 'codec/std', 'sp-runtime/std', diff --git a/pallets/prices/src/lib.rs b/pallets/prices/src/lib.rs index 8574c5e416..e4c7e27981 100644 --- a/pallets/prices/src/lib.rs +++ b/pallets/prices/src/lib.rs @@ -48,14 +48,14 @@ pub mod pallet { type Event: From> + IsType<::Event>; /// The data source, such as Oracle. - type Source: DataProvider - + DataProviderExtended; + type Source: DataProvider + + DataProviderExtended; /// The origin which may set prices feed to system. type FeederOrigin: EnsureOrigin; /// Liquid currency & staking currency provider - type LiquidStakingCurrenciesProvider: LiquidStakingCurrenciesProvider; + type LiquidStakingCurrenciesProvider: LiquidStakingCurrenciesProvider; /// The provider of the exchange rate between liquid currency and /// staking currency. @@ -69,15 +69,16 @@ pub mod pallet { #[pallet::generate_deposit(pub(crate) fn deposit_event)] pub enum Event { /// Set emergency price. \[asset_id, price_detail\] - SetPrice(AssetId, Price), + SetPrice(CurrencyId, Price), /// Reset emergency price. \[asset_id\] - ResetPrice(AssetId), + ResetPrice(CurrencyId), } /// Mapping from currency id to it's emergency price #[pallet::storage] #[pallet::getter(fn emergency_price)] - pub type EmergencyPrice = StorageMap<_, Twox64Concat, AssetId, Price, OptionQuery>; + pub type EmergencyPrice = + StorageMap<_, Twox64Concat, CurrencyId, Price, OptionQuery>; #[pallet::pallet] pub struct Pallet(PhantomData); @@ -92,11 +93,11 @@ pub mod pallet { #[transactional] pub fn set_price( origin: OriginFor, - asset_id: AssetId, + asset_id: CurrencyId, price: Price, ) -> DispatchResultWithPostInfo { T::FeederOrigin::ensure_origin(origin)?; - as EmergencyPriceFeeder>::set_emergency_price( + as EmergencyPriceFeeder>::set_emergency_price( asset_id, price, ); Ok(().into()) @@ -105,9 +106,12 @@ pub mod pallet { /// Reset emergency price #[pallet::weight(100)] #[transactional] - pub fn reset_price(origin: OriginFor, asset_id: AssetId) -> DispatchResultWithPostInfo { + pub fn reset_price( + origin: OriginFor, + asset_id: CurrencyId, + ) -> DispatchResultWithPostInfo { T::FeederOrigin::ensure_origin(origin)?; - as EmergencyPriceFeeder>::reset_emergency_price(asset_id); + as EmergencyPriceFeeder>::reset_emergency_price(asset_id); Ok(().into()) } } @@ -115,7 +119,7 @@ pub mod pallet { impl Pallet { // get emergency price, the timestamp is zero - fn get_emergency_price(asset_id: &AssetId) -> Option { + fn get_emergency_price(asset_id: &CurrencyId) -> Option { Self::emergency_price(asset_id).and_then(|p| { 10u128 .checked_pow(T::Decimal::get_decimal(asset_id).into()) @@ -130,7 +134,7 @@ impl Pallet { impl PriceFeeder for Pallet { /// Get price and timestamp by currency id /// Timestamp is zero means the price is emergency price - fn get_price(asset_id: &AssetId) -> Option { + fn get_price(asset_id: &CurrencyId) -> Option { // if emergency price exists, return it, otherwise return latest price from oracle. Self::get_emergency_price(asset_id).or_else(|| { match T::LiquidStakingCurrenciesProvider::get_staking_currency() @@ -166,23 +170,23 @@ impl PriceFeeder for Pallet { } } -impl EmergencyPriceFeeder for Pallet { +impl EmergencyPriceFeeder for Pallet { /// Set emergency price - fn set_emergency_price(asset_id: AssetId, price: Price) { + fn set_emergency_price(asset_id: CurrencyId, price: Price) { // set price direct EmergencyPrice::::insert(asset_id, price); >::deposit_event(Event::SetPrice(asset_id, price)); } /// Reset emergency price - fn reset_emergency_price(asset_id: AssetId) { + fn reset_emergency_price(asset_id: CurrencyId) { EmergencyPrice::::remove(asset_id); >::deposit_event(Event::ResetPrice(asset_id)); } } -impl DataProviderExtended for Pallet { - fn get_no_op(asset_id: &AssetId) -> Option { +impl DataProviderExtended for Pallet { + fn get_no_op(asset_id: &CurrencyId) -> Option { match T::LiquidStakingCurrenciesProvider::get_staking_currency() .zip(T::LiquidStakingCurrenciesProvider::get_liquid_currency()) { @@ -200,7 +204,7 @@ impl DataProviderExtended for Pallet { } } - fn get_all_values() -> Vec<(AssetId, Option)> { + fn get_all_values() -> Vec<(CurrencyId, Option)> { T::Source::get_all_values() } } diff --git a/pallets/prices/src/mock.rs b/pallets/prices/src/mock.rs index d2b6fc6466..8e87528fe9 100644 --- a/pallets/prices/src/mock.rs +++ b/pallets/prices/src/mock.rs @@ -27,12 +27,12 @@ mod prices { pub use super::super::*; } -pub const DOT: AssetId = 10; +pub const DOT: CurrencyId = 10; #[allow(non_upper_case_globals)] -pub const xDOT: AssetId = 11; -pub const KSM: AssetId = 20; +pub const xDOT: CurrencyId = 11; +pub const KSM: CurrencyId = 20; #[allow(non_upper_case_globals)] -pub const xKSM: AssetId = 21; +pub const xKSM: CurrencyId = 21; parameter_types! { pub const BlockHashCount: u64 = 250; @@ -66,8 +66,8 @@ impl frame_system::Config for Runtime { pub type TimeStampedPrice = orml_oracle::TimestampedValue; pub struct MockDataProvider; -impl DataProvider for MockDataProvider { - fn get(asset_id: &AssetId) -> Option { +impl DataProvider for MockDataProvider { + fn get(asset_id: &CurrencyId) -> Option { match *asset_id { DOT => Some(TimeStampedPrice { value: Price::saturating_from_integer(100), @@ -82,12 +82,12 @@ impl DataProvider for MockDataProvider { } } -impl DataProviderExtended for MockDataProvider { - fn get_no_op(_key: &AssetId) -> Option { +impl DataProviderExtended for MockDataProvider { + fn get_no_op(_key: &CurrencyId) -> Option { None } - fn get_all_values() -> Vec<(AssetId, Option)> { + fn get_all_values() -> Vec<(CurrencyId, Option)> { vec![] } } @@ -101,13 +101,13 @@ impl ExchangeRateProvider for LiquidStakingExchangeRateProvider { ord_parameter_types! { pub const One: AccountId = 1; - pub const StakingCurrency: AssetId = KSM; - pub const LiquidCurrency: AssetId = xKSM; + pub const StakingCurrency: CurrencyId = KSM; + pub const LiquidCurrency: CurrencyId = xKSM; } pub struct Decimal; #[allow(non_upper_case_globals)] impl DecimalProvider for Decimal { - fn get_decimal(asset_id: &AssetId) -> u8 { + fn get_decimal(asset_id: &CurrencyId) -> u8 { match *asset_id { DOT | xDOT => 10, KSM | xKSM => 12, @@ -117,11 +117,11 @@ impl DecimalProvider for Decimal { } pub struct LiquidStaking; -impl LiquidStakingCurrenciesProvider for LiquidStaking { - fn get_staking_currency() -> Option { +impl LiquidStakingCurrenciesProvider for LiquidStaking { + fn get_staking_currency() -> Option { Some(KSM) } - fn get_liquid_currency() -> Option { + fn get_liquid_currency() -> Option { Some(xKSM) } } diff --git a/pallets/router/Cargo.toml b/pallets/router/Cargo.toml index 0b871f11ec..206f6fd999 100644 --- a/pallets/router/Cargo.toml +++ b/pallets/router/Cargo.toml @@ -8,32 +8,32 @@ version = '3.0.0' targets = ['x86_64-unknown-linux-gnu'] [dependencies] -frame-benchmarking = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false, optional = true } -frame-support = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } -frame-system = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } +frame-benchmarking = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false, optional = true } +frame-support = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } +frame-system = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } pallet-amm = { path = '../amm', default-features = false } -pallet-assets = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } -parity-scale-codec = { version = '2.0', default-features = false, features = ['derive'] } +pallet-assets = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } +parity-scale-codec = { version = '2.2.0', default-features = false, features = ['derive'] } primitives = { package = 'parallel-primitives', path = '../../primitives', default-features = false } -sp-runtime = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } -sp-std = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.9', default-features = false } +sp-runtime = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } +sp-std = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.10', default-features = false } [dev-dependencies] -pallet-balances = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9' } -sp-core = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9' } -sp-io = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9' } -pallet-currency-adapter = { path = '../currency-adapter' } +pallet-balances = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10' } +pallet-currency-adapter = { path = '../currency-adapter' } +sp-core = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10' } +sp-io = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10' } [features] default = ['std'] runtime-benchmarks = ['frame-benchmarking'] -std = [ - 'frame-support/std', - 'frame-system/std', - 'pallet-amm/std', - 'pallet-assets/std', - 'parity-scale-codec/std', - 'primitives/std', - 'sp-std/std', - 'sp-runtime/std', +std = [ + 'frame-support/std', + 'frame-system/std', + 'pallet-amm/std', + 'pallet-assets/std', + 'parity-scale-codec/std', + 'primitives/std', + 'sp-std/std', + 'sp-runtime/std', ] diff --git a/pallets/router/src/benchmarking.rs b/pallets/router/src/benchmarking.rs index 124de08094..bb7131ebdd 100644 --- a/pallets/router/src/benchmarking.rs +++ b/pallets/router/src/benchmarking.rs @@ -17,11 +17,11 @@ use frame_support::{ BoundedVec, }; use frame_system::{self, RawOrigin as SystemOrigin}; -use primitives::{tokens, AssetId}; +use primitives::{tokens, CurrencyId}; use sp_runtime::traits::StaticLookup; -const DOT: AssetId = tokens::DOT; -const XDOT: AssetId = tokens::XDOT; +const DOT: CurrencyId = tokens::DOT; +const XDOT: CurrencyId = tokens::XDOT; const INITIAL_AMOUNT: u128 = 1000_000_000_000_000; fn assert_last_event, I: 'static>(generic_event: >::Event) { diff --git a/pallets/router/src/lib.rs b/pallets/router/src/lib.rs index 4b9148155d..13aa9e8ab3 100644 --- a/pallets/router/src/lib.rs +++ b/pallets/router/src/lib.rs @@ -21,6 +21,7 @@ pub use pallet::*; mod benchmarking; + #[cfg(test)] mod mock; #[cfg(test)] @@ -44,15 +45,15 @@ pub mod pallet { ensure_signed, pallet_prelude::{BlockNumberFor, OriginFor}, }; - use primitives::{AssetId, Balance, AMM}; + use primitives::{Balance, CurrencyId, AMM}; use sp_runtime::traits::Zero; pub type Route = BoundedVec< ( // Base asset - AssetId, + CurrencyId, // Quote asset - AssetId, + CurrencyId, ), >::MaxLengthRoute, >; @@ -60,7 +61,7 @@ pub mod pallet { #[pallet::config] pub trait Config: frame_system::Config - + pallet_assets::Config + + pallet_assets::Config + pallet_amm::Config { type Event: From> + IsType<::Event>; @@ -81,9 +82,9 @@ pub mod pallet { /// Currency type for deposit/withdraw assets to/from amm route /// module - type Assets: fungibles::Inspect - + fungibles::Mutate - + fungibles::Transfer; + type Assets: fungibles::Inspect + + fungibles::Mutate + + fungibles::Transfer; } #[pallet::pallet] diff --git a/pallets/router/src/mock.rs b/pallets/router/src/mock.rs index 951b8da372..81b5378cce 100644 --- a/pallets/router/src/mock.rs +++ b/pallets/router/src/mock.rs @@ -16,13 +16,14 @@ use super::*; use crate as pallet_route; + use frame_support::{construct_runtime, parameter_types, PalletId}; use frame_system::EnsureRoot; -use primitives::AssetId; -pub use primitives::{tokens, Amount, Balance, AMM}; use sp_core::H256; use sp_runtime::{testing::Header, traits::IdentityLookup, Perbill}; +pub use primitives::{tokens, Amount, Balance, CurrencyId, AMM}; + pub type AccountId = u128; pub type BlockNumber = u64; @@ -31,10 +32,10 @@ pub const BOB: AccountId = 2; pub const CHARLIE: AccountId = 3; pub const DAVE: AccountId = 4; -pub const DOT: AssetId = tokens::DOT; -pub const XDOT: AssetId = tokens::XDOT; -pub const USDT: AssetId = tokens::USDT; -pub const KSM: AssetId = tokens::KSM; +pub const DOT: CurrencyId = tokens::DOT; +pub const XDOT: CurrencyId = tokens::XDOT; +pub const USDT: CurrencyId = tokens::USDT; +pub const KSM: CurrencyId = tokens::KSM; parameter_types! { pub const BlockHashCount: u64 = 250; @@ -130,13 +131,13 @@ impl pallet_amm::Config for Runtime { } parameter_types! { - pub const NativeCurrency: AssetId = 0; + pub const NativeCurrencyId: CurrencyId = 0; } impl pallet_currency_adapter::Config for Runtime { type Assets = Assets; type Balances = Balances; - type GetNativeCurrencyId = NativeCurrency; + type GetNativeCurrencyId = NativeCurrencyId; } parameter_types! { diff --git a/pallets/router/src/tests.rs b/pallets/router/src/tests.rs index 91bc51f1a2..06569299e8 100644 --- a/pallets/router/src/tests.rs +++ b/pallets/router/src/tests.rs @@ -18,7 +18,7 @@ use super::*; use core::convert::TryFrom; use frame_support::{assert_noop, assert_ok}; use mock::*; -use primitives::AssetId; +use primitives::CurrencyId; #[test] fn too_many_or_too_less_routes_should_not_work() { @@ -26,7 +26,7 @@ fn too_many_or_too_less_routes_should_not_work() { let routes_11 = Route::::try_from( core::iter::repeat((DOT, XDOT)) .take(MaxLengthRoute::get() as usize + 1) - .collect::>(), + .collect::>(), ); assert!(routes_11.is_err()); diff --git a/primitives/Cargo.toml b/primitives/Cargo.toml index 6df93fbc63..7708d53b52 100644 --- a/primitives/Cargo.toml +++ b/primitives/Cargo.toml @@ -6,17 +6,17 @@ version = '1.0.0' [dependencies] codec = { package = 'parity-scale-codec', version = '2.2.0', default-features = false } -frame-support = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } -frame-system = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } -orml-oracle = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', default-features = false } +frame-support = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } +frame-system = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } +orml-oracle = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', branch = 'sw/xcm-v1', default-features = false } serde = { version = '1', optional = true } -sp-consensus-aura = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } -sp-core = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } -sp-io = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } -sp-runtime = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } -sp-std = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } -xcm = { git = 'https://github.com/paritytech/polkadot.git', branch = 'release-v0.9.9', default-features = false } -xcm-executor = { git = 'https://github.com/paritytech/polkadot.git', branch = 'release-v0.9.9', default-features = false } +sp-consensus-aura = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } +sp-core = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } +sp-io = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } +sp-runtime = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } +sp-std = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } +xcm = { git = 'https://github.com/paritytech/polkadot.git', branch = 'release-v0.9.10', default-features = false } +xcm-executor = { git = 'https://github.com/paritytech/polkadot.git', branch = 'release-v0.9.10', default-features = false } [features] default = ['std'] diff --git a/primitives/src/currency.rs b/primitives/src/currency.rs index a036de3395..d43155dc2a 100644 --- a/primitives/src/currency.rs +++ b/primitives/src/currency.rs @@ -12,16 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -use codec::{Decode, Encode}; use frame_support::traits::fungibles::{Inspect, Mutate}; -use sp_runtime::{traits::Convert, RuntimeDebug, SaturatedConversion}; +use sp_runtime::{traits::Convert, SaturatedConversion}; use sp_std::{convert::Into, marker::PhantomData, prelude::*, result}; -use xcm::v0::{Error as XcmError, MultiAsset, MultiLocation, Result as XcmResult}; +use xcm::latest::prelude::*; use xcm_executor::traits::{Convert as MoreConvert, MatchesFungible, TransactAsset}; -use crate::AssetId; #[cfg(feature = "std")] -use serde::{Deserialize, Serialize}; pub struct MultiCurrencyAdapter< MultiCurrency, @@ -106,10 +103,3 @@ impl< Ok(asset.clone().into()) } } - -#[derive(Encode, Decode, Eq, PartialEq, Copy, Clone, RuntimeDebug, PartialOrd, Ord)] -#[cfg_attr(feature = "std", derive(Serialize, Deserialize, Hash))] -pub enum CurrencyId { - Native, - Asset(AssetId), -} diff --git a/primitives/src/lib.rs b/primitives/src/lib.rs index e417019639..1ef15ec37a 100644 --- a/primitives/src/lib.rs +++ b/primitives/src/lib.rs @@ -80,7 +80,7 @@ pub type Price = FixedU128; pub type Timestamp = u64; -pub type AssetId = u32; +pub type CurrencyId = u32; pub const SECONDS_PER_YEAR: Timestamp = 365 * 24 * 60 * 60; @@ -98,25 +98,25 @@ pub enum DataProviderId { //////////////////////////////////////////////////////////////////////////////// pub trait PriceFeeder { - fn get_price(asset_id: &AssetId) -> Option; + fn get_price(asset_id: &CurrencyId) -> Option; } pub trait DecimalProvider { - fn get_decimal(asset_id: &AssetId) -> u8; + fn get_decimal(asset_id: &CurrencyId) -> u8; } -pub trait EmergencyPriceFeeder { - fn set_emergency_price(asset_id: AssetId, price: Price); - fn reset_emergency_price(asset_id: AssetId); +pub trait EmergencyPriceFeeder { + fn set_emergency_price(asset_id: CurrencyId, price: Price); + fn reset_emergency_price(asset_id: CurrencyId); } pub trait ExchangeRateProvider { fn get_exchange_rate() -> Rate; } -pub trait LiquidStakingCurrenciesProvider { - fn get_staking_currency() -> Option; - fn get_liquid_currency() -> Option; +pub trait LiquidStakingCurrenciesProvider { + fn get_staking_currency() -> Option; + fn get_liquid_currency() -> Option; } pub trait AMM { @@ -126,7 +126,7 @@ pub trait AMM { /// of currency that was sent back to the user. fn trade( who: &T::AccountId, - pair: (AssetId, AssetId), + pair: (CurrencyId, CurrencyId), amount_in: Balance, minimum_amount_out: Balance, ) -> Result; diff --git a/primitives/src/tokens.rs b/primitives/src/tokens.rs index 14c1398368..f8426fbd8b 100644 --- a/primitives/src/tokens.rs +++ b/primitives/src/tokens.rs @@ -12,17 +12,17 @@ // See the License for the specific language governing permissions and // limitations under the License. -use crate::AssetId; +use crate::CurrencyId; -pub const HKO: AssetId = 0; -pub const PARA: AssetId = 1; +pub const HKO: CurrencyId = 0; +pub const PARA: CurrencyId = 1; -pub const KSM: AssetId = 100; -pub const DOT: AssetId = 101; -pub const USDT: AssetId = 102; +pub const KSM: CurrencyId = 100; +pub const DOT: CurrencyId = 101; +pub const USDT: CurrencyId = 102; -pub const XKSM: AssetId = 1000; -pub const XDOT: AssetId = 1001; +pub const XKSM: CurrencyId = 1000; +pub const XDOT: CurrencyId = 1001; // Token Registration Information // +──────────+────────+────────────────────+ diff --git a/runtime/heiko/Cargo.toml b/runtime/heiko/Cargo.toml index acc4544125..8006fbba05 100644 --- a/runtime/heiko/Cargo.toml +++ b/runtime/heiko/Cargo.toml @@ -20,71 +20,70 @@ smallvec = '1.6.1' static_assertions = '1.1.0' # Substrate dependencies -frame-benchmarking = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false, optional = true } -frame-executive = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } -frame-support = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } -frame-system = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } -frame-system-benchmarking = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false, optional = true } -frame-system-rpc-runtime-api = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } -frame-try-runtime = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false, optional = true } -pallet-assets = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } -pallet-aura = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } -pallet-authorship = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } -pallet-balances = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } -pallet-collective = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } -pallet-democracy = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } -pallet-membership = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } -pallet-multisig = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } -pallet-scheduler = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } -pallet-session = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } -pallet-sudo = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } -pallet-timestamp = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } -pallet-transaction-payment = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } -pallet-transaction-payment-rpc-runtime-api = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } -pallet-treasury = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } -pallet-utility = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } -sp-api = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } -sp-block-builder = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } -sp-consensus-aura = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } -sp-core = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } -sp-inherents = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } -sp-offchain = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } -sp-runtime = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } -sp-session = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } -sp-std = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } -sp-transaction-pool = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } -sp-version = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } +frame-benchmarking = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false, optional = true } +frame-executive = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } +frame-support = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } +frame-system = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } +frame-system-benchmarking = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false, optional = true } +frame-system-rpc-runtime-api = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } +frame-try-runtime = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false, optional = true } +pallet-assets = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } +pallet-aura = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } +pallet-authorship = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } +pallet-balances = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } +pallet-collective = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } +pallet-democracy = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } +pallet-membership = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } +pallet-multisig = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } +pallet-scheduler = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } +pallet-session = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } +pallet-sudo = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } +pallet-timestamp = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } +pallet-transaction-payment = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } +pallet-transaction-payment-rpc-runtime-api = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } +pallet-treasury = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } +pallet-utility = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } +sp-api = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } +sp-block-builder = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } +sp-consensus-aura = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } +sp-core = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } +sp-inherents = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } +sp-offchain = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } +sp-runtime = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } +sp-session = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } +sp-std = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } +sp-transaction-pool = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } +sp-version = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } # Polkadot dependencies -pallet-xcm = { git = 'https://github.com/paritytech/polkadot.git', branch = 'release-v0.9.9', default-features = false } -polkadot-parachain = { git = 'https://github.com/paritytech/polkadot.git', branch = 'release-v0.9.9', default-features = false } -polkadot-runtime-common = { git = 'https://github.com/paritytech/polkadot.git', branch = 'release-v0.9.9', default-features = false } -xcm = { git = 'https://github.com/paritytech/polkadot.git', branch = 'release-v0.9.9', default-features = false } -xcm-builder = { git = 'https://github.com/paritytech/polkadot.git', branch = 'release-v0.9.9', default-features = false } -xcm-executor = { git = 'https://github.com/paritytech/polkadot.git', branch = 'release-v0.9.9', default-features = false } +pallet-xcm = { git = 'https://github.com/paritytech/polkadot.git', branch = 'release-v0.9.10', default-features = false } +polkadot-parachain = { git = 'https://github.com/paritytech/polkadot.git', branch = 'release-v0.9.10', default-features = false } +polkadot-runtime-common = { git = 'https://github.com/paritytech/polkadot.git', branch = 'release-v0.9.10', default-features = false } +xcm = { git = 'https://github.com/paritytech/polkadot.git', branch = 'release-v0.9.10', default-features = false } +xcm-builder = { git = 'https://github.com/paritytech/polkadot.git', branch = 'release-v0.9.10', default-features = false } +xcm-executor = { git = 'https://github.com/paritytech/polkadot.git', branch = 'release-v0.9.10', default-features = false } # Cumulus dependencies -cumulus-pallet-aura-ext = { git = 'https://github.com/paritytech/cumulus.git', branch = 'polkadot-v0.9.9', default-features = false } -cumulus-pallet-dmp-queue = { git = 'https://github.com/paritytech/cumulus.git', branch = 'polkadot-v0.9.9', default-features = false } -cumulus-pallet-parachain-system = { git = 'https://github.com/paritytech/cumulus.git', branch = 'polkadot-v0.9.9', default-features = false } -cumulus-pallet-xcm = { git = 'https://github.com/paritytech/cumulus.git', branch = 'polkadot-v0.9.9', default-features = false } -cumulus-pallet-xcmp-queue = { git = 'https://github.com/paritytech/cumulus.git', branch = 'polkadot-v0.9.9', default-features = false } -cumulus-primitives-core = { git = 'https://github.com/paritytech/cumulus.git', branch = 'polkadot-v0.9.9', default-features = false } -cumulus-primitives-timestamp = { git = 'https://github.com/paritytech/cumulus.git', branch = 'polkadot-v0.9.9', default-features = false } -cumulus-primitives-utility = { git = 'https://github.com/paritytech/cumulus.git', branch = 'polkadot-v0.9.9', default-features = false } -pallet-collator-selection = { git = 'https://github.com/paritytech/cumulus.git', branch = 'polkadot-v0.9.9', default-features = false } -parachain-info = { git = 'https://github.com/paritytech/cumulus.git', branch = 'polkadot-v0.9.9', default-features = false } +cumulus-pallet-aura-ext = { git = 'https://github.com/paritytech/cumulus.git', branch = 'polkadot-v0.9.10', default-features = false } +cumulus-pallet-dmp-queue = { git = 'https://github.com/paritytech/cumulus.git', branch = 'polkadot-v0.9.10', default-features = false } +cumulus-pallet-parachain-system = { git = 'https://github.com/paritytech/cumulus.git', branch = 'polkadot-v0.9.10', default-features = false } +cumulus-pallet-xcm = { git = 'https://github.com/paritytech/cumulus.git', branch = 'polkadot-v0.9.10', default-features = false } +cumulus-pallet-xcmp-queue = { git = 'https://github.com/paritytech/cumulus.git', branch = 'polkadot-v0.9.10', default-features = false } +cumulus-primitives-core = { git = 'https://github.com/paritytech/cumulus.git', branch = 'polkadot-v0.9.10', default-features = false } +cumulus-primitives-timestamp = { git = 'https://github.com/paritytech/cumulus.git', branch = 'polkadot-v0.9.10', default-features = false } +cumulus-primitives-utility = { git = 'https://github.com/paritytech/cumulus.git', branch = 'polkadot-v0.9.10', default-features = false } +pallet-collator-selection = { git = 'https://github.com/paritytech/cumulus.git', branch = 'polkadot-v0.9.10', default-features = false } +parachain-info = { git = 'https://github.com/paritytech/cumulus.git', branch = 'polkadot-v0.9.10', default-features = false } # ORML dependencies -orml-oracle = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', default-features = false } -orml-oracle-rpc-runtime-api = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', default-features = false } -orml-traits = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', default-features = false } -orml-unknown-tokens = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', default-features = false } -orml-utilities = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', default-features = false } -orml-vesting = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', default-features = false } -orml-xcm = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', default-features = false } -orml-xcm-support = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', default-features = false } -orml-xtokens = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', default-features = false } +orml-oracle = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', branch = 'sw/xcm-v1', default-features = false } +orml-oracle-rpc-runtime-api = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', branch = 'sw/xcm-v1', default-features = false } +orml-traits = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', branch = 'sw/xcm-v1', default-features = false } +orml-utilities = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', branch = 'sw/xcm-v1', default-features = false } +orml-vesting = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', branch = 'sw/xcm-v1', default-features = false } +orml-xcm = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', branch = 'sw/xcm-v1', default-features = false } +orml-xcm-support = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', branch = 'sw/xcm-v1', default-features = false } +orml-xtokens = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', branch = 'sw/xcm-v1', default-features = false } # Parallel dependencies pallet-liquid-staking = { path = '../../pallets/liquid-staking-v2', package = 'pallet-liquid-staking-v2', default-features = false } @@ -96,11 +95,11 @@ pallet-prices = { path = '../../pallets/prices', default-features primitives = { package = 'parallel-primitives', path = '../../primitives', default-features = false } [build-dependencies.substrate-wasm-builder] -branch = 'polkadot-v0.9.9' +branch = 'polkadot-v0.9.10' git = 'https://github.com/paritytech/substrate.git' [dev-dependencies] -sp-io = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } +sp-io = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } [features] default = ['std'] @@ -180,7 +179,6 @@ std = [ 'pallet-authorship/std', 'pallet-collator-selection/std', 'cumulus-primitives-timestamp/std', - 'orml-unknown-tokens/std', 'orml-xcm-support/std', 'orml-xtokens/std', 'orml-xcm/std', @@ -208,7 +206,6 @@ try-runtime = [ 'pallet-session/try-runtime', 'pallet-assets/try-runtime', 'pallet-authorship/try-runtime', - 'orml-unknown-tokens/try-runtime', 'orml-xtokens/try-runtime', 'orml-xcm/try-runtime', 'orml-vesting/try-runtime', diff --git a/runtime/heiko/src/lib.rs b/runtime/heiko/src/lib.rs index 6359d41e61..db68718d18 100644 --- a/runtime/heiko/src/lib.rs +++ b/runtime/heiko/src/lib.rs @@ -62,15 +62,14 @@ use primitives::{ currency::MultiCurrencyAdapter, network::HEIKO_PREFIX, tokens::{KSM, XKSM}, - *, + Index, *, }; -use xcm::v0::{Junction, Junction::*, MultiAsset, MultiLocation, MultiLocation::*, NetworkId}; +use xcm::latest::prelude::*; use xcm_builder::{ - AccountId32Aliases, AllowTopLevelPaidExecutionFrom, EnsureXcmOrigin, - FixedRateOfConcreteFungible, FixedWeightBounds, LocationInverter, ParentAsSuperuser, - ParentIsDefault, RelayChainAsNative, SiblingParachainAsNative, SiblingParachainConvertsVia, - SignedAccountId32AsNative, SignedToAccountId32, SovereignSignedViaLocation, TakeRevenue, - TakeWeightCredit, + AccountId32Aliases, AllowTopLevelPaidExecutionFrom, EnsureXcmOrigin, FixedRateOfFungible, + FixedWeightBounds, LocationInverter, ParentAsSuperuser, ParentIsDefault, RelayChainAsNative, + SiblingParachainAsNative, SiblingParachainConvertsVia, SignedAccountId32AsNative, + SignedToAccountId32, SovereignSignedViaLocation, TakeRevenue, TakeWeightCredit, }; use xcm_executor::{Config, XcmExecutor}; @@ -320,27 +319,33 @@ parameter_types! { } pub struct CurrencyIdConvert; -impl Convert> for CurrencyIdConvert { - fn convert(id: AssetId) -> Option { +impl Convert> for CurrencyIdConvert { + fn convert(id: CurrencyId) -> Option { match id { - KSM => Some(X1(Parent)), - XKSM => Some(X3( - Parent, - Parachain(ParachainInfo::parachain_id().into()), - GeneralKey(b"xKSM".to_vec()), + KSM => Some(MultiLocation::parent()), + XKSM => Some(MultiLocation::new( + 1, + X2( + Parachain(ParachainInfo::parachain_id().into()), + GeneralKey(b"xKSM".to_vec()), + ), )), _ => None, } } } -impl Convert> for CurrencyIdConvert { - fn convert(location: MultiLocation) -> Option { +impl Convert> for CurrencyIdConvert { + fn convert(location: MultiLocation) -> Option { match location { - X1(Parent) => Some(KSM), - X3(Parent, Parachain(id), GeneralKey(key)) - if ParaId::from(id) == ParachainInfo::parachain_id() && key == b"xKSM".to_vec() => - { + MultiLocation { + parents: 1, + interior: Here, + } => Some(KSM), + MultiLocation { + parents: 1, + interior: X2(Parachain(id), GeneralKey(key)), + } if ParaId::from(id) == ParachainInfo::parachain_id() && key == b"xKSM".to_vec() => { Some(XKSM) } _ => None, @@ -348,9 +353,13 @@ impl Convert> for CurrencyIdConvert { } } -impl Convert> for CurrencyIdConvert { - fn convert(a: MultiAsset) -> Option { - if let MultiAsset::ConcreteFungible { id, amount: _ } = a { +impl Convert> for CurrencyIdConvert { + fn convert(a: MultiAsset) -> Option { + if let MultiAsset { + id: AssetId::Concrete(id), + fun: Fungibility::Fungible(_amount), + } = a + { Self::convert(id) } else { None @@ -369,24 +378,21 @@ impl Convert for AccountIdToMultiLocation { } parameter_types! { - pub SelfLocation: MultiLocation = X2(Parent, Parachain(ParachainInfo::parachain_id().into())); + pub SelfLocation: MultiLocation = MultiLocation::new(1, X1(Parachain(ParachainInfo::parachain_id().into()))); pub const BaseXcmWeight: Weight = 100_000_000; } impl orml_xtokens::Config for Runtime { type Event = Event; type Balance = Balance; - type CurrencyId = AssetId; + type CurrencyId = CurrencyId; type CurrencyIdConvert = CurrencyIdConvert; type AccountIdToMultiLocation = AccountIdToMultiLocation; type SelfLocation = SelfLocation; type XcmExecutor = XcmExecutor; type Weigher = FixedWeightBounds; type BaseXcmWeight = BaseXcmWeight; -} - -impl orml_unknown_tokens::Config for Runtime { - type Event = Event; + type LocationInverter = LocationInverter; } parameter_types! { @@ -402,7 +408,7 @@ parameter_types! { impl pallet_assets::Config for Runtime { type Event = Event; type Balance = Balance; - type AssetId = AssetId; + type AssetId = CurrencyId; type Currency = Balances; type ForceOrigin = EnsureRootOrMoreThanHalfGeneralCouncil; type AssetDeposit = AssetDeposit; @@ -446,13 +452,13 @@ impl pallet_membership::Config for Runtime parameter_types! { pub const StakingPalletId: PalletId = PalletId(*b"par/lqsk"); - pub RelayAgent: MultiLocation = MultiLocation::X2( - Junction::Parent, - Junction::AccountId32{ + pub RelayAgent: MultiLocation = MultiLocation::new( + 1, + X1(AccountId32{ network: NetworkId::Any, // Dave id: hex!["306721211d5404bd9da88e0204360a1a9ab8b87c66c1bc2fcdd37f3c2222cc20"] - } + }) ); pub const PeriodBasis: BlockNumber = 1000u32; } @@ -687,7 +693,7 @@ pub type LocalOriginToLocation = (SignedToAccountId32, + cumulus_primitives_utility::ParentAsUmp, // ..and XCMP to communicate with the sibling chains. XcmpQueue, ); @@ -715,6 +721,7 @@ impl cumulus_pallet_xcmp_queue::Config for Runtime { type Event = Event; type XcmExecutor = XcmExecutor; type ChannelInfo = ParachainSystem; + type VersionWrapper = (); } impl cumulus_pallet_dmp_queue::Config for Runtime { @@ -742,11 +749,11 @@ impl cumulus_pallet_parachain_system::Config for Runtime { impl parachain_info::Config for Runtime {} parameter_types! { - pub const RelayLocation: MultiLocation = MultiLocation::X1(Junction::Parent); + pub RelayLocation: MultiLocation = MultiLocation::parent(); pub const RelayNetwork: NetworkId = NetworkId::Kusama; pub HeikoNetwork: NetworkId = NetworkId::Named("heiko".into()); pub RelayChainOrigin: Origin = cumulus_pallet_xcm::Origin::Relay.into(); - pub Ancestry: MultiLocation = X1(Parachain(ParachainInfo::parachain_id().into())); + pub Ancestry: MultiLocation = MultiLocation::new(0, X1(Parachain(ParachainInfo::parachain_id().into()))); } /// Type for specifying how a `MultiLocation` can be converted into an `AccountId`. This is used @@ -766,7 +773,7 @@ pub type LocalAssetTransactor = MultiCurrencyAdapter< // Use this currency: Assets, // Use this currency when it is a fungible asset matching the given location or name: - IsNativeConcrete, + IsNativeConcrete, // Our chain's account ID type (we can't get away without mentioning it explicitly): AccountId, // Do a simple punn to convert an AccountId32 MultiLocation into a native chain account ID: @@ -800,14 +807,14 @@ pub type XcmOriginToTransactDispatchOrigin = ( parameter_types! { pub UnitWeightCost: Weight = 20_000_000; - pub KsmPerSecond: (MultiLocation, u128) = (X1(Parent), ksm_per_second()); + pub KsmPerSecond: (AssetId, u128) = (AssetId::Concrete(MultiLocation::parent()), ksm_per_second()); } parameter_types! { // 1_000_000_000_000 => 1 unit of asset for 1 unit of Weight. // TODO Should take the actual weight price. This is just 1_000 KSM per second of weight. - pub const WeightPrice: (MultiLocation, u128) = (MultiLocation::X1(Junction::Parent), 1_000); - // pub AllowUnpaidFrom: Vec = vec![ MultiLocation::X1(Junction::Parent) ]; + pub WeightPrice: (MultiLocation, u128) = (MultiLocation::parent(), 1_000); + // pub AllowUnpaidFrom: Vec = vec![ Junction::Parent) ]; } pub type Barrier = (TakeWeightCredit, AllowTopLevelPaidExecutionFrom); @@ -815,7 +822,11 @@ pub type Barrier = (TakeWeightCredit, AllowTopLevelPaidExecutionFrom pub struct ToTreasury; impl TakeRevenue for ToTreasury { fn take_revenue(revenue: MultiAsset) { - if let MultiAsset::ConcreteFungible { id, amount } = revenue { + if let MultiAsset { + id: AssetId::Concrete(id), + fun: Fungibility::Fungible(amount), + } = revenue + { if let Some(currency_id) = CurrencyIdConvert::convert(id) { let _ = Assets::mint_into(currency_id, &TreasuryAccount::get(), amount); } @@ -836,8 +847,9 @@ impl Config for XcmConfig { type LocationInverter = LocationInverter; type Barrier = Barrier; type Weigher = FixedWeightBounds; - type Trader = FixedRateOfConcreteFungible; - type ResponseHandler = (); // Don't handle responses for now. + type Trader = FixedRateOfFungible; + type ResponseHandler = (); + type SubscriptionService = PolkadotXcm; } parameter_types! { @@ -854,7 +866,7 @@ impl orml_oracle::Config for Runtime { type CombineData = orml_oracle::DefaultCombineData; type Time = Timestamp; - type OracleKey = AssetId; + type OracleKey = CurrencyId; type OracleValue = Price; type RootOperatorAccountId = ZeroAccountId; type MaxHasDispatchedSize = MaxHasDispatchedSize; @@ -864,25 +876,25 @@ impl orml_oracle::Config for Runtime { pub type TimeStampedPrice = orml_oracle::TimestampedValue; pub struct AggregatedDataProvider; -impl DataProvider for AggregatedDataProvider { - fn get(key: &AssetId) -> Option { +impl DataProvider for AggregatedDataProvider { + fn get(key: &CurrencyId) -> Option { Oracle::get(key) } } -impl DataProviderExtended for AggregatedDataProvider { - fn get_no_op(key: &AssetId) -> Option { +impl DataProviderExtended for AggregatedDataProvider { + fn get_no_op(key: &CurrencyId) -> Option { Oracle::get_no_op(key) } - fn get_all_values() -> Vec<(AssetId, Option)> { + fn get_all_values() -> Vec<(CurrencyId, Option)> { Oracle::get_all_values() } } pub struct Decimal; impl DecimalProvider for Decimal { - fn get_decimal(asset_id: &AssetId) -> u8 { + fn get_decimal(asset_id: &CurrencyId) -> u8 { // TODO should find a way, get decimal from pallet_assets // pallet_assets::Metadata::::get(asset_id).decimals match *asset_id { @@ -1194,7 +1206,6 @@ construct_runtime!( // 3rd Party Oracle: orml_oracle::::{Pallet, Storage, Call, Event} = 42, XTokens: orml_xtokens::{Pallet, Storage, Call, Event} = 43, - UnknownTokens: orml_unknown_tokens::{Pallet, Storage, Event} = 44, OrmlXcm: orml_xcm::{Pallet, Call, Event} = 45, Vesting: orml_vesting::{Pallet, Storage, Call, Event, Config} = 46, @@ -1356,16 +1367,16 @@ impl_runtime_apis! { impl orml_oracle_rpc_runtime_api::OracleApi< Block, DataProviderId, - AssetId, + CurrencyId, TimeStampedPrice, > for Runtime { - fn get_value(provider_id: DataProviderId, key: AssetId) -> Option { + fn get_value(provider_id: DataProviderId, key: CurrencyId) -> Option { match provider_id { DataProviderId::Aggregated => Prices::get_no_op(&key) } } - fn get_all_values(provider_id: DataProviderId) -> Vec<(AssetId, Option)> { + fn get_all_values(provider_id: DataProviderId) -> Vec<(CurrencyId, Option)> { match provider_id { DataProviderId::Aggregated => Prices::get_all_values() } diff --git a/runtime/parallel/Cargo.toml b/runtime/parallel/Cargo.toml index ea62b4fa9f..306aa2eb79 100644 --- a/runtime/parallel/Cargo.toml +++ b/runtime/parallel/Cargo.toml @@ -20,71 +20,70 @@ smallvec = '1.6.1' static_assertions = '1.1.0' # Substrate dependencies -frame-benchmarking = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false, optional = true } -frame-executive = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } -frame-support = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } -frame-system = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } -frame-system-benchmarking = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false, optional = true } -frame-system-rpc-runtime-api = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } -frame-try-runtime = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false, optional = true } -pallet-assets = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } -pallet-aura = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } -pallet-authorship = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } -pallet-balances = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } -pallet-collective = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } -pallet-democracy = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } -pallet-membership = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } -pallet-multisig = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } -pallet-scheduler = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } -pallet-session = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } -pallet-sudo = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } -pallet-timestamp = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } -pallet-transaction-payment = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } -pallet-transaction-payment-rpc-runtime-api = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } -pallet-treasury = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } -pallet-utility = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } -sp-api = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } -sp-block-builder = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } -sp-consensus-aura = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } -sp-core = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } -sp-inherents = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } -sp-offchain = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } -sp-runtime = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } -sp-session = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } -sp-std = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } -sp-transaction-pool = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } -sp-version = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } +frame-benchmarking = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false, optional = true } +frame-executive = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } +frame-support = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } +frame-system = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } +frame-system-benchmarking = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false, optional = true } +frame-system-rpc-runtime-api = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } +frame-try-runtime = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false, optional = true } +pallet-assets = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } +pallet-aura = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } +pallet-authorship = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } +pallet-balances = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } +pallet-collective = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } +pallet-democracy = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } +pallet-membership = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } +pallet-multisig = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } +pallet-scheduler = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } +pallet-session = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } +pallet-sudo = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } +pallet-timestamp = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } +pallet-transaction-payment = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } +pallet-transaction-payment-rpc-runtime-api = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } +pallet-treasury = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } +pallet-utility = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } +sp-api = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } +sp-block-builder = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } +sp-consensus-aura = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } +sp-core = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } +sp-inherents = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } +sp-offchain = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } +sp-runtime = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } +sp-session = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } +sp-std = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } +sp-transaction-pool = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } +sp-version = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } # Polkadot dependencies -pallet-xcm = { git = 'https://github.com/paritytech/polkadot.git', branch = 'release-v0.9.9', default-features = false } -polkadot-parachain = { git = 'https://github.com/paritytech/polkadot.git', branch = 'release-v0.9.9', default-features = false } -polkadot-runtime-common = { git = 'https://github.com/paritytech/polkadot.git', branch = 'release-v0.9.9', default-features = false } -xcm = { git = 'https://github.com/paritytech/polkadot.git', branch = 'release-v0.9.9', default-features = false } -xcm-builder = { git = 'https://github.com/paritytech/polkadot.git', branch = 'release-v0.9.9', default-features = false } -xcm-executor = { git = 'https://github.com/paritytech/polkadot.git', branch = 'release-v0.9.9', default-features = false } +pallet-xcm = { git = 'https://github.com/paritytech/polkadot.git', branch = 'release-v0.9.10', default-features = false } +polkadot-parachain = { git = 'https://github.com/paritytech/polkadot.git', branch = 'release-v0.9.10', default-features = false } +polkadot-runtime-common = { git = 'https://github.com/paritytech/polkadot.git', branch = 'release-v0.9.10', default-features = false } +xcm = { git = 'https://github.com/paritytech/polkadot.git', branch = 'release-v0.9.10', default-features = false } +xcm-builder = { git = 'https://github.com/paritytech/polkadot.git', branch = 'release-v0.9.10', default-features = false } +xcm-executor = { git = 'https://github.com/paritytech/polkadot.git', branch = 'release-v0.9.10', default-features = false } # Cumulus dependencies -cumulus-pallet-aura-ext = { git = 'https://github.com/paritytech/cumulus.git', branch = 'polkadot-v0.9.9', default-features = false } -cumulus-pallet-dmp-queue = { git = 'https://github.com/paritytech/cumulus.git', branch = 'polkadot-v0.9.9', default-features = false } -cumulus-pallet-parachain-system = { git = 'https://github.com/paritytech/cumulus.git', branch = 'polkadot-v0.9.9', default-features = false } -cumulus-pallet-xcm = { git = 'https://github.com/paritytech/cumulus.git', branch = 'polkadot-v0.9.9', default-features = false } -cumulus-pallet-xcmp-queue = { git = 'https://github.com/paritytech/cumulus.git', branch = 'polkadot-v0.9.9', default-features = false } -cumulus-primitives-core = { git = 'https://github.com/paritytech/cumulus.git', branch = 'polkadot-v0.9.9', default-features = false } -cumulus-primitives-timestamp = { git = 'https://github.com/paritytech/cumulus.git', branch = 'polkadot-v0.9.9', default-features = false } -cumulus-primitives-utility = { git = 'https://github.com/paritytech/cumulus.git', branch = 'polkadot-v0.9.9', default-features = false } -pallet-collator-selection = { git = 'https://github.com/paritytech/cumulus.git', branch = 'polkadot-v0.9.9', default-features = false } -parachain-info = { git = 'https://github.com/paritytech/cumulus.git', branch = 'polkadot-v0.9.9', default-features = false } +cumulus-pallet-aura-ext = { git = 'https://github.com/paritytech/cumulus.git', branch = 'polkadot-v0.9.10', default-features = false } +cumulus-pallet-dmp-queue = { git = 'https://github.com/paritytech/cumulus.git', branch = 'polkadot-v0.9.10', default-features = false } +cumulus-pallet-parachain-system = { git = 'https://github.com/paritytech/cumulus.git', branch = 'polkadot-v0.9.10', default-features = false } +cumulus-pallet-xcm = { git = 'https://github.com/paritytech/cumulus.git', branch = 'polkadot-v0.9.10', default-features = false } +cumulus-pallet-xcmp-queue = { git = 'https://github.com/paritytech/cumulus.git', branch = 'polkadot-v0.9.10', default-features = false } +cumulus-primitives-core = { git = 'https://github.com/paritytech/cumulus.git', branch = 'polkadot-v0.9.10', default-features = false } +cumulus-primitives-timestamp = { git = 'https://github.com/paritytech/cumulus.git', branch = 'polkadot-v0.9.10', default-features = false } +cumulus-primitives-utility = { git = 'https://github.com/paritytech/cumulus.git', branch = 'polkadot-v0.9.10', default-features = false } +pallet-collator-selection = { git = 'https://github.com/paritytech/cumulus.git', branch = 'polkadot-v0.9.10', default-features = false } +parachain-info = { git = 'https://github.com/paritytech/cumulus.git', branch = 'polkadot-v0.9.10', default-features = false } # ORML dependencies -orml-oracle = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', default-features = false } -orml-oracle-rpc-runtime-api = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', default-features = false } -orml-traits = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', default-features = false } -orml-unknown-tokens = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', default-features = false } -orml-utilities = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', default-features = false } -orml-vesting = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', default-features = false } -orml-xcm = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', default-features = false } -orml-xcm-support = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', default-features = false } -orml-xtokens = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', default-features = false } +orml-oracle = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', branch = 'sw/xcm-v1', default-features = false } +orml-oracle-rpc-runtime-api = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', branch = 'sw/xcm-v1', default-features = false } +orml-traits = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', branch = 'sw/xcm-v1', default-features = false } +orml-utilities = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', branch = 'sw/xcm-v1', default-features = false } +orml-vesting = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', branch = 'sw/xcm-v1', default-features = false } +orml-xcm = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', branch = 'sw/xcm-v1', default-features = false } +orml-xcm-support = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', branch = 'sw/xcm-v1', default-features = false } +orml-xtokens = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', branch = 'sw/xcm-v1', default-features = false } # Parallel dependencies pallet-amm = { path = '../../pallets/amm', default-features = false } @@ -99,11 +98,11 @@ pallet-router = { path = '../../pallets/router', default-features primitives = { package = 'parallel-primitives', path = '../../primitives', default-features = false } [build-dependencies.substrate-wasm-builder] -branch = 'polkadot-v0.9.9' +branch = 'polkadot-v0.9.10' git = 'https://github.com/paritytech/substrate.git' [dev-dependencies] -sp-io = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } +sp-io = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } [features] default = ['std'] @@ -185,7 +184,6 @@ std = [ 'pallet-authorship/std', 'pallet-collator-selection/std', 'cumulus-primitives-timestamp/std', - 'orml-unknown-tokens/std', 'orml-xcm-support/std', 'orml-xtokens/std', 'orml-xcm/std', @@ -216,7 +214,6 @@ try-runtime = [ 'pallet-session/try-runtime', 'pallet-assets/try-runtime', 'pallet-authorship/try-runtime', - 'orml-unknown-tokens/try-runtime', 'orml-xtokens/try-runtime', 'orml-xcm/try-runtime', 'orml-vesting/try-runtime', diff --git a/runtime/parallel/src/lib.rs b/runtime/parallel/src/lib.rs index c50848b481..9913467106 100644 --- a/runtime/parallel/src/lib.rs +++ b/runtime/parallel/src/lib.rs @@ -31,7 +31,6 @@ use frame_support::{ use orml_traits::{DataProvider, DataProviderExtended}; use polkadot_runtime_common::SlowAdjustingFeeUpdate; -use primitives::*; use sp_api::impl_runtime_apis; use sp_core::{ u32_trait::{_1, _2, _3, _4, _5}, @@ -63,16 +62,16 @@ use primitives::{ currency::MultiCurrencyAdapter, network::PARALLEL_PREFIX, tokens::{DOT, XDOT}, + Index, *, }; use hex_literal::hex; -use xcm::v0::{Junction, Junction::*, MultiAsset, MultiLocation, MultiLocation::*, NetworkId}; +use xcm::latest::prelude::*; use xcm_builder::{ - AccountId32Aliases, AllowTopLevelPaidExecutionFrom, EnsureXcmOrigin, - FixedRateOfConcreteFungible, FixedWeightBounds, LocationInverter, ParentAsSuperuser, - ParentIsDefault, RelayChainAsNative, SiblingParachainAsNative, SiblingParachainConvertsVia, - SignedAccountId32AsNative, SignedToAccountId32, SovereignSignedViaLocation, TakeRevenue, - TakeWeightCredit, + AccountId32Aliases, AllowTopLevelPaidExecutionFrom, EnsureXcmOrigin, FixedRateOfFungible, + FixedWeightBounds, LocationInverter, ParentAsSuperuser, ParentIsDefault, RelayChainAsNative, + SiblingParachainAsNative, SiblingParachainConvertsVia, SignedAccountId32AsNative, + SignedToAccountId32, SovereignSignedViaLocation, TakeRevenue, TakeWeightCredit, }; use xcm_executor::{Config, XcmExecutor}; pub mod constants; @@ -308,27 +307,33 @@ parameter_types! { } pub struct CurrencyIdConvert; -impl Convert> for CurrencyIdConvert { - fn convert(id: AssetId) -> Option { +impl Convert> for CurrencyIdConvert { + fn convert(id: CurrencyId) -> Option { match id { - DOT => Some(X1(Parent)), - XDOT => Some(X3( - Parent, - Parachain(ParachainInfo::parachain_id().into()), - GeneralKey(b"xDOT".to_vec()), + DOT => Some(MultiLocation::parent()), + XDOT => Some(MultiLocation::new( + 1, + Junctions::X2( + Parachain(ParachainInfo::parachain_id().into()), + GeneralKey(b"xDOT".to_vec()), + ), )), _ => None, } } } -impl Convert> for CurrencyIdConvert { - fn convert(location: MultiLocation) -> Option { +impl Convert> for CurrencyIdConvert { + fn convert(location: MultiLocation) -> Option { match location { - X1(Parent) => Some(DOT), - X3(Parent, Parachain(id), GeneralKey(key)) - if ParaId::from(id) == ParachainInfo::parachain_id() && key == b"xDOT".to_vec() => - { + MultiLocation { + parents: 1, + interior: Here, + } => Some(DOT), + MultiLocation { + parents: 1, + interior: X2(Parachain(id), GeneralKey(key)), + } if ParaId::from(id) == ParachainInfo::parachain_id() && key == b"xDOT".to_vec() => { Some(XDOT) } _ => None, @@ -336,9 +341,13 @@ impl Convert> for CurrencyIdConvert { } } -impl Convert> for CurrencyIdConvert { - fn convert(a: MultiAsset) -> Option { - if let MultiAsset::ConcreteFungible { id, amount: _ } = a { +impl Convert> for CurrencyIdConvert { + fn convert(a: MultiAsset) -> Option { + if let MultiAsset { + id: AssetId::Concrete(id), + fun: _, + } = a + { Self::convert(id) } else { None @@ -357,24 +366,21 @@ impl Convert for AccountIdToMultiLocation { } parameter_types! { - pub SelfLocation: MultiLocation = X2(Parent, Parachain(ParachainInfo::parachain_id().into())); + pub SelfLocation: MultiLocation = MultiLocation::new(1, X1(Parachain(ParachainInfo::parachain_id().into()))); pub const BaseXcmWeight: Weight = 100_000_000; } impl orml_xtokens::Config for Runtime { type Event = Event; type Balance = Balance; - type CurrencyId = AssetId; + type CurrencyId = CurrencyId; type CurrencyIdConvert = CurrencyIdConvert; type AccountIdToMultiLocation = AccountIdToMultiLocation; type SelfLocation = SelfLocation; type XcmExecutor = XcmExecutor; type Weigher = FixedWeightBounds; type BaseXcmWeight = BaseXcmWeight; -} - -impl orml_unknown_tokens::Config for Runtime { - type Event = Event; + type LocationInverter = LocationInverter; } parameter_types! { @@ -390,7 +396,7 @@ parameter_types! { impl pallet_assets::Config for Runtime { type Event = Event; type Balance = Balance; - type AssetId = AssetId; + type AssetId = CurrencyId; type Currency = Balances; type ForceOrigin = EnsureRootOrMoreThanHalfGeneralCouncil; type AssetDeposit = AssetDeposit; @@ -434,13 +440,13 @@ impl pallet_membership::Config for Runtime parameter_types! { pub const StakingPalletId: PalletId = PalletId(*b"par/lqsk"); - pub RelayAgent: MultiLocation = MultiLocation::X2( - Junction::Parent, - Junction::AccountId32{ + pub RelayAgent: MultiLocation = MultiLocation::new( + 1, + X1(AccountId32{ network: NetworkId::Any, // Dave id: hex!["306721211d5404bd9da88e0204360a1a9ab8b87c66c1bc2fcdd37f3c2222cc20"] - } + }) ); pub const PeriodBasis: BlockNumber = 1000u32; pub BridgeOrigin: Vec = vec![hex!["306721211d5404bd9da88e0204360a1a9ab8b87c66c1bc2fcdd37f3c2222cc20"].into()]; @@ -676,7 +682,7 @@ pub type LocalOriginToLocation = (SignedToAccountId32, + cumulus_primitives_utility::ParentAsUmp, // ..and XCMP to communicate with the sibling chains. XcmpQueue, ); @@ -704,6 +710,7 @@ impl cumulus_pallet_xcmp_queue::Config for Runtime { type Event = Event; type XcmExecutor = XcmExecutor; type ChannelInfo = ParachainSystem; + type VersionWrapper = (); } impl cumulus_pallet_dmp_queue::Config for Runtime { @@ -731,11 +738,11 @@ impl cumulus_pallet_parachain_system::Config for Runtime { impl parachain_info::Config for Runtime {} parameter_types! { - pub const RelayLocation: MultiLocation = MultiLocation::X1(Junction::Parent); + pub RelayLocation: MultiLocation = MultiLocation::parent(); pub const RelayNetwork: NetworkId = NetworkId::Polkadot; pub ParallelNetwork: NetworkId = NetworkId::Named("parallel".into()); pub RelayChainOrigin: Origin = cumulus_pallet_xcm::Origin::Relay.into(); - pub Ancestry: MultiLocation = X1(Parachain(ParachainInfo::parachain_id().into())); + pub Ancestry: MultiLocation = MultiLocation::new(0, X1(Parachain(ParachainInfo::parachain_id().into()))); } /// Type for specifying how a `MultiLocation` can be converted into an `AccountId`. This is used @@ -755,7 +762,7 @@ pub type LocalAssetTransactor = MultiCurrencyAdapter< // Use this currency: Assets, // Use this currency when it is a fungible asset matching the given location or name: - IsNativeConcrete, + IsNativeConcrete, // Our chain's account ID type (we can't get away without mentioning it explicitly): AccountId, // Do a simple punn to convert an AccountId32 MultiLocation into a native chain account ID: @@ -789,14 +796,14 @@ pub type XcmOriginToTransactDispatchOrigin = ( parameter_types! { pub UnitWeightCost: Weight = 20_000_000; - pub DotPerSecond: (MultiLocation, u128) = (X1(Parent), dot_per_second()); + pub DotPerSecond: (AssetId, u128) = (AssetId::Concrete(MultiLocation::parent()), dot_per_second()); } parameter_types! { // 1_000_000_000_000 => 1 unit of asset for 1 unit of Weight. // TODO Should take the actual weight price. This is just 1_000 DOT per second of weight. - pub const WeightPrice: (MultiLocation, u128) = (MultiLocation::X1(Junction::Parent), 1_000); - // pub AllowUnpaidFrom: Vec = vec![ MultiLocation::X1(Junction::Parent) ]; + pub WeightPrice: (MultiLocation, u128) = (MultiLocation::parent(), 1_000); + // pub AllowUnpaidFrom: Vec = vec![ X1(Junction::Parent) ]; } pub type Barrier = (TakeWeightCredit, AllowTopLevelPaidExecutionFrom); @@ -804,7 +811,11 @@ pub type Barrier = (TakeWeightCredit, AllowTopLevelPaidExecutionFrom pub struct ToTreasury; impl TakeRevenue for ToTreasury { fn take_revenue(revenue: MultiAsset) { - if let MultiAsset::ConcreteFungible { id, amount } = revenue { + if let MultiAsset { + id: AssetId::Concrete(id), + fun: Fungibility::Fungible(amount), + } = revenue + { if let Some(currency_id) = CurrencyIdConvert::convert(id) { let _ = Assets::mint_into(currency_id, &TreasuryAccount::get(), amount); } @@ -825,8 +836,9 @@ impl Config for XcmConfig { type LocationInverter = LocationInverter; type Barrier = Barrier; type Weigher = FixedWeightBounds; - type Trader = FixedRateOfConcreteFungible; + type Trader = FixedRateOfFungible; type ResponseHandler = (); // Don't handle responses for now. + type SubscriptionService = PolkadotXcm; } parameter_types! { @@ -843,7 +855,7 @@ impl orml_oracle::Config for Runtime { type CombineData = orml_oracle::DefaultCombineData; type Time = Timestamp; - type OracleKey = AssetId; + type OracleKey = CurrencyId; type OracleValue = Price; type RootOperatorAccountId = ZeroAccountId; type MaxHasDispatchedSize = MaxHasDispatchedSize; @@ -853,25 +865,25 @@ impl orml_oracle::Config for Runtime { pub type TimeStampedPrice = orml_oracle::TimestampedValue; pub struct AggregatedDataProvider; -impl DataProvider for AggregatedDataProvider { - fn get(key: &AssetId) -> Option { +impl DataProvider for AggregatedDataProvider { + fn get(key: &CurrencyId) -> Option { Oracle::get(key) } } -impl DataProviderExtended for AggregatedDataProvider { - fn get_no_op(key: &AssetId) -> Option { +impl DataProviderExtended for AggregatedDataProvider { + fn get_no_op(key: &CurrencyId) -> Option { Oracle::get_no_op(key) } - fn get_all_values() -> Vec<(AssetId, Option)> { + fn get_all_values() -> Vec<(CurrencyId, Option)> { Oracle::get_all_values() } } pub struct Decimal; impl DecimalProvider for Decimal { - fn get_decimal(asset_id: &AssetId) -> u8 { + fn get_decimal(asset_id: &CurrencyId) -> u8 { // pallet_assets::Metadata::::get(asset_id).decimals match *asset_id { DOT | XDOT => 10, @@ -1174,7 +1186,7 @@ impl pallet_router::Config for Runtime { } parameter_types! { - pub const NativeCurrencyId: AssetId = tokens::PARA; + pub const NativeCurrencyId: CurrencyId = tokens::PARA; } impl pallet_currency_adapter::Config for Runtime { @@ -1225,7 +1237,6 @@ construct_runtime!( // 3rd Party Oracle: orml_oracle::::{Pallet, Storage, Call, Event} = 42, XTokens: orml_xtokens::{Pallet, Storage, Call, Event} = 43, - UnknownTokens: orml_unknown_tokens::{Pallet, Storage, Event} = 44, OrmlXcm: orml_xcm::{Pallet, Call, Event} = 45, Vesting: orml_vesting::{Pallet, Storage, Call, Event, Config} = 46, @@ -1392,16 +1403,16 @@ impl_runtime_apis! { impl orml_oracle_rpc_runtime_api::OracleApi< Block, DataProviderId, - AssetId, + CurrencyId, TimeStampedPrice, > for Runtime { - fn get_value(provider_id: DataProviderId, key: AssetId) -> Option { + fn get_value(provider_id: DataProviderId, key: CurrencyId) -> Option { match provider_id { DataProviderId::Aggregated => Prices::get_no_op(&key) } } - fn get_all_values(provider_id: DataProviderId) -> Vec<(AssetId, Option)> { + fn get_all_values(provider_id: DataProviderId) -> Vec<(CurrencyId, Option)> { match provider_id { DataProviderId::Aggregated => Prices::get_all_values() } diff --git a/runtime/vanilla/Cargo.toml b/runtime/vanilla/Cargo.toml index 330b4f86c5..1d02c24e48 100644 --- a/runtime/vanilla/Cargo.toml +++ b/runtime/vanilla/Cargo.toml @@ -20,71 +20,70 @@ smallvec = '1.6.1' static_assertions = '1.1.0' # Substrate dependencies -frame-benchmarking = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false, optional = true } -frame-executive = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } -frame-support = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } -frame-system = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } -frame-system-benchmarking = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false, optional = true } -frame-system-rpc-runtime-api = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } -frame-try-runtime = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false, optional = true } -pallet-assets = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } -pallet-aura = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } -pallet-authorship = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } -pallet-balances = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } -pallet-collective = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } -pallet-democracy = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } -pallet-membership = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } -pallet-multisig = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } -pallet-scheduler = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } -pallet-session = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } -pallet-sudo = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } -pallet-timestamp = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } -pallet-transaction-payment = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } -pallet-transaction-payment-rpc-runtime-api = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } -pallet-treasury = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } -pallet-utility = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } -sp-api = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } -sp-block-builder = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } -sp-consensus-aura = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } -sp-core = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } -sp-inherents = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } -sp-offchain = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } -sp-runtime = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } -sp-session = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } -sp-std = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } -sp-transaction-pool = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } -sp-version = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } +frame-benchmarking = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false, optional = true } +frame-executive = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } +frame-support = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } +frame-system = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } +frame-system-benchmarking = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false, optional = true } +frame-system-rpc-runtime-api = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } +frame-try-runtime = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false, optional = true } +pallet-assets = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } +pallet-aura = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } +pallet-authorship = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } +pallet-balances = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } +pallet-collective = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } +pallet-democracy = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } +pallet-membership = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } +pallet-multisig = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } +pallet-scheduler = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } +pallet-session = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } +pallet-sudo = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } +pallet-timestamp = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } +pallet-transaction-payment = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } +pallet-transaction-payment-rpc-runtime-api = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } +pallet-treasury = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } +pallet-utility = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } +sp-api = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } +sp-block-builder = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } +sp-consensus-aura = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } +sp-core = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } +sp-inherents = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } +sp-offchain = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } +sp-runtime = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } +sp-session = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } +sp-std = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } +sp-transaction-pool = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } +sp-version = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } # Polkadot dependencies -pallet-xcm = { git = 'https://github.com/paritytech/polkadot.git', branch = 'release-v0.9.9', default-features = false } -polkadot-parachain = { git = 'https://github.com/paritytech/polkadot.git', branch = 'release-v0.9.9', default-features = false } -polkadot-runtime-common = { git = 'https://github.com/paritytech/polkadot.git', branch = 'release-v0.9.9', default-features = false } -xcm = { git = 'https://github.com/paritytech/polkadot.git', branch = 'release-v0.9.9', default-features = false } -xcm-builder = { git = 'https://github.com/paritytech/polkadot.git', branch = 'release-v0.9.9', default-features = false } -xcm-executor = { git = 'https://github.com/paritytech/polkadot.git', branch = 'release-v0.9.9', default-features = false } +pallet-xcm = { git = 'https://github.com/paritytech/polkadot.git', branch = 'release-v0.9.10', default-features = false } +polkadot-parachain = { git = 'https://github.com/paritytech/polkadot.git', branch = 'release-v0.9.10', default-features = false } +polkadot-runtime-common = { git = 'https://github.com/paritytech/polkadot.git', branch = 'release-v0.9.10', default-features = false } +xcm = { git = 'https://github.com/paritytech/polkadot.git', branch = 'release-v0.9.10', default-features = false } +xcm-builder = { git = 'https://github.com/paritytech/polkadot.git', branch = 'release-v0.9.10', default-features = false } +xcm-executor = { git = 'https://github.com/paritytech/polkadot.git', branch = 'release-v0.9.10', default-features = false } # Cumulus dependencies -cumulus-pallet-aura-ext = { git = 'https://github.com/paritytech/cumulus.git', branch = 'polkadot-v0.9.9', default-features = false } -cumulus-pallet-dmp-queue = { git = 'https://github.com/paritytech/cumulus.git', branch = 'polkadot-v0.9.9', default-features = false } -cumulus-pallet-parachain-system = { git = 'https://github.com/paritytech/cumulus.git', branch = 'polkadot-v0.9.9', default-features = false } -cumulus-pallet-xcm = { git = 'https://github.com/paritytech/cumulus.git', branch = 'polkadot-v0.9.9', default-features = false } -cumulus-pallet-xcmp-queue = { git = 'https://github.com/paritytech/cumulus.git', branch = 'polkadot-v0.9.9', default-features = false } -cumulus-primitives-core = { git = 'https://github.com/paritytech/cumulus.git', branch = 'polkadot-v0.9.9', default-features = false } -cumulus-primitives-timestamp = { git = 'https://github.com/paritytech/cumulus.git', branch = 'polkadot-v0.9.9', default-features = false } -cumulus-primitives-utility = { git = 'https://github.com/paritytech/cumulus.git', branch = 'polkadot-v0.9.9', default-features = false } -pallet-collator-selection = { git = 'https://github.com/paritytech/cumulus.git', branch = 'polkadot-v0.9.9', default-features = false } -parachain-info = { git = 'https://github.com/paritytech/cumulus.git', branch = 'polkadot-v0.9.9', default-features = false } +cumulus-pallet-aura-ext = { git = 'https://github.com/paritytech/cumulus.git', branch = 'polkadot-v0.9.10', default-features = false } +cumulus-pallet-dmp-queue = { git = 'https://github.com/paritytech/cumulus.git', branch = 'polkadot-v0.9.10', default-features = false } +cumulus-pallet-parachain-system = { git = 'https://github.com/paritytech/cumulus.git', branch = 'polkadot-v0.9.10', default-features = false } +cumulus-pallet-xcm = { git = 'https://github.com/paritytech/cumulus.git', branch = 'polkadot-v0.9.10', default-features = false } +cumulus-pallet-xcmp-queue = { git = 'https://github.com/paritytech/cumulus.git', branch = 'polkadot-v0.9.10', default-features = false } +cumulus-primitives-core = { git = 'https://github.com/paritytech/cumulus.git', branch = 'polkadot-v0.9.10', default-features = false } +cumulus-primitives-timestamp = { git = 'https://github.com/paritytech/cumulus.git', branch = 'polkadot-v0.9.10', default-features = false } +cumulus-primitives-utility = { git = 'https://github.com/paritytech/cumulus.git', branch = 'polkadot-v0.9.10', default-features = false } +pallet-collator-selection = { git = 'https://github.com/paritytech/cumulus.git', branch = 'polkadot-v0.9.10', default-features = false } +parachain-info = { git = 'https://github.com/paritytech/cumulus.git', branch = 'polkadot-v0.9.10', default-features = false } # ORML dependencies -orml-oracle = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', default-features = false } -orml-oracle-rpc-runtime-api = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', default-features = false } -orml-traits = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', default-features = false } -orml-unknown-tokens = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', default-features = false } -orml-utilities = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', default-features = false } -orml-vesting = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', default-features = false } -orml-xcm = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', default-features = false } -orml-xcm-support = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', default-features = false } -orml-xtokens = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', default-features = false } +orml-oracle = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', branch = 'sw/xcm-v1', default-features = false } +orml-oracle-rpc-runtime-api = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', branch = 'sw/xcm-v1', default-features = false } +orml-traits = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', branch = 'sw/xcm-v1', default-features = false } +orml-utilities = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', branch = 'sw/xcm-v1', default-features = false } +orml-vesting = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', branch = 'sw/xcm-v1', default-features = false } +orml-xcm = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', branch = 'sw/xcm-v1', default-features = false } +orml-xcm-support = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', branch = 'sw/xcm-v1', default-features = false } +orml-xtokens = { git = 'https://github.com/open-web3-stack/open-runtime-module-library.git', branch = 'sw/xcm-v1', default-features = false } # Parallel dependencies pallet-amm = { path = '../../pallets/amm', default-features = false } @@ -99,11 +98,11 @@ pallet-router = { path = '../../pallets/router', default-features primitives = { package = 'parallel-primitives', path = '../../primitives', default-features = false } [build-dependencies.substrate-wasm-builder] -branch = 'polkadot-v0.9.9' +branch = 'polkadot-v0.9.10' git = 'https://github.com/paritytech/substrate.git' [dev-dependencies] -sp-io = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.9', default-features = false } +sp-io = { git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10', default-features = false } [features] default = ['std'] @@ -185,7 +184,6 @@ std = [ 'pallet-authorship/std', 'pallet-collator-selection/std', 'cumulus-primitives-timestamp/std', - 'orml-unknown-tokens/std', 'orml-xcm-support/std', 'orml-xtokens/std', 'orml-xcm/std', @@ -216,7 +214,6 @@ try-runtime = [ 'pallet-session/try-runtime', 'pallet-assets/try-runtime', 'pallet-authorship/try-runtime', - 'orml-unknown-tokens/try-runtime', 'orml-xtokens/try-runtime', 'orml-xcm/try-runtime', 'orml-vesting/try-runtime', diff --git a/runtime/vanilla/src/lib.rs b/runtime/vanilla/src/lib.rs index cd89275cb9..61a3289667 100644 --- a/runtime/vanilla/src/lib.rs +++ b/runtime/vanilla/src/lib.rs @@ -41,9 +41,10 @@ use orml_xcm_support::{IsNativeConcrete, MultiNativeAsset}; use polkadot_parachain::primitives::Sibling; use polkadot_runtime_common::SlowAdjustingFeeUpdate; use primitives::{ + currency::MultiCurrencyAdapter, network::HEIKO_PREFIX, tokens::{KSM, XKSM}, - *, + Index, *, }; use sp_api::impl_runtime_apis; use sp_core::{ @@ -63,13 +64,12 @@ use sp_std::prelude::*; #[cfg(feature = "std")] use sp_version::NativeVersion; use sp_version::RuntimeVersion; -use xcm::v0::{Junction, Junction::*, MultiAsset, MultiLocation, MultiLocation::*, NetworkId}; +use xcm::latest::prelude::*; use xcm_builder::{ - AccountId32Aliases, AllowTopLevelPaidExecutionFrom, EnsureXcmOrigin, - FixedRateOfConcreteFungible, FixedWeightBounds, LocationInverter, ParentAsSuperuser, - ParentIsDefault, RelayChainAsNative, SiblingParachainAsNative, SiblingParachainConvertsVia, - SignedAccountId32AsNative, SignedToAccountId32, SovereignSignedViaLocation, TakeRevenue, - TakeWeightCredit, + AccountId32Aliases, AllowTopLevelPaidExecutionFrom, EnsureXcmOrigin, FixedRateOfFungible, + FixedWeightBounds, LocationInverter, ParentAsSuperuser, ParentIsDefault, RelayChainAsNative, + SiblingParachainAsNative, SiblingParachainConvertsVia, SignedAccountId32AsNative, + SignedToAccountId32, SovereignSignedViaLocation, TakeRevenue, TakeWeightCredit, }; use xcm_executor::{Config, XcmExecutor}; @@ -100,9 +100,6 @@ pub use frame_support::{ StorageValue, }; use pallet_xcm::XcmPassthrough; -use primitives::currency::MultiCurrencyAdapter; -#[cfg(any(feature = "std", test))] -pub use sp_runtime::BuildStorage; use time::*; /// Opaque types. These are used by the CLI to instantiate machinery that don't need to know @@ -307,27 +304,33 @@ parameter_types! { } pub struct CurrencyIdConvert; -impl Convert> for CurrencyIdConvert { - fn convert(id: AssetId) -> Option { +impl Convert> for CurrencyIdConvert { + fn convert(id: CurrencyId) -> Option { match id { - KSM => Some(X1(Parent)), - XKSM => Some(X3( - Parent, - Parachain(ParachainInfo::parachain_id().into()), - GeneralKey(b"xKSM".to_vec()), + KSM => Some(MultiLocation::parent()), + XKSM => Some(MultiLocation::new( + 1, + X2( + Parachain(ParachainInfo::parachain_id().into()), + GeneralKey(b"xKSM".to_vec()), + ), )), _ => None, } } } -impl Convert> for CurrencyIdConvert { - fn convert(location: MultiLocation) -> Option { +impl Convert> for CurrencyIdConvert { + fn convert(location: MultiLocation) -> Option { match location { - X1(Parent) => Some(KSM), - X3(Parent, Parachain(id), GeneralKey(key)) - if ParaId::from(id) == ParachainInfo::parachain_id() && key == b"xKSM".to_vec() => - { + MultiLocation { + parents: 1, + interior: Here, + } => Some(KSM), + MultiLocation { + parents: 1, + interior: X2(Parachain(id), GeneralKey(key)), + } if ParaId::from(id) == ParachainInfo::parachain_id() && key == b"xKSM".to_vec() => { Some(XKSM) } _ => None, @@ -335,9 +338,13 @@ impl Convert> for CurrencyIdConvert { } } -impl Convert> for CurrencyIdConvert { - fn convert(a: MultiAsset) -> Option { - if let MultiAsset::ConcreteFungible { id, amount: _ } = a { +impl Convert> for CurrencyIdConvert { + fn convert(a: MultiAsset) -> Option { + if let MultiAsset { + id: AssetId::Concrete(id), + fun: _, + } = a + { Self::convert(id) } else { None @@ -356,24 +363,21 @@ impl Convert for AccountIdToMultiLocation { } parameter_types! { - pub SelfLocation: MultiLocation = X2(Parent, Parachain(ParachainInfo::parachain_id().into())); + pub SelfLocation: MultiLocation = MultiLocation::new(1, X1(Parachain(ParachainInfo::parachain_id().into()))); pub const BaseXcmWeight: Weight = 100_000_000; } impl orml_xtokens::Config for Runtime { type Event = Event; type Balance = Balance; - type CurrencyId = AssetId; + type CurrencyId = CurrencyId; type CurrencyIdConvert = CurrencyIdConvert; type AccountIdToMultiLocation = AccountIdToMultiLocation; type SelfLocation = SelfLocation; type XcmExecutor = XcmExecutor; type Weigher = FixedWeightBounds; type BaseXcmWeight = BaseXcmWeight; -} - -impl orml_unknown_tokens::Config for Runtime { - type Event = Event; + type LocationInverter = LocationInverter; } parameter_types! { @@ -389,7 +393,7 @@ parameter_types! { impl pallet_assets::Config for Runtime { type Event = Event; type Balance = Balance; - type AssetId = AssetId; + type AssetId = CurrencyId; type Currency = Balances; type ForceOrigin = EnsureRootOrMoreThanHalfGeneralCouncil; type AssetDeposit = AssetDeposit; @@ -415,13 +419,13 @@ impl pallet_loans::Config for Runtime { parameter_types! { pub const StakingPalletId: PalletId = PalletId(*b"par/lqsk"); - pub RelayAgent: MultiLocation = MultiLocation::X2( - Junction::Parent, - Junction::AccountId32{ + pub RelayAgent: MultiLocation = MultiLocation::new( + 1, + X1(AccountId32{ network: NetworkId::Any, // Dave id: hex!["306721211d5404bd9da88e0204360a1a9ab8b87c66c1bc2fcdd37f3c2222cc20"] - } + }) ); pub const PeriodBasis: BlockNumber = 1000u32; pub BridgeAccount: Vec = vec![hex!["306721211d5404bd9da88e0204360a1a9ab8b87c66c1bc2fcdd37f3c2222cc20"].into()]; @@ -657,7 +661,7 @@ pub type LocalOriginToLocation = (SignedToAccountId32, + cumulus_primitives_utility::ParentAsUmp, // ..and XCMP to communicate with the sibling chains. XcmpQueue, ); @@ -685,6 +689,7 @@ impl cumulus_pallet_xcmp_queue::Config for Runtime { type Event = Event; type XcmExecutor = XcmExecutor; type ChannelInfo = ParachainSystem; + type VersionWrapper = (); } impl cumulus_pallet_dmp_queue::Config for Runtime { @@ -712,11 +717,11 @@ impl cumulus_pallet_parachain_system::Config for Runtime { impl parachain_info::Config for Runtime {} parameter_types! { - pub const RelayLocation: MultiLocation = MultiLocation::X1(Junction::Parent); + pub const RelayLocation: MultiLocation = MultiLocation::parent(); pub const RelayNetwork: NetworkId = NetworkId::Kusama; pub VanillaNetwork: NetworkId = NetworkId::Named("vanilla".into()); pub RelayChainOrigin: Origin = cumulus_pallet_xcm::Origin::Relay.into(); - pub Ancestry: MultiLocation = X1(Parachain(ParachainInfo::parachain_id().into())); + pub Ancestry: MultiLocation = MultiLocation::new(0, X1(Parachain(ParachainInfo::parachain_id().into()))); } /// Type for specifying how a `MultiLocation` can be converted into an `AccountId`. This is used @@ -736,7 +741,7 @@ pub type LocalAssetTransactor = MultiCurrencyAdapter< // Use this currency: Assets, // Use this currency when it is a fungible asset matching the given location or name: - IsNativeConcrete, + IsNativeConcrete, // Our chain's account ID type (we can't get away without mentioning it explicitly): AccountId, // Do a simple punn to convert an AccountId32 MultiLocation into a native chain account ID: @@ -770,14 +775,14 @@ pub type XcmOriginToTransactDispatchOrigin = ( parameter_types! { pub UnitWeightCost: Weight = 20_000_000; - pub KsmPerSecond: (MultiLocation, u128) = (X1(Parent), ksm_per_second()); + pub KsmPerSecond: (AssetId, u128) = (AssetId::Concrete(MultiLocation::parent()), ksm_per_second()); } parameter_types! { // 1_000_000_000_000 => 1 unit of asset for 1 unit of Weight. // TODO Should take the actual weight price. This is just 1_000 KSM per second of weight. - pub const WeightPrice: (MultiLocation, u128) = (MultiLocation::X1(Junction::Parent), 1_000); - // pub AllowUnpaidFrom: Vec = vec![ MultiLocation::X1(Junction::Parent) ]; + pub const WeightPrice: (MultiLocation, u128) = (MultiLocation::parent(), 1_000); + // pub AllowUnpaidFrom: Vec = vec![ MultiLocation::parent() ]; } pub type Barrier = (TakeWeightCredit, AllowTopLevelPaidExecutionFrom); @@ -785,7 +790,11 @@ pub type Barrier = (TakeWeightCredit, AllowTopLevelPaidExecutionFrom pub struct ToTreasury; impl TakeRevenue for ToTreasury { fn take_revenue(revenue: MultiAsset) { - if let MultiAsset::ConcreteFungible { id, amount } = revenue { + if let MultiAsset { + id: AssetId::Concrete(id), + fun: Fungibility::Fungible(amount), + } = revenue + { if let Some(currency_id) = CurrencyIdConvert::convert(id) { let _ = Assets::mint_into(currency_id, &TreasuryAccount::get(), amount); } @@ -806,8 +815,9 @@ impl Config for XcmConfig { type LocationInverter = LocationInverter; type Barrier = Barrier; type Weigher = FixedWeightBounds; - type Trader = FixedRateOfConcreteFungible; + type Trader = FixedRateOfFungible; type ResponseHandler = (); // Don't handle responses for now. + type SubscriptionService = PolkadotXcm; } parameter_types! { @@ -824,7 +834,7 @@ impl orml_oracle::Config for Runtime { type CombineData = orml_oracle::DefaultCombineData; type Time = Timestamp; - type OracleKey = AssetId; + type OracleKey = CurrencyId; type OracleValue = Price; type RootOperatorAccountId = ZeroAccountId; type MaxHasDispatchedSize = MaxHasDispatchedSize; @@ -834,25 +844,25 @@ impl orml_oracle::Config for Runtime { pub type TimeStampedPrice = orml_oracle::TimestampedValue; pub struct AggregatedDataProvider; -impl DataProvider for AggregatedDataProvider { - fn get(key: &AssetId) -> Option { +impl DataProvider for AggregatedDataProvider { + fn get(key: &CurrencyId) -> Option { Oracle::get(key) } } -impl DataProviderExtended for AggregatedDataProvider { - fn get_no_op(key: &AssetId) -> Option { +impl DataProviderExtended for AggregatedDataProvider { + fn get_no_op(key: &CurrencyId) -> Option { Oracle::get_no_op(key) } - fn get_all_values() -> Vec<(AssetId, Option)> { + fn get_all_values() -> Vec<(CurrencyId, Option)> { Oracle::get_all_values() } } pub struct Decimal; impl DecimalProvider for Decimal { - fn get_decimal(asset_id: &AssetId) -> u8 { + fn get_decimal(asset_id: &CurrencyId) -> u8 { // pallet_assets::Metadata::::get(asset_id).decimals match *asset_id { KSM | XKSM => 12, @@ -1155,7 +1165,7 @@ impl pallet_router::Config for Runtime { } parameter_types! { - pub const NativeCurrencyId: AssetId = tokens::HKO; + pub const NativeCurrencyId: CurrencyId = tokens::HKO; } impl pallet_currency_adapter::Config for Runtime { @@ -1205,7 +1215,6 @@ construct_runtime!( // 3rd Party Oracle: orml_oracle::::{Pallet, Storage, Call, Event} = 42, XTokens: orml_xtokens::{Pallet, Storage, Call, Event} = 43, - UnknownTokens: orml_unknown_tokens::{Pallet, Storage, Event} = 44, OrmlXcm: orml_xcm::{Pallet, Call, Event} = 45, Vesting: orml_vesting::{Pallet, Storage, Call, Event, Config} = 46, @@ -1371,16 +1380,16 @@ impl_runtime_apis! { impl orml_oracle_rpc_runtime_api::OracleApi< Block, DataProviderId, - AssetId, + CurrencyId, TimeStampedPrice, > for Runtime { - fn get_value(provider_id: DataProviderId, key: AssetId) -> Option { + fn get_value(provider_id: DataProviderId, key: CurrencyId) -> Option { match provider_id { DataProviderId::Aggregated => Prices::get_no_op(&key) } } - fn get_all_values(provider_id: DataProviderId) -> Vec<(AssetId, Option)> { + fn get_all_values(provider_id: DataProviderId) -> Vec<(CurrencyId, Option)> { match provider_id { DataProviderId::Aggregated => Prices::get_all_values() } diff --git a/rust-toolchain b/rust-toolchain index 3f4830156c..1fbf4a40b1 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1 +1 @@ -1.53.0 +nightly-2021-07-29