From 48ba6e5f6d0acb49ff3afb1a6982e6fb273a8976 Mon Sep 17 00:00:00 2001 From: nanocryk <6422796+nanocryk@users.noreply.github.com> Date: Thu, 24 Feb 2022 15:28:03 +0000 Subject: [PATCH 1/5] Update deps --- Cargo.lock | 1371 ++++++++++-------- Cargo.toml | 6 +- bin/utils/moonkey/Cargo.toml | 2 +- bin/utils/moonkey/src/main.rs | 10 +- client/evm-tracing/Cargo.toml | 2 +- client/rpc-core/debug/Cargo.toml | 2 +- client/rpc-core/txpool/Cargo.toml | 2 +- client/rpc/debug/Cargo.toml | 24 +- client/rpc/finality/Cargo.toml | 12 +- client/rpc/manual-xcm/Cargo.toml | 4 +- client/rpc/trace/Cargo.toml | 28 +- client/rpc/txpool/Cargo.toml | 18 +- core-primitives/Cargo.toml | 6 +- node/Cargo.toml | 4 +- node/cli-opt/Cargo.toml | 4 +- node/cli-opt/src/account_key.rs | 10 +- node/cli/Cargo.toml | 36 +- node/cli/src/cli.rs | 97 +- node/perf-test/Cargo.toml | 47 +- node/perf-test/src/command.rs | 13 +- node/perf-test/src/lib.rs | 16 +- node/service/Cargo.toml | 145 +- node/service/src/lib.rs | 26 +- node/service/src/rpc.rs | 18 +- pallets/asset-manager/Cargo.toml | 18 +- pallets/author-mapping/Cargo.toml | 18 +- pallets/ethereum-chain-id/Cargo.toml | 4 +- pallets/maintenance-mode/Cargo.toml | 14 +- pallets/migrations/Cargo.toml | 12 +- pallets/parachain-staking/Cargo.toml | 18 +- pallets/proxy-genesis-companion/Cargo.toml | 14 +- pallets/xcm-transactor/Cargo.toml | 30 +- precompiles/assets-erc20/Cargo.toml | 24 +- precompiles/author-mapping/Cargo.toml | 24 +- precompiles/balances-erc20/Cargo.toml | 20 +- precompiles/crowdloan-rewards/Cargo.toml | 32 +- precompiles/pallet-democracy/Cargo.toml | 24 +- precompiles/parachain-staking/Cargo.toml | 20 +- precompiles/relay-encoder/Cargo.toml | 26 +- precompiles/utils/Cargo.toml | 16 +- precompiles/xcm_transactor/Cargo.toml | 30 +- precompiles/xtokens/Cargo.toml | 32 +- primitives/account/Cargo.toml | 10 +- primitives/ext/Cargo.toml | 6 +- primitives/rpc/debug/Cargo.toml | 10 +- primitives/rpc/evm-tracing-events/Cargo.toml | 2 +- primitives/rpc/txpool/Cargo.toml | 8 +- primitives/xcm/Cargo.toml | 14 +- runtime/common/Cargo.toml | 20 +- runtime/evm_tracer/Cargo.toml | 12 +- runtime/moonbase/Cargo.toml | 140 +- runtime/moonbase/src/lib.rs | 8 +- runtime/moonbeam/Cargo.toml | 136 +- runtime/moonbeam/src/lib.rs | 8 +- runtime/moonriver/Cargo.toml | 138 +- runtime/moonriver/src/lib.rs | 8 +- runtime/relay-encoder/Cargo.toml | 24 +- scripts/create-substrate-fork.sh | 2 +- 58 files changed, 1545 insertions(+), 1280 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d4b49bd37fe..cf85ada110a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -514,7 +514,7 @@ dependencies = [ [[package]] name = "beefy-gadget" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "beefy-primitives", "fnv", @@ -543,11 +543,10 @@ dependencies = [ [[package]] name = "beefy-gadget-rpc" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "beefy-gadget", "beefy-primitives", - "derive_more", "futures 0.3.21", "jsonrpc-core", "jsonrpc-core-client", @@ -567,12 +566,12 @@ dependencies = [ [[package]] name = "beefy-merkle-tree" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" [[package]] name = "beefy-primitives" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "parity-scale-codec", "scale-info", @@ -777,7 +776,7 @@ dependencies = [ [[package]] name = "bp-header-chain" version = "0.1.0" -source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.16#c028a34292a744d048d3076e7b072db39d745df7" +source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.17#66cb46bb3a7bd7295d1eb39a391559bc6efb2a22" dependencies = [ "finality-grandpa", "frame-support", @@ -793,7 +792,7 @@ dependencies = [ [[package]] name = "bp-message-dispatch" version = "0.1.0" -source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.16#c028a34292a744d048d3076e7b072db39d745df7" +source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.17#66cb46bb3a7bd7295d1eb39a391559bc6efb2a22" dependencies = [ "bp-runtime", "frame-support", @@ -805,7 +804,7 @@ dependencies = [ [[package]] name = "bp-messages" version = "0.1.0" -source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.16#c028a34292a744d048d3076e7b072db39d745df7" +source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.17#66cb46bb3a7bd7295d1eb39a391559bc6efb2a22" dependencies = [ "bitvec 0.20.4", "bp-runtime", @@ -821,7 +820,7 @@ dependencies = [ [[package]] name = "bp-polkadot-core" version = "0.1.0" -source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.16#c028a34292a744d048d3076e7b072db39d745df7" +source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.17#66cb46bb3a7bd7295d1eb39a391559bc6efb2a22" dependencies = [ "bp-messages", "bp-runtime", @@ -839,7 +838,7 @@ dependencies = [ [[package]] name = "bp-rococo" version = "0.1.0" -source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.16#c028a34292a744d048d3076e7b072db39d745df7" +source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.17#66cb46bb3a7bd7295d1eb39a391559bc6efb2a22" dependencies = [ "bp-messages", "bp-polkadot-core", @@ -856,7 +855,7 @@ dependencies = [ [[package]] name = "bp-runtime" version = "0.1.0" -source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.16#c028a34292a744d048d3076e7b072db39d745df7" +source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.17#66cb46bb3a7bd7295d1eb39a391559bc6efb2a22" dependencies = [ "frame-support", "hash-db", @@ -874,7 +873,7 @@ dependencies = [ [[package]] name = "bp-test-utils" version = "0.1.0" -source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.16#c028a34292a744d048d3076e7b072db39d745df7" +source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.17#66cb46bb3a7bd7295d1eb39a391559bc6efb2a22" dependencies = [ "bp-header-chain", "ed25519-dalek", @@ -889,7 +888,7 @@ dependencies = [ [[package]] name = "bp-wococo" version = "0.1.0" -source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.16#c028a34292a744d048d3076e7b072db39d745df7" +source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.17#66cb46bb3a7bd7295d1eb39a391559bc6efb2a22" dependencies = [ "bp-messages", "bp-polkadot-core", @@ -904,7 +903,7 @@ dependencies = [ [[package]] name = "bridge-runtime-common" version = "0.1.0" -source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.16#c028a34292a744d048d3076e7b072db39d745df7" +source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.17#66cb46bb3a7bd7295d1eb39a391559bc6efb2a22" dependencies = [ "bp-message-dispatch", "bp-messages", @@ -1151,12 +1150,42 @@ dependencies = [ "ansi_term 0.11.0", "atty", "bitflags", - "strsim", - "textwrap", + "strsim 0.8.0", + "textwrap 0.11.0", "unicode-width", "vec_map", ] +[[package]] +name = "clap" +version = "3.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5177fac1ab67102d8989464efd043c6ff44191b1557ec1ddd489b4f7e1447e77" +dependencies = [ + "atty", + "bitflags", + "clap_derive", + "indexmap", + "lazy_static", + "os_str_bytes", + "strsim 0.10.0", + "termcolor", + "textwrap 0.14.2", +] + +[[package]] +name = "clap_derive" +version = "3.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01d42c94ce7c2252681b5fed4d3627cc807b13dfc033246bd05d5b252399000e" +dependencies = [ + "heck 0.4.0", + "proc-macro-error", + "proc-macro2 1.0.36", + "quote 1.0.15", + "syn 1.0.86", +] + [[package]] name = "cli-table" version = "0.4.6" @@ -1447,11 +1476,12 @@ checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" [[package]] name = "crypto-common" -version = "0.1.1" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "683d6b536309245c849479fba3da410962a43ed8e51c26b729208ec0ac2798d0" +checksum = "57952ca27b5e3606ff4dd79b0020231aaf9d6aa76dc05fd30137538c50bd3ce8" dependencies = [ "generic-array 0.14.4", + "typenum", ] [[package]] @@ -1512,7 +1542,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c1a816186fa68d9e426e3cb4ae4dff1fcd8e4a2c34b781bf7a822574a0d0aac8" dependencies = [ - "sct", + "sct 0.6.1", ] [[package]] @@ -1548,17 +1578,17 @@ dependencies = [ [[package]] name = "cumulus-client-cli" version = "0.1.0" -source = "git+https://github.com/purestake/cumulus?branch=moonbeam-polkadot-v0.9.16#c92f0abbfaefe66645d2d54facb878dd98273a9d" +source = "git+https://github.com/purestake/cumulus?branch=moonbeam-polkadot-v0.9.17#b43fcfff1df6bad837b98e5862e60367b9bc92e0" dependencies = [ + "clap 3.1.2", "sc-cli", "sc-service", - "structopt", ] [[package]] name = "cumulus-client-collator" version = "0.1.0" -source = "git+https://github.com/purestake/cumulus?branch=moonbeam-polkadot-v0.9.16#c92f0abbfaefe66645d2d54facb878dd98273a9d" +source = "git+https://github.com/purestake/cumulus?branch=moonbeam-polkadot-v0.9.17#b43fcfff1df6bad837b98e5862e60367b9bc92e0" dependencies = [ "cumulus-client-consensus-common", "cumulus-client-network", @@ -1582,7 +1612,7 @@ dependencies = [ [[package]] name = "cumulus-client-consensus-common" version = "0.1.0" -source = "git+https://github.com/purestake/cumulus?branch=moonbeam-polkadot-v0.9.16#c92f0abbfaefe66645d2d54facb878dd98273a9d" +source = "git+https://github.com/purestake/cumulus?branch=moonbeam-polkadot-v0.9.17#b43fcfff1df6bad837b98e5862e60367b9bc92e0" dependencies = [ "async-trait", "cumulus-relay-chain-interface", @@ -1603,14 +1633,14 @@ dependencies = [ [[package]] name = "cumulus-client-consensus-relay-chain" version = "0.1.0" -source = "git+https://github.com/purestake/cumulus?branch=moonbeam-polkadot-v0.9.16#c92f0abbfaefe66645d2d54facb878dd98273a9d" +source = "git+https://github.com/purestake/cumulus?branch=moonbeam-polkadot-v0.9.17#b43fcfff1df6bad837b98e5862e60367b9bc92e0" dependencies = [ "async-trait", "cumulus-client-consensus-common", "cumulus-primitives-core", "cumulus-relay-chain-interface", "futures 0.3.21", - "parking_lot 0.10.2", + "parking_lot 0.12.0", "sc-client-api", "sc-consensus", "sp-api", @@ -1627,7 +1657,7 @@ dependencies = [ [[package]] name = "cumulus-client-network" version = "0.1.0" -source = "git+https://github.com/purestake/cumulus?branch=moonbeam-polkadot-v0.9.16#c92f0abbfaefe66645d2d54facb878dd98273a9d" +source = "git+https://github.com/purestake/cumulus?branch=moonbeam-polkadot-v0.9.17#b43fcfff1df6bad837b98e5862e60367b9bc92e0" dependencies = [ "async-trait", "cumulus-relay-chain-interface", @@ -1635,7 +1665,7 @@ dependencies = [ "futures 0.3.21", "futures-timer", "parity-scale-codec", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "polkadot-node-primitives", "polkadot-parachain", "polkadot-primitives", @@ -1652,7 +1682,7 @@ dependencies = [ [[package]] name = "cumulus-client-pov-recovery" version = "0.1.0" -source = "git+https://github.com/purestake/cumulus?branch=moonbeam-polkadot-v0.9.16#c92f0abbfaefe66645d2d54facb878dd98273a9d" +source = "git+https://github.com/purestake/cumulus?branch=moonbeam-polkadot-v0.9.17#b43fcfff1df6bad837b98e5862e60367b9bc92e0" dependencies = [ "cumulus-primitives-core", "cumulus-relay-chain-interface", @@ -1663,7 +1693,7 @@ dependencies = [ "polkadot-node-subsystem", "polkadot-overseer", "polkadot-primitives", - "rand 0.8.4", + "rand 0.8.5", "sc-client-api", "sc-consensus", "sp-api", @@ -1676,7 +1706,7 @@ dependencies = [ [[package]] name = "cumulus-client-service" version = "0.1.0" -source = "git+https://github.com/purestake/cumulus?branch=moonbeam-polkadot-v0.9.16#c92f0abbfaefe66645d2d54facb878dd98273a9d" +source = "git+https://github.com/purestake/cumulus?branch=moonbeam-polkadot-v0.9.17#b43fcfff1df6bad837b98e5862e60367b9bc92e0" dependencies = [ "cumulus-client-collator", "cumulus-client-consensus-common", @@ -1684,7 +1714,7 @@ dependencies = [ "cumulus-primitives-core", "cumulus-relay-chain-interface", "parity-scale-codec", - "parking_lot 0.10.2", + "parking_lot 0.12.0", "polkadot-overseer", "polkadot-primitives", "sc-chain-spec", @@ -1705,7 +1735,7 @@ dependencies = [ [[package]] name = "cumulus-pallet-dmp-queue" version = "0.1.0" -source = "git+https://github.com/purestake/cumulus?branch=moonbeam-polkadot-v0.9.16#c92f0abbfaefe66645d2d54facb878dd98273a9d" +source = "git+https://github.com/purestake/cumulus?branch=moonbeam-polkadot-v0.9.17#b43fcfff1df6bad837b98e5862e60367b9bc92e0" dependencies = [ "cumulus-primitives-core", "frame-support", @@ -1723,7 +1753,7 @@ dependencies = [ [[package]] name = "cumulus-pallet-parachain-system" version = "0.1.0" -source = "git+https://github.com/purestake/cumulus?branch=moonbeam-polkadot-v0.9.16#c92f0abbfaefe66645d2d54facb878dd98273a9d" +source = "git+https://github.com/purestake/cumulus?branch=moonbeam-polkadot-v0.9.17#b43fcfff1df6bad837b98e5862e60367b9bc92e0" dependencies = [ "cumulus-pallet-parachain-system-proc-macro", "cumulus-primitives-core", @@ -1753,9 +1783,9 @@ dependencies = [ [[package]] name = "cumulus-pallet-parachain-system-proc-macro" version = "0.1.0" -source = "git+https://github.com/purestake/cumulus?branch=moonbeam-polkadot-v0.9.16#c92f0abbfaefe66645d2d54facb878dd98273a9d" +source = "git+https://github.com/purestake/cumulus?branch=moonbeam-polkadot-v0.9.17#b43fcfff1df6bad837b98e5862e60367b9bc92e0" dependencies = [ - "proc-macro-crate 1.1.0", + "proc-macro-crate 1.1.3", "proc-macro2 1.0.36", "quote 1.0.15", "syn 1.0.86", @@ -1764,7 +1794,7 @@ dependencies = [ [[package]] name = "cumulus-pallet-xcm" version = "0.1.0" -source = "git+https://github.com/purestake/cumulus?branch=moonbeam-polkadot-v0.9.16#c92f0abbfaefe66645d2d54facb878dd98273a9d" +source = "git+https://github.com/purestake/cumulus?branch=moonbeam-polkadot-v0.9.17#b43fcfff1df6bad837b98e5862e60367b9bc92e0" dependencies = [ "cumulus-primitives-core", "frame-support", @@ -1781,7 +1811,7 @@ dependencies = [ [[package]] name = "cumulus-pallet-xcmp-queue" version = "0.1.0" -source = "git+https://github.com/purestake/cumulus?branch=moonbeam-polkadot-v0.9.16#c92f0abbfaefe66645d2d54facb878dd98273a9d" +source = "git+https://github.com/purestake/cumulus?branch=moonbeam-polkadot-v0.9.17#b43fcfff1df6bad837b98e5862e60367b9bc92e0" dependencies = [ "cumulus-primitives-core", "frame-support", @@ -1799,7 +1829,7 @@ dependencies = [ [[package]] name = "cumulus-primitives-core" version = "0.1.0" -source = "git+https://github.com/purestake/cumulus?branch=moonbeam-polkadot-v0.9.16#c92f0abbfaefe66645d2d54facb878dd98273a9d" +source = "git+https://github.com/purestake/cumulus?branch=moonbeam-polkadot-v0.9.17#b43fcfff1df6bad837b98e5862e60367b9bc92e0" dependencies = [ "frame-support", "parity-scale-codec", @@ -1815,7 +1845,7 @@ dependencies = [ [[package]] name = "cumulus-primitives-parachain-inherent" version = "0.1.0" -source = "git+https://github.com/purestake/cumulus?branch=moonbeam-polkadot-v0.9.16#c92f0abbfaefe66645d2d54facb878dd98273a9d" +source = "git+https://github.com/purestake/cumulus?branch=moonbeam-polkadot-v0.9.17#b43fcfff1df6bad837b98e5862e60367b9bc92e0" dependencies = [ "async-trait", "cumulus-primitives-core", @@ -1838,7 +1868,7 @@ dependencies = [ [[package]] name = "cumulus-primitives-timestamp" version = "0.1.0" -source = "git+https://github.com/purestake/cumulus?branch=moonbeam-polkadot-v0.9.16#c92f0abbfaefe66645d2d54facb878dd98273a9d" +source = "git+https://github.com/purestake/cumulus?branch=moonbeam-polkadot-v0.9.17#b43fcfff1df6bad837b98e5862e60367b9bc92e0" dependencies = [ "cumulus-primitives-core", "sp-inherents", @@ -1849,7 +1879,7 @@ dependencies = [ [[package]] name = "cumulus-primitives-utility" version = "0.1.0" -source = "git+https://github.com/purestake/cumulus?branch=moonbeam-polkadot-v0.9.16#c92f0abbfaefe66645d2d54facb878dd98273a9d" +source = "git+https://github.com/purestake/cumulus?branch=moonbeam-polkadot-v0.9.17#b43fcfff1df6bad837b98e5862e60367b9bc92e0" dependencies = [ "cumulus-primitives-core", "frame-support", @@ -1866,13 +1896,13 @@ dependencies = [ [[package]] name = "cumulus-relay-chain-interface" version = "0.1.0" -source = "git+https://github.com/purestake/cumulus?branch=moonbeam-polkadot-v0.9.16#c92f0abbfaefe66645d2d54facb878dd98273a9d" +source = "git+https://github.com/purestake/cumulus?branch=moonbeam-polkadot-v0.9.17#b43fcfff1df6bad837b98e5862e60367b9bc92e0" dependencies = [ "async-trait", "cumulus-primitives-core", "derive_more", "futures 0.3.21", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "polkadot-overseer", "sc-client-api", "sc-service", @@ -1887,14 +1917,14 @@ dependencies = [ [[package]] name = "cumulus-relay-chain-local" version = "0.1.0" -source = "git+https://github.com/purestake/cumulus?branch=moonbeam-polkadot-v0.9.16#c92f0abbfaefe66645d2d54facb878dd98273a9d" +source = "git+https://github.com/purestake/cumulus?branch=moonbeam-polkadot-v0.9.17#b43fcfff1df6bad837b98e5862e60367b9bc92e0" dependencies = [ "async-trait", "cumulus-primitives-core", "cumulus-relay-chain-interface", "futures 0.3.21", "futures-timer", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "polkadot-client", "polkadot-service", "sc-client-api", @@ -1915,7 +1945,7 @@ dependencies = [ [[package]] name = "cumulus-test-relay-sproof-builder" version = "0.1.0" -source = "git+https://github.com/purestake/cumulus?branch=moonbeam-polkadot-v0.9.16#c92f0abbfaefe66645d2d54facb878dd98273a9d" +source = "git+https://github.com/purestake/cumulus?branch=moonbeam-polkadot-v0.9.17#b43fcfff1df6bad837b98e5862e60367b9bc92e0" dependencies = [ "cumulus-primitives-core", "parity-scale-codec", @@ -2047,13 +2077,12 @@ dependencies = [ [[package]] name = "digest" -version = "0.10.1" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b697d66081d42af4fba142d56918a3cb21dc8eb63372c6b85d14f44fb9c5979b" +checksum = "f2fb860ca6fafa5552fb6d0e816a69c8e49f0908bf524e30a90d97c85892d506" dependencies = [ "block-buffer 0.10.1", "crypto-common", - "generic-array 0.14.4", ] [[package]] @@ -2193,7 +2222,7 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7c5f0096a91d210159eceb2ff5e1c4da18388a170e1e3ce948aac9c8fdbbf595" dependencies = [ - "heck", + "heck 0.3.3", "proc-macro2 1.0.36", "quote 1.0.15", "syn 1.0.86", @@ -2353,7 +2382,7 @@ checksum = "f7531096570974c3a9dcf9e4b8e1cede1ec26cf5046219fb3b9d897503b9be59" [[package]] name = "evm" version = "0.33.1" -source = "git+https://github.com/purestake/evm?branch=moonbeam-polkadot-v0.9.16#7deff4781014e10684253d9c72540ef75f03830f" +source = "git+https://github.com/purestake/evm?branch=moonbeam-polkadot-v0.9.17#7deff4781014e10684253d9c72540ef75f03830f" dependencies = [ "auto_impl", "environmental", @@ -2373,7 +2402,7 @@ dependencies = [ [[package]] name = "evm-core" version = "0.33.0" -source = "git+https://github.com/purestake/evm?branch=moonbeam-polkadot-v0.9.16#7deff4781014e10684253d9c72540ef75f03830f" +source = "git+https://github.com/purestake/evm?branch=moonbeam-polkadot-v0.9.17#7deff4781014e10684253d9c72540ef75f03830f" dependencies = [ "funty", "parity-scale-codec", @@ -2385,7 +2414,7 @@ dependencies = [ [[package]] name = "evm-gasometer" version = "0.33.0" -source = "git+https://github.com/purestake/evm?branch=moonbeam-polkadot-v0.9.16#7deff4781014e10684253d9c72540ef75f03830f" +source = "git+https://github.com/purestake/evm?branch=moonbeam-polkadot-v0.9.17#7deff4781014e10684253d9c72540ef75f03830f" dependencies = [ "environmental", "evm-core", @@ -2396,7 +2425,7 @@ dependencies = [ [[package]] name = "evm-runtime" version = "0.33.0" -source = "git+https://github.com/purestake/evm?branch=moonbeam-polkadot-v0.9.16#7deff4781014e10684253d9c72540ef75f03830f" +source = "git+https://github.com/purestake/evm?branch=moonbeam-polkadot-v0.9.17#7deff4781014e10684253d9c72540ef75f03830f" dependencies = [ "auto_impl", "environmental", @@ -2468,38 +2497,29 @@ dependencies = [ [[package]] name = "fc-consensus" version = "2.0.0-dev" -source = "git+https://github.com/purestake/frontier?branch=moonbeam-polkadot-v0.9.16#a74529a06c7d3137c621a1ec6ae49a9c57e7416f" +source = "git+https://github.com/purestake/frontier?branch=moonbeam-polkadot-v0.9.17#2be428cd1cf69bf66fe760eb6bbbac3e589decbe" dependencies = [ "async-trait", - "derive_more", "fc-db", "fp-consensus", "fp-rpc", - "futures 0.3.21", - "log", - "parity-scale-codec", "sc-client-api", "sc-consensus", "sp-api", "sp-block-builder", "sp-blockchain", "sp-consensus", - "sp-core", - "sp-inherents", "sp-runtime", - "sp-timestamp", - "substrate-prometheus-endpoint", + "thiserror", ] [[package]] name = "fc-db" version = "2.0.0-dev" -source = "git+https://github.com/purestake/frontier?branch=moonbeam-polkadot-v0.9.16#a74529a06c7d3137c621a1ec6ae49a9c57e7416f" +source = "git+https://github.com/purestake/frontier?branch=moonbeam-polkadot-v0.9.17#2be428cd1cf69bf66fe760eb6bbbac3e589decbe" dependencies = [ "fp-storage", - "kvdb", "kvdb-rocksdb", - "pallet-ethereum", "parity-scale-codec", "parking_lot 0.11.2", "sp-core", @@ -2510,9 +2530,8 @@ dependencies = [ [[package]] name = "fc-mapping-sync" version = "2.0.0-dev" -source = "git+https://github.com/purestake/frontier?branch=moonbeam-polkadot-v0.9.16#a74529a06c7d3137c621a1ec6ae49a9c57e7416f" +source = "git+https://github.com/purestake/frontier?branch=moonbeam-polkadot-v0.9.17#2be428cd1cf69bf66fe760eb6bbbac3e589decbe" dependencies = [ - "fc-consensus", "fc-db", "fp-consensus", "fp-rpc", @@ -2528,53 +2547,47 @@ dependencies = [ [[package]] name = "fc-rpc" version = "2.0.0-dev" -source = "git+https://github.com/purestake/frontier?branch=moonbeam-polkadot-v0.9.16#a74529a06c7d3137c621a1ec6ae49a9c57e7416f" +source = "git+https://github.com/purestake/frontier?branch=moonbeam-polkadot-v0.9.17#2be428cd1cf69bf66fe760eb6bbbac3e589decbe" dependencies = [ "ethereum", "ethereum-types", "evm", - "fc-consensus", "fc-db", "fc-rpc-core", - "fp-consensus", - "fp-evm", "fp-rpc", "fp-storage", "futures 0.3.21", + "hex", "jsonrpc-core", "jsonrpc-core-client", - "jsonrpc-derive", "jsonrpc-pubsub", - "libsecp256k1 0.3.5", + "libsecp256k1 0.7.0", "log", "lru 0.6.6", "pallet-ethereum", - "pallet-evm", "parity-scale-codec", - "parking_lot 0.11.2", - "rand 0.7.3", + "rand 0.8.5", "rlp", - "rustc-hex", "sc-client-api", "sc-network", "sc-rpc", "sc-service", "sc-transaction-pool", "sc-transaction-pool-api", - "sha3 0.8.2", + "sha3 0.10.1", "sp-api", "sp-block-builder", "sp-blockchain", "sp-io", "sp-runtime", "sp-storage", - "sp-transaction-pool", + "tokio", ] [[package]] name = "fc-rpc-core" version = "1.1.0-dev" -source = "git+https://github.com/purestake/frontier?branch=moonbeam-polkadot-v0.9.16#a74529a06c7d3137c621a1ec6ae49a9c57e7416f" +source = "git+https://github.com/purestake/frontier?branch=moonbeam-polkadot-v0.9.17#2be428cd1cf69bf66fe760eb6bbbac3e589decbe" dependencies = [ "ethereum", "ethereum-types", @@ -2586,7 +2599,6 @@ dependencies = [ "rustc-hex", "serde", "serde_json", - "sha3 0.8.2", ] [[package]] @@ -2631,7 +2643,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cfcf0ed7fe52a17a03854ec54a9f76d6d84508d1c0e66bc1793301c73fc8493c" dependencies = [ "byteorder", - "rand 0.8.4", + "rand 0.8.5", "rustc-hex", "static_assertions", ] @@ -2677,7 +2689,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "fork-tree" version = "3.0.0" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "parity-scale-codec", ] @@ -2695,12 +2707,10 @@ dependencies = [ [[package]] name = "fp-consensus" version = "2.0.0-dev" -source = "git+https://github.com/purestake/frontier?branch=moonbeam-polkadot-v0.9.16#a74529a06c7d3137c621a1ec6ae49a9c57e7416f" +source = "git+https://github.com/purestake/frontier?branch=moonbeam-polkadot-v0.9.17#2be428cd1cf69bf66fe760eb6bbbac3e589decbe" dependencies = [ "ethereum", "parity-scale-codec", - "rlp", - "sha3 0.8.2", "sp-core", "sp-runtime", "sp-std", @@ -2709,7 +2719,7 @@ dependencies = [ [[package]] name = "fp-evm" version = "3.0.0-dev" -source = "git+https://github.com/purestake/frontier?branch=moonbeam-polkadot-v0.9.16#a74529a06c7d3137c621a1ec6ae49a9c57e7416f" +source = "git+https://github.com/purestake/frontier?branch=moonbeam-polkadot-v0.9.17#2be428cd1cf69bf66fe760eb6bbbac3e589decbe" dependencies = [ "evm", "parity-scale-codec", @@ -2721,7 +2731,7 @@ dependencies = [ [[package]] name = "fp-rpc" version = "3.0.0-dev" -source = "git+https://github.com/purestake/frontier?branch=moonbeam-polkadot-v0.9.16#a74529a06c7d3137c621a1ec6ae49a9c57e7416f" +source = "git+https://github.com/purestake/frontier?branch=moonbeam-polkadot-v0.9.17#2be428cd1cf69bf66fe760eb6bbbac3e589decbe" dependencies = [ "ethereum", "ethereum-types", @@ -2738,7 +2748,7 @@ dependencies = [ [[package]] name = "fp-self-contained" version = "1.0.0-dev" -source = "git+https://github.com/purestake/frontier?branch=moonbeam-polkadot-v0.9.16#a74529a06c7d3137c621a1ec6ae49a9c57e7416f" +source = "git+https://github.com/purestake/frontier?branch=moonbeam-polkadot-v0.9.17#2be428cd1cf69bf66fe760eb6bbbac3e589decbe" dependencies = [ "ethereum", "frame-support", @@ -2746,8 +2756,7 @@ dependencies = [ "parity-util-mem", "scale-info", "serde", - "sha3 0.8.2", - "sp-core", + "sp-debug-derive", "sp-io", "sp-runtime", ] @@ -2755,12 +2764,15 @@ dependencies = [ [[package]] name = "fp-storage" version = "2.0.0" -source = "git+https://github.com/purestake/frontier?branch=moonbeam-polkadot-v0.9.16#a74529a06c7d3137c621a1ec6ae49a9c57e7416f" +source = "git+https://github.com/purestake/frontier?branch=moonbeam-polkadot-v0.9.17#2be428cd1cf69bf66fe760eb6bbbac3e589decbe" +dependencies = [ + "parity-scale-codec", +] [[package]] name = "frame-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "frame-support", "frame-system", @@ -2769,6 +2781,7 @@ dependencies = [ "parity-scale-codec", "paste", "scale-info", + "serde", "sp-api", "sp-application-crypto", "sp-io", @@ -2781,10 +2794,11 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "Inflector", "chrono", + "clap 3.1.2", "frame-benchmarking", "frame-support", "handlebars", @@ -2796,18 +2810,18 @@ dependencies = [ "sc-executor", "sc-service", "serde", + "serde_json", "sp-core", "sp-externalities", "sp-keystore", "sp-runtime", "sp-state-machine", - "structopt", ] [[package]] name = "frame-election-provider-support" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "frame-support", "frame-system", @@ -2821,7 +2835,7 @@ dependencies = [ [[package]] name = "frame-executive" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "frame-support", "frame-system", @@ -2849,7 +2863,7 @@ dependencies = [ [[package]] name = "frame-support" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "bitflags", "frame-metadata", @@ -2878,7 +2892,7 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "Inflector", "frame-support-procedural-tools", @@ -2890,10 +2904,10 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "frame-support-procedural-tools-derive", - "proc-macro-crate 1.1.0", + "proc-macro-crate 1.1.3", "proc-macro2 1.0.36", "quote 1.0.15", "syn 1.0.86", @@ -2902,7 +2916,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "3.0.0" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "proc-macro2 1.0.36", "quote 1.0.15", @@ -2912,7 +2926,7 @@ dependencies = [ [[package]] name = "frame-system" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "frame-support", "log", @@ -2929,7 +2943,7 @@ dependencies = [ [[package]] name = "frame-system-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "frame-benchmarking", "frame-support", @@ -2944,7 +2958,7 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "parity-scale-codec", "sp-api", @@ -2953,7 +2967,7 @@ dependencies = [ [[package]] name = "frame-try-runtime" version = "0.10.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "frame-support", "sp-api", @@ -3105,8 +3119,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3a1387e07917c711fb4ee4f48ea0adb04a3c9739e53ef85bf43ae1edc2937a8b" dependencies = [ "futures-io", - "rustls", - "webpki", + "rustls 0.19.1", + "webpki 0.21.4", ] [[package]] @@ -3337,6 +3351,12 @@ dependencies = [ "unicode-segmentation", ] +[[package]] +name = "heck" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" + [[package]] name = "heim" version = "0.1.0-rc.1" @@ -3583,11 +3603,11 @@ dependencies = [ "futures-util", "hyper", "log", - "rustls", - "rustls-native-certs", + "rustls 0.19.1", + "rustls-native-certs 0.5.0", "tokio", - "tokio-rustls", - "webpki", + "tokio-rustls 0.22.0", + "webpki 0.21.4", ] [[package]] @@ -3678,9 +3698,9 @@ dependencies = [ [[package]] name = "impl-trait-for-tuples" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5dacb10c5b3bb92d46ba347505a9041e676bb20ad220101326bffb0c93031ee" +checksum = "11d7a9f6330b71fea57921c9b61c47ee6e84f72d394754eff6163ae67e7395eb" dependencies = [ "proc-macro2 1.0.36", "quote 1.0.15", @@ -3689,9 +3709,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc633605454125dec4b66843673f01c7df2b89479b32e0ed634e43a91cff62a5" +checksum = "282a6247722caba404c065016bbfa522806e51714c34f5dfc3e4a3a46fcb4223" dependencies = [ "autocfg 1.0.1", "hashbrown 0.11.2", @@ -3941,20 +3961,74 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6373a33d987866ccfe1af4bc11b089dce941764313f9fd8b7cf13fcb51b72dc5" dependencies = [ - "jsonrpsee-proc-macros", - "jsonrpsee-types", + "jsonrpsee-types 0.4.1", "jsonrpsee-utils", - "jsonrpsee-ws-client", + "jsonrpsee-ws-client 0.4.1", +] + +[[package]] +name = "jsonrpsee" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05fd8cd6c6b1bbd06881d2cf88f1fc83cc36c98f2219090f839115fb4a956cb9" +dependencies = [ + "jsonrpsee-core", + "jsonrpsee-proc-macros", + "jsonrpsee-types 0.8.0", + "jsonrpsee-ws-client 0.8.0", +] + +[[package]] +name = "jsonrpsee-client-transport" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3303cdf246e6ab76e2866fb3d9acb6c76a068b1b28bd923a1b7a8122257ad7b5" +dependencies = [ + "futures 0.3.21", + "http", + "jsonrpsee-core", + "jsonrpsee-types 0.8.0", + "pin-project 1.0.10", + "rustls-native-certs 0.6.1", + "soketto", + "thiserror", + "tokio", + "tokio-rustls 0.23.2", + "tokio-util", + "tracing", + "webpki-roots 0.22.2", +] + +[[package]] +name = "jsonrpsee-core" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f220b5a238dc7992b90f1144fbf6eaa585872c9376afe6fe6863ffead6191bf3" +dependencies = [ + "anyhow", + "arrayvec 0.7.1", + "async-trait", + "beef", + "futures-channel", + "futures-util", + "hyper", + "jsonrpsee-types 0.8.0", + "rustc-hash", + "serde", + "serde_json", + "soketto", + "thiserror", + "tokio", + "tracing", ] [[package]] name = "jsonrpsee-proc-macros" -version = "0.4.1" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d802063f7a3c867456955f9d2f15eb3ee0edb5ec9ec2b5526324756759221c0f" +checksum = "4299ebf790ea9de1cb72e73ff2ae44c723ef264299e5e2d5ef46a371eb3ac3d8" dependencies = [ - "log", - "proc-macro-crate 1.1.0", + "proc-macro-crate 1.1.3", "proc-macro2 1.0.36", "quote 1.0.15", "syn 1.0.86", @@ -3979,6 +4053,20 @@ dependencies = [ "thiserror", ] +[[package]] +name = "jsonrpsee-types" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1b3f601bbbe45cd63f5407b6f7d7950e08a7d4f82aa699ff41a4a5e9e54df58" +dependencies = [ + "anyhow", + "beef", + "serde", + "serde_json", + "thiserror", + "tracing", +] + [[package]] name = "jsonrpsee-utils" version = "0.4.1" @@ -3987,7 +4075,7 @@ checksum = "0109c4f972058f3b1925b73a17210aff7b63b65967264d0045d15ee88fe84f0c" dependencies = [ "arrayvec 0.7.1", "beef", - "jsonrpsee-types", + "jsonrpsee-types 0.4.1", ] [[package]] @@ -4001,19 +4089,30 @@ dependencies = [ "fnv", "futures 0.3.21", "http", - "jsonrpsee-types", + "jsonrpsee-types 0.4.1", "log", "pin-project 1.0.10", - "rustls-native-certs", + "rustls-native-certs 0.5.0", "serde", "serde_json", "soketto", "thiserror", "tokio", - "tokio-rustls", + "tokio-rustls 0.22.0", "tokio-util", ] +[[package]] +name = "jsonrpsee-ws-client" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aff425cee7c779e33920913bc695447416078ee6d119f443f3060feffa4e86b5" +dependencies = [ + "jsonrpsee-client-transport", + "jsonrpsee-core", + "jsonrpsee-types 0.8.0", +] + [[package]] name = "keccak" version = "0.1.0" @@ -4032,8 +4131,8 @@ dependencies = [ [[package]] name = "kusama-runtime" -version = "0.9.16" -source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.16#c028a34292a744d048d3076e7b072db39d745df7" +version = "0.9.17" +source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.17#66cb46bb3a7bd7295d1eb39a391559bc6efb2a22" dependencies = [ "beefy-primitives", "bitvec 0.20.4", @@ -4115,8 +4214,8 @@ dependencies = [ [[package]] name = "kusama-runtime-constants" -version = "0.9.16" -source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.16#c028a34292a744d048d3076e7b072db39d745df7" +version = "0.9.17" +source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.17#66cb46bb3a7bd7295d1eb39a391559bc6efb2a22" dependencies = [ "frame-support", "polkadot-primitives", @@ -4284,7 +4383,7 @@ dependencies = [ "pin-project 1.0.10", "prost", "prost-build", - "rand 0.8.4", + "rand 0.8.5", "ring", "rw-stream-sink", "sha2 0.9.8", @@ -4422,7 +4521,7 @@ dependencies = [ "libp2p-core", "libp2p-swarm", "log", - "rand 0.8.4", + "rand 0.8.5", "smallvec 1.8.0", "socket2 0.4.0", "void", @@ -4474,7 +4573,7 @@ dependencies = [ "log", "prost", "prost-build", - "rand 0.8.4", + "rand 0.8.5", "sha2 0.9.8", "snow", "static_assertions", @@ -4565,7 +4664,7 @@ dependencies = [ "log", "prost", "prost-build", - "rand 0.8.4", + "rand 0.8.5", "sha2 0.9.8", "thiserror", "unsigned-varint 0.7.0", @@ -4676,7 +4775,7 @@ dependencies = [ "rw-stream-sink", "soketto", "url 2.2.2", - "webpki-roots", + "webpki-roots 0.21.1", ] [[package]] @@ -4771,7 +4870,7 @@ dependencies = [ "libsecp256k1-core 0.3.0", "libsecp256k1-gen-ecmult 0.3.0", "libsecp256k1-gen-genmult 0.3.0", - "rand 0.8.4", + "rand 0.8.5", "serde", "sha2 0.9.8", "typenum", @@ -5118,8 +5217,8 @@ dependencies = [ [[package]] name = "metered-channel" -version = "0.9.16" -source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.16#c028a34292a744d048d3076e7b072db39d745df7" +version = "0.9.17" +source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.17#66cb46bb3a7bd7295d1eb39a391559bc6efb2a22" dependencies = [ "derive_more", "futures 0.3.21", @@ -5135,7 +5234,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fd2c2cc134e57461f0898b0e921f0a7819b5e3f3a4335b9aa390ce81a5f36fb9" dependencies = [ "futures 0.3.21", - "rand 0.8.4", + "rand 0.8.5", "thrift", ] @@ -5347,6 +5446,7 @@ dependencies = [ name = "moonbeam-cli" version = "0.20.1" dependencies = [ + "clap 3.1.2", "cumulus-client-cli", "cumulus-client-service", "cumulus-primitives-core", @@ -5367,7 +5467,6 @@ dependencies = [ "sc-tracing", "sp-core", "sp-runtime", - "structopt", "substrate-build-script-utils", "try-runtime-cli", ] @@ -5377,11 +5476,11 @@ name = "moonbeam-cli-opt" version = "0.20.1" dependencies = [ "account", + "clap 3.1.2", "libsecp256k1 0.6.0", "primitive-types", "sha3 0.9.1", "sp-runtime", - "structopt", "tiny-bip39", "tiny-hderive", ] @@ -5782,6 +5881,7 @@ dependencies = [ "flume", "fp-consensus", "fp-rpc", + "fp-storage", "frame-benchmarking", "frame-benchmarking-cli", "frame-system-rpc-runtime-api", @@ -5873,8 +5973,8 @@ dependencies = [ name = "moonkey" version = "0.1.1" dependencies = [ + "clap 3.1.2", "moonbeam-cli-opt", - "structopt", ] [[package]] @@ -6059,7 +6159,7 @@ version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "424f6e86263cd5294cbd7f1e95746b95aca0e0d66bff31e5a40d6baa87b4aa99" dependencies = [ - "proc-macro-crate 1.1.0", + "proc-macro-crate 1.1.3", "proc-macro-error", "proc-macro2 1.0.36", "quote 1.0.15", @@ -6099,7 +6199,7 @@ dependencies = [ "num-complex", "num-rational 0.4.0", "num-traits", - "rand 0.8.4", + "rand 0.8.5", "rand_distr", "simba", "typenum", @@ -6122,7 +6222,7 @@ version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "10a8690bf09abf659851e58cd666c3d37ac6af07c2bd7a9e332cfba471715775" dependencies = [ - "rand 0.8.4", + "rand 0.8.5", ] [[package]] @@ -6148,7 +6248,7 @@ dependencies = [ [[package]] name = "nimbus-consensus" version = "0.9.0" -source = "git+https://github.com/purestake/nimbus?branch=moonbeam-polkadot-v0.9.16#0e06b186bdbde069ba9c2177f9baed1bae833b19" +source = "git+https://github.com/purestake/nimbus?branch=moonbeam-polkadot-v0.9.17#5f92d1434491c06d87c03193938ce02bd2bdd7d3" dependencies = [ "async-trait", "cumulus-client-consensus-common", @@ -6180,7 +6280,7 @@ dependencies = [ [[package]] name = "nimbus-primitives" version = "0.9.0" -source = "git+https://github.com/purestake/nimbus?branch=moonbeam-polkadot-v0.9.16#0e06b186bdbde069ba9c2177f9baed1bae833b19" +source = "git+https://github.com/purestake/nimbus?branch=moonbeam-polkadot-v0.9.17#5f92d1434491c06d87c03193938ce02bd2bdd7d3" dependencies = [ "async-trait", "frame-support", @@ -6389,7 +6489,7 @@ version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "486ea01961c4a818096de679a8b740b26d9033146ac5291b1c98557658f8cdd9" dependencies = [ - "proc-macro-crate 1.1.0", + "proc-macro-crate 1.1.3", "proc-macro2 1.0.36", "quote 1.0.15", "syn 1.0.86", @@ -6465,7 +6565,7 @@ dependencies = [ [[package]] name = "orml-traits" version = "0.4.1-dev" -source = "git+https://github.com/purestake/open-runtime-module-library?branch=moonbeam-polkadot-v0.9.16#2fcfee8eef1b30e6a05a80d992a001c5a5e7aa9b" +source = "git+https://github.com/purestake/open-runtime-module-library?branch=moonbeam-polkadot-v0.9.17#7ba9fad0423294bd0799d45cd7d7cff37da9007b" dependencies = [ "frame-support", "impl-trait-for-tuples", @@ -6483,7 +6583,7 @@ dependencies = [ [[package]] name = "orml-utilities" version = "0.4.1-dev" -source = "git+https://github.com/purestake/open-runtime-module-library?branch=moonbeam-polkadot-v0.9.16#2fcfee8eef1b30e6a05a80d992a001c5a5e7aa9b" +source = "git+https://github.com/purestake/open-runtime-module-library?branch=moonbeam-polkadot-v0.9.17#7ba9fad0423294bd0799d45cd7d7cff37da9007b" dependencies = [ "frame-support", "parity-scale-codec", @@ -6497,7 +6597,7 @@ dependencies = [ [[package]] name = "orml-xcm-support" version = "0.4.1-dev" -source = "git+https://github.com/purestake/open-runtime-module-library?branch=moonbeam-polkadot-v0.9.16#2fcfee8eef1b30e6a05a80d992a001c5a5e7aa9b" +source = "git+https://github.com/purestake/open-runtime-module-library?branch=moonbeam-polkadot-v0.9.17#7ba9fad0423294bd0799d45cd7d7cff37da9007b" dependencies = [ "frame-support", "orml-traits", @@ -6511,7 +6611,7 @@ dependencies = [ [[package]] name = "orml-xtokens" version = "0.4.1-dev" -source = "git+https://github.com/purestake/open-runtime-module-library?branch=moonbeam-polkadot-v0.9.16#2fcfee8eef1b30e6a05a80d992a001c5a5e7aa9b" +source = "git+https://github.com/purestake/open-runtime-module-library?branch=moonbeam-polkadot-v0.9.17#7ba9fad0423294bd0799d45cd7d7cff37da9007b" dependencies = [ "cumulus-primitives-core", "frame-support", @@ -6528,6 +6628,15 @@ dependencies = [ "xcm-executor", ] +[[package]] +name = "os_str_bytes" +version = "6.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e22443d1643a904602595ba1cd8f7d896afe56d26712531c5ff73a15b2fbf64" +dependencies = [ + "memchr", +] + [[package]] name = "owning_ref" version = "0.4.1" @@ -6560,7 +6669,7 @@ dependencies = [ [[package]] name = "pallet-assets" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "frame-benchmarking", "frame-support", @@ -6574,7 +6683,7 @@ dependencies = [ [[package]] name = "pallet-author-inherent" version = "0.9.0" -source = "git+https://github.com/purestake/nimbus?branch=moonbeam-polkadot-v0.9.16#0e06b186bdbde069ba9c2177f9baed1bae833b19" +source = "git+https://github.com/purestake/nimbus?branch=moonbeam-polkadot-v0.9.17#5f92d1434491c06d87c03193938ce02bd2bdd7d3" dependencies = [ "frame-support", "frame-system", @@ -6639,7 +6748,7 @@ dependencies = [ [[package]] name = "pallet-author-slot-filter" version = "0.9.0" -source = "git+https://github.com/purestake/nimbus?branch=moonbeam-polkadot-v0.9.16#0e06b186bdbde069ba9c2177f9baed1bae833b19" +source = "git+https://github.com/purestake/nimbus?branch=moonbeam-polkadot-v0.9.17#5f92d1434491c06d87c03193938ce02bd2bdd7d3" dependencies = [ "frame-support", "frame-system", @@ -6656,7 +6765,7 @@ dependencies = [ [[package]] name = "pallet-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "frame-support", "frame-system", @@ -6672,7 +6781,7 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "frame-support", "frame-system", @@ -6687,7 +6796,7 @@ dependencies = [ [[package]] name = "pallet-babe" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "frame-benchmarking", "frame-support", @@ -6711,7 +6820,7 @@ dependencies = [ [[package]] name = "pallet-bags-list" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "frame-election-provider-support", "frame-support", @@ -6726,7 +6835,7 @@ dependencies = [ [[package]] name = "pallet-balances" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "frame-benchmarking", "frame-support", @@ -6741,7 +6850,7 @@ dependencies = [ [[package]] name = "pallet-base-fee" version = "1.0.0" -source = "git+https://github.com/purestake/frontier?branch=moonbeam-polkadot-v0.9.16#a74529a06c7d3137c621a1ec6ae49a9c57e7416f" +source = "git+https://github.com/purestake/frontier?branch=moonbeam-polkadot-v0.9.17#2be428cd1cf69bf66fe760eb6bbbac3e589decbe" dependencies = [ "frame-support", "frame-system", @@ -6756,7 +6865,7 @@ dependencies = [ [[package]] name = "pallet-beefy" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "beefy-primitives", "frame-support", @@ -6772,7 +6881,7 @@ dependencies = [ [[package]] name = "pallet-beefy-mmr" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "beefy-merkle-tree", "beefy-primitives", @@ -6797,7 +6906,7 @@ dependencies = [ [[package]] name = "pallet-bounties" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "frame-support", "frame-system", @@ -6814,7 +6923,7 @@ dependencies = [ [[package]] name = "pallet-bridge-dispatch" version = "0.1.0" -source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.16#c028a34292a744d048d3076e7b072db39d745df7" +source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.17#66cb46bb3a7bd7295d1eb39a391559bc6efb2a22" dependencies = [ "bp-message-dispatch", "bp-runtime", @@ -6831,7 +6940,7 @@ dependencies = [ [[package]] name = "pallet-bridge-grandpa" version = "0.1.0" -source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.16#c028a34292a744d048d3076e7b072db39d745df7" +source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.17#66cb46bb3a7bd7295d1eb39a391559bc6efb2a22" dependencies = [ "bp-header-chain", "bp-runtime", @@ -6853,7 +6962,7 @@ dependencies = [ [[package]] name = "pallet-bridge-messages" version = "0.1.0" -source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.16#c028a34292a744d048d3076e7b072db39d745df7" +source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.17#66cb46bb3a7bd7295d1eb39a391559bc6efb2a22" dependencies = [ "bitvec 0.20.4", "bp-message-dispatch", @@ -6874,7 +6983,7 @@ dependencies = [ [[package]] name = "pallet-collective" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "frame-benchmarking", "frame-support", @@ -6891,7 +7000,7 @@ dependencies = [ [[package]] name = "pallet-crowdloan-rewards" version = "0.6.0" -source = "git+https://github.com/purestake/crowdloan-rewards?branch=moonbeam-polkadot-v0.9.16#6cf0021bfa08c473a5886c06c38fafa6f59b29cc" +source = "git+https://github.com/purestake/crowdloan-rewards?branch=moonbeam-polkadot-v0.9.17#9a9c171f212766ffd7520536dea2c5b99b5f1a2b" dependencies = [ "cumulus-pallet-parachain-system", "cumulus-primitives-core", @@ -6916,7 +7025,7 @@ dependencies = [ [[package]] name = "pallet-democracy" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "frame-benchmarking", "frame-support", @@ -6958,13 +7067,15 @@ dependencies = [ [[package]] name = "pallet-election-provider-multi-phase" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ + "frame-benchmarking", "frame-election-provider-support", "frame-support", "frame-system", "log", "parity-scale-codec", + "rand 0.7.3", "scale-info", "sp-arithmetic", "sp-core", @@ -6973,12 +7084,13 @@ dependencies = [ "sp-runtime", "sp-std", "static_assertions", + "strum", ] [[package]] name = "pallet-elections-phragmen" version = "5.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "frame-support", "frame-system", @@ -6995,7 +7107,7 @@ dependencies = [ [[package]] name = "pallet-ethereum" version = "4.0.0-dev" -source = "git+https://github.com/purestake/frontier?branch=moonbeam-polkadot-v0.9.16#a74529a06c7d3137c621a1ec6ae49a9c57e7416f" +source = "git+https://github.com/purestake/frontier?branch=moonbeam-polkadot-v0.9.17#2be428cd1cf69bf66fe760eb6bbbac3e589decbe" dependencies = [ "ethereum", "ethereum-types", @@ -7013,10 +7125,9 @@ dependencies = [ "pallet-timestamp", "parity-scale-codec", "rlp", - "rustc-hex", "scale-info", "serde", - "sha3 0.8.2", + "sha3 0.10.1", "sp-io", "sp-runtime", "sp-std", @@ -7036,11 +7147,9 @@ dependencies = [ [[package]] name = "pallet-evm" version = "6.0.0-dev" -source = "git+https://github.com/purestake/frontier?branch=moonbeam-polkadot-v0.9.16#a74529a06c7d3137c621a1ec6ae49a9c57e7416f" +source = "git+https://github.com/purestake/frontier?branch=moonbeam-polkadot-v0.9.17#2be428cd1cf69bf66fe760eb6bbbac3e589decbe" dependencies = [ "evm", - "evm-gasometer", - "evm-runtime", "fp-evm", "frame-benchmarking", "frame-support", @@ -7116,74 +7225,63 @@ dependencies = [ [[package]] name = "pallet-evm-precompile-blake2" version = "2.0.0-dev" -source = "git+https://github.com/purestake/frontier?branch=moonbeam-polkadot-v0.9.16#a74529a06c7d3137c621a1ec6ae49a9c57e7416f" +source = "git+https://github.com/purestake/frontier?branch=moonbeam-polkadot-v0.9.17#2be428cd1cf69bf66fe760eb6bbbac3e589decbe" dependencies = [ "fp-evm", - "sp-core", - "sp-io", ] [[package]] name = "pallet-evm-precompile-bn128" version = "2.0.0-dev" -source = "git+https://github.com/purestake/frontier?branch=moonbeam-polkadot-v0.9.16#a74529a06c7d3137c621a1ec6ae49a9c57e7416f" +source = "git+https://github.com/purestake/frontier?branch=moonbeam-polkadot-v0.9.17#2be428cd1cf69bf66fe760eb6bbbac3e589decbe" dependencies = [ "fp-evm", "sp-core", - "sp-io", "substrate-bn", ] [[package]] name = "pallet-evm-precompile-dispatch" version = "2.0.0-dev" -source = "git+https://github.com/purestake/frontier?branch=moonbeam-polkadot-v0.9.16#a74529a06c7d3137c621a1ec6ae49a9c57e7416f" +source = "git+https://github.com/purestake/frontier?branch=moonbeam-polkadot-v0.9.17#2be428cd1cf69bf66fe760eb6bbbac3e589decbe" dependencies = [ "fp-evm", "frame-support", "pallet-evm", - "parity-scale-codec", - "sp-core", - "sp-io", ] [[package]] name = "pallet-evm-precompile-modexp" version = "2.0.0-dev" -source = "git+https://github.com/purestake/frontier?branch=moonbeam-polkadot-v0.9.16#a74529a06c7d3137c621a1ec6ae49a9c57e7416f" +source = "git+https://github.com/purestake/frontier?branch=moonbeam-polkadot-v0.9.17#2be428cd1cf69bf66fe760eb6bbbac3e589decbe" dependencies = [ "fp-evm", "num", - "sp-core", - "sp-io", ] [[package]] name = "pallet-evm-precompile-sha3fips" version = "2.0.0-dev" -source = "git+https://github.com/purestake/frontier?branch=moonbeam-polkadot-v0.9.16#a74529a06c7d3137c621a1ec6ae49a9c57e7416f" +source = "git+https://github.com/purestake/frontier?branch=moonbeam-polkadot-v0.9.17#2be428cd1cf69bf66fe760eb6bbbac3e589decbe" dependencies = [ "fp-evm", - "sp-core", - "sp-io", "tiny-keccak", ] [[package]] name = "pallet-evm-precompile-simple" version = "2.0.0-dev" -source = "git+https://github.com/purestake/frontier?branch=moonbeam-polkadot-v0.9.16#a74529a06c7d3137c621a1ec6ae49a9c57e7416f" +source = "git+https://github.com/purestake/frontier?branch=moonbeam-polkadot-v0.9.17#2be428cd1cf69bf66fe760eb6bbbac3e589decbe" dependencies = [ "fp-evm", - "ripemd160", - "sp-core", + "ripemd", "sp-io", ] [[package]] name = "pallet-gilt" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "frame-benchmarking", "frame-support", @@ -7198,7 +7296,7 @@ dependencies = [ [[package]] name = "pallet-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "frame-benchmarking", "frame-support", @@ -7221,7 +7319,7 @@ dependencies = [ [[package]] name = "pallet-identity" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "enumflags2", "frame-benchmarking", @@ -7237,7 +7335,7 @@ dependencies = [ [[package]] name = "pallet-im-online" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "frame-support", "frame-system", @@ -7256,7 +7354,7 @@ dependencies = [ [[package]] name = "pallet-indices" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "frame-support", "frame-system", @@ -7288,7 +7386,7 @@ dependencies = [ [[package]] name = "pallet-membership" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "frame-benchmarking", "frame-support", @@ -7322,7 +7420,7 @@ dependencies = [ [[package]] name = "pallet-mmr" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "ckb-merkle-mountain-range", "frame-benchmarking", @@ -7340,7 +7438,7 @@ dependencies = [ [[package]] name = "pallet-mmr-primitives" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "frame-support", "frame-system", @@ -7356,7 +7454,7 @@ dependencies = [ [[package]] name = "pallet-mmr-rpc" version = "3.0.0" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -7373,7 +7471,7 @@ dependencies = [ [[package]] name = "pallet-multisig" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "frame-support", "frame-system", @@ -7387,7 +7485,7 @@ dependencies = [ [[package]] name = "pallet-nicks" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "frame-support", "frame-system", @@ -7401,7 +7499,7 @@ dependencies = [ [[package]] name = "pallet-offences" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "frame-support", "frame-system", @@ -7418,7 +7516,7 @@ dependencies = [ [[package]] name = "pallet-preimage" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "frame-benchmarking", "frame-support", @@ -7434,7 +7532,7 @@ dependencies = [ [[package]] name = "pallet-proxy" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "frame-support", "frame-system", @@ -7464,7 +7562,7 @@ dependencies = [ [[package]] name = "pallet-randomness-collective-flip" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "frame-support", "frame-system", @@ -7478,7 +7576,7 @@ dependencies = [ [[package]] name = "pallet-recovery" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "frame-support", "frame-system", @@ -7492,7 +7590,7 @@ dependencies = [ [[package]] name = "pallet-scheduler" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "frame-benchmarking", "frame-support", @@ -7508,7 +7606,7 @@ dependencies = [ [[package]] name = "pallet-session" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "frame-support", "frame-system", @@ -7529,7 +7627,7 @@ dependencies = [ [[package]] name = "pallet-society" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "frame-support", "frame-system", @@ -7543,7 +7641,7 @@ dependencies = [ [[package]] name = "pallet-staking" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "frame-election-provider-support", "frame-support", @@ -7564,9 +7662,9 @@ dependencies = [ [[package]] name = "pallet-staking-reward-curve" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ - "proc-macro-crate 1.1.0", + "proc-macro-crate 1.1.3", "proc-macro2 1.0.36", "quote 1.0.15", "syn 1.0.86", @@ -7575,7 +7673,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-fn" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "log", "sp-arithmetic", @@ -7584,7 +7682,7 @@ dependencies = [ [[package]] name = "pallet-sudo" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "frame-support", "frame-system", @@ -7598,7 +7696,7 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "frame-benchmarking", "frame-support", @@ -7616,7 +7714,7 @@ dependencies = [ [[package]] name = "pallet-tips" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "frame-support", "frame-system", @@ -7634,7 +7732,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "frame-support", "frame-system", @@ -7651,7 +7749,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -7668,7 +7766,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "pallet-transaction-payment", "parity-scale-codec", @@ -7679,7 +7777,7 @@ dependencies = [ [[package]] name = "pallet-treasury" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "frame-support", "frame-system", @@ -7695,7 +7793,7 @@ dependencies = [ [[package]] name = "pallet-utility" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "frame-support", "frame-system", @@ -7710,7 +7808,7 @@ dependencies = [ [[package]] name = "pallet-vesting" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "frame-support", "frame-system", @@ -7723,8 +7821,8 @@ dependencies = [ [[package]] name = "pallet-xcm" -version = "0.9.16" -source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.16#c028a34292a744d048d3076e7b072db39d745df7" +version = "0.9.17" +source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.17#66cb46bb3a7bd7295d1eb39a391559bc6efb2a22" dependencies = [ "frame-support", "frame-system", @@ -7742,7 +7840,7 @@ dependencies = [ [[package]] name = "parachain-info" version = "0.1.0" -source = "git+https://github.com/purestake/cumulus?branch=moonbeam-polkadot-v0.9.16#c92f0abbfaefe66645d2d54facb878dd98273a9d" +source = "git+https://github.com/purestake/cumulus?branch=moonbeam-polkadot-v0.9.17#b43fcfff1df6bad837b98e5862e60367b9bc92e0" dependencies = [ "cumulus-primitives-core", "frame-support", @@ -7814,7 +7912,7 @@ dependencies = [ "lz4", "memmap2 0.2.3", "parking_lot 0.11.2", - "rand 0.8.4", + "rand 0.8.5", "snap", ] @@ -7838,7 +7936,7 @@ version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1557010476e0595c9b568d16dcfb81b93cdeb157612726f5170d31aa707bed27" dependencies = [ - "proc-macro-crate 1.1.0", + "proc-macro-crate 1.1.3", "proc-macro2 1.0.36", "quote 1.0.15", "syn 1.0.86", @@ -7974,6 +8072,16 @@ dependencies = [ "parking_lot_core 0.8.5", ] +[[package]] +name = "parking_lot" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87f5ec2493a61ac0506c0f4199f99070cbe83857b0337006a30f3e6719b8ef58" +dependencies = [ + "lock_api 0.4.6", + "parking_lot_core 0.9.1", +] + [[package]] name = "parking_lot_core" version = "0.4.0" @@ -8030,6 +8138,19 @@ dependencies = [ "winapi 0.3.9", ] +[[package]] +name = "parking_lot_core" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28141e0cc4143da2443301914478dc976a61ffdb3f043058310c70df2fed8954" +dependencies = [ + "cfg-if 1.0.0", + "libc", + "redox_syscall 0.2.9", + "smallvec 1.8.0", + "windows-sys", +] + [[package]] name = "paste" version = "1.0.6" @@ -8077,10 +8198,12 @@ name = "perf-test" version = "0.1.0" dependencies = [ "async-io", + "clap 3.1.2", "cli-table", "cumulus-primitives-parachain-inherent", "ethereum", "fc-consensus", + "fc-rpc", "fp-evm", "fp-rpc", "futures 0.3.21", @@ -8119,7 +8242,6 @@ dependencies = [ "sp-runtime", "sp-state-machine", "sp-timestamp", - "structopt", ] [[package]] @@ -8253,8 +8375,8 @@ checksum = "e8d0eef3571242013a0d5dc84861c3ae4a652e56e12adf8bdc26ff5f8cb34c94" [[package]] name = "polkadot-approval-distribution" -version = "0.9.16" -source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.16#c028a34292a744d048d3076e7b072db39d745df7" +version = "0.9.17" +source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.17#66cb46bb3a7bd7295d1eb39a391559bc6efb2a22" dependencies = [ "futures 0.3.21", "polkadot-node-network-protocol", @@ -8267,8 +8389,8 @@ dependencies = [ [[package]] name = "polkadot-availability-bitfield-distribution" -version = "0.9.16" -source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.16#c028a34292a744d048d3076e7b072db39d745df7" +version = "0.9.17" +source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.17#66cb46bb3a7bd7295d1eb39a391559bc6efb2a22" dependencies = [ "futures 0.3.21", "polkadot-node-network-protocol", @@ -8280,8 +8402,8 @@ dependencies = [ [[package]] name = "polkadot-availability-distribution" -version = "0.9.16" -source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.16#c028a34292a744d048d3076e7b072db39d745df7" +version = "0.9.17" +source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.17#66cb46bb3a7bd7295d1eb39a391559bc6efb2a22" dependencies = [ "derive_more", "futures 0.3.21", @@ -8293,7 +8415,7 @@ dependencies = [ "polkadot-node-subsystem", "polkadot-node-subsystem-util", "polkadot-primitives", - "rand 0.8.4", + "rand 0.8.5", "sp-core", "sp-keystore", "thiserror", @@ -8302,8 +8424,8 @@ dependencies = [ [[package]] name = "polkadot-availability-recovery" -version = "0.9.16" -source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.16#c028a34292a744d048d3076e7b072db39d745df7" +version = "0.9.17" +source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.17#66cb46bb3a7bd7295d1eb39a391559bc6efb2a22" dependencies = [ "futures 0.3.21", "lru 0.7.2", @@ -8314,7 +8436,7 @@ dependencies = [ "polkadot-node-subsystem", "polkadot-node-subsystem-util", "polkadot-primitives", - "rand 0.8.4", + "rand 0.8.5", "sc-network", "thiserror", "tracing", @@ -8322,9 +8444,10 @@ dependencies = [ [[package]] name = "polkadot-cli" -version = "0.9.16" -source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.16#c028a34292a744d048d3076e7b072db39d745df7" +version = "0.9.17" +source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.17#66cb46bb3a7bd7295d1eb39a391559bc6efb2a22" dependencies = [ + "clap 3.1.2", "frame-benchmarking-cli", "futures 0.3.21", "log", @@ -8337,7 +8460,6 @@ dependencies = [ "sc-tracing", "sp-core", "sp-trie", - "structopt", "substrate-build-script-utils", "thiserror", "try-runtime-cli", @@ -8345,8 +8467,8 @@ dependencies = [ [[package]] name = "polkadot-client" -version = "0.9.16" -source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.16#c028a34292a744d048d3076e7b072db39d745df7" +version = "0.9.17" +source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.17#66cb46bb3a7bd7295d1eb39a391559bc6efb2a22" dependencies = [ "beefy-primitives", "frame-benchmarking", @@ -8378,8 +8500,8 @@ dependencies = [ [[package]] name = "polkadot-collator-protocol" -version = "0.9.16" -source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.16#c028a34292a744d048d3076e7b072db39d745df7" +version = "0.9.17" +source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.17#66cb46bb3a7bd7295d1eb39a391559bc6efb2a22" dependencies = [ "always-assert", "derive_more", @@ -8399,8 +8521,8 @@ dependencies = [ [[package]] name = "polkadot-core-primitives" -version = "0.9.16" -source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.16#c028a34292a744d048d3076e7b072db39d745df7" +version = "0.9.17" +source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.17#66cb46bb3a7bd7295d1eb39a391559bc6efb2a22" dependencies = [ "parity-scale-codec", "parity-util-mem", @@ -8412,8 +8534,8 @@ dependencies = [ [[package]] name = "polkadot-dispute-distribution" -version = "0.9.16" -source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.16#c028a34292a744d048d3076e7b072db39d745df7" +version = "0.9.17" +source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.17#66cb46bb3a7bd7295d1eb39a391559bc6efb2a22" dependencies = [ "derive_more", "futures 0.3.21", @@ -8434,8 +8556,8 @@ dependencies = [ [[package]] name = "polkadot-erasure-coding" -version = "0.9.16" -source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.16#c028a34292a744d048d3076e7b072db39d745df7" +version = "0.9.17" +source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.17#66cb46bb3a7bd7295d1eb39a391559bc6efb2a22" dependencies = [ "parity-scale-codec", "polkadot-node-primitives", @@ -8448,8 +8570,8 @@ dependencies = [ [[package]] name = "polkadot-gossip-support" -version = "0.9.16" -source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.16#c028a34292a744d048d3076e7b072db39d745df7" +version = "0.9.17" +source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.17#66cb46bb3a7bd7295d1eb39a391559bc6efb2a22" dependencies = [ "futures 0.3.21", "futures-timer", @@ -8457,7 +8579,7 @@ dependencies = [ "polkadot-node-subsystem", "polkadot-node-subsystem-util", "polkadot-primitives", - "rand 0.8.4", + "rand 0.8.5", "rand_chacha 0.3.1", "sc-network", "sp-application-crypto", @@ -8468,8 +8590,8 @@ dependencies = [ [[package]] name = "polkadot-network-bridge" -version = "0.9.16" -source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.16#c028a34292a744d048d3076e7b072db39d745df7" +version = "0.9.17" +source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.17#66cb46bb3a7bd7295d1eb39a391559bc6efb2a22" dependencies = [ "async-trait", "futures 0.3.21", @@ -8487,8 +8609,8 @@ dependencies = [ [[package]] name = "polkadot-node-collation-generation" -version = "0.9.16" -source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.16#c028a34292a744d048d3076e7b072db39d745df7" +version = "0.9.17" +source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.17#66cb46bb3a7bd7295d1eb39a391559bc6efb2a22" dependencies = [ "futures 0.3.21", "parity-scale-codec", @@ -8505,8 +8627,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-approval-voting" -version = "0.9.16" -source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.16#c028a34292a744d048d3076e7b072db39d745df7" +version = "0.9.17" +source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.17#66cb46bb3a7bd7295d1eb39a391559bc6efb2a22" dependencies = [ "bitvec 0.20.4", "derive_more", @@ -8533,8 +8655,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-av-store" -version = "0.9.16" -source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.16#c028a34292a744d048d3076e7b072db39d745df7" +version = "0.9.17" +source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.17#66cb46bb3a7bd7295d1eb39a391559bc6efb2a22" dependencies = [ "bitvec 0.20.4", "futures 0.3.21", @@ -8553,8 +8675,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-backing" -version = "0.9.16" -source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.16#c028a34292a744d048d3076e7b072db39d745df7" +version = "0.9.17" +source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.17#66cb46bb3a7bd7295d1eb39a391559bc6efb2a22" dependencies = [ "bitvec 0.20.4", "futures 0.3.21", @@ -8571,8 +8693,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-bitfield-signing" -version = "0.9.16" -source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.16#c028a34292a744d048d3076e7b072db39d745df7" +version = "0.9.17" +source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.17#66cb46bb3a7bd7295d1eb39a391559bc6efb2a22" dependencies = [ "futures 0.3.21", "polkadot-node-subsystem", @@ -8586,8 +8708,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-candidate-validation" -version = "0.9.16" -source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.16#c028a34292a744d048d3076e7b072db39d745df7" +version = "0.9.17" +source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.17#66cb46bb3a7bd7295d1eb39a391559bc6efb2a22" dependencies = [ "async-trait", "futures 0.3.21", @@ -8604,8 +8726,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-chain-api" -version = "0.9.16" -source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.16#c028a34292a744d048d3076e7b072db39d745df7" +version = "0.9.17" +source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.17#66cb46bb3a7bd7295d1eb39a391559bc6efb2a22" dependencies = [ "futures 0.3.21", "polkadot-node-subsystem", @@ -8619,8 +8741,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-chain-selection" -version = "0.9.16" -source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.16#c028a34292a744d048d3076e7b072db39d745df7" +version = "0.9.17" +source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.17#66cb46bb3a7bd7295d1eb39a391559bc6efb2a22" dependencies = [ "futures 0.3.21", "futures-timer", @@ -8636,8 +8758,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-dispute-coordinator" -version = "0.9.16" -source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.16#c028a34292a744d048d3076e7b072db39d745df7" +version = "0.9.17" +source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.17#66cb46bb3a7bd7295d1eb39a391559bc6efb2a22" dependencies = [ "futures 0.3.21", "kvdb", @@ -8654,8 +8776,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-parachains-inherent" -version = "0.9.16" -source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.16#c028a34292a744d048d3076e7b072db39d745df7" +version = "0.9.17" +source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.17#66cb46bb3a7bd7295d1eb39a391559bc6efb2a22" dependencies = [ "async-trait", "futures 0.3.21", @@ -8671,8 +8793,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-provisioner" -version = "0.9.16" -source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.16#c028a34292a744d048d3076e7b072db39d745df7" +version = "0.9.17" +source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.17#66cb46bb3a7bd7295d1eb39a391559bc6efb2a22" dependencies = [ "bitvec 0.20.4", "futures 0.3.21", @@ -8681,15 +8803,15 @@ dependencies = [ "polkadot-node-subsystem", "polkadot-node-subsystem-util", "polkadot-primitives", - "rand 0.8.4", + "rand 0.8.5", "thiserror", "tracing", ] [[package]] name = "polkadot-node-core-pvf" -version = "0.9.16" -source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.16#c028a34292a744d048d3076e7b072db39d745df7" +version = "0.9.17" +source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.17#66cb46bb3a7bd7295d1eb39a391559bc6efb2a22" dependencies = [ "always-assert", "assert_matches", @@ -8702,7 +8824,7 @@ dependencies = [ "polkadot-core-primitives", "polkadot-node-subsystem-util", "polkadot-parachain", - "rand 0.8.4", + "rand 0.8.5", "sc-executor", "sc-executor-common", "sc-executor-wasmtime", @@ -8718,8 +8840,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-pvf-checker" -version = "0.9.16" -source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.16#c028a34292a744d048d3076e7b072db39d745df7" +version = "0.9.17" +source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.17#66cb46bb3a7bd7295d1eb39a391559bc6efb2a22" dependencies = [ "futures 0.3.21", "polkadot-node-primitives", @@ -8734,8 +8856,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-runtime-api" -version = "0.9.16" -source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.16#c028a34292a744d048d3076e7b072db39d745df7" +version = "0.9.17" +source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.17#66cb46bb3a7bd7295d1eb39a391559bc6efb2a22" dependencies = [ "futures 0.3.21", "memory-lru", @@ -8752,8 +8874,8 @@ dependencies = [ [[package]] name = "polkadot-node-jaeger" -version = "0.9.16" -source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.16#c028a34292a744d048d3076e7b072db39d745df7" +version = "0.9.17" +source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.17#66cb46bb3a7bd7295d1eb39a391559bc6efb2a22" dependencies = [ "async-std", "lazy_static", @@ -8770,8 +8892,8 @@ dependencies = [ [[package]] name = "polkadot-node-metrics" -version = "0.9.16" -source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.16#c028a34292a744d048d3076e7b072db39d745df7" +version = "0.9.17" +source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.17#66cb46bb3a7bd7295d1eb39a391559bc6efb2a22" dependencies = [ "bs58", "futures 0.3.21", @@ -8789,8 +8911,8 @@ dependencies = [ [[package]] name = "polkadot-node-network-protocol" -version = "0.9.16" -source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.16#c028a34292a744d048d3076e7b072db39d745df7" +version = "0.9.17" +source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.17#66cb46bb3a7bd7295d1eb39a391559bc6efb2a22" dependencies = [ "async-trait", "derive_more", @@ -8801,14 +8923,14 @@ dependencies = [ "polkadot-primitives", "sc-authority-discovery", "sc-network", - "strum 0.23.0", + "strum", "thiserror", ] [[package]] name = "polkadot-node-primitives" -version = "0.9.16" -source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.16#c028a34292a744d048d3076e7b072db39d745df7" +version = "0.9.17" +source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.17#66cb46bb3a7bd7295d1eb39a391559bc6efb2a22" dependencies = [ "bounded-vec", "futures 0.3.21", @@ -8829,8 +8951,8 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem" -version = "0.9.16" -source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.16#c028a34292a744d048d3076e7b072db39d745df7" +version = "0.9.17" +source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.17#66cb46bb3a7bd7295d1eb39a391559bc6efb2a22" dependencies = [ "polkadot-node-jaeger", "polkadot-node-subsystem-types", @@ -8839,8 +8961,8 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem-types" -version = "0.9.16" -source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.16#c028a34292a744d048d3076e7b072db39d745df7" +version = "0.9.17" +source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.17#66cb46bb3a7bd7295d1eb39a391559bc6efb2a22" dependencies = [ "derive_more", "futures 0.3.21", @@ -8858,8 +8980,8 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem-util" -version = "0.9.16" -source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.16#c028a34292a744d048d3076e7b072db39d745df7" +version = "0.9.17" +source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.17#66cb46bb3a7bd7295d1eb39a391559bc6efb2a22" dependencies = [ "async-trait", "derive_more", @@ -8876,7 +8998,7 @@ dependencies = [ "polkadot-node-subsystem", "polkadot-overseer", "polkadot-primitives", - "rand 0.8.4", + "rand 0.8.5", "sp-application-crypto", "sp-core", "sp-keystore", @@ -8886,8 +9008,8 @@ dependencies = [ [[package]] name = "polkadot-overseer" -version = "0.9.16" -source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.16#c028a34292a744d048d3076e7b072db39d745df7" +version = "0.9.17" +source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.17#66cb46bb3a7bd7295d1eb39a391559bc6efb2a22" dependencies = [ "futures 0.3.21", "futures-timer", @@ -8907,8 +9029,8 @@ dependencies = [ [[package]] name = "polkadot-overseer-gen" -version = "0.9.16" -source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.16#c028a34292a744d048d3076e7b072db39d745df7" +version = "0.9.17" +source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.17#66cb46bb3a7bd7295d1eb39a391559bc6efb2a22" dependencies = [ "async-trait", "futures 0.3.21", @@ -8924,10 +9046,10 @@ dependencies = [ [[package]] name = "polkadot-overseer-gen-proc-macro" -version = "0.9.16" -source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.16#c028a34292a744d048d3076e7b072db39d745df7" +version = "0.9.17" +source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.17#66cb46bb3a7bd7295d1eb39a391559bc6efb2a22" dependencies = [ - "proc-macro-crate 1.1.0", + "proc-macro-crate 1.1.3", "proc-macro2 1.0.36", "quote 1.0.15", "syn 1.0.86", @@ -8935,8 +9057,8 @@ dependencies = [ [[package]] name = "polkadot-parachain" -version = "0.9.16" -source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.16#c028a34292a744d048d3076e7b072db39d745df7" +version = "0.9.17" +source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.17#66cb46bb3a7bd7295d1eb39a391559bc6efb2a22" dependencies = [ "derive_more", "frame-support", @@ -8952,8 +9074,8 @@ dependencies = [ [[package]] name = "polkadot-performance-test" -version = "0.9.16" -source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.16#c028a34292a744d048d3076e7b072db39d745df7" +version = "0.9.17" +source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.17#66cb46bb3a7bd7295d1eb39a391559bc6efb2a22" dependencies = [ "env_logger 0.9.0", "kusama-runtime", @@ -8967,8 +9089,8 @@ dependencies = [ [[package]] name = "polkadot-primitives" -version = "0.9.16" -source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.16#c028a34292a744d048d3076e7b072db39d745df7" +version = "0.9.17" +source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.17#66cb46bb3a7bd7295d1eb39a391559bc6efb2a22" dependencies = [ "bitvec 0.20.4", "frame-system", @@ -8997,8 +9119,8 @@ dependencies = [ [[package]] name = "polkadot-rpc" -version = "0.9.16" -source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.16#c028a34292a744d048d3076e7b072db39d745df7" +version = "0.9.17" +source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.17#66cb46bb3a7bd7295d1eb39a391559bc6efb2a22" dependencies = [ "beefy-gadget", "beefy-gadget-rpc", @@ -9028,8 +9150,8 @@ dependencies = [ [[package]] name = "polkadot-runtime" -version = "0.9.16" -source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.16#c028a34292a744d048d3076e7b072db39d745df7" +version = "0.9.17" +source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.17#66cb46bb3a7bd7295d1eb39a391559bc6efb2a22" dependencies = [ "beefy-primitives", "bitvec 0.20.4", @@ -9107,8 +9229,8 @@ dependencies = [ [[package]] name = "polkadot-runtime-common" -version = "0.9.16" -source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.16#c028a34292a744d048d3076e7b072db39d745df7" +version = "0.9.17" +source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.17#66cb46bb3a7bd7295d1eb39a391559bc6efb2a22" dependencies = [ "beefy-primitives", "bitvec 0.20.4", @@ -9152,8 +9274,8 @@ dependencies = [ [[package]] name = "polkadot-runtime-constants" -version = "0.9.16" -source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.16#c028a34292a744d048d3076e7b072db39d745df7" +version = "0.9.17" +source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.17#66cb46bb3a7bd7295d1eb39a391559bc6efb2a22" dependencies = [ "frame-support", "polkadot-primitives", @@ -9164,8 +9286,8 @@ dependencies = [ [[package]] name = "polkadot-runtime-metrics" -version = "0.9.16" -source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.16#c028a34292a744d048d3076e7b072db39d745df7" +version = "0.9.17" +source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.17#66cb46bb3a7bd7295d1eb39a391559bc6efb2a22" dependencies = [ "bs58", "parity-scale-codec", @@ -9176,8 +9298,8 @@ dependencies = [ [[package]] name = "polkadot-runtime-parachains" -version = "0.9.16" -source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.16#c028a34292a744d048d3076e7b072db39d745df7" +version = "0.9.17" +source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.17#66cb46bb3a7bd7295d1eb39a391559bc6efb2a22" dependencies = [ "bitflags", "bitvec 0.20.4", @@ -9196,7 +9318,7 @@ dependencies = [ "parity-scale-codec", "polkadot-primitives", "polkadot-runtime-metrics", - "rand 0.8.4", + "rand 0.8.5", "rand_chacha 0.3.1", "rustc-hex", "scale-info", @@ -9216,8 +9338,8 @@ dependencies = [ [[package]] name = "polkadot-service" -version = "0.9.16" -source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.16#c028a34292a744d048d3076e7b072db39d745df7" +version = "0.9.17" +source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.17#66cb46bb3a7bd7295d1eb39a391559bc6efb2a22" dependencies = [ "async-trait", "beefy-gadget", @@ -9319,8 +9441,8 @@ dependencies = [ [[package]] name = "polkadot-statement-distribution" -version = "0.9.16" -source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.16#c028a34292a744d048d3076e7b072db39d745df7" +version = "0.9.17" +source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.17#66cb46bb3a7bd7295d1eb39a391559bc6efb2a22" dependencies = [ "arrayvec 0.5.2", "derive_more", @@ -9340,8 +9462,8 @@ dependencies = [ [[package]] name = "polkadot-statement-table" -version = "0.9.16" -source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.16#c028a34292a744d048d3076e7b072db39d745df7" +version = "0.9.17" +source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.17#66cb46bb3a7bd7295d1eb39a391559bc6efb2a22" dependencies = [ "parity-scale-codec", "polkadot-primitives", @@ -9472,9 +9594,9 @@ dependencies = [ [[package]] name = "proc-macro-crate" -version = "1.1.0" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ebace6889caf889b4d3f76becee12e90353f2b8c7d875534a71e5742f8f6f83" +checksum = "e17d47ce914bf4de440332250b0edd23ce48c005f59fab39d3335866b114f11a" dependencies = [ "thiserror", "toml", @@ -9553,7 +9675,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "62941722fb675d463659e49c4f3fe1fe792ff24fe5bbaa9c08cd3b98a1c354f5" dependencies = [ "bytes 1.1.0", - "heck", + "heck 0.3.3", "itertools", "lazy_static", "log", @@ -9705,14 +9827,13 @@ dependencies = [ [[package]] name = "rand" -version = "0.8.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ "libc", "rand_chacha 0.3.1", "rand_core 0.6.3", - "rand_hc 0.3.1", ] [[package]] @@ -9785,7 +9906,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "051b398806e42b9cd04ad9ec8f81e355d0a382c543ac6672c62f5a5b452ef142" dependencies = [ "num-traits", - "rand 0.8.4", + "rand 0.8.5", ] [[package]] @@ -9806,15 +9927,6 @@ dependencies = [ "rand_core 0.5.1", ] -[[package]] -name = "rand_hc" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7" -dependencies = [ - "rand_core 0.6.3", -] - [[package]] name = "rand_isaac" version = "0.1.1" @@ -10065,10 +10177,10 @@ dependencies = [ [[package]] name = "remote-externalities" version = "0.10.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "env_logger 0.9.0", - "jsonrpsee", + "jsonrpsee 0.8.0", "log", "parity-scale-codec", "serde", @@ -10120,14 +10232,12 @@ dependencies = [ ] [[package]] -name = "ripemd160" -version = "0.9.1" +name = "ripemd" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2eca4ecc81b7f313189bf73ce724400a07da2a6dac19588b03c8bd76a2dcc251" +checksum = "1facec54cb5e0dc08553501fa740091086d0259ad0067e0d4103448e4cb22ed3" dependencies = [ - "block-buffer 0.9.0", - "digest 0.9.0", - "opaque-debug 0.3.0", + "digest 0.10.3", ] [[package]] @@ -10163,8 +10273,8 @@ dependencies = [ [[package]] name = "rococo-runtime" -version = "0.9.16" -source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.16#c028a34292a744d048d3076e7b072db39d745df7" +version = "0.9.17" +source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.17#66cb46bb3a7bd7295d1eb39a391559bc6efb2a22" dependencies = [ "beefy-primitives", "bp-messages", @@ -10236,8 +10346,8 @@ dependencies = [ [[package]] name = "rococo-runtime-constants" -version = "0.9.16" -source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.16#c028a34292a744d048d3076e7b072db39d745df7" +version = "0.9.17" +source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.17#66cb46bb3a7bd7295d1eb39a391559bc6efb2a22" dependencies = [ "frame-support", "polkadot-primitives", @@ -10347,8 +10457,20 @@ dependencies = [ "base64 0.13.0", "log", "ring", - "sct", - "webpki", + "sct 0.6.1", + "webpki 0.21.4", +] + +[[package]] +name = "rustls" +version = "0.20.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fbfeb8d0ddb84706bc597a5574ab8912817c52a397f819e5b614e2265206921" +dependencies = [ + "log", + "ring", + "sct 0.7.0", + "webpki 0.22.0", ] [[package]] @@ -10358,11 +10480,32 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a07b7c1885bd8ed3831c289b7870b13ef46fe0e856d288c30d9cc17d75a2092" dependencies = [ "openssl-probe", - "rustls", + "rustls 0.19.1", + "schannel", + "security-framework", +] + +[[package]] +name = "rustls-native-certs" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ca9ebdfa27d3fc180e42879037b5338ab1c040c06affd00d8338598e7800943" +dependencies = [ + "openssl-probe", + "rustls-pemfile", "schannel", "security-framework", ] +[[package]] +name = "rustls-pemfile" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5eebeaeb360c87bfb72e84abdb3447159c0eaececf1bef2aecd65a8be949d1c9" +dependencies = [ + "base64 0.13.0", +] + [[package]] name = "rustversion" version = "1.0.6" @@ -10416,7 +10559,7 @@ dependencies = [ [[package]] name = "sc-allocator" version = "4.1.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "log", "sp-core", @@ -10427,10 +10570,9 @@ dependencies = [ [[package]] name = "sc-authority-discovery" version = "0.10.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "async-trait", - "derive_more", "futures 0.3.21", "futures-timer", "ip_network", @@ -10449,12 +10591,13 @@ dependencies = [ "sp-keystore", "sp-runtime", "substrate-prometheus-endpoint", + "thiserror", ] [[package]] name = "sc-basic-authorship" version = "0.10.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "futures 0.3.21", "futures-timer", @@ -10477,7 +10620,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.10.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -10493,7 +10636,7 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "impl-trait-for-tuples", "memmap2 0.5.0", @@ -10510,9 +10653,9 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ - "proc-macro-crate 1.1.0", + "proc-macro-crate 1.1.3", "proc-macro2 1.0.36", "quote 1.0.15", "syn 1.0.86", @@ -10521,9 +10664,10 @@ dependencies = [ [[package]] name = "sc-cli" version = "0.10.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "chrono", + "clap 3.1.2", "fdlimit", "futures 0.3.21", "hex", @@ -10550,7 +10694,6 @@ dependencies = [ "sp-panic-handler", "sp-runtime", "sp-version", - "structopt", "thiserror", "tiny-bip39", "tokio", @@ -10559,7 +10702,7 @@ dependencies = [ [[package]] name = "sc-client-api" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "fnv", "futures 0.3.21", @@ -10587,7 +10730,7 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.10.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "hash-db", "kvdb", @@ -10612,7 +10755,7 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.10.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "async-trait", "futures 0.3.21", @@ -10636,10 +10779,9 @@ dependencies = [ [[package]] name = "sc-consensus-aura" version = "0.10.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "async-trait", - "derive_more", "futures 0.3.21", "log", "parity-scale-codec", @@ -10660,15 +10802,15 @@ dependencies = [ "sp-keystore", "sp-runtime", "substrate-prometheus-endpoint", + "thiserror", ] [[package]] name = "sc-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "async-trait", - "derive_more", "fork-tree", "futures 0.3.21", "log", @@ -10703,14 +10845,14 @@ dependencies = [ "sp-runtime", "sp-version", "substrate-prometheus-endpoint", + "thiserror", ] [[package]] name = "sc-consensus-babe-rpc" version = "0.10.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ - "derive_more", "futures 0.3.21", "jsonrpc-core", "jsonrpc-core-client", @@ -10727,12 +10869,13 @@ dependencies = [ "sp-core", "sp-keystore", "sp-runtime", + "thiserror", ] [[package]] name = "sc-consensus-epochs" version = "0.10.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "fork-tree", "parity-scale-codec", @@ -10745,11 +10888,10 @@ dependencies = [ [[package]] name = "sc-consensus-manual-seal" version = "0.10.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "assert_matches", "async-trait", - "derive_more", "futures 0.3.21", "jsonrpc-core", "jsonrpc-core-client", @@ -10776,12 +10918,13 @@ dependencies = [ "sp-runtime", "sp-timestamp", "substrate-prometheus-endpoint", + "thiserror", ] [[package]] name = "sc-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "async-trait", "futures 0.3.21", @@ -10806,7 +10949,7 @@ dependencies = [ [[package]] name = "sc-consensus-uncles" version = "0.10.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "sc-client-api", "sp-authorship", @@ -10817,7 +10960,7 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.10.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "lazy_static", "libsecp256k1 0.7.0", @@ -10845,9 +10988,8 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.10.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ - "derive_more", "environmental", "parity-scale-codec", "sc-allocator", @@ -10863,7 +11005,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" version = "0.10.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "log", "parity-scale-codec", @@ -10879,7 +11021,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.10.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "cfg-if 1.0.0", "libc", @@ -10897,10 +11039,9 @@ dependencies = [ [[package]] name = "sc-finality-grandpa" version = "0.10.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "async-trait", - "derive_more", "dyn-clone", "finality-grandpa", "fork-tree", @@ -10909,7 +11050,7 @@ dependencies = [ "log", "parity-scale-codec", "parking_lot 0.11.2", - "rand 0.8.4", + "rand 0.8.5", "sc-block-builder", "sc-chain-spec", "sc-client-api", @@ -10930,14 +11071,14 @@ dependencies = [ "sp-keystore", "sp-runtime", "substrate-prometheus-endpoint", + "thiserror", ] [[package]] name = "sc-finality-grandpa-rpc" version = "0.10.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ - "derive_more", "finality-grandpa", "futures 0.3.21", "jsonrpc-core", @@ -10954,12 +11095,13 @@ dependencies = [ "sp-blockchain", "sp-core", "sp-runtime", + "thiserror", ] [[package]] name = "sc-informant" version = "0.10.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "ansi_term 0.12.1", "futures 0.3.21", @@ -10976,22 +11118,22 @@ dependencies = [ [[package]] name = "sc-keystore" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "async-trait", - "derive_more", "hex", "parking_lot 0.11.2", "serde_json", "sp-application-crypto", "sp-core", "sp-keystore", + "thiserror", ] [[package]] name = "sc-network" version = "0.10.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "async-std", "async-trait", @@ -10999,7 +11141,6 @@ dependencies = [ "bitflags", "bytes 1.1.0", "cid", - "derive_more", "either", "fnv", "fork-tree", @@ -11042,7 +11183,7 @@ dependencies = [ [[package]] name = "sc-network-gossip" version = "0.10.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "futures 0.3.21", "futures-timer", @@ -11058,7 +11199,7 @@ dependencies = [ [[package]] name = "sc-offchain" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "bytes 1.1.0", "fnv", @@ -11086,7 +11227,7 @@ dependencies = [ [[package]] name = "sc-peerset" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "futures 0.3.21", "libp2p", @@ -11099,7 +11240,7 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.10.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "log", "substrate-prometheus-endpoint", @@ -11108,7 +11249,7 @@ dependencies = [ [[package]] name = "sc-rpc" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "futures 0.3.21", "hash-db", @@ -11139,7 +11280,7 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.10.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "futures 0.3.21", "jsonrpc-core", @@ -11164,7 +11305,7 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "futures 0.3.21", "jsonrpc-core", @@ -11181,7 +11322,7 @@ dependencies = [ [[package]] name = "sc-service" version = "0.10.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "async-trait", "directories", @@ -11245,7 +11386,7 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.10.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "log", "parity-scale-codec", @@ -11259,7 +11400,7 @@ dependencies = [ [[package]] name = "sc-sync-state-rpc" version = "0.10.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -11281,7 +11422,7 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "chrono", "futures 0.3.21", @@ -11299,7 +11440,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "ansi_term 0.12.1", "atty", @@ -11330,9 +11471,9 @@ dependencies = [ [[package]] name = "sc-tracing-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ - "proc-macro-crate 1.1.0", + "proc-macro-crate 1.1.3", "proc-macro2 1.0.36", "quote 1.0.15", "syn 1.0.86", @@ -11341,7 +11482,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "futures 0.3.21", "futures-timer", @@ -11368,9 +11509,8 @@ dependencies = [ [[package]] name = "sc-transaction-pool-api" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ - "derive_more", "futures 0.3.21", "log", "serde", @@ -11382,7 +11522,7 @@ dependencies = [ [[package]] name = "sc-utils" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "futures 0.3.21", "futures-timer", @@ -11411,7 +11551,7 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baeb2780690380592f86205aa4ee49815feb2acad8c2f59e6dd207148c3f1fcd" dependencies = [ - "proc-macro-crate 1.1.0", + "proc-macro-crate 1.1.3", "proc-macro2 1.0.36", "quote 1.0.15", "syn 1.0.86", @@ -11473,6 +11613,16 @@ dependencies = [ "untrusted", ] +[[package]] +name = "sct" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" +dependencies = [ + "ring", + "untrusted", +] + [[package]] name = "secrecy" version = "0.8.0" @@ -11645,7 +11795,7 @@ checksum = "99c3bd8169c58782adad9290a9af5939994036b76187f7b4f0e6de91dbbfc0ec" dependencies = [ "cfg-if 1.0.0", "cpufeatures 0.2.1", - "digest 0.10.1", + "digest 0.10.3", ] [[package]] @@ -11673,6 +11823,16 @@ dependencies = [ "opaque-debug 0.3.0", ] +[[package]] +name = "sha3" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "881bf8156c87b6301fc5ca6b27f11eeb2761224c7081e69b409d5a1951a70c86" +dependencies = [ + "digest 0.10.3", + "keccak", +] + [[package]] name = "sharded-slab" version = "0.1.1" @@ -11765,8 +11925,8 @@ dependencies = [ [[package]] name = "slot-range-helper" -version = "0.9.16" -source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.16#c028a34292a744d048d3076e7b072db39d745df7" +version = "0.9.17" +source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.17#66cb46bb3a7bd7295d1eb39a391559bc6efb2a22" dependencies = [ "enumn", "parity-scale-codec", @@ -11832,7 +11992,7 @@ dependencies = [ "aes-gcm", "blake2", "chacha20poly1305", - "rand 0.8.4", + "rand 0.8.5", "rand_core 0.6.3", "ring", "rustc_version 0.3.3", @@ -11874,14 +12034,14 @@ dependencies = [ "futures 0.3.21", "httparse", "log", - "rand 0.8.4", + "rand 0.8.5", "sha-1 0.9.7", ] [[package]] name = "sp-api" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "hash-db", "log", @@ -11898,10 +12058,10 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "blake2-rfc", - "proc-macro-crate 1.1.0", + "proc-macro-crate 1.1.3", "proc-macro2 1.0.36", "quote 1.0.15", "syn 1.0.86", @@ -11909,8 +12069,8 @@ dependencies = [ [[package]] name = "sp-application-crypto" -version = "4.0.0" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +version = "5.0.0" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "parity-scale-codec", "scale-info", @@ -11923,7 +12083,7 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "4.0.0" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "integer-sqrt", "num-traits", @@ -11938,7 +12098,7 @@ dependencies = [ [[package]] name = "sp-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "parity-scale-codec", "scale-info", @@ -11951,7 +12111,7 @@ dependencies = [ [[package]] name = "sp-authorship" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "async-trait", "parity-scale-codec", @@ -11963,7 +12123,7 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "parity-scale-codec", "sp-api", @@ -11975,7 +12135,7 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "futures 0.3.21", "log", @@ -11993,7 +12153,7 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.10.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "async-trait", "futures 0.3.21", @@ -12012,7 +12172,7 @@ dependencies = [ [[package]] name = "sp-consensus-aura" version = "0.10.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "async-trait", "parity-scale-codec", @@ -12030,7 +12190,7 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "async-trait", "merlin", @@ -12053,7 +12213,7 @@ dependencies = [ [[package]] name = "sp-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "parity-scale-codec", "scale-info", @@ -12065,7 +12225,7 @@ dependencies = [ [[package]] name = "sp-consensus-vrf" version = "0.10.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "parity-scale-codec", "schnorrkel", @@ -12076,8 +12236,8 @@ dependencies = [ [[package]] name = "sp-core" -version = "4.1.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +version = "5.0.0" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "base58 0.2.0", "bitflags", @@ -12125,7 +12285,7 @@ dependencies = [ [[package]] name = "sp-core-hashing" version = "4.0.0" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "blake2-rfc", "byteorder", @@ -12138,7 +12298,7 @@ dependencies = [ [[package]] name = "sp-core-hashing-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "proc-macro2 1.0.36", "quote 1.0.15", @@ -12149,7 +12309,7 @@ dependencies = [ [[package]] name = "sp-database" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "kvdb", "parking_lot 0.11.2", @@ -12158,7 +12318,7 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "4.0.0" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "proc-macro2 1.0.36", "quote 1.0.15", @@ -12167,8 +12327,8 @@ dependencies = [ [[package]] name = "sp-externalities" -version = "0.10.0" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +version = "0.11.0" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "environmental", "parity-scale-codec", @@ -12179,7 +12339,7 @@ dependencies = [ [[package]] name = "sp-finality-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "finality-grandpa", "log", @@ -12197,7 +12357,7 @@ dependencies = [ [[package]] name = "sp-inherents" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "async-trait", "impl-trait-for-tuples", @@ -12210,8 +12370,8 @@ dependencies = [ [[package]] name = "sp-io" -version = "4.0.0" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +version = "5.0.0" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "futures 0.3.21", "hash-db", @@ -12234,22 +12394,21 @@ dependencies = [ [[package]] name = "sp-keyring" -version = "4.1.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +version = "5.0.0" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "lazy_static", "sp-core", "sp-runtime", - "strum 0.22.0", + "strum", ] [[package]] name = "sp-keystore" -version = "0.10.0" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +version = "0.11.0" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "async-trait", - "derive_more", "futures 0.3.21", "merlin", "parity-scale-codec", @@ -12258,20 +12417,22 @@ dependencies = [ "serde", "sp-core", "sp-externalities", + "thiserror", ] [[package]] name = "sp-maybe-compressed-blob" version = "4.1.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ + "thiserror", "zstd", ] [[package]] name = "sp-npos-elections" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "parity-scale-codec", "scale-info", @@ -12286,9 +12447,9 @@ dependencies = [ [[package]] name = "sp-npos-elections-solution-type" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ - "proc-macro-crate 1.1.0", + "proc-macro-crate 1.1.3", "proc-macro2 1.0.36", "quote 1.0.15", "syn 1.0.86", @@ -12297,7 +12458,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "sp-api", "sp-core", @@ -12307,7 +12468,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "4.0.0" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "backtrace", "lazy_static", @@ -12316,8 +12477,8 @@ dependencies = [ [[package]] name = "sp-rpc" -version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +version = "5.0.0" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "rustc-hash", "serde", @@ -12326,8 +12487,8 @@ dependencies = [ [[package]] name = "sp-runtime" -version = "4.1.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +version = "5.0.0" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "either", "hash256-std-hasher", @@ -12348,8 +12509,8 @@ dependencies = [ [[package]] name = "sp-runtime-interface" -version = "4.1.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +version = "5.0.0" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -12366,10 +12527,10 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "4.0.0" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "Inflector", - "proc-macro-crate 1.1.0", + "proc-macro-crate 1.1.3", "proc-macro2 1.0.36", "quote 1.0.15", "syn 1.0.86", @@ -12378,7 +12539,7 @@ dependencies = [ [[package]] name = "sp-serializer" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "serde", "serde_json", @@ -12387,7 +12548,7 @@ dependencies = [ [[package]] name = "sp-session" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "parity-scale-codec", "scale-info", @@ -12401,7 +12562,7 @@ dependencies = [ [[package]] name = "sp-staking" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "parity-scale-codec", "scale-info", @@ -12411,8 +12572,8 @@ dependencies = [ [[package]] name = "sp-state-machine" -version = "0.10.0" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +version = "0.11.0" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "hash-db", "log", @@ -12435,12 +12596,12 @@ dependencies = [ [[package]] name = "sp-std" version = "4.0.0" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" [[package]] name = "sp-storage" -version = "4.0.0" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +version = "5.0.0" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "impl-serde", "parity-scale-codec", @@ -12453,7 +12614,7 @@ dependencies = [ [[package]] name = "sp-tasks" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "log", "sp-core", @@ -12466,7 +12627,7 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "async-trait", "futures-timer", @@ -12482,7 +12643,7 @@ dependencies = [ [[package]] name = "sp-tracing" version = "4.0.0" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "parity-scale-codec", "sp-std", @@ -12494,7 +12655,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "sp-api", "sp-runtime", @@ -12503,7 +12664,7 @@ dependencies = [ [[package]] name = "sp-transaction-storage-proof" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "async-trait", "log", @@ -12518,8 +12679,8 @@ dependencies = [ [[package]] name = "sp-trie" -version = "4.0.0" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +version = "5.0.0" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "hash-db", "memory-db 0.28.0", @@ -12534,7 +12695,7 @@ dependencies = [ [[package]] name = "sp-version" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "impl-serde", "parity-scale-codec", @@ -12551,7 +12712,7 @@ dependencies = [ [[package]] name = "sp-version-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "parity-scale-codec", "proc-macro2 1.0.36", @@ -12561,8 +12722,8 @@ dependencies = [ [[package]] name = "sp-wasm-interface" -version = "4.1.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +version = "5.0.0" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "impl-trait-for-tuples", "log", @@ -12648,7 +12809,7 @@ dependencies = [ "lazy_static", "nalgebra", "num-traits", - "rand 0.8.4", + "rand 0.8.5", ] [[package]] @@ -12657,13 +12818,19 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + [[package]] name = "structopt" version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "40b9788f4202aa75c240ecc9c15c65185e6a39ccdeb0fd5d008b98825464c87c" dependencies = [ - "clap", + "clap 2.33.3", "lazy_static", "structopt-derive", ] @@ -12674,41 +12841,20 @@ version = "0.4.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dcb5ae327f9cc13b68763b5749770cb9e048a99bd9dfdfa58d0cf05d5f64afe0" dependencies = [ - "heck", + "heck 0.3.3", "proc-macro-error", "proc-macro2 1.0.36", "quote 1.0.15", "syn 1.0.86", ] -[[package]] -name = "strum" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7ac893c7d471c8a21f31cfe213ec4f6d9afeed25537c772e08ef3f005f8729e" -dependencies = [ - "strum_macros 0.22.0", -] - [[package]] name = "strum" version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cae14b91c7d11c9a851d3fbc80a963198998c2a64eec840477fa92d8ce9b70bb" dependencies = [ - "strum_macros 0.23.1", -] - -[[package]] -name = "strum_macros" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "339f799d8b549e3744c7ac7feb216383e4005d94bdb22561b3ab8f3b808ae9fb" -dependencies = [ - "heck", - "proc-macro2 1.0.36", - "quote 1.0.15", - "syn 1.0.86", + "strum_macros", ] [[package]] @@ -12717,7 +12863,7 @@ version = "0.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5bb0dc7ee9c15cea6199cde9a127fa16a4c5819af85395457ad72d68edc85a38" dependencies = [ - "heck", + "heck 0.3.3", "proc-macro2 1.0.36", "quote 1.0.15", "rustversion", @@ -12746,14 +12892,14 @@ dependencies = [ "byteorder", "crunchy", "lazy_static", - "rand 0.8.4", + "rand 0.8.5", "rustc-hex", ] [[package]] name = "substrate-build-script-utils" version = "3.0.0" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "platforms 2.0.0", ] @@ -12770,7 +12916,7 @@ dependencies = [ [[package]] name = "substrate-frame-rpc-system" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "frame-system-rpc-runtime-api", "futures 0.3.21", @@ -12792,21 +12938,21 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.10.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "async-std", - "derive_more", "futures-util", "hyper", "log", "prometheus", + "thiserror", "tokio", ] [[package]] name = "substrate-test-client" version = "2.0.1" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "async-trait", "futures 0.3.21", @@ -12832,7 +12978,7 @@ dependencies = [ [[package]] name = "substrate-test-runtime" version = "2.0.0" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "cfg-if 1.0.0", "frame-support", @@ -12874,7 +13020,7 @@ dependencies = [ [[package]] name = "substrate-test-runtime-client" version = "2.0.0" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "futures 0.3.21", "parity-scale-codec", @@ -12893,12 +13039,13 @@ dependencies = [ [[package]] name = "substrate-wasm-builder" version = "5.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ "ansi_term 0.12.1", "build-helper", "cargo_metadata", "sp-maybe-compressed-blob", + "strum", "tempfile", "toml", "walkdir", @@ -12971,7 +13118,7 @@ checksum = "dac1c663cfc93810f88aed9b8941d48cabf856a1b111c29a40439018d870eb22" dependencies = [ "cfg-if 1.0.0", "libc", - "rand 0.8.4", + "rand 0.8.5", "redox_syscall 0.2.9", "remove_dir_all", "winapi 0.3.9", @@ -13005,6 +13152,12 @@ dependencies = [ "unicode-width", ] +[[package]] +name = "textwrap" +version = "0.14.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0066c8d12af8b5acd21e00547c3797fde4e8677254a7ee429176ccebbe93dd80" + [[package]] name = "thiserror" version = "1.0.30" @@ -13158,9 +13311,20 @@ version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc6844de72e57df1980054b38be3a9f4702aba4858be64dd700181a8a6d0e1b6" dependencies = [ - "rustls", + "rustls 0.19.1", "tokio", - "webpki", + "webpki 0.21.4", +] + +[[package]] +name = "tokio-rustls" +version = "0.23.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a27d5f2b839802bd8267fa19b0530f5a08b9c08cd417976be2a65d130fe1c11b" +dependencies = [ + "rustls 0.20.4", + "tokio", + "webpki 0.22.0", ] [[package]] @@ -13206,9 +13370,9 @@ checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6" [[package]] name = "tracing" -version = "0.1.29" +version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "375a639232caf30edfc78e8d89b2d4c375515393e7af7e16f01cd96917fb2105" +checksum = "f6c650a8ef0cd2dd93736f033d21cbd1224c5a967aa0c258d00fcf7dafef9b9f" dependencies = [ "cfg-if 1.0.0", "pin-project-lite 0.2.8", @@ -13218,9 +13382,9 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.18" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4f480b8f81512e825f337ad51e94c1eb5d3bbdf2b363dcd01e2b19a9ffe3f8e" +checksum = "8276d9a4a3a558d7b7ad5303ad50b53d58264641b82914b7ada36bd762e7a716" dependencies = [ "proc-macro2 1.0.36", "quote 1.0.15", @@ -13229,11 +13393,12 @@ dependencies = [ [[package]] name = "tracing-core" -version = "0.1.21" +version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f4ed65637b8390770814083d20756f87bfa2c21bf2f110babdc5438351746e4" +checksum = "03cfcb51380632a72d3111cb8d3447a8d908e577d31beeac006f836383d29a23" dependencies = [ "lazy_static", + "valuable", ] [[package]] @@ -13354,7 +13519,7 @@ dependencies = [ "ipnet", "lazy_static", "log", - "rand 0.8.4", + "rand 0.8.5", "smallvec 1.8.0", "thiserror", "tinyvec", @@ -13389,9 +13554,10 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" [[package]] name = "try-runtime-cli" version = "0.10.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#570b21a17d9ab06d8508180c98ad2c476ebcec6f" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.17#c92f69db6dd96a90eed90a44539deb615eaf7319" dependencies = [ - "jsonrpsee", + "clap 3.1.2", + "jsonrpsee 0.4.1", "log", "parity-scale-codec", "remote-externalities", @@ -13407,7 +13573,6 @@ dependencies = [ "sp-runtime", "sp-state-machine", "sp-version", - "structopt", "zstd", ] @@ -13424,15 +13589,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ee73e6e4924fe940354b8d4d98cad5231175d615cd855b758adc658c0aac6a0" dependencies = [ "cfg-if 1.0.0", - "rand 0.8.4", + "rand 0.7.3", "static_assertions", ] [[package]] name = "typenum" -version = "1.13.0" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "879f6906492a7cd215bfa4cf595b600146ccfac0c79bcbd1f3000162af5e8b06" +checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" [[package]] name = "ucd-trie" @@ -13598,6 +13763,12 @@ dependencies = [ "rand 0.6.5", ] +[[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + [[package]] name = "value-bag" version = "1.0.0-alpha.7" @@ -13944,7 +14115,7 @@ dependencies = [ "mach", "memoffset", "more-asserts", - "rand 0.8.4", + "rand 0.8.5", "region", "rustix", "thiserror", @@ -13984,13 +14155,32 @@ dependencies = [ "untrusted", ] +[[package]] +name = "webpki" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" +dependencies = [ + "ring", + "untrusted", +] + [[package]] name = "webpki-roots" version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aabe153544e473b775453675851ecc86863d2a81d786d741f6b76778f2a48940" dependencies = [ - "webpki", + "webpki 0.21.4", +] + +[[package]] +name = "webpki-roots" +version = "0.22.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "552ceb903e957524388c4d3475725ff2c8b7960922063af6ce53c9a43da07449" +dependencies = [ + "webpki 0.22.0", ] [[package]] @@ -14004,8 +14194,8 @@ dependencies = [ [[package]] name = "westend-runtime" -version = "0.9.16" -source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.16#c028a34292a744d048d3076e7b072db39d745df7" +version = "0.9.17" +source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.17#66cb46bb3a7bd7295d1eb39a391559bc6efb2a22" dependencies = [ "beefy-primitives", "bitvec 0.20.4", @@ -14084,8 +14274,8 @@ dependencies = [ [[package]] name = "westend-runtime-constants" -version = "0.9.16" -source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.16#c028a34292a744d048d3076e7b072db39d745df7" +version = "0.9.17" +source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.17#66cb46bb3a7bd7295d1eb39a391559bc6efb2a22" dependencies = [ "frame-support", "polkadot-primitives", @@ -14153,6 +14343,49 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +[[package]] +name = "windows-sys" +version = "0.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3df6e476185f92a12c072be4a189a0210dcdcf512a1891d6dff9edb874deadc6" +dependencies = [ + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows_aarch64_msvc" +version = "0.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8e92753b1c443191654ec532f14c199742964a061be25d77d7a96f09db20bf5" + +[[package]] +name = "windows_i686_gnu" +version = "0.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a711c68811799e017b6038e0922cb27a5e2f43a2ddb609fe0b6f3eeda9de615" + +[[package]] +name = "windows_i686_msvc" +version = "0.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "146c11bb1a02615db74680b32a68e2d61f553cc24c4eb5b4ca10311740e44172" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c912b12f7454c6620635bbff3450962753834be2a594819bd5e945af18ec64bc" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "504a2476202769977a040c6364301a3f65d0cc9e3fb08600b2bda150a0488316" + [[package]] name = "winreg" version = "0.6.2" @@ -14191,8 +14424,8 @@ dependencies = [ [[package]] name = "xcm" -version = "0.9.16" -source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.16#c028a34292a744d048d3076e7b072db39d745df7" +version = "0.9.17" +source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.17#66cb46bb3a7bd7295d1eb39a391559bc6efb2a22" dependencies = [ "derivative", "impl-trait-for-tuples", @@ -14204,8 +14437,8 @@ dependencies = [ [[package]] name = "xcm-builder" -version = "0.9.16" -source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.16#c028a34292a744d048d3076e7b072db39d745df7" +version = "0.9.17" +source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.17#66cb46bb3a7bd7295d1eb39a391559bc6efb2a22" dependencies = [ "frame-support", "frame-system", @@ -14224,8 +14457,8 @@ dependencies = [ [[package]] name = "xcm-executor" -version = "0.9.16" -source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.16#c028a34292a744d048d3076e7b072db39d745df7" +version = "0.9.17" +source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.17#66cb46bb3a7bd7295d1eb39a391559bc6efb2a22" dependencies = [ "frame-support", "impl-trait-for-tuples", @@ -14261,7 +14494,7 @@ dependencies = [ [[package]] name = "xcm-procedural" version = "0.1.0" -source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.16#c028a34292a744d048d3076e7b072db39d745df7" +source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.17#66cb46bb3a7bd7295d1eb39a391559bc6efb2a22" dependencies = [ "Inflector", "proc-macro2 1.0.36", @@ -14271,8 +14504,8 @@ dependencies = [ [[package]] name = "xcm-simulator" -version = "0.9.16" -source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.16#c028a34292a744d048d3076e7b072db39d745df7" +version = "0.9.17" +source = "git+https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.17#66cb46bb3a7bd7295d1eb39a391559bc6efb2a22" dependencies = [ "frame-support", "parity-scale-codec", @@ -14387,7 +14620,7 @@ dependencies = [ "log", "nohash-hasher", "parking_lot 0.11.2", - "rand 0.8.4", + "rand 0.8.5", "static_assertions", ] diff --git a/Cargo.toml b/Cargo.toml index 18364544fc1..4bddc25e8fb 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -18,9 +18,9 @@ members = [ [patch.crates-io] ethereum = { git = "https://github.com/purestake/ethereum", branch = "tgm-0.11.1-typeinfo-patch" } -evm = { git = "https://github.com/purestake/evm", branch = "moonbeam-polkadot-v0.9.16" } -evm-gasometer = { git = "https://github.com/purestake/evm", branch = "moonbeam-polkadot-v0.9.16" } -evm-runtime = { git = "https://github.com/purestake/evm", branch = "moonbeam-polkadot-v0.9.16" } +evm = { git = "https://github.com/purestake/evm", branch = "moonbeam-polkadot-v0.9.17" } +evm-gasometer = { git = "https://github.com/purestake/evm", branch = "moonbeam-polkadot-v0.9.17" } +evm-runtime = { git = "https://github.com/purestake/evm", branch = "moonbeam-polkadot-v0.9.17" } [profile.release] panic = "unwind" diff --git a/bin/utils/moonkey/Cargo.toml b/bin/utils/moonkey/Cargo.toml index 148bcdfb3ca..e479027a5ec 100644 --- a/bin/utils/moonkey/Cargo.toml +++ b/bin/utils/moonkey/Cargo.toml @@ -13,4 +13,4 @@ path = "src/main.rs" [dependencies] cli-opt = { package = "moonbeam-cli-opt", path = "../../../node/cli-opt", default-features = false } -structopt = "0.3.8" +clap = { version = "3.1", features = ["derive"] } diff --git a/bin/utils/moonkey/src/main.rs b/bin/utils/moonkey/src/main.rs index 087768eeb2f..62a9f5bc5dc 100644 --- a/bin/utils/moonkey/src/main.rs +++ b/bin/utils/moonkey/src/main.rs @@ -16,13 +16,13 @@ //! Generate an Ethereum account. +use clap::Parser; use cli_opt::account_key::GenerateAccountKey; -use structopt::StructOpt; -#[derive(Debug, StructOpt)] -#[structopt(author = "PureStake")] +#[derive(Debug, Parser)] +#[clap(author = "PureStake")] struct Opt { - #[structopt(flatten)] + #[clap(flatten)] cmd: GenerateAccountKey, } @@ -34,6 +34,6 @@ impl Opt { fn main() { // Parses the options - let cmd = Opt::from_args(); + let cmd = Opt::parse(); cmd.run(); } diff --git a/client/evm-tracing/Cargo.toml b/client/evm-tracing/Cargo.toml index c8f200a74cb..c737029c658 100644 --- a/client/evm-tracing/Cargo.toml +++ b/client/evm-tracing/Cargo.toml @@ -19,4 +19,4 @@ moonbeam-rpc-primitives-debug = { path = "../../primitives/rpc/debug" } # Substrate codec = { package = "parity-scale-codec", version = "2.2", default-features = false } -sp-std = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +sp-std = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } diff --git a/client/rpc-core/debug/Cargo.toml b/client/rpc-core/debug/Cargo.toml index a7fdfed03aa..65991318122 100644 --- a/client/rpc-core/debug/Cargo.toml +++ b/client/rpc-core/debug/Cargo.toml @@ -18,4 +18,4 @@ moonbeam-rpc-core-types = { path = "../types" } serde = { version = "1.0", features = [ "derive" ] } serde_json = "1.0" -sp-core = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +sp-core = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } diff --git a/client/rpc-core/txpool/Cargo.toml b/client/rpc-core/txpool/Cargo.toml index 9f11e24732a..8ec37c9997b 100644 --- a/client/rpc-core/txpool/Cargo.toml +++ b/client/rpc-core/txpool/Cargo.toml @@ -16,4 +16,4 @@ jsonrpc-derive = "18.0.0" serde = { version = "1.0", features = [ "derive" ] } serde_json = "1.0" -fc-rpc-core = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.16" } +fc-rpc-core = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.17" } diff --git a/client/rpc/debug/Cargo.toml b/client/rpc/debug/Cargo.toml index ad37fa9d6e6..53fbe52fa01 100644 --- a/client/rpc/debug/Cargo.toml +++ b/client/rpc/debug/Cargo.toml @@ -20,19 +20,19 @@ moonbeam-rpc-core-types = { path = "../../rpc-core/types" } moonbeam-rpc-primitives-debug = { path = "../../../primitives/rpc/debug" } # Substrate -sc-client-api = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } -sc-utils = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } -sp-api = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } -sp-block-builder = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } -sp-blockchain = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } -sp-core = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } -sp-io = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } -sp-runtime = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +sc-client-api = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } +sc-utils = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } +sp-api = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } +sp-block-builder = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } +sp-blockchain = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } +sp-core = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } +sp-io = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } +sp-runtime = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } # Frontier ethereum = { version = "0.11.1", default-features = false, features = [ "with-codec" ] } ethereum-types = "0.12.1" -fc-consensus = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.16" } -fc-db = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.16" } -fc-rpc = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.16", features = [ "rpc_binary_search_estimate" ] } -fp-rpc = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.16" } +fc-consensus = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.17" } +fc-db = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.17" } +fc-rpc = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.17", features = [ "rpc_binary_search_estimate" ] } +fp-rpc = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.17" } diff --git a/client/rpc/finality/Cargo.toml b/client/rpc/finality/Cargo.toml index f87a5fdec94..78ce6523524 100644 --- a/client/rpc/finality/Cargo.toml +++ b/client/rpc/finality/Cargo.toml @@ -15,9 +15,9 @@ jsonrpc-derive = "18.0.0" parity-scale-codec = "2.2" tokio = { version = "1.12.0", features = [ "sync", "time" ] } -fc-db = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.16" } -fc-rpc = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.16" } -sp-api = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } -sp-blockchain = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } -sp-core = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } -sp-runtime = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +fc-db = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.17" } +fc-rpc = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.17" } +sp-api = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } +sp-blockchain = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } +sp-core = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } +sp-runtime = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } diff --git a/client/rpc/manual-xcm/Cargo.toml b/client/rpc/manual-xcm/Cargo.toml index 9c944954cf2..cffcbfe2f37 100644 --- a/client/rpc/manual-xcm/Cargo.toml +++ b/client/rpc/manual-xcm/Cargo.toml @@ -15,6 +15,6 @@ jsonrpc-core = "18.0.0" jsonrpc-derive = "18.0.0" parity-scale-codec = "2.2" tokio = { version = "1.12.0", features = [ "sync", "time" ] } -xcm = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.16", default-features = false } +xcm = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.17", default-features = false } -cumulus-primitives-core = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.16" } +cumulus-primitives-core = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.17" } diff --git a/client/rpc/trace/Cargo.toml b/client/rpc/trace/Cargo.toml index dfe0d948bab..aedf94b3fee 100644 --- a/client/rpc/trace/Cargo.toml +++ b/client/rpc/trace/Cargo.toml @@ -24,19 +24,19 @@ moonbeam-rpc-core-types = { path = "../../rpc-core/types" } moonbeam-rpc-primitives-debug = { path = "../../../primitives/rpc/debug" } # Substrate -sc-client-api = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } -sc-network = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } -sc-utils = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } -sp-api = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } -sp-block-builder = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } -sp-blockchain = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } -sp-io = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } -sp-runtime = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } -sp-std = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } -sp-transaction-pool = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +sc-client-api = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } +sc-network = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } +sc-utils = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } +sp-api = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } +sp-block-builder = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } +sp-blockchain = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } +sp-io = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } +sp-runtime = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } +sp-std = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } +sp-transaction-pool = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } # Frontier -fc-consensus = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.16" } -fc-rpc = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.16", features = [ "rpc_binary_search_estimate" ] } -fc-rpc-core = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.16" } -fp-rpc = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.16" } +fc-consensus = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.17" } +fc-rpc = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.17", features = [ "rpc_binary_search_estimate" ] } +fc-rpc-core = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.17" } +fp-rpc = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.17" } diff --git a/client/rpc/txpool/Cargo.toml b/client/rpc/txpool/Cargo.toml index da500a8d660..7130c4fe711 100644 --- a/client/rpc/txpool/Cargo.toml +++ b/client/rpc/txpool/Cargo.toml @@ -18,15 +18,15 @@ moonbeam-rpc-core-txpool = { path = "../../rpc-core/txpool" } moonbeam-rpc-primitives-txpool = { path = "../../../primitives/rpc/txpool" } # Substrate -frame-system = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } -sc-transaction-pool = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } -sc-transaction-pool-api = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } -sp-api = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } -sp-blockchain = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } -sp-io = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } -sp-runtime = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } -sp-std = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +frame-system = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } +sc-transaction-pool = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } +sc-transaction-pool-api = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } +sp-api = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } +sp-blockchain = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } +sp-io = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } +sp-runtime = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } +sp-std = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } # Frontier ethereum-types = "0.12.1" -fc-rpc = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.16", features = [ "rpc_binary_search_estimate" ] } +fc-rpc = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.17", features = [ "rpc_binary_search_estimate" ] } diff --git a/core-primitives/Cargo.toml b/core-primitives/Cargo.toml index 6b610dcff93..48597c1ffcb 100644 --- a/core-primitives/Cargo.toml +++ b/core-primitives/Cargo.toml @@ -10,9 +10,9 @@ version = "0.1.1" [dependencies] account = { path = "../primitives/account", default-features = false } -fp-self-contained = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -sp-core = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -sp-runtime = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } +fp-self-contained = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +sp-core = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +sp-runtime = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } [features] default = [ "std" ] diff --git a/node/Cargo.toml b/node/Cargo.toml index 4ac83594f89..4786d13be68 100644 --- a/node/Cargo.toml +++ b/node/Cargo.toml @@ -26,8 +26,8 @@ serde_json = "1.0" tempfile = "3.2.0" # Benchmarking -pallet-xcm = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.16" } -xcm-builder = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.16" } +pallet-xcm = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.17" } +xcm-builder = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.17" } [features] default = [ "moonbase-native", "moonbeam-native", "moonriver-native" ] diff --git a/node/cli-opt/Cargo.toml b/node/cli-opt/Cargo.toml index d2c92b10ef1..1709d3cc286 100644 --- a/node/cli-opt/Cargo.toml +++ b/node/cli-opt/Cargo.toml @@ -10,7 +10,7 @@ version = "0.20.1" libsecp256k1 = "0.6" primitive-types = "0.10.0" sha3 = "0.9" -structopt = "0.3.8" +clap = { version = "3.1", features = ["derive"] } tiny-bip39 = "0.8" tiny-hderive = "0.3.0" @@ -18,4 +18,4 @@ tiny-hderive = "0.3.0" account = { path = "../../primitives/account" } # Substrate -sp-runtime = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +sp-runtime = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } diff --git a/node/cli-opt/src/account_key.rs b/node/cli-opt/src/account_key.rs index a9d0d5136b0..a55a86345ab 100644 --- a/node/cli-opt/src/account_key.rs +++ b/node/cli-opt/src/account_key.rs @@ -15,24 +15,24 @@ // along with Moonbeam. If not, see . use bip39::{Language, Mnemonic, MnemonicType, Seed}; +use clap::Parser; use libsecp256k1::{PublicKey, SecretKey}; use primitive_types::H256; use sp_runtime::traits::IdentifyAccount; -use structopt::StructOpt; use tiny_hderive::bip32::ExtendedPrivKey; -#[derive(Debug, StructOpt)] +#[derive(Debug, Parser)] pub struct GenerateAccountKey { /// Generate 12 words mnemonic instead of 24 - #[structopt(long, short = "w")] + #[clap(long, short = 'w')] w12: bool, /// Specify the mnemonic - #[structopt(long, short = "m")] + #[clap(long, short = 'm')] mnemonic: Option, /// The account index to use in the derivation path - #[structopt(long = "account-index", short = "a")] + #[clap(long = "account-index", short = 'a')] account_index: Option, } diff --git a/node/cli/Cargo.toml b/node/cli/Cargo.toml index 15453581ae9..6333f64b37c 100644 --- a/node/cli/Cargo.toml +++ b/node/cli/Cargo.toml @@ -7,7 +7,7 @@ version = "0.20.1" [dependencies] log = "0.4.8" parity-scale-codec = "2.2" -structopt = "0.3.8" +clap = { version = "3.1", features = ["derive"] } # Moonbeam cli-opt = { package = "moonbeam-cli-opt", path = "../cli-opt", default-features = false } @@ -15,29 +15,29 @@ perf-test = { path = "../perf-test" } service = { package = "moonbeam-service", path = "../service", default-features = false } # Substrate -frame-benchmarking-cli = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } -sc-cli = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } -sc-service = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } -sc-telemetry = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } -sc-tracing = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } -sp-core = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } -sp-runtime = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } -try-runtime-cli = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", optional = true } +frame-benchmarking-cli = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } +sc-cli = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } +sc-service = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } +sc-telemetry = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } +sc-tracing = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } +sp-core = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } +sp-runtime = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } +try-runtime-cli = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", optional = true } # Cumulus / Nimbus -cumulus-client-cli = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.16" } -cumulus-client-service = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.16" } -cumulus-primitives-core = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.16" } -nimbus-primitives = { git = "https://github.com/purestake/nimbus", branch = "moonbeam-polkadot-v0.9.16" } +cumulus-client-cli = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.17" } +cumulus-client-service = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.17" } +cumulus-primitives-core = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.17" } +nimbus-primitives = { git = "https://github.com/purestake/nimbus", branch = "moonbeam-polkadot-v0.9.17" } # Polkadot -polkadot-cli = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.16" } -polkadot-parachain = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.16" } -polkadot-primitives = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.16" } -polkadot-service = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.16" } +polkadot-cli = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.17" } +polkadot-parachain = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.17" } +polkadot-primitives = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.17" } +polkadot-service = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.17" } [build-dependencies] -substrate-build-script-utils = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +substrate-build-script-utils = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } [features] default = [ "moonbase-native", "moonbeam-native", "moonriver-native", "wasmtime", "westend-native" ] diff --git a/node/cli/src/cli.rs b/node/cli/src/cli.rs index 1e33fd189e2..be9f1876188 100644 --- a/node/cli/src/cli.rs +++ b/node/cli/src/cli.rs @@ -14,27 +14,27 @@ // You should have received a copy of the GNU General Public License // along with Moonbeam. If not, see . -//! Moonbeam CLI Library. Built with structopt +//! Moonbeam CLI Library. Built with clap //! //! This module defines the Moonbeam node's Command Line Interface (CLI) -//! It is built using structopt and inherits behavior from Substrate's sc_cli crate. +//! It is built using clap and inherits behavior from Substrate's sc_cli crate. +use clap::Parser; use cli_opt::{account_key::GenerateAccountKey, EthApi, Sealing}; use perf_test::PerfCmd; use sc_cli::{Error as CliError, SubstrateCli}; use service::chain_spec; use std::path::PathBuf; -use structopt::StructOpt; /// Sub-commands supported by the collator. -#[derive(Debug, StructOpt)] +#[derive(Debug, clap::Subcommand)] pub enum Subcommand { /// Export the genesis state of the parachain. - #[structopt(name = "export-genesis-state")] + #[clap(name = "export-genesis-state")] ExportGenesisState(ExportGenesisStateCommand), /// Export the genesis wasm of the parachain. - #[structopt(name = "export-genesis-wasm")] + #[clap(name = "export-genesis-wasm")] ExportGenesisWasm(ExportGenesisWasmCommand), /// Build a chain specification. @@ -62,7 +62,7 @@ pub enum Subcommand { PerfTest(PerfCmd), /// The custom benchmark subcommmand benchmarking runtime pallets. - #[structopt(name = "benchmark", about = "Benchmark runtime pallets.")] + #[clap(name = "benchmark", about = "Benchmark runtime pallets.")] Benchmark(frame_benchmarking_cli::BenchmarkCmd), /// Try some command against runtime state. @@ -74,127 +74,128 @@ pub enum Subcommand { TryRuntime, /// Key management cli utilities + #[clap(flatten)] Key(KeyCmd), } -#[derive(Debug, StructOpt)] +#[derive(Debug, Parser)] pub struct BuildSpecCommand { - #[structopt(flatten)] + #[clap(flatten)] pub base: sc_cli::BuildSpecCmd, /// Number of accounts to be funded in the genesis /// Warning: This flag implies a development spec and overrides any explicitly supplied spec - #[structopt(long, conflicts_with = "chain")] + #[clap(long, conflicts_with = "chain")] pub accounts: Option, /// Mnemonic from which we can derive funded accounts in the genesis /// Warning: This flag implies a development spec and overrides any explicitly supplied spec - #[structopt(long, conflicts_with = "chain")] + #[clap(long, conflicts_with = "chain")] pub mnemonic: Option, } /// Command for exporting the genesis state of the parachain -#[derive(Debug, StructOpt)] +#[derive(Debug, Parser)] pub struct ExportGenesisStateCommand { /// Output file name or stdout if unspecified. - #[structopt(parse(from_os_str))] + #[clap(parse(from_os_str))] pub output: Option, /// Id of the parachain this state is for. - #[structopt(long)] + #[clap(long)] pub parachain_id: Option, /// Write output in binary. Default is to write in hex. - #[structopt(short, long)] + #[clap(short, long)] pub raw: bool, /// The name of the chain for that the genesis state should be exported. - #[structopt(long)] + #[clap(long)] pub chain: Option, } /// Command for exporting the genesis wasm file. -#[derive(Debug, StructOpt)] +#[derive(Debug, Parser)] pub struct ExportGenesisWasmCommand { /// Output file name or stdout if unspecified. - #[structopt(parse(from_os_str))] + #[clap(parse(from_os_str))] pub output: Option, /// Write output in binary. Default is to write in hex. - #[structopt(short, long)] + #[clap(short, long)] pub raw: bool, /// The name of the chain for that the genesis wasm file should be exported. - #[structopt(long)] + #[clap(long)] pub chain: Option, } -#[derive(Debug, StructOpt)] +#[derive(Debug, Parser)] pub struct RunCmd { - #[structopt(flatten)] + #[clap(flatten)] pub base: cumulus_client_cli::RunCmd, /// Enable the development service to run without a backing relay chain - #[structopt(long)] + #[clap(long)] pub dev_service: bool, /// When blocks should be sealed in the dev service. /// /// Options are "instant", "manual", or timer interval in milliseconds - #[structopt(long, default_value = "instant")] + #[clap(long, default_value = "instant")] pub sealing: Sealing, /// Public authoring identity to be inserted in the author inherent /// This is not currently used, but we may want a way to use it in the dev service. - // #[structopt(long)] + // #[clap(long)] // pub author_id: Option, /// Enable EVM tracing module on a non-authority node. - #[structopt( + #[clap( long, conflicts_with = "collator", conflicts_with = "validator", - require_delimiter = true + require_value_delimiter = true )] pub ethapi: Vec, /// Number of concurrent tracing tasks. Meant to be shared by both "debug" and "trace" modules. - #[structopt(long, default_value = "10")] + #[clap(long, default_value = "10")] pub ethapi_max_permits: u32, /// Maximum number of trace entries a single request of `trace_filter` is allowed to return. /// A request asking for more or an unbounded one going over this limit will both return an /// error. - #[structopt(long, default_value = "500")] + #[clap(long, default_value = "500")] pub ethapi_trace_max_count: u32, /// Duration (in seconds) after which the cache of `trace_filter` for a given block will be /// discarded. - #[structopt(long, default_value = "300")] + #[clap(long, default_value = "300")] pub ethapi_trace_cache_duration: u64, /// Size of the LRU cache for block data and their transaction statuses. - #[structopt(long, default_value = "3000")] + #[clap(long, default_value = "3000")] pub eth_log_block_cache: usize, /// Maximum number of logs in a query. - #[structopt(long, default_value = "10000")] + #[clap(long, default_value = "10000")] pub max_past_logs: u32, /// Force using Moonbase native runtime. - #[structopt(long = "force-moonbase")] + #[clap(long = "force-moonbase")] pub force_moonbase: bool, /// Force using Moonriver native runtime. - #[structopt(long = "force-moonriver")] + #[clap(long = "force-moonriver")] pub force_moonriver: bool, /// Id of the parachain this collator collates for. - #[structopt(long)] + #[clap(long)] pub parachain_id: Option, /// Maximum fee history cache size. - #[structopt(long, default_value = "2048")] + #[clap(long, default_value = "2048")] pub fee_history_limit: u64, } @@ -206,9 +207,9 @@ impl std::ops::Deref for RunCmd { } } -#[derive(Debug, StructOpt)] +#[derive(Debug, clap::Subcommand)] pub enum KeyCmd { - #[structopt(flatten)] + #[clap(flatten)] BaseCli(sc_cli::KeySubcommand), /// Generate an Ethereum account. GenerateAccountKey(GenerateAccountKey), @@ -227,21 +228,21 @@ impl KeyCmd { } } -#[derive(Debug, StructOpt)] -#[structopt(settings = &[ - structopt::clap::AppSettings::GlobalVersion, - structopt::clap::AppSettings::ArgsNegateSubcommands, - structopt::clap::AppSettings::SubcommandsNegateReqs, -])] +#[derive(Debug, Parser)] +#[clap( + propagate_version = true, + args_conflicts_with_subcommands = true, + subcommand_negates_reqs = true +)] pub struct Cli { - #[structopt(subcommand)] + #[clap(subcommand)] pub subcommand: Option, - #[structopt(flatten)] + #[clap(flatten)] pub run: RunCmd, /// Relaychain arguments - #[structopt(raw = true)] + #[clap(raw = true)] pub relaychain_args: Vec, } @@ -272,7 +273,7 @@ impl RelayChainCli { Self { base_path, chain_id, - base: polkadot_cli::RunCmd::from_iter(relay_chain_args), + base: polkadot_cli::RunCmd::parse_from(relay_chain_args), } } } diff --git a/node/perf-test/Cargo.toml b/node/perf-test/Cargo.toml index bd8c4e32800..9d66d76b6e8 100644 --- a/node/perf-test/Cargo.toml +++ b/node/perf-test/Cargo.toml @@ -19,7 +19,7 @@ rlp = { version = "0.5" } serde = { version = "1.0", features = [ "derive" ] } serde_json = "1.0" sha3 = { version = "0.8" } -structopt = "0.3.8" +clap = { version = "3.1", features = ["derive"] } heim = { git = "https://github.com/heim-rs/heim", rev = "1fb090576629cd2788dff993cc6ef77547f3df18" } heim-common = { git = "https://github.com/heim-rs/heim", rev = "1fb090576629cd2788dff993cc6ef77547f3df18" } @@ -36,30 +36,31 @@ moonbase-runtime = { path = "../../runtime/moonbase" } service = { package = "moonbeam-service", path = "../service", default-features = false } # Substrate -sc-basic-authorship = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } -sc-cli = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } -sc-client-api = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } -sc-client-db = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } -sc-consensus-manual-seal = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } -sc-executor = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } -sc-rpc = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } -sc-service = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } -sc-transaction-pool = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } -sp-api = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } -sp-core = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } -sp-externalities = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } -sp-keystore = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } -sp-runtime = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } -sp-state-machine = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } -sp-timestamp = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +sc-basic-authorship = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } +sc-cli = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } +sc-client-api = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } +sc-client-db = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } +sc-consensus-manual-seal = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } +sc-executor = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } +sc-rpc = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } +sc-service = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } +sc-transaction-pool = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } +sp-api = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } +sp-core = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } +sp-externalities = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } +sp-keystore = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } +sp-runtime = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } +sp-state-machine = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } +sp-timestamp = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } # Frontier ethereum = { version = "0.11.1" } -fc-consensus = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.16" } -fp-evm = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.16" } -fp-rpc = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.16" } -pallet-ethereum = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.16" } +fc-consensus = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.17" } +fp-evm = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.17" } +fp-rpc = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.17" } +fc-rpc = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.17" } +pallet-ethereum = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.17" } # Cumulus / Nimbus -cumulus-primitives-parachain-inherent = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.16" } -nimbus-primitives = { git = "https://github.com/purestake/nimbus", branch = "moonbeam-polkadot-v0.9.16" } +cumulus-primitives-parachain-inherent = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.17" } +nimbus-primitives = { git = "https://github.com/purestake/nimbus", branch = "moonbeam-polkadot-v0.9.17" } diff --git a/node/perf-test/src/command.rs b/node/perf-test/src/command.rs index f2769ed4664..28a1b242c40 100644 --- a/node/perf-test/src/command.rs +++ b/node/perf-test/src/command.rs @@ -204,6 +204,13 @@ where let command_sink_for_deps = command_sink.clone(); + let block_data_cache = Arc::new(fc_rpc::EthBlockDataCache::new( + task_manager.spawn_handle(), + overrides.clone(), + 3000, + 3000, + )); + let rpc_extensions_builder = { let client = client.clone(); let pool = transaction_pool.clone(); @@ -212,6 +219,7 @@ where let max_past_logs = 1000; let fee_history_cache = fee_history_cache.clone(); let overrides = overrides.clone(); + let block_data_cache = block_data_cache.clone(); Box::new(move |deny_unsafe, _| { let deps = rpc::FullDeps { @@ -223,7 +231,6 @@ where network: network.clone(), filter_pool: filter_pool.clone(), ethapi_cmd: Default::default(), - eth_log_block_cache: 3000, command_sink: command_sink_for_deps.clone(), frontier_backend: frontier_backend.clone(), backend: backend.clone(), @@ -231,9 +238,11 @@ where fee_history_limit, fee_history_cache: fee_history_cache.clone(), xcm_senders: None, + overrides: overrides.clone(), + block_data_cache: block_data_cache.clone(), }; #[allow(unused_mut)] - let mut io = rpc::create_full(deps, subscription_task_executor.clone(), overrides.clone()); + let mut io = rpc::create_full(deps, subscription_task_executor.clone()); Ok(io) }) }; diff --git a/node/perf-test/src/lib.rs b/node/perf-test/src/lib.rs index 8d5f528d1a8..4e372fc99bc 100644 --- a/node/perf-test/src/lib.rs +++ b/node/perf-test/src/lib.rs @@ -20,38 +20,38 @@ pub mod sysinfo; mod tests; mod txn_signer; +use clap::Parser; use std::path::PathBuf; -use structopt::StructOpt; -#[derive(Debug, Clone, StructOpt)] +#[derive(Debug, Clone, Parser)] pub struct PerfCmd { #[allow(missing_docs)] - #[structopt(flatten)] + #[clap(flatten)] pub shared_params: sc_cli::SharedParams, - #[structopt( + #[clap( long = "working-dir", help = "Used for temp blockchain data. Should exist on desired test hardware.", required = true )] pub working_dir: PathBuf, - #[structopt( + #[clap( long = "output-file", help = "File where results should be printed (STDOUT if omitted)." )] pub output_file: Option, - #[structopt(long, value_name = "CHAIN_SPEC", default_value = "dev")] + #[clap(long, value_name = "CHAIN_SPEC", default_value = "dev")] pub chain: String, - #[structopt( + #[clap( long = "disable-sysinfo", help = "Do not attempt to query system info." )] pub disable_sysinfo: bool, - #[structopt( + #[clap( long = "tests", help = "Comma-separated list of tests to run (if omitted, runs all tests)" )] diff --git a/node/service/Cargo.toml b/node/service/Cargo.toml index f98070d15d5..8b60d07a4f4 100644 --- a/node/service/Cargo.toml +++ b/node/service/Cargo.toml @@ -47,83 +47,84 @@ moonbeam-runtime = { path = "../../runtime/moonbeam", optional = true } moonriver-runtime = { path = "../../runtime/moonriver", optional = true } # Substrate -frame-system-rpc-runtime-api = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } -pallet-transaction-payment-rpc = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } -pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +frame-system-rpc-runtime-api = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } +pallet-transaction-payment-rpc = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } +pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } parity-scale-codec = "2.2" -sc-basic-authorship = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } -sc-chain-spec = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } -sc-cli = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", features = [ "wasmtime" ] } -sc-client-api = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } -sc-client-db = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } -sc-consensus = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } -sc-consensus-manual-seal = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } -sc-executor = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", features = [ "wasmtime" ] } -sc-finality-grandpa = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } -sc-informant = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } -sc-network = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } -sc-rpc = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } -sc-rpc-api = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } -sc-service = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } -sc-telemetry = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } -sc-tracing = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } -sc-transaction-pool = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } -sc-transaction-pool-api = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } -sp-api = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } -sp-block-builder = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } -sp-blockchain = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } -sp-consensus = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } -sp-core = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } -sp-inherents = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } -sp-io = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } -sp-keystore = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } -sp-offchain = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } -sp-runtime = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } -sp-session = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } -sp-storage = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } -sp-timestamp = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } -sp-transaction-pool = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } -sp-trie = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } -substrate-frame-rpc-system = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } -substrate-prometheus-endpoint = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +sc-basic-authorship = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } +sc-chain-spec = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } +sc-cli = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", features = [ "wasmtime" ] } +sc-client-api = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } +sc-client-db = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } +sc-consensus = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } +sc-consensus-manual-seal = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } +sc-executor = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", features = [ "wasmtime" ] } +sc-finality-grandpa = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } +sc-informant = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } +sc-network = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } +sc-rpc = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } +sc-rpc-api = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } +sc-service = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } +sc-telemetry = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } +sc-tracing = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } +sc-transaction-pool = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } +sc-transaction-pool-api = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } +sp-api = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } +sp-block-builder = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } +sp-blockchain = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } +sp-consensus = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } +sp-core = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } +sp-inherents = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } +sp-io = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } +sp-keystore = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } +sp-offchain = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } +sp-runtime = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } +sp-session = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } +sp-storage = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } +sp-timestamp = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } +sp-transaction-pool = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } +sp-trie = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } +substrate-frame-rpc-system = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } +substrate-prometheus-endpoint = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } # Frontier -fc-consensus = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.16" } -fc-db = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.16" } -fc-mapping-sync = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.16" } -fc-rpc = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.16", features = [ "rpc_binary_search_estimate" ] } -fc-rpc-core = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.16" } -fp-consensus = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.16" } -fp-rpc = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.16" } -pallet-ethereum = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.16" } +fp-storage = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.17" } +fc-consensus = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.17" } +fc-db = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.17" } +fc-mapping-sync = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.17" } +fc-rpc = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.17", features = [ "rpc_binary_search_estimate" ] } +fc-rpc-core = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.17" } +fp-consensus = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.17" } +fp-rpc = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.17" } +pallet-ethereum = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.17" } # Cumulus / Nimbus -cumulus-client-cli = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.16" } -cumulus-client-collator = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.16" } -cumulus-client-consensus-common = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.16" } -cumulus-client-consensus-relay-chain = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.16" } -cumulus-client-network = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.16" } -cumulus-client-service = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.16" } -cumulus-primitives-core = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.16" } -cumulus-primitives-parachain-inherent = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.16" } -cumulus-relay-chain-interface = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.16" } -cumulus-relay-chain-local = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.16" } -cumulus-test-relay-sproof-builder = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.16" } -nimbus-consensus = { git = "https://github.com/purestake/nimbus", branch = "moonbeam-polkadot-v0.9.16" } +cumulus-client-cli = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.17" } +cumulus-client-collator = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.17" } +cumulus-client-consensus-common = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.17" } +cumulus-client-consensus-relay-chain = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.17" } +cumulus-client-network = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.17" } +cumulus-client-service = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.17" } +cumulus-primitives-core = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.17" } +cumulus-primitives-parachain-inherent = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.17" } +cumulus-relay-chain-interface = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.17" } +cumulus-relay-chain-local = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.17" } +cumulus-test-relay-sproof-builder = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.17" } +nimbus-consensus = { git = "https://github.com/purestake/nimbus", branch = "moonbeam-polkadot-v0.9.17" } # TODO we should be able to depend only on the primitives crate once we move the inherent data provider there. -nimbus-primitives = { git = "https://github.com/purestake/nimbus", branch = "moonbeam-polkadot-v0.9.16" } -pallet-author-inherent = { git = "https://github.com/purestake/nimbus", branch = "moonbeam-polkadot-v0.9.16" } +nimbus-primitives = { git = "https://github.com/purestake/nimbus", branch = "moonbeam-polkadot-v0.9.17" } +pallet-author-inherent = { git = "https://github.com/purestake/nimbus", branch = "moonbeam-polkadot-v0.9.17" } # Polkadot -polkadot-cli = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.16" } -polkadot-parachain = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.16" } -polkadot-primitives = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.16" } -polkadot-service = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.16" } -xcm = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.16", default-features = false } +polkadot-cli = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.17" } +polkadot-parachain = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.17" } +polkadot-primitives = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.17" } +polkadot-service = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.17" } +xcm = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.17", default-features = false } # Benchmarking -frame-benchmarking = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } -frame-benchmarking-cli = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +frame-benchmarking = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } +frame-benchmarking-cli = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } [dev-dependencies] assert_cmd = "0.12" @@ -131,15 +132,15 @@ nix = "0.17" rand = "0.7.3" # Polkadot dev-dependencies -polkadot-runtime-common = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.16" } +polkadot-runtime-common = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.17" } # Substrate dev-dependencies -pallet-sudo = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } -substrate-test-client = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } -substrate-test-runtime-client = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +pallet-sudo = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } +substrate-test-client = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } +substrate-test-runtime-client = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } [build-dependencies] -substrate-build-script-utils = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +substrate-build-script-utils = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } [features] default = [ diff --git a/node/service/src/lib.rs b/node/service/src/lib.rs index bfd817f2e97..890a48ed160 100644 --- a/node/service/src/lib.rs +++ b/node/service/src/lib.rs @@ -525,6 +525,13 @@ where } }; + let block_data_cache = Arc::new(fc_rpc::EthBlockDataCache::new( + task_manager.spawn_handle(), + overrides.clone(), + rpc_config.eth_log_block_cache, + rpc_config.eth_log_block_cache, + )); + let rpc_extensions_builder = { let client = client.clone(); let pool = transaction_pool.clone(); @@ -536,6 +543,7 @@ where let max_past_logs = rpc_config.max_past_logs; let overrides = overrides.clone(); let fee_history_cache = fee_history_cache.clone(); + let block_data_cache = block_data_cache.clone(); Box::new(move |deny_unsafe, _| { let deps = rpc::FullDeps { @@ -544,7 +552,6 @@ where command_sink: None, deny_unsafe, ethapi_cmd: ethapi_cmd.clone(), - eth_log_block_cache: rpc_config.eth_log_block_cache, filter_pool: filter_pool.clone(), frontier_backend: frontier_backend.clone(), graph: pool.pool().clone(), @@ -555,9 +562,11 @@ where fee_history_cache: fee_history_cache.clone(), network: network.clone(), xcm_senders: None, + block_data_cache: block_data_cache.clone(), + overrides: overrides.clone(), }; #[allow(unused_mut)] - let mut io = rpc::create_full(deps, subscription_task_executor.clone(), overrides.clone()); + let mut io = rpc::create_full(deps, subscription_task_executor.clone()); if ethapi_cmd.contains(&EthApiCmd::Debug) || ethapi_cmd.contains(&EthApiCmd::Trace) { rpc::tracing::extend_with_tracing( client.clone(), @@ -924,6 +933,13 @@ where } }; + let block_data_cache = Arc::new(fc_rpc::EthBlockDataCache::new( + task_manager.spawn_handle(), + overrides.clone(), + rpc_config.eth_log_block_cache, + rpc_config.eth_log_block_cache, + )); + let rpc_extensions_builder = { let client = client.clone(); let pool = transaction_pool.clone(); @@ -933,6 +949,7 @@ where let max_past_logs = rpc_config.max_past_logs; let overrides = overrides.clone(); let fee_history_cache = fee_history_cache.clone(); + let block_data_cache = block_data_cache.clone(); Box::new(move |deny_unsafe, _| { let deps = rpc::FullDeps { @@ -941,7 +958,6 @@ where command_sink: command_sink.clone(), deny_unsafe, ethapi_cmd: ethapi_cmd.clone(), - eth_log_block_cache: rpc_config.eth_log_block_cache, filter_pool: filter_pool.clone(), frontier_backend: frontier_backend.clone(), graph: pool.pool().clone(), @@ -952,9 +968,11 @@ where fee_history_cache: fee_history_cache.clone(), network: network.clone(), xcm_senders: xcm_senders.clone(), + overrides: overrides.clone(), + block_data_cache: block_data_cache.clone(), }; #[allow(unused_mut)] - let mut io = rpc::create_full(deps, subscription_task_executor.clone(), overrides.clone()); + let mut io = rpc::create_full(deps, subscription_task_executor.clone()); if ethapi_cmd.contains(&EthApiCmd::Debug) || ethapi_cmd.contains(&EthApiCmd::Trace) { rpc::tracing::extend_with_tracing( client.clone(), diff --git a/node/service/src/rpc.rs b/node/service/src/rpc.rs index 2c6b51cd9d3..e9f8a2e08c2 100644 --- a/node/service/src/rpc.rs +++ b/node/service/src/rpc.rs @@ -34,13 +34,13 @@ use fc_rpc::{ StorageOverride, Web3Api, Web3ApiServer, }; use fc_rpc_core::types::{FeeHistoryCache, FilterPool}; +use fp_storage::EthereumStorageSchema; use futures::StreamExt; use jsonrpc_pubsub::manager::SubscriptionManager; use manual_xcm_rpc::{ManualXcm, ManualXcmApi}; use moonbeam_core_primitives::{Block, Hash}; use moonbeam_finality_rpc::{MoonbeamFinality, MoonbeamFinalityApi}; use moonbeam_rpc_txpool::{TxPool, TxPoolServer}; -use pallet_ethereum::EthereumStorageSchema; use pallet_transaction_payment_rpc::{TransactionPayment, TransactionPaymentApi}; use sc_client_api::{ backend::{AuxStore, Backend, StateBackend, StorageProvider}, @@ -81,8 +81,6 @@ pub struct FullDeps { pub filter_pool: Option, /// The list of optional RPC extensions. pub ethapi_cmd: Vec, - /// Size of the LRU cache for block data and their transaction statuses. - pub eth_log_block_cache: usize, /// Frontier Backend. pub frontier_backend: Arc>, /// Backend. @@ -97,6 +95,10 @@ pub struct FullDeps { pub fee_history_cache: FeeHistoryCache, /// Channels for manual xcm messages (downward, hrmp) pub xcm_senders: Option<(flume::Sender>, flume::Sender<(ParaId, Vec)>)>, + /// Ethereum data access overrides. + pub overrides: Arc>, + /// Cache for Ethereum block data. + pub block_data_cache: Arc>, } pub fn overrides_handle(client: Arc) -> Arc> @@ -135,7 +137,6 @@ where pub fn create_full( deps: FullDeps, subscription_task_executor: SubscriptionTaskExecutor, - overrides: Arc>, ) -> jsonrpc_core::IoHandler where BE: Backend + 'static, @@ -159,7 +160,6 @@ where network, filter_pool, ethapi_cmd, - eth_log_block_cache, command_sink, frontier_backend, backend: _, @@ -167,6 +167,8 @@ where fee_history_limit, fee_history_cache, xcm_senders, + overrides, + block_data_cache, } = deps; io.extend_with(SystemApi::to_delegate(FullSystem::new( @@ -180,11 +182,6 @@ where // TODO: are we supporting signing? let signers = Vec::new(); - let block_data_cache = Arc::new(EthBlockDataCache::new( - eth_log_block_cache, - eth_log_block_cache, - )); - enum Never {} impl fp_rpc::ConvertTransaction for Never { fn convert_transaction(&self, _transaction: pallet_ethereum::Transaction) -> T { @@ -219,7 +216,6 @@ where frontier_backend.clone(), filter_pool, 500_usize, // max stored filters - overrides.clone(), max_past_logs, block_data_cache.clone(), ))); diff --git a/pallets/asset-manager/Cargo.toml b/pallets/asset-manager/Cargo.toml index 60a49c3ab11..9ff67ab4201 100644 --- a/pallets/asset-manager/Cargo.toml +++ b/pallets/asset-manager/Cargo.toml @@ -12,23 +12,23 @@ serde = { version = "1.0.124", optional = true } xcm-primitives = { path = "../../primitives/xcm/", default-features = false } # Substrate -frame-support = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -frame-system = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } +frame-support = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +frame-system = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } parity-scale-codec = { version = "2.0.0", default-features = false, features = [ "derive" ] } scale-info = { version = "1.0", default-features = false, features = [ "derive" ] } -sp-io = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -sp-runtime = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -sp-std = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } +sp-io = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +sp-runtime = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +sp-std = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } # Polkadot -xcm = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.16", default-features = false } +xcm = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.17", default-features = false } # Benchmarks -frame-benchmarking = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", optional = true, default-features = false } +frame-benchmarking = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", optional = true, default-features = false } [dev-dependencies] -pallet-balances = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } -sp-core = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +pallet-balances = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } +sp-core = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } [features] default = [ "std" ] diff --git a/pallets/author-mapping/Cargo.toml b/pallets/author-mapping/Cargo.toml index 8d60a81df70..da7505d9c07 100644 --- a/pallets/author-mapping/Cargo.toml +++ b/pallets/author-mapping/Cargo.toml @@ -10,21 +10,21 @@ log = { version = "0.4", default-features = false } serde = { version = "1.0.101", optional = true } # Substrate -frame-benchmarking = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", optional = true, default-features = false } -frame-support = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -frame-system = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } +frame-benchmarking = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", optional = true, default-features = false } +frame-support = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +frame-system = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } parity-scale-codec = { version = "2.0.0", default-features = false, features = [ "derive" ] } scale-info = { version = "1.0", default-features = false, features = [ "derive" ] } -sp-runtime = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -sp-std = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } +sp-runtime = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +sp-std = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } # Nimbus -nimbus-primitives = { git = "https://github.com/purestake/nimbus", branch = "moonbeam-polkadot-v0.9.16", default-features = false } +nimbus-primitives = { git = "https://github.com/purestake/nimbus", branch = "moonbeam-polkadot-v0.9.17", default-features = false } [dev-dependencies] -pallet-balances = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } -sp-core = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } -sp-io = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +pallet-balances = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } +sp-core = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } +sp-io = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } [features] default = [ "std" ] diff --git a/pallets/ethereum-chain-id/Cargo.toml b/pallets/ethereum-chain-id/Cargo.toml index 7f4d22d758d..43ff1534bb3 100644 --- a/pallets/ethereum-chain-id/Cargo.toml +++ b/pallets/ethereum-chain-id/Cargo.toml @@ -8,8 +8,8 @@ version = "1.0.0" serde = { version = "1.0.101", optional = true, features = [ "derive" ] } # Substrate -frame-support = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -frame-system = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } +frame-support = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +frame-system = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } parity-scale-codec = { version = "2.2", default-features = false, features = [ "derive" ] } scale-info = { version = "1.0", default-features = false, features = [ "derive" ] } diff --git a/pallets/maintenance-mode/Cargo.toml b/pallets/maintenance-mode/Cargo.toml index e831865fe38..5dfdf60c2a7 100644 --- a/pallets/maintenance-mode/Cargo.toml +++ b/pallets/maintenance-mode/Cargo.toml @@ -9,18 +9,18 @@ version = "0.1.0" log = "0.4" # Substrate -frame-support = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -frame-system = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } +frame-support = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +frame-system = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } parity-scale-codec = { version = "2.2", default-features = false } scale-info = { version = "1.0", default-features = false, features = [ "derive" ] } -sp-runtime = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -sp-std = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } +sp-runtime = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +sp-std = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } -cumulus-primitives-core = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.16", optional = true, default-features = false } +cumulus-primitives-core = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.17", optional = true, default-features = false } [dev-dependencies] -sp-core = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } -sp-io = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +sp-core = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } +sp-io = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } [features] default = [ "std", "xcm-support" ] diff --git a/pallets/migrations/Cargo.toml b/pallets/migrations/Cargo.toml index 85340b4c481..c8f0fc6659c 100644 --- a/pallets/migrations/Cargo.toml +++ b/pallets/migrations/Cargo.toml @@ -10,18 +10,18 @@ impl-trait-for-tuples = "0.2.1" log = "0.4" # Substrate -frame-support = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -frame-system = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } +frame-support = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +frame-system = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } parity-scale-codec = { version = "2.0.0", default-features = false } scale-info = { version = "1.0", default-features = false, features = [ "derive" ] } -sp-runtime = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -sp-std = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } +sp-runtime = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +sp-std = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } [dev-dependencies] environmental = "1.1.2" -sp-core = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } -sp-io = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +sp-core = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } +sp-io = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } [features] default = [ "std" ] diff --git a/pallets/parachain-staking/Cargo.toml b/pallets/parachain-staking/Cargo.toml index c2ac82607ef..644236945e6 100644 --- a/pallets/parachain-staking/Cargo.toml +++ b/pallets/parachain-staking/Cargo.toml @@ -10,24 +10,24 @@ log = "0.4" serde = { version = "1.0.101", optional = true } # Substrate -frame-benchmarking = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", optional = true, default-features = false } -frame-support = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -frame-system = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } +frame-benchmarking = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", optional = true, default-features = false } +frame-support = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +frame-system = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } parity-scale-codec = { version = "2.2", default-features = false, features = [ "derive" ] } scale-info = { version = "1.0", default-features = false, features = [ "derive" ] } -sp-runtime = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -sp-std = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } +sp-runtime = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +sp-std = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } substrate-fixed = { git = "https://github.com/encointer/substrate-fixed", default-features = false } # Nimbus -nimbus-primitives = { git = "https://github.com/purestake/nimbus", branch = "moonbeam-polkadot-v0.9.16", default-features = false } +nimbus-primitives = { git = "https://github.com/purestake/nimbus", branch = "moonbeam-polkadot-v0.9.17", default-features = false } [dev-dependencies] similar-asserts = "1.1.0" -pallet-balances = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } -sp-core = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } -sp-io = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +pallet-balances = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } +sp-core = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } +sp-io = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } [features] default = [ "std" ] diff --git a/pallets/proxy-genesis-companion/Cargo.toml b/pallets/proxy-genesis-companion/Cargo.toml index f0210ddd9b5..5a30898a982 100644 --- a/pallets/proxy-genesis-companion/Cargo.toml +++ b/pallets/proxy-genesis-companion/Cargo.toml @@ -6,19 +6,19 @@ edition = "2018" version = "0.1.0" [dependencies] -frame-support = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -frame-system = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -pallet-proxy = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } +frame-support = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +frame-system = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +pallet-proxy = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } parity-scale-codec = { version = "2.2", default-features = false } scale-info = { version = "1.0", default-features = false, features = [ "derive" ] } -sp-runtime = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } +sp-runtime = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } [dev-dependencies] serde = "1.0.124" -pallet-balances = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } -sp-core = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } -sp-io = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +pallet-balances = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } +sp-core = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } +sp-io = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } [features] default = [ "std" ] diff --git a/pallets/xcm-transactor/Cargo.toml b/pallets/xcm-transactor/Cargo.toml index 10894baef37..c8c18da7dd7 100644 --- a/pallets/xcm-transactor/Cargo.toml +++ b/pallets/xcm-transactor/Cargo.toml @@ -12,32 +12,32 @@ serde = { version = "1.0.124", optional = true } xcm-primitives = { path = "../../primitives/xcm/", default-features = false } # Substrate -frame-support = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -frame-system = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } +frame-support = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +frame-system = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } parity-scale-codec = { version = "2.0.0", default-features = false, features = [ "derive" ] } scale-info = { version = "1.0", default-features = false, features = [ "derive" ] } -sp-io = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -sp-runtime = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -sp-std = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } +sp-io = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +sp-runtime = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +sp-std = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } # Cumulus -cumulus-primitives-core = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.16", default-features = false } +cumulus-primitives-core = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.17", default-features = false } # Polkadot / XCM -orml-traits = { git = "https://github.com/purestake/open-runtime-module-library", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -xcm = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -xcm-builder = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -xcm-executor = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.16", default-features = false } +orml-traits = { git = "https://github.com/purestake/open-runtime-module-library", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +xcm = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +xcm-builder = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +xcm-executor = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.17", default-features = false } # Benchmarks -frame-benchmarking = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", optional = true, default-features = false } +frame-benchmarking = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", optional = true, default-features = false } [dev-dependencies] -pallet-balances = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } -pallet-timestamp = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } -pallet-xcm = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.16" } +pallet-balances = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } +pallet-timestamp = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } +pallet-xcm = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.17" } parity-scale-codec = { version = "2.1.1" } -sp-core = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +sp-core = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } [features] default = [ "std" ] diff --git a/precompiles/assets-erc20/Cargo.toml b/precompiles/assets-erc20/Cargo.toml index 6a5e4fcab27..da94007cd4a 100644 --- a/precompiles/assets-erc20/Cargo.toml +++ b/precompiles/assets-erc20/Cargo.toml @@ -15,18 +15,18 @@ precompile-utils = { path = "../utils", default-features = false } # Substrate codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = [ "max-encoded-len" ] } -frame-support = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -frame-system = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -pallet-assets = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -pallet-balances = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -sp-core = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -sp-io = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -sp-runtime = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -sp-std = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } +frame-support = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +frame-system = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +pallet-assets = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +pallet-balances = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +sp-core = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +sp-io = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +sp-runtime = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +sp-std = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } # Frontier -fp-evm = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -pallet-evm = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.16", default-features = false } +fp-evm = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +pallet-evm = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.17", default-features = false } [dev-dependencies] derive_more = { version = "0.99" } @@ -34,9 +34,9 @@ serde = { version = "1.0.100" } sha3 = "0.8" codec = { package = "parity-scale-codec", version = "2.0.0", features = [ "max-encoded-len" ] } -pallet-timestamp = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +pallet-timestamp = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } scale-info = { version = "1.0", default-features = false, features = [ "derive" ] } -sp-runtime = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +sp-runtime = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } [features] default = [ "std" ] diff --git a/precompiles/author-mapping/Cargo.toml b/precompiles/author-mapping/Cargo.toml index cde8a855b20..646c2f38da4 100644 --- a/precompiles/author-mapping/Cargo.toml +++ b/precompiles/author-mapping/Cargo.toml @@ -15,29 +15,29 @@ precompile-utils = { path = "../utils", default-features = false } # Substrate codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false } -fp-evm = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -frame-support = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -frame-system = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -sp-core = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -sp-io = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -sp-std = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } +fp-evm = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +frame-support = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +frame-system = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +sp-core = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +sp-io = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +sp-std = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } # Frontier -pallet-evm = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.16", default-features = false } +pallet-evm = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.17", default-features = false } [dev-dependencies] derive_more = "0.99" hex-literal = "0.3.4" # Nimbus -nimbus-primitives = { git = "https://github.com/purestake/nimbus", branch = "moonbeam-polkadot-v0.9.16" } +nimbus-primitives = { git = "https://github.com/purestake/nimbus", branch = "moonbeam-polkadot-v0.9.17" } serde = "1.0.100" # Substrate -pallet-balances = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } -pallet-scheduler = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } -pallet-timestamp = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +pallet-balances = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } +pallet-scheduler = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } +pallet-timestamp = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } scale-info = { version = "1.0", default-features = false, features = [ "derive" ] } -sp-runtime = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +sp-runtime = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } [features] default = [ "std" ] diff --git a/precompiles/balances-erc20/Cargo.toml b/precompiles/balances-erc20/Cargo.toml index be449cf98f9..feeffbb73f9 100644 --- a/precompiles/balances-erc20/Cargo.toml +++ b/precompiles/balances-erc20/Cargo.toml @@ -16,25 +16,25 @@ precompile-utils = { path = "../utils", default-features = false } # Substrate codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = [ "max-encoded-len" ] } -frame-support = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -frame-system = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -pallet-balances = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -sp-core = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -sp-io = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -sp-std = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } +frame-support = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +frame-system = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +pallet-balances = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +sp-core = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +sp-io = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +sp-std = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } # Frontier -fp-evm = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -pallet-evm = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.16", default-features = false } +fp-evm = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +pallet-evm = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.17", default-features = false } [dev-dependencies] derive_more = { version = "0.99" } serde = { version = "1.0.100" } sha3 = "0.8" -pallet-timestamp = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +pallet-timestamp = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } scale-info = { version = "1.0", default-features = false, features = [ "derive" ] } -sp-runtime = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +sp-runtime = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } [features] default = [ "std" ] diff --git a/precompiles/crowdloan-rewards/Cargo.toml b/precompiles/crowdloan-rewards/Cargo.toml index dd6c5cc0b81..72e0dcf9ef3 100644 --- a/precompiles/crowdloan-rewards/Cargo.toml +++ b/precompiles/crowdloan-rewards/Cargo.toml @@ -14,13 +14,13 @@ rustc-hex = { version = "2.0.1", default-features = false } precompile-utils = { path = "../utils", default-features = false } # Substrate -fp-evm = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -frame-support = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -frame-system = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -pallet-crowdloan-rewards = { git = "https://github.com/purestake/crowdloan-rewards", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -pallet-evm = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -sp-core = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -sp-std = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } +fp-evm = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +frame-support = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +frame-system = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +pallet-crowdloan-rewards = { git = "https://github.com/purestake/crowdloan-rewards", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +pallet-evm = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +sp-core = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +sp-std = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } [dev-dependencies] derive_more = "0.99" @@ -29,18 +29,18 @@ sha3 = "0.9" # Substrate codec = { package = "parity-scale-codec", version = "2.2", default-features = false, features = [ "max-encoded-len" ] } -pallet-balances = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } -pallet-scheduler = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } -pallet-timestamp = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +pallet-balances = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } +pallet-scheduler = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } +pallet-timestamp = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } scale-info = { version = "1.0", default-features = false, features = [ "derive" ] } -sp-io = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -sp-runtime = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +sp-io = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +sp-runtime = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } # Cumulus -cumulus-pallet-parachain-system = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -cumulus-primitives-core = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -cumulus-primitives-parachain-inherent = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -cumulus-test-relay-sproof-builder = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.16", default-features = false } +cumulus-pallet-parachain-system = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +cumulus-primitives-core = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +cumulus-primitives-parachain-inherent = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +cumulus-test-relay-sproof-builder = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.17", default-features = false } [features] default = [ "std" ] diff --git a/precompiles/pallet-democracy/Cargo.toml b/precompiles/pallet-democracy/Cargo.toml index 4f5a8c8eac6..ff7e9f469ae 100644 --- a/precompiles/pallet-democracy/Cargo.toml +++ b/precompiles/pallet-democracy/Cargo.toml @@ -14,17 +14,17 @@ precompile-utils = { path = "../utils", default-features = false } # Substrate codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false } -fp-evm = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -frame-support = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -frame-system = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -pallet-democracy = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -sp-core = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -sp-io = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -sp-std = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } +fp-evm = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +frame-support = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +frame-system = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +pallet-democracy = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +sp-core = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +sp-io = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +sp-std = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } # Frontier -pallet-evm = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.16", default-features = false } +pallet-evm = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.17", default-features = false } [dev-dependencies] derive_more = "0.99" @@ -32,11 +32,11 @@ hex-literal = "0.3.4" serde = "1.0.100" # Substrate -pallet-balances = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } -pallet-scheduler = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } -pallet-timestamp = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +pallet-balances = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } +pallet-scheduler = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } +pallet-timestamp = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } scale-info = { version = "1.0", default-features = false, features = [ "derive" ] } -sp-runtime = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +sp-runtime = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } [features] default = [ "std" ] diff --git a/precompiles/parachain-staking/Cargo.toml b/precompiles/parachain-staking/Cargo.toml index 238ed377a90..e4cbe721e9d 100644 --- a/precompiles/parachain-staking/Cargo.toml +++ b/precompiles/parachain-staking/Cargo.toml @@ -16,16 +16,16 @@ precompile-utils = { path = "../utils", default-features = false } # Substrate codec = { package = "parity-scale-codec", version = "2.2", default-features = false, features = [ "max-encoded-len" ] } -frame-support = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -frame-system = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -sp-core = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -sp-io = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -sp-std = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } +frame-support = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +frame-system = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +sp-core = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +sp-io = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +sp-std = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } # Frontier -fp-evm = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -pallet-evm = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.16", default-features = false } +fp-evm = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +pallet-evm = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.17", default-features = false } [dev-dependencies] derive_more = "0.99" @@ -33,10 +33,10 @@ serde = "1.0.100" sha3 = "0.9" # Substrate -pallet-balances = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } -pallet-timestamp = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +pallet-balances = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } +pallet-timestamp = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } scale-info = { version = "1.0", default-features = false, features = [ "derive" ] } -sp-runtime = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +sp-runtime = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } [features] default = [ "std" ] diff --git a/precompiles/relay-encoder/Cargo.toml b/precompiles/relay-encoder/Cargo.toml index b47c3700798..eb9c275830c 100644 --- a/precompiles/relay-encoder/Cargo.toml +++ b/precompiles/relay-encoder/Cargo.toml @@ -14,21 +14,21 @@ rustc-hex = { version = "2.0.1", default-features = false } precompile-utils = { path = "../utils", default-features = false } # Substrate -frame-support = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -frame-system = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -pallet-staking = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } +frame-support = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +frame-system = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +pallet-staking = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } parity-scale-codec = { version = "2.0.0", default-features = false, features = [ "derive" ] } -sp-core = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -sp-runtime = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -sp-std = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } +sp-core = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +sp-runtime = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +sp-std = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } # Frontier -fp-evm = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -pallet-evm = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.16", default-features = false } +fp-evm = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +pallet-evm = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.17", default-features = false } # Cumulus -cumulus-primitives-core = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.16", default-features = false } +cumulus-primitives-core = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.17", default-features = false } [dev-dependencies] derive_more = "0.99" @@ -37,13 +37,13 @@ serde = "1.0.100" sha3 = "0.9" # Substrate -pallet-balances = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } -pallet-timestamp = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +pallet-balances = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } +pallet-timestamp = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } scale-info = { version = "1.0", default-features = false, features = [ "derive" ] } -sp-io = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } +sp-io = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } # Cumulus -cumulus-pallet-parachain-system = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.16" } +cumulus-pallet-parachain-system = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.17" } [features] default = [ "std" ] diff --git a/precompiles/utils/Cargo.toml b/precompiles/utils/Cargo.toml index 75a3a68765d..1e33ce7cc46 100644 --- a/precompiles/utils/Cargo.toml +++ b/precompiles/utils/Cargo.toml @@ -15,18 +15,18 @@ precompile-utils-macro = { path = "macro" } # Substrate codec = { package = "parity-scale-codec", version = "2.2", default-features = false } -frame-support = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -frame-system = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -sp-core = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -sp-io = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -sp-std = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } +frame-support = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +frame-system = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +sp-core = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +sp-io = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +sp-std = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } # Frontier -fp-evm = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -pallet-evm = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.16", default-features = false } +fp-evm = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +pallet-evm = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.17", default-features = false } # Polkadot / XCM -xcm = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.16", default-features = false } +xcm = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.17", default-features = false } [dev-dependencies] hex-literal = "0.3.1" diff --git a/precompiles/xcm_transactor/Cargo.toml b/precompiles/xcm_transactor/Cargo.toml index 31bd1caa650..0aa67918d9b 100644 --- a/precompiles/xcm_transactor/Cargo.toml +++ b/precompiles/xcm_transactor/Cargo.toml @@ -16,19 +16,19 @@ xcm-primitives = { path = "../../primitives/xcm/", default-features = false } xcm-transactor = { path = "../../pallets/xcm-transactor", default-features = false } # Substrate -frame-support = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -frame-system = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -sp-core = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -sp-runtime = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -sp-std = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } +frame-support = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +frame-system = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +sp-core = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +sp-runtime = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +sp-std = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } # Frontier evm = { version = "0.33.1", default-features = false, features = [ "with-codec" ] } -fp-evm = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -pallet-evm = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.16", default-features = false } +fp-evm = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +pallet-evm = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.17", default-features = false } # Polkadot -xcm = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.16", default-features = false } +xcm = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.17", default-features = false } [dev-dependencies] derive_more = "0.99" @@ -40,18 +40,18 @@ xcm-primitives = { path = "../../primitives/xcm/" } # Substrate codec = { package = "parity-scale-codec", version = "2.2", default-features = false, features = [ "max-encoded-len" ] } -pallet-balances = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } -pallet-timestamp = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +pallet-balances = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } +pallet-timestamp = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } scale-info = { version = "1.0", default-features = false, features = [ "derive" ] } -sp-io = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +sp-io = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } # Cumulus -cumulus-primitives-core = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.16" } +cumulus-primitives-core = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.17" } # Polkadot -pallet-xcm = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.16" } -xcm-builder = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.16" } -xcm-executor = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.16" } +pallet-xcm = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.17" } +xcm-builder = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.17" } +xcm-executor = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.17" } [features] default = [ "std" ] diff --git a/precompiles/xtokens/Cargo.toml b/precompiles/xtokens/Cargo.toml index 6b08cab6341..f59a53e4764 100644 --- a/precompiles/xtokens/Cargo.toml +++ b/precompiles/xtokens/Cargo.toml @@ -15,19 +15,19 @@ precompile-utils = { path = "../utils", default-features = false } xcm-primitives = { path = "../../primitives/xcm/", default-features = false } # Substrate -frame-support = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -sp-core = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -sp-runtime = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -sp-std = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } +frame-support = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +sp-core = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +sp-runtime = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +sp-std = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } # Frontier -fp-evm = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -frame-system = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -pallet-evm = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.16", default-features = false } +fp-evm = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +frame-system = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +pallet-evm = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.17", default-features = false } # Polkadot / XCM -orml-xtokens = { git = "https://github.com/purestake/open-runtime-module-library", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -xcm = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.16", default-features = false } +orml-xtokens = { git = "https://github.com/purestake/open-runtime-module-library", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +xcm = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.17", default-features = false } [dev-dependencies] derive_more = "0.99" @@ -36,18 +36,18 @@ sha3 = "0.9" # Substrate codec = { package = "parity-scale-codec", version = "2.2", default-features = false, features = [ "max-encoded-len" ] } -pallet-balances = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } -pallet-timestamp = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +pallet-balances = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } +pallet-timestamp = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } scale-info = { version = "1.0", features = [ "derive" ] } -sp-io = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +sp-io = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } # Cumulus -cumulus-primitives-core = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.16" } +cumulus-primitives-core = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.17" } # Polkadot -pallet-xcm = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.16" } -xcm-builder = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.16" } -xcm-executor = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.16" } +pallet-xcm = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.17" } +xcm-builder = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.17" } +xcm-executor = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.17" } [features] default = [ "std" ] diff --git a/primitives/account/Cargo.toml b/primitives/account/Cargo.toml index d2343b2ba7a..1543596f3ab 100644 --- a/primitives/account/Cargo.toml +++ b/primitives/account/Cargo.toml @@ -22,11 +22,11 @@ sha3 = { version = "0.9", default-features = false } # Substrate parity-scale-codec = { version = "2.2", default-features = false, features = [ "derive" ] } scale-info = { version = "1.0", default-features = false, features = [ "derive" ] } -sp-core = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -sp-io = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -sp-runtime = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -sp-runtime-interface = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -sp-std = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } +sp-core = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +sp-io = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +sp-runtime = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +sp-runtime-interface = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +sp-std = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } [dev-dependencies] hex = "0.4.3" diff --git a/primitives/ext/Cargo.toml b/primitives/ext/Cargo.toml index a6616ed8c96..0f5a2667f31 100644 --- a/primitives/ext/Cargo.toml +++ b/primitives/ext/Cargo.toml @@ -15,9 +15,9 @@ evm-tracing-events = { path = "../rpc/evm-tracing-events", default-features = fa # Substrate codec = { package = "parity-scale-codec", version = "2.2", default-features = false } -sp-externalities = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -sp-runtime-interface = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -sp-std = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } +sp-externalities = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +sp-runtime-interface = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +sp-std = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } [features] default = [ "std" ] diff --git a/primitives/rpc/debug/Cargo.toml b/primitives/rpc/debug/Cargo.toml index e1d77ee4f4e..df9249c4ae9 100644 --- a/primitives/rpc/debug/Cargo.toml +++ b/primitives/rpc/debug/Cargo.toml @@ -17,11 +17,11 @@ serde_json = { version = "1.0", optional = true } # Substrate codec = { package = "parity-scale-codec", version = "2.2", default-features = false } -sp-api = { git = "https://github.com/purestake/substrate.git", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -sp-core = { git = "https://github.com/purestake/substrate.git", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -sp-io = { git = "https://github.com/purestake/substrate.git", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -sp-runtime = { git = "https://github.com/purestake/substrate.git", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -sp-std = { git = "https://github.com/purestake/substrate.git", branch = "moonbeam-polkadot-v0.9.16", default-features = false } +sp-api = { git = "https://github.com/purestake/substrate.git", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +sp-core = { git = "https://github.com/purestake/substrate.git", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +sp-io = { git = "https://github.com/purestake/substrate.git", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +sp-runtime = { git = "https://github.com/purestake/substrate.git", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +sp-std = { git = "https://github.com/purestake/substrate.git", branch = "moonbeam-polkadot-v0.9.17", default-features = false } [features] default = [ "std" ] diff --git a/primitives/rpc/evm-tracing-events/Cargo.toml b/primitives/rpc/evm-tracing-events/Cargo.toml index 103c2e51c5b..ef7581acc5e 100644 --- a/primitives/rpc/evm-tracing-events/Cargo.toml +++ b/primitives/rpc/evm-tracing-events/Cargo.toml @@ -12,7 +12,7 @@ environmental = { version = "1.1.2", default-features = false } # Substrate codec = { package = "parity-scale-codec", version = "2.2", default-features = false } -sp-runtime-interface = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } +sp-runtime-interface = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } # Ethereum ethereum = { version = "0.11.1", default-features = false, features = [ "with-codec" ] } diff --git a/primitives/rpc/txpool/Cargo.toml b/primitives/rpc/txpool/Cargo.toml index 226c4a5b7b7..5ba13cff632 100644 --- a/primitives/rpc/txpool/Cargo.toml +++ b/primitives/rpc/txpool/Cargo.toml @@ -12,10 +12,10 @@ ethereum = { version = "0.11.1", default-features = false, features = [ "with-co # Substrate codec = { package = "parity-scale-codec", version = "2.2", default-features = false } -sp-api = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -sp-io = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -sp-runtime = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -sp-std = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } +sp-api = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +sp-io = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +sp-runtime = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +sp-std = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } [features] default = [ "std" ] diff --git a/primitives/xcm/Cargo.toml b/primitives/xcm/Cargo.toml index 0104eaf74f0..d22730971aa 100644 --- a/primitives/xcm/Cargo.toml +++ b/primitives/xcm/Cargo.toml @@ -17,17 +17,17 @@ serde = { version = "1.0.101", optional = true, default-features = false, featur sha3 = { version = "0.8", default-features = false } # Substrate -frame-support = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -frame-system = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } +frame-support = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +frame-system = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } parity-scale-codec = { version = "2.2", default-features = false, features = [ "derive" ] } scale-info = { version = "1.0", default-features = false, features = [ "derive" ] } -sp-runtime = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -sp-std = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } +sp-runtime = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +sp-std = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } # Polkadot / XCM -xcm = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -xcm-builder = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -xcm-executor = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.16", default-features = false } +xcm = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +xcm-builder = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +xcm-executor = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.17", default-features = false } [features] default = [ "std" ] diff --git a/runtime/common/Cargo.toml b/runtime/common/Cargo.toml index 7c755281415..dfe1ae19ead 100644 --- a/runtime/common/Cargo.toml +++ b/runtime/common/Cargo.toml @@ -19,20 +19,20 @@ parachain-staking = { path = "../../pallets/parachain-staking", default-features xcm-transactor = { path = "../../pallets/xcm-transactor", optional = true, default-features = false } # Substrate -frame-support = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -frame-system = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -pallet-collective = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -pallet-scheduler = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -sp-core = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -sp-runtime = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -sp-std = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } +frame-support = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +frame-system = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +pallet-collective = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +pallet-scheduler = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +sp-core = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +sp-runtime = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +sp-std = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } # Frontier -pallet-base-fee = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -pallet-evm = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.16", default-features = false } +pallet-base-fee = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +pallet-evm = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.17", default-features = false } # Polkadot -xcm = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.16", optional = true, default-features = false } +xcm = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.17", optional = true, default-features = false } [features] std = [ diff --git a/runtime/evm_tracer/Cargo.toml b/runtime/evm_tracer/Cargo.toml index 8a6e1852e6b..c99a14934fd 100644 --- a/runtime/evm_tracer/Cargo.toml +++ b/runtime/evm_tracer/Cargo.toml @@ -15,18 +15,18 @@ moonbeam-primitives-ext = { path = "../../primitives/ext", default-features = fa # Substrate codec = { package = "parity-scale-codec", version = "2.2", default-features = false } -sp-core = { git = "https://github.com/purestake/substrate.git", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -sp-io = { git = "https://github.com/purestake/substrate.git", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -sp-runtime = { git = "https://github.com/purestake/substrate.git", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -sp-std = { git = "https://github.com/purestake/substrate.git", branch = "moonbeam-polkadot-v0.9.16", default-features = false } +sp-core = { git = "https://github.com/purestake/substrate.git", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +sp-io = { git = "https://github.com/purestake/substrate.git", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +sp-runtime = { git = "https://github.com/purestake/substrate.git", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +sp-std = { git = "https://github.com/purestake/substrate.git", branch = "moonbeam-polkadot-v0.9.17", default-features = false } # Frontier ethereum-types = { version = "0.12.1", default-features = false } evm = { version = "0.33.1", default-features = false, features = [ "with-codec" ] } evm-gasometer = { version = "0.33.0", default-features = false } evm-runtime = { version = "0.33.0", default-features = false } -fp-evm = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -pallet-evm = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.16", default-features = false } +fp-evm = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +pallet-evm = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.17", default-features = false } [features] default = [ "std" ] diff --git a/runtime/moonbase/Cargo.toml b/runtime/moonbase/Cargo.toml index dc8559d4e59..80c49866069 100644 --- a/runtime/moonbase/Cargo.toml +++ b/runtime/moonbase/Cargo.toml @@ -26,7 +26,7 @@ xcm-primitives = { path = "../../primitives/xcm/", default-features = false } # Moonbeam pallets pallet-asset-manager = { path = "../../pallets/asset-manager", default-features = false } pallet-author-mapping = { path = "../../pallets/author-mapping", default-features = false } -pallet-crowdloan-rewards = { git = "https://github.com/purestake/crowdloan-rewards", branch = "moonbeam-polkadot-v0.9.16", default-features = false } +pallet-crowdloan-rewards = { git = "https://github.com/purestake/crowdloan-rewards", branch = "moonbeam-polkadot-v0.9.17", default-features = false } pallet-ethereum-chain-id = { path = "../../pallets/ethereum-chain-id", default-features = false } pallet-maintenance-mode = { path = "../../pallets/maintenance-mode", default-features = false, features = [ "xcm-support" ] } pallet-migrations = { path = "../../pallets/migrations", default-features = false } @@ -52,94 +52,94 @@ moonbeam-rpc-primitives-debug = { path = "../../primitives/rpc/debug", default-f moonbeam-rpc-primitives-txpool = { path = "../../primitives/rpc/txpool", default-features = false } # Substrate -frame-executive = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -frame-support = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -frame-system = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -frame-system-rpc-runtime-api = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -pallet-assets = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -pallet-balances = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -pallet-collective = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -pallet-democracy = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -pallet-identity = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -pallet-proxy = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -pallet-randomness-collective-flip = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -pallet-scheduler = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -pallet-society = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -pallet-sudo = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -pallet-timestamp = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -pallet-transaction-payment = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -pallet-treasury = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -pallet-utility = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } +frame-executive = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +frame-support = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +frame-system = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +frame-system-rpc-runtime-api = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +pallet-assets = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +pallet-balances = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +pallet-collective = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +pallet-democracy = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +pallet-identity = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +pallet-proxy = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +pallet-randomness-collective-flip = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +pallet-scheduler = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +pallet-society = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +pallet-sudo = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +pallet-timestamp = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +pallet-transaction-payment = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +pallet-treasury = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +pallet-utility = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } parity-scale-codec = { version = "2.2", default-features = false, features = [ "derive", "max-encoded-len" ] } scale-info = { version = "1.0", default-features = false, features = [ "derive" ] } -sp-api = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -sp-block-builder = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -sp-core = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -sp-debug-derive = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -sp-inherents = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -sp-io = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -sp-offchain = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -sp-runtime = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -sp-session = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -sp-std = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -sp-transaction-pool = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -sp-version = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } +sp-api = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +sp-block-builder = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +sp-core = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +sp-debug-derive = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +sp-inherents = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +sp-io = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +sp-offchain = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +sp-runtime = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +sp-session = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +sp-std = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +sp-transaction-pool = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +sp-version = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } # Frontier -fp-evm = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -fp-rpc = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -fp-self-contained = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -pallet-base-fee = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -pallet-ethereum = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -pallet-evm = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -pallet-evm-precompile-blake2 = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -pallet-evm-precompile-bn128 = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -pallet-evm-precompile-dispatch = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -pallet-evm-precompile-modexp = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -pallet-evm-precompile-sha3fips = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -pallet-evm-precompile-simple = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.16", default-features = false } +fp-evm = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +fp-rpc = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +fp-self-contained = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +pallet-base-fee = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +pallet-ethereum = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +pallet-evm = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +pallet-evm-precompile-blake2 = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +pallet-evm-precompile-bn128 = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +pallet-evm-precompile-dispatch = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +pallet-evm-precompile-modexp = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +pallet-evm-precompile-sha3fips = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +pallet-evm-precompile-simple = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.17", default-features = false } # Cumulus / Nimbus -cumulus-pallet-dmp-queue = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -cumulus-pallet-parachain-system = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -cumulus-pallet-xcm = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -cumulus-pallet-xcmp-queue = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -cumulus-primitives-core = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -cumulus-primitives-timestamp = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -cumulus-primitives-utility = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -nimbus-primitives = { git = "https://github.com/purestake/nimbus", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -pallet-author-inherent = { git = "https://github.com/purestake/nimbus", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -pallet-author-slot-filter = { git = "https://github.com/purestake/nimbus", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -parachain-info = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.16", default-features = false } +cumulus-pallet-dmp-queue = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +cumulus-pallet-parachain-system = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +cumulus-pallet-xcm = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +cumulus-pallet-xcmp-queue = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +cumulus-primitives-core = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +cumulus-primitives-timestamp = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +cumulus-primitives-utility = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +nimbus-primitives = { git = "https://github.com/purestake/nimbus", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +pallet-author-inherent = { git = "https://github.com/purestake/nimbus", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +pallet-author-slot-filter = { git = "https://github.com/purestake/nimbus", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +parachain-info = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.17", default-features = false } # Polkadot / XCM -orml-xtokens = { git = "https://github.com/purestake/open-runtime-module-library", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -pallet-xcm = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -polkadot-core-primitives = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -polkadot-parachain = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -xcm = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -xcm-builder = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -xcm-executor = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.16", default-features = false } +orml-xtokens = { git = "https://github.com/purestake/open-runtime-module-library", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +pallet-xcm = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +polkadot-core-primitives = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +polkadot-parachain = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +xcm = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +xcm-builder = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +xcm-executor = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.17", default-features = false } # Benchmarking -frame-benchmarking = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", optional = true, default-features = false } -frame-system-benchmarking = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", optional = true, default-features = false } -frame-try-runtime = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", optional = true, default-features = false } +frame-benchmarking = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", optional = true, default-features = false } +frame-system-benchmarking = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", optional = true, default-features = false } +frame-try-runtime = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", optional = true, default-features = false } [dev-dependencies] hex = "0.4" rlp = "0.5" sha3 = "0.9" -cumulus-primitives-parachain-inherent = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -cumulus-test-relay-sproof-builder = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.16", default-features = false } +cumulus-primitives-parachain-inherent = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +cumulus-test-relay-sproof-builder = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.17", default-features = false } -polkadot-runtime-parachains = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.16" } -xcm-simulator = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.16" } +polkadot-runtime-parachains = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.17" } +xcm-simulator = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.17" } [build-dependencies] -substrate-wasm-builder = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +substrate-wasm-builder = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } [features] default = [ "std" ] diff --git a/runtime/moonbase/src/lib.rs b/runtime/moonbase/src/lib.rs index f96d40f5378..39dc8ba2133 100644 --- a/runtime/moonbase/src/lib.rs +++ b/runtime/moonbase/src/lib.rs @@ -54,7 +54,7 @@ use xcm_builder::{ AccountKey20Aliases, AllowKnownQueryResponses, AllowSubscriptionsFrom, AllowTopLevelPaidExecutionFrom, ConvertedConcreteAssetId, CurrencyAdapter as XcmCurrencyAdapter, EnsureXcmOrigin, FixedWeightBounds, FungiblesAdapter, - LocationInverter, ParentAsSuperuser, ParentIsDefault, RelayChainAsNative, + LocationInverter, ParentAsSuperuser, ParentIsPreset, RelayChainAsNative, SiblingParachainAsNative, SiblingParachainConvertsVia, SignedAccountKey20AsNative, SovereignSignedViaLocation, TakeWeightCredit, UsingComponents, }; @@ -746,7 +746,7 @@ impl fp_rpc::ConvertTransaction for TransactionConve impl pallet_ethereum::Config for Runtime { type Event = Event; - type StateRoot = pallet_ethereum::IntermediateStateRoot; + type StateRoot = pallet_ethereum::IntermediateStateRoot; } parameter_types! { @@ -1046,7 +1046,7 @@ parameter_types! { /// `Transact` in order to determine the dispatch Origin. pub type LocationToAccountId = ( // The parent (Relay-chain) origin converts to the default `AccountId`. - ParentIsDefault, + ParentIsPreset, // Sibling parachain origins convert to AccountId via the `ParaId::into`. SiblingParachainConvertsVia, // If we receive a MultiLocation of type AccountKey20, just generate a native account @@ -1251,6 +1251,8 @@ impl cumulus_pallet_xcmp_queue::Config for Runtime { type ChannelInfo = ParachainSystem; type VersionWrapper = PolkadotXcm; type ExecuteOverweightOrigin = EnsureRoot; + type ControllerOrigin = EnsureRoot; + type ControllerOriginConverter = XcmOriginToTransactDispatchOrigin; } impl cumulus_pallet_dmp_queue::Config for Runtime { diff --git a/runtime/moonbeam/Cargo.toml b/runtime/moonbeam/Cargo.toml index b4458137dbe..72b3bd7ca38 100644 --- a/runtime/moonbeam/Cargo.toml +++ b/runtime/moonbeam/Cargo.toml @@ -25,7 +25,7 @@ xcm-primitives = { path = "../../primitives/xcm/", default-features = false } # Moonbeam pallets pallet-asset-manager = { path = "../../pallets/asset-manager", default-features = false } pallet-author-mapping = { path = "../../pallets/author-mapping", default-features = false } -pallet-crowdloan-rewards = { git = "https://github.com/purestake/crowdloan-rewards", branch = "moonbeam-polkadot-v0.9.16", default-features = false } +pallet-crowdloan-rewards = { git = "https://github.com/purestake/crowdloan-rewards", branch = "moonbeam-polkadot-v0.9.17", default-features = false } pallet-ethereum-chain-id = { path = "../../pallets/ethereum-chain-id", default-features = false } pallet-maintenance-mode = { path = "../../pallets/maintenance-mode", default-features = false, features = [ "xcm-support" ] } pallet-migrations = { path = "../../pallets/migrations", default-features = false } @@ -50,92 +50,92 @@ moonbeam-rpc-primitives-debug = { path = "../../primitives/rpc/debug", default-f moonbeam-rpc-primitives-txpool = { path = "../../primitives/rpc/txpool", default-features = false } # Substrate -frame-executive = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -frame-support = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -frame-system = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -frame-system-rpc-runtime-api = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -pallet-assets = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -pallet-balances = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -pallet-collective = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -pallet-democracy = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -pallet-identity = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -pallet-proxy = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -pallet-randomness-collective-flip = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -pallet-scheduler = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -pallet-society = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -pallet-timestamp = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -pallet-transaction-payment = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -pallet-treasury = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -pallet-utility = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } +frame-executive = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +frame-support = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +frame-system = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +frame-system-rpc-runtime-api = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +pallet-assets = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +pallet-balances = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +pallet-collective = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +pallet-democracy = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +pallet-identity = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +pallet-proxy = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +pallet-randomness-collective-flip = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +pallet-scheduler = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +pallet-society = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +pallet-timestamp = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +pallet-transaction-payment = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +pallet-treasury = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +pallet-utility = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } parity-scale-codec = { version = "2.2", default-features = false, features = [ "derive", "max-encoded-len" ] } scale-info = { version = "1.0", default-features = false, features = [ "derive" ] } -sp-api = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -sp-block-builder = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -sp-core = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -sp-inherents = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -sp-io = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -sp-offchain = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -sp-runtime = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -sp-session = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -sp-std = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -sp-transaction-pool = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -sp-version = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } +sp-api = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +sp-block-builder = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +sp-core = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +sp-inherents = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +sp-io = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +sp-offchain = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +sp-runtime = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +sp-session = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +sp-std = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +sp-transaction-pool = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +sp-version = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } # Frontier -fp-evm = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -fp-rpc = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -fp-self-contained = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -pallet-base-fee = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -pallet-ethereum = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -pallet-evm = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -pallet-evm-precompile-blake2 = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -pallet-evm-precompile-bn128 = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -pallet-evm-precompile-dispatch = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -pallet-evm-precompile-modexp = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -pallet-evm-precompile-sha3fips = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -pallet-evm-precompile-simple = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.16", default-features = false } +fp-evm = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +fp-rpc = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +fp-self-contained = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +pallet-base-fee = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +pallet-ethereum = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +pallet-evm = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +pallet-evm-precompile-blake2 = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +pallet-evm-precompile-bn128 = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +pallet-evm-precompile-dispatch = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +pallet-evm-precompile-modexp = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +pallet-evm-precompile-sha3fips = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +pallet-evm-precompile-simple = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.17", default-features = false } # Cumulus / Nimbus -cumulus-pallet-dmp-queue = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -cumulus-pallet-parachain-system = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -cumulus-pallet-xcm = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -cumulus-pallet-xcmp-queue = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -cumulus-primitives-core = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -cumulus-primitives-timestamp = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -cumulus-primitives-utility = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -nimbus-primitives = { git = "https://github.com/purestake/nimbus", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -pallet-author-inherent = { git = "https://github.com/purestake/nimbus", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -pallet-author-slot-filter = { git = "https://github.com/purestake/nimbus", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -parachain-info = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.16", default-features = false } +cumulus-pallet-dmp-queue = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +cumulus-pallet-parachain-system = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +cumulus-pallet-xcm = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +cumulus-pallet-xcmp-queue = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +cumulus-primitives-core = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +cumulus-primitives-timestamp = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +cumulus-primitives-utility = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +nimbus-primitives = { git = "https://github.com/purestake/nimbus", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +pallet-author-inherent = { git = "https://github.com/purestake/nimbus", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +pallet-author-slot-filter = { git = "https://github.com/purestake/nimbus", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +parachain-info = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.17", default-features = false } # Polkadot / XCM -orml-xtokens = { git = "https://github.com/purestake/open-runtime-module-library", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -pallet-xcm = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -polkadot-core-primitives = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -polkadot-parachain = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -xcm = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -xcm-builder = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -xcm-executor = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.16", default-features = false } +orml-xtokens = { git = "https://github.com/purestake/open-runtime-module-library", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +pallet-xcm = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +polkadot-core-primitives = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +polkadot-parachain = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +xcm = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +xcm-builder = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +xcm-executor = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.17", default-features = false } # Benchmarking -frame-benchmarking = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", optional = true, default-features = false } -frame-system-benchmarking = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", optional = true, default-features = false } -frame-try-runtime = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", optional = true, default-features = false } +frame-benchmarking = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", optional = true, default-features = false } +frame-system-benchmarking = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", optional = true, default-features = false } +frame-try-runtime = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", optional = true, default-features = false } [dev-dependencies] hex = "0.4" rlp = "0.5" sha3 = "0.9" -cumulus-primitives-parachain-inherent = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -cumulus-test-relay-sproof-builder = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.16", default-features = false } +cumulus-primitives-parachain-inherent = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +cumulus-test-relay-sproof-builder = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.17", default-features = false } -polkadot-runtime-parachains = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.16" } -xcm-simulator = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.16" } +polkadot-runtime-parachains = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.17" } +xcm-simulator = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.17" } [build-dependencies] -substrate-wasm-builder = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +substrate-wasm-builder = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } [features] default = [ "std" ] diff --git a/runtime/moonbeam/src/lib.rs b/runtime/moonbeam/src/lib.rs index 57cb0a9bc1d..2fdc8b67179 100644 --- a/runtime/moonbeam/src/lib.rs +++ b/runtime/moonbeam/src/lib.rs @@ -84,7 +84,7 @@ use pallet_evm_precompile_assets_erc20::AccountIdAssetIdConversion; use xcm_builder::{ AccountKey20Aliases, AllowKnownQueryResponses, AllowSubscriptionsFrom, AllowTopLevelPaidExecutionFrom, ConvertedConcreteAssetId, EnsureXcmOrigin, FixedWeightBounds, - FungiblesAdapter, LocationInverter, ParentIsDefault, RelayChainAsNative, + FungiblesAdapter, LocationInverter, ParentIsPreset, RelayChainAsNative, SiblingParachainAsNative, SiblingParachainConvertsVia, SignedAccountKey20AsNative, SovereignSignedViaLocation, TakeWeightCredit, }; @@ -683,7 +683,7 @@ impl fp_rpc::ConvertTransaction for TransactionConve impl pallet_ethereum::Config for Runtime { type Event = Event; - type StateRoot = pallet_ethereum::IntermediateStateRoot; + type StateRoot = pallet_ethereum::IntermediateStateRoot; } parameter_types! { @@ -953,7 +953,7 @@ parameter_types! { /// `Transact` in order to determine the dispatch Origin. pub type LocationToAccountId = ( // The parent (Relay-chain) origin converts to the default `AccountId`. - ParentIsDefault, + ParentIsPreset, // Sibling parachain origins convert to AccountId via the `ParaId::into`. SiblingParachainConvertsVia, // If we receive a MultiLocation of type AccountKey20, just generate a native account @@ -1119,6 +1119,8 @@ impl cumulus_pallet_xcmp_queue::Config for Runtime { type ChannelInfo = ParachainSystem; type VersionWrapper = PolkadotXcm; type ExecuteOverweightOrigin = EnsureRoot; + type ControllerOrigin = EnsureRoot; + type ControllerOriginConverter = XcmOriginToTransactDispatchOrigin; } impl cumulus_pallet_dmp_queue::Config for Runtime { diff --git a/runtime/moonriver/Cargo.toml b/runtime/moonriver/Cargo.toml index c9f973b68f5..149e4dcb69d 100644 --- a/runtime/moonriver/Cargo.toml +++ b/runtime/moonriver/Cargo.toml @@ -26,7 +26,7 @@ xcm-primitives = { path = "../../primitives/xcm/", default-features = false } # Moonbeam pallets pallet-asset-manager = { path = "../../pallets/asset-manager", default-features = false } pallet-author-mapping = { path = "../../pallets/author-mapping", default-features = false } -pallet-crowdloan-rewards = { git = "https://github.com/purestake/crowdloan-rewards", branch = "moonbeam-polkadot-v0.9.16", default-features = false } +pallet-crowdloan-rewards = { git = "https://github.com/purestake/crowdloan-rewards", branch = "moonbeam-polkadot-v0.9.17", default-features = false } pallet-ethereum-chain-id = { path = "../../pallets/ethereum-chain-id", default-features = false } pallet-maintenance-mode = { path = "../../pallets/maintenance-mode", default-features = false, features = [ "xcm-support" ] } pallet-migrations = { path = "../../pallets/migrations", default-features = false } @@ -52,93 +52,93 @@ moonbeam-rpc-primitives-debug = { path = "../../primitives/rpc/debug", default-f moonbeam-rpc-primitives-txpool = { path = "../../primitives/rpc/txpool", default-features = false } # Substrate -frame-executive = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -frame-support = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -frame-system = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -frame-system-rpc-runtime-api = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -pallet-assets = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -pallet-balances = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -pallet-collective = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -pallet-democracy = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -pallet-identity = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -pallet-proxy = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -pallet-randomness-collective-flip = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -pallet-scheduler = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -pallet-society = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -pallet-timestamp = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -pallet-transaction-payment = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -pallet-treasury = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -pallet-utility = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } +frame-executive = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +frame-support = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +frame-system = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +frame-system-rpc-runtime-api = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +pallet-assets = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +pallet-balances = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +pallet-collective = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +pallet-democracy = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +pallet-identity = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +pallet-proxy = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +pallet-randomness-collective-flip = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +pallet-scheduler = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +pallet-society = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +pallet-timestamp = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +pallet-transaction-payment = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +pallet-treasury = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +pallet-utility = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } parity-scale-codec = { version = "2.2", default-features = false, features = [ "derive", "max-encoded-len" ] } scale-info = { version = "1.0", default-features = false, features = [ "derive" ] } -sp-api = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -sp-block-builder = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -sp-core = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -sp-debug-derive = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -sp-inherents = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -sp-io = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -sp-offchain = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -sp-runtime = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -sp-session = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -sp-std = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -sp-transaction-pool = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -sp-version = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } +sp-api = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +sp-block-builder = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +sp-core = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +sp-debug-derive = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +sp-inherents = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +sp-io = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +sp-offchain = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +sp-runtime = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +sp-session = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +sp-std = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +sp-transaction-pool = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +sp-version = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } # Frontier -fp-evm = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -fp-rpc = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -fp-self-contained = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -pallet-base-fee = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -pallet-ethereum = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -pallet-evm = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -pallet-evm-precompile-blake2 = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -pallet-evm-precompile-bn128 = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -pallet-evm-precompile-dispatch = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -pallet-evm-precompile-modexp = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -pallet-evm-precompile-sha3fips = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -pallet-evm-precompile-simple = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.16", default-features = false } +fp-evm = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +fp-rpc = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +fp-self-contained = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +pallet-base-fee = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +pallet-ethereum = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +pallet-evm = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +pallet-evm-precompile-blake2 = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +pallet-evm-precompile-bn128 = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +pallet-evm-precompile-dispatch = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +pallet-evm-precompile-modexp = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +pallet-evm-precompile-sha3fips = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +pallet-evm-precompile-simple = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.17", default-features = false } # Cumulus / Nimbus -cumulus-pallet-dmp-queue = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -cumulus-pallet-parachain-system = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -cumulus-pallet-xcm = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -cumulus-pallet-xcmp-queue = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -cumulus-primitives-core = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -cumulus-primitives-timestamp = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -cumulus-primitives-utility = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -nimbus-primitives = { git = "https://github.com/purestake/nimbus", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -pallet-author-inherent = { git = "https://github.com/purestake/nimbus", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -pallet-author-slot-filter = { git = "https://github.com/purestake/nimbus", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -parachain-info = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.16", default-features = false } +cumulus-pallet-dmp-queue = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +cumulus-pallet-parachain-system = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +cumulus-pallet-xcm = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +cumulus-pallet-xcmp-queue = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +cumulus-primitives-core = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +cumulus-primitives-timestamp = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +cumulus-primitives-utility = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +nimbus-primitives = { git = "https://github.com/purestake/nimbus", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +pallet-author-inherent = { git = "https://github.com/purestake/nimbus", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +pallet-author-slot-filter = { git = "https://github.com/purestake/nimbus", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +parachain-info = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.17", default-features = false } # Polkadot / XCM -orml-xtokens = { git = "https://github.com/purestake/open-runtime-module-library", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -pallet-xcm = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -polkadot-core-primitives = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -polkadot-parachain = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -xcm = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -xcm-builder = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -xcm-executor = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.16", default-features = false } +orml-xtokens = { git = "https://github.com/purestake/open-runtime-module-library", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +pallet-xcm = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +polkadot-core-primitives = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +polkadot-parachain = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +xcm = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +xcm-builder = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +xcm-executor = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.17", default-features = false } # Benchmarking -frame-benchmarking = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", optional = true, default-features = false } -frame-system-benchmarking = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", optional = true, default-features = false } -frame-try-runtime = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", optional = true, default-features = false } +frame-benchmarking = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", optional = true, default-features = false } +frame-system-benchmarking = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", optional = true, default-features = false } +frame-try-runtime = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", optional = true, default-features = false } [dev-dependencies] hex = "0.4" rlp = "0.5" sha3 = "0.9" -cumulus-primitives-parachain-inherent = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -cumulus-test-relay-sproof-builder = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.16", default-features = false } +cumulus-primitives-parachain-inherent = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +cumulus-test-relay-sproof-builder = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.17", default-features = false } -polkadot-runtime-parachains = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.16" } -xcm-simulator = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.16" } +polkadot-runtime-parachains = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.17" } +xcm-simulator = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.17" } [build-dependencies] -substrate-wasm-builder = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +substrate-wasm-builder = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } [features] default = [ "std" ] diff --git a/runtime/moonriver/src/lib.rs b/runtime/moonriver/src/lib.rs index 51dfd4cc3bb..ba87fdd74fa 100644 --- a/runtime/moonriver/src/lib.rs +++ b/runtime/moonriver/src/lib.rs @@ -85,7 +85,7 @@ use xcm_builder::{ AccountKey20Aliases, AllowKnownQueryResponses, AllowSubscriptionsFrom, AllowTopLevelPaidExecutionFrom, ConvertedConcreteAssetId, CurrencyAdapter as XcmCurrencyAdapter, EnsureXcmOrigin, FixedWeightBounds, FungiblesAdapter, - LocationInverter, ParentIsDefault, RelayChainAsNative, SiblingParachainAsNative, + LocationInverter, ParentIsPreset, RelayChainAsNative, SiblingParachainAsNative, SiblingParachainConvertsVia, SignedAccountKey20AsNative, SovereignSignedViaLocation, TakeWeightCredit, UsingComponents, }; @@ -681,7 +681,7 @@ impl fp_rpc::ConvertTransaction for TransactionConve impl pallet_ethereum::Config for Runtime { type Event = Event; - type StateRoot = pallet_ethereum::IntermediateStateRoot; + type StateRoot = pallet_ethereum::IntermediateStateRoot; } parameter_types! { @@ -1004,7 +1004,7 @@ parameter_types! { /// `Transact` in order to determine the dispatch Origin. pub type LocationToAccountId = ( // The parent (Relay-chain) origin converts to the default `AccountId`. - ParentIsDefault, + ParentIsPreset, // Sibling parachain origins convert to AccountId via the `ParaId::into`. SiblingParachainConvertsVia, // If we receive a MultiLocation of type AccountKey20, just generate a native account @@ -1203,6 +1203,8 @@ impl cumulus_pallet_xcmp_queue::Config for Runtime { type ChannelInfo = ParachainSystem; type VersionWrapper = PolkadotXcm; type ExecuteOverweightOrigin = EnsureRoot; + type ControllerOrigin = EnsureRoot; + type ControllerOriginConverter = XcmOriginToTransactDispatchOrigin; } impl cumulus_pallet_dmp_queue::Config for Runtime { diff --git a/runtime/relay-encoder/Cargo.toml b/runtime/relay-encoder/Cargo.toml index bdfa5748a03..e095886d137 100644 --- a/runtime/relay-encoder/Cargo.toml +++ b/runtime/relay-encoder/Cargo.toml @@ -14,24 +14,24 @@ relay-encoder-precompiles = { path = "../../precompiles/relay-encoder/", default xcm-primitives = { path = "../../primitives/xcm", default-features = false } # Substrate -frame-system = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -pallet-staking = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } +frame-system = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +pallet-staking = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } parity-scale-codec = { version = "2.0.0", default-features = false, features = [ "derive" ] } -sp-runtime = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } -sp-std = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } +sp-runtime = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } +sp-std = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false } # Cumulus -cumulus-primitives-core = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.16", default-features = false } +cumulus-primitives-core = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.17", default-features = false } [dev-dependencies] -frame-support = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } -pallet-proxy = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } -pallet-utility = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +frame-support = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } +pallet-proxy = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } +pallet-utility = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } -kusama-runtime = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.16" } -polkadot-runtime = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.16" } -rococo-runtime = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.16" } -westend-runtime = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.16" } +kusama-runtime = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.17" } +polkadot-runtime = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.17" } +rococo-runtime = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.17" } +westend-runtime = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.17" } [features] default = [ "std" ] diff --git a/scripts/create-substrate-fork.sh b/scripts/create-substrate-fork.sh index c0e0bfa4623..066159a8885 100755 --- a/scripts/create-substrate-fork.sh +++ b/scripts/create-substrate-fork.sh @@ -6,7 +6,7 @@ if [[ -z "$1" ]]; then fi NEW_BRANCH=$1 -BASE_BRANCH=${2:-"moonbeam-polkadot-v0.9.16"} +BASE_BRANCH=${2:-"moonbeam-polkadot-v0.9.17"} mkdir -p scripts/tmp cd scripts/tmp From bd38790ec5c958ca51f55528a8de979f819953ab Mon Sep 17 00:00:00 2001 From: nanocryk <6422796+nanocryk@users.noreply.github.com> Date: Thu, 24 Feb 2022 15:43:40 +0000 Subject: [PATCH 2/5] fix tests --- pallets/parachain-staking/src/tests.rs | 6 +++--- runtime/moonbase/tests/integration_test.rs | 10 +++++----- runtime/moonbase/tests/xcm_mock/parachain.rs | 4 ++-- runtime/moonbase/tests/xcm_mock/statemint_like.rs | 4 ++-- runtime/moonbase/tests/xcm_tests.rs | 2 +- runtime/moonbeam/tests/integration_test.rs | 10 +++++----- runtime/moonbeam/tests/xcm_mock/parachain.rs | 4 ++-- runtime/moonbeam/tests/xcm_mock/statemint_like.rs | 4 ++-- runtime/moonbeam/tests/xcm_tests.rs | 2 +- runtime/moonriver/tests/integration_test.rs | 12 ++++++------ runtime/moonriver/tests/xcm_mock/parachain.rs | 4 ++-- runtime/moonriver/tests/xcm_mock/statemine_like.rs | 4 ++-- runtime/moonriver/tests/xcm_tests.rs | 2 +- 13 files changed, 34 insertions(+), 34 deletions(-) diff --git a/pallets/parachain-staking/src/tests.rs b/pallets/parachain-staking/src/tests.rs index ecce226ec41..88612d20204 100644 --- a/pallets/parachain-staking/src/tests.rs +++ b/pallets/parachain-staking/src/tests.rs @@ -34,7 +34,7 @@ use crate::{ PendingDelegationRequests, Range, TopDelegations, Total, }; use frame_support::{assert_noop, assert_ok, traits::ReservableCurrency}; -use sp_runtime::{traits::Zero, DispatchError, Perbill, Percent}; +use sp_runtime::{traits::Zero, DispatchError, ModuleError, Perbill, Percent}; use sp_std::collections::btree_map::BTreeMap; // ~~ ROOT ~~ @@ -771,11 +771,11 @@ fn cannot_join_candidates_with_more_than_available_balance() { .execute_with(|| { assert_noop!( ParachainStaking::join_candidates(Origin::signed(1), 501u128, 100u32), - DispatchError::Module { + DispatchError::Module(ModuleError { index: 1, error: 2, message: Some("InsufficientBalance") - } + }) ); }); } diff --git a/runtime/moonbase/tests/integration_test.rs b/runtime/moonbase/tests/integration_test.rs index d6cbf33c6fe..5dfa9e792b7 100644 --- a/runtime/moonbase/tests/integration_test.rs +++ b/runtime/moonbase/tests/integration_test.rs @@ -48,7 +48,7 @@ use sha3::{Digest, Keccak256}; use sp_core::{crypto::UncheckedFrom, ByteArray, Pair, H160, U256}; use sp_runtime::{ traits::{Convert, One}, - DispatchError, + DispatchError, ModuleError, }; use xcm::latest::prelude::*; @@ -330,11 +330,11 @@ fn transfer_through_evm_to_stake() { 1_000 * UNIT, 0u32 ), - DispatchError::Module { + DispatchError::Module(ModuleError { index: 3, error: 2, message: Some("InsufficientBalance") - } + }) ); // Alice transfer from free balance 2000 UNIT to Bob @@ -534,11 +534,11 @@ fn initialize_crowdloan_addresses_with_batch_and_pay() { .dispatch(root_origin())); let expected_fail = Event::Utility(pallet_utility::Event::BatchInterrupted { index: 0, - error: DispatchError::Module { + error: DispatchError::Module(ModuleError { index: 20, error: 8, message: None, - }, + }), }); assert_eq!(last_event(), expected_fail); // Claim 1 block. diff --git a/runtime/moonbase/tests/xcm_mock/parachain.rs b/runtime/moonbase/tests/xcm_mock/parachain.rs index 1dc6a1f0154..b57d6fc2bc4 100644 --- a/runtime/moonbase/tests/xcm_mock/parachain.rs +++ b/runtime/moonbase/tests/xcm_mock/parachain.rs @@ -45,7 +45,7 @@ use xcm_builder::{ AccountKey20Aliases, AllowKnownQueryResponses, AllowSubscriptionsFrom, AllowTopLevelPaidExecutionFrom, ConvertedConcreteAssetId, CurrencyAdapter as XcmCurrencyAdapter, EnsureXcmOrigin, FixedRateOfFungible, FixedWeightBounds, - FungiblesAdapter, LocationInverter, ParentAsSuperuser, ParentIsDefault, RelayChainAsNative, + FungiblesAdapter, LocationInverter, ParentAsSuperuser, ParentIsPreset, RelayChainAsNative, SiblingParachainAsNative, SiblingParachainConvertsVia, SignedAccountKey20AsNative, SovereignSignedViaLocation, TakeWeightCredit, }; @@ -142,7 +142,7 @@ impl pallet_assets::Config for Runtime { /// `Transact` in order to determine the dispatch Origin. pub type LocationToAccountId = ( // The parent (Relay-chain) origin converts to the default `AccountId`. - ParentIsDefault, + ParentIsPreset, // Sibling parachain origins convert to AccountId via the `ParaId::into`. SiblingParachainConvertsVia, AccountKey20Aliases, diff --git a/runtime/moonbase/tests/xcm_mock/statemint_like.rs b/runtime/moonbase/tests/xcm_mock/statemint_like.rs index b9ad2a93ead..809fff3fb39 100644 --- a/runtime/moonbase/tests/xcm_mock/statemint_like.rs +++ b/runtime/moonbase/tests/xcm_mock/statemint_like.rs @@ -42,7 +42,7 @@ use xcm_builder::{ AllowTopLevelPaidExecutionFrom, AllowUnpaidExecutionFrom, AsPrefixedGeneralIndex, ConvertedConcreteAssetId, CurrencyAdapter, EnsureXcmOrigin, FixedRateOfFungible, FixedWeightBounds, FungiblesAdapter, IsConcrete, LocationInverter, ParentAsSuperuser, - ParentIsDefault, RelayChainAsNative, SiblingParachainAsNative, SiblingParachainConvertsVia, + ParentIsPreset, RelayChainAsNative, SiblingParachainAsNative, SiblingParachainConvertsVia, SignedAccountId32AsNative, SignedToAccountId32, SovereignSignedViaLocation, TakeWeightCredit, }; use xcm_executor::{traits::JustTry, Config, XcmExecutor}; @@ -147,7 +147,7 @@ parameter_types! { /// `Transact` in order to determine the dispatch Origin. pub type LocationToAccountId = ( // The parent (Relay-chain) origin converts to the default `AccountId`. - ParentIsDefault, + ParentIsPreset, // Sibling parachain origins convert to AccountId via the `ParaId::into`. SiblingParachainConvertsVia, // Straight up local `AccountId32` origins just alias directly to `AccountId`. diff --git a/runtime/moonbase/tests/xcm_tests.rs b/runtime/moonbase/tests/xcm_tests.rs index c37f7436a19..7f8706634ec 100644 --- a/runtime/moonbase/tests/xcm_tests.rs +++ b/runtime/moonbase/tests/xcm_tests.rs @@ -2028,5 +2028,5 @@ use sp_io::hashing::blake2_256; // Helper to derive accountIds pub fn derivative_account_id(who: sp_runtime::AccountId32, index: u16) -> sp_runtime::AccountId32 { let entropy = (b"modlpy/utilisuba", who, index).using_encoded(blake2_256); - sp_runtime::AccountId32::decode(&mut &entropy[..]).unwrap_or_default() + sp_runtime::AccountId32::decode(&mut &entropy[..]).expect("valid account id") } diff --git a/runtime/moonbeam/tests/integration_test.rs b/runtime/moonbeam/tests/integration_test.rs index b244f19cb57..fc7029cf1cb 100644 --- a/runtime/moonbeam/tests/integration_test.rs +++ b/runtime/moonbeam/tests/integration_test.rs @@ -45,7 +45,7 @@ use sha3::{Digest, Keccak256}; use sp_core::{ByteArray, Pair, H160, U256}; use sp_runtime::{ traits::{Convert, One}, - DispatchError, + DispatchError, ModuleError, }; use xcm::latest::prelude::*; use xcm::{VersionedMultiAsset, VersionedMultiAssets, VersionedMultiLocation}; @@ -332,11 +332,11 @@ fn transfer_through_evm_to_stake() { 100_000 * GLMR, 2u32 ), - DispatchError::Module { + DispatchError::Module(ModuleError { index: 10, error: 2, message: Some("InsufficientBalance") - } + }) ); // Alice transfer from free balance 200_000 GLMR to Bob assert_ok!(Balances::transfer( @@ -544,11 +544,11 @@ fn initialize_crowdloan_addresses_with_batch_and_pay() { .dispatch(root_origin())); let expected_fail = Event::Utility(pallet_utility::Event::BatchInterrupted { index: 0, - error: DispatchError::Module { + error: DispatchError::Module(ModuleError { index: 90, error: 8, message: None, - }, + }), }); assert_eq!(last_event(), expected_fail); // Claim 1 block. diff --git a/runtime/moonbeam/tests/xcm_mock/parachain.rs b/runtime/moonbeam/tests/xcm_mock/parachain.rs index 5038ea2c989..66ef714c308 100644 --- a/runtime/moonbeam/tests/xcm_mock/parachain.rs +++ b/runtime/moonbeam/tests/xcm_mock/parachain.rs @@ -44,7 +44,7 @@ use xcm::latest::{ use xcm_builder::{ AccountKey20Aliases, AllowKnownQueryResponses, AllowSubscriptionsFrom, AllowTopLevelPaidExecutionFrom, ConvertedConcreteAssetId, EnsureXcmOrigin, FixedWeightBounds, - FungiblesAdapter, LocationInverter, ParentAsSuperuser, ParentIsDefault, RelayChainAsNative, + FungiblesAdapter, LocationInverter, ParentAsSuperuser, ParentIsPreset, RelayChainAsNative, SiblingParachainAsNative, SiblingParachainConvertsVia, SignedAccountKey20AsNative, SovereignSignedViaLocation, TakeWeightCredit, }; @@ -141,7 +141,7 @@ impl pallet_assets::Config for Runtime { /// `Transact` in order to determine the dispatch Origin. pub type LocationToAccountId = ( // The parent (Relay-chain) origin converts to the default `AccountId`. - ParentIsDefault, + ParentIsPreset, // Sibling parachain origins convert to AccountId via the `ParaId::into`. SiblingParachainConvertsVia, AccountKey20Aliases, diff --git a/runtime/moonbeam/tests/xcm_mock/statemint_like.rs b/runtime/moonbeam/tests/xcm_mock/statemint_like.rs index b9ad2a93ead..809fff3fb39 100644 --- a/runtime/moonbeam/tests/xcm_mock/statemint_like.rs +++ b/runtime/moonbeam/tests/xcm_mock/statemint_like.rs @@ -42,7 +42,7 @@ use xcm_builder::{ AllowTopLevelPaidExecutionFrom, AllowUnpaidExecutionFrom, AsPrefixedGeneralIndex, ConvertedConcreteAssetId, CurrencyAdapter, EnsureXcmOrigin, FixedRateOfFungible, FixedWeightBounds, FungiblesAdapter, IsConcrete, LocationInverter, ParentAsSuperuser, - ParentIsDefault, RelayChainAsNative, SiblingParachainAsNative, SiblingParachainConvertsVia, + ParentIsPreset, RelayChainAsNative, SiblingParachainAsNative, SiblingParachainConvertsVia, SignedAccountId32AsNative, SignedToAccountId32, SovereignSignedViaLocation, TakeWeightCredit, }; use xcm_executor::{traits::JustTry, Config, XcmExecutor}; @@ -147,7 +147,7 @@ parameter_types! { /// `Transact` in order to determine the dispatch Origin. pub type LocationToAccountId = ( // The parent (Relay-chain) origin converts to the default `AccountId`. - ParentIsDefault, + ParentIsPreset, // Sibling parachain origins convert to AccountId via the `ParaId::into`. SiblingParachainConvertsVia, // Straight up local `AccountId32` origins just alias directly to `AccountId`. diff --git a/runtime/moonbeam/tests/xcm_tests.rs b/runtime/moonbeam/tests/xcm_tests.rs index 666748c2ee7..4ded20e1245 100644 --- a/runtime/moonbeam/tests/xcm_tests.rs +++ b/runtime/moonbeam/tests/xcm_tests.rs @@ -1632,5 +1632,5 @@ use sp_io::hashing::blake2_256; // Helper to derive accountIds pub fn derivative_account_id(who: sp_runtime::AccountId32, index: u16) -> sp_runtime::AccountId32 { let entropy = (b"modlpy/utilisuba", who, index).using_encoded(blake2_256); - sp_runtime::AccountId32::decode(&mut &entropy[..]).unwrap_or_default() + sp_runtime::AccountId32::decode(&mut &entropy[..]).expect("valid account id") } diff --git a/runtime/moonriver/tests/integration_test.rs b/runtime/moonriver/tests/integration_test.rs index 52a833fc0f0..87cea1eadd4 100644 --- a/runtime/moonriver/tests/integration_test.rs +++ b/runtime/moonriver/tests/integration_test.rs @@ -44,7 +44,7 @@ use sha3::{Digest, Keccak256}; use sp_core::{ByteArray, Pair, H160, U256}; use sp_runtime::{ traits::{Convert, One}, - DispatchError, + DispatchError, ModuleError, }; use xcm::latest::prelude::*; use xcm::{VersionedMultiAsset, VersionedMultiAssets, VersionedMultiLocation}; @@ -327,11 +327,11 @@ fn transfer_through_evm_to_stake() { 1_000 * MOVR, 2u32 ), - DispatchError::Module { + DispatchError::Module(ModuleError { index: 10, error: 2, message: Some("InsufficientBalance") - } + }) ); // Alice transfer from free balance 2000 MOVR to Bob assert_ok!(Balances::transfer( @@ -342,7 +342,7 @@ fn transfer_through_evm_to_stake() { assert_eq!(Balances::free_balance(AccountId::from(BOB)), 2_000 * MOVR); let gas_limit = 100000u64; - let gas_price: U256 = 1_000_000_000.into(); + let gas_price: U256 = 1_000_000_000u64.into(); // Bob transfers 1000 MOVR to Charlie via EVM assert_ok!(Call::EVM(pallet_evm::Call::::call { source: H160::from(BOB), @@ -530,11 +530,11 @@ fn initialize_crowdloan_addresses_with_batch_and_pay() { .dispatch(root_origin())); let expected_fail = Event::Utility(pallet_utility::Event::BatchInterrupted { index: 0, - error: DispatchError::Module { + error: DispatchError::Module(ModuleError { index: 90, error: 8, message: None, - }, + }), }); assert_eq!(last_event(), expected_fail); // Claim 1 block. diff --git a/runtime/moonriver/tests/xcm_mock/parachain.rs b/runtime/moonriver/tests/xcm_mock/parachain.rs index 72211bc7c1c..3f46590d186 100644 --- a/runtime/moonriver/tests/xcm_mock/parachain.rs +++ b/runtime/moonriver/tests/xcm_mock/parachain.rs @@ -45,7 +45,7 @@ use xcm_builder::{ AccountKey20Aliases, AllowKnownQueryResponses, AllowSubscriptionsFrom, AllowTopLevelPaidExecutionFrom, ConvertedConcreteAssetId, CurrencyAdapter as XcmCurrencyAdapter, EnsureXcmOrigin, FixedRateOfFungible, FixedWeightBounds, - FungiblesAdapter, LocationInverter, ParentAsSuperuser, ParentIsDefault, RelayChainAsNative, + FungiblesAdapter, LocationInverter, ParentAsSuperuser, ParentIsPreset, RelayChainAsNative, SiblingParachainAsNative, SiblingParachainConvertsVia, SignedAccountKey20AsNative, SovereignSignedViaLocation, TakeWeightCredit, }; @@ -142,7 +142,7 @@ impl pallet_assets::Config for Runtime { /// `Transact` in order to determine the dispatch Origin. pub type LocationToAccountId = ( // The parent (Relay-chain) origin converts to the default `AccountId`. - ParentIsDefault, + ParentIsPreset, // Sibling parachain origins convert to AccountId via the `ParaId::into`. SiblingParachainConvertsVia, AccountKey20Aliases, diff --git a/runtime/moonriver/tests/xcm_mock/statemine_like.rs b/runtime/moonriver/tests/xcm_mock/statemine_like.rs index 5c8263a9008..0a2d2a58026 100644 --- a/runtime/moonriver/tests/xcm_mock/statemine_like.rs +++ b/runtime/moonriver/tests/xcm_mock/statemine_like.rs @@ -42,7 +42,7 @@ use xcm_builder::{ AllowTopLevelPaidExecutionFrom, AllowUnpaidExecutionFrom, AsPrefixedGeneralIndex, ConvertedConcreteAssetId, CurrencyAdapter, EnsureXcmOrigin, FixedRateOfFungible, FixedWeightBounds, FungiblesAdapter, IsConcrete, LocationInverter, ParentAsSuperuser, - ParentIsDefault, RelayChainAsNative, SiblingParachainAsNative, SiblingParachainConvertsVia, + ParentIsPreset, RelayChainAsNative, SiblingParachainAsNative, SiblingParachainConvertsVia, SignedAccountId32AsNative, SignedToAccountId32, SovereignSignedViaLocation, TakeWeightCredit, }; use xcm_executor::{traits::JustTry, Config, XcmExecutor}; @@ -147,7 +147,7 @@ parameter_types! { /// `Transact` in order to determine the dispatch Origin. pub type LocationToAccountId = ( // The parent (Relay-chain) origin converts to the default `AccountId`. - ParentIsDefault, + ParentIsPreset, // Sibling parachain origins convert to AccountId via the `ParaId::into`. SiblingParachainConvertsVia, // Straight up local `AccountId32` origins just alias directly to `AccountId`. diff --git a/runtime/moonriver/tests/xcm_tests.rs b/runtime/moonriver/tests/xcm_tests.rs index c56883cdfb5..726b3995129 100644 --- a/runtime/moonriver/tests/xcm_tests.rs +++ b/runtime/moonriver/tests/xcm_tests.rs @@ -2013,5 +2013,5 @@ use sp_io::hashing::blake2_256; // Helper to derive accountIds pub fn derivative_account_id(who: sp_runtime::AccountId32, index: u16) -> sp_runtime::AccountId32 { let entropy = (b"modlpy/utilisuba", who, index).using_encoded(blake2_256); - sp_runtime::AccountId32::decode(&mut &entropy[..]).unwrap_or_default() + sp_runtime::AccountId32::decode(&mut &entropy[..]).expect("valid account id") } From 58d137eeb0e78cbc2b1dc9ab9dfefe13a65dba63 Mon Sep 17 00:00:00 2001 From: nanocryk <6422796+nanocryk@users.noreply.github.com> Date: Thu, 24 Feb 2022 15:45:09 +0000 Subject: [PATCH 3/5] toml sort --- bin/utils/moonkey/Cargo.toml | 2 +- node/cli-opt/Cargo.toml | 2 +- node/cli/Cargo.toml | 2 +- node/perf-test/Cargo.toml | 4 ++-- node/service/Cargo.toml | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/bin/utils/moonkey/Cargo.toml b/bin/utils/moonkey/Cargo.toml index e479027a5ec..bbeba7a8f46 100644 --- a/bin/utils/moonkey/Cargo.toml +++ b/bin/utils/moonkey/Cargo.toml @@ -12,5 +12,5 @@ name = "moonkey" path = "src/main.rs" [dependencies] +clap = { version = "3.1", features = [ "derive" ] } cli-opt = { package = "moonbeam-cli-opt", path = "../../../node/cli-opt", default-features = false } -clap = { version = "3.1", features = ["derive"] } diff --git a/node/cli-opt/Cargo.toml b/node/cli-opt/Cargo.toml index 1709d3cc286..225c8f17170 100644 --- a/node/cli-opt/Cargo.toml +++ b/node/cli-opt/Cargo.toml @@ -7,10 +7,10 @@ license = "GPL-3.0-only" version = "0.20.1" [dependencies] +clap = { version = "3.1", features = [ "derive" ] } libsecp256k1 = "0.6" primitive-types = "0.10.0" sha3 = "0.9" -clap = { version = "3.1", features = ["derive"] } tiny-bip39 = "0.8" tiny-hderive = "0.3.0" diff --git a/node/cli/Cargo.toml b/node/cli/Cargo.toml index 6333f64b37c..3af71f4046a 100644 --- a/node/cli/Cargo.toml +++ b/node/cli/Cargo.toml @@ -5,9 +5,9 @@ edition = "2018" version = "0.20.1" [dependencies] +clap = { version = "3.1", features = [ "derive" ] } log = "0.4.8" parity-scale-codec = "2.2" -clap = { version = "3.1", features = ["derive"] } # Moonbeam cli-opt = { package = "moonbeam-cli-opt", path = "../cli-opt", default-features = false } diff --git a/node/perf-test/Cargo.toml b/node/perf-test/Cargo.toml index 9d66d76b6e8..a01b3a10a27 100644 --- a/node/perf-test/Cargo.toml +++ b/node/perf-test/Cargo.toml @@ -7,6 +7,7 @@ version = "0.1.0" [dependencies] async-io = "1.3" +clap = { version = "3.1", features = [ "derive" ] } cli-table = "0.4" futures = { version = "0.3.1", features = [ "compat" ] } hex = "0.4.3" @@ -19,7 +20,6 @@ rlp = { version = "0.5" } serde = { version = "1.0", features = [ "derive" ] } serde_json = "1.0" sha3 = { version = "0.8" } -clap = { version = "3.1", features = ["derive"] } heim = { git = "https://github.com/heim-rs/heim", rev = "1fb090576629cd2788dff993cc6ef77547f3df18" } heim-common = { git = "https://github.com/heim-rs/heim", rev = "1fb090576629cd2788dff993cc6ef77547f3df18" } @@ -56,9 +56,9 @@ sp-timestamp = { git = "https://github.com/purestake/substrate", branch = "moonb # Frontier ethereum = { version = "0.11.1" } fc-consensus = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.17" } +fc-rpc = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.17" } fp-evm = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.17" } fp-rpc = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.17" } -fc-rpc = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.17" } pallet-ethereum = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.17" } # Cumulus / Nimbus diff --git a/node/service/Cargo.toml b/node/service/Cargo.toml index 8b60d07a4f4..cf3cfa9241c 100644 --- a/node/service/Cargo.toml +++ b/node/service/Cargo.toml @@ -88,7 +88,6 @@ substrate-frame-rpc-system = { git = "https://github.com/purestake/substrate", b substrate-prometheus-endpoint = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" } # Frontier -fp-storage = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.17" } fc-consensus = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.17" } fc-db = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.17" } fc-mapping-sync = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.17" } @@ -96,6 +95,7 @@ fc-rpc = { git = "https://github.com/purestake/frontier", branch = "moonbeam-pol fc-rpc-core = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.17" } fp-consensus = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.17" } fp-rpc = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.17" } +fp-storage = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.17" } pallet-ethereum = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.17" } # Cumulus / Nimbus From 6c6e515379873ed84201b12efd2c1523bea563c9 Mon Sep 17 00:00:00 2001 From: librelois Date: Thu, 24 Feb 2022 22:04:29 +0100 Subject: [PATCH 4/5] fix rust tests --- pallets/proxy-genesis-companion/src/tests.rs | 4 ++-- precompiles/assets-erc20/src/tests.rs | 18 +++++++++--------- precompiles/balances-erc20/src/tests.rs | 6 +++--- runtime/moonbase/tests/integration_test.rs | 6 +++--- runtime/moonbeam/tests/integration_test.rs | 6 +++--- runtime/moonriver/tests/integration_test.rs | 6 +++--- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/pallets/proxy-genesis-companion/src/tests.rs b/pallets/proxy-genesis-companion/src/tests.rs index 9bf64ba7965..03f2b07e2da 100644 --- a/pallets/proxy-genesis-companion/src/tests.rs +++ b/pallets/proxy-genesis-companion/src/tests.rs @@ -54,8 +54,8 @@ fn non_empty_genesis_works() { } #[test] -#[should_panic(expected = "Genesis proxy could not be added: Module \ - { index: 1, error: 2, message: Some(\"InsufficientBalance\") }")] +#[should_panic(expected = "Genesis proxy could not be added: Module(ModuleError \ + { index: 1, error: 2, message: Some(\"InsufficientBalance\") })")] fn genesis_fails_if_balance_insufficient() { ExtBuilder::default() .with_proxies(vec![(1, 2)]) diff --git a/precompiles/assets-erc20/src/tests.rs b/precompiles/assets-erc20/src/tests.rs index 432c9ec5b58..9cf9d388d77 100644 --- a/precompiles/assets-erc20/src/tests.rs +++ b/precompiles/assets-erc20/src/tests.rs @@ -290,7 +290,7 @@ fn approve() { Some(Ok(PrecompileOutput { exit_status: ExitSucceed::Returned, output: EvmDataWriter::new().write(true).build(), - cost: 56999756u64, + cost: 30832756u64, logs: LogsBuilder::new(Account::AssetId(0u128).into()) .log3( SELECTOR_LOG_APPROVAL, @@ -342,7 +342,7 @@ fn approve_saturating() { Some(Ok(PrecompileOutput { exit_status: ExitSucceed::Returned, output: EvmDataWriter::new().write(true).build(), - cost: 56999756u64, + cost: 30832756u64, logs: LogsBuilder::new(Account::AssetId(0u128).into()) .log3( SELECTOR_LOG_APPROVAL, @@ -521,7 +521,7 @@ fn transfer() { Some(Ok(PrecompileOutput { exit_status: ExitSucceed::Returned, output: EvmDataWriter::new().write(true).build(), - cost: 83206756u64, // 1 weight => 1 gas in mock + cost: 44001756u64, // 1 weight => 1 gas in mock logs: LogsBuilder::new(Account::AssetId(0u128).into()) .log3( SELECTOR_LOG_TRANSFER, @@ -676,7 +676,7 @@ fn transfer_from() { Some(Ok(PrecompileOutput { exit_status: ExitSucceed::Returned, output: EvmDataWriter::new().write(true).build(), - cost: 107172756u64, // 1 weight => 1 gas in mock + cost: 56268756u64, // 1 weight => 1 gas in mock logs: LogsBuilder::new(Account::AssetId(0u128).into()) .log3( SELECTOR_LOG_TRANSFER, @@ -795,7 +795,7 @@ fn transfer_from_non_incremental_approval() { Some(Ok(PrecompileOutput { exit_status: ExitSucceed::Returned, output: EvmDataWriter::new().write(true).build(), - cost: 56999756u64, + cost: 30832756u64, logs: LogsBuilder::new(Account::AssetId(0u128).into()) .log3( SELECTOR_LOG_APPROVAL, @@ -829,7 +829,7 @@ fn transfer_from_non_incremental_approval() { Some(Ok(PrecompileOutput { exit_status: ExitSucceed::Returned, output: EvmDataWriter::new().write(true).build(), - cost: 114357756u64, + cost: 62796756u64, logs: LogsBuilder::new(Account::AssetId(0u128).into()) .log3( SELECTOR_LOG_APPROVAL, @@ -861,7 +861,7 @@ fn transfer_from_non_incremental_approval() { Some(Err(PrecompileFailure::Revert { output, ..})) if output == b"Dispatched call failed with error: DispatchErrorWithPostInfo { \ post_info: PostDispatchInfo { actual_weight: None, pays_fee: Pays::Yes }, \ - error: Module { index: 2, error: 10, message: Some(\"Unapproved\") } }", + error: Module(ModuleError { index: 2, error: 10, message: Some(\"Unapproved\") }) }" ); }); } @@ -920,7 +920,7 @@ fn transfer_from_above_allowance() { Some(Err(PrecompileFailure::Revert { output, ..})) if output == b"Dispatched call failed with error: DispatchErrorWithPostInfo { \ post_info: PostDispatchInfo { actual_weight: None, pays_fee: Pays::Yes }, \ - error: Module { index: 2, error: 10, message: Some(\"Unapproved\") } }" + error: Module(ModuleError { index: 2, error: 10, message: Some(\"Unapproved\") }) }" ); }); } @@ -965,7 +965,7 @@ fn transfer_from_self() { Some(Ok(PrecompileOutput { exit_status: ExitSucceed::Returned, output: EvmDataWriter::new().write(true).build(), - cost: 83206756u64, // 1 weight => 1 gas in mock + cost: 44001756u64, // 1 weight => 1 gas in mock logs: LogsBuilder::new(Account::AssetId(0u128).into()) .log3( SELECTOR_LOG_TRANSFER, diff --git a/precompiles/balances-erc20/src/tests.rs b/precompiles/balances-erc20/src/tests.rs index df3a33c9ff5..04b0b8f4e1d 100644 --- a/precompiles/balances-erc20/src/tests.rs +++ b/precompiles/balances-erc20/src/tests.rs @@ -351,7 +351,7 @@ fn transfer() { Some(Ok(PrecompileOutput { exit_status: ExitSucceed::Returned, output: EvmDataWriter::new().write(true).build(), - cost: 195953756u64, // 1 weight => 1 gas in mock + cost: 159201756u64, // 1 weight => 1 gas in mock logs: LogsBuilder::new(Account::Precompile.into()) .log3( SELECTOR_LOG_TRANSFER, @@ -478,7 +478,7 @@ fn transfer_from() { Some(Ok(PrecompileOutput { exit_status: ExitSucceed::Returned, output: EvmDataWriter::new().write(true).build(), - cost: 195953756u64, // 1 weight => 1 gas in mock + cost: 159201756u64, // 1 weight => 1 gas in mock logs: LogsBuilder::new(Account::Precompile.into()) .log3( SELECTOR_LOG_TRANSFER, @@ -628,7 +628,7 @@ fn transfer_from_self() { Some(Ok(PrecompileOutput { exit_status: ExitSucceed::Returned, output: EvmDataWriter::new().write(true).build(), - cost: 195953756u64, // 1 weight => 1 gas in mock + cost: 159201756u64, // 1 weight => 1 gas in mock logs: LogsBuilder::new(Account::Precompile.into()) .log3( SELECTOR_LOG_TRANSFER, diff --git a/runtime/moonbase/tests/integration_test.rs b/runtime/moonbase/tests/integration_test.rs index 5dfa9e792b7..553a5db00ba 100644 --- a/runtime/moonbase/tests/integration_test.rs +++ b/runtime/moonbase/tests/integration_test.rs @@ -1146,7 +1146,7 @@ fn asset_erc20_precompiles_transfer() { let expected_result = Some(Ok(PrecompileOutput { exit_status: ExitSucceed::Returned, output: EvmDataWriter::new().write(true).build(), - cost: 25084u64, + cost: 23516u64, logs: LogsBuilder::new(asset_precompile_address) .log3( SELECTOR_LOG_TRANSFER, @@ -1220,7 +1220,7 @@ fn asset_erc20_precompiles_approve() { let expected_result = Some(Ok(PrecompileOutput { exit_status: ExitSucceed::Returned, output: EvmDataWriter::new().write(true).build(), - cost: 15035u64, + cost: 13989u64, logs: LogsBuilder::new(asset_precompile_address) .log3( SELECTOR_LOG_APPROVAL, @@ -1254,7 +1254,7 @@ fn asset_erc20_precompiles_approve() { let expected_result = Some(Ok(PrecompileOutput { exit_status: ExitSucceed::Returned, output: EvmDataWriter::new().write(true).build(), - cost: 31042u64, + cost: 29006u64, logs: LogsBuilder::new(asset_precompile_address) .log3( SELECTOR_LOG_TRANSFER, diff --git a/runtime/moonbeam/tests/integration_test.rs b/runtime/moonbeam/tests/integration_test.rs index fc7029cf1cb..4ee9bffc6f8 100644 --- a/runtime/moonbeam/tests/integration_test.rs +++ b/runtime/moonbeam/tests/integration_test.rs @@ -1390,7 +1390,7 @@ fn asset_erc20_precompiles_transfer() { let expected_result = Some(Ok(PrecompileOutput { exit_status: ExitSucceed::Returned, output: EvmDataWriter::new().write(true).build(), - cost: 25084u64, + cost: 23516u64, logs: LogsBuilder::new(asset_precompile_address) .log3( SELECTOR_LOG_TRANSFER, @@ -1464,7 +1464,7 @@ fn asset_erc20_precompiles_approve() { let expected_result = Some(Ok(PrecompileOutput { exit_status: ExitSucceed::Returned, output: EvmDataWriter::new().write(true).build(), - cost: 15035u64, + cost: 13989u64, logs: LogsBuilder::new(asset_precompile_address) .log3( SELECTOR_LOG_APPROVAL, @@ -1498,7 +1498,7 @@ fn asset_erc20_precompiles_approve() { let expected_result = Some(Ok(PrecompileOutput { exit_status: ExitSucceed::Returned, output: EvmDataWriter::new().write(true).build(), - cost: 31042u64, + cost: 29006u64, logs: LogsBuilder::new(asset_precompile_address) .log3( SELECTOR_LOG_TRANSFER, diff --git a/runtime/moonriver/tests/integration_test.rs b/runtime/moonriver/tests/integration_test.rs index 87cea1eadd4..bff8c0a7806 100644 --- a/runtime/moonriver/tests/integration_test.rs +++ b/runtime/moonriver/tests/integration_test.rs @@ -1378,7 +1378,7 @@ fn asset_erc20_precompiles_transfer() { let expected_result = Some(Ok(PrecompileOutput { exit_status: ExitSucceed::Returned, output: EvmDataWriter::new().write(true).build(), - cost: 25084u64, + cost: 23516u64, logs: LogsBuilder::new(asset_precompile_address) .log3( SELECTOR_LOG_TRANSFER, @@ -1452,7 +1452,7 @@ fn asset_erc20_precompiles_approve() { let expected_result = Some(Ok(PrecompileOutput { exit_status: ExitSucceed::Returned, output: EvmDataWriter::new().write(true).build(), - cost: 15035u64, + cost: 13989u64, logs: LogsBuilder::new(asset_precompile_address) .log3( SELECTOR_LOG_APPROVAL, @@ -1486,7 +1486,7 @@ fn asset_erc20_precompiles_approve() { let expected_result = Some(Ok(PrecompileOutput { exit_status: ExitSucceed::Returned, output: EvmDataWriter::new().write(true).build(), - cost: 31042u64, + cost: 29006u64, logs: LogsBuilder::new(asset_precompile_address) .log3( SELECTOR_LOG_TRANSFER, From 24d61e8f0c6a2389c7c5b2dc0be2b14ab7186f8b Mon Sep 17 00:00:00 2001 From: Crystalin Date: Thu, 24 Feb 2022 20:58:16 -0500 Subject: [PATCH 5/5] Fixes assets sufficients test --- tests/tests/test-assets-sufficients.ts | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/tests/tests/test-assets-sufficients.ts b/tests/tests/test-assets-sufficients.ts index c2594893642..26d7bf427bc 100644 --- a/tests/tests/test-assets-sufficients.ts +++ b/tests/tests/test-assets-sufficients.ts @@ -7,8 +7,6 @@ import Keyring from "@polkadot/keyring"; import { randomAsHex } from "@polkadot/util-crypto"; -const sourceLocationRelay = { parents: 1, interior: "Here" }; - const sourceLocationRelayAssetType = { XCM: { parents: 1, interior: "Here" } }; interface AssetMetadata { @@ -90,7 +88,7 @@ async function mockAssetBalance( describeDevMoonbeam( "Pallet Assets - Sufficient tests: is_sufficient to true", (context) => { - let sudoAccount, assetId, iFace; + let sudoAccount, assetId; before("Setup contract and mock balance", async () => { const keyring = new Keyring({ type: "ethereum" }); sudoAccount = await keyring.addFromUri(ALITH_PRIV_KEY, null, "ethereum"); @@ -121,9 +119,6 @@ describeDevMoonbeam( true ); - let beforeAssetBalance = ( - (await context.polkadotApi.query.assets.account(assetId, ALITH)) as any - ).balance as BN; await context.createBlock(); let alithBalance = (await context.polkadotApi.query.assets.account(assetId, ALITH)) as any; expect(alithBalance.unwrap()["balance"].eq(new BN(100000000000000))).to.equal(true); @@ -171,9 +166,9 @@ describeDevMoonbeam( .paymentInfo(freshAccount) ).partialFee as any; - // For some reason paymentInfo overestimates by 4359 + // For some reason paymentInfo overestimates by 4067 await context.polkadotApi.tx.balances - .transfer(freshAccount.address, BigInt(fee) - BigInt(4359)) + .transfer(freshAccount.address, BigInt(fee) - BigInt(4067)) .signAndSend(alith); await context.createBlock(); @@ -237,7 +232,7 @@ describeDevMoonbeam( describeDevMoonbeam( "Pallet Assets - Sufficient tests: is_sufficient to true", (context) => { - let sudoAccount, assetId, iFace; + let sudoAccount, assetId; before("Setup contract and mock balance", async () => { const keyring = new Keyring({ type: "ethereum" }); sudoAccount = await keyring.addFromUri(ALITH_PRIV_KEY, null, "ethereum"); @@ -268,9 +263,6 @@ describeDevMoonbeam( true ); - let beforeAssetBalance = ( - (await context.polkadotApi.query.assets.account(assetId, ALITH)) as any - ).balance as BN; await context.createBlock(); let alithBalance = (await context.polkadotApi.query.assets.account(assetId, ALITH)) as any; expect(alithBalance.unwrap()["balance"].eq(new BN(100000000000000))).to.equal(true); @@ -382,7 +374,7 @@ describeDevMoonbeam( describeDevMoonbeam( "Pallet Assets - Sufficient tests: is_sufficient to false", (context) => { - let sudoAccount, assetId, iFace; + let sudoAccount, assetId; before("Setup contract and mock balance", async () => { const keyring = new Keyring({ type: "ethereum" }); sudoAccount = await keyring.addFromUri(ALITH_PRIV_KEY, null, "ethereum"); @@ -413,9 +405,6 @@ describeDevMoonbeam( false ); - let beforeAssetBalance = ( - (await context.polkadotApi.query.assets.account(assetId, ALITH)) as any - ).balance as BN; await context.createBlock(); let alithBalance = (await context.polkadotApi.query.assets.account(assetId, ALITH)) as any; expect(alithBalance.unwrap()["balance"].eq(new BN(100000000000000))).to.equal(true);