diff --git a/Cargo.lock b/Cargo.lock index 4f792242f5..2ad544d991 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -684,7 +684,7 @@ dependencies = [ [[package]] name = "bp-header-chain" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#d70f74c37561f8db7a62d27e15566761d2d202e6" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#6e3e9e60c2615f1cd715923aea9816ac6b9b59f7" dependencies = [ "finality-grandpa", "frame-support", @@ -700,7 +700,7 @@ dependencies = [ [[package]] name = "bp-message-dispatch" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#d70f74c37561f8db7a62d27e15566761d2d202e6" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#6e3e9e60c2615f1cd715923aea9816ac6b9b59f7" dependencies = [ "bp-runtime", "frame-support", @@ -712,7 +712,7 @@ dependencies = [ [[package]] name = "bp-messages" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#d70f74c37561f8db7a62d27e15566761d2d202e6" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#6e3e9e60c2615f1cd715923aea9816ac6b9b59f7" dependencies = [ "bitvec", "bp-runtime", @@ -728,7 +728,7 @@ dependencies = [ [[package]] name = "bp-polkadot-core" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#d70f74c37561f8db7a62d27e15566761d2d202e6" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#6e3e9e60c2615f1cd715923aea9816ac6b9b59f7" dependencies = [ "bp-messages", "bp-runtime", @@ -746,7 +746,7 @@ dependencies = [ [[package]] name = "bp-rococo" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#d70f74c37561f8db7a62d27e15566761d2d202e6" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#6e3e9e60c2615f1cd715923aea9816ac6b9b59f7" dependencies = [ "bp-messages", "bp-polkadot-core", @@ -763,7 +763,7 @@ dependencies = [ [[package]] name = "bp-runtime" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#d70f74c37561f8db7a62d27e15566761d2d202e6" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#6e3e9e60c2615f1cd715923aea9816ac6b9b59f7" dependencies = [ "frame-support", "hash-db", @@ -781,7 +781,7 @@ dependencies = [ [[package]] name = "bp-test-utils" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#d70f74c37561f8db7a62d27e15566761d2d202e6" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#6e3e9e60c2615f1cd715923aea9816ac6b9b59f7" dependencies = [ "bp-header-chain", "ed25519-dalek", @@ -796,7 +796,7 @@ dependencies = [ [[package]] name = "bp-wococo" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#d70f74c37561f8db7a62d27e15566761d2d202e6" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#6e3e9e60c2615f1cd715923aea9816ac6b9b59f7" dependencies = [ "bp-messages", "bp-polkadot-core", @@ -811,7 +811,7 @@ dependencies = [ [[package]] name = "bridge-runtime-common" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#d70f74c37561f8db7a62d27e15566761d2d202e6" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#6e3e9e60c2615f1cd715923aea9816ac6b9b59f7" dependencies = [ "bp-message-dispatch", "bp-messages", @@ -1067,42 +1067,12 @@ dependencies = [ "ansi_term", "atty", "bitflags", - "strsim 0.8.0", - "textwrap 0.11.0", + "strsim", + "textwrap", "unicode-width", "vec_map", ] -[[package]] -name = "clap" -version = "3.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12e8611f9ae4e068fa3e56931fded356ff745e70987ff76924a6e0ab1c8ef2e3" -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.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "517358c28fcef6607bf6f76108e02afad7e82297d132a6b846dcc1fc3efcd153" -dependencies = [ - "heck 0.4.0", - "proc-macro-error", - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "cloudabi" version = "0.0.3" @@ -1282,7 +1252,7 @@ checksum = "1604dafd25fba2fe2d5895a9da139f8dc9b319a5fe5354ca137cbbce4e178d10" dependencies = [ "atty", "cast", - "clap 2.34.0", + "clap", "criterion-plot", "csv", "futures 0.3.19", @@ -1456,9 +1426,9 @@ dependencies = [ name = "cumulus-client-cli" version = "0.1.0" dependencies = [ - "clap 3.0.7", "sc-cli", "sc-service", + "structopt", ] [[package]] @@ -2321,7 +2291,7 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7c5f0096a91d210159eceb2ff5e1c4da18388a170e1e3ce948aac9c8fdbbf595" dependencies = [ - "heck 0.3.3", + "heck", "proc-macro2", "quote", "syn", @@ -3127,12 +3097,6 @@ dependencies = [ "unicode-segmentation", ] -[[package]] -name = "heck" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" - [[package]] name = "hermit-abi" version = "0.1.19" @@ -3754,7 +3718,7 @@ dependencies = [ [[package]] name = "kusama-runtime" version = "0.9.16" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#d70f74c37561f8db7a62d27e15566761d2d202e6" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#6e3e9e60c2615f1cd715923aea9816ac6b9b59f7" dependencies = [ "beefy-primitives", "bitvec", @@ -3842,7 +3806,7 @@ dependencies = [ [[package]] name = "kusama-runtime-constants" version = "0.9.16" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#d70f74c37561f8db7a62d27e15566761d2d202e6" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#6e3e9e60c2615f1cd715923aea9816ac6b9b59f7" dependencies = [ "frame-support", "polkadot-primitives", @@ -4711,7 +4675,7 @@ dependencies = [ [[package]] name = "metered-channel" version = "0.9.16" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#d70f74c37561f8db7a62d27e15566761d2d202e6" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#6e3e9e60c2615f1cd715923aea9816ac6b9b59f7" dependencies = [ "derive_more", "futures 0.3.19", @@ -5164,15 +5128,6 @@ dependencies = [ "num-traits", ] -[[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" @@ -5381,7 +5336,7 @@ dependencies = [ [[package]] name = "pallet-bridge-dispatch" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#d70f74c37561f8db7a62d27e15566761d2d202e6" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#6e3e9e60c2615f1cd715923aea9816ac6b9b59f7" dependencies = [ "bp-message-dispatch", "bp-runtime", @@ -5398,7 +5353,7 @@ dependencies = [ [[package]] name = "pallet-bridge-grandpa" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#d70f74c37561f8db7a62d27e15566761d2d202e6" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#6e3e9e60c2615f1cd715923aea9816ac6b9b59f7" dependencies = [ "bp-header-chain", "bp-runtime", @@ -5420,7 +5375,7 @@ dependencies = [ [[package]] name = "pallet-bridge-messages" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#d70f74c37561f8db7a62d27e15566761d2d202e6" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#6e3e9e60c2615f1cd715923aea9816ac6b9b59f7" dependencies = [ "bitvec", "bp-message-dispatch", @@ -6099,7 +6054,7 @@ dependencies = [ [[package]] name = "pallet-xcm" version = "0.9.16" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#d70f74c37561f8db7a62d27e15566761d2d202e6" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#6e3e9e60c2615f1cd715923aea9816ac6b9b59f7" dependencies = [ "frame-support", "frame-system", @@ -6117,7 +6072,7 @@ dependencies = [ [[package]] name = "pallet-xcm-benchmarks" version = "0.9.16" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#d70f74c37561f8db7a62d27e15566761d2d202e6" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#6e3e9e60c2615f1cd715923aea9816ac6b9b59f7" dependencies = [ "frame-benchmarking", "frame-support", @@ -6147,7 +6102,6 @@ dependencies = [ name = "parachain-template-node" version = "0.1.0" dependencies = [ - "clap 3.0.7", "cumulus-client-cli", "cumulus-client-collator", "cumulus-client-consensus-aura", @@ -6200,6 +6154,7 @@ dependencies = [ "sp-session", "sp-timestamp", "sp-transaction-pool", + "structopt", "substrate-build-script-utils", "substrate-frame-rpc-system", "substrate-prometheus-endpoint", @@ -6669,7 +6624,7 @@ dependencies = [ [[package]] name = "polkadot-approval-distribution" version = "0.9.16" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#d70f74c37561f8db7a62d27e15566761d2d202e6" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#6e3e9e60c2615f1cd715923aea9816ac6b9b59f7" dependencies = [ "futures 0.3.19", "polkadot-node-network-protocol", @@ -6683,7 +6638,7 @@ dependencies = [ [[package]] name = "polkadot-availability-bitfield-distribution" version = "0.9.16" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#d70f74c37561f8db7a62d27e15566761d2d202e6" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#6e3e9e60c2615f1cd715923aea9816ac6b9b59f7" dependencies = [ "futures 0.3.19", "polkadot-node-network-protocol", @@ -6696,7 +6651,7 @@ dependencies = [ [[package]] name = "polkadot-availability-distribution" version = "0.9.16" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#d70f74c37561f8db7a62d27e15566761d2d202e6" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#6e3e9e60c2615f1cd715923aea9816ac6b9b59f7" dependencies = [ "derive_more", "futures 0.3.19", @@ -6718,7 +6673,7 @@ dependencies = [ [[package]] name = "polkadot-availability-recovery" version = "0.9.16" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#d70f74c37561f8db7a62d27e15566761d2d202e6" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#6e3e9e60c2615f1cd715923aea9816ac6b9b59f7" dependencies = [ "futures 0.3.19", "lru 0.7.2", @@ -6738,7 +6693,7 @@ dependencies = [ [[package]] name = "polkadot-cli" version = "0.9.16" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#d70f74c37561f8db7a62d27e15566761d2d202e6" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#6e3e9e60c2615f1cd715923aea9816ac6b9b59f7" dependencies = [ "frame-benchmarking-cli", "futures 0.3.19", @@ -6761,7 +6716,7 @@ dependencies = [ [[package]] name = "polkadot-client" version = "0.9.16" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#d70f74c37561f8db7a62d27e15566761d2d202e6" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#6e3e9e60c2615f1cd715923aea9816ac6b9b59f7" dependencies = [ "beefy-primitives", "frame-benchmarking", @@ -6794,7 +6749,6 @@ version = "5.2.0" dependencies = [ "assert_cmd", "async-trait", - "clap 3.0.7", "cumulus-client-cli", "cumulus-client-consensus-aura", "cumulus-client-consensus-common", @@ -6852,6 +6806,7 @@ dependencies = [ "sp-transaction-pool", "statemine-runtime", "statemint-runtime", + "structopt", "substrate-build-script-utils", "substrate-frame-rpc-system", "substrate-prometheus-endpoint", @@ -6864,7 +6819,7 @@ dependencies = [ [[package]] name = "polkadot-collator-protocol" version = "0.9.16" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#d70f74c37561f8db7a62d27e15566761d2d202e6" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#6e3e9e60c2615f1cd715923aea9816ac6b9b59f7" dependencies = [ "always-assert", "derive_more", @@ -6885,7 +6840,7 @@ dependencies = [ [[package]] name = "polkadot-core-primitives" version = "0.9.16" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#d70f74c37561f8db7a62d27e15566761d2d202e6" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#6e3e9e60c2615f1cd715923aea9816ac6b9b59f7" dependencies = [ "parity-scale-codec", "parity-util-mem", @@ -6898,7 +6853,7 @@ dependencies = [ [[package]] name = "polkadot-dispute-distribution" version = "0.9.16" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#d70f74c37561f8db7a62d27e15566761d2d202e6" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#6e3e9e60c2615f1cd715923aea9816ac6b9b59f7" dependencies = [ "derive_more", "futures 0.3.19", @@ -6920,7 +6875,7 @@ dependencies = [ [[package]] name = "polkadot-erasure-coding" version = "0.9.16" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#d70f74c37561f8db7a62d27e15566761d2d202e6" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#6e3e9e60c2615f1cd715923aea9816ac6b9b59f7" dependencies = [ "parity-scale-codec", "polkadot-node-primitives", @@ -6934,7 +6889,7 @@ dependencies = [ [[package]] name = "polkadot-gossip-support" version = "0.9.16" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#d70f74c37561f8db7a62d27e15566761d2d202e6" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#6e3e9e60c2615f1cd715923aea9816ac6b9b59f7" dependencies = [ "futures 0.3.19", "futures-timer", @@ -6954,7 +6909,7 @@ dependencies = [ [[package]] name = "polkadot-network-bridge" version = "0.9.16" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#d70f74c37561f8db7a62d27e15566761d2d202e6" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#6e3e9e60c2615f1cd715923aea9816ac6b9b59f7" dependencies = [ "async-trait", "futures 0.3.19", @@ -6973,7 +6928,7 @@ dependencies = [ [[package]] name = "polkadot-node-collation-generation" version = "0.9.16" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#d70f74c37561f8db7a62d27e15566761d2d202e6" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#6e3e9e60c2615f1cd715923aea9816ac6b9b59f7" dependencies = [ "futures 0.3.19", "parity-scale-codec", @@ -6991,7 +6946,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-approval-voting" version = "0.9.16" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#d70f74c37561f8db7a62d27e15566761d2d202e6" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#6e3e9e60c2615f1cd715923aea9816ac6b9b59f7" dependencies = [ "bitvec", "derive_more", @@ -7019,7 +6974,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-av-store" version = "0.9.16" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#d70f74c37561f8db7a62d27e15566761d2d202e6" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#6e3e9e60c2615f1cd715923aea9816ac6b9b59f7" dependencies = [ "bitvec", "futures 0.3.19", @@ -7039,7 +6994,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-backing" version = "0.9.16" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#d70f74c37561f8db7a62d27e15566761d2d202e6" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#6e3e9e60c2615f1cd715923aea9816ac6b9b59f7" dependencies = [ "bitvec", "futures 0.3.19", @@ -7057,7 +7012,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-bitfield-signing" version = "0.9.16" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#d70f74c37561f8db7a62d27e15566761d2d202e6" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#6e3e9e60c2615f1cd715923aea9816ac6b9b59f7" dependencies = [ "futures 0.3.19", "polkadot-node-subsystem", @@ -7072,7 +7027,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-candidate-validation" version = "0.9.16" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#d70f74c37561f8db7a62d27e15566761d2d202e6" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#6e3e9e60c2615f1cd715923aea9816ac6b9b59f7" dependencies = [ "async-trait", "futures 0.3.19", @@ -7090,7 +7045,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-chain-api" version = "0.9.16" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#d70f74c37561f8db7a62d27e15566761d2d202e6" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#6e3e9e60c2615f1cd715923aea9816ac6b9b59f7" dependencies = [ "futures 0.3.19", "polkadot-node-subsystem", @@ -7105,7 +7060,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-chain-selection" version = "0.9.16" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#d70f74c37561f8db7a62d27e15566761d2d202e6" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#6e3e9e60c2615f1cd715923aea9816ac6b9b59f7" dependencies = [ "futures 0.3.19", "futures-timer", @@ -7122,7 +7077,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-dispute-coordinator" version = "0.9.16" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#d70f74c37561f8db7a62d27e15566761d2d202e6" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#6e3e9e60c2615f1cd715923aea9816ac6b9b59f7" dependencies = [ "futures 0.3.19", "kvdb", @@ -7140,7 +7095,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-parachains-inherent" version = "0.9.16" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#d70f74c37561f8db7a62d27e15566761d2d202e6" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#6e3e9e60c2615f1cd715923aea9816ac6b9b59f7" dependencies = [ "async-trait", "futures 0.3.19", @@ -7157,7 +7112,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-provisioner" version = "0.9.16" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#d70f74c37561f8db7a62d27e15566761d2d202e6" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#6e3e9e60c2615f1cd715923aea9816ac6b9b59f7" dependencies = [ "bitvec", "futures 0.3.19", @@ -7174,7 +7129,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-pvf" version = "0.9.16" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#d70f74c37561f8db7a62d27e15566761d2d202e6" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#6e3e9e60c2615f1cd715923aea9816ac6b9b59f7" dependencies = [ "always-assert", "assert_matches", @@ -7204,7 +7159,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-pvf-checker" version = "0.9.16" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#d70f74c37561f8db7a62d27e15566761d2d202e6" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#6e3e9e60c2615f1cd715923aea9816ac6b9b59f7" dependencies = [ "futures 0.3.19", "polkadot-node-primitives", @@ -7220,7 +7175,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-runtime-api" version = "0.9.16" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#d70f74c37561f8db7a62d27e15566761d2d202e6" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#6e3e9e60c2615f1cd715923aea9816ac6b9b59f7" dependencies = [ "futures 0.3.19", "memory-lru", @@ -7238,7 +7193,7 @@ dependencies = [ [[package]] name = "polkadot-node-jaeger" version = "0.9.16" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#d70f74c37561f8db7a62d27e15566761d2d202e6" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#6e3e9e60c2615f1cd715923aea9816ac6b9b59f7" dependencies = [ "async-std", "lazy_static", @@ -7256,7 +7211,7 @@ dependencies = [ [[package]] name = "polkadot-node-metrics" version = "0.9.16" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#d70f74c37561f8db7a62d27e15566761d2d202e6" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#6e3e9e60c2615f1cd715923aea9816ac6b9b59f7" dependencies = [ "bs58", "futures 0.3.19", @@ -7275,7 +7230,7 @@ dependencies = [ [[package]] name = "polkadot-node-network-protocol" version = "0.9.16" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#d70f74c37561f8db7a62d27e15566761d2d202e6" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#6e3e9e60c2615f1cd715923aea9816ac6b9b59f7" dependencies = [ "async-trait", "derive_more", @@ -7293,7 +7248,7 @@ dependencies = [ [[package]] name = "polkadot-node-primitives" version = "0.9.16" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#d70f74c37561f8db7a62d27e15566761d2d202e6" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#6e3e9e60c2615f1cd715923aea9816ac6b9b59f7" dependencies = [ "bounded-vec", "futures 0.3.19", @@ -7315,7 +7270,7 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem" version = "0.9.16" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#d70f74c37561f8db7a62d27e15566761d2d202e6" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#6e3e9e60c2615f1cd715923aea9816ac6b9b59f7" dependencies = [ "polkadot-node-jaeger", "polkadot-node-subsystem-types", @@ -7325,7 +7280,7 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem-test-helpers" version = "0.9.16" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#d70f74c37561f8db7a62d27e15566761d2d202e6" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#6e3e9e60c2615f1cd715923aea9816ac6b9b59f7" dependencies = [ "async-trait", "futures 0.3.19", @@ -7343,7 +7298,7 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem-types" version = "0.9.16" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#d70f74c37561f8db7a62d27e15566761d2d202e6" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#6e3e9e60c2615f1cd715923aea9816ac6b9b59f7" dependencies = [ "derive_more", "futures 0.3.19", @@ -7362,7 +7317,7 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem-util" version = "0.9.16" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#d70f74c37561f8db7a62d27e15566761d2d202e6" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#6e3e9e60c2615f1cd715923aea9816ac6b9b59f7" dependencies = [ "async-trait", "derive_more", @@ -7390,7 +7345,7 @@ dependencies = [ [[package]] name = "polkadot-overseer" version = "0.9.16" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#d70f74c37561f8db7a62d27e15566761d2d202e6" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#6e3e9e60c2615f1cd715923aea9816ac6b9b59f7" dependencies = [ "futures 0.3.19", "futures-timer", @@ -7411,7 +7366,7 @@ dependencies = [ [[package]] name = "polkadot-overseer-gen" version = "0.9.16" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#d70f74c37561f8db7a62d27e15566761d2d202e6" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#6e3e9e60c2615f1cd715923aea9816ac6b9b59f7" dependencies = [ "async-trait", "futures 0.3.19", @@ -7428,7 +7383,7 @@ dependencies = [ [[package]] name = "polkadot-overseer-gen-proc-macro" version = "0.9.16" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#d70f74c37561f8db7a62d27e15566761d2d202e6" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#6e3e9e60c2615f1cd715923aea9816ac6b9b59f7" dependencies = [ "proc-macro-crate 1.1.0", "proc-macro2", @@ -7439,7 +7394,7 @@ dependencies = [ [[package]] name = "polkadot-parachain" version = "0.9.16" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#d70f74c37561f8db7a62d27e15566761d2d202e6" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#6e3e9e60c2615f1cd715923aea9816ac6b9b59f7" dependencies = [ "derive_more", "frame-support", @@ -7456,7 +7411,7 @@ dependencies = [ [[package]] name = "polkadot-performance-test" version = "0.9.16" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#d70f74c37561f8db7a62d27e15566761d2d202e6" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#6e3e9e60c2615f1cd715923aea9816ac6b9b59f7" dependencies = [ "env_logger 0.9.0", "kusama-runtime", @@ -7471,7 +7426,7 @@ dependencies = [ [[package]] name = "polkadot-primitives" version = "0.9.16" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#d70f74c37561f8db7a62d27e15566761d2d202e6" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#6e3e9e60c2615f1cd715923aea9816ac6b9b59f7" dependencies = [ "bitvec", "frame-system", @@ -7501,7 +7456,7 @@ dependencies = [ [[package]] name = "polkadot-rpc" version = "0.9.16" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#d70f74c37561f8db7a62d27e15566761d2d202e6" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#6e3e9e60c2615f1cd715923aea9816ac6b9b59f7" dependencies = [ "beefy-gadget", "beefy-gadget-rpc", @@ -7532,7 +7487,7 @@ dependencies = [ [[package]] name = "polkadot-runtime" version = "0.9.16" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#d70f74c37561f8db7a62d27e15566761d2d202e6" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#6e3e9e60c2615f1cd715923aea9816ac6b9b59f7" dependencies = [ "beefy-primitives", "bitvec", @@ -7616,7 +7571,7 @@ dependencies = [ [[package]] name = "polkadot-runtime-common" version = "0.9.16" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#d70f74c37561f8db7a62d27e15566761d2d202e6" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#6e3e9e60c2615f1cd715923aea9816ac6b9b59f7" dependencies = [ "beefy-primitives", "bitvec", @@ -7663,7 +7618,7 @@ dependencies = [ [[package]] name = "polkadot-runtime-constants" version = "0.9.16" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#d70f74c37561f8db7a62d27e15566761d2d202e6" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#6e3e9e60c2615f1cd715923aea9816ac6b9b59f7" dependencies = [ "frame-support", "polkadot-primitives", @@ -7675,7 +7630,7 @@ dependencies = [ [[package]] name = "polkadot-runtime-metrics" version = "0.9.16" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#d70f74c37561f8db7a62d27e15566761d2d202e6" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#6e3e9e60c2615f1cd715923aea9816ac6b9b59f7" dependencies = [ "bs58", "parity-scale-codec", @@ -7687,7 +7642,7 @@ dependencies = [ [[package]] name = "polkadot-runtime-parachains" version = "0.9.16" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#d70f74c37561f8db7a62d27e15566761d2d202e6" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#6e3e9e60c2615f1cd715923aea9816ac6b9b59f7" dependencies = [ "bitflags", "bitvec", @@ -7728,7 +7683,7 @@ dependencies = [ [[package]] name = "polkadot-service" version = "0.9.16" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#d70f74c37561f8db7a62d27e15566761d2d202e6" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#6e3e9e60c2615f1cd715923aea9816ac6b9b59f7" dependencies = [ "async-trait", "beefy-gadget", @@ -7828,7 +7783,7 @@ dependencies = [ [[package]] name = "polkadot-statement-distribution" version = "0.9.16" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#d70f74c37561f8db7a62d27e15566761d2d202e6" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#6e3e9e60c2615f1cd715923aea9816ac6b9b59f7" dependencies = [ "arrayvec 0.5.2", "derive_more", @@ -7849,7 +7804,7 @@ dependencies = [ [[package]] name = "polkadot-statement-table" version = "0.9.16" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#d70f74c37561f8db7a62d27e15566761d2d202e6" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#6e3e9e60c2615f1cd715923aea9816ac6b9b59f7" dependencies = [ "parity-scale-codec", "polkadot-primitives", @@ -7859,7 +7814,7 @@ dependencies = [ [[package]] name = "polkadot-test-client" version = "0.9.16" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#d70f74c37561f8db7a62d27e15566761d2d202e6" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#6e3e9e60c2615f1cd715923aea9816ac6b9b59f7" dependencies = [ "parity-scale-codec", "polkadot-node-subsystem", @@ -7884,7 +7839,7 @@ dependencies = [ [[package]] name = "polkadot-test-runtime" version = "0.9.16" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#d70f74c37561f8db7a62d27e15566761d2d202e6" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#6e3e9e60c2615f1cd715923aea9816ac6b9b59f7" dependencies = [ "beefy-primitives", "bitvec", @@ -7946,7 +7901,7 @@ dependencies = [ [[package]] name = "polkadot-test-service" version = "0.9.16" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#d70f74c37561f8db7a62d27e15566761d2d202e6" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#6e3e9e60c2615f1cd715923aea9816ac6b9b59f7" dependencies = [ "frame-benchmarking", "frame-system", @@ -8168,7 +8123,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "62941722fb675d463659e49c4f3fe1fe792ff24fe5bbaa9c08cd3b98a1c354f5" dependencies = [ "bytes 1.1.0", - "heck 0.3.3", + "heck", "itertools", "lazy_static", "log", @@ -8620,7 +8575,7 @@ dependencies = [ [[package]] name = "rococo-runtime" version = "0.9.16" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#d70f74c37561f8db7a62d27e15566761d2d202e6" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#6e3e9e60c2615f1cd715923aea9816ac6b9b59f7" dependencies = [ "beefy-primitives", "bp-messages", @@ -8695,7 +8650,7 @@ dependencies = [ [[package]] name = "rococo-runtime-constants" version = "0.9.16" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#d70f74c37561f8db7a62d27e15566761d2d202e6" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#6e3e9e60c2615f1cd715923aea9816ac6b9b59f7" dependencies = [ "frame-support", "polkadot-primitives", @@ -10163,7 +10118,7 @@ checksum = "9def91fd1e018fe007022791f865d0ccc9b3a0d5001e01aabb8b40e46000afb5" [[package]] name = "slot-range-helper" version = "0.9.16" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#d70f74c37561f8db7a62d27e15566761d2d202e6" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#6e3e9e60c2615f1cd715923aea9816ac6b9b59f7" dependencies = [ "enumn", "parity-scale-codec", @@ -11152,19 +11107,13 @@ 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.26" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c6b5c64445ba8094a6ab0c3cd2ad323e07171012d9c98b0b15651daf1787a10" dependencies = [ - "clap 2.34.0", + "clap", "lazy_static", "structopt-derive", ] @@ -11175,7 +11124,7 @@ version = "0.4.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dcb5ae327f9cc13b68763b5749770cb9e048a99bd9dfdfa58d0cf05d5f64afe0" dependencies = [ - "heck 0.3.3", + "heck", "proc-macro-error", "proc-macro2", "quote", @@ -11206,7 +11155,7 @@ version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "339f799d8b549e3744c7ac7feb216383e4005d94bdb22561b3ab8f3b808ae9fb" dependencies = [ - "heck 0.3.3", + "heck", "proc-macro2", "quote", "syn", @@ -11218,7 +11167,7 @@ version = "0.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5bb0dc7ee9c15cea6199cde9a127fa16a4c5819af85395457ad72d68edc85a38" dependencies = [ - "heck 0.3.3", + "heck", "proc-macro2", "quote", "rustversion", @@ -11417,7 +11366,7 @@ checksum = "13a4ec180a2de59b57434704ccfad967f789b12737738798fa08798cd5824c16" [[package]] name = "test-runtime-constants" version = "0.9.16" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#d70f74c37561f8db7a62d27e15566761d2d202e6" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#6e3e9e60c2615f1cd715923aea9816ac6b9b59f7" dependencies = [ "frame-support", "polkadot-primitives", @@ -11435,12 +11384,6 @@ 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" @@ -12378,7 +12321,7 @@ dependencies = [ [[package]] name = "westend-runtime" version = "0.9.16" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#d70f74c37561f8db7a62d27e15566761d2d202e6" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#6e3e9e60c2615f1cd715923aea9816ac6b9b59f7" dependencies = [ "beefy-primitives", "bitvec", @@ -12464,7 +12407,7 @@ dependencies = [ [[package]] name = "westend-runtime-constants" version = "0.9.16" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#d70f74c37561f8db7a62d27e15566761d2d202e6" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#6e3e9e60c2615f1cd715923aea9816ac6b9b59f7" dependencies = [ "frame-support", "polkadot-primitives", @@ -12638,7 +12581,7 @@ dependencies = [ [[package]] name = "xcm" version = "0.9.16" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#d70f74c37561f8db7a62d27e15566761d2d202e6" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#6e3e9e60c2615f1cd715923aea9816ac6b9b59f7" dependencies = [ "derivative", "impl-trait-for-tuples", @@ -12651,7 +12594,7 @@ dependencies = [ [[package]] name = "xcm-builder" version = "0.9.16" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#d70f74c37561f8db7a62d27e15566761d2d202e6" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#6e3e9e60c2615f1cd715923aea9816ac6b9b59f7" dependencies = [ "frame-support", "frame-system", @@ -12671,7 +12614,7 @@ dependencies = [ [[package]] name = "xcm-executor" version = "0.9.16" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#d70f74c37561f8db7a62d27e15566761d2d202e6" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#6e3e9e60c2615f1cd715923aea9816ac6b9b59f7" dependencies = [ "frame-benchmarking", "frame-support", @@ -12689,7 +12632,7 @@ dependencies = [ [[package]] name = "xcm-procedural" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#d70f74c37561f8db7a62d27e15566761d2d202e6" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#6e3e9e60c2615f1cd715923aea9816ac6b9b59f7" dependencies = [ "Inflector", "proc-macro2", diff --git a/client/cli/Cargo.toml b/client/cli/Cargo.toml index a564c13886..3741eed037 100644 --- a/client/cli/Cargo.toml +++ b/client/cli/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Parity Technologies "] edition = "2021" [dependencies] -clap = { version = "3.0", features = ["derive"] } +structopt = "0.3.3" # Substrate dependencies sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } diff --git a/client/cli/src/lib.rs b/client/cli/src/lib.rs index 65322089a3..9e3ab0fc4b 100644 --- a/client/cli/src/lib.rs +++ b/client/cli/src/lib.rs @@ -18,7 +18,6 @@ #![warn(missing_docs)] -use clap::Parser; use sc_cli; use sc_service::{ config::{PrometheusConfig, TelemetryEndpoints}, @@ -29,20 +28,21 @@ use std::{ io::{self, Write}, net::SocketAddr, }; +use structopt::StructOpt; /// The `purge-chain` command used to remove the whole chain: the parachain and the relay chain. -#[derive(Debug, Parser)] +#[derive(Debug, StructOpt)] pub struct PurgeChainCmd { /// The base struct of the purge-chain command. - #[clap(flatten)] + #[structopt(flatten)] pub base: sc_cli::PurgeChainCmd, /// Only delete the para chain database - #[clap(long, aliases = &["para"])] + #[structopt(long, aliases = &["para"])] pub parachain: bool, /// Only delete the relay chain database - #[clap(long, aliases = &["relay"])] + #[structopt(long, aliases = &["relay"])] pub relaychain: bool, } @@ -120,16 +120,16 @@ impl sc_cli::CliConfiguration for PurgeChainCmd { } /// The `run` command used to run a node. -#[derive(Debug, Parser)] +#[derive(Debug, StructOpt)] pub struct RunCmd { /// The cumulus RunCmd inherents from sc_cli's - #[clap(flatten)] + #[structopt(flatten)] pub base: sc_cli::RunCmd, /// Run node as collator. /// /// Note that this is the same as running with `--validator`. - #[clap(long, conflicts_with = "validator")] + #[structopt(long, conflicts_with = "validator")] pub collator: bool, } diff --git a/pallets/parachain-system/src/validate_block/implementation.rs b/pallets/parachain-system/src/validate_block/implementation.rs index 4aac6d8778..b0e34758a1 100644 --- a/pallets/parachain-system/src/validate_block/implementation.rs +++ b/pallets/parachain-system/src/validate_block/implementation.rs @@ -221,8 +221,8 @@ fn host_storage_clear(key: &[u8]) { with_externalities(|ext| ext.place_storage(key.to_vec(), None)) } -fn host_storage_root(version: StateVersion) -> Vec { - with_externalities(|ext| ext.storage_root(version)) +fn host_storage_root() -> Vec { + with_externalities(|ext| ext.storage_root(StateVersion::V0)) } fn host_storage_clear_prefix(prefix: &[u8], limit: Option) -> KillStorageResult { @@ -327,9 +327,9 @@ fn host_default_child_storage_clear_prefix( }) } -fn host_default_child_storage_root(storage_key: &[u8], version: StateVersion) -> Vec { +fn host_default_child_storage_root(storage_key: &[u8]) -> Vec { let child_info = ChildInfo::new_default(storage_key); - with_externalities(|ext| ext.child_storage_root(&child_info, version)) + with_externalities(|ext| ext.child_storage_root(&child_info, StateVersion::V0)) } fn host_default_child_storage_next_key(storage_key: &[u8], key: &[u8]) -> Option> { diff --git a/pallets/xcmp-queue/src/mock.rs b/pallets/xcmp-queue/src/mock.rs index b783ddf11f..f65343258a 100644 --- a/pallets/xcmp-queue/src/mock.rs +++ b/pallets/xcmp-queue/src/mock.rs @@ -26,7 +26,7 @@ use sp_runtime::{ }; use xcm::prelude::*; use xcm_builder::{ - CurrencyAdapter, FixedWeightBounds, IsConcrete, LocationInverter, NativeAsset, ParentIsPreset, + CurrencyAdapter, FixedWeightBounds, IsConcrete, LocationInverter, NativeAsset, ParentIsDefault, }; use xcm_executor::traits::ConvertOrigin; @@ -132,7 +132,7 @@ pub type LocalAssetTransactor = CurrencyAdapter< (), >; -pub type LocationToAccountId = (ParentIsPreset,); +pub type LocationToAccountId = (ParentIsDefault,); pub struct XcmConfig; impl xcm_executor::Config for XcmConfig { diff --git a/parachain-template/node/Cargo.toml b/parachain-template/node/Cargo.toml index 176905a235..f61cc1efc1 100644 --- a/parachain-template/node/Cargo.toml +++ b/parachain-template/node/Cargo.toml @@ -21,13 +21,13 @@ path = "src/main.rs" [features] runtime-benchmarks = ["parachain-template-runtime/runtime-benchmarks"] -try-runtime = ["parachain-template-runtime/try-runtime"] +try-runtime = [ "parachain-template-runtime/try-runtime" ] [dependencies] -clap = { version = "3.0", features = ["derive"] } derive_more = "0.99.2" log = "0.4.14" codec = { package = "parity-scale-codec", version = "2.0.0" } +structopt = "0.3.8" serde = { version = "1.0.132", features = ["derive"] } hex-literal = "0.3.1" diff --git a/parachain-template/node/src/cli.rs b/parachain-template/node/src/cli.rs index a7e8934b78..53040d7c58 100644 --- a/parachain-template/node/src/cli.rs +++ b/parachain-template/node/src/cli.rs @@ -1,16 +1,16 @@ use crate::chain_spec; -use clap::{AppSettings, Parser}; use std::path::PathBuf; +use structopt::StructOpt; /// Sub-commands supported by the collator. -#[derive(Debug, clap::Subcommand)] +#[derive(Debug, StructOpt)] pub enum Subcommand { /// Export the genesis state of the parachain. - #[clap(name = "export-genesis-state")] + #[structopt(name = "export-genesis-state")] ExportGenesisState(ExportGenesisStateCommand), /// Export the genesis wasm of the parachain. - #[clap(name = "export-genesis-wasm")] + #[structopt(name = "export-genesis-wasm")] ExportGenesisWasm(ExportGenesisWasmCommand), /// Build a chain specification. @@ -35,7 +35,7 @@ pub enum Subcommand { Revert(sc_cli::RevertCmd), /// The custom benchmark subcommmand benchmarking runtime pallets. - #[clap(name = "benchmark", about = "Benchmark runtime pallets.")] + #[structopt(name = "benchmark", about = "Benchmark runtime pallets.")] Benchmark(frame_benchmarking_cli::BenchmarkCmd), /// Try some testing command against a specified runtime state. @@ -43,52 +43,52 @@ pub enum Subcommand { } /// Command for exporting the genesis state of the parachain -#[derive(Debug, Parser)] +#[derive(Debug, StructOpt)] pub struct ExportGenesisStateCommand { /// Output file name or stdout if unspecified. - #[clap(parse(from_os_str))] + #[structopt(parse(from_os_str))] pub output: Option, /// Write output in binary. Default is to write in hex. - #[clap(short, long)] + #[structopt(short, long)] pub raw: bool, /// The name of the chain for that the genesis state should be exported. - #[clap(long)] + #[structopt(long)] pub chain: Option, } /// Command for exporting the genesis wasm file. -#[derive(Debug, Parser)] +#[derive(Debug, StructOpt)] pub struct ExportGenesisWasmCommand { /// Output file name or stdout if unspecified. - #[clap(parse(from_os_str))] + #[structopt(parse(from_os_str))] pub output: Option, /// Write output in binary. Default is to write in hex. - #[clap(short, long)] + #[structopt(short, long)] pub raw: bool, /// The name of the chain for that the genesis wasm file should be exported. - #[clap(long)] + #[structopt(long)] pub chain: Option, } -#[derive(Debug, Parser)] -#[clap(setting( - AppSettings::PropagateVersion | - AppSettings::ArgsNegateSubcommands | - AppSettings::SubcommandsNegateReqs, -))] +#[derive(Debug, StructOpt)] +#[structopt(settings = &[ + structopt::clap::AppSettings::GlobalVersion, + structopt::clap::AppSettings::ArgsNegateSubcommands, + structopt::clap::AppSettings::SubcommandsNegateReqs, +])] pub struct Cli { - #[clap(subcommand)] + #[structopt(subcommand)] pub subcommand: Option, - #[clap(flatten)] + #[structopt(flatten)] pub run: cumulus_client_cli::RunCmd, /// Relay chain arguments - #[clap(raw = true)] + #[structopt(raw = true)] pub relay_chain_args: Vec, } @@ -113,6 +113,6 @@ impl RelayChainCli { let extension = chain_spec::Extensions::try_get(&*para_config.chain_spec); let chain_id = extension.map(|e| e.relay_chain.clone()); let base_path = para_config.base_path.as_ref().map(|x| x.path().join("polkadot")); - Self { base_path, chain_id, base: polkadot_cli::RunCmd::parse_from(relay_chain_args) } + Self { base_path, chain_id, base: polkadot_cli::RunCmd::from_iter(relay_chain_args) } } } diff --git a/parachain-template/runtime/src/lib.rs b/parachain-template/runtime/src/lib.rs index c09fde55b8..4adb2a3cbc 100644 --- a/parachain-template/runtime/src/lib.rs +++ b/parachain-template/runtime/src/lib.rs @@ -50,7 +50,7 @@ use polkadot_runtime_common::{BlockHashCount, RocksDbWeight, SlowAdjustingFeeUpd use xcm::latest::prelude::*; use xcm_builder::{ AccountId32Aliases, AllowTopLevelPaidExecutionFrom, AllowUnpaidExecutionFrom, CurrencyAdapter, - EnsureXcmOrigin, FixedWeightBounds, IsConcrete, LocationInverter, NativeAsset, ParentIsPreset, + EnsureXcmOrigin, FixedWeightBounds, IsConcrete, LocationInverter, NativeAsset, ParentIsDefault, RelayChainAsNative, SiblingParachainAsNative, SiblingParachainConvertsVia, SignedAccountId32AsNative, SignedToAccountId32, SovereignSignedViaLocation, TakeWeightCredit, UsingComponents, @@ -179,8 +179,8 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { spec_version: 1, impl_version: 0, apis: RUNTIME_API_VERSIONS, - transaction_version: 1, - state_version: 1, + transaction_version: 0, + state_version: 0, }; /// This determines the average expected block time that we are targeting. @@ -395,8 +395,8 @@ parameter_types! { /// when determining ownership of accounts for asset transacting and when attempting to use XCM /// `Transact` in order to determine the dispatch Origin. pub type LocationToAccountId = ( - // The parent (Relay-chain) origin converts to the parent `AccountId`. - ParentIsPreset, + // The parent (Relay-chain) origin converts to the default `AccountId`. + ParentIsDefault, // Sibling parachain origins convert to AccountId via the `ParaId::into`. SiblingParachainConvertsVia, // Straight up local `AccountId32` origins just alias directly to `AccountId`. diff --git a/polkadot-parachains/Cargo.toml b/polkadot-parachains/Cargo.toml index 4b68f0bb7e..a604b461c7 100644 --- a/polkadot-parachains/Cargo.toml +++ b/polkadot-parachains/Cargo.toml @@ -10,10 +10,10 @@ name = "polkadot-collator" path = "src/main.rs" [dependencies] -clap = { version = "3.0", features = ["derive"] } futures = { version = "0.3.1", features = ["compat"] } log = "0.4.8" codec = { package = "parity-scale-codec", version = "2.3.0" } +structopt = "0.3.3" serde = { version = "1.0.132", features = ["derive"] } hex-literal = "0.2.1" async-trait = "0.1.42" diff --git a/polkadot-parachains/rococo-parachain/src/lib.rs b/polkadot-parachains/rococo-parachain/src/lib.rs index d84e2f891f..b7765f2419 100644 --- a/polkadot-parachains/rococo-parachain/src/lib.rs +++ b/polkadot-parachains/rococo-parachain/src/lib.rs @@ -73,7 +73,7 @@ use xcm::latest::prelude::*; use xcm_builder::{ AccountId32Aliases, AllowTopLevelPaidExecutionFrom, AllowUnpaidExecutionFrom, CurrencyAdapter, EnsureXcmOrigin, FixedWeightBounds, IsConcrete, LocationInverter, NativeAsset, - ParentAsSuperuser, ParentIsPreset, RelayChainAsNative, SiblingParachainAsNative, + ParentAsSuperuser, ParentIsDefault, RelayChainAsNative, SiblingParachainAsNative, SiblingParachainConvertsVia, SignedAccountId32AsNative, SignedToAccountId32, SovereignSignedViaLocation, TakeWeightCredit, UsingComponents, }; @@ -283,8 +283,8 @@ parameter_types! { /// when determining ownership of accounts for asset transacting and when attempting to use XCM /// `Transact` in order to determine the dispatch Origin. pub type LocationToAccountId = ( - // The parent (Relay-chain) origin converts to the parent `AccountId`. - ParentIsPreset, + // The parent (Relay-chain) origin converts to the default `AccountId`. + ParentIsDefault, // Sibling parachain origins convert to AccountId via the `ParaId::into`. SiblingParachainConvertsVia, // Straight up local `AccountId32` origins just alias directly to `AccountId`. diff --git a/polkadot-parachains/shell/src/lib.rs b/polkadot-parachains/shell/src/lib.rs index da8bd54679..a00ef0c430 100644 --- a/polkadot-parachains/shell/src/lib.rs +++ b/polkadot-parachains/shell/src/lib.rs @@ -57,7 +57,7 @@ pub use sp_runtime::{Perbill, Permill}; use xcm::latest::prelude::*; use xcm_builder::{ AllowUnpaidExecutionFrom, FixedWeightBounds, LocationInverter, ParentAsSuperuser, - ParentIsPreset, SovereignSignedViaLocation, + ParentIsDefault, SovereignSignedViaLocation, }; use xcm_executor::{Config, XcmExecutor}; @@ -186,7 +186,7 @@ pub type XcmOriginToTransactDispatchOrigin = ( // Sovereign account converter; this attempts to derive an `AccountId` from the origin location // using `LocationToAccountId` and then turn that into the usual `Signed` origin. Useful for // foreign chains who want to have a local sovereign account on this chain which they control. - SovereignSignedViaLocation, Origin>, + SovereignSignedViaLocation, Origin>, // Superuser converter for the Relay-chain (Parent) location. This will allow it to issue a // transaction from the Root origin. ParentAsSuperuser, diff --git a/polkadot-parachains/src/cli.rs b/polkadot-parachains/src/cli.rs index 63356ab654..900335fb94 100644 --- a/polkadot-parachains/src/cli.rs +++ b/polkadot-parachains/src/cli.rs @@ -15,19 +15,19 @@ // along with Cumulus. If not, see . use crate::chain_spec; -use clap::{AppSettings, Parser}; use sc_cli; use std::path::PathBuf; +use structopt::StructOpt; /// Sub-commands supported by the collator. -#[derive(Debug, clap::Subcommand)] +#[derive(Debug, StructOpt)] pub enum Subcommand { /// Export the genesis state of the parachain. - #[clap(name = "export-genesis-state")] + #[structopt(name = "export-genesis-state")] ExportGenesisState(ExportGenesisStateCommand), /// Export the genesis wasm of the parachain. - #[clap(name = "export-genesis-wasm")] + #[structopt(name = "export-genesis-wasm")] ExportGenesisWasm(ExportGenesisWasmCommand), /// Build a chain specification. @@ -52,70 +52,69 @@ pub enum Subcommand { Revert(sc_cli::RevertCmd), /// The custom benchmark subcommmand benchmarking runtime pallets. - #[clap(name = "benchmark", about = "Benchmark runtime pallets.")] + #[structopt(name = "benchmark", about = "Benchmark runtime pallets.")] Benchmark(frame_benchmarking_cli::BenchmarkCmd), /// Try some testing command against a specified runtime state. TryRuntime(try_runtime_cli::TryRuntimeCmd), /// Key management CLI utilities - #[clap(subcommand)] Key(sc_cli::KeySubcommand), } /// Command for exporting the genesis state of the parachain -#[derive(Debug, Parser)] +#[derive(Debug, StructOpt)] pub struct ExportGenesisStateCommand { /// Output file name or stdout if unspecified. - #[clap(parse(from_os_str))] + #[structopt(parse(from_os_str))] pub output: Option, /// Id of the parachain this state is for. /// /// Default: 100 - #[clap(long)] + #[structopt(long)] pub parachain_id: Option, /// Write output in binary. Default is to write in hex. - #[clap(short, long)] + #[structopt(short, long)] pub raw: bool, /// The name of the chain for that the genesis state should be exported. - #[clap(long)] + #[structopt(long)] pub chain: Option, } /// Command for exporting the genesis wasm file. -#[derive(Debug, Parser)] +#[derive(Debug, StructOpt)] pub struct ExportGenesisWasmCommand { /// Output file name or stdout if unspecified. - #[clap(parse(from_os_str))] + #[structopt(parse(from_os_str))] pub output: Option, /// Write output in binary. Default is to write in hex. - #[clap(short, long)] + #[structopt(short, long)] pub raw: bool, /// The name of the chain for that the genesis wasm file should be exported. - #[clap(long)] + #[structopt(long)] pub chain: Option, } -#[derive(Debug, Parser)] -#[clap(setting( - AppSettings::PropagateVersion | - AppSettings::ArgsNegateSubcommands | - AppSettings::SubcommandsNegateReqs -))] +#[derive(Debug, StructOpt)] +#[structopt(settings = &[ + structopt::clap::AppSettings::GlobalVersion, + structopt::clap::AppSettings::ArgsNegateSubcommands, + structopt::clap::AppSettings::SubcommandsNegateReqs, +])] pub struct Cli { - #[clap(subcommand)] + #[structopt(subcommand)] pub subcommand: Option, - #[clap(flatten)] + #[structopt(flatten)] pub run: cumulus_client_cli::RunCmd, /// Relay chain arguments - #[clap(raw = true)] + #[structopt(raw = true)] pub relaychain_args: Vec, } @@ -140,6 +139,6 @@ impl RelayChainCli { let extension = chain_spec::Extensions::try_get(&*para_config.chain_spec); let chain_id = extension.map(|e| e.relay_chain.clone()); let base_path = para_config.base_path.as_ref().map(|x| x.path().join("polkadot")); - Self { base_path, chain_id, base: polkadot_cli::RunCmd::parse_from(relay_chain_args) } + Self { base_path, chain_id, base: polkadot_cli::RunCmd::from_iter(relay_chain_args) } } } diff --git a/polkadot-parachains/statemine/src/lib.rs b/polkadot-parachains/statemine/src/lib.rs index 0a61bd839a..5f52e29b9e 100644 --- a/polkadot-parachains/statemine/src/lib.rs +++ b/polkadot-parachains/statemine/src/lib.rs @@ -73,8 +73,8 @@ use xcm_builder::{ AccountId32Aliases, AllowKnownQueryResponses, AllowSubscriptionsFrom, AllowTopLevelPaidExecutionFrom, AllowUnpaidExecutionFrom, AsPrefixedGeneralIndex, ConvertedConcreteAssetId, CurrencyAdapter, EnsureXcmOrigin, FixedWeightBounds, - FungiblesAdapter, IsConcrete, LocationInverter, NativeAsset, ParentAsSuperuser, ParentIsPreset, - RelayChainAsNative, SiblingParachainAsNative, SiblingParachainConvertsVia, + FungiblesAdapter, IsConcrete, LocationInverter, NativeAsset, ParentAsSuperuser, + ParentIsDefault, RelayChainAsNative, SiblingParachainAsNative, SiblingParachainConvertsVia, SignedAccountId32AsNative, SignedToAccountId32, SovereignSignedViaLocation, TakeWeightCredit, UsingComponents, }; @@ -443,8 +443,8 @@ parameter_types! { /// when determining ownership of accounts for asset transacting and when attempting to use XCM /// `Transact` in order to determine the dispatch Origin. pub type LocationToAccountId = ( - // The parent (Relay-chain) origin converts to the parent `AccountId`. - ParentIsPreset, + // The parent (Relay-chain) origin converts to the default `AccountId`. + ParentIsDefault, // Sibling parachain origins convert to AccountId via the `ParaId::into`. SiblingParachainConvertsVia, // Straight up local `AccountId32` origins just alias directly to `AccountId`. diff --git a/polkadot-parachains/statemint/src/lib.rs b/polkadot-parachains/statemint/src/lib.rs index 336645d802..276a4184b8 100644 --- a/polkadot-parachains/statemint/src/lib.rs +++ b/polkadot-parachains/statemint/src/lib.rs @@ -74,8 +74,8 @@ use xcm_builder::{ AccountId32Aliases, AllowKnownQueryResponses, AllowSubscriptionsFrom, AllowTopLevelPaidExecutionFrom, AllowUnpaidExecutionFrom, AsPrefixedGeneralIndex, ConvertedConcreteAssetId, CurrencyAdapter, EnsureXcmOrigin, FixedWeightBounds, - FungiblesAdapter, IsConcrete, LocationInverter, NativeAsset, ParentAsSuperuser, ParentIsPreset, - RelayChainAsNative, SiblingParachainAsNative, SiblingParachainConvertsVia, + FungiblesAdapter, IsConcrete, LocationInverter, NativeAsset, ParentAsSuperuser, + ParentIsDefault, RelayChainAsNative, SiblingParachainAsNative, SiblingParachainConvertsVia, SignedAccountId32AsNative, SignedToAccountId32, SovereignSignedViaLocation, TakeWeightCredit, UsingComponents, }; @@ -456,8 +456,8 @@ parameter_types! { /// when determining ownership of accounts for asset transacting and when attempting to use XCM /// `Transact` in order to determine the dispatch Origin. pub type LocationToAccountId = ( - // The parent (Relay-chain) origin converts to the parent `AccountId`. - ParentIsPreset, + // The parent (Relay-chain) origin converts to the default `AccountId`. + ParentIsDefault, // Sibling parachain origins convert to AccountId via the `ParaId::into`. SiblingParachainConvertsVia, // Straight up local `AccountId32` origins just alias directly to `AccountId`. diff --git a/polkadot-parachains/westmint/src/lib.rs b/polkadot-parachains/westmint/src/lib.rs index c7c0c252eb..cb418895f5 100644 --- a/polkadot-parachains/westmint/src/lib.rs +++ b/polkadot-parachains/westmint/src/lib.rs @@ -73,8 +73,8 @@ use xcm_builder::{ AccountId32Aliases, AllowKnownQueryResponses, AllowSubscriptionsFrom, AllowTopLevelPaidExecutionFrom, AllowUnpaidExecutionFrom, AsPrefixedGeneralIndex, ConvertedConcreteAssetId, CurrencyAdapter, EnsureXcmOrigin, FixedWeightBounds, - FungiblesAdapter, IsConcrete, LocationInverter, NativeAsset, ParentAsSuperuser, ParentIsPreset, - RelayChainAsNative, SiblingParachainAsNative, SiblingParachainConvertsVia, + FungiblesAdapter, IsConcrete, LocationInverter, NativeAsset, ParentAsSuperuser, + ParentIsDefault, RelayChainAsNative, SiblingParachainAsNative, SiblingParachainConvertsVia, SignedAccountId32AsNative, SignedToAccountId32, SovereignSignedViaLocation, TakeWeightCredit, UsingComponents, }; @@ -440,8 +440,8 @@ parameter_types! { /// when determining ownership of accounts for asset transacting and when attempting to use XCM /// `Transact` in order to determine the dispatch Origin. pub type LocationToAccountId = ( - // The parent (Relay-chain) origin converts to the parent `AccountId`. - ParentIsPreset, + // The parent (Relay-chain) origin converts to the default `AccountId`. + ParentIsDefault, // Sibling parachain origins convert to AccountId via the `ParaId::into`. SiblingParachainConvertsVia, // Straight up local `AccountId32` origins just alias directly to `AccountId`. diff --git a/test/runtime/src/lib.rs b/test/runtime/src/lib.rs index 5685807120..a8c82355ba 100644 --- a/test/runtime/src/lib.rs +++ b/test/runtime/src/lib.rs @@ -94,7 +94,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { impl_version: 1, apis: RUNTIME_API_VERSIONS, transaction_version: 1, - state_version: 1, + state_version: 0, }; #[cfg(feature = "increment-spec-version")] @@ -108,7 +108,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { impl_version: 1, apis: RUNTIME_API_VERSIONS, transaction_version: 1, - state_version: 1, + state_version: 0, }; pub const MILLISECS_PER_BLOCK: u64 = 12000; diff --git a/test/service/src/genesis.rs b/test/service/src/genesis.rs index cf46d11af7..0af0357cfe 100644 --- a/test/service/src/genesis.rs +++ b/test/service/src/genesis.rs @@ -25,7 +25,7 @@ use sp_runtime::traits::Block as BlockT; pub fn initial_head_data(para_id: ParaId) -> HeadData { let spec = Box::new(crate::chain_spec::get_chain_spec(para_id)); let block: Block = - generate_genesis_block(&(spec as Box<_>), sp_runtime::StateVersion::V1).unwrap(); + generate_genesis_block(&(spec as Box<_>), sp_runtime::StateVersion::V0).unwrap(); let genesis_state = block.header().encode(); genesis_state.into() }