From 7fd38567241e975fdf82e3d1a39f06f007d4fe31 Mon Sep 17 00:00:00 2001 From: Lumir Mrkva Date: Mon, 23 Aug 2021 23:42:00 +0200 Subject: [PATCH 01/15] updated to polkadot 0.9.9-1 --- Cargo.lock | 1980 +++++++++-------- Cargo.toml | 132 -- node/Cargo.toml | 159 +- node/src/command.rs | 8 +- node/src/rpc.rs | 13 +- node/src/service.rs | 7 +- pallets/asset-registry/Cargo.toml | 64 +- pallets/duster/Cargo.toml | 90 +- pallets/duster/src/benchmarking.rs | 2 +- pallets/duster/src/mock.rs | 3 +- pallets/exchange/Cargo.toml | 78 +- pallets/exchange/benchmarking/Cargo.toml | 80 +- pallets/exchange/benchmarking/src/lib.rs | 20 +- pallets/exchange/benchmarking/src/mock.rs | 1 + pallets/exchange/src/lib.rs | 2 +- pallets/exchange/src/mock.rs | 1 + pallets/lbp/Cargo.toml | 82 +- pallets/lbp/src/benchmarking.rs | 16 +- pallets/lbp/src/mock.rs | 1 + pallets/nft/Cargo.toml | 66 +- pallets/nft/src/benchmarking.rs | 14 +- pallets/nft/src/mock.rs | 7 + pallets/offchain-duster/Cargo.toml | 98 +- pallets/transaction-multi-payment/Cargo.toml | 88 +- .../benchmarking/Cargo.toml | 88 +- .../benchmarking/src/lib.rs | 12 +- .../benchmarking/src/mock.rs | 3 +- pallets/transaction-multi-payment/src/mock.rs | 3 +- pallets/xyk/Cargo.toml | 74 +- pallets/xyk/rpc/Cargo.toml | 50 +- pallets/xyk/rpc/runtime-api/Cargo.toml | 38 +- pallets/xyk/src/benchmarking.rs | 10 +- pallets/xyk/src/mock.rs | 1 + primitives/Cargo.toml | 48 +- runtime/Cargo.toml | 301 ++- runtime/src/lib.rs | 51 +- runtime/src/xcm.rs | 11 +- 37 files changed, 1868 insertions(+), 1834 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d822708099d..ec7e9c9e9b0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -90,12 +90,6 @@ dependencies = [ "opaque-debug 0.3.0", ] -[[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" @@ -142,9 +136,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.42" +version = "1.0.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "595d3cfa7a60d4555cb5067b99f07142a08ea778de5cf993f7b75c7d8fabc486" +checksum = "28ae2b3dec75a406790005a200b1bd89785afc02517a00ca99ecfe093ee9e6cf" [[package]] name = "approx" @@ -259,7 +253,7 @@ dependencies = [ "parking", "polling", "slab", - "socket2 0.4.0", + "socket2 0.4.1", "waker-fn", "winapi 0.3.9", ] @@ -284,9 +278,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", @@ -350,9 +344,9 @@ 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", "quote", @@ -419,9 +413,9 @@ checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" [[package]] name = "az" -version = "1.1.1" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "822d7d63e0c0260a050f6b1f0d316f5c79b9eab830aca526ed904e1011bd64ca" +checksum = "9d6dff4a1892b54d70af377bf7a17064192e822865791d812957f21e3108c325" [[package]] name = "backtrace" @@ -434,10 +428,23 @@ dependencies = [ "cfg-if 1.0.0", "libc", "miniz_oxide", - "object 0.26.0", + "object 0.26.1", "rustc-demangle", ] +[[package]] +name = "bae" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec107f431ee3d8a8e45e6dd117adab769556ef463959e77bf6a4888d5fd500cf" +dependencies = [ + "heck", + "proc-macro-error 0.4.12", + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "base-x" version = "0.2.8" @@ -464,7 +471,7 @@ checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" [[package]] name = "basilisk" -version = "3.1.0" +version = "3.2.0" dependencies = [ "basilisk-runtime", "cumulus-client-cli", @@ -511,6 +518,7 @@ dependencies = [ "sc-telemetry", "sc-tracing", "sc-transaction-pool", + "sc-transaction-pool-api", "serde", "serde_json", "sp-api", @@ -537,7 +545,7 @@ dependencies = [ [[package]] name = "basilisk-runtime" -version = "13.0.0" +version = "14.0.0" dependencies = [ "cumulus-pallet-aura-ext", "cumulus-pallet-dmp-queue", @@ -616,8 +624,8 @@ dependencies = [ "sp-transaction-pool", "sp-trie", "sp-version", - "substrate-build-script-utils 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "substrate-wasm-builder 4.0.0", + "substrate-build-script-utils", + "substrate-wasm-builder", "tracing-core", "trie-db", "xcm", @@ -637,9 +645,10 @@ dependencies = [ [[package]] name = "beefy-gadget" version = "0.1.0" -source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=polkadot-v0.9.8#55ae3329847e0bbde51c9d45991d99f444777555" +source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=polkadot-v0.9.9#f40c0ab7b327e874d5c8d699bfa5d762f1759ee0" dependencies = [ "beefy-primitives", + "fnv", "futures 0.3.16", "hex", "log", @@ -660,12 +669,13 @@ dependencies = [ "sp-utils", "substrate-prometheus-endpoint", "thiserror", + "wasm-timer", ] [[package]] name = "beefy-gadget-rpc" version = "0.1.0" -source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=polkadot-v0.9.8#55ae3329847e0bbde51c9d45991d99f444777555" +source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=polkadot-v0.9.9#f40c0ab7b327e874d5c8d699bfa5d762f1759ee0" dependencies = [ "beefy-gadget", "beefy-primitives", @@ -683,10 +693,15 @@ dependencies = [ "sp-runtime", ] +[[package]] +name = "beefy-merkle-tree" +version = "0.1.0" +source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=polkadot-v0.9.9#f40c0ab7b327e874d5c8d699bfa5d762f1759ee0" + [[package]] name = "beefy-primitives" version = "0.1.0" -source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=polkadot-v0.9.8#55ae3329847e0bbde51c9d45991d99f444777555" +source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=polkadot-v0.9.9#f40c0ab7b327e874d5c8d699bfa5d762f1759ee0" dependencies = [ "parity-scale-codec 2.2.0", "sp-api", @@ -726,9 +741,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" @@ -885,7 +900,7 @@ dependencies = [ [[package]] name = "bp-header-chain" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.8#3a10ee63c0b5703a1c802db3438ab7e01344a8ce" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" dependencies = [ "finality-grandpa", "frame-support", @@ -897,10 +912,21 @@ dependencies = [ "sp-std", ] +[[package]] +name = "bp-message-dispatch" +version = "0.1.0" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" +dependencies = [ + "bp-runtime", + "frame-support", + "parity-scale-codec 2.2.0", + "sp-std", +] + [[package]] name = "bp-messages" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.8#3a10ee63c0b5703a1c802db3438ab7e01344a8ce" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" dependencies = [ "bitvec 0.20.4", "bp-runtime", @@ -915,7 +941,7 @@ dependencies = [ [[package]] name = "bp-polkadot-core" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.8#3a10ee63c0b5703a1c802db3438ab7e01344a8ce" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" dependencies = [ "bp-messages", "bp-runtime", @@ -929,10 +955,25 @@ dependencies = [ "sp-version", ] +[[package]] +name = "bp-rialto" +version = "0.1.0" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" +dependencies = [ + "bp-messages", + "bp-runtime", + "frame-support", + "frame-system", + "sp-api", + "sp-core", + "sp-runtime", + "sp-std", +] + [[package]] name = "bp-rococo" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.8#3a10ee63c0b5703a1c802db3438ab7e01344a8ce" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" dependencies = [ "bp-messages", "bp-polkadot-core", @@ -949,7 +990,7 @@ dependencies = [ [[package]] name = "bp-runtime" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.8#3a10ee63c0b5703a1c802db3438ab7e01344a8ce" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" dependencies = [ "frame-support", "hash-db", @@ -966,7 +1007,7 @@ dependencies = [ [[package]] name = "bp-test-utils" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.8#3a10ee63c0b5703a1c802db3438ab7e01344a8ce" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" dependencies = [ "bp-header-chain", "ed25519-dalek", @@ -981,7 +1022,7 @@ dependencies = [ [[package]] name = "bp-wococo" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.8#3a10ee63c0b5703a1c802db3438ab7e01344a8ce" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" dependencies = [ "bp-messages", "bp-polkadot-core", @@ -993,6 +1034,28 @@ dependencies = [ "sp-std", ] +[[package]] +name = "bridge-runtime-common" +version = "0.1.0" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" +dependencies = [ + "bp-message-dispatch", + "bp-messages", + "bp-runtime", + "frame-support", + "hash-db", + "pallet-bridge-dispatch", + "pallet-bridge-grandpa", + "pallet-bridge-messages", + "pallet-transaction-payment", + "parity-scale-codec 2.2.0", + "sp-core", + "sp-runtime", + "sp-state-machine", + "sp-std", + "sp-trie", +] + [[package]] name = "bs58" version = "0.4.0" @@ -1107,24 +1170,11 @@ dependencies = [ [[package]] name = "cargo-platform" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0226944a63d1bf35a3b5f948dd7c59e263db83695c9e8bffc4037de02e30f1d7" -dependencies = [ - "serde", -] - -[[package]] -name = "cargo_metadata" -version = "0.12.3" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7714a157da7991e23d90686b9524b9e12e0407a108647f52e9328f4b3d51ac7f" +checksum = "cbdb825da8a5df079a43676dbe042702f1707b1109f713a01420fbb4cc71fa27" dependencies = [ - "cargo-platform", - "semver 0.11.0", - "semver-parser 0.10.2", "serde", - "serde_json", ] [[package]] @@ -1235,9 +1285,9 @@ dependencies = [ [[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", ] @@ -1469,9 +1519,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", @@ -1480,9 +1530,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", @@ -1608,7 +1658,7 @@ dependencies = [ [[package]] name = "cumulus-client-cli" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.8#ed6ba5dfb2c112c29505e856e8971da3420ce6d0" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.9#fd80849dde5c209c20a996cfcc5aaacd4666dcbe" dependencies = [ "sc-cli", "sc-service", @@ -1618,7 +1668,7 @@ dependencies = [ [[package]] name = "cumulus-client-collator" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.8#ed6ba5dfb2c112c29505e856e8971da3420ce6d0" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.9#fd80849dde5c209c20a996cfcc5aaacd4666dcbe" dependencies = [ "cumulus-client-consensus-common", "cumulus-client-network", @@ -1642,7 +1692,7 @@ dependencies = [ [[package]] name = "cumulus-client-consensus-aura" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.8#ed6ba5dfb2c112c29505e856e8971da3420ce6d0" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.9#fd80849dde5c209c20a996cfcc5aaacd4666dcbe" dependencies = [ "async-trait", "cumulus-client-consensus-common", @@ -1652,6 +1702,7 @@ dependencies = [ "parking_lot 0.10.2", "polkadot-client", "sc-client-api", + "sc-consensus", "sc-consensus-aura", "sc-consensus-slots", "sc-telemetry", @@ -1672,7 +1723,7 @@ dependencies = [ [[package]] name = "cumulus-client-consensus-common" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.8#ed6ba5dfb2c112c29505e856e8971da3420ce6d0" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.9#fd80849dde5c209c20a996cfcc5aaacd4666dcbe" dependencies = [ "async-trait", "dyn-clone", @@ -1681,6 +1732,7 @@ dependencies = [ "polkadot-primitives", "polkadot-runtime", "sc-client-api", + "sc-consensus", "sp-api", "sp-block-builder", "sp-blockchain", @@ -1696,7 +1748,7 @@ dependencies = [ [[package]] name = "cumulus-client-consensus-relay-chain" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.8#ed6ba5dfb2c112c29505e856e8971da3420ce6d0" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.9#fd80849dde5c209c20a996cfcc5aaacd4666dcbe" dependencies = [ "async-trait", "cumulus-client-consensus-common", @@ -1706,6 +1758,7 @@ dependencies = [ "parking_lot 0.10.2", "polkadot-client", "sc-client-api", + "sc-consensus", "sp-api", "sp-block-builder", "sp-blockchain", @@ -1720,7 +1773,7 @@ dependencies = [ [[package]] name = "cumulus-client-network" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.8#ed6ba5dfb2c112c29505e856e8971da3420ce6d0" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.9#fd80849dde5c209c20a996cfcc5aaacd4666dcbe" dependencies = [ "derive_more", "futures 0.3.16", @@ -1744,7 +1797,7 @@ dependencies = [ [[package]] name = "cumulus-client-pov-recovery" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.8#ed6ba5dfb2c112c29505e856e8971da3420ce6d0" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.9#fd80849dde5c209c20a996cfcc5aaacd4666dcbe" dependencies = [ "cumulus-primitives-core", "futures 0.3.16", @@ -1756,6 +1809,7 @@ dependencies = [ "polkadot-primitives", "rand 0.8.4", "sc-client-api", + "sc-consensus", "sp-api", "sp-consensus", "sp-core", @@ -1767,7 +1821,7 @@ dependencies = [ [[package]] name = "cumulus-client-service" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.8#ed6ba5dfb2c112c29505e856e8971da3420ce6d0" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.9#fd80849dde5c209c20a996cfcc5aaacd4666dcbe" dependencies = [ "cumulus-client-collator", "cumulus-client-consensus-common", @@ -1780,6 +1834,7 @@ dependencies = [ "polkadot-service", "sc-chain-spec", "sc-client-api", + "sc-consensus", "sc-consensus-babe", "sc-service", "sc-telemetry", @@ -1795,7 +1850,7 @@ dependencies = [ [[package]] name = "cumulus-pallet-aura-ext" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.8#ed6ba5dfb2c112c29505e856e8971da3420ce6d0" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.9#fd80849dde5c209c20a996cfcc5aaacd4666dcbe" dependencies = [ "frame-executive", "frame-support", @@ -1812,7 +1867,7 @@ dependencies = [ [[package]] name = "cumulus-pallet-dmp-queue" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.8#ed6ba5dfb2c112c29505e856e8971da3420ce6d0" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.9#fd80849dde5c209c20a996cfcc5aaacd4666dcbe" dependencies = [ "cumulus-primitives-core", "frame-support", @@ -1831,7 +1886,7 @@ dependencies = [ [[package]] name = "cumulus-pallet-parachain-system" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.8#ed6ba5dfb2c112c29505e856e8971da3420ce6d0" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.9#fd80849dde5c209c20a996cfcc5aaacd4666dcbe" dependencies = [ "cumulus-pallet-parachain-system-proc-macro", "cumulus-primitives-core", @@ -1859,7 +1914,7 @@ dependencies = [ [[package]] name = "cumulus-pallet-parachain-system-proc-macro" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.8#ed6ba5dfb2c112c29505e856e8971da3420ce6d0" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.9#fd80849dde5c209c20a996cfcc5aaacd4666dcbe" dependencies = [ "proc-macro-crate 1.0.0", "proc-macro2", @@ -1870,7 +1925,7 @@ dependencies = [ [[package]] name = "cumulus-pallet-xcm" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.8#ed6ba5dfb2c112c29505e856e8971da3420ce6d0" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.9#fd80849dde5c209c20a996cfcc5aaacd4666dcbe" dependencies = [ "cumulus-primitives-core", "frame-support", @@ -1886,7 +1941,7 @@ dependencies = [ [[package]] name = "cumulus-pallet-xcmp-queue" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.8#ed6ba5dfb2c112c29505e856e8971da3420ce6d0" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.9#fd80849dde5c209c20a996cfcc5aaacd4666dcbe" dependencies = [ "cumulus-primitives-core", "frame-support", @@ -1904,7 +1959,7 @@ dependencies = [ [[package]] name = "cumulus-primitives-core" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.8#ed6ba5dfb2c112c29505e856e8971da3420ce6d0" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.9#fd80849dde5c209c20a996cfcc5aaacd4666dcbe" dependencies = [ "frame-support", "impl-trait-for-tuples", @@ -1922,7 +1977,7 @@ dependencies = [ [[package]] name = "cumulus-primitives-parachain-inherent" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.8#ed6ba5dfb2c112c29505e856e8971da3420ce6d0" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.9#fd80849dde5c209c20a996cfcc5aaacd4666dcbe" dependencies = [ "async-trait", "cumulus-primitives-core", @@ -1943,7 +1998,7 @@ dependencies = [ [[package]] name = "cumulus-primitives-timestamp" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.8#ed6ba5dfb2c112c29505e856e8971da3420ce6d0" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.9#fd80849dde5c209c20a996cfcc5aaacd4666dcbe" dependencies = [ "cumulus-primitives-core", "sp-inherents", @@ -1954,7 +2009,7 @@ dependencies = [ [[package]] name = "cumulus-primitives-utility" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.8#ed6ba5dfb2c112c29505e856e8971da3420ce6d0" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.9#fd80849dde5c209c20a996cfcc5aaacd4666dcbe" dependencies = [ "cumulus-primitives-core", "frame-support", @@ -1972,7 +2027,7 @@ dependencies = [ [[package]] name = "cumulus-test-relay-sproof-builder" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.8#ed6ba5dfb2c112c29505e856e8971da3420ce6d0" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.9#fd80849dde5c209c20a996cfcc5aaacd4666dcbe" dependencies = [ "cumulus-primitives-core", "parity-scale-codec 2.2.0", @@ -1997,9 +2052,9 @@ dependencies = [ [[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", @@ -2175,7 +2230,7 @@ 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", @@ -2309,15 +2364,15 @@ dependencies = [ [[package]] name = "ethereum-types" -version = "0.11.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f64b5df66a228d85e4b17e5d6c6aa43b0310898ffe8a85988c4c032357aaabfd" +checksum = "0dd6bde671199089e601e8d47e153368b893ef885f11f365a3261ec58153c211" dependencies = [ "ethbloom", "fixed-hash", "impl-rlp", "impl-serde", - "primitive-types 0.9.1", + "primitive-types 0.10.1", "uint", ] @@ -2400,9 +2455,9 @@ dependencies = [ [[package]] name = "finality-grandpa" -version = "0.14.1" +version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74a1bfdcc776e63e49f741c7ce6116fa1b887e8ac2e3ccb14dd4aa113e54feb9" +checksum = "c832d0ed507622c7cb98e9b7f10426850fc9d38527ab8071778dcc3a81d45875" dependencies = [ "either", "futures 0.3.16", @@ -2411,13 +2466,14 @@ dependencies = [ "num-traits", "parity-scale-codec 2.2.0", "parking_lot 0.11.1", + "scale-info", ] [[package]] name = "fixed" -version = "1.9.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c97cabfe1ce0db024d64e9f688469e80a8e2b36cb792b09ba33e1ee8d21d00ae" +checksum = "6d333a26ec13a023c6dff4b7584de4d323cfee2e508f5dd2bbee6669e4f7efdf" dependencies = [ "az", "bytemuck", @@ -2465,7 +2521,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "fork-tree" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "parity-scale-codec 2.2.0", ] @@ -2482,8 +2538,8 @@ dependencies = [ [[package]] name = "frame-benchmarking" -version = "3.1.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "frame-support", "frame-system", @@ -2501,13 +2557,16 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "Inflector", "chrono", "frame-benchmarking", + "frame-support", "handlebars", + "linked-hash-map", + "log", "parity-scale-codec 2.2.0", "sc-cli", "sc-client-db", @@ -2524,8 +2583,8 @@ dependencies = [ [[package]] name = "frame-election-provider-support" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "frame-support", "frame-system", @@ -2537,8 +2596,8 @@ dependencies = [ [[package]] name = "frame-executive" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "frame-support", "frame-system", @@ -2552,8 +2611,8 @@ dependencies = [ [[package]] name = "frame-metadata" -version = "13.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "14.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "parity-scale-codec 2.2.0", "serde", @@ -2563,15 +2622,14 @@ dependencies = [ [[package]] name = "frame-support" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "bitflags", "frame-metadata", "frame-support-procedural", "impl-trait-for-tuples", "log", - "max-encoded-len", "once_cell", "parity-scale-codec 2.2.0", "paste", @@ -2590,8 +2648,8 @@ dependencies = [ [[package]] name = "frame-support-procedural" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "Inflector", "frame-support-procedural-tools", @@ -2602,8 +2660,8 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate 1.0.0", @@ -2615,7 +2673,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "proc-macro2", "quote", @@ -2624,8 +2682,8 @@ dependencies = [ [[package]] name = "frame-system" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "frame-support", "impl-trait-for-tuples", @@ -2641,8 +2699,8 @@ dependencies = [ [[package]] name = "frame-system-benchmarking" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "frame-benchmarking", "frame-support", @@ -2655,8 +2713,8 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "parity-scale-codec 2.2.0", "sp-api", @@ -2664,8 +2722,8 @@ dependencies = [ [[package]] name = "frame-try-runtime" -version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "frame-support", "parity-scale-codec 2.2.0", @@ -3081,22 +3139,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]] @@ -3166,6 +3215,17 @@ dependencies = [ "hmac 0.7.1", ] +[[package]] +name = "hmac-drbg" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17ea0a1394df5b6574da6e0c1ade9e78868c9fb0a4e5ef4428e32da4676b85b1" +dependencies = [ + "digest 0.9.0", + "generic-array 0.14.4", + "hmac 0.8.1", +] + [[package]] name = "hostname" version = "0.3.1" @@ -3223,9 +3283,9 @@ dependencies = [ [[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", @@ -3234,9 +3294,9 @@ dependencies = [ [[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" @@ -3268,7 +3328,7 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hydra-dx-build-script-utils" version = "1.0.0" -source = "git+https://github.com/galacticcouncil/HydraDX-node?branch=master#d1298bd429c4bb441e5a46e6a569469d5dbed5d5" +source = "git+https://github.com/galacticcouncil/HydraDX-node?branch=master#eb67e1e8692fbdf15b953c4b349c93a9a320fb97" dependencies = [ "cargo-lock", "platforms", @@ -3351,12 +3411,12 @@ dependencies = [ "futures-core", "futures-util", "http 0.2.4", - "http-body 0.4.2", + "http-body 0.4.3", "httparse", "httpdate 1.0.1", "itoa", "pin-project-lite 0.2.7", - "tokio 1.9.0", + "tokio 1.10.0", "tower-service", "tracing", "want 0.3.0", @@ -3493,7 +3553,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc633605454125dec4b66843673f01c7df2b89479b32e0ed634e43a91cff62a5" dependencies = [ "autocfg", - "hashbrown 0.11.2", + "hashbrown", "serde", ] @@ -3584,24 +3644,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.53" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83bdfbace3a0e81a4253f73b49e960b053e396a11012cbd49b9b74d6a2b67062" +checksum = "e4bf49d50e2961077d9c99f4b7997d770a1114f087c3c2e0069b36c13fc2979d" dependencies = [ "wasm-bindgen", ] @@ -3730,11 +3790,12 @@ dependencies = [ [[package]] name = "jsonrpsee-proc-macros" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b4c85cfa6767333f3e5f3b2f2f765dad2727b0033ee270ae07c599bf43ed5ae" +checksum = "f37924e16300e249a52a22cabb5632f846dc9760b39355f5e8bc70cd23dc6300" dependencies = [ "Inflector", + "bae", "proc-macro-crate 1.0.0", "proc-macro2", "quote", @@ -3743,9 +3804,9 @@ dependencies = [ [[package]] name = "jsonrpsee-types" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0cf7bd4e93b3b56e59131de7f24afbea871faf914e97bcdd942c86927ab0172" +checksum = "d67724d368c59e08b557a516cf8fcc51100e7a708850f502e1044b151fe89788" dependencies = [ "async-trait", "beef", @@ -3755,15 +3816,15 @@ dependencies = [ "log", "serde", "serde_json", - "soketto 0.5.0", + "soketto 0.6.0", "thiserror", ] [[package]] name = "jsonrpsee-ws-client" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ec51150965544e1a4468f372bdab8545243a1b045d4ab272023aac74c60de32" +checksum = "8e2834b6e7f57ce9a4412ed4d6dc95125d2c8612e68f86b9d9a07369164e4198" dependencies = [ "async-trait", "fnv", @@ -3775,7 +3836,7 @@ dependencies = [ "rustls-native-certs 0.5.0", "serde", "serde_json", - "soketto 0.5.0", + "soketto 0.6.0", "thiserror", "tokio 0.2.25", "tokio-rustls 0.15.0", @@ -3801,8 +3862,8 @@ dependencies = [ [[package]] name = "kusama-runtime" -version = "0.9.8" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.8#3a10ee63c0b5703a1c802db3438ab7e01344a8ce" +version = "0.9.9-1" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" dependencies = [ "beefy-primitives", "bitvec 0.20.4", @@ -3816,7 +3877,6 @@ dependencies = [ "frame-try-runtime", "hex-literal", "log", - "max-encoded-len", "pallet-authority-discovery", "pallet-authorship", "pallet-babe", @@ -3878,7 +3938,7 @@ dependencies = [ "sp-transaction-pool", "sp-version", "static_assertions", - "substrate-wasm-builder 4.0.0", + "substrate-wasm-builder", "xcm", "xcm-builder", "xcm-executor", @@ -3895,9 +3955,9 @@ dependencies = [ [[package]] name = "kvdb" -version = "0.9.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8891bd853eff90e33024195d79d578dc984c82f9e0715fcd2b525a0c19d52811" +checksum = "45a3f58dc069ec0e205a27f5b45920722a46faed802a0541538241af6228f512" dependencies = [ "parity-util-mem", "smallvec 1.6.1", @@ -3905,9 +3965,9 @@ dependencies = [ [[package]] name = "kvdb-memorydb" -version = "0.9.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30a0da8e08caf08d384a620ec19bb6c9b85c84137248e202617fb91881f25912" +checksum = "c3b6b85fc643f5acd0bffb2cc8a6d150209379267af0d41db72170021841f9f5" dependencies = [ "kvdb", "parity-util-mem", @@ -3916,9 +3976,9 @@ dependencies = [ [[package]] name = "kvdb-rocksdb" -version = "0.11.1" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94b27cdb788bf1c8ade782289f9dbee626940be2961fd75c7cde993fa2f1ded1" +checksum = "0d169dbb316aa0fa185d02d847c047f1aa20e292cf1563d790c13536a2a732c8" dependencies = [ "fs-swap", "kvdb", @@ -3947,17 +4007,11 @@ version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" -[[package]] -name = "leb128" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3576a87f2ba00f6f106fdfcd16db1d698d648a26ad8e0573cad8537c3c362d2a" - [[package]] name = "libc" -version = "0.2.98" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "320cfe77175da3a483efed4bc0adc1968ca050b098ce4f2f1c13a56626128790" +checksum = "a1fa8cddc8fbbee11227ef194b5317ed014b8acbf15139bd716a18ad3fe99ec5" [[package]] name = "libloading" @@ -4038,7 +4092,7 @@ dependencies = [ "futures 0.3.16", "futures-timer 3.0.2", "lazy_static", - "libsecp256k1", + "libsecp256k1 0.3.5", "log", "multihash", "multistream-select", @@ -4186,7 +4240,7 @@ dependencies = [ "log", "rand 0.8.4", "smallvec 1.6.1", - "socket2 0.4.0", + "socket2 0.4.1", "void", ] @@ -4215,7 +4269,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "36db0f0db3b0433f5b9463f1c0cd9eadc0a3734a9170439ce501ff99733a88bd" dependencies = [ "bytes 1.0.1", - "curve25519-dalek 3.1.0", + "curve25519-dalek 3.2.0", "futures 0.3.16", "lazy_static", "libp2p-core", @@ -4359,7 +4413,7 @@ dependencies = [ "libc", "libp2p-core", "log", - "socket2 0.4.0", + "socket2 0.4.1", ] [[package]] @@ -4440,13 +4494,61 @@ dependencies = [ "arrayref", "crunchy", "digest 0.8.1", - "hmac-drbg", + "hmac-drbg 0.2.0", "rand 0.7.3", "sha2 0.8.2", "subtle 2.4.1", "typenum", ] +[[package]] +name = "libsecp256k1" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9d220bc1feda2ac231cb78c3d26f27676b8cf82c96971f7aeef3d0cf2797c73" +dependencies = [ + "arrayref", + "base64 0.12.3", + "digest 0.9.0", + "hmac-drbg 0.3.0", + "libsecp256k1-core", + "libsecp256k1-gen-ecmult", + "libsecp256k1-gen-genmult", + "rand 0.7.3", + "serde", + "sha2 0.9.5", + "typenum", +] + +[[package]] +name = "libsecp256k1-core" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0f6ab710cec28cef759c5f18671a27dae2a5f952cdaaee1d8e2908cb2478a80" +dependencies = [ + "crunchy", + "digest 0.9.0", + "subtle 2.4.1", +] + +[[package]] +name = "libsecp256k1-gen-ecmult" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccab96b584d38fac86a83f07e659f0deafd0253dc096dab5a36d53efe653c5c3" +dependencies = [ + "libsecp256k1-core", +] + +[[package]] +name = "libsecp256k1-gen-genmult" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67abfe149395e3aa1c48a2beb32b068e2334402df8181f818d3aee2b304c4f5d" +dependencies = [ + "libsecp256k1-core", +] + [[package]] name = "libz-sys" version = "1.1.3" @@ -4513,11 +4615,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]] @@ -4561,9 +4663,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" @@ -4574,28 +4676,6 @@ dependencies = [ "rawpointer", ] -[[package]] -name = "max-encoded-len" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" -dependencies = [ - "impl-trait-for-tuples", - "max-encoded-len-derive", - "parity-scale-codec 2.2.0", - "primitive-types 0.9.1", -] - -[[package]] -name = "max-encoded-len-derive" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" -dependencies = [ - "proc-macro-crate 1.0.0", - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "maybe-uninit" version = "2.0.0" @@ -4604,9 +4684,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" @@ -4637,12 +4717,12 @@ dependencies = [ [[package]] name = "memory-db" -version = "0.26.0" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "814bbecfc0451fc314eeea34f05bbcd5b98a7ad7af37faee088b86a1e633f1d4" +checksum = "de006e09d04fc301a5f7e817b75aa49801c4479a8af753764416b085337ddcc5" dependencies = [ "hash-db", - "hashbrown 0.9.1", + "hashbrown", "parity-util-mem", ] @@ -4675,8 +4755,8 @@ dependencies = [ [[package]] name = "metered-channel" -version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.8#3a10ee63c0b5703a1c802db3438ab7e01344a8ce" +version = "0.9.9-1" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" dependencies = [ "derive_more", "futures 0.3.16", @@ -4840,7 +4920,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "424f6e86263cd5294cbd7f1e95746b95aca0e0d66bff31e5a40d6baa87b4aa99" dependencies = [ "proc-macro-crate 1.0.0", - "proc-macro-error", + "proc-macro-error 1.0.4", "proc-macro2", "quote", "syn", @@ -5025,9 +5105,9 @@ dependencies = [ [[package]] name = "object" -version = "0.26.0" +version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c55827317fb4c08822499848a14237d2874d6f139828893017237e7ab93eb386" +checksum = "ee2766204889d09937d00bfbb7fec56bb2a199e2ade963cab19185d8a6104c7c" dependencies = [ "memchr", ] @@ -5071,7 +5151,7 @@ dependencies = [ [[package]] name = "orml-currencies" version = "0.4.1-dev" -source = "git+https://github.com/open-web3-stack/open-runtime-module-library?rev=33d9ac0927ba61e15763ee438721ef92d408271a#33d9ac0927ba61e15763ee438721ef92d408271a" +source = "git+https://github.com/open-web3-stack/open-runtime-module-library?rev=8d5432c3458702a7df14b374bddde43a2a20aa43#8d5432c3458702a7df14b374bddde43a2a20aa43" dependencies = [ "frame-support", "frame-system", @@ -5086,13 +5166,11 @@ dependencies = [ [[package]] name = "orml-nft" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6b52928f5bb44f1b87dee2a4bf10356475c79d8a97ab33042aa111d25ba3b5c" +version = "0.4.1-dev" +source = "git+https://github.com/open-web3-stack/open-runtime-module-library?rev=8d5432c3458702a7df14b374bddde43a2a20aa43#8d5432c3458702a7df14b374bddde43a2a20aa43" dependencies = [ "frame-support", "frame-system", - "funty", "parity-scale-codec 2.2.0", "serde", "sp-runtime", @@ -5102,11 +5180,10 @@ dependencies = [ [[package]] name = "orml-tokens" version = "0.4.1-dev" -source = "git+https://github.com/open-web3-stack/open-runtime-module-library?rev=33d9ac0927ba61e15763ee438721ef92d408271a#33d9ac0927ba61e15763ee438721ef92d408271a" +source = "git+https://github.com/open-web3-stack/open-runtime-module-library?rev=8d5432c3458702a7df14b374bddde43a2a20aa43#8d5432c3458702a7df14b374bddde43a2a20aa43" dependencies = [ "frame-support", "frame-system", - "max-encoded-len", "orml-traits", "parity-scale-codec 2.2.0", "serde", @@ -5117,7 +5194,7 @@ dependencies = [ [[package]] name = "orml-traits" version = "0.4.1-dev" -source = "git+https://github.com/open-web3-stack/open-runtime-module-library?rev=33d9ac0927ba61e15763ee438721ef92d408271a#33d9ac0927ba61e15763ee438721ef92d408271a" +source = "git+https://github.com/open-web3-stack/open-runtime-module-library?rev=8d5432c3458702a7df14b374bddde43a2a20aa43#8d5432c3458702a7df14b374bddde43a2a20aa43" dependencies = [ "frame-support", "impl-trait-for-tuples", @@ -5134,7 +5211,7 @@ dependencies = [ [[package]] name = "orml-unknown-tokens" version = "0.4.1-dev" -source = "git+https://github.com/open-web3-stack/open-runtime-module-library?rev=33d9ac0927ba61e15763ee438721ef92d408271a#33d9ac0927ba61e15763ee438721ef92d408271a" +source = "git+https://github.com/open-web3-stack/open-runtime-module-library?rev=8d5432c3458702a7df14b374bddde43a2a20aa43#8d5432c3458702a7df14b374bddde43a2a20aa43" dependencies = [ "frame-support", "frame-system", @@ -5148,7 +5225,7 @@ dependencies = [ [[package]] name = "orml-utilities" version = "0.4.1-dev" -source = "git+https://github.com/open-web3-stack/open-runtime-module-library?rev=33d9ac0927ba61e15763ee438721ef92d408271a#33d9ac0927ba61e15763ee438721ef92d408271a" +source = "git+https://github.com/open-web3-stack/open-runtime-module-library?rev=8d5432c3458702a7df14b374bddde43a2a20aa43#8d5432c3458702a7df14b374bddde43a2a20aa43" dependencies = [ "frame-support", "parity-scale-codec 2.2.0", @@ -5161,11 +5238,10 @@ dependencies = [ [[package]] name = "orml-vesting" version = "0.4.1-dev" -source = "git+https://github.com/open-web3-stack/open-runtime-module-library?rev=33d9ac0927ba61e15763ee438721ef92d408271a#33d9ac0927ba61e15763ee438721ef92d408271a" +source = "git+https://github.com/open-web3-stack/open-runtime-module-library?rev=8d5432c3458702a7df14b374bddde43a2a20aa43#8d5432c3458702a7df14b374bddde43a2a20aa43" dependencies = [ "frame-support", "frame-system", - "max-encoded-len", "parity-scale-codec 2.2.0", "serde", "sp-io", @@ -5176,7 +5252,7 @@ dependencies = [ [[package]] name = "orml-xcm-support" version = "0.4.1-dev" -source = "git+https://github.com/open-web3-stack/open-runtime-module-library?rev=33d9ac0927ba61e15763ee438721ef92d408271a#33d9ac0927ba61e15763ee438721ef92d408271a" +source = "git+https://github.com/open-web3-stack/open-runtime-module-library?rev=8d5432c3458702a7df14b374bddde43a2a20aa43#8d5432c3458702a7df14b374bddde43a2a20aa43" dependencies = [ "frame-support", "orml-traits", @@ -5190,7 +5266,7 @@ dependencies = [ [[package]] name = "orml-xtokens" version = "0.4.1-dev" -source = "git+https://github.com/open-web3-stack/open-runtime-module-library?rev=33d9ac0927ba61e15763ee438721ef92d408271a#33d9ac0927ba61e15763ee438721ef92d408271a" +source = "git+https://github.com/open-web3-stack/open-runtime-module-library?rev=8d5432c3458702a7df14b374bddde43a2a20aa43#8d5432c3458702a7df14b374bddde43a2a20aa43" dependencies = [ "cumulus-primitives-core", "frame-support", @@ -5229,13 +5305,13 @@ dependencies = [ "sp-io", "sp-runtime", "sp-std", - "substrate-wasm-builder 4.0.0", + "substrate-wasm-builder", ] [[package]] name = "pallet-aura" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "frame-support", "frame-system", @@ -5250,8 +5326,8 @@ dependencies = [ [[package]] name = "pallet-authority-discovery" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "frame-support", "frame-system", @@ -5265,8 +5341,8 @@ dependencies = [ [[package]] name = "pallet-authorship" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "frame-support", "frame-system", @@ -5279,8 +5355,8 @@ dependencies = [ [[package]] name = "pallet-babe" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "frame-benchmarking", "frame-support", @@ -5302,14 +5378,13 @@ dependencies = [ [[package]] name = "pallet-balances" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", "log", - "max-encoded-len", "parity-scale-codec 2.2.0", "sp-runtime", "sp-std", @@ -5318,22 +5393,48 @@ dependencies = [ [[package]] name = "pallet-beefy" version = "0.1.0" -source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=polkadot-v0.9.8#55ae3329847e0bbde51c9d45991d99f444777555" +source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=polkadot-v0.9.9#f40c0ab7b327e874d5c8d699bfa5d762f1759ee0" +dependencies = [ + "beefy-primitives", + "frame-support", + "frame-system", + "pallet-session", + "parity-scale-codec 2.2.0", + "scale-info", + "serde", + "sp-runtime", + "sp-std", +] + +[[package]] +name = "pallet-beefy-mmr" +version = "0.1.0" +source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=polkadot-v0.9.9#f40c0ab7b327e874d5c8d699bfa5d762f1759ee0" dependencies = [ + "beefy-merkle-tree", "beefy-primitives", "frame-support", "frame-system", + "hex", + "libsecp256k1 0.6.0", + "log", + "pallet-beefy", + "pallet-mmr", + "pallet-mmr-primitives", "pallet-session", "parity-scale-codec 2.2.0", + "scale-info", "serde", + "sp-core", + "sp-io", "sp-runtime", "sp-std", ] [[package]] name = "pallet-bounties" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "frame-benchmarking", "frame-support", @@ -5344,10 +5445,26 @@ dependencies = [ "sp-std", ] +[[package]] +name = "pallet-bridge-dispatch" +version = "0.1.0" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" +dependencies = [ + "bp-message-dispatch", + "bp-runtime", + "frame-support", + "frame-system", + "log", + "parity-scale-codec 2.2.0", + "sp-core", + "sp-runtime", + "sp-std", +] + [[package]] name = "pallet-bridge-grandpa" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.8#3a10ee63c0b5703a1c802db3438ab7e01344a8ce" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" dependencies = [ "bp-header-chain", "bp-runtime", @@ -5366,16 +5483,37 @@ dependencies = [ ] [[package]] -name = "pallet-collator-selection" -version = "3.0.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.8#ed6ba5dfb2c112c29505e856e8971da3420ce6d0" +name = "pallet-bridge-messages" +version = "0.1.0" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" dependencies = [ - "frame-benchmarking", + "bitvec 0.20.4", + "bp-message-dispatch", + "bp-messages", + "bp-rialto", + "bp-runtime", "frame-support", "frame-system", "log", - "pallet-authorship", - "pallet-session", + "num-traits", + "parity-scale-codec 2.2.0", + "serde", + "sp-core", + "sp-runtime", + "sp-std", +] + +[[package]] +name = "pallet-collator-selection" +version = "3.0.0" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.9#fd80849dde5c209c20a996cfcc5aaacd4666dcbe" +dependencies = [ + "frame-benchmarking", + "frame-support", + "frame-system", + "log", + "pallet-authorship", + "pallet-session", "parity-scale-codec 2.2.0", "serde", "sp-runtime", @@ -5385,8 +5523,8 @@ dependencies = [ [[package]] name = "pallet-collective" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "frame-benchmarking", "frame-support", @@ -5401,8 +5539,8 @@ dependencies = [ [[package]] name = "pallet-democracy" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "frame-benchmarking", "frame-support", @@ -5434,13 +5572,13 @@ dependencies = [ "sp-io", "sp-runtime", "sp-std", - "substrate-wasm-builder 3.0.0", + "substrate-wasm-builder", ] [[package]] name = "pallet-election-provider-multi-phase" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5460,8 +5598,8 @@ dependencies = [ [[package]] name = "pallet-elections-phragmen" -version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "5.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "frame-benchmarking", "frame-support", @@ -5477,7 +5615,7 @@ dependencies = [ [[package]] name = "pallet-exchange" -version = "4.0.1" +version = "4.1.0" dependencies = [ "frame-support", "frame-system", @@ -5493,7 +5631,7 @@ dependencies = [ "sp-io", "sp-runtime", "sp-std", - "substrate-wasm-builder 4.0.0", + "substrate-wasm-builder", ] [[package]] @@ -5516,13 +5654,13 @@ dependencies = [ "sp-io", "sp-runtime", "sp-std", - "substrate-wasm-builder 4.0.0", + "substrate-wasm-builder", ] [[package]] name = "pallet-gilt" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "frame-benchmarking", "frame-support", @@ -5535,8 +5673,8 @@ dependencies = [ [[package]] name = "pallet-grandpa" -version = "3.1.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "frame-benchmarking", "frame-support", @@ -5557,8 +5695,8 @@ dependencies = [ [[package]] name = "pallet-identity" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "enumflags2", "frame-benchmarking", @@ -5572,8 +5710,8 @@ dependencies = [ [[package]] name = "pallet-im-online" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "frame-benchmarking", "frame-support", @@ -5591,8 +5729,8 @@ dependencies = [ [[package]] name = "pallet-indices" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "frame-benchmarking", "frame-support", @@ -5624,13 +5762,13 @@ dependencies = [ "sp-io", "sp-runtime", "sp-std", - "substrate-wasm-builder-runner", + "substrate-wasm-builder", ] [[package]] name = "pallet-membership" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "frame-benchmarking", "frame-support", @@ -5644,8 +5782,8 @@ dependencies = [ [[package]] name = "pallet-mmr" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "ckb-merkle-mountain-range", "frame-benchmarking", @@ -5661,8 +5799,8 @@ dependencies = [ [[package]] name = "pallet-mmr-primitives" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "frame-support", "frame-system", @@ -5678,7 +5816,7 @@ dependencies = [ [[package]] name = "pallet-mmr-rpc" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -5717,13 +5855,13 @@ dependencies = [ "sp-io", "sp-runtime", "sp-std", - "substrate-wasm-builder 4.0.0", + "substrate-wasm-builder", ] [[package]] name = "pallet-multisig" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "frame-benchmarking", "frame-support", @@ -5756,8 +5894,8 @@ dependencies = [ [[package]] name = "pallet-nicks" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "frame-support", "frame-system", @@ -5769,8 +5907,8 @@ dependencies = [ [[package]] name = "pallet-offences" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "frame-support", "frame-system", @@ -5785,8 +5923,8 @@ dependencies = [ [[package]] name = "pallet-offences-benchmarking" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5807,13 +5945,12 @@ dependencies = [ [[package]] name = "pallet-proxy" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", - "max-encoded-len", "parity-scale-codec 2.2.0", "sp-core", "sp-io", @@ -5823,8 +5960,8 @@ dependencies = [ [[package]] name = "pallet-randomness-collective-flip" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "frame-support", "frame-system", @@ -5836,8 +5973,8 @@ dependencies = [ [[package]] name = "pallet-recovery" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "enumflags2", "frame-support", @@ -5850,8 +5987,8 @@ dependencies = [ [[package]] name = "pallet-scheduler" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "frame-benchmarking", "frame-support", @@ -5865,8 +6002,8 @@ dependencies = [ [[package]] name = "pallet-session" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "frame-support", "frame-system", @@ -5885,8 +6022,8 @@ dependencies = [ [[package]] name = "pallet-session-benchmarking" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "frame-benchmarking", "frame-support", @@ -5901,8 +6038,8 @@ dependencies = [ [[package]] name = "pallet-society" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "frame-support", "frame-system", @@ -5914,8 +6051,8 @@ dependencies = [ [[package]] name = "pallet-staking" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5938,8 +6075,8 @@ dependencies = [ [[package]] name = "pallet-staking-reward-curve" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "proc-macro-crate 1.0.0", "proc-macro2", @@ -5949,8 +6086,8 @@ dependencies = [ [[package]] name = "pallet-staking-reward-fn" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "log", "sp-arithmetic", @@ -5958,8 +6095,8 @@ dependencies = [ [[package]] name = "pallet-sudo" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "frame-support", "frame-system", @@ -5971,8 +6108,8 @@ dependencies = [ [[package]] name = "pallet-timestamp" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "frame-benchmarking", "frame-support", @@ -5989,8 +6126,8 @@ dependencies = [ [[package]] name = "pallet-tips" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "frame-benchmarking", "frame-support", @@ -6025,13 +6162,13 @@ dependencies = [ "sp-io", "sp-runtime", "sp-std", - "substrate-wasm-builder 4.0.0", + "substrate-wasm-builder", ] [[package]] name = "pallet-transaction-payment" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "frame-support", "frame-system", @@ -6046,8 +6183,8 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -6063,8 +6200,8 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "pallet-transaction-payment", "parity-scale-codec 2.2.0", @@ -6074,8 +6211,8 @@ dependencies = [ [[package]] name = "pallet-treasury" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "frame-benchmarking", "frame-support", @@ -6090,8 +6227,8 @@ dependencies = [ [[package]] name = "pallet-utility" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "frame-benchmarking", "frame-support", @@ -6105,8 +6242,8 @@ dependencies = [ [[package]] name = "pallet-vesting" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "enumflags2", "frame-benchmarking", @@ -6119,11 +6256,12 @@ dependencies = [ [[package]] name = "pallet-xcm" -version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.8#3a10ee63c0b5703a1c802db3438ab7e01344a8ce" +version = "0.9.9-1" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" dependencies = [ "frame-support", "frame-system", + "log", "parity-scale-codec 2.2.0", "serde", "sp-runtime", @@ -6153,7 +6291,7 @@ dependencies = [ "sp-io", "sp-runtime", "sp-std", - "substrate-wasm-builder 4.0.0", + "substrate-wasm-builder", ] [[package]] @@ -6170,7 +6308,7 @@ dependencies = [ "sp-blockchain", "sp-runtime", "sp-std", - "substrate-wasm-builder 4.0.0", + "substrate-wasm-builder", ] [[package]] @@ -6182,13 +6320,13 @@ dependencies = [ "sp-api", "sp-runtime", "sp-std", - "substrate-wasm-builder 4.0.0", + "substrate-wasm-builder", ] [[package]] name = "parachain-info" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.8#ed6ba5dfb2c112c29505e856e8971da3420ce6d0" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.9#fd80849dde5c209c20a996cfcc5aaacd4666dcbe" dependencies = [ "cumulus-primitives-core", "frame-support", @@ -6297,18 +6435,18 @@ dependencies = [ [[package]] name = "parity-util-mem" -version = "0.9.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "664a8c6b8e62d8f9f2f937e391982eb433ab285b4cd9545b342441e04a906e42" +checksum = "7ad6f1acec69b95caf435bbd158d486e5a0a44fcf51531e84922c59ff09e8457" dependencies = [ "cfg-if 1.0.0", "ethereum-types", - "hashbrown 0.9.1", + "hashbrown", "impl-trait-for-tuples", "lru", "parity-util-mem-derive", "parking_lot 0.11.1", - "primitive-types 0.9.1", + "primitive-types 0.10.1", "smallvec 1.6.1", "winapi 0.3.9", ] @@ -6433,7 +6571,7 @@ 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", ] @@ -6612,8 +6750,8 @@ checksum = "989d43012e2ca1c4a02507c67282691a0a3207f9dc67cec596b43fe925b3d325" [[package]] name = "polkadot-approval-distribution" -version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.8#3a10ee63c0b5703a1c802db3438ab7e01344a8ce" +version = "0.9.9-1" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" dependencies = [ "futures 0.3.16", "polkadot-node-network-protocol", @@ -6626,8 +6764,8 @@ dependencies = [ [[package]] name = "polkadot-availability-bitfield-distribution" -version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.8#3a10ee63c0b5703a1c802db3438ab7e01344a8ce" +version = "0.9.9-1" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" dependencies = [ "futures 0.3.16", "polkadot-node-network-protocol", @@ -6639,8 +6777,8 @@ dependencies = [ [[package]] name = "polkadot-availability-distribution" -version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.8#3a10ee63c0b5703a1c802db3438ab7e01344a8ce" +version = "0.9.9-1" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" dependencies = [ "futures 0.3.16", "lru", @@ -6662,8 +6800,8 @@ dependencies = [ [[package]] name = "polkadot-availability-recovery" -version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.8#3a10ee63c0b5703a1c802db3438ab7e01344a8ce" +version = "0.9.9-1" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" dependencies = [ "futures 0.3.16", "lru", @@ -6681,8 +6819,8 @@ dependencies = [ [[package]] name = "polkadot-cli" -version = "0.9.8" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.8#3a10ee63c0b5703a1c802db3438ab7e01344a8ce" +version = "0.9.9-1" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" dependencies = [ "frame-benchmarking-cli", "futures 0.3.16", @@ -6694,15 +6832,15 @@ dependencies = [ "sp-core", "sp-trie", "structopt", - "substrate-build-script-utils 3.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8)", + "substrate-build-script-utils", "thiserror", "try-runtime-cli", ] [[package]] name = "polkadot-client" -version = "0.9.8" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.8#3a10ee63c0b5703a1c802db3438ab7e01344a8ce" +version = "0.9.9-1" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" dependencies = [ "beefy-primitives", "frame-benchmarking", @@ -6712,6 +6850,7 @@ dependencies = [ "polkadot-primitives", "polkadot-runtime", "sc-client-api", + "sc-consensus", "sc-executor", "sc-service", "sp-api", @@ -6730,8 +6869,8 @@ dependencies = [ [[package]] name = "polkadot-collator-protocol" -version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.8#3a10ee63c0b5703a1c802db3438ab7e01344a8ce" +version = "0.9.9-1" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" dependencies = [ "always-assert", "futures 0.3.16", @@ -6750,8 +6889,8 @@ dependencies = [ [[package]] name = "polkadot-core-primitives" -version = "0.9.8" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.8#3a10ee63c0b5703a1c802db3438ab7e01344a8ce" +version = "0.9.9-1" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" dependencies = [ "parity-scale-codec 2.2.0", "parity-util-mem", @@ -6760,10 +6899,34 @@ dependencies = [ "sp-std", ] +[[package]] +name = "polkadot-dispute-distribution" +version = "0.9.9-1" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" +dependencies = [ + "futures 0.3.16", + "lru", + "parity-scale-codec 2.2.0", + "polkadot-erasure-coding", + "polkadot-node-core-runtime-api", + "polkadot-node-network-protocol", + "polkadot-node-primitives", + "polkadot-node-subsystem", + "polkadot-node-subsystem-util", + "polkadot-primitives", + "rand 0.8.4", + "sc-network", + "sp-application-crypto", + "sp-core", + "sp-keystore", + "thiserror", + "tracing", +] + [[package]] name = "polkadot-erasure-coding" -version = "0.9.8" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.8#3a10ee63c0b5703a1c802db3438ab7e01344a8ce" +version = "0.9.9-1" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" dependencies = [ "parity-scale-codec 2.2.0", "polkadot-node-primitives", @@ -6776,8 +6939,8 @@ dependencies = [ [[package]] name = "polkadot-gossip-support" -version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.8#3a10ee63c0b5703a1c802db3438ab7e01344a8ce" +version = "0.9.9-1" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" dependencies = [ "futures 0.3.16", "polkadot-node-network-protocol", @@ -6794,8 +6957,8 @@ dependencies = [ [[package]] name = "polkadot-network-bridge" -version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.8#3a10ee63c0b5703a1c802db3438ab7e01344a8ce" +version = "0.9.9-1" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" dependencies = [ "async-trait", "futures 0.3.16", @@ -6804,8 +6967,8 @@ dependencies = [ "polkadot-node-network-protocol", "polkadot-node-subsystem", "polkadot-node-subsystem-util", + "polkadot-overseer", "polkadot-primitives", - "sc-authority-discovery", "sc-network", "sp-consensus", "strum", @@ -6814,8 +6977,8 @@ dependencies = [ [[package]] name = "polkadot-node-collation-generation" -version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.8#3a10ee63c0b5703a1c802db3438ab7e01344a8ce" +version = "0.9.9-1" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" dependencies = [ "futures 0.3.16", "parity-scale-codec 2.2.0", @@ -6832,8 +6995,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-approval-voting" -version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.8#3a10ee63c0b5703a1c802db3438ab7e01344a8ce" +version = "0.9.9-1" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" dependencies = [ "bitvec 0.20.4", "derive_more", @@ -6862,8 +7025,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-av-store" -version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.8#3a10ee63c0b5703a1c802db3438ab7e01344a8ce" +version = "0.9.9-1" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" dependencies = [ "bitvec 0.20.4", "futures 0.3.16", @@ -6882,8 +7045,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-backing" -version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.8#3a10ee63c0b5703a1c802db3438ab7e01344a8ce" +version = "0.9.9-1" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" dependencies = [ "bitvec 0.20.4", "futures 0.3.16", @@ -6900,8 +7063,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-bitfield-signing" -version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.8#3a10ee63c0b5703a1c802db3438ab7e01344a8ce" +version = "0.9.9-1" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" dependencies = [ "futures 0.3.16", "polkadot-node-subsystem", @@ -6915,8 +7078,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-candidate-validation" -version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.8#3a10ee63c0b5703a1c802db3438ab7e01344a8ce" +version = "0.9.9-1" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" dependencies = [ "async-trait", "futures 0.3.16", @@ -6933,8 +7096,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-chain-api" -version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.8#3a10ee63c0b5703a1c802db3438ab7e01344a8ce" +version = "0.9.9-1" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" dependencies = [ "futures 0.3.16", "polkadot-node-subsystem", @@ -6946,16 +7109,64 @@ dependencies = [ "tracing", ] +[[package]] +name = "polkadot-node-core-chain-selection" +version = "0.9.9-1" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" +dependencies = [ + "futures 0.3.16", + "futures-timer 3.0.2", + "kvdb", + "parity-scale-codec 2.2.0", + "polkadot-node-primitives", + "polkadot-node-subsystem", + "polkadot-node-subsystem-util", + "polkadot-primitives", + "thiserror", + "tracing", +] + +[[package]] +name = "polkadot-node-core-dispute-coordinator" +version = "0.9.9-1" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" +dependencies = [ + "bitvec 0.20.4", + "derive_more", + "futures 0.3.16", + "kvdb", + "parity-scale-codec 2.2.0", + "polkadot-node-primitives", + "polkadot-node-subsystem", + "polkadot-node-subsystem-util", + "polkadot-primitives", + "sc-keystore", + "thiserror", + "tracing", +] + +[[package]] +name = "polkadot-node-core-dispute-participation" +version = "0.9.9-1" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" +dependencies = [ + "futures 0.3.16", + "polkadot-node-primitives", + "polkadot-node-subsystem", + "polkadot-primitives", + "thiserror", + "tracing", +] + [[package]] name = "polkadot-node-core-parachains-inherent" -version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.8#3a10ee63c0b5703a1c802db3438ab7e01344a8ce" +version = "0.9.9-1" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" dependencies = [ "async-trait", "futures 0.3.16", "futures-timer 3.0.2", "polkadot-node-subsystem", - "polkadot-overseer", "polkadot-primitives", "sp-blockchain", "sp-inherents", @@ -6966,8 +7177,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-provisioner" -version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.8#3a10ee63c0b5703a1c802db3438ab7e01344a8ce" +version = "0.9.9-1" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" dependencies = [ "bitvec 0.20.4", "futures 0.3.16", @@ -6981,8 +7192,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-pvf" -version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.8#3a10ee63c0b5703a1c802db3438ab7e01344a8ce" +version = "0.9.9-1" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" dependencies = [ "always-assert", "assert_matches", @@ -7004,14 +7215,15 @@ dependencies = [ "sp-externalities", "sp-io", "sp-maybe-compressed-blob", + "sp-tracing", "sp-wasm-interface", "tracing", ] [[package]] name = "polkadot-node-core-runtime-api" -version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.8#3a10ee63c0b5703a1c802db3438ab7e01344a8ce" +version = "0.9.9-1" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" dependencies = [ "futures 0.3.16", "memory-lru", @@ -7028,8 +7240,8 @@ dependencies = [ [[package]] name = "polkadot-node-jaeger" -version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.8#3a10ee63c0b5703a1c802db3438ab7e01344a8ce" +version = "0.9.9-1" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" dependencies = [ "async-std", "lazy_static", @@ -7044,16 +7256,34 @@ dependencies = [ "thiserror", ] +[[package]] +name = "polkadot-node-metrics" +version = "0.9.9-1" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" +dependencies = [ + "async-trait", + "futures 0.3.16", + "futures-timer 3.0.2", + "metered-channel", + "sc-network", + "sp-application-crypto", + "sp-core", + "sp-keystore", + "substrate-prometheus-endpoint", +] + [[package]] name = "polkadot-node-network-protocol" -version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.8#3a10ee63c0b5703a1c802db3438ab7e01344a8ce" +version = "0.9.9-1" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" dependencies = [ + "async-trait", "futures 0.3.16", "parity-scale-codec 2.2.0", "polkadot-node-jaeger", "polkadot-node-primitives", "polkadot-primitives", + "sc-authority-discovery", "sc-network", "strum", "thiserror", @@ -7061,8 +7291,8 @@ dependencies = [ [[package]] name = "polkadot-node-primitives" -version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.8#3a10ee63c0b5703a1c802db3438ab7e01344a8ce" +version = "0.9.9-1" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" dependencies = [ "futures 0.3.16", "parity-scale-codec 2.2.0", @@ -7079,13 +7309,24 @@ dependencies = [ "sp-maybe-compressed-blob", "sp-runtime", "thiserror", + "tracing", "zstd", ] [[package]] name = "polkadot-node-subsystem" -version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.8#3a10ee63c0b5703a1c802db3438ab7e01344a8ce" +version = "0.9.9-1" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" +dependencies = [ + "polkadot-node-jaeger", + "polkadot-node-subsystem-types", + "polkadot-overseer", +] + +[[package]] +name = "polkadot-node-subsystem-types" +version = "0.9.9-1" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" dependencies = [ "async-std", "async-trait", @@ -7101,8 +7342,8 @@ dependencies = [ "polkadot-node-jaeger", "polkadot-node-network-protocol", "polkadot-node-primitives", + "polkadot-overseer-gen", "polkadot-primitives", - "polkadot-procmacro-subsystem-dispatch-gen", "polkadot-statement-table", "sc-network", "smallvec 1.6.1", @@ -7114,8 +7355,8 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem-util" -version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.8#3a10ee63c0b5703a1c802db3438ab7e01344a8ce" +version = "0.9.9-1" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" dependencies = [ "async-trait", "futures 0.3.16", @@ -7126,9 +7367,11 @@ dependencies = [ "parity-scale-codec 2.2.0", "pin-project 1.0.8", "polkadot-node-jaeger", + "polkadot-node-metrics", "polkadot-node-network-protocol", "polkadot-node-primitives", "polkadot-node-subsystem", + "polkadot-overseer", "polkadot-primitives", "rand 0.8.4", "sc-network", @@ -7142,29 +7385,72 @@ dependencies = [ [[package]] name = "polkadot-overseer" -version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.8#3a10ee63c0b5703a1c802db3438ab7e01344a8ce" +version = "0.9.9-1" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" dependencies = [ "async-trait", "futures 0.3.16", "futures-timer 3.0.2", "lru", + "parking_lot 0.11.1", + "polkadot-node-metrics", + "polkadot-node-network-protocol", "polkadot-node-primitives", - "polkadot-node-subsystem", - "polkadot-node-subsystem-util", + "polkadot-node-subsystem-types", + "polkadot-overseer-all-subsystems-gen", + "polkadot-overseer-gen", "polkadot-primitives", - "polkadot-procmacro-overseer-subsystems-gen", "sc-client-api", "sp-api", "tracing", ] +[[package]] +name = "polkadot-overseer-all-subsystems-gen" +version = "0.9.9-1" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" +dependencies = [ + "assert_matches", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "polkadot-overseer-gen" +version = "0.9.9-1" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" +dependencies = [ + "async-trait", + "futures 0.3.16", + "futures-timer 3.0.2", + "metered-channel", + "pin-project 1.0.8", + "polkadot-node-network-protocol", + "polkadot-node-primitives", + "polkadot-overseer-gen-proc-macro", + "thiserror", + "tracing", +] + +[[package]] +name = "polkadot-overseer-gen-proc-macro" +version = "0.9.9-1" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" +dependencies = [ + "proc-macro-crate 1.0.0", + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "polkadot-parachain" -version = "0.9.8" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.8#3a10ee63c0b5703a1c802db3438ab7e01344a8ce" +version = "0.9.9-1" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" dependencies = [ "derive_more", + "frame-support", "parity-scale-codec 2.2.0", "parity-util-mem", "polkadot-core-primitives", @@ -7176,8 +7462,8 @@ dependencies = [ [[package]] name = "polkadot-primitives" -version = "0.9.8" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.8#3a10ee63c0b5703a1c802db3438ab7e01344a8ce" +version = "0.9.9-1" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" dependencies = [ "bitvec 0.20.4", "frame-system", @@ -7204,32 +7490,10 @@ dependencies = [ "thiserror", ] -[[package]] -name = "polkadot-procmacro-overseer-subsystems-gen" -version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.8#3a10ee63c0b5703a1c802db3438ab7e01344a8ce" -dependencies = [ - "assert_matches", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "polkadot-procmacro-subsystem-dispatch-gen" -version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.8#3a10ee63c0b5703a1c802db3438ab7e01344a8ce" -dependencies = [ - "assert_matches", - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "polkadot-rpc" -version = "0.9.8" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.8#3a10ee63c0b5703a1c802db3438ab7e01344a8ce" +version = "0.9.9-1" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" dependencies = [ "beefy-gadget", "beefy-gadget-rpc", @@ -7248,6 +7512,7 @@ dependencies = [ "sc-keystore", "sc-rpc", "sc-sync-state-rpc", + "sc-transaction-pool-api", "sp-api", "sp-block-builder", "sp-blockchain", @@ -7255,14 +7520,13 @@ dependencies = [ "sp-consensus-babe", "sp-keystore", "sp-runtime", - "sp-transaction-pool", "substrate-frame-rpc-system", ] [[package]] name = "polkadot-runtime" -version = "0.9.8" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.8#3a10ee63c0b5703a1c802db3438ab7e01344a8ce" +version = "0.9.9-1" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" dependencies = [ "beefy-primitives", "bitvec 0.20.4", @@ -7276,7 +7540,6 @@ dependencies = [ "frame-try-runtime", "hex-literal", "log", - "max-encoded-len", "pallet-authority-discovery", "pallet-authorship", "pallet-babe", @@ -7332,28 +7595,26 @@ dependencies = [ "sp-transaction-pool", "sp-version", "static_assertions", - "substrate-wasm-builder 4.0.0", + "substrate-wasm-builder", ] [[package]] name = "polkadot-runtime-common" -version = "0.9.8" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.8#3a10ee63c0b5703a1c802db3438ab7e01344a8ce" +version = "0.9.9-1" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" dependencies = [ - "beefy-primitives", "bitvec 0.20.4", "frame-benchmarking", "frame-support", "frame-system", "impl-trait-for-tuples", - "libsecp256k1", + "libsecp256k1 0.6.0", "log", "pallet-authorship", "pallet-babe", "pallet-balances", - "pallet-beefy", + "pallet-beefy-mmr", "pallet-election-provider-multi-phase", - "pallet-mmr", "pallet-offences", "pallet-session", "pallet-staking", @@ -7382,15 +7643,15 @@ dependencies = [ [[package]] name = "polkadot-runtime-parachains" -version = "0.9.8" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.8#3a10ee63c0b5703a1c802db3438ab7e01344a8ce" +version = "0.9.9-1" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" dependencies = [ + "bitflags", "bitvec 0.20.4", "derive_more", "frame-benchmarking", "frame-support", "frame-system", - "libsecp256k1", "log", "pallet-authority-discovery", "pallet-authorship", @@ -7421,8 +7682,8 @@ dependencies = [ [[package]] name = "polkadot-service" -version = "0.9.8" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.8#3a10ee63c0b5703a1c802db3438ab7e01344a8ce" +version = "0.9.9-1" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" dependencies = [ "async-trait", "beefy-gadget", @@ -7444,6 +7705,7 @@ dependencies = [ "polkadot-availability-recovery", "polkadot-client", "polkadot-collator-protocol", + "polkadot-dispute-distribution", "polkadot-gossip-support", "polkadot-network-bridge", "polkadot-node-collation-generation", @@ -7453,6 +7715,9 @@ dependencies = [ "polkadot-node-core-bitfield-signing", "polkadot-node-core-candidate-validation", "polkadot-node-core-chain-api", + "polkadot-node-core-chain-selection", + "polkadot-node-core-dispute-coordinator", + "polkadot-node-core-dispute-participation", "polkadot-node-core-parachains-inherent", "polkadot-node-core-provisioner", "polkadot-node-core-runtime-api", @@ -7479,10 +7744,10 @@ dependencies = [ "sc-consensus-uncles", "sc-executor", "sc-finality-grandpa", - "sc-finality-grandpa-warp-sync", "sc-keystore", "sc-network", "sc-service", + "sc-sync-state-rpc", "sc-telemetry", "sc-transaction-pool", "serde", @@ -7513,8 +7778,8 @@ dependencies = [ [[package]] name = "polkadot-statement-distribution" -version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.8#3a10ee63c0b5703a1c802db3438ab7e01344a8ce" +version = "0.9.9-1" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" dependencies = [ "arrayvec 0.5.2", "futures 0.3.16", @@ -7534,8 +7799,8 @@ dependencies = [ [[package]] name = "polkadot-statement-table" -version = "0.9.8" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.8#3a10ee63c0b5703a1c802db3438ab7e01344a8ce" +version = "0.9.9-1" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" dependencies = [ "parity-scale-codec 2.2.0", "polkadot-primitives", @@ -7544,8 +7809,8 @@ dependencies = [ [[package]] name = "polkadot-test-client" -version = "0.9.8" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.8#3a10ee63c0b5703a1c802db3438ab7e01344a8ce" +version = "0.9.9-1" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" dependencies = [ "parity-scale-codec 2.2.0", "polkadot-node-subsystem", @@ -7569,8 +7834,8 @@ dependencies = [ [[package]] name = "polkadot-test-runtime" -version = "0.9.8" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.8#3a10ee63c0b5703a1c802db3438ab7e01344a8ce" +version = "0.9.9-1" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" dependencies = [ "beefy-primitives", "bitvec 0.20.4", @@ -7597,6 +7862,7 @@ dependencies = [ "pallet-transaction-payment", "pallet-transaction-payment-rpc-runtime-api", "pallet-vesting", + "pallet-xcm", "parity-scale-codec 2.2.0", "polkadot-parachain", "polkadot-primitives", @@ -7620,13 +7886,16 @@ dependencies = [ "sp-std", "sp-transaction-pool", "sp-version", - "substrate-wasm-builder 4.0.0", + "substrate-wasm-builder", + "xcm", + "xcm-builder", + "xcm-executor", ] [[package]] name = "polkadot-test-service" -version = "0.9.8" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.8#3a10ee63c0b5703a1c802db3438ab7e01344a8ce" +version = "0.9.9-1" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" dependencies = [ "frame-benchmarking", "frame-system", @@ -7728,9 +7997,9 @@ dependencies = [ [[package]] name = "primitive-types" -version = "0.9.1" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06345ee39fbccfb06ab45f3a1a5798d9dafa04cb8921a76d227040003a234b0e" +checksum = "05e4722c697a58a99d5d06a08c30821d7c082a4632198de1eaa5a6c22ef42373" dependencies = [ "fixed-hash", "impl-codec 0.5.1", @@ -7752,7 +8021,7 @@ dependencies = [ "sp-io", "sp-runtime", "sp-std", - "substrate-wasm-builder 4.0.0", + "substrate-wasm-builder", ] [[package]] @@ -7774,16 +8043,42 @@ dependencies = [ "toml", ] +[[package]] +name = "proc-macro-error" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18f33027081eba0a6d8aba6d1b1c3a3be58cbb12106341c2d5759fcd9b5277e7" +dependencies = [ + "proc-macro-error-attr 0.4.12", + "proc-macro2", + "quote", + "syn", + "version_check", +] + [[package]] name = "proc-macro-error" version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" dependencies = [ - "proc-macro-error-attr", + "proc-macro-error-attr 1.0.4", + "proc-macro2", + "quote", + "syn", + "version_check", +] + +[[package]] +name = "proc-macro-error-attr" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a5b4b77fdb63c1eca72173d68d24501c54ab1269409f6b672c85deb18af69de" +dependencies = [ "proc-macro2", "quote", "syn", + "syn-mid", "version_check", ] @@ -7886,9 +8181,9 @@ dependencies = [ [[package]] name = "psm" -version = "0.1.14" +version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14ce37fa8c0428a37307d163292add09b3aedc003472e6b3622486878404191d" +checksum = "0617ee61163b5d941d804065ce49040967610a4d4278fae73e096a057b01d358" dependencies = [ "cc", ] @@ -8106,7 +8401,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", ] @@ -8118,7 +8413,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", @@ -8141,9 +8436,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", ] @@ -8155,7 +8450,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]] @@ -8243,8 +8538,8 @@ dependencies = [ [[package]] name = "remote-externalities" -version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "env_logger 0.8.4", "hex", @@ -8301,9 +8596,9 @@ 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", "rustc-hex", @@ -8311,9 +8606,9 @@ dependencies = [ [[package]] name = "rocksdb" -version = "0.16.0" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c749134fda8bfc90d0de643d59bfc841dcb3ac8a1062e12b6754bd60235c48b3" +checksum = "7a62eca5cacf2c8261128631bed9f045598d40bfbe4b29f5163f0f802f8f44a7" dependencies = [ "libc", "librocksdb-sys", @@ -8321,25 +8616,30 @@ dependencies = [ [[package]] name = "rococo-runtime" -version = "0.9.8" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.8#3a10ee63c0b5703a1c802db3438ab7e01344a8ce" +version = "0.9.9-1" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" dependencies = [ "beefy-primitives", + "bp-messages", "bp-rococo", + "bp-runtime", "bp-wococo", + "bridge-runtime-common", "frame-executive", "frame-support", "frame-system", "frame-system-rpc-runtime-api", "hex-literal", "log", - "max-encoded-len", "pallet-authority-discovery", "pallet-authorship", "pallet-babe", "pallet-balances", "pallet-beefy", + "pallet-beefy-mmr", + "pallet-bridge-dispatch", "pallet-bridge-grandpa", + "pallet-bridge-messages", "pallet-collective", "pallet-grandpa", "pallet-im-online", @@ -8380,7 +8680,7 @@ dependencies = [ "sp-std", "sp-transaction-pool", "sp-version", - "substrate-wasm-builder 4.0.0", + "substrate-wasm-builder", "xcm", "xcm-builder", "xcm-executor", @@ -8538,20 +8838,19 @@ dependencies = [ [[package]] name = "sc-allocator" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "log", "sp-core", - "sp-std", "sp-wasm-interface", "thiserror", ] [[package]] name = "sc-authority-discovery" -version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "async-trait", "derive_more", @@ -8579,8 +8878,8 @@ dependencies = [ [[package]] name = "sc-basic-authorship" -version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "futures 0.3.16", "futures-timer 3.0.2", @@ -8590,20 +8889,20 @@ dependencies = [ "sc-client-api", "sc-proposer-metrics", "sc-telemetry", + "sc-transaction-pool-api", "sp-api", "sp-blockchain", "sp-consensus", "sp-core", "sp-inherents", "sp-runtime", - "sp-transaction-pool", "substrate-prometheus-endpoint", ] [[package]] name = "sc-block-builder" -version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "parity-scale-codec 2.2.0", "sc-client-api", @@ -8618,28 +8917,24 @@ dependencies = [ [[package]] name = "sc-chain-spec" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec 2.2.0", "sc-chain-spec-derive", - "sc-consensus-babe", - "sc-consensus-epochs", - "sc-finality-grandpa", "sc-network", "sc-telemetry", "serde", "serde_json", - "sp-consensus-babe", "sp-core", "sp-runtime", ] [[package]] name = "sc-chain-spec-derive" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "proc-macro-crate 1.0.0", "proc-macro2", @@ -8649,8 +8944,8 @@ dependencies = [ [[package]] name = "sc-cli" -version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "chrono", "fdlimit", @@ -8687,8 +8982,8 @@ dependencies = [ [[package]] name = "sc-client-api" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "derive_more", "fnv", @@ -8700,6 +8995,7 @@ dependencies = [ "parity-scale-codec 2.2.0", "parking_lot 0.11.1", "sc-executor", + "sc-transaction-pool-api", "sp-api", "sp-blockchain", "sp-consensus", @@ -8712,7 +9008,6 @@ dependencies = [ "sp-state-machine", "sp-std", "sp-storage", - "sp-transaction-pool", "sp-trie", "sp-utils", "sp-version", @@ -8721,8 +9016,8 @@ dependencies = [ [[package]] name = "sc-client-db" -version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "blake2-rfc", "hash-db", @@ -8740,7 +9035,6 @@ dependencies = [ "sc-state-db", "sp-arithmetic", "sp-blockchain", - "sp-consensus", "sp-core", "sp-database", "sp-runtime", @@ -8751,21 +9045,33 @@ dependencies = [ [[package]] name = "sc-consensus" -version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "async-trait", + "futures 0.3.16", + "futures-timer 3.0.2", + "libp2p", + "log", "parking_lot 0.11.1", "sc-client-api", + "serde", + "sp-api", "sp-blockchain", "sp-consensus", + "sp-core", "sp-runtime", + "sp-state-machine", + "sp-utils", + "substrate-prometheus-endpoint", + "thiserror", + "wasm-timer", ] [[package]] name = "sc-consensus-aura" -version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "async-trait", "derive_more", @@ -8775,6 +9081,7 @@ dependencies = [ "parity-scale-codec 2.2.0", "sc-block-builder", "sc-client-api", + "sc-consensus", "sc-consensus-slots", "sc-telemetry", "sp-api", @@ -8795,8 +9102,8 @@ dependencies = [ [[package]] name = "sc-consensus-babe" -version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "async-trait", "derive_more", @@ -8814,6 +9121,7 @@ dependencies = [ "rand 0.7.3", "retain_mut", "sc-client-api", + "sc-consensus", "sc-consensus-epochs", "sc-consensus-slots", "sc-consensus-uncles", @@ -8841,8 +9149,8 @@ dependencies = [ [[package]] name = "sc-consensus-babe-rpc" -version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "derive_more", "futures 0.3.16", @@ -8865,8 +9173,8 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" -version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "fork-tree", "parity-scale-codec 2.2.0", @@ -8878,8 +9186,8 @@ dependencies = [ [[package]] name = "sc-consensus-slots" -version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "async-trait", "futures 0.3.16", @@ -8888,6 +9196,7 @@ dependencies = [ "log", "parity-scale-codec 2.2.0", "sc-client-api", + "sc-consensus", "sc-telemetry", "sp-api", "sp-application-crypto", @@ -8906,8 +9215,8 @@ dependencies = [ [[package]] name = "sc-consensus-uncles" -version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "sc-client-api", "sp-authorship", @@ -8917,12 +9226,12 @@ dependencies = [ [[package]] name = "sc-executor" -version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "derive_more", "lazy_static", - "libsecp256k1", + "libsecp256k1 0.3.5", "log", "parity-scale-codec 2.2.0", "parity-wasm 0.42.2", @@ -8946,8 +9255,8 @@ dependencies = [ [[package]] name = "sc-executor-common" -version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "derive_more", "parity-scale-codec 2.2.0", @@ -8963,8 +9272,8 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" -version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "log", "parity-scale-codec 2.2.0", @@ -8978,14 +9287,15 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" -version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "cfg-if 1.0.0", "libc", "log", "parity-scale-codec 2.2.0", "parity-wasm 0.42.2", + "pwasm-utils", "sc-allocator", "sc-executor-common", "scoped-tls", @@ -8997,8 +9307,8 @@ dependencies = [ [[package]] name = "sc-finality-grandpa" -version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "async-trait", "derive_more", @@ -9012,7 +9322,7 @@ dependencies = [ "parity-scale-codec 2.2.0", "parking_lot 0.11.1", "pin-project 1.0.8", - "rand 0.7.3", + "rand 0.8.4", "sc-block-builder", "sc-client-api", "sc-consensus", @@ -9038,8 +9348,8 @@ dependencies = [ [[package]] name = "sc-finality-grandpa-rpc" -version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "derive_more", "finality-grandpa", @@ -9060,31 +9370,10 @@ dependencies = [ "sp-runtime", ] -[[package]] -name = "sc-finality-grandpa-warp-sync" -version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" -dependencies = [ - "derive_more", - "futures 0.3.16", - "log", - "num-traits", - "parity-scale-codec 2.2.0", - "parking_lot 0.11.1", - "prost", - "sc-client-api", - "sc-finality-grandpa", - "sc-network", - "sc-service", - "sp-blockchain", - "sp-finality-grandpa", - "sp-runtime", -] - [[package]] name = "sc-informant" -version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "ansi_term 0.12.1", "futures 0.3.16", @@ -9093,16 +9382,16 @@ dependencies = [ "parity-util-mem", "sc-client-api", "sc-network", + "sc-transaction-pool-api", "sp-blockchain", "sp-runtime", - "sp-transaction-pool", "wasm-timer", ] [[package]] name = "sc-keystore" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "async-trait", "derive_more", @@ -9121,8 +9410,8 @@ dependencies = [ [[package]] name = "sc-light" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "hash-db", "lazy_static", @@ -9140,8 +9429,8 @@ dependencies = [ [[package]] name = "sc-network" -version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "async-std", "async-trait", @@ -9173,6 +9462,7 @@ dependencies = [ "rand 0.7.3", "sc-block-builder", "sc-client-api", + "sc-consensus", "sc-peerset", "serde", "serde_json", @@ -9181,6 +9471,7 @@ dependencies = [ "sp-blockchain", "sp-consensus", "sp-core", + "sp-finality-grandpa", "sp-runtime", "sp-utils", "substrate-prometheus-endpoint", @@ -9193,8 +9484,8 @@ dependencies = [ [[package]] name = "sc-network-gossip" -version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "futures 0.3.16", "futures-timer 3.0.2", @@ -9210,8 +9501,8 @@ dependencies = [ [[package]] name = "sc-offchain" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "bytes 0.5.6", "fnv", @@ -9238,8 +9529,8 @@ dependencies = [ [[package]] name = "sc-peerset" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "futures 0.3.16", "libp2p", @@ -9252,7 +9543,7 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "log", "substrate-prometheus-endpoint", @@ -9260,8 +9551,8 @@ dependencies = [ [[package]] name = "sc-rpc" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "futures 0.3.16", "hash-db", @@ -9277,6 +9568,7 @@ dependencies = [ "sc-keystore", "sc-rpc-api", "sc-tracing", + "sc-transaction-pool-api", "serde_json", "sp-api", "sp-blockchain", @@ -9288,15 +9580,14 @@ dependencies = [ "sp-session", "sp-state-machine", "sp-tracing", - "sp-transaction-pool", "sp-utils", "sp-version", ] [[package]] name = "sc-rpc-api" -version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "derive_more", "futures 0.3.16", @@ -9308,20 +9599,20 @@ dependencies = [ "parity-scale-codec 2.2.0", "parking_lot 0.11.1", "sc-chain-spec", + "sc-transaction-pool-api", "serde", "serde_json", "sp-core", "sp-rpc", "sp-runtime", "sp-tracing", - "sp-transaction-pool", "sp-version", ] [[package]] name = "sc-rpc-server" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "futures 0.1.31", "jsonrpc-core", @@ -9338,8 +9629,8 @@ dependencies = [ [[package]] name = "sc-service" -version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "async-trait", "directories", @@ -9361,6 +9652,7 @@ dependencies = [ "sc-chain-spec", "sc-client-api", "sc-client-db", + "sc-consensus", "sc-executor", "sc-informant", "sc-keystore", @@ -9372,6 +9664,7 @@ dependencies = [ "sc-telemetry", "sc-tracing", "sc-transaction-pool", + "sc-transaction-pool-api", "serde", "serde_json", "sp-api", @@ -9404,8 +9697,8 @@ dependencies = [ [[package]] name = "sc-state-db" -version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "log", "parity-scale-codec 2.2.0", @@ -9419,18 +9712,20 @@ dependencies = [ [[package]] name = "sc-sync-state-rpc" -version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", "jsonrpc-derive", + "parity-scale-codec 2.2.0", "sc-chain-spec", "sc-client-api", "sc-consensus-babe", "sc-consensus-epochs", "sc-finality-grandpa", "sc-rpc-api", + "serde", "serde_json", "sp-blockchain", "sp-runtime", @@ -9439,8 +9734,8 @@ dependencies = [ [[package]] name = "sc-telemetry" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "chrono", "futures 0.3.16", @@ -9459,8 +9754,8 @@ dependencies = [ [[package]] name = "sc-tracing" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "ansi_term 0.12.1", "atty", @@ -9496,8 +9791,8 @@ dependencies = [ [[package]] name = "sc-tracing-proc-macro" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "proc-macro-crate 1.0.0", "proc-macro2", @@ -9506,50 +9801,72 @@ dependencies = [ ] [[package]] -name = "sc-transaction-graph" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +name = "sc-transaction-pool" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "derive_more", "futures 0.3.16", + "intervalier", "linked-hash-map", "log", + "parity-scale-codec 2.2.0", "parity-util-mem", "parking_lot 0.11.1", "retain_mut", + "sc-client-api", + "sc-transaction-pool-api", "serde", + "sp-api", "sp-blockchain", "sp-core", "sp-runtime", + "sp-tracing", "sp-transaction-pool", "sp-utils", + "substrate-prometheus-endpoint", "thiserror", "wasm-timer", ] [[package]] -name = "sc-transaction-pool" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +name = "sc-transaction-pool-api" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ + "derive_more", "futures 0.3.16", - "intervalier", "log", "parity-scale-codec 2.2.0", - "parity-util-mem", - "parking_lot 0.11.1", - "sc-client-api", - "sc-transaction-graph", - "sp-api", + "serde", "sp-blockchain", - "sp-core", "sp-runtime", - "sp-tracing", - "sp-transaction-pool", - "sp-utils", - "substrate-prometheus-endpoint", "thiserror", - "wasm-timer", +] + +[[package]] +name = "scale-info" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2e62ff266e136db561a007c84569985805f84a1d5a08278e52c36aacb6e061b" +dependencies = [ + "bitvec 0.20.4", + "cfg-if 1.0.0", + "derive_more", + "parity-scale-codec 2.2.0", + "scale-info-derive", +] + +[[package]] +name = "scale-info-derive" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b648fa291891a4c80187a25532f6a7d96b82c70353e30b868b14632b8fe043d6" +dependencies = [ + "proc-macro-crate 1.0.0", + "proc-macro2", + "quote", + "syn", ] [[package]] @@ -9592,26 +9909,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" -[[package]] -name = "scroll" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fda28d4b4830b807a8b43f7b0e6b5df875311b3e7621d84577188c175b6ec1ec" -dependencies = [ - "scroll_derive", -] - -[[package]] -name = "scroll_derive" -version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aaaae8f38bb311444cfb7f1979af0bc9240d95795f75f9ceddf6a59b79ceffa0" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "sct" version = "0.6.1" @@ -9723,18 +10020,18 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.126" +version = "1.0.128" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec7505abeacaec74ae4778d9d9328fe5a5d04253220a85c4ee022239fc996d03" +checksum = "1056a0db1978e9dbf0f6e4fca677f6f9143dc1c19de346f22cac23e422196834" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.126" +version = "1.0.128" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "963a7dbc9895aeac7ac90e74f34a5d5261828f79df35cbed41e10189d3804d43" +checksum = "13af2fbb8b60a8950d6c72a56d2095c28870367cc8e10c55e9745bac4995a2c4" dependencies = [ "proc-macro2", "quote", @@ -9743,9 +10040,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.64" +version = "1.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "799e97dc9fdae36a5c8b8f2cae9ce2ee9fdce2058c57a93e6099d919fd982f79" +checksum = "336b10da19a12ad094b59d870ebde26a45402e5b470add4b5fd03c5048a32127" dependencies = [ "itoa", "ryu", @@ -9816,9 +10113,9 @@ 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", ] @@ -9868,9 +10165,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" @@ -9883,8 +10180,8 @@ dependencies = [ [[package]] name = "slot-range-helper" -version = "0.9.8" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.8#3a10ee63c0b5703a1c802db3438ab7e01344a8ce" +version = "0.9.9-1" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" dependencies = [ "enumn", "parity-scale-codec 2.2.0", @@ -9948,9 +10245,9 @@ dependencies = [ [[package]] name = "socket2" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e3dfc207c526015c632472a77be09cf1b6e46866581aecae5cc38fb4235dea2" +checksum = "765f090f0e423d2b55843402a07915add955e7d60657db13707a159727326cad" dependencies = [ "libc", "winapi 0.3.9", @@ -9974,9 +10271,9 @@ dependencies = [ [[package]] name = "soketto" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4919971d141dbadaa0e82b5d369e2d7666c98e4625046140615ca363e50d4daa" +checksum = "a74e48087dbeed4833785c2f3352b59140095dc192dce966a3bfc155020a439f" dependencies = [ "base64 0.13.0", "bytes 1.0.1", @@ -9989,8 +10286,8 @@ dependencies = [ [[package]] name = "sp-api" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "hash-db", "log", @@ -10006,8 +10303,8 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "blake2-rfc", "proc-macro-crate 1.0.0", @@ -10018,10 +10315,9 @@ dependencies = [ [[package]] name = "sp-application-crypto" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ - "max-encoded-len", "parity-scale-codec 2.2.0", "serde", "sp-core", @@ -10031,8 +10327,8 @@ dependencies = [ [[package]] name = "sp-arithmetic" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "integer-sqrt", "num-traits", @@ -10045,8 +10341,8 @@ dependencies = [ [[package]] name = "sp-authority-discovery" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "parity-scale-codec 2.2.0", "sp-api", @@ -10057,8 +10353,8 @@ dependencies = [ [[package]] name = "sp-authorship" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "async-trait", "parity-scale-codec 2.2.0", @@ -10069,8 +10365,8 @@ dependencies = [ [[package]] name = "sp-block-builder" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "parity-scale-codec 2.2.0", "sp-api", @@ -10081,8 +10377,8 @@ dependencies = [ [[package]] name = "sp-blockchain" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "futures 0.3.16", "log", @@ -10099,13 +10395,12 @@ dependencies = [ [[package]] name = "sp-consensus" -version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "async-trait", "futures 0.3.16", "futures-timer 3.0.2", - "libp2p", "log", "parity-scale-codec 2.2.0", "parking_lot 0.11.1", @@ -10126,8 +10421,8 @@ dependencies = [ [[package]] name = "sp-consensus-aura" -version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "async-trait", "parity-scale-codec 2.2.0", @@ -10143,8 +10438,8 @@ dependencies = [ [[package]] name = "sp-consensus-babe" -version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "async-trait", "merlin", @@ -10165,8 +10460,8 @@ dependencies = [ [[package]] name = "sp-consensus-slots" -version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "parity-scale-codec 2.2.0", "sp-arithmetic", @@ -10175,8 +10470,8 @@ dependencies = [ [[package]] name = "sp-consensus-vrf" -version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "parity-scale-codec 2.2.0", "schnorrkel", @@ -10187,8 +10482,8 @@ dependencies = [ [[package]] name = "sp-core" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "base58", "blake2-rfc", @@ -10201,15 +10496,14 @@ dependencies = [ "hex", "impl-serde", "lazy_static", - "libsecp256k1", + "libsecp256k1 0.3.5", "log", - "max-encoded-len", "merlin", "num-traits", "parity-scale-codec 2.2.0", "parity-util-mem", "parking_lot 0.11.1", - "primitive-types 0.9.1", + "primitive-types 0.10.1", "rand 0.7.3", "regex", "schnorrkel", @@ -10232,8 +10526,8 @@ dependencies = [ [[package]] name = "sp-database" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "kvdb", "parking_lot 0.11.1", @@ -10242,7 +10536,7 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "proc-macro2", "quote", @@ -10251,8 +10545,8 @@ dependencies = [ [[package]] name = "sp-externalities" -version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "environmental", "parity-scale-codec 2.2.0", @@ -10262,8 +10556,8 @@ dependencies = [ [[package]] name = "sp-finality-grandpa" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "finality-grandpa", "log", @@ -10279,8 +10573,8 @@ dependencies = [ [[package]] name = "sp-inherents" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "async-trait", "impl-trait-for-tuples", @@ -10293,12 +10587,12 @@ dependencies = [ [[package]] name = "sp-io" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "futures 0.3.16", "hash-db", - "libsecp256k1", + "libsecp256k1 0.3.5", "log", "parity-scale-codec 2.2.0", "parking_lot 0.11.1", @@ -10318,8 +10612,8 @@ dependencies = [ [[package]] name = "sp-keyring" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "lazy_static", "sp-core", @@ -10329,8 +10623,8 @@ dependencies = [ [[package]] name = "sp-keystore" -version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "async-trait", "derive_more", @@ -10346,8 +10640,8 @@ dependencies = [ [[package]] name = "sp-maybe-compressed-blob" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "ruzstd", "zstd", @@ -10355,8 +10649,8 @@ dependencies = [ [[package]] name = "sp-npos-elections" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "parity-scale-codec 2.2.0", "serde", @@ -10368,8 +10662,8 @@ dependencies = [ [[package]] name = "sp-npos-elections-compact" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "proc-macro-crate 1.0.0", "proc-macro2", @@ -10379,8 +10673,8 @@ dependencies = [ [[package]] name = "sp-offchain" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "sp-api", "sp-core", @@ -10390,15 +10684,15 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "backtrace", ] [[package]] name = "sp-rpc" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "rustc-hash", "serde", @@ -10408,14 +10702,13 @@ dependencies = [ [[package]] name = "sp-runtime" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "either", "hash256-std-hasher", "impl-trait-for-tuples", "log", - "max-encoded-len", "parity-scale-codec 2.2.0", "parity-util-mem", "paste", @@ -10430,12 +10723,12 @@ dependencies = [ [[package]] name = "sp-runtime-interface" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec 2.2.0", - "primitive-types 0.9.1", + "primitive-types 0.10.1", "sp-externalities", "sp-runtime-interface-proc-macro", "sp-std", @@ -10447,8 +10740,8 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "Inflector", "proc-macro-crate 1.0.0", @@ -10460,7 +10753,7 @@ dependencies = [ [[package]] name = "sp-serializer" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "serde", "serde_json", @@ -10468,8 +10761,8 @@ dependencies = [ [[package]] name = "sp-session" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "parity-scale-codec 2.2.0", "sp-api", @@ -10481,8 +10774,8 @@ dependencies = [ [[package]] name = "sp-staking" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "parity-scale-codec 2.2.0", "sp-runtime", @@ -10491,8 +10784,8 @@ dependencies = [ [[package]] name = "sp-state-machine" -version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "hash-db", "log", @@ -10514,13 +10807,13 @@ dependencies = [ [[package]] name = "sp-std" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" [[package]] name = "sp-storage" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "impl-serde", "parity-scale-codec 2.2.0", @@ -10532,8 +10825,8 @@ dependencies = [ [[package]] name = "sp-tasks" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "log", "sp-core", @@ -10545,8 +10838,8 @@ dependencies = [ [[package]] name = "sp-timestamp" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "async-trait", "futures-timer 3.0.2", @@ -10562,8 +10855,8 @@ dependencies = [ [[package]] name = "sp-tracing" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "erased-serde", "log", @@ -10580,24 +10873,17 @@ dependencies = [ [[package]] name = "sp-transaction-pool" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ - "derive_more", - "futures 0.3.16", - "log", - "parity-scale-codec 2.2.0", - "serde", "sp-api", - "sp-blockchain", "sp-runtime", - "thiserror", ] [[package]] name = "sp-transaction-storage-proof" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "async-trait", "log", @@ -10611,8 +10897,8 @@ dependencies = [ [[package]] name = "sp-trie" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "hash-db", "memory-db", @@ -10625,8 +10911,8 @@ dependencies = [ [[package]] name = "sp-utils" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "futures 0.3.16", "futures-core", @@ -10637,21 +10923,23 @@ dependencies = [ [[package]] name = "sp-version" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "impl-serde", "parity-scale-codec 2.2.0", + "parity-wasm 0.42.2", "serde", "sp-runtime", "sp-std", "sp-version-proc-macro", + "thiserror", ] [[package]] name = "sp-version-proc-macro" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "parity-scale-codec 2.2.0", "proc-macro-crate 1.0.0", @@ -10662,8 +10950,8 @@ dependencies = [ [[package]] name = "sp-wasm-interface" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec 2.2.0", @@ -10770,7 +11058,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7813934aecf5f51a54775e00068c237de98489463968231a51746bbbc03f9c10" dependencies = [ "heck", - "proc-macro-error", + "proc-macro-error 1.0.4", "proc-macro2", "quote", "syn", @@ -10813,24 +11101,15 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd540ba72520174c2c73ce96bf507eeba3cc8a481f58be92525b69110e1fa645" -dependencies = [ - "platforms", -] - -[[package]] -name = "substrate-build-script-utils" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "platforms", ] [[package]] name = "substrate-frame-rpc-system" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "frame-system-rpc-runtime-api", "futures 0.3.16", @@ -10841,19 +11120,19 @@ dependencies = [ "parity-scale-codec 2.2.0", "sc-client-api", "sc-rpc-api", + "sc-transaction-pool-api", "serde", "sp-api", "sp-block-builder", "sp-blockchain", "sp-core", "sp-runtime", - "sp-transaction-pool", ] [[package]] name = "substrate-prometheus-endpoint" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "async-std", "derive_more", @@ -10867,7 +11146,7 @@ dependencies = [ [[package]] name = "substrate-test-client" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "async-trait", "futures 0.1.31", @@ -10896,7 +11175,7 @@ dependencies = [ [[package]] name = "substrate-test-runtime" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "cfg-if 1.0.0", "frame-support", @@ -10930,14 +11209,14 @@ dependencies = [ "sp-transaction-pool", "sp-trie", "sp-version", - "substrate-wasm-builder 4.0.0", + "substrate-wasm-builder", "trie-db", ] [[package]] name = "substrate-test-runtime-client" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "futures 0.3.16", "parity-scale-codec 2.2.0", @@ -10957,29 +11236,13 @@ dependencies = [ [[package]] name = "substrate-wasm-builder" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79091baab813855ddf65b191de9fe53e656b6b67c1e9bd23fdcbff8788164684" -dependencies = [ - "ansi_term 0.12.1", - "atty", - "build-helper", - "cargo_metadata 0.12.3", - "tempfile", - "toml", - "walkdir", - "wasm-gc-api", -] - -[[package]] -name = "substrate-wasm-builder" -version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "5.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "ansi_term 0.12.1", "atty", "build-helper", - "cargo_metadata 0.13.1", + "cargo_metadata", "sp-maybe-compressed-blob", "tempfile", "toml", @@ -10987,12 +11250,6 @@ dependencies = [ "wasm-gc-api", ] -[[package]] -name = "substrate-wasm-builder-runner" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2a965994514ab35d3893e9260245f2947fd1981cdd4fffd2c6e6d1a9ce02e6a" - [[package]] name = "subtle" version = "1.0.0" @@ -11007,15 +11264,26 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" [[package]] name = "syn" -version = "1.0.74" +version = "1.0.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1873d832550d4588c3dbc20f01361ab00bfe741048f71e3fecf145a7cc18b29c" +checksum = "b7f58f7e8eaa0009c5fec437aabf511bd9933e4b2d7407bd05273c01a8906ea7" dependencies = [ "proc-macro2", "quote", "unicode-xid", ] +[[package]] +name = "syn-mid" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baa8e7560a164edb1621a55d18a0c59abf49d360f47aa7b821061dd7eea7fac9" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "synstructure" version = "0.12.5" @@ -11042,9 +11310,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" @@ -11055,7 +11323,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", ] @@ -11225,14 +11493,15 @@ dependencies = [ "pin-project-lite 0.1.12", "signal-hook-registry", "slab", + "tokio-macros", "winapi 0.3.9", ] [[package]] name = "tokio" -version = "1.9.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b7b349f11a7047e6d1276853e612d152f5e8a352c61917887cc2169e2366b4c" +checksum = "01cf844b23c6131f624accf65ce0e4e9956a8bb329400ea5bcc26ae3a5c20b0b" dependencies = [ "autocfg", "pin-project-lite 0.2.7", @@ -11302,6 +11571,17 @@ dependencies = [ "log", ] +[[package]] +name = "tokio-macros" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e44da00bfc73a25f814cd8d7e57a68a5c31b74b3152a0a1d1f590c97ed06265a" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "tokio-named-pipes" version = "0.1.0" @@ -11397,7 +11677,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", @@ -11509,9 +11789,9 @@ dependencies = [ [[package]] name = "tracing-core" -version = "0.1.18" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9ff14f98b1a4b289c6248a023c1c2fa1491062964e9fed67ab29c4e4da4a052" +checksum = "2ca517f43f0fb96e0c3072ed5c275fe5eece87e8cb52f4a77b69226d3b1c9df8" dependencies = [ "lazy_static", ] @@ -11549,9 +11829,9 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.2.19" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab69019741fca4d98be3c62d2b75254528b5432233fd8a4d2739fec20278de48" +checksum = "b9cbe87a2fa7e35900ce5de20220a582a9483a7063811defce79d7cbd59d4cfe" dependencies = [ "ansi_term 0.12.1", "chrono", @@ -11576,7 +11856,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", @@ -11642,8 +11922,8 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" [[package]] name = "try-runtime-cli" -version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" dependencies = [ "frame-try-runtime", "log", @@ -11659,7 +11939,6 @@ dependencies = [ "sp-blockchain", "sp-core", "sp-externalities", - "sp-io", "sp-keystore", "sp-runtime", "sp-state-machine", @@ -11668,12 +11947,12 @@ 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.7.3", + "cfg-if 1.0.0", + "rand 0.8.4", "static_assertions", ] @@ -11712,12 +11991,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" @@ -11901,9 +12177,9 @@ checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" [[package]] name = "wasm-bindgen" -version = "0.2.74" +version = "0.2.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54ee1d4ed486f78874278e63e4069fc1ab9f6a18ca492076ffb90c5eb2997fd" +checksum = "8ce9b1b516211d33767048e5d47fa2a381ed8b76fc48d2ce4aa39877f9f183e0" dependencies = [ "cfg-if 1.0.0", "wasm-bindgen-macro", @@ -11911,9 +12187,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.74" +version = "0.2.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b33f6a0694ccfea53d94db8b2ed1c3a8a4c86dd936b13b9f0a15ec4a451b900" +checksum = "cfe8dc78e2326ba5f845f4b5bf548401604fa20b1dd1d365fb73b6c1d6364041" dependencies = [ "bumpalo", "lazy_static", @@ -11926,9 +12202,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.24" +version = "0.4.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fba7978c679d53ce2d0ac80c8c175840feb849a161664365d1287b41f2e67f1" +checksum = "95fded345a6559c2cfee778d562300c581f7d4ff3edb9b0d230d69800d213972" dependencies = [ "cfg-if 1.0.0", "js-sys", @@ -11938,9 +12214,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.74" +version = "0.2.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "088169ca61430fe1e58b8096c24975251700e7b1f6fd91cc9d59b04fb9b18bd4" +checksum = "44468aa53335841d9d6b6c023eaab07c0cd4bddbcfdee3e2bb1e8d2cb8069fef" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -11948,9 +12224,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.74" +version = "0.2.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be2241542ff3d9f241f5e2cb6dd09b37efe786df8851c54957683a49f0987a97" +checksum = "0195807922713af1e67dc66132c7328206ed9766af3858164fb583eedc25fbad" dependencies = [ "proc-macro2", "quote", @@ -11961,9 +12237,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.74" +version = "0.2.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7cff876b8f18eed75a66cf49b65e7f967cb354a7aa16003fb55dbfd25b44b4f" +checksum = "acdb075a845574a1fa5f09fd77e43f7747599301ea3417a9fbffdeedfc1f4a29" [[package]] name = "wasm-gc-api" @@ -12046,11 +12322,9 @@ dependencies = [ "wasmparser", "wasmtime-cache", "wasmtime-environ", - "wasmtime-fiber", "wasmtime-jit", "wasmtime-profiling", "wasmtime-runtime", - "wat", "winapi 0.3.9", ] @@ -12125,17 +12399,6 @@ dependencies = [ "wasmparser", ] -[[package]] -name = "wasmtime-fiber" -version = "0.27.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a089d44cd7e2465d41a53b840a5b4fca1bf6d1ecfebc970eac9592b34ea5f0b3" -dependencies = [ - "cc", - "libc", - "winapi 0.3.9", -] - [[package]] name = "wasmtime-jit" version = "0.27.0" @@ -12191,11 +12454,8 @@ checksum = "e24364d522dcd67c897c8fffc42e5bdfc57207bbb6d7eeade0da9d4a7d70105b" dependencies = [ "anyhow", "cfg-if 1.0.0", - "gimli 0.24.0", "lazy_static", "libc", - "object 0.24.0", - "scroll", "serde", "target-lexicon", "wasmtime-environ", @@ -12223,33 +12483,14 @@ dependencies = [ "region", "thiserror", "wasmtime-environ", - "wasmtime-fiber", "winapi 0.3.9", ] -[[package]] -name = "wast" -version = "36.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b5d7ba374a364571da1cb0a379a3dc302582a2d9937a183bfe35b68ad5bb9c4" -dependencies = [ - "leb128", -] - -[[package]] -name = "wat" -version = "1.0.38" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16383df7f0e3901484c2dda6294ed6895caa3627ce4f6584141dcf30a33a23e6" -dependencies = [ - "wast", -] - [[package]] name = "web-sys" -version = "0.3.51" +version = "0.3.53" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e828417b379f3df7111d3a2a9e5753706cae29c41f7c4029ee9fd77f3e09e582" +checksum = "224b2f6b67919060055ef1a67807367c2066ed520c3862cc013d26cf893a783c" dependencies = [ "js-sys", "wasm-bindgen", @@ -12285,8 +12526,8 @@ dependencies = [ [[package]] name = "westend-runtime" -version = "0.9.8" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.8#3a10ee63c0b5703a1c802db3438ab7e01344a8ce" +version = "0.9.9-1" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" dependencies = [ "beefy-primitives", "bitvec 0.20.4", @@ -12300,7 +12541,6 @@ dependencies = [ "frame-try-runtime", "hex-literal", "log", - "max-encoded-len", "pallet-authority-discovery", "pallet-authorship", "pallet-babe", @@ -12360,7 +12600,7 @@ dependencies = [ "sp-transaction-pool", "sp-version", "static_assertions", - "substrate-wasm-builder 4.0.0", + "substrate-wasm-builder", "xcm", "xcm-builder", "xcm-executor", @@ -12368,11 +12608,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", ] @@ -12456,25 +12697,26 @@ version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a0c105152107e3b96f6a00a65e86ce82d9b125230e1c4302940eca58ff71f4f" dependencies = [ - "curve25519-dalek 3.1.0", + "curve25519-dalek 3.2.0", "rand_core 0.5.1", "zeroize", ] [[package]] name = "xcm" -version = "0.9.8" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.8#3a10ee63c0b5703a1c802db3438ab7e01344a8ce" +version = "0.9.9-1" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" dependencies = [ "derivative", "impl-trait-for-tuples", + "log", "parity-scale-codec 2.2.0", ] [[package]] name = "xcm-builder" -version = "0.9.8" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.8#3a10ee63c0b5703a1c802db3438ab7e01344a8ce" +version = "0.9.9-1" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" dependencies = [ "frame-support", "frame-system", @@ -12492,8 +12734,8 @@ dependencies = [ [[package]] name = "xcm-executor" -version = "0.9.8" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.8#3a10ee63c0b5703a1c802db3438ab7e01344a8ce" +version = "0.9.9-1" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" dependencies = [ "frame-support", "impl-trait-for-tuples", diff --git a/Cargo.toml b/Cargo.toml index 67eb863d559..d7dc411fd1b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,135 +1,3 @@ -[patch.crates-io] -substrate-wasm-builder = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.8" } -frame-benchmarking = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.8" } -frame-benchmarking-cli = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.8" } -frame-executive = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.8" } -frame-support = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.8" } -frame-system = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.8" } -frame-system-benchmarking = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.8" } -frame-system-rpc-runtime-api = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.8" } -pallet-authorship = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.8" } -pallet-aura = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.8" } -pallet-balances = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.8" } -pallet-collective = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.8" } -pallet-democracy = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.8" } -pallet-grandpa = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.8" } -pallet-randomness-collective-flip = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.8" } -pallet-session = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.8" } -pallet-scheduler = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.8" } -pallet-sudo = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.8" } -pallet-tips = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.8" } -pallet-timestamp = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.8" } -pallet-treasury= { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.8" } -pallet-transaction-payment-rpc = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.8" } -pallet-transaction-payment-rpc-runtime-api = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.8" } -sc-basic-authorship = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.8" } -sc-chain-spec = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.8" } -sc-cli = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.8" } -sc-client-api = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.8" } -sc-client-db = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.8" } -sc-consensus = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.8" } -sc-consensus-aura = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.8" } -sc-consensus-epochs = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.8" } -sc-executor = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.8" } -sc-finality-grandpa = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.8" } -sc-informant = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.8" } -sc-keystore = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.8" } -sc-network = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.8" } -sc-offchain = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.8" } -sc-rpc = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.8" } -sc-rpc-api = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.8" } -sc-service = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.8" } -sc-telemetry = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.8" } -sc-transaction-pool = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.8" } -sc-tracing = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.8" } -sp-api = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.8" } -sp-application-crypto = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.8" } -sp-arithmetic = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.8" } -sp-block-builder = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.8" } -sp-blockchain = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.8" } -sp-consensus = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.8" } -sp-consensus-aura = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.8" } -sp-core = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.8" } -sp-externalities = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.8" } -sp-finality-grandpa = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.8" } -sp-inherents = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.8" } -sp-io = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.8" } -sp-offchain = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.8" } -sp-rpc = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.8" } -sp-runtime = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.8" } -sp-runtime-interface = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.8" } -sp-session = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.8" } -sp-std = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.8" } -sp-staking = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.8" } -sp-storage = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.8" } -sp-state-machine = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.8" } -sp-timestamp = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.8" } -sp-tracing = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.8" } -sp-transaction-pool = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.8" } -sp-trie = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.8" } -sp-version = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.8" } -substrate-frame-rpc-system = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.8" } -substrate-test-client = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.8" } -substrate-test-runtime-client = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.8" } -pallet-transaction-payment = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.8" } -pallet-elections-phragmen = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.8" } -pallet-utility = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.8" } - -sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.8" } -substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.8" } - -pallet-collator-selection = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.8" } - - -# ORML dependencies -orml-xcm-support = { git = 'https://github.com/open-web3-stack/open-runtime-module-library', rev = '33d9ac0927ba61e15763ee438721ef92d408271a' } -orml-xtokens = { git = 'https://github.com/open-web3-stack/open-runtime-module-library', rev = '33d9ac0927ba61e15763ee438721ef92d408271a' } -orml-unknown-tokens = { git = 'https://github.com/open-web3-stack/open-runtime-module-library', rev = '33d9ac0927ba61e15763ee438721ef92d408271a' } - -xcm = { git = 'https://github.com/paritytech/polkadot', branch = "release-v0.9.8" } -pallet-xcm = { git = 'https://github.com/paritytech/polkadot', branch = "release-v0.9.8" } -xcm-builder = { git = 'https://github.com/paritytech/polkadot', branch = "release-v0.9.8" } -xcm-executor = { git = 'https://github.com/paritytech/polkadot', branch = "release-v0.9.8" } - -cumulus-pallet-xcm = { git = 'https://github.com/paritytech/cumulus', default-features = false, branch = "polkadot-v0.9.8" } -cumulus-pallet-xcmp-queue = { git = 'https://github.com/paritytech/cumulus', default-features = false, branch = "polkadot-v0.9.8" } -cumulus-pallet-dmp-queue = { git = 'https://github.com/paritytech/cumulus', default-features = false, branch = "polkadot-v0.9.8" } - -orml-currencies = { git = 'https://github.com/open-web3-stack/open-runtime-module-library', rev = '33d9ac0927ba61e15763ee438721ef92d408271a' } -orml-tokens = { git = 'https://github.com/open-web3-stack/open-runtime-module-library', rev = '33d9ac0927ba61e15763ee438721ef92d408271a' } -orml-traits = { git = 'https://github.com/open-web3-stack/open-runtime-module-library', rev = '33d9ac0927ba61e15763ee438721ef92d408271a' } -orml-utilities = { git = 'https://github.com/open-web3-stack/open-runtime-module-library', rev = '33d9ac0927ba61e15763ee438721ef92d408271a' } -orml-vesting = { git = 'https://github.com/open-web3-stack/open-runtime-module-library', rev = '33d9ac0927ba61e15763ee438721ef92d408271a' } - -# Polkadot dependencies -polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.8" } -polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.8" } -polkadot-cli = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.8" } -polkadot-test-service = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.8" } -polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.8" } -polkadot-runtime-common = { git = 'https://github.com/paritytech/polkadot', branch = "release-v0.9.8" } -polkadot-test-runtime = { git = 'https://github.com/paritytech/polkadot', branch = "release-v0.9.8" } -polkadot-test-client = { git = 'https://github.com/paritytech/polkadot', branch = "release-v0.9.8" } -# Cumulus -cumulus-client-cli = {git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.8"} -cumulus-client-collator = {git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.8"} -cumulus-client-consensus-aura = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.8" } -cumulus-client-consensus-relay-chain = {git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.8"} -cumulus-client-consensus-common = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.8" } -cumulus-client-network = {git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.8"} -cumulus-client-service = {git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.8"} -cumulus-primitives-core = {git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.8"} -cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.8" } -cumulus-primitives-timestamp = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.8" } -cumulus-primitives-utility = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.8" } - -cumulus-pallet-aura-ext = { git = 'https://github.com/paritytech/cumulus', default-features = false, branch = "polkadot-v0.9.8" } -cumulus-pallet-parachain-system = { git = 'https://github.com/paritytech/cumulus', default-features = false, branch = "polkadot-v0.9.8" } -parachain-info = { git = 'https://github.com/paritytech/cumulus', default-features = false, branch = "polkadot-v0.9.8" } - -# HydraDX utils -hydra-dx-build-script-utils = { git = "https://github.com/galacticcouncil/HydraDX-node", branch = "master" } - [profile.release] panic = 'unwind' diff --git a/node/Cargo.toml b/node/Cargo.toml index d6203aff57b..5df03592d4b 100644 --- a/node/Cargo.toml +++ b/node/Cargo.toml @@ -1,110 +1,111 @@ [package] -authors = ['GalacticCouncil'] -build = 'build.rs' -description = 'Basilisk node' -edition = '2018' -homepage = 'https://github.com/galacticcouncil/Basilisk-node' -license = 'Apache 2.0' -name = 'basilisk' -repository = 'https://github.com/galacticcouncil/Basilisk-node' -version = '3.1.0' +name = "basilisk" +version = "3.2.0" +description = "Basilisk node" +authors = ["GalacticCouncil"] +edition = "2018" +homepage = "https://github.com/galacticcouncil/Basilisk-node" +license = "Apache 2.0" +repository = "https://github.com/galacticcouncil/Basilisk-node" +build = "build.rs" [[bin]] -name = 'basilisk' +name = "basilisk" [package.metadata.docs.rs] -targets = ['x86_64-unknown-linux-gnu'] +targets = ["x86_64-unknown-linux-gnu"] [build-dependencies] -hydra-dx-build-script-utils = {version = "1.0.0"} +hydra-dx-build-script-utils = { git = "https://github.com/galacticcouncil/HydraDX-node", branch = "master" } [dependencies] -codec = {package = 'parity-scale-codec', version = '2.0.0'} +codec = { package = "parity-scale-codec", version = "2.0.0" } hex-literal = "0.3.1" -jsonrpc-core = '15.1.0' -log = '0.4.8' -serde = {version = '1.0.101', features = ['derive']} -serde_json = '1.0.64' -structopt = '0.3.8' +jsonrpc-core = "15.1.0" +log = "0.4.8" +serde = { version = "1.0.101", features = ["derive"] } +serde_json = "1.0.64" +structopt = "0.3.8" # local dependencies -basilisk-runtime = {path = '../runtime'} -pallet-xyk-rpc = {path="../pallets/xyk/rpc"} -primitives = {path = "../primitives"} +basilisk-runtime = { path = "../runtime" } +pallet-xyk-rpc = { path="../pallets/xyk/rpc" } +primitives = { path = "../primitives" } # Substrate dependencies -frame-benchmarking = '3.0.0' -frame-benchmarking-cli = {version = '3.0.0', optional = true} -pallet-transaction-payment-rpc = '3.0.0' -sc-basic-authorship = '0.9.0' -sc-chain-spec = '3.0.0' -sc-cli = {features = ['wasmtime'], version = '0.9.0'} -sc-client-api = '3.0.0' -sc-consensus = '0.9.0' -sc-consensus-aura = '0.9.0' -sc-executor = {features = ['wasmtime'], version = '0.9.0'} -sc-finality-grandpa = '0.9.0' -sc-keystore = '3.0.0' -sc-rpc = '3.0.0' -sc-rpc-api = '0.9.0' -sc-service = {features = ['wasmtime'], version = '0.9.0'} -sc-tracing = '3.0.0' -sc-telemetry = '3.0.0' -sc-transaction-pool = '3.0.0' -sp-api = '3.0.0' -sp-block-builder = '3.0.0' -sp-blockchain = '3.0.0' -sp-consensus = '0.9.0' -sp-consensus-aura = '0.9.0' -sp-core = '3.0.0' -sp-finality-grandpa = '3.0.0' -sp-inherents = '3.0.0' -sp-runtime = '3.0.0' -sp-timestamp = '3.0.0' -sp-transaction-pool = '3.0.0' -sp-trie = '3.0.0' -substrate-frame-rpc-system = '3.0.0' -sc-network = "0.9.0" -sp-keystore = "0.9.0" -sp-session = "3.0.0" -sp-offchain = "3.0.0" -substrate-prometheus-endpoint = "0.9.0" +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" } +frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9", optional = true } +pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" } +sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" } +sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" } +sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9", features = ["wasmtime"] } +sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" } +sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" } +sc-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" } +sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9", features = ["wasmtime"] } +sc-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" } +sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" } +sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" } +sc-rpc-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" } +sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9", features = ["wasmtime"] } +sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" } +sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" } +sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" } +sc-transaction-pool-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" } +sp-block-builder = { 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-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" } +sp-consensus-aura = { 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-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" } +sp-inherents = { 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-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" } +sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" } +sp-trie = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" } +substrate-frame-rpc-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" } +sc-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" } +sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" } +sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" } +sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" } +substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" } # Cumulus dependencies -cumulus-client-cli = "0.1.0" -cumulus-client-collator = "0.1.0" -cumulus-client-consensus-aura = "0.1.0" -cumulus-client-consensus-relay-chain = "0.1.0" -cumulus-client-consensus-common = "0.1.0" -cumulus-client-network = "0.1.0" -cumulus-client-service = "0.1.0" -cumulus-primitives-core = "0.1.0" -cumulus-primitives-parachain-inherent = "0.1.0" +cumulus-client-cli = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.9" } +cumulus-client-collator = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.9" } +cumulus-client-consensus-aura = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.9" } +cumulus-client-consensus-relay-chain = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.9" } +cumulus-client-consensus-common = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.9" } +cumulus-client-network = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.9" } +cumulus-client-service = { 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" } +cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.9" } # Polkadot dependencies -polkadot-cli = {version="0.9.5"} -polkadot-parachain = {version="0.9.5"} -polkadot-primitives = {version="0.9.5"} -polkadot-service = {version="0.9.5"} -polkadot-test-service = {version="0.9.5"} +polkadot-cli = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.9" } +polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.9" } +polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.9" } +polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.9" } +polkadot-test-service = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.9" } [features] default = [ "frame-benchmarking-cli", ] runtime-benchmarks = [ - 'basilisk-runtime/runtime-benchmarks', + "basilisk-runtime/runtime-benchmarks", "frame-benchmarking-cli", - 'polkadot-service/runtime-benchmarks', + "polkadot-service/runtime-benchmarks", ] [dev-dependencies] # Polkadot dependencies -polkadot-runtime-common = {version="0.9.5"} -polkadot-test-client = {version="0.9.5"} -polkadot-test-runtime = {version="0.9.5"} +polkadot-runtime-common = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.9" } +polkadot-test-client = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.9" } +polkadot-test-runtime = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.9" } # Substrate dependencies -pallet-sudo = {version="3.0.0"} -substrate-test-client = {version="2.0.1"} -substrate-test-runtime-client = {version="2.0.0"} +pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" } +substrate-test-client = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" } +substrate-test-runtime-client = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" } diff --git a/node/src/command.rs b/node/src/command.rs index 883716429ff..ab301f94dd6 100644 --- a/node/src/command.rs +++ b/node/src/command.rs @@ -400,12 +400,12 @@ impl CliConfiguration for RelayChainCli { self.base.base.rpc_ws_max_connections() } - fn rpc_cors(&self, is_dev: bool) -> Result>> { - self.base.base.rpc_cors(is_dev) + fn rpc_http_threads(&self) -> Result> { + self.base.base.rpc_http_threads() } - fn telemetry_external_transport(&self) -> Result> { - self.base.base.telemetry_external_transport() + fn rpc_cors(&self, is_dev: bool) -> Result>> { + self.base.base.rpc_cors(is_dev) } fn default_heap_pages(&self) -> Result> { diff --git a/node/src/rpc.rs b/node/src/rpc.rs index 4dc4db861dc..2cf10f565eb 100644 --- a/node/src/rpc.rs +++ b/node/src/rpc.rs @@ -12,7 +12,7 @@ pub use sc_rpc_api::DenyUnsafe; use sp_api::ProvideRuntimeApi; use sp_block_builder::BlockBuilder; use sp_blockchain::{Error as BlockChainError, HeaderBackend, HeaderMetadata}; -use sp_transaction_pool::TransactionPool; +use sc_transaction_pool_api::TransactionPool; /// Full client dependencies. pub struct FullDeps { @@ -24,17 +24,20 @@ pub struct FullDeps { pub deny_unsafe: DenyUnsafe, } +/// RPC Extension Builder +pub type RpcExtension = Result, sc_service::Error>; + /// Instantiate all full RPC extensions. -pub fn create_full(deps: FullDeps) -> jsonrpc_core::IoHandler +pub fn create_full(deps: FullDeps) -> RpcExtension where C: ProvideRuntimeApi, - C: HeaderBackend + HeaderMetadata + 'static, + C: HeaderBackend + HeaderMetadata, C: Send + Sync + 'static, C::Api: substrate_frame_rpc_system::AccountNonceApi, C::Api: pallet_transaction_payment_rpc::TransactionPaymentRuntimeApi, C::Api: pallet_xyk_rpc::XYKRuntimeApi, C::Api: BlockBuilder, - P: TransactionPool + 'static, + P: TransactionPool + Sync + Send + 'static, { use pallet_transaction_payment_rpc::{TransactionPayment, TransactionPaymentApi}; use pallet_xyk_rpc::{XYKApi, XYK}; @@ -64,5 +67,5 @@ where io.extend_with(XYKApi::to_delegate(XYK::new(client))); - io + Ok(io) } diff --git a/node/src/service.rs b/node/src/service.rs index dee278bb716..14c6e98ca0c 100644 --- a/node/src/service.rs +++ b/node/src/service.rs @@ -41,7 +41,7 @@ pub fn new_partial( TFullClient, TFullBackend, (), - sp_consensus::DefaultImportQueue>, + sc_consensus::DefaultImportQueue>, sc_transaction_pool::FullPool>, (Option, Option), >, @@ -160,13 +160,14 @@ where import_queue: import_queue.clone(), on_demand: None, block_announce_validator_builder: Some(Box::new(|_| block_announce_validator)), + warp_sync: None, })?; let rpc_extensions_builder = { let client = client.clone(); let pool = transaction_pool.clone(); - Box::new(move |deny_unsafe, _| { + Box::new(move |deny_unsafe, _| -> crate::rpc::RpcExtension { let deps = crate::rpc::FullDeps { client: client.clone(), pool: pool.clone(), @@ -248,7 +249,7 @@ pub fn parachain_build_import_queue( config: &Configuration, telemetry: Option, task_manager: &TaskManager, -) -> Result>, sc_service::Error> { +) -> Result>, sc_service::Error> { let slot_duration = cumulus_client_consensus_aura::slot_duration(&*client)?; cumulus_client_consensus_aura::import_queue::( diff --git a/pallets/asset-registry/Cargo.toml b/pallets/asset-registry/Cargo.toml index e6c0a5c50ef..46572f21104 100644 --- a/pallets/asset-registry/Cargo.toml +++ b/pallets/asset-registry/Cargo.toml @@ -1,52 +1,46 @@ [package] -authors = ['GalacticCouncil'] -description = 'FRAME Pallet for asset registry management' -edition = '2018' -homepage = 'https://github.com/galacticcouncil/basilisk-node' -license = 'Apache 2.0' -name = 'pallet-asset-registry' -repository = 'https://github.com/galacticcouncil/basilisk-node' -version = '3.1.0' +name = "pallet-asset-registry" +version = "3.1.0" +description = "FRAME Pallet for asset registry management" +authors = ["GalacticCouncil"] +edition = "2018" +homepage = "https://github.com/galacticcouncil/basilisk-node" +license = "Apache 2.0" +repository = "https://github.com/galacticcouncil/basilisk-node" [package.metadata.docs.rs] -targets = ['x86_64-unknown-linux-gnu'] +targets = ["x86_64-unknown-linux-gnu"] [build-dependencies] -substrate-wasm-builder = '4.0.0' - -# alias "parity-scale-code" to "codec" -[dependencies.codec] -default-features = false -features = ['derive'] -package = 'parity-scale-codec' -version = '2.0.0' +substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" } [dependencies] -primitive-types = {default-features = false, version = '0.8.0'} -serde = {features = ['derive'], optional = true, version = '1.0.101'} +codec = { default-features = false, features = ["derive"], package = "parity-scale-codec", version = "2.0.0" } +primitive-types = { default-features = false, version = "0.8.0" } +serde = { features = ["derive"], optional = true, version = "1.0.101" } # Local dependencies -primitives = {path = '../../primitives', default-features = false} +primitives = { path = "../../primitives", default-features = false } # Substrate dependencies -frame-support = {default-features = false, version = '3.0.0'} -frame-system = {default-features = false, version = '3.0.0'} -sp-core = {default-features = false, version = '3.0.0'} -sp-runtime = {default-features = false, version = '3.0.0'} -sp-std = {default-features = false, version = '3.0.0'} +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 } +sp-core = { 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 } [dev-dependencies] -sp-io = {default-features = false, version = '3.0.0'} +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9", default-features = false } [features] -default = ['std'] +default = ["std"] std = [ - 'serde/std', - 'codec/std', - 'frame-support/std', - 'frame-system/std', - 'sp-runtime/std', - 'sp-core/std', - 'sp-std/std', - 'primitives/std', + "serde/std", + "codec/std", + "frame-support/std", + "frame-system/std", + "sp-runtime/std", + "sp-core/std", + "sp-std/std", + "primitives/std", ] diff --git a/pallets/duster/Cargo.toml b/pallets/duster/Cargo.toml index 53e72fb4fba..5d0ffe88b30 100644 --- a/pallets/duster/Cargo.toml +++ b/pallets/duster/Cargo.toml @@ -1,69 +1,63 @@ [package] -authors = ['GalacticCouncil'] -description = 'Account duster' -edition = '2018' -homepage = 'https://github.com/galacticcouncil/Basilisk-node' -license = 'Apache 2.0' -name = 'pallet-duster' -repository = 'https://github.com/galacticcouncil/Basilisk-node' -version = '1.0.0' +name = "pallet-duster" +version = "1.0.0" +description = "Account duster" +authors = ["GalacticCouncil"] +edition = "2018" +homepage = "https://github.com/galacticcouncil/Basilisk-node" +license = "Apache 2.0" +repository = "https://github.com/galacticcouncil/Basilisk-node" [package.metadata.docs.rs] -targets = ['x86_64-unknown-linux-gnu'] +targets = ["x86_64-unknown-linux-gnu"] [build-dependencies] -substrate-wasm-builder = {package = 'substrate-wasm-builder', version = '3.0.0'} - -# alias "parity-scale-code" to "codec" -[dependencies.codec] -default-features = false -features = ['derive'] -package = 'parity-scale-codec' -version = '2.0.0' +substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" } [dependencies] -serde = {features = ['derive'], optional = true, version = '1.0.101'} +codec = { default-features = false, features = ["derive"], package = "parity-scale-codec", version = "2.0.0" } +serde = { features = ["derive"], optional = true, version = "1.0.101" } # ORML dependencies -orml-traits = {default-features = false, version = "0.4.1-dev"} +orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "8d5432c3458702a7df14b374bddde43a2a20aa43", default-features = false } # Substrate dependencies -sp-std = {default-features = false, version = '3.0.0'} -frame-support = {default-features = false, version = '3.0.0'} -frame-system = {default-features = false, version = '3.0.0'} +sp-std = { 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.9", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9", default-features = false } # Optionals -frame-system-benchmarking = {default-features = false, optional = true, version = '3.0.0'} -frame-benchmarking = {default-features = false, optional = true, version = '3.0.0'} +frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9", default-features = false, optional = true } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9", default-features = false, optional = true } [dev-dependencies] -sp-io = {default-features = false, version = '3.0.0'} -orml-currencies = {default-features = false, version = "0.4.1-dev"} -orml-tokens = {default-features = false, version = "0.4.1-dev"} -primitives = {path = '../../primitives', default-features = false} -lazy_static = {features = ['spin_no_std'], version = "1.4.0"} -sp-core = {default-features = false, version = '3.0.0'} -sp-runtime = {default-features = false, version = '3.0.0'} -pallet-balances = {default-features = false, version = '3.0.0'} +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9", default-features = false } +orml-currencies = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "8d5432c3458702a7df14b374bddde43a2a20aa43", default-features = false } +orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "8d5432c3458702a7df14b374bddde43a2a20aa43", default-features = false } +primitives = { path = "../../primitives", default-features = false } +lazy_static = { features = ["spin_no_std"], version = "1.4.0" } +sp-core = { 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 } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9", default-features = false } [features] -default = ['std'] +default = ["std"] runtime-benchmarks = [ - "frame-benchmarking", - "frame-system/runtime-benchmarks", - "frame-support/runtime-benchmarks", + "frame-benchmarking", + "frame-system/runtime-benchmarks", + "frame-support/runtime-benchmarks", ] std = [ - 'serde', - 'codec/std', - 'frame-support/std', - 'frame-system/std', - 'sp-runtime/std', - 'sp-core/std', - 'sp-std/std', - 'orml-tokens/std', - 'orml-traits/std', - 'primitives/std', - 'lazy_static/spin_no_std', - 'pallet-balances/std', + "serde", + "codec/std", + "frame-support/std", + "frame-system/std", + "sp-runtime/std", + "sp-core/std", + "sp-std/std", + "orml-tokens/std", + "orml-traits/std", + "primitives/std", + "lazy_static/spin_no_std", + "pallet-balances/std", ] diff --git a/pallets/duster/src/benchmarking.rs b/pallets/duster/src/benchmarking.rs index 7333f5da8fc..bec8fb0aa14 100644 --- a/pallets/duster/src/benchmarking.rs +++ b/pallets/duster/src/benchmarking.rs @@ -60,7 +60,7 @@ mod tests { #[test] fn test_benchmarks() { ExtBuilder::default().build().execute_with(|| { - assert_ok!(test_benchmark_dust_account::()); + assert_ok!(Pallet::::test_benchmark_dust_account()); }); } } diff --git a/pallets/duster/src/mock.rs b/pallets/duster/src/mock.rs index 0b5917e1d44..11aab5b31f1 100644 --- a/pallets/duster/src/mock.rs +++ b/pallets/duster/src/mock.rs @@ -1,7 +1,7 @@ use crate as duster; use frame_support::parameter_types; -use frame_support::traits::{GenesisBuild, OnKilledAccount}; +use frame_support::traits::{Nothing, GenesisBuild, OnKilledAccount}; use orml_currencies::BasicCurrencyAdapter; use orml_traits::parameter_type_with_key; @@ -141,6 +141,7 @@ impl orml_tokens::Config for Test { type ExistentialDeposits = ExistentialDeposits; type OnDust = (); type MaxLocks = (); + type DustRemovalWhitelist = Nothing; } impl orml_currencies::Config for Test { diff --git a/pallets/exchange/Cargo.toml b/pallets/exchange/Cargo.toml index f5bf537ea27..044a4464288 100644 --- a/pallets/exchange/Cargo.toml +++ b/pallets/exchange/Cargo.toml @@ -1,62 +1,56 @@ [package] -authors = ['GalacticCouncil'] -description = 'Exchange Module' -edition = '2018' -homepage = 'https://github.com/galacticcouncil/basilisk-node' -license = 'Apache 2.0' -name = 'pallet-exchange' -repository = 'https://github.com/galacticcouncil/basilisk-node' -version = '4.0.1' +name = "pallet-exchange" +version = "4.1.0" +description = "Exchange Module" +authors = ["GalacticCouncil"] +edition = "2018" +homepage = "https://github.com/galacticcouncil/basilisk-node" +license = "Apache 2.0" +repository = "https://github.com/galacticcouncil/basilisk-node" [package.metadata.docs.rs] -targets = ['x86_64-unknown-linux-gnu'] +targets = ["x86_64-unknown-linux-gnu"] [build-dependencies] -substrate-wasm-builder = '4.0.0' - -# alias "parity-scale-code" to "codec" -[dependencies.codec] -default-features = false -features = ['derive'] -package = 'parity-scale-codec' -version = '2.0.0' +substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" } [dependencies] -primitive-types = {default-features = false, version = '0.8.0'} -serde = {features = ['derive'], optional = true, version = '1.0.101'} +codec = { default-features = false, features = ["derive"], package = "parity-scale-codec", version = "2.0.0" } +primitive-types = { default-features = false, version = "0.8.0" } +serde = { features = ["derive"], optional = true, version = "1.0.101" } # Local dependencies -pallet-xyk = {path = '../xyk', default-features = false} -pallet-asset-registry = {path = '../asset-registry', default-features = false} -primitives = {path = '../../primitives', default-features = false} +pallet-xyk = { path = "../xyk", default-features = false } +pallet-asset-registry = { path = "../asset-registry", default-features = false } +primitives = { path = "../../primitives", default-features = false } # ORML dependencies -orml-tokens = {default-features = false, version = "0.4.1-dev"} -orml-traits = {default-features = false, version = "0.4.1-dev"} +orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "8d5432c3458702a7df14b374bddde43a2a20aa43", default-features = false } +orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "8d5432c3458702a7df14b374bddde43a2a20aa43", default-features = false } # Substrate dependencies -frame-support = {default-features = false, version = '3.0.0'} -frame-system = {default-features = false, version = '3.0.0'} -sp-std = {default-features = false, version = '3.0.0'} +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 } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9", default-features = false } -sp-core = {default-features = false, version = '3.0.0'} -sp-runtime = {default-features = false, version = '3.0.0'} +sp-core = { 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 } [dev-dependencies] -sp-io = {default-features = false, version = '3.0.0'} +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9", default-features = false } [features] -default = ['std'] +default = ["std"] std = [ - 'serde', - 'codec/std', - 'frame-support/std', - 'frame-system/std', - 'sp-std/std', - 'sp-runtime/std', - 'primitives/std', - 'orml-tokens/std', - 'orml-traits/std', - 'pallet-xyk/std', - 'pallet-asset-registry/std', + "serde", + "codec/std", + "frame-support/std", + "frame-system/std", + "sp-std/std", + "sp-runtime/std", + "primitives/std", + "orml-tokens/std", + "orml-traits/std", + "pallet-xyk/std", + "pallet-asset-registry/std", ] diff --git a/pallets/exchange/benchmarking/Cargo.toml b/pallets/exchange/benchmarking/Cargo.toml index 75b85e3c89b..b32a9273809 100644 --- a/pallets/exchange/benchmarking/Cargo.toml +++ b/pallets/exchange/benchmarking/Cargo.toml @@ -1,63 +1,57 @@ [package] -authors = ['GalacticCouncil'] -description = 'Exchange Benchmarking Module' -edition = '2018' -homepage = 'https://github.com/galacticcouncil/basilisk-node' -license = 'Apache 2.0' -name = 'pallet-exchange-benchmarking' -repository = 'https://github.com/galacticcouncil/basilisk-node' -version = '3.1.1' +name = "pallet-exchange-benchmarking" +version = "3.1.1" +description = "Exchange Benchmarking Module" +authors = ["GalacticCouncil"] +edition = "2018" +homepage = "https://github.com/galacticcouncil/basilisk-node" +license = "Apache 2.0" +repository = "https://github.com/galacticcouncil/basilisk-node" [package.metadata.docs.rs] -targets = ['x86_64-unknown-linux-gnu'] +targets = ["x86_64-unknown-linux-gnu"] [build-dependencies] -substrate-wasm-builder = '4.0.0' - -# alias "parity-scale-code" to "codec" -[dependencies.codec] -default-features = false -features = ['derive'] -package = 'parity-scale-codec' -version = '2.0.0' +substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" } [dependencies] -serde = {features = ['derive'], optional = true, version = '1.0.101'} +codec = { default-features = false, features = ["derive"], package = "parity-scale-codec", version = "2.0.0" } +serde = { features = ["derive"], optional = true, version = "1.0.101" } # Local dependencies -pallet-xyk = {path = '../../xyk', default-features = false} -pallet-asset-registry = {path = '../../asset-registry', default-features = false} -pallet-exchange = {path = '../../exchange', default-features = false} -primitives = {path = '../../../primitives', default-features = false} +pallet-xyk = { path = "../../xyk", default-features = false } +pallet-asset-registry = { path = "../../asset-registry", default-features = false } +pallet-exchange = { path = "../../exchange", default-features = false } +primitives = { path = "../../../primitives", default-features = false } # ORML dependencies -orml-tokens = {default-features = false, version = "0.4.1-dev"} -orml-traits = {default-features = false, version = "0.4.1-dev"} +orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "8d5432c3458702a7df14b374bddde43a2a20aa43", default-features = false } +orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "8d5432c3458702a7df14b374bddde43a2a20aa43", default-features = false } # Substrate dependencies -frame-benchmarking = {default-features = false, version = '3.0.0'} -frame-support = {default-features = false, version = '3.0.0'} -frame-system = {default-features = false, version = '3.0.0'} -frame-system-benchmarking = {default-features = false, version = '3.0.0'} -sp-std = {default-features = false, version = '3.0.0'} +frame-benchmarking = { 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.9", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9", default-features = false } +frame-system-benchmarking = { 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-core = {default-features = false, version = '3.0.0'} -sp-runtime = {default-features = false, version = '3.0.0'} +sp-core = { 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 } [dev-dependencies] -sp-io = {default-features = false, version = '3.0.0'} +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9", default-features = false } [features] -default = ['std'] +default = ["std"] std = [ - 'serde', - 'codec/std', - 'frame-support/std', - 'frame-system/std', - 'sp-std/std', - 'sp-runtime/std', - 'primitives/std', - 'pallet-exchange/std', - 'pallet-asset-registry/std', - 'frame-benchmarking/std', + "serde", + "codec/std", + "frame-support/std", + "frame-system/std", + "sp-std/std", + "sp-runtime/std", + "primitives/std", + "pallet-exchange/std", + "pallet-asset-registry/std", + "frame-benchmarking/std", ] diff --git a/pallets/exchange/benchmarking/src/lib.rs b/pallets/exchange/benchmarking/src/lib.rs index a4c3bfdd4e9..2a8dc80f186 100644 --- a/pallets/exchange/benchmarking/src/lib.rs +++ b/pallets/exchange/benchmarking/src/lib.rs @@ -380,16 +380,16 @@ mod tests { #[test] fn test_benchmarks() { new_test_ext().execute_with(|| { - assert_ok!(test_benchmark_known_overhead_for_on_finalize::()); - assert_ok!(test_benchmark_sell_intention::()); - assert_ok!(test_benchmark_buy_intention::()); - assert_ok!(test_benchmark_on_finalize::()); - assert_ok!(test_benchmark_on_finalize_buys_no_matches::()); - assert_ok!(test_benchmark_on_finalize_sells_no_matches::()); - assert_ok!(test_benchmark_sell_extrinsic::()); - assert_ok!(test_benchmark_on_finalize_for_one_sell_extrinsic::()); - assert_ok!(test_benchmark_buy_extrinsic::()); - assert_ok!(test_benchmark_on_finalize_for_one_buy_extrinsic::()); + assert_ok!(Pallet::::test_benchmark_known_overhead_for_on_finalize()); + assert_ok!(Pallet::::test_benchmark_sell_intention()); + assert_ok!(Pallet::::test_benchmark_buy_intention()); + assert_ok!(Pallet::::test_benchmark_on_finalize()); + assert_ok!(Pallet::::test_benchmark_on_finalize_buys_no_matches()); + assert_ok!(Pallet::::test_benchmark_on_finalize_sells_no_matches()); + assert_ok!(Pallet::::test_benchmark_sell_extrinsic()); + assert_ok!(Pallet::::test_benchmark_on_finalize_for_one_sell_extrinsic()); + assert_ok!(Pallet::::test_benchmark_buy_extrinsic()); + assert_ok!(Pallet::::test_benchmark_on_finalize_for_one_buy_extrinsic()); }); } } diff --git a/pallets/exchange/benchmarking/src/mock.rs b/pallets/exchange/benchmarking/src/mock.rs index ac99ec1688b..04b4302e757 100644 --- a/pallets/exchange/benchmarking/src/mock.rs +++ b/pallets/exchange/benchmarking/src/mock.rs @@ -110,6 +110,7 @@ impl orml_tokens::Config for Test { type ExistentialDeposits = ExistentialDeposits; type OnDust = (); type MaxLocks = (); + type DustRemovalWhitelist = (); } pub struct AssetPairAccountIdTest(); diff --git a/pallets/exchange/src/lib.rs b/pallets/exchange/src/lib.rs index 0793eb3a654..d939dfcb7eb 100644 --- a/pallets/exchange/src/lib.rs +++ b/pallets/exchange/src/lib.rs @@ -40,7 +40,7 @@ use direct::{DirectTradeData, Transfer}; use frame_support::weights::Weight; use primitives::traits::AMMTransfer; -use frame_support::sp_runtime::offchain::storage_lock::BlockNumberProvider; +use frame_support::sp_runtime::traits::BlockNumberProvider; use frame_support::sp_runtime::traits::Hash; #[cfg(test)] diff --git a/pallets/exchange/src/mock.rs b/pallets/exchange/src/mock.rs index e93f50ff397..c125709c152 100644 --- a/pallets/exchange/src/mock.rs +++ b/pallets/exchange/src/mock.rs @@ -116,6 +116,7 @@ impl orml_tokens::Config for Test { type ExistentialDeposits = ExistentialDeposits; type OnDust = (); type MaxLocks = (); + type DustRemovalWhitelist = (); } impl pallet_asset_registry::Config for Test { diff --git a/pallets/lbp/Cargo.toml b/pallets/lbp/Cargo.toml index a57d1b453d2..54f55f61e86 100644 --- a/pallets/lbp/Cargo.toml +++ b/pallets/lbp/Cargo.toml @@ -1,69 +1,63 @@ [package] -authors = ['GalacticCouncil'] -description = 'HydraDX Liquidity Bootstrapping Pool Pallet' -edition = '2018' -homepage = 'https://github.com/galacticcouncil/Basilisk-node' -license = 'Apache 2.0' -name = 'pallet-lbp' -repository = 'https://github.com/galacticcouncil/Basilisk-node' -version = '1.0.0' +name = "pallet-lbp" +version = "1.0.0" +description = "HydraDX Liquidity Bootstrapping Pool Pallet" +authors = ["GalacticCouncil"] +edition = "2018" +homepage = "https://github.com/galacticcouncil/Basilisk-node" +license = "Apache 2.0" +repository = "https://github.com/galacticcouncil/Basilisk-node" [package.metadata.docs.rs] -targets = ['x86_64-unknown-linux-gnu'] +targets = ["x86_64-unknown-linux-gnu"] [build-dependencies] -wasm-builder-runner = {package = 'substrate-wasm-builder-runner', version = '1.0.5'} - -# alias "parity-scale-code" to "codec" -[dependencies.codec] -default-features = false -features = ['derive'] -package = 'parity-scale-codec' -version = '2.0.0' +substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" } [dependencies] -primitive-types = {default-features = false, version = '0.8.0'} -serde = {features = ['derive'], optional = true, version = '1.0.101'} +codec = { default-features = false, features = ["derive"], package = "parity-scale-codec", version = "2.0.0" } +primitive-types = { default-features = false, version = "0.8.0" } +serde = { features = ["derive"], optional = true, version = "1.0.101" } -hydra-dx-math = {default-features = false, version = "3.3.0"} +hydra-dx-math = { default-features = false, version = "3.3.0" } ## Local dependencies primitives = { default-features = false, path = "../../primitives" } ## ORML dependencies -orml-traits = {default-features = false, version = "0.4.1-dev"} +orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "8d5432c3458702a7df14b374bddde43a2a20aa43", default-features = false } ## Substrate dependencies -frame-benchmarking = {default-features = false, optional = true, version = '3.0.0'} -frame-support = {default-features = false, version = '3.0.0'} -frame-system = {default-features = false, version = '3.0.0'} -frame-system-benchmarking = {default-features = false, optional = true, version = '3.0.0'} -sp-std = {default-features = false, version = '3.0.0'} +frame-benchmarking = { git = "https://github.com/paritytech/substrate", 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 } +frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9", default-features = false, optional = true } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9", default-features = false } # Needed for benchmarks -orml-tokens = {default-features = false, version = "0.4.1-dev"} -sp-core = {default-features = false, version = '3.0.0'} -sp-runtime = {default-features = false, version = '3.0.0'} +orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "8d5432c3458702a7df14b374bddde43a2a20aa43", default-features = false } +sp-core = { 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 } [dev-dependencies] -sp-io = {default-features = false, version = '3.0.0'} +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9", default-features = false } [features] -default = ['std'] +default = ["std"] runtime-benchmarks = [ - "frame-benchmarking", - "frame-system/runtime-benchmarks", - "frame-support/runtime-benchmarks", + "frame-benchmarking", + "frame-system/runtime-benchmarks", + "frame-support/runtime-benchmarks", ] std = [ - 'serde', - 'codec/std', - 'frame-support/std', - 'frame-system/std', - 'orml-tokens/std', - 'orml-traits/std', - 'sp-runtime/std', - 'sp-core/std', - 'sp-std/std', - 'primitives/std', + "serde", + "codec/std", + "frame-support/std", + "frame-system/std", + "orml-tokens/std", + "orml-traits/std", + "sp-runtime/std", + "sp-core/std", + "sp-std/std", + "primitives/std", ] diff --git a/pallets/lbp/src/benchmarking.rs b/pallets/lbp/src/benchmarking.rs index 4c6b9f83f65..cc4fa79ab73 100644 --- a/pallets/lbp/src/benchmarking.rs +++ b/pallets/lbp/src/benchmarking.rs @@ -287,14 +287,14 @@ mod tests { #[test] fn test_benchmarks() { new_test_ext().execute_with(|| { - assert_ok!(test_benchmark_create_pool::()); - assert_ok!(test_benchmark_update_pool_data::()); - assert_ok!(test_benchmark_pause_pool::()); - assert_ok!(test_benchmark_unpause_pool::()); - assert_ok!(test_benchmark_add_liquidity::()); - assert_ok!(test_benchmark_remove_liquidity::()); - assert_ok!(test_benchmark_sell::()); - assert_ok!(test_benchmark_buy::()); + assert_ok!(Pallet::::test_benchmark_create_pool()); + assert_ok!(Pallet::::test_benchmark_update_pool_data()); + assert_ok!(Pallet::::test_benchmark_pause_pool()); + assert_ok!(Pallet::::test_benchmark_unpause_pool()); + assert_ok!(Pallet::::test_benchmark_add_liquidity()); + assert_ok!(Pallet::::test_benchmark_remove_liquidity()); + assert_ok!(Pallet::::test_benchmark_sell()); + assert_ok!(Pallet::::test_benchmark_buy()); }); } } diff --git a/pallets/lbp/src/mock.rs b/pallets/lbp/src/mock.rs index 6c3c1668066..24b003b9d5e 100644 --- a/pallets/lbp/src/mock.rs +++ b/pallets/lbp/src/mock.rs @@ -89,6 +89,7 @@ impl orml_tokens::Config for Test { type ExistentialDeposits = ExistentialDeposits; type OnDust = (); type MaxLocks = (); + type DustRemovalWhitelist = (); } pub struct AssetPairPoolIdTest(); diff --git a/pallets/nft/Cargo.toml b/pallets/nft/Cargo.toml index 4bcfc0f8482..dae05b26817 100644 --- a/pallets/nft/Cargo.toml +++ b/pallets/nft/Cargo.toml @@ -1,49 +1,49 @@ [package] -name = 'pallet-nft' -authors = ['GalacticCoucil'] -description = 'Simple NFT pallet for creating tokens' -edition = '2018' -homepage = 'https://github.com/galacticcouncil/Basilisk-node' -license = 'Unlicense' -repository = 'https://github.com/galacticcouncil/Basilisk-node' -version = '1.0.0' +name = "pallet-nft" +version = "1.0.0" +description = "Simple NFT pallet for creating tokens" +authors = ["GalacticCoucil"] +edition = "2018" +homepage = "https://github.com/galacticcouncil/Basilisk-node" +license = "Apache 2.0" +repository = "https://github.com/galacticcouncil/Basilisk-node" [package.metadata.docs.rs] -targets = ['x86_64-unknown-linux-gnu'] +targets = ["x86_64-unknown-linux-gnu"] [dependencies] -codec = { default-features = false, features = ['derive'], package = 'parity-scale-codec', version = '2.0.0' } -frame-benchmarking = { version = "3.1.0", default-features = false, optional = true } -frame-support = { default-features = false, version = '3.0.0' } -frame-system = { default-features = false, version = '3.0.0' } -orml-nft = { default-features = false, version = '0.4.0' } -orml-utilities = { default-features = false, version = '0.4.1-dev' } +codec = { default-features = false, features = ["derive"], package = "parity-scale-codec", version = "2.0.0" } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", 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 } +orml-nft = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "8d5432c3458702a7df14b374bddde43a2a20aa43", default-features = false } +orml-utilities = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "8d5432c3458702a7df14b374bddde43a2a20aa43", default-features = false } serde = { version = "1.0.111", optional = true, features = ["derive"] } -sp-runtime = { default-features = false, version = '3.0.0' } -sp-std = { default-features = false, version = '3.0.0' } +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 } # local dependency primitives = { default-features = false, path = "../../primitives" } [dev-dependencies] -pallet-balances = { version = "3.0.0" } -sp-core = { default-features = false, version = '3.0.0' } -sp-io = { default-features = false, version = '3.0.0' } -sp-runtime = { default-features = false, version = '3.0.0' } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" } +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-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9", default-features = false } [features] -default = ['std'] +default = ["std"] std = [ - 'serde/std', - 'codec/std', - 'frame-support/std', - 'frame-system/std', - 'sp-std/std', - 'sp-runtime/std', - 'orml-nft/std', + "serde/std", + "codec/std", + "frame-support/std", + "frame-system/std", + "sp-std/std", + "sp-runtime/std", + "orml-nft/std", ] runtime-benchmarks = [ - "frame-benchmarking", - "frame-support/runtime-benchmarks", - "frame-system/runtime-benchmarks", -] + "frame-benchmarking", + "frame-support/runtime-benchmarks", + "frame-system/runtime-benchmarks", +] diff --git a/pallets/nft/src/benchmarking.rs b/pallets/nft/src/benchmarking.rs index dca82e5388a..a4bd768b5eb 100644 --- a/pallets/nft/src/benchmarking.rs +++ b/pallets/nft/src/benchmarking.rs @@ -133,13 +133,13 @@ mod tests { #[test] fn test_benchmarks() { new_test_ext().execute_with(|| { - assert_ok!(test_benchmark_create_class::()); - assert_ok!(test_benchmark_mint::()); - assert_ok!(test_benchmark_transfer::()); - assert_ok!(test_benchmark_burn::()); - assert_ok!(test_benchmark_destroy_class::()); - assert_ok!(test_benchmark_buy_from_pool::()); - assert_ok!(test_benchmark_sell_to_pool::()); + assert_ok!(Pallet::::test_benchmark_create_class()); + assert_ok!(Pallet::::test_benchmark_mint()); + assert_ok!(Pallet::::test_benchmark_transfer()); + assert_ok!(Pallet::::test_benchmark_burn()); + assert_ok!(Pallet::::test_benchmark_destroy_class()); + assert_ok!(Pallet::::test_benchmark_buy_from_pool()); + assert_ok!(Pallet::::test_benchmark_sell_to_pool()); }); } } diff --git a/pallets/nft/src/mock.rs b/pallets/nft/src/mock.rs index 1a9b95103a5..e0e3f02aa86 100644 --- a/pallets/nft/src/mock.rs +++ b/pallets/nft/src/mock.rs @@ -46,11 +46,18 @@ impl pallet_nft::Config for Test { type ClassBondDuration = ClassBondDuration; } +parameter_types! { + pub const MaxClassMetadata: u32 = 1024; + pub const MaxTokenMetadata: u32 = 1024; +} + impl orml_nft::Config for Test { type ClassId = u64; type TokenId = u64; type ClassData = pallet_nft::ClassData; type TokenData = pallet_nft::TokenData; + type MaxClassMetadata = MaxClassMetadata; + type MaxTokenMetadata = MaxTokenMetadata; } parameter_types! { diff --git a/pallets/offchain-duster/Cargo.toml b/pallets/offchain-duster/Cargo.toml index b86715114f3..7df9b647807 100644 --- a/pallets/offchain-duster/Cargo.toml +++ b/pallets/offchain-duster/Cargo.toml @@ -1,73 +1,67 @@ [package] -authors = ['GalacticCouncil'] -description = 'Account offchain duster' -edition = '2018' -homepage = 'https://github.com/galacticcouncil/Basilisk-node' -license = 'Apache 2.0' -name = 'pallet-offchain-duster' -repository = 'https://github.com/galacticcouncil/Basilisk-node' -version = '1.0.0' +name = "pallet-offchain-duster" +version = "1.0.0" +description = "Account duster offchain worker" +authors = ["GalacticCouncil"] +edition = "2018" +homepage = "https://github.com/galacticcouncil/Basilisk-node" +license = "Apache 2.0" +repository = "https://github.com/galacticcouncil/Basilisk-node" [package.metadata.docs.rs] -targets = ['x86_64-unknown-linux-gnu'] +targets = ["x86_64-unknown-linux-gnu"] [build-dependencies] -substrate-wasm-builder = {package = 'substrate-wasm-builder', version = '3.0.0'} - -# alias "parity-scale-code" to "codec" -[dependencies.codec] -default-features = false -features = ['derive'] -package = 'parity-scale-codec' -version = '2.0.0' +substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" } [dependencies] -primitive-types = {default-features = false, version = '0.8.0'} -serde = {features = ['derive'], optional = true, version = '1.0.101'} +codec = { default-features = false, features = ["derive"], package = "parity-scale-codec", version = "2.0.0" } +primitive-types = { default-features = false, version = "0.8.0" } +serde = { features = ["derive"], optional = true, version = "1.0.101" } +lazy_static = { features = ["spin_no_std"], version = "1.4.0" } # Local dependencies -pallet-asset-registry = {path = '../asset-registry', default-features = false} -primitives = {path = '../../primitives', default-features = false} -pallet-duster = {path = '../duster', default-features = false} +pallet-asset-registry = { path = "../asset-registry", default-features = false } +primitives = { path = "../../primitives", default-features = false } +pallet-duster = { path = "../duster", default-features = false } # ORML dependencies -orml-tokens = {default-features = false, version = "0.4.1-dev"} -orml-traits = {default-features = false, version = "0.4.1-dev"} -orml-utilities = {default-features = false, version = "0.4.1-dev"} +orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "8d5432c3458702a7df14b374bddde43a2a20aa43", default-features = false } +orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "8d5432c3458702a7df14b374bddde43a2a20aa43", default-features = false } +orml-utilities = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "8d5432c3458702a7df14b374bddde43a2a20aa43", default-features = false } # Substrate dependencies -frame-benchmarking = {default-features = false, optional = true, version = '3.0.0'} -frame-support = {default-features = false, version = '3.0.0'} -frame-system = {default-features = false, version = '3.0.0'} -frame-system-benchmarking = {default-features = false, optional = true, version = '3.0.0'} -sp-core = {default-features = false, version = '3.0.0'} -sp-runtime = {default-features = false, version = '3.0.0'} -sp-io = {default-features = false, version = '3.0.0'} -sp-std = {default-features = false, version = '3.0.0'} -sp-keystore = {default-features = false, version = '0.9.0'} -lazy_static = {features = ['spin_no_std'], version = "1.4.0"} +frame-benchmarking = { 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.9", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9", default-features = false } +frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9", default-features = false, optional = true } +sp-core = { 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-io = { 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-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9", default-features = false } [dev-dependencies] -sp-io = {default-features = false, version = '3.0.0'} +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9", default-features = false } [features] -default = ['std'] +default = ["std"] runtime-benchmarks = [ - "frame-benchmarking", - "frame-system/runtime-benchmarks", - "frame-support/runtime-benchmarks", + "frame-benchmarking", + "frame-system/runtime-benchmarks", + "frame-support/runtime-benchmarks", ] std = [ - 'serde', - 'codec/std', - 'frame-support/std', - 'frame-system/std', - 'sp-runtime/std', - 'sp-core/std', - 'sp-std/std', - 'orml-tokens/std', - 'orml-traits/std', - 'primitives/std', - 'sp-keystore/std', - 'lazy_static/spin_no_std', + "serde", + "codec/std", + "frame-support/std", + "frame-system/std", + "sp-runtime/std", + "sp-core/std", + "sp-std/std", + "orml-tokens/std", + "orml-traits/std", + "primitives/std", + "sp-keystore/std", + "lazy_static/spin_no_std", ] diff --git a/pallets/transaction-multi-payment/Cargo.toml b/pallets/transaction-multi-payment/Cargo.toml index 0db76a91602..01f805fc03a 100644 --- a/pallets/transaction-multi-payment/Cargo.toml +++ b/pallets/transaction-multi-payment/Cargo.toml @@ -1,68 +1,62 @@ [package] -authors = ['GalacticCoucil'] -description = 'Transaction multi currency payment support module' -edition = '2018' -homepage = 'https://github.com/galacticcouncil/basilisk-node' -license = 'Apache 2.0' -name = 'pallet-transaction-multi-payment' -repository = 'https://github.com/galacticcouncil/basilisk-node' -version = '4.1.0' +name = "pallet-transaction-multi-payment" +version = "4.1.0" +description = "Transaction multi currency payment support module" +authors = ["GalacticCoucil"] +edition = "2018" +homepage = "https://github.com/galacticcouncil/basilisk-node" +license = "Apache 2.0" +repository = "https://github.com/galacticcouncil/basilisk-node" [package.metadata.docs.rs] -targets = ['x86_64-unknown-linux-gnu'] +targets = ["x86_64-unknown-linux-gnu"] [build-dependencies] -substrate-wasm-builder = '4.0.0' - -# alias "parity-scale-code" to "codec" -[dependencies.codec] -default-features = false -features = ['derive'] -package = 'parity-scale-codec' -version = '2.0.0' +substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" } [dependencies] -primitive-types = {default-features = false, version = '0.8.0'} -serde = {features = ['derive'], optional = true, version = '1.0.101'} +codec = { default-features = false, features = ["derive"], package = "parity-scale-codec", version = "2.0.0" } +primitive-types = { default-features = false, version = "0.8.0" } +serde = { features = ["derive"], optional = true, version = "1.0.101" } # Local dependecies -primitives = {path = '../../primitives', default-features = false} +primitives = { path = "../../primitives", default-features = false } # ORML dependencies -orml-tokens = {default-features = false, version = "0.4.1-dev"} -orml-traits = {default-features = false, version = "0.4.1-dev"} -orml-utilities = {default-features = false, version = "0.4.1-dev"} +orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "8d5432c3458702a7df14b374bddde43a2a20aa43", default-features = false } +orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "8d5432c3458702a7df14b374bddde43a2a20aa43", default-features = false } +orml-utilities = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "8d5432c3458702a7df14b374bddde43a2a20aa43", default-features = false } # Substrate dependencies -frame-support = {default-features = false, version = '3.0.0'} -frame-system = {default-features = false, version = '3.0.0'} -sp-api = {default-features = false, version = '3.0.0'} -sp-core = {default-features = false, version = '3.0.0'} -sp-runtime = {default-features = false, version = '3.0.0'} -sp-std = {default-features = false, version = '3.0.0'} -pallet-transaction-payment = {default-features = false, version = '3.0.0'} +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 } +sp-api = { 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.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 } +pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9", default-features = false } # These 2 dependencies are for testing only. But need to be here for benchmarking pallet - could not figure out why yet -pallet-asset-registry = {path = '../asset-registry', default-features = false} -pallet-balances = {default-features = false, version = '3.0.0'} +pallet-asset-registry = { path = "../asset-registry", default-features = false } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9", default-features = false } [dev-dependencies] -orml-currencies = {default-features = false, version = "0.4.1-dev"} -pallet-xyk = {path = '../xyk', default-features = false} -sp-io = {default-features = false, version = '3.0.0'} +orml-currencies = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "8d5432c3458702a7df14b374bddde43a2a20aa43", default-features = false } +pallet-xyk = { path = "../xyk", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9", default-features = false } [features] -default = ['std'] +default = ["std"] std = [ - 'serde/std', - 'codec/std', - 'sp-core/std', - 'sp-api/std', - 'frame-support/std', - 'frame-system/std', - 'sp-runtime/std', - 'orml-tokens/std', - 'orml-traits/std', - 'pallet-balances/std', - 'pallet-asset-registry/std', + "serde/std", + "codec/std", + "sp-core/std", + "sp-api/std", + "frame-support/std", + "frame-system/std", + "sp-runtime/std", + "orml-tokens/std", + "orml-traits/std", + "pallet-balances/std", + "pallet-asset-registry/std", ] diff --git a/pallets/transaction-multi-payment/benchmarking/Cargo.toml b/pallets/transaction-multi-payment/benchmarking/Cargo.toml index 5dab7c30982..f22a5511f6e 100644 --- a/pallets/transaction-multi-payment/benchmarking/Cargo.toml +++ b/pallets/transaction-multi-payment/benchmarking/Cargo.toml @@ -1,69 +1,63 @@ [package] -authors = ['GalacticCouncil'] -description = 'Transaction Payment Benchmarking Module' -edition = '2018' -homepage = 'https://github.com/galacticcouncil/basilisk-node' -license = 'Apache 2.0' -name = 'pallet-multi-payment-benchmarking' -repository = 'https://github.com/galacticcouncil/basilisk-node' -version = '4.0.0' +name = "pallet-multi-payment-benchmarking" +version = "4.0.0" +description = "Transaction Payment Benchmarking Module" +authors = ["GalacticCouncil"] +edition = "2018" +homepage = "https://github.com/galacticcouncil/basilisk-node" +license = "Apache 2.0" +repository = "https://github.com/galacticcouncil/basilisk-node" [package.metadata.docs.rs] -targets = ['x86_64-unknown-linux-gnu'] +targets = ["x86_64-unknown-linux-gnu"] [build-dependencies] -substrate-wasm-builder = '4.0.0' - -# alias "parity-scale-code" to "codec" -[dependencies.codec] -default-features = false -features = ['derive'] -package = 'parity-scale-codec' -version = '2.0.0' +substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" } [dependencies] -serde = {features = ['derive'], optional = true, version = '1.0.101'} +codec = { default-features = false, features = ["derive"], package = "parity-scale-codec", version = "2.0.0" } +serde = { features = ["derive"], optional = true, version = "1.0.101" } # Local dependencies -pallet-xyk = {path = '../../xyk', default-features = false} -pallet-asset-registry = {path = '../../asset-registry', default-features = false} -pallet-transaction-multi-payment = {path = '../../transaction-multi-payment', default-features = false} -primitives = {path = '../../../primitives', default-features = false} +pallet-xyk = { path = "../../xyk", default-features = false} +pallet-asset-registry = { path = "../../asset-registry", default-features = false} +pallet-transaction-multi-payment = { path = "../../transaction-multi-payment", default-features = false} +primitives = { path = "../../../primitives", default-features = false} # ORML dependencies -orml-currencies = {default-features = false, version = "0.4.1-dev"} -orml-tokens = {default-features = false, version = "0.4.1-dev"} -orml-traits = {default-features = false, version = "0.4.1-dev"} -orml-utilities = {default-features = false, version = "0.4.1-dev"} +orml-currencies = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "8d5432c3458702a7df14b374bddde43a2a20aa43", default-features = false } +orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "8d5432c3458702a7df14b374bddde43a2a20aa43", default-features = false } +orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "8d5432c3458702a7df14b374bddde43a2a20aa43", default-features = false } +orml-utilities = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "8d5432c3458702a7df14b374bddde43a2a20aa43", default-features = false } # Substrate dependencies -frame-benchmarking = {default-features = false, version = '3.0.0'} -frame-support = {default-features = false, version = '3.0.0'} -frame-system = {default-features = false, version = '3.0.0'} -frame-system-benchmarking = {default-features = false, version = '3.0.0'} +frame-benchmarking = { 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.9", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9", default-features = false } +frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9", default-features = false } -pallet-balances = {default-features = false, version = "3.0.0"} -pallet-transaction-payment = {default-features = false, version = '3.0.0'} +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9", default-features = false } +pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9", default-features = false } -sp-std = {default-features = false, version = '3.0.0'} -sp-core = {default-features = false, version = '3.0.0'} -sp-runtime = {default-features = false, version = '3.0.0'} +sp-std = { 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.9", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9", default-features = false } [dev-dependencies] -sp-io = {default-features = false, version = '3.0.0'} +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9", default-features = false } [features] -default = ['std'] +default = ["std"] std = [ - 'serde', - 'codec/std', - 'frame-support/std', - 'frame-system/std', - 'sp-std/std', - 'sp-runtime/std', - 'primitives/std', - 'pallet-xyk/std', - 'pallet-asset-registry/std', - 'pallet-transaction-multi-payment/std', + "serde", + "codec/std", + "frame-support/std", + "frame-system/std", + "sp-std/std", + "sp-runtime/std", + "primitives/std", + "pallet-xyk/std", + "pallet-asset-registry/std", + "pallet-transaction-multi-payment/std", "frame-benchmarking/std", ] diff --git a/pallets/transaction-multi-payment/benchmarking/src/lib.rs b/pallets/transaction-multi-payment/benchmarking/src/lib.rs index 6601a3ca3b8..6585d39e48d 100644 --- a/pallets/transaction-multi-payment/benchmarking/src/lib.rs +++ b/pallets/transaction-multi-payment/benchmarking/src/lib.rs @@ -142,12 +142,12 @@ mod tests { #[test] fn test_benchmarks() { ExtBuilder::default().base_weight(5).build().execute_with(|| { - assert_ok!(test_benchmark_swap_currency::()); - assert_ok!(test_benchmark_set_currency::()); - assert_ok!(test_benchmark_add_currency::()); - assert_ok!(test_benchmark_remove_currency::()); - assert_ok!(test_benchmark_add_member::()); - assert_ok!(test_benchmark_remove_member::()); + assert_ok!(Pallet::::test_benchmark_swap_currency()); + assert_ok!(Pallet::::test_benchmark_set_currency()); + assert_ok!(Pallet::::test_benchmark_add_currency()); + assert_ok!(Pallet::::test_benchmark_remove_currency()); + assert_ok!(Pallet::::test_benchmark_add_member()); + assert_ok!(Pallet::::test_benchmark_remove_member()); }); } } diff --git a/pallets/transaction-multi-payment/benchmarking/src/mock.rs b/pallets/transaction-multi-payment/benchmarking/src/mock.rs index d7ead942a9a..8bd779a9922 100644 --- a/pallets/transaction-multi-payment/benchmarking/src/mock.rs +++ b/pallets/transaction-multi-payment/benchmarking/src/mock.rs @@ -69,7 +69,7 @@ frame_support::construct_runtime!( Currencies: orml_currencies::{Pallet, Event}, Tokens: orml_tokens::{Pallet, Event}, AssetRegistry: pallet_asset_registry::{Pallet, Storage}, - transaction_payment: pallet_transaction_payment::{Pallet, Storage}, + TransactionPayment: pallet_transaction_payment::{Pallet, Storage}, } ); @@ -186,6 +186,7 @@ impl orml_tokens::Config for Test { type ExistentialDeposits = ExistentialDeposits; type OnDust = (); type MaxLocks = (); + type DustRemovalWhitelist = (); } impl orml_currencies::Config for Test { diff --git a/pallets/transaction-multi-payment/src/mock.rs b/pallets/transaction-multi-payment/src/mock.rs index c047c099232..edc7ac7d6b4 100644 --- a/pallets/transaction-multi-payment/src/mock.rs +++ b/pallets/transaction-multi-payment/src/mock.rs @@ -77,7 +77,7 @@ frame_support::construct_runtime!( { System: frame_system::{Pallet, Call, Config, Storage, Event}, PaymentPallet: multi_payment::{Pallet, Call, Storage, Event}, - transaction_payment: pallet_transaction_payment::{Pallet, Storage}, + TransactionPayment: pallet_transaction_payment::{Pallet, Storage}, XYKPallet: pallet_xyk::{Pallet, Call, Storage, Event}, Balances: pallet_balances::{Pallet,Call, Storage,Config, Event}, Currencies: orml_currencies::{Pallet, Event}, @@ -216,6 +216,7 @@ impl orml_tokens::Config for Test { type ExistentialDeposits = ExistentialDeposits; type OnDust = (); type MaxLocks = (); + type DustRemovalWhitelist = (); } impl orml_currencies::Config for Test { diff --git a/pallets/xyk/Cargo.toml b/pallets/xyk/Cargo.toml index 35c28c74d39..8774a00dc68 100644 --- a/pallets/xyk/Cargo.toml +++ b/pallets/xyk/Cargo.toml @@ -1,69 +1,63 @@ [package] +name = 'pallet-xyk' +version = '1.3.0' +description = 'XYK automated market maker' authors = ['GalacticCouncil'] -description = 'XYK Pallet' edition = '2018' homepage = 'https://github.com/galacticcouncil/basilisk-node' license = 'Apache 2.0' -name = 'pallet-xyk' repository = 'https://github.com/galacticcouncil/basilisk-node' -version = '1.3.0' [package.metadata.docs.rs] targets = ['x86_64-unknown-linux-gnu'] [build-dependencies] -substrate-wasm-builder = '4.0.0' - -# alias "parity-scale-code" to "codec" -[dependencies.codec] -default-features = false -features = ['derive'] -package = 'parity-scale-codec' -version = '2.0.0' +substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" } [dependencies] -primitive-types = {default-features = false, version = '0.8.0'} -serde = {features = ['derive'], optional = true, version = '1.0.101'} +codec = { default-features = false, features = ["derive"], package = "parity-scale-codec", version = "2.0.0" } +primitive-types = { default-features = false, version = '0.8.0' } +serde = { features = ['derive'], optional = true, version = '1.0.101' } -hydra-dx-math = {default-features = false, version = "3.3.0"} +hydra-dx-math = { default-features = false, version = "3.3.0" } # Local dependencies -pallet-asset-registry = {path = '../asset-registry', default-features = false} -primitives = {path = '../../primitives', default-features = false} +pallet-asset-registry = { path = '../asset-registry', default-features = false } +primitives = { path = '../../primitives', default-features = false } # ORML dependencies -orml-tokens = {default-features = false, version = "0.4.1-dev"} -orml-traits = {default-features = false, version = "0.4.1-dev"} -orml-utilities = {default-features = false, version = "0.4.1-dev"} +orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "8d5432c3458702a7df14b374bddde43a2a20aa43", default-features = false } +orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "8d5432c3458702a7df14b374bddde43a2a20aa43", default-features = false } +orml-utilities = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "8d5432c3458702a7df14b374bddde43a2a20aa43", default-features = false } # Substrate dependencies -frame-benchmarking = {default-features = false, optional = true, version = '3.0.0'} -frame-support = {default-features = false, version = '3.0.0'} -frame-system = {default-features = false, version = '3.0.0'} -frame-system-benchmarking = {default-features = false, optional = true, version = '3.0.0'} -sp-core = {default-features = false, version = '3.0.0'} -sp-runtime = {default-features = false, version = '3.0.0'} -sp-std = {default-features = false, version = '3.0.0'} +frame-benchmarking = { git = "https://github.com/paritytech/substrate", 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 } +frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9", default-features = false, optional = true } +sp-core = { 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 } [dev-dependencies] -sp-io = {default-features = false, version = '3.0.0'} +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9", default-features = false } [features] default = ['std'] runtime-benchmarks = [ - "frame-benchmarking", - "frame-system/runtime-benchmarks", - "frame-support/runtime-benchmarks", + "frame-benchmarking", + "frame-system/runtime-benchmarks", + "frame-support/runtime-benchmarks", ] std = [ - 'serde', - 'codec/std', - 'frame-support/std', - 'frame-system/std', - 'sp-runtime/std', - 'sp-core/std', - 'sp-std/std', - 'orml-tokens/std', - 'orml-traits/std', - 'primitives/std', + 'serde', + 'codec/std', + 'frame-support/std', + 'frame-system/std', + 'sp-runtime/std', + 'sp-core/std', + 'sp-std/std', + 'orml-tokens/std', + 'orml-traits/std', + 'primitives/std', ] diff --git a/pallets/xyk/rpc/Cargo.toml b/pallets/xyk/rpc/Cargo.toml index f9ff2fa7368..685f53e01d6 100644 --- a/pallets/xyk/rpc/Cargo.toml +++ b/pallets/xyk/rpc/Cargo.toml @@ -1,45 +1,39 @@ [package] -authors = ['GalacticCouncil'] -edition = "2018" -license = 'Apache 2.0' -repository = 'https://github.com/galacticcouncil/basilisk-node' name = "pallet-xyk-rpc" -version = '1.0.0' +version = "1.0.0" +authors = ["GalacticCouncil"] +edition = "2018" +license = "Apache 2.0" +repository = "https://github.com/galacticcouncil/basilisk-node" [dependencies.pallet-xyk-rpc-runtime-api] default-features = false -package = 'pallet-xyk-rpc-runtime-api' -path = 'runtime-api' +package = "pallet-xyk-rpc-runtime-api" +path = "runtime-api" [package.metadata.docs.rs] -targets = ['x86_64-unknown-linux-gnu'] +targets = ["x86_64-unknown-linux-gnu"] [build-dependencies] -substrate-wasm-builder = '4.0.0' - -# alias "parity-scale-code" to "codec" -[dependencies.codec] -default-features = false -features = ['derive'] -package = 'parity-scale-codec' -version = '2.0.0' +substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" } [dependencies] -jsonrpc-core = {default-features = false, version = '15.0.0'} -jsonrpc-core-client = {default-features = false, version = '15.0.0'} -jsonrpc-derive = {default-features = false, version = '15.0.0'} -serde = {features = ['derive'], optional = true, version = '1.0.101'} +codec = { default-features = false, features = ["derive"], package = "parity-scale-codec", version = "2.0.0" } +jsonrpc-core = { default-features = false, version = "15.0.0" } +jsonrpc-core-client = { default-features = false, version = "15.0.0" } +jsonrpc-derive = { default-features = false, version = "15.0.0" } +serde = { features = ["derive"], optional = true, version = "1.0.101" } # Substrate dependencies -sp-api = {default-features = false, version = '3.0.0'} -sp-blockchain = {default-features = false, version = '3.0.0'} -sp-runtime = {default-features = false, version = '3.0.0'} -sp-std = {default-features = false, version = '3.0.0'} +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9", default-features = false } +sp-blockchain = { 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 } [features] -default = ['std'] +default = ["std"] std = [ - 'pallet-xyk-rpc-runtime-api/std', - 'serde', - 'codec/std', + "pallet-xyk-rpc-runtime-api/std", + "serde", + "codec/std", ] diff --git a/pallets/xyk/rpc/runtime-api/Cargo.toml b/pallets/xyk/rpc/runtime-api/Cargo.toml index fe0f9835756..8002e38b9b5 100644 --- a/pallets/xyk/rpc/runtime-api/Cargo.toml +++ b/pallets/xyk/rpc/runtime-api/Cargo.toml @@ -1,38 +1,32 @@ [package] -authors = ['GalacticCouncil'] -license = 'Apache 2.0' name = "pallet-xyk-rpc-runtime-api" -repository = 'https://github.com/galacticcouncil/basilisk-node' -version = '3.0.0' +version = "3.0.0" +authors = ["GalacticCouncil"] +license = "Apache 2.0" +repository = "https://github.com/galacticcouncil/basilisk-node" edition = "2018" [package.metadata.docs.rs] -targets = ['x86_64-unknown-linux-gnu'] +targets = ["x86_64-unknown-linux-gnu"] [build-dependencies] -substrate-wasm-builder = '4.0.0' - -# alias "parity-scale-code" to "codec" -[dependencies.codec] -default-features = false -features = ['derive'] -package = 'parity-scale-codec' -version = '2.0.0' +substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" } [dependencies] -serde = { features = ['derive'], optional = true, version = '1.0.101' } +codec = { default-features = false, features = ["derive"], package = "parity-scale-codec", version = "2.0.0" } +serde = { features = ["derive"], optional = true, version = "1.0.101" } # Substrate dependencies -sp-std = { default-features = false, version = '3.0.0' } -sp-api = { default-features = false, version = '3.0.0' } -sp-runtime = { default-features = false, version = '3.0.0' } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9", 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", branch = "polkadot-v0.9.9", default-features = false } [features] default = ["std"] std = [ - "serde", - "codec/std", - "sp-api/std", - "sp-runtime/std", - "sp-std/std", + "serde", + "codec/std", + "sp-api/std", + "sp-runtime/std", + "sp-std/std", ] diff --git a/pallets/xyk/src/benchmarking.rs b/pallets/xyk/src/benchmarking.rs index 42eddb61010..9c71c5c4832 100644 --- a/pallets/xyk/src/benchmarking.rs +++ b/pallets/xyk/src/benchmarking.rs @@ -135,11 +135,11 @@ mod tests { #[test] fn test_benchmarks() { new_test_ext().execute_with(|| { - assert_ok!(test_benchmark_create_pool::()); - assert_ok!(test_benchmark_add_liquidity::()); - assert_ok!(test_benchmark_remove_liquidity::()); - assert_ok!(test_benchmark_sell::()); - assert_ok!(test_benchmark_buy::()); + assert_ok!(Pallet::::test_benchmark_create_pool()); + assert_ok!(Pallet::::test_benchmark_add_liquidity()); + assert_ok!(Pallet::::test_benchmark_remove_liquidity()); + assert_ok!(Pallet::::test_benchmark_sell()); + assert_ok!(Pallet::::test_benchmark_buy()); }); } } diff --git a/pallets/xyk/src/mock.rs b/pallets/xyk/src/mock.rs index ceba0ca3e0a..18bdd61427f 100644 --- a/pallets/xyk/src/mock.rs +++ b/pallets/xyk/src/mock.rs @@ -121,6 +121,7 @@ impl orml_tokens::Config for Test { type ExistentialDeposits = ExistentialDeposits; type OnDust = (); type MaxLocks = (); + type DustRemovalWhitelist = (); } pub struct AssetPairAccountIdTest(); diff --git a/primitives/Cargo.toml b/primitives/Cargo.toml index fee26247a51..6b73676b82e 100644 --- a/primitives/Cargo.toml +++ b/primitives/Cargo.toml @@ -1,40 +1,34 @@ [package] -authors = ['GalacticCouncil'] -edition = '2018' -name = 'primitives' -version = '4.2.0' -repository = 'https://github.com/galacticcouncil/Basilisk-node' +name = "primitives" +version = "4.2.0" +authors = ["GalacticCouncil"] +edition = "2018" +repository = "https://github.com/galacticcouncil/Basilisk-node" [build-dependencies] -substrate-wasm-builder = '4.0.0' - -# alias "parity-scale-code" to "codec" -[dependencies.codec] -default-features = false -features = ['derive'] -package = 'parity-scale-codec' -version = '2.0.0' +substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9", default-features = false } [dependencies] -primitive-types = {default-features = false, version = '0.8.0'} -serde = {features = ['derive'], optional = true, version = '1.0.101'} +codec = { default-features = false, features = ["derive"], package = "parity-scale-codec", version = "2.0.0" } +primitive-types = { default-features = false, version = "0.8.0" } +serde = { features = ["derive"], optional = true, version = "1.0.101" } # Substrate dependencies -frame-support = {default-features = false, version = '3.0.0'} -frame-system = {default-features = false, version = '3.0.0'} -sp-std = {default-features = false, version = '3.0.0'} +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 } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9", default-features = false } [dev-dependencies] -sp-core = {default-features = false, version = '3.0.0'} -sp-io = {default-features = false, version = '3.0.0'} -sp-runtime = {default-features = false, version = '3.0.0'} +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-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9", default-features = false } [features] -default = ['std'] +default = ["std"] std = [ - 'codec/std', - 'primitive-types/std', - 'serde', - 'frame-support/std', - 'sp-std/std', + "codec/std", + "primitive-types/std", + "serde", + "frame-support/std", + "sp-std/std", ] diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml index 736b5a3fc65..9741ce824db 100644 --- a/runtime/Cargo.toml +++ b/runtime/Cargo.toml @@ -1,154 +1,150 @@ [package] -authors = ['GalacticCouncil'] -edition = '2018' -homepage = 'https://github.com/galacticcouncil/Basilisk-node' -license = 'Apache 2.0' -name = 'basilisk-runtime' -repository = 'https://github.com/galacticcouncil/Basilisk-node' -version = '13.0.0' +name = "basilisk-runtime" +version = "14.0.0" +authors = ["GalacticCouncil"] +edition = "2018" +homepage = "https://github.com/galacticcouncil/Basilisk-node" +license = "Apache 2.0" +repository = "https://github.com/galacticcouncil/Basilisk-node" [package.metadata.docs.rs] -targets = ['x86_64-unknown-linux-gnu'] +targets = ["x86_64-unknown-linux-gnu"] [build-dependencies] -substrate-build-script-utils = '3.0.0' -substrate-wasm-builder = '4.0.0' - -[dependencies.polkadot-xcm] -default-features = false -package = 'xcm' -version = '0.9.8' +substrate-build-script-utils = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" } +substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" } [dependencies] getrandom = { version = "0.2.3", features = ["js"] } -hex-literal = { version = '0.3.1' } -tracing-core = { optional = true, version = '0.1.17' } -serde = { features = ['derive'], optional = true, version = '1.0.101' } +hex-literal = "0.3.1" +tracing-core = { optional = true, version = "0.1.17" } +serde = { features = ["derive"], optional = true, version = "1.0.101" } codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] } hash-db = { version = "0.15.2", default-features = false } -memory-db = { version = "0.26.0", default-features = false } -trie-db = { version = "0.22.0", default-features = false } +memory-db = { version = "0.27.0", default-features = false } +trie-db = { version = "0.22.6", default-features = false } smallvec = "1.6.1" # local dependencies -pallet-transaction-multi-payment = {path = "../pallets/transaction-multi-payment", default-features = false} -pallet-multi-payment-benchmarking = { path = "../pallets/transaction-multi-payment/benchmarking", optional=true, default-features= false} -pallet-exchange = {path = "../pallets/exchange", default-features=false} -pallet-exchange-benchmarking = { path = "../pallets/exchange/benchmarking", optional=true, default-features=false} -pallet-asset-registry = {path = "../pallets/asset-registry",default-features=false} -pallet-xyk = { path = "../pallets/xyk",default-features=false} -pallet-duster= { path = "../pallets/duster",default-features=false} -pallet-xyk-rpc-runtime-api = {path = "../pallets/xyk/rpc/runtime-api",default-features=false} -pallet-nft = { path = '../pallets/nft', default-features = false } -pallet-lbp = { path = '../pallets/lbp', default-features = false } +pallet-transaction-multi-payment = { path = "../pallets/transaction-multi-payment", default-features = false} +pallet-multi-payment-benchmarking = { path = "../pallets/transaction-multi-payment/benchmarking", optional = true, default-features = false} +pallet-exchange = { path = "../pallets/exchange", default-features=false} +pallet-exchange-benchmarking = { path = "../pallets/exchange/benchmarking", optional = true, default-features = false} +pallet-asset-registry = { path = "../pallets/asset-registry",default-features = false} +pallet-xyk = { path = "../pallets/xyk",default-features = false} +pallet-duster= { path = "../pallets/duster",default-features = false} +pallet-xyk-rpc-runtime-api = { path = "../pallets/xyk/rpc/runtime-api",default-features = false} +pallet-nft = { path = "../pallets/nft", default-features = false } +pallet-lbp = { path = "../pallets/lbp", default-features = false } primitives = { default-features = false, path = "../primitives" } -pallet-treasury = { version = "3.0.0", default-features = false } -pallet-democracy = { version = "3.0.0", default-features = false } -pallet-scheduler = { version = "3.0.0", default-features = false } -pallet-elections-phragmen = {default-features = false, version = '4.0.0'} -pallet-tips = {default-features = false, version = '=3.0.0'} +pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9", default-features = false } +pallet-democracy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9", default-features = false } +pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9", default-features = false } +pallet-elections-phragmen = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9", default-features = false } +pallet-tips = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9", default-features = false } # collator support -pallet-collator-selection = { default-features=false, version="3.0.0" } -pallet-authorship = { default-features = false, version="3.0.0"} +pallet-collator-selection = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.9", default-features = false } +pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9", default-features = false } # ORML dependencies -orml-currencies = { default-features = false, version = "0.4.1-dev" } -orml-nft = { default-features = false, version = '0.4.0' } -orml-tokens = { default-features = false, version = "0.4.1-dev" } -orml-traits = { default-features = false, version = "0.4.1-dev" } -orml-vesting = { default-features = false, version = "0.4.1-dev" } +orml-currencies = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "8d5432c3458702a7df14b374bddde43a2a20aa43", default-features = false } +orml-nft = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "8d5432c3458702a7df14b374bddde43a2a20aa43", default-features = false } +orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "8d5432c3458702a7df14b374bddde43a2a20aa43", default-features = false } +orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "8d5432c3458702a7df14b374bddde43a2a20aa43", default-features = false } +orml-vesting = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "8d5432c3458702a7df14b374bddde43a2a20aa43", default-features = false } # orml XCM support -orml-xtokens = { default-features = false, version = "0.4.1-dev" } -orml-xcm-support = { default-features = false, version = "0.4.1-dev" } -orml-unknown-tokens = { default-features = false, version = "0.4.1-dev" } +orml-xtokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "8d5432c3458702a7df14b374bddde43a2a20aa43", default-features = false } +orml-xcm-support = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "8d5432c3458702a7df14b374bddde43a2a20aa43", default-features = false } +orml-unknown-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "8d5432c3458702a7df14b374bddde43a2a20aa43", default-features = false } # Cumulus dependencies -cumulus-pallet-aura-ext = { version = "0.1.0", default-features = false} -cumulus-pallet-parachain-system ={ version = "0.1.0", default-features = false} -cumulus-pallet-xcm = { version = "0.1.0", default-features = false} -cumulus-pallet-xcmp-queue = { version = "0.1.0", default-features = false} -cumulus-pallet-dmp-queue = { version = "0.1.0", default-features = false} -cumulus-primitives-core ={ version = "0.1.0", default-features = false} -cumulus-primitives-utility ={ version = "0.1.0", default-features = false} -cumulus-primitives-parachain-inherent ={ version = "0.1.0", default-features = false} -cumulus-primitives-timestamp ={ version = "0.1.0", default-features = false} -parachain-info = { version = "0.1.0", default-features = false} +cumulus-pallet-aura-ext = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.9", default-features = false } +cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.9", default-features = false } +cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.9", default-features = false } +cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.9", default-features = false } +cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.9", default-features = false } +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.9", default-features = false } +cumulus-primitives-utility = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.9", default-features = false } +cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.9", default-features = false } +cumulus-primitives-timestamp = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.9", default-features = false } +parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.9", default-features = false } # Polkadot dependencies -polkadot-parachain = { version = "0.9.8", default-features = false, features = ["wasm-api"]} -xcm-builder = { version = "0.9.8", default-features = false } -pallet-xcm = { version = "0.1.0", default-features = false } -xcm-executor = { version = "0.9.8", default-features = false } +polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.9", default-features = false, features = ["wasm-api"] } +xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.9", default-features = false } +pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.9", default-features = false } +xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.9", default-features = false } +polkadot-xcm = { package = "xcm", git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.9", default-features = false } # Substrate dependencies -frame-benchmarking = { default-features = false, optional = true, version = '3.0.0' } -frame-executive = { default-features = false, version = '3.0.0' } -frame-support = { default-features = false, version = '3.0.0' } -frame-system = { default-features = false, version = '3.0.0' } -frame-system-benchmarking = { default-features = false, optional = true, version = '3.0.0' } -frame-system-rpc-runtime-api = { default-features = false, version = '3.0.0' } -pallet-aura = { default-features = false, version = '3.0.0' } -pallet-balances = { default-features = false, version = '3.0.0' } -pallet-collective = { default-features = false, version= '3.0.0' } -pallet-grandpa = { default-features = false, version = '3.0.0' } -pallet-randomness-collective-flip = { default-features = false, version = '3.0.0' } -pallet-session = { default-features = false, version = '3.0.0' } -pallet-sudo = { default-features = false, version = '3.0.0' } -pallet-timestamp = { default-features = false, version = '3.0.0' } -pallet-transaction-payment = { default-features = false, version = '3.0.0' } -pallet-transaction-payment-rpc-runtime-api = { default-features = false, version = '3.0.0' } -pallet-utility = { default-features = false, version = '3.0.0' } -sp-api = { default-features = false, version = '3.0.0' } -sp-block-builder = { default-features = false, version = '3.0.0' } -sp-consensus-aura = { default-features = false, version = '0.9.0' } -sp-core = { default-features = false, version = '3.0.0' } -sp-inherents = { default-features = false, version = '3.0.0' } -sp-externalities = { default-features = false, version = '0.9.0' } -sp-offchain = { default-features = false, version = '3.0.0' } -sp-runtime = { default-features = false, version = '3.0.0' } -sp-session = { default-features = false, version = '3.0.0' } -sp-std = { default-features = false, version = '3.0.0' } -sp-transaction-pool = { default-features = false, version = '3.0.0' } -sp-version = { default-features = false, version = '3.0.0' } -sp-staking = { default-features = false, version = '3.0.0' } -sp-trie = { default-features = false, version = '3.0.0' } -sp-io = { default-features = false, version = '3.0.0' } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9", default-features = false, optional = true } +frame-executive = { 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.9", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9", default-features = false } +frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9", default-features = false, optional = true } +frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9", default-features = false } +pallet-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9", default-features = false } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9", default-features = false } +pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9", default-features = false } +pallet-grandpa = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9", default-features = false } +pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9", default-features = false } +pallet-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9", default-features = false } +pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9", default-features = false } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9", default-features = false } +pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9", default-features = false } +pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9", default-features = false } +pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9", default-features = false } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9", default-features = false } +sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9", default-features = false } +sp-consensus-aura = { 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.9", default-features = false } +sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9", default-features = false } +sp-externalities = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9", default-features = false } +sp-offchain = { 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-session = { 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-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9", default-features = false } +sp-version = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9", default-features = false } +sp-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9", default-features = false } +sp-trie = { 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 } [features] -default = ['std'] +default = ["std"] runtime-benchmarks = [ - 'frame-benchmarking', - 'frame-support/runtime-benchmarks', - 'frame-system-benchmarking', - 'frame-system/runtime-benchmarks', - 'pallet-balances/runtime-benchmarks', - 'pallet-collective/runtime-benchmarks', - 'pallet-timestamp/runtime-benchmarks', - 'pallet-multi-payment-benchmarking', - 'pallet-nft/runtime-benchmarks', + "frame-benchmarking", + "frame-support/runtime-benchmarks", + "frame-system-benchmarking", + "frame-system/runtime-benchmarks", + "pallet-balances/runtime-benchmarks", + "pallet-collective/runtime-benchmarks", + "pallet-timestamp/runtime-benchmarks", + "pallet-multi-payment-benchmarking", + "pallet-nft/runtime-benchmarks", "pallet-xyk/runtime-benchmarks", "pallet-exchange-benchmarking", "pallet-lbp/runtime-benchmarks", - 'sp-runtime/runtime-benchmarks', - 'pallet-collator-selection/runtime-benchmarks', + "sp-runtime/runtime-benchmarks", + "pallet-collator-selection/runtime-benchmarks", "pallet-xcm/runtime-benchmarks", "xcm-builder/runtime-benchmarks", ] std = [ - 'codec/std', - 'serde', - 'frame-executive/std', - 'frame-support/std', - 'frame-system/std', - 'frame-system-rpc-runtime-api/std', - 'orml-currencies/std', - 'orml-tokens/std', - 'orml-traits/std', - 'orml-vesting/std', + "codec/std", + "serde", + "frame-executive/std", + "frame-support/std", + "frame-system/std", + "frame-system-rpc-runtime-api/std", + "orml-currencies/std", + "orml-tokens/std", + "orml-traits/std", + "orml-vesting/std", "orml-xtokens/std", "orml-xcm-support/std", "orml-unknown-tokens/std", @@ -162,45 +158,46 @@ std = [ "xcm-builder/std", "xcm-executor/std", "pallet-xcm/std", - 'orml-nft/std', - 'parachain-info/std', - 'pallet-xyk/std', - 'pallet-duster/std', - 'pallet-xyk-rpc-runtime-api/std', - 'pallet-asset-registry/std', - 'pallet-exchange/std', - 'pallet-aura/std', - 'pallet-balances/std', - 'pallet-elections-phragmen/std', - 'pallet-grandpa/std', - 'pallet-nft/std', - 'pallet-randomness-collective-flip/std', - 'pallet-session/std', - 'pallet-sudo/std', - 'pallet-timestamp/std', - 'pallet-transaction-payment/std', + "orml-nft/std", + "parachain-info/std", + "pallet-xyk/std", + "pallet-duster/std", + "pallet-xyk-rpc-runtime-api/std", + "pallet-asset-registry/std", + "pallet-exchange/std", + "pallet-aura/std", + "pallet-balances/std", + "pallet-elections-phragmen/std", + "pallet-grandpa/std", + "pallet-nft/std", + "pallet-randomness-collective-flip/std", + "pallet-session/std", + "pallet-sudo/std", + "pallet-timestamp/std", + "pallet-transaction-payment/std", "pallet-transaction-multi-payment/std", - 'pallet-transaction-payment-rpc-runtime-api/std', - 'pallet-lbp/std', - 'pallet-utility/std', - 'sp-api/std', - 'sp-block-builder/std', - 'sp-consensus-aura/std', - 'sp-core/std', + "pallet-transaction-payment-rpc-runtime-api/std", + "pallet-lbp/std", + "pallet-utility/std", + "sp-api/std", + "sp-block-builder/std", + "sp-consensus-aura/std", + "sp-core/std", "sp-io/std", - 'sp-inherents/std', - 'sp-externalities/std', - 'sp-offchain/std', - 'sp-runtime/std', - 'sp-session/std', - 'sp-std/std', - 'sp-transaction-pool/std', - 'sp-version/std', - 'pallet-treasury/std', - 'pallet-collective/std', - 'pallet-democracy/std', - 'pallet-scheduler/std', - 'pallet-tips/std', - 'pallet-collator-selection/std', - 'pallet-authorship/std', + "sp-inherents/std", + "sp-externalities/std", + "sp-offchain/std", + "sp-runtime/std", + "sp-session/std", + "sp-std/std", + "sp-trie/std", + "sp-transaction-pool/std", + "sp-version/std", + "pallet-treasury/std", + "pallet-collective/std", + "pallet-democracy/std", + "pallet-scheduler/std", + "pallet-tips/std", + "pallet-collator-selection/std", + "pallet-authorship/std", ] diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs index 3dce00afe53..0a8d795b623 100644 --- a/runtime/src/lib.rs +++ b/runtime/src/lib.rs @@ -35,7 +35,7 @@ use sp_version::RuntimeVersion; // A few exports that help ease life for downstream crates. pub use frame_support::{ construct_runtime, match_type, parameter_types, - traits::{EnsureOrigin, Filter, Get, KeyOwnerProofSystem, LockIdentifier, Randomness, U128CurrencyToVote}, + traits::{EnsureOrigin, Contains, Get, KeyOwnerProofSystem, LockIdentifier, Randomness, U128CurrencyToVote, Nothing}, weights::{ constants::{BlockExecutionWeight, RocksDbWeight, WEIGHT_PER_SECOND}, DispatchClass, IdentityFee, Pays, Weight, WeightToFeeCoefficient, WeightToFeeCoefficients, @@ -118,7 +118,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { spec_name: create_runtime_str!("basilisk"), impl_name: create_runtime_str!("basilisk"), authoring_version: 1, - spec_version: 13, + spec_version: 14, impl_version: 0, apis: RUNTIME_API_VERSIONS, transaction_version: 1, @@ -185,41 +185,11 @@ pub fn native_version() -> NativeVersion { } pub struct BaseFilter; -impl Filter for BaseFilter { - fn filter(call: &Call) -> bool { +impl Contains for BaseFilter { + fn contains(call: &Call) -> bool { match call { - Call::System(_) - | Call::Timestamp(_) - | Call::ParachainSystem(_) - | Call::Elections(_) - | Call::Democracy(_) - | Call::Scheduler(_) - | Call::Council(_) - | Call::TechnicalCommittee(_) - | Call::Treasury(_) - | Call::Authorship(_) - | Call::CollatorSelection(_) - | Call::Session(_) - | Call::Balances(_) - | Call::AssetRegistry(_) - | Call::Currencies(_) - | Call::Exchange(_) - | Call::MultiTransactionPayment(_) - | Call::Tokens(_) - | Call::Tips(_) - | Call::LBP(_) - | Call::Utility(_) - | Call::Vesting(_) - | Call::NFT(_) - | Call::CumulusXcm(_) - | Call::XTokens(_) - | Call::XcmpQueue(_) - | Call::DmpQueue(_) - | Call::PolkadotXcm(_) - | Call::Duster(_) - | Call::Sudo(_) => true, - Call::XYK(_) => false, + _ => true, } } } @@ -395,6 +365,7 @@ impl orml_tokens::Config for Runtime { type ExistentialDeposits = ExistentialDeposits; type OnDust = (); type MaxLocks = MaxLocks; + type DustRemovalWhitelist = Nothing; } impl orml_currencies::Config for Runtime { @@ -483,6 +454,7 @@ impl cumulus_pallet_parachain_system::Config for Runtime { impl pallet_aura::Config for Runtime { type AuthorityId = AuraId; + type DisabledValidators = (); } impl parachain_info::Config for Runtime {} @@ -504,11 +476,18 @@ impl pallet_nft::Config for Runtime { type ClassBondDuration = ClassBondDuration; } +parameter_types! { + pub const MaxClassMetadata: u32 = 1024; + pub const MaxTokenMetadata: u32 = 1024; +} + impl orml_nft::Config for Runtime { type ClassId = u64; type TokenId = u64; type ClassData = pallet_nft::ClassData; type TokenData = pallet_nft::TokenData; + type MaxClassMetadata = MaxClassMetadata; + type MaxTokenMetadata = MaxTokenMetadata; } parameter_types! { @@ -848,7 +827,7 @@ construct_runtime!( Vesting: orml_vesting::{Pallet, Call, Storage, Event, Config}, // Parachain - ParachainSystem: cumulus_pallet_parachain_system::{Pallet, Call, Storage, Inherent, Event}, + ParachainSystem: cumulus_pallet_parachain_system::{Pallet, Call, Storage, Inherent, Event, ValidateUnsigned}, ParachainInfo: parachain_info::{Pallet, Storage, Config}, // XCM diff --git a/runtime/src/xcm.rs b/runtime/src/xcm.rs index 02a1b2b3423..6d04fbc2db4 100644 --- a/runtime/src/xcm.rs +++ b/runtime/src/xcm.rs @@ -1,11 +1,11 @@ use super::*; use cumulus_primitives_core::ParaId; -use frame_support::traits::All; +use frame_support::traits::{Everything, Nothing}; pub use orml_xcm_support::{IsNativeConcrete, MultiCurrencyAdapter, MultiNativeAsset}; use pallet_xcm::XcmPassthrough; use polkadot_parachain::primitives::Sibling; -use polkadot_xcm::v0::{Junction::*, MultiAsset, MultiLocation, MultiLocation::*, NetworkId, Xcm}; +use polkadot_xcm::v0::{Junction::*, MultiAsset, MultiLocation, MultiLocation::*, NetworkId}; use sp_runtime::traits::Convert; use xcm_builder::{ AccountId32Aliases, AllowTopLevelPaidExecutionFrom, EnsureXcmOrigin, @@ -20,7 +20,7 @@ use polkadot_xcm::opaque::v0::Error; pub type LocalOriginToLocation = SignedToAccountId32; -pub type Barrier = (TakeWeightCredit, AllowTopLevelPaidExecutionFrom>); +pub type Barrier = (TakeWeightCredit, AllowTopLevelPaidExecutionFrom); parameter_types! { pub SelfLocation: MultiLocation = X2(Parent, Parachain(ParachainInfo::get().into())); @@ -149,11 +149,12 @@ impl pallet_xcm::Config for Runtime { type SendXcmOrigin = EnsureXcmOrigin; type XcmRouter = XcmRouter; type ExecuteXcmOrigin = EnsureXcmOrigin; - type XcmExecuteFilter = All<(MultiLocation, Xcm)>; + type XcmExecuteFilter = Everything; type XcmExecutor = XcmExecutor; type XcmTeleportFilter = (); - type XcmReserveTransferFilter = All<(MultiLocation, Vec)>; + type XcmReserveTransferFilter = Nothing; type Weigher = FixedWeightBounds; + type LocationInverter = LocationInverter; } pub struct CurrencyIdConvert; From ca7f35bad64188e8cfae5a34c93b3a83af7f3254 Mon Sep 17 00:00:00 2001 From: Lumir Mrkva Date: Tue, 24 Aug 2021 01:15:24 +0200 Subject: [PATCH 02/15] simplified basic rococo launch config --- rococo-local/config.json | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/rococo-local/config.json b/rococo-local/config.json index 3afe4de5f3c..677207f4cda 100644 --- a/rococo-local/config.json +++ b/rococo-local/config.json @@ -46,28 +46,8 @@ "flags": ["--alice","--", "--execution=wasm"] } ] - }, - { - "bin": "../target/release/basilisk", - "id": "300", - "chain":"local", - "balance": "1000000000000000000000", - "nodes": [ - { - "wsPort": 9999, - "port": 31210, - "flags": ["--alice","--", "--execution=wasm"] - } - ] } ], - "hrmpChannels": [ - { - "sender": 200, - "recipient": 300, - "maxCapacity": 8, - "maxMessageSize": 512 - } - ], + "hrmpChannels": [], "types": {} } From 3e4090ae56cc9c0e5def46eb7ed37132b39d8c6a Mon Sep 17 00:00:00 2001 From: Martin Date: Tue, 24 Aug 2021 12:04:00 +0200 Subject: [PATCH 03/15] orml tokens ed set to 1 to make sure accounts are reaped after dusted --- pallets/duster/src/mock.rs | 3 +-- pallets/duster/src/tests.rs | 4 ++-- runtime/src/lib.rs | 5 ++++- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/pallets/duster/src/mock.rs b/pallets/duster/src/mock.rs index 11aab5b31f1..963fcb6075e 100644 --- a/pallets/duster/src/mock.rs +++ b/pallets/duster/src/mock.rs @@ -19,7 +19,6 @@ use sp_runtime::{ use frame_support::weights::Weight; use primitives::Amount; -use sp_runtime::traits::Zero; use sp_std::cell::RefCell; use sp_std::vec::Vec; @@ -106,7 +105,7 @@ impl system::Config for Test { parameter_type_with_key! { pub ExistentialDeposits: |_currency_id: AssetId| -> Balance { - Zero::zero() + 1u128 }; } diff --git a/pallets/duster/src/tests.rs b/pallets/duster/src/tests.rs index f4da9ea8965..3d414619bcf 100644 --- a/pallets/duster/src/tests.rs +++ b/pallets/duster/src/tests.rs @@ -54,11 +54,11 @@ fn dust_account_with_exact_dust_fails() { #[test] fn dust_account_with_zero_fails() { ExtBuilder::default() - .with_balance(*ALICE, 1, 0) + .with_native_balance(*ALICE, 0) .build() .execute_with(|| { assert_noop!( - Duster::dust_account(Origin::signed(*DUSTER), *ALICE, 1), + Duster::dust_account(Origin::signed(*DUSTER), *ALICE, 0), Error::::ZeroBalance ); assert_eq!(Tokens::free_balance(1, &*TREASURY), 0); diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs index 0a8d795b623..a7dddafd5b2 100644 --- a/runtime/src/lib.rs +++ b/runtime/src/lib.rs @@ -351,7 +351,10 @@ impl pallet_sudo::Config for Runtime { parameter_type_with_key! { pub ExistentialDeposits: |_currency_id: AssetId| -> Balance { - Zero::zero() + // Dusting is handled by duster pallet. + // However, to make sure that account is reaped/killed and storage updated, ED must be > 0 + // On ED = 0 - accounts are never reaped. + 1u128 }; } From 8b879792a3dddc70b719b42f325edb76d1ff1fc2 Mon Sep 17 00:00:00 2001 From: Roznovjak Date: Tue, 24 Aug 2021 16:34:22 +0200 Subject: [PATCH 04/15] fix lbp tests --- pallets/lbp/src/tests.rs | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pallets/lbp/src/tests.rs b/pallets/lbp/src/tests.rs index 9d657070e41..b86d8679487 100644 --- a/pallets/lbp/src/tests.rs +++ b/pallets/lbp/src/tests.rs @@ -1433,7 +1433,6 @@ fn remove_liquidity_should_work() { expect_events(vec![ Event::PoolCreated(ALICE, ACA_DOT_POOL_ID, ACA, DOT, 1_000_000_000, 2_000_000_000).into(), - frame_system::Event::KilledAccount(ACA_DOT_POOL_ID).into(), Event::LiquidityRemoved(ACA_DOT_POOL_ID, ACA, DOT, pool_balance_a_before, pool_balance_b_before).into(), ]); }); @@ -1477,7 +1476,6 @@ fn remove_liquidity_from_paused_pool_should_work() { expect_events(vec![ Event::PoolCreated(ALICE, ACA_DOT_POOL_ID, ACA, DOT, 1_000_000_000, 2_000_000_000).into(), Event::Paused(1, 2003000).into(), - frame_system::Event::KilledAccount(ACA_DOT_POOL_ID).into(), Event::LiquidityRemoved(ACA_DOT_POOL_ID, ACA, DOT, pool_balance_a_before, pool_balance_b_before).into(), ]); }); @@ -1516,7 +1514,6 @@ fn remove_liquidity_from_not_started_pool_should_work() { expect_events(vec![ Event::PoolCreated(ALICE, ACA_DOT_POOL_ID, ACA, DOT, 1_000_000_000, 2_000_000_000).into(), - frame_system::Event::KilledAccount(ACA_DOT_POOL_ID).into(), Event::LiquidityRemoved(ACA_DOT_POOL_ID, ACA, DOT, pool_balance_a_before, pool_balance_b_before).into(), ]); @@ -1573,7 +1570,6 @@ fn remove_liquidity_from_not_started_pool_should_work() { expect_events(vec![ Event::PoolCreated(ALICE, HDX_DOT_POOL_ID, HDX, DOT, 1_000_000_000, 2_000_000_000).into(), - frame_system::Event::KilledAccount(HDX_DOT_POOL_ID).into(), Event::LiquidityRemoved(HDX_DOT_POOL_ID, HDX, DOT, pool_balance_a_before, pool_balance_b_before).into(), ]); }); @@ -1663,7 +1659,6 @@ fn remove_liquidity_from_finalized_pool_should_work() { expect_events(vec![ Event::PoolCreated(ALICE, ACA_DOT_POOL_ID, ACA, DOT, 1_000_000_000, 2_000_000_000).into(), - frame_system::Event::KilledAccount(ACA_DOT_POOL_ID).into(), Event::LiquidityRemoved(ACA_DOT_POOL_ID, ACA, DOT, pool_balance_a_before, pool_balance_b_before).into(), ]); }); From 9c3047bd659f91ca8ba41389cdf67013b2c85eaf Mon Sep 17 00:00:00 2001 From: Roznovjak Date: Tue, 24 Aug 2021 16:53:20 +0200 Subject: [PATCH 05/15] fix xyk tests --- pallets/xyk/src/mock.rs | 4 ++-- runtime/src/lib.rs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pallets/xyk/src/mock.rs b/pallets/xyk/src/mock.rs index 18bdd61427f..2b2ced3ca8d 100644 --- a/pallets/xyk/src/mock.rs +++ b/pallets/xyk/src/mock.rs @@ -23,7 +23,7 @@ use orml_traits::parameter_type_with_key; use sp_core::H256; use sp_runtime::{ testing::Header, - traits::{BlakeTwo256, IdentityLookup, Zero}, + traits::{BlakeTwo256, IdentityLookup, One}, }; use frame_support::traits::{GenesisBuild, Get}; @@ -108,7 +108,7 @@ impl system::Config for Test { parameter_type_with_key! { pub ExistentialDeposits: |_currency_id: AssetId| -> Balance { - Zero::zero() + One::one() }; } diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs index a7dddafd5b2..f1d4203767a 100644 --- a/runtime/src/lib.rs +++ b/runtime/src/lib.rs @@ -22,7 +22,7 @@ use sp_core::{ }; use sp_runtime::{ create_runtime_str, generic, impl_opaque_keys, - traits::{AccountIdConversion, BlakeTwo256, Block as BlockT, IdentifyAccount, IdentityLookup, Verify, Zero}, + traits::{AccountIdConversion, BlakeTwo256, Block as BlockT, IdentifyAccount, IdentityLookup, Verify}, transaction_validity::{TransactionSource, TransactionValidity}, ApplyExtrinsicResult, MultiSignature, }; From 544482e5bc97c2b90fba1949e14b954e0e88cfab Mon Sep 17 00:00:00 2001 From: Roznovjak Date: Tue, 24 Aug 2021 18:08:16 +0200 Subject: [PATCH 06/15] revert lbp tests fix and change existential deposit to allow dusting in lbp tests --- pallets/lbp/src/mock.rs | 4 ++-- pallets/lbp/src/tests.rs | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/pallets/lbp/src/mock.rs b/pallets/lbp/src/mock.rs index 24b003b9d5e..921f12bd7e7 100644 --- a/pallets/lbp/src/mock.rs +++ b/pallets/lbp/src/mock.rs @@ -8,7 +8,7 @@ use primitives::{AssetId, Balance, CORE_ASSET_ID}; use sp_core::H256; use sp_runtime::{ testing::Header, - traits::{BlakeTwo256, IdentityLookup, Zero}, + traits::{BlakeTwo256, IdentityLookup, One}, }; pub type Amount = i128; @@ -76,7 +76,7 @@ impl frame_system::Config for Test { parameter_type_with_key! { pub ExistentialDeposits: |_currency_id: AssetId| -> Balance { - Zero::zero() + One::one() }; } diff --git a/pallets/lbp/src/tests.rs b/pallets/lbp/src/tests.rs index b86d8679487..9d657070e41 100644 --- a/pallets/lbp/src/tests.rs +++ b/pallets/lbp/src/tests.rs @@ -1433,6 +1433,7 @@ fn remove_liquidity_should_work() { expect_events(vec![ Event::PoolCreated(ALICE, ACA_DOT_POOL_ID, ACA, DOT, 1_000_000_000, 2_000_000_000).into(), + frame_system::Event::KilledAccount(ACA_DOT_POOL_ID).into(), Event::LiquidityRemoved(ACA_DOT_POOL_ID, ACA, DOT, pool_balance_a_before, pool_balance_b_before).into(), ]); }); @@ -1476,6 +1477,7 @@ fn remove_liquidity_from_paused_pool_should_work() { expect_events(vec![ Event::PoolCreated(ALICE, ACA_DOT_POOL_ID, ACA, DOT, 1_000_000_000, 2_000_000_000).into(), Event::Paused(1, 2003000).into(), + frame_system::Event::KilledAccount(ACA_DOT_POOL_ID).into(), Event::LiquidityRemoved(ACA_DOT_POOL_ID, ACA, DOT, pool_balance_a_before, pool_balance_b_before).into(), ]); }); @@ -1514,6 +1516,7 @@ fn remove_liquidity_from_not_started_pool_should_work() { expect_events(vec![ Event::PoolCreated(ALICE, ACA_DOT_POOL_ID, ACA, DOT, 1_000_000_000, 2_000_000_000).into(), + frame_system::Event::KilledAccount(ACA_DOT_POOL_ID).into(), Event::LiquidityRemoved(ACA_DOT_POOL_ID, ACA, DOT, pool_balance_a_before, pool_balance_b_before).into(), ]); @@ -1570,6 +1573,7 @@ fn remove_liquidity_from_not_started_pool_should_work() { expect_events(vec![ Event::PoolCreated(ALICE, HDX_DOT_POOL_ID, HDX, DOT, 1_000_000_000, 2_000_000_000).into(), + frame_system::Event::KilledAccount(HDX_DOT_POOL_ID).into(), Event::LiquidityRemoved(HDX_DOT_POOL_ID, HDX, DOT, pool_balance_a_before, pool_balance_b_before).into(), ]); }); @@ -1659,6 +1663,7 @@ fn remove_liquidity_from_finalized_pool_should_work() { expect_events(vec![ Event::PoolCreated(ALICE, ACA_DOT_POOL_ID, ACA, DOT, 1_000_000_000, 2_000_000_000).into(), + frame_system::Event::KilledAccount(ACA_DOT_POOL_ID).into(), Event::LiquidityRemoved(ACA_DOT_POOL_ID, ACA, DOT, pool_balance_a_before, pool_balance_b_before).into(), ]); }); From a0e42349cd8ef7ff28ff4dd33c8943ec995856aa Mon Sep 17 00:00:00 2001 From: Lumir Mrkva Date: Thu, 26 Aug 2021 15:36:24 +0200 Subject: [PATCH 07/15] merged cargo --- Cargo.lock | 8 +++++++- pallets/asset-registry/Cargo.toml | 6 ++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ec7e9c9e9b0..11d7614f4b2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5293,19 +5293,24 @@ dependencies = [ [[package]] name = "pallet-asset-registry" -version = "3.1.0" +version = "0.1.0" dependencies = [ + "frame-benchmarking", "frame-support", "frame-system", + "frame-system-benchmarking", "parity-scale-codec 2.2.0", "primitive-types 0.8.0", "primitives", "serde", + "sp-api", + "sp-arithmetic", "sp-core", "sp-io", "sp-runtime", "sp-std", "substrate-wasm-builder", + "xcm", ] [[package]] @@ -6287,6 +6292,7 @@ dependencies = [ "primitive-types 0.8.0", "primitives", "serde", + "sp-api", "sp-core", "sp-io", "sp-runtime", diff --git a/pallets/asset-registry/Cargo.toml b/pallets/asset-registry/Cargo.toml index 171d9c3239b..e4a5b7dd0d8 100644 --- a/pallets/asset-registry/Cargo.toml +++ b/pallets/asset-registry/Cargo.toml @@ -15,7 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"] substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" } [dependencies] -codec = { default-features = false, features = ["derive"], package = "parity-scale-codec", version = "2.0.0" } +codec = { default-features = false, features = ["derive", "max-encoded-len"], package = "parity-scale-codec", version = "2.2.0" } primitive-types = { default-features = false, version = "0.8.0" } serde = { features = ["derive"], optional = true, version = "1.0.101" } @@ -29,7 +29,6 @@ sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot- 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 } -max-encoded-len = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9", default-features = false } # Optionals frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9", default-features = false, optional = true } @@ -38,7 +37,7 @@ sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v [dev-dependencies] sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9", default-features = false } -polkadot-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.9", default-features = false } +polkadot-xcm = { package = "xcm", git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.9", default-features = false } [features] default = ["std"] @@ -56,7 +55,6 @@ std = [ "sp-core/std", "sp-std/std", "primitives/std", - "max-encoded-len/std", "sp-api/std", "frame-benchmarking/std" ] From fa9c49ebff98f541c2e79220874e2386cb0266c4 Mon Sep 17 00:00:00 2001 From: Lumir Mrkva Date: Thu, 26 Aug 2021 15:39:12 +0200 Subject: [PATCH 08/15] merge fix --- runtime/src/lib.rs | 5 ----- 1 file changed, 5 deletions(-) diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs index 8fe8660d66d..49b3073d427 100644 --- a/runtime/src/lib.rs +++ b/runtime/src/lib.rs @@ -497,11 +497,6 @@ impl pallet_nft::Config for Runtime { type MaxEmoteLength = MaxEmoteLength; } -parameter_types! { - pub MaxClassMetadata: u32 = 1024; - pub MaxTokenMetadata: u32 = 1024; -} - parameter_types! { pub const MaxClassMetadata: u32 = 1024; pub const MaxTokenMetadata: u32 = 1024; From a888c80652344fffdfcb1459f48b9bad1d1fb51b Mon Sep 17 00:00:00 2001 From: Lumir Mrkva Date: Thu, 26 Aug 2021 15:46:28 +0200 Subject: [PATCH 09/15] test fix --- pallets/nft/src/mock.rs | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pallets/nft/src/mock.rs b/pallets/nft/src/mock.rs index 406110395b4..f385451986f 100644 --- a/pallets/nft/src/mock.rs +++ b/pallets/nft/src/mock.rs @@ -49,11 +49,6 @@ impl pallet_nft::Config for Test { type MaxEmoteLength = MaxEmoteLength; } -parameter_types! { - pub MaxClassMetadata: u32 = 256; - pub MaxTokenMetadata: u32 = 256; -} - parameter_types! { pub const MaxClassMetadata: u32 = 1024; pub const MaxTokenMetadata: u32 = 1024; From 82997c84c5b1e1eaae8f33001add72c3746619b4 Mon Sep 17 00:00:00 2001 From: Lumir Mrkva Date: Thu, 26 Aug 2021 16:03:50 +0200 Subject: [PATCH 10/15] benchmark fix --- pallets/asset-registry/src/benchmarking.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pallets/asset-registry/src/benchmarking.rs b/pallets/asset-registry/src/benchmarking.rs index a8f4527a502..a9c9bd82e6d 100644 --- a/pallets/asset-registry/src/benchmarking.rs +++ b/pallets/asset-registry/src/benchmarking.rs @@ -118,10 +118,10 @@ mod tests { #[test] fn test_benchmarks() { ExtBuilder::default().build().execute_with(|| { - assert_ok!(test_benchmark_register::()); - assert_ok!(test_benchmark_update::()); - assert_ok!(test_benchmark_set_metadata::()); - assert_ok!(test_benchmark_set_location::()); + assert_ok!(Pallet::::test_benchmark_register()); + assert_ok!(Pallet::::test_benchmark_update()); + assert_ok!(Pallet::::test_benchmark_set_metadata()); + assert_ok!(Pallet::::test_benchmark_set_location()); }); } } From e15aa29b7a1f2b0b56cacb6705cdab3a635bd5f5 Mon Sep 17 00:00:00 2001 From: Lumir Mrkva Date: Thu, 26 Aug 2021 16:19:32 +0200 Subject: [PATCH 11/15] added benchmark metadata --- runtime/src/lib.rs | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs index 49b3073d427..7a5248a5142 100644 --- a/runtime/src/lib.rs +++ b/runtime/src/lib.rs @@ -1049,6 +1049,35 @@ impl_runtime_apis! { #[cfg(feature = "runtime-benchmarks")] impl frame_benchmarking::Benchmark for Runtime { + fn benchmark_metadata(extra: bool) -> ( + Vec, + Vec, + ) { + use frame_benchmarking::{list_benchmark, Benchmarking, BenchmarkList}; + use frame_support::traits::StorageInfoTrait; + + use pallet_exchange_benchmarking::Pallet as ExchangeBench; + use frame_system_benchmarking::Pallet as SystemBench; + use pallet_multi_payment_benchmarking::Pallet as MultiBench; + + let mut list = Vec::::new(); + + list_benchmark!(list, extra, xyk, XYK); + list_benchmark!(list, extra, lbp, LBP); + list_benchmark!(list, extra, transaction_multi_payment, MultiBench::); + list_benchmark!(list, extra, frame_system, SystemBench::); + list_benchmark!(list, extra, exchange, ExchangeBench::); + list_benchmark!(list, extra, frame_system, SystemBench::); + list_benchmark!(list, extra, pallet_balances, Balances); + list_benchmark!(list, extra, pallet_nft, NFT); + list_benchmark!(list, extra, pallet_timestamp, Timestamp); + list_benchmark!(list, extra, transaction_multi_payment, MultiBench::); + + let storage_info = AllPalletsWithSystem::storage_info(); + + return (list, storage_info) + } + fn dispatch_benchmark( config: frame_benchmarking::BenchmarkConfig ) -> Result, sp_runtime::RuntimeString> { From 4e6e3416cdcd9d7d2886356f8cf462d75bcfe938 Mon Sep 17 00:00:00 2001 From: Lumir Mrkva Date: Thu, 26 Aug 2021 18:48:45 +0200 Subject: [PATCH 12/15] removed some unnecessary dependencies --- Cargo.lock | 140 ------------------------------------------------ node/Cargo.toml | 3 -- 2 files changed, 143 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 11d7614f4b2..1735a2a1820 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -498,9 +498,6 @@ dependencies = [ "polkadot-primitives", "polkadot-runtime-common", "polkadot-service", - "polkadot-test-client", - "polkadot-test-runtime", - "polkadot-test-service", "primitives", "sc-basic-authorship", "sc-chain-spec", @@ -7813,143 +7810,6 @@ dependencies = [ "sp-core", ] -[[package]] -name = "polkadot-test-client" -version = "0.9.9-1" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" -dependencies = [ - "parity-scale-codec 2.2.0", - "polkadot-node-subsystem", - "polkadot-primitives", - "polkadot-test-runtime", - "polkadot-test-service", - "sc-block-builder", - "sc-consensus", - "sc-service", - "sp-api", - "sp-blockchain", - "sp-consensus", - "sp-consensus-babe", - "sp-core", - "sp-inherents", - "sp-runtime", - "sp-state-machine", - "sp-timestamp", - "substrate-test-client", -] - -[[package]] -name = "polkadot-test-runtime" -version = "0.9.9-1" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" -dependencies = [ - "beefy-primitives", - "bitvec 0.20.4", - "frame-election-provider-support", - "frame-executive", - "frame-support", - "frame-system", - "frame-system-rpc-runtime-api", - "log", - "pallet-authority-discovery", - "pallet-authorship", - "pallet-babe", - "pallet-balances", - "pallet-grandpa", - "pallet-indices", - "pallet-mmr-primitives", - "pallet-nicks", - "pallet-offences", - "pallet-session", - "pallet-staking", - "pallet-staking-reward-curve", - "pallet-sudo", - "pallet-timestamp", - "pallet-transaction-payment", - "pallet-transaction-payment-rpc-runtime-api", - "pallet-vesting", - "pallet-xcm", - "parity-scale-codec 2.2.0", - "polkadot-parachain", - "polkadot-primitives", - "polkadot-runtime-common", - "polkadot-runtime-parachains", - "rustc-hex", - "serde", - "serde_derive", - "smallvec 1.6.1", - "sp-api", - "sp-authority-discovery", - "sp-block-builder", - "sp-consensus-babe", - "sp-core", - "sp-inherents", - "sp-io", - "sp-offchain", - "sp-runtime", - "sp-session", - "sp-staking", - "sp-std", - "sp-transaction-pool", - "sp-version", - "substrate-wasm-builder", - "xcm", - "xcm-builder", - "xcm-executor", -] - -[[package]] -name = "polkadot-test-service" -version = "0.9.9-1" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.9#7a9f624777ad2d2adb3a1e6797a31f9d653c9587" -dependencies = [ - "frame-benchmarking", - "frame-system", - "futures 0.1.31", - "futures 0.3.16", - "hex", - "pallet-balances", - "pallet-staking", - "pallet-transaction-payment", - "polkadot-node-primitives", - "polkadot-node-subsystem", - "polkadot-overseer", - "polkadot-parachain", - "polkadot-primitives", - "polkadot-rpc", - "polkadot-runtime-common", - "polkadot-runtime-parachains", - "polkadot-service", - "polkadot-test-runtime", - "rand 0.8.4", - "sc-authority-discovery", - "sc-chain-spec", - "sc-cli", - "sc-client-api", - "sc-consensus", - "sc-consensus-babe", - "sc-executor", - "sc-finality-grandpa", - "sc-network", - "sc-service", - "sc-tracing", - "sc-transaction-pool", - "sp-arithmetic", - "sp-authority-discovery", - "sp-blockchain", - "sp-consensus", - "sp-consensus-babe", - "sp-core", - "sp-finality-grandpa", - "sp-inherents", - "sp-keyring", - "sp-runtime", - "sp-state-machine", - "substrate-test-client", - "tempfile", - "tracing", -] - [[package]] name = "polling" version = "2.1.0" diff --git a/node/Cargo.toml b/node/Cargo.toml index 5df03592d4b..16cfb3233ce 100644 --- a/node/Cargo.toml +++ b/node/Cargo.toml @@ -87,7 +87,6 @@ polkadot-cli = { git = "https://github.com/paritytech/polkadot", branch = "relea polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.9" } polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.9" } polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.9" } -polkadot-test-service = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.9" } [features] default = [ @@ -102,8 +101,6 @@ runtime-benchmarks = [ [dev-dependencies] # Polkadot dependencies polkadot-runtime-common = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.9" } -polkadot-test-client = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.9" } -polkadot-test-runtime = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.9" } # Substrate dependencies pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" } From ba2690ed9333dbae30dea97e0f86455094e91092 Mon Sep 17 00:00:00 2001 From: Lumir Mrkva Date: Thu, 26 Aug 2021 19:10:21 +0200 Subject: [PATCH 13/15] removed more deps --- Cargo.lock | 95 ------------------------------------------------- node/Cargo.toml | 9 ----- 2 files changed, 104 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1735a2a1820..40225c97c10 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -489,14 +489,12 @@ dependencies = [ "hydra-dx-build-script-utils", "jsonrpc-core", "log", - "pallet-sudo", "pallet-transaction-payment-rpc", "pallet-xyk-rpc", "parity-scale-codec 2.2.0", "polkadot-cli", "polkadot-parachain", "polkadot-primitives", - "polkadot-runtime-common", "polkadot-service", "primitives", "sc-basic-authorship", @@ -536,8 +534,6 @@ dependencies = [ "structopt", "substrate-frame-rpc-system", "substrate-prometheus-endpoint", - "substrate-test-client", - "substrate-test-runtime-client", ] [[package]] @@ -11009,97 +11005,6 @@ dependencies = [ "tokio 0.2.25", ] -[[package]] -name = "substrate-test-client" -version = "2.0.1" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" -dependencies = [ - "async-trait", - "futures 0.1.31", - "futures 0.3.16", - "hash-db", - "hex", - "parity-scale-codec 2.2.0", - "sc-client-api", - "sc-client-db", - "sc-consensus", - "sc-executor", - "sc-light", - "sc-offchain", - "sc-service", - "serde", - "serde_json", - "sp-blockchain", - "sp-consensus", - "sp-core", - "sp-keyring", - "sp-keystore", - "sp-runtime", - "sp-state-machine", -] - -[[package]] -name = "substrate-test-runtime" -version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" -dependencies = [ - "cfg-if 1.0.0", - "frame-support", - "frame-system", - "frame-system-rpc-runtime-api", - "log", - "memory-db", - "pallet-babe", - "pallet-timestamp", - "parity-scale-codec 2.2.0", - "parity-util-mem", - "sc-service", - "serde", - "sp-api", - "sp-application-crypto", - "sp-block-builder", - "sp-consensus-aura", - "sp-consensus-babe", - "sp-core", - "sp-externalities", - "sp-finality-grandpa", - "sp-inherents", - "sp-io", - "sp-keyring", - "sp-offchain", - "sp-runtime", - "sp-runtime-interface", - "sp-session", - "sp-state-machine", - "sp-std", - "sp-transaction-pool", - "sp-trie", - "sp-version", - "substrate-wasm-builder", - "trie-db", -] - -[[package]] -name = "substrate-test-runtime-client" -version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.9#91061a7d925b5bc597804293da283477512ba4ff" -dependencies = [ - "futures 0.3.16", - "parity-scale-codec 2.2.0", - "sc-block-builder", - "sc-client-api", - "sc-consensus", - "sc-light", - "sc-service", - "sp-api", - "sp-blockchain", - "sp-consensus", - "sp-core", - "sp-runtime", - "substrate-test-client", - "substrate-test-runtime", -] - [[package]] name = "substrate-wasm-builder" version = "5.0.0-dev" diff --git a/node/Cargo.toml b/node/Cargo.toml index 16cfb3233ce..a4407909e3e 100644 --- a/node/Cargo.toml +++ b/node/Cargo.toml @@ -97,12 +97,3 @@ runtime-benchmarks = [ "frame-benchmarking-cli", "polkadot-service/runtime-benchmarks", ] - -[dev-dependencies] -# Polkadot dependencies -polkadot-runtime-common = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.9" } - -# Substrate dependencies -pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" } -substrate-test-client = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" } -substrate-test-runtime-client = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" } From 8cf687869c4827daf0066745671db7f478b53e8a Mon Sep 17 00:00:00 2001 From: Lumir Mrkva Date: Thu, 26 Aug 2021 19:16:16 +0200 Subject: [PATCH 14/15] test inclusion with v0.9.9-1 --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index dd90f0ef47a..dcea6d227ad 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -166,7 +166,7 @@ jobs: name: Download relay chain binary with: repository: paritytech/polkadot - tag: v0.9.3 + tag: v0.9.9-1 fileName: polkadot out-file-path: ../polkadot/target/release - run: chmod +x ./basilisk && ./basilisk --version From 4b381c94e2a7c9c7ba30128077b1a496154d7650 Mon Sep 17 00:00:00 2001 From: Lumir Mrkva Date: Thu, 26 Aug 2021 20:18:50 +0200 Subject: [PATCH 15/15] updated polkadot launch --- scripts/install_polkadot_launch.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install_polkadot_launch.sh b/scripts/install_polkadot_launch.sh index 4904c532acc..93b6734f4b2 100755 --- a/scripts/install_polkadot_launch.sh +++ b/scripts/install_polkadot_launch.sh @@ -1,7 +1,7 @@ npm install -g yarn git clone https://github.com/paritytech/polkadot-launch.git cd polkadot-launch -git checkout 381cc9108dd32e5260ef3b85ea49e00cda35c398 +git checkout d696b0e04beca3368ea60f6b496722906abf0afc yarn yarn build chmod +x dist/index.js