diff --git a/Cargo.lock b/Cargo.lock index e9756cfd539e..22c14cc8b38a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1261,7 +1261,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "fork-tree" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "parity-scale-codec", ] @@ -1269,7 +1269,7 @@ dependencies = [ [[package]] name = "frame-benchmarking" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "frame-support", "frame-system", @@ -1286,7 +1286,7 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "frame-benchmarking", "parity-scale-codec", @@ -1304,7 +1304,7 @@ dependencies = [ [[package]] name = "frame-executive" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "frame-support", "frame-system", @@ -1319,7 +1319,7 @@ dependencies = [ [[package]] name = "frame-metadata" version = "11.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "parity-scale-codec", "serde", @@ -1330,7 +1330,7 @@ dependencies = [ [[package]] name = "frame-support" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "bitmask", "frame-metadata", @@ -1355,7 +1355,7 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "frame-support-procedural-tools", "proc-macro2 1.0.18", @@ -1366,7 +1366,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate", @@ -1378,7 +1378,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "proc-macro2 1.0.18", "quote 1.0.7", @@ -1388,7 +1388,7 @@ dependencies = [ [[package]] name = "frame-system" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "frame-support", "impl-trait-for-tuples", @@ -1404,7 +1404,7 @@ dependencies = [ [[package]] name = "frame-system-benchmarking" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "frame-benchmarking", "frame-support", @@ -1418,7 +1418,7 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "parity-scale-codec", "sp-api", @@ -2347,7 +2347,7 @@ dependencies = [ [[package]] name = "kusama-runtime" -version = "0.8.13" +version = "0.8.14" dependencies = [ "bitvec", "frame-benchmarking", @@ -3375,7 +3375,7 @@ dependencies = [ [[package]] name = "pallet-authority-discovery" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "frame-support", "frame-system", @@ -3391,7 +3391,7 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "frame-support", "frame-system", @@ -3406,7 +3406,7 @@ dependencies = [ [[package]] name = "pallet-babe" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "frame-support", "frame-system", @@ -3428,7 +3428,7 @@ dependencies = [ [[package]] name = "pallet-balances" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "frame-benchmarking", "frame-support", @@ -3442,7 +3442,7 @@ dependencies = [ [[package]] name = "pallet-collective" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "frame-benchmarking", "frame-support", @@ -3458,7 +3458,7 @@ dependencies = [ [[package]] name = "pallet-democracy" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "frame-benchmarking", "frame-support", @@ -3473,7 +3473,7 @@ dependencies = [ [[package]] name = "pallet-elections-phragmen" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "frame-benchmarking", "frame-support", @@ -3488,7 +3488,7 @@ dependencies = [ [[package]] name = "pallet-finality-tracker" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "frame-support", "frame-system", @@ -3504,7 +3504,7 @@ dependencies = [ [[package]] name = "pallet-grandpa" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "frame-support", "frame-system", @@ -3524,7 +3524,7 @@ dependencies = [ [[package]] name = "pallet-identity" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "enumflags2", "frame-benchmarking", @@ -3540,7 +3540,7 @@ dependencies = [ [[package]] name = "pallet-im-online" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "frame-benchmarking", "frame-support", @@ -3560,7 +3560,7 @@ dependencies = [ [[package]] name = "pallet-indices" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "frame-support", "frame-system", @@ -3576,7 +3576,7 @@ dependencies = [ [[package]] name = "pallet-membership" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "frame-support", "frame-system", @@ -3590,7 +3590,7 @@ dependencies = [ [[package]] name = "pallet-multisig" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "frame-support", "frame-system", @@ -3605,7 +3605,7 @@ dependencies = [ [[package]] name = "pallet-nicks" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "frame-support", "frame-system", @@ -3619,7 +3619,7 @@ dependencies = [ [[package]] name = "pallet-offences" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "frame-support", "frame-system", @@ -3634,7 +3634,7 @@ dependencies = [ [[package]] name = "pallet-offences-benchmarking" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "frame-benchmarking", "frame-support", @@ -3655,7 +3655,7 @@ dependencies = [ [[package]] name = "pallet-proxy" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "frame-support", "frame-system", @@ -3670,7 +3670,7 @@ dependencies = [ [[package]] name = "pallet-randomness-collective-flip" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "frame-support", "frame-system", @@ -3683,7 +3683,7 @@ dependencies = [ [[package]] name = "pallet-recovery" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "enumflags2", "frame-support", @@ -3698,7 +3698,7 @@ dependencies = [ [[package]] name = "pallet-scheduler" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "frame-benchmarking", "frame-support", @@ -3713,7 +3713,7 @@ dependencies = [ [[package]] name = "pallet-session" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "frame-support", "frame-system", @@ -3733,7 +3733,7 @@ dependencies = [ [[package]] name = "pallet-session-benchmarking" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "frame-benchmarking", "frame-support", @@ -3747,7 +3747,7 @@ dependencies = [ [[package]] name = "pallet-society" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "frame-support", "frame-system", @@ -3761,7 +3761,7 @@ dependencies = [ [[package]] name = "pallet-staking" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "frame-benchmarking", "frame-support", @@ -3783,7 +3783,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-curve" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "proc-macro-crate", "proc-macro2 1.0.18", @@ -3794,7 +3794,7 @@ dependencies = [ [[package]] name = "pallet-sudo" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "frame-support", "frame-system", @@ -3808,7 +3808,7 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "frame-benchmarking", "frame-support", @@ -3826,7 +3826,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "frame-support", "frame-system", @@ -3841,7 +3841,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -3859,7 +3859,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "frame-support", "parity-scale-codec", @@ -3872,7 +3872,7 @@ dependencies = [ [[package]] name = "pallet-treasury" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "frame-benchmarking", "frame-support", @@ -3887,7 +3887,7 @@ dependencies = [ [[package]] name = "pallet-utility" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "frame-benchmarking", "frame-support", @@ -3903,7 +3903,7 @@ dependencies = [ [[package]] name = "pallet-vesting" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "enumflags2", "frame-benchmarking", @@ -4228,7 +4228,7 @@ checksum = "feb3b2b1033b8a60b4da6ee470325f887758c95d5320f52f9ce0df055a55940e" [[package]] name = "polkadot" -version = "0.8.13" +version = "0.8.14" dependencies = [ "assert_cmd", "futures 0.3.5", @@ -4242,7 +4242,7 @@ dependencies = [ [[package]] name = "polkadot-availability-store" -version = "0.8.13" +version = "0.8.14" dependencies = [ "derive_more 0.99.8", "exit-future", @@ -4268,7 +4268,7 @@ dependencies = [ [[package]] name = "polkadot-cli" -version = "0.8.13" +version = "0.8.14" dependencies = [ "frame-benchmarking-cli", "futures 0.3.5", @@ -4293,7 +4293,7 @@ dependencies = [ [[package]] name = "polkadot-collator" -version = "0.8.13" +version = "0.8.14" dependencies = [ "futures 0.3.5", "futures-timer 2.0.2", @@ -4331,7 +4331,7 @@ dependencies = [ [[package]] name = "polkadot-erasure-coding" -version = "0.8.13" +version = "0.8.14" dependencies = [ "derive_more 0.15.0", "parity-scale-codec", @@ -4343,7 +4343,7 @@ dependencies = [ [[package]] name = "polkadot-network" -version = "0.8.13" +version = "0.8.14" dependencies = [ "arrayvec 0.4.12", "bytes 0.5.4", @@ -4390,7 +4390,7 @@ dependencies = [ [[package]] name = "polkadot-network-test" -version = "0.8.13" +version = "0.8.14" dependencies = [ "futures 0.3.5", "log 0.4.8", @@ -4450,7 +4450,7 @@ dependencies = [ [[package]] name = "polkadot-parachain" -version = "0.8.13" +version = "0.8.14" dependencies = [ "derive_more 0.99.8", "log 0.4.8", @@ -4469,7 +4469,7 @@ dependencies = [ [[package]] name = "polkadot-primitives" -version = "0.8.13" +version = "0.8.14" dependencies = [ "bitvec", "frame-system", @@ -4492,7 +4492,7 @@ dependencies = [ [[package]] name = "polkadot-rpc" -version = "0.8.13" +version = "0.8.14" dependencies = [ "jsonrpc-core", "pallet-transaction-payment-rpc", @@ -4518,7 +4518,7 @@ dependencies = [ [[package]] name = "polkadot-runtime" -version = "0.8.13" +version = "0.8.14" dependencies = [ "bitvec", "frame-benchmarking", @@ -4592,7 +4592,7 @@ dependencies = [ [[package]] name = "polkadot-runtime-common" -version = "0.8.13" +version = "0.8.14" dependencies = [ "bitvec", "frame-benchmarking", @@ -4679,7 +4679,7 @@ dependencies = [ [[package]] name = "polkadot-service" -version = "0.8.13" +version = "0.8.14" dependencies = [ "env_logger", "frame-benchmarking", @@ -4732,6 +4732,7 @@ dependencies = [ "sp-runtime", "sp-session", "sp-transaction-pool", + "sp-trie", "substrate-prometheus-endpoint", "westend-runtime", ] @@ -4792,13 +4793,14 @@ dependencies = [ "sp-runtime", "sp-session", "sp-transaction-pool", + "sp-trie", "substrate-prometheus-endpoint", "westend-runtime", ] [[package]] name = "polkadot-statement-table" -version = "0.8.13" +version = "0.8.14" dependencies = [ "parity-scale-codec", "polkadot-primitives", @@ -4817,7 +4819,7 @@ dependencies = [ [[package]] name = "polkadot-test-runtime" -version = "0.8.13" +version = "0.8.14" dependencies = [ "bitvec", "frame-executive", @@ -4894,8 +4896,9 @@ dependencies = [ [[package]] name = "polkadot-validation" -version = "0.8.13" +version = "0.8.14" dependencies = [ + "ansi_term 0.12.1", "bitvec", "derive_more 0.14.1", "exit-future", @@ -5703,7 +5706,7 @@ dependencies = [ [[package]] name = "sc-authority-discovery" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "bytes 0.5.4", "derive_more 0.99.8", @@ -5730,7 +5733,7 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "futures 0.3.5", "futures-timer 3.0.2", @@ -5754,7 +5757,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -5763,6 +5766,7 @@ dependencies = [ "sp-blockchain", "sp-consensus", "sp-core", + "sp-inherents", "sp-runtime", "sp-state-machine", ] @@ -5770,7 +5774,7 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "impl-trait-for-tuples", "sc-chain-spec-derive", @@ -5786,7 +5790,7 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "proc-macro-crate", "proc-macro2 1.0.18", @@ -5797,7 +5801,7 @@ dependencies = [ [[package]] name = "sc-cli" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "ansi_term 0.12.1", "atty", @@ -5819,6 +5823,7 @@ dependencies = [ "sc-service", "sc-telemetry", "sc-tracing", + "serde", "serde_json", "sp-blockchain", "sp-core", @@ -5837,7 +5842,7 @@ dependencies = [ [[package]] name = "sc-client-api" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "derive_more 0.99.8", "fnv", @@ -5873,7 +5878,7 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "blake2-rfc", "hash-db", @@ -5902,7 +5907,7 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "sc-client-api", "sp-blockchain", @@ -5913,7 +5918,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "derive_more 0.99.8", "fork-tree", @@ -5955,7 +5960,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe-rpc" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "derive_more 0.99.8", "futures 0.3.5", @@ -5979,7 +5984,7 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "fork-tree", "parity-scale-codec", @@ -5992,7 +5997,7 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "futures 0.3.5", "futures-timer 3.0.2", @@ -6014,7 +6019,7 @@ dependencies = [ [[package]] name = "sc-consensus-uncles" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "log 0.4.8", "sc-client-api", @@ -6028,7 +6033,7 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "derive_more 0.99.8", "lazy_static", @@ -6056,7 +6061,7 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "derive_more 0.99.8", "log 0.4.8", @@ -6073,7 +6078,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "log 0.4.8", "parity-scale-codec", @@ -6088,7 +6093,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "cranelift-codegen", "cranelift-wasm", @@ -6109,7 +6114,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "assert_matches", "derive_more 0.99.8", @@ -6147,7 +6152,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa-rpc" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "derive_more 0.99.8", "finality-grandpa", @@ -6164,7 +6169,7 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "ansi_term 0.12.1", "futures 0.3.5", @@ -6183,7 +6188,7 @@ dependencies = [ [[package]] name = "sc-keystore" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "derive_more 0.99.8", "hex", @@ -6199,7 +6204,7 @@ dependencies = [ [[package]] name = "sc-light" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "hash-db", "lazy_static", @@ -6218,7 +6223,7 @@ dependencies = [ [[package]] name = "sc-network" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "bitflags", "bs58", @@ -6270,7 +6275,7 @@ dependencies = [ [[package]] name = "sc-network-gossip" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "futures 0.3.5", "futures-timer 3.0.2", @@ -6285,7 +6290,7 @@ dependencies = [ [[package]] name = "sc-network-test" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "env_logger", "futures 0.3.5", @@ -6312,7 +6317,7 @@ dependencies = [ [[package]] name = "sc-offchain" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "bytes 0.5.4", "fnv", @@ -6339,7 +6344,7 @@ dependencies = [ [[package]] name = "sc-peerset" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "futures 0.3.5", "libp2p", @@ -6352,7 +6357,7 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "log 0.4.8", "substrate-prometheus-endpoint", @@ -6361,7 +6366,7 @@ dependencies = [ [[package]] name = "sc-rpc" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "futures 0.3.5", "hash-db", @@ -6393,7 +6398,7 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "derive_more 0.99.8", "futures 0.3.5", @@ -6417,7 +6422,7 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "jsonrpc-core", "jsonrpc-http-server", @@ -6433,7 +6438,7 @@ dependencies = [ [[package]] name = "sc-service" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "derive_more 0.99.8", "directories", @@ -6496,7 +6501,7 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "log 0.4.8", "parity-scale-codec", @@ -6510,7 +6515,7 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "futures 0.3.5", "futures-timer 3.0.2", @@ -6531,7 +6536,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "erased-serde", "log 0.4.8", @@ -6548,7 +6553,7 @@ dependencies = [ [[package]] name = "sc-transaction-graph" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "derive_more 0.99.8", "futures 0.3.5", @@ -6568,7 +6573,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "derive_more 0.99.8", "futures 0.3.5", @@ -6661,6 +6666,15 @@ dependencies = [ "untrusted", ] +[[package]] +name = "secrecy" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9182278ed645df3477a9c27bfee0621c621aa16f6972635f7f795dae3d81070f" +dependencies = [ + "zeroize", +] + [[package]] name = "security-framework" version = "0.4.4" @@ -6945,7 +6959,7 @@ dependencies = [ [[package]] name = "sp-allocator" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "derive_more 0.99.8", "log 0.4.8", @@ -6957,7 +6971,7 @@ dependencies = [ [[package]] name = "sp-api" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "hash-db", "parity-scale-codec", @@ -6972,7 +6986,7 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "blake2-rfc", "proc-macro-crate", @@ -6984,7 +6998,7 @@ dependencies = [ [[package]] name = "sp-application-crypto" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "parity-scale-codec", "serde", @@ -6996,7 +7010,7 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "integer-sqrt", "num-traits 0.2.12", @@ -7009,7 +7023,7 @@ dependencies = [ [[package]] name = "sp-authority-discovery" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "parity-scale-codec", "sp-api", @@ -7021,7 +7035,7 @@ dependencies = [ [[package]] name = "sp-authorship" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "parity-scale-codec", "sp-inherents", @@ -7032,7 +7046,7 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "parity-scale-codec", "sp-api", @@ -7044,7 +7058,7 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "derive_more 0.99.8", "log 0.4.8", @@ -7060,7 +7074,7 @@ dependencies = [ [[package]] name = "sp-chain-spec" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "serde", "serde_json", @@ -7069,7 +7083,7 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "derive_more 0.99.8", "futures 0.3.5", @@ -7093,7 +7107,7 @@ dependencies = [ [[package]] name = "sp-consensus-aura" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "parity-scale-codec", "sp-api", @@ -7107,7 +7121,7 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "merlin", "parity-scale-codec", @@ -7125,7 +7139,7 @@ dependencies = [ [[package]] name = "sp-consensus-vrf" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "parity-scale-codec", "schnorrkel", @@ -7137,7 +7151,7 @@ dependencies = [ [[package]] name = "sp-core" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "base58", "blake2-rfc", @@ -7161,6 +7175,7 @@ dependencies = [ "rand 0.7.3", "regex", "schnorrkel", + "secrecy", "serde", "sha2", "sp-debug-derive", @@ -7179,7 +7194,7 @@ dependencies = [ [[package]] name = "sp-database" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "kvdb", "parking_lot 0.10.2", @@ -7188,7 +7203,7 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "proc-macro2 1.0.18", "quote 1.0.7", @@ -7198,7 +7213,7 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "environmental", "parity-scale-codec", @@ -7209,7 +7224,7 @@ dependencies = [ [[package]] name = "sp-finality-grandpa" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "finality-grandpa", "log 0.4.8", @@ -7225,7 +7240,7 @@ dependencies = [ [[package]] name = "sp-finality-tracker" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "parity-scale-codec", "sp-inherents", @@ -7235,7 +7250,7 @@ dependencies = [ [[package]] name = "sp-inherents" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "derive_more 0.99.8", "parity-scale-codec", @@ -7247,7 +7262,7 @@ dependencies = [ [[package]] name = "sp-io" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "futures 0.3.5", "hash-db", @@ -7268,7 +7283,7 @@ dependencies = [ [[package]] name = "sp-keyring" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "lazy_static", "sp-core", @@ -7279,7 +7294,7 @@ dependencies = [ [[package]] name = "sp-npos-elections" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "parity-scale-codec", "serde", @@ -7291,7 +7306,7 @@ dependencies = [ [[package]] name = "sp-npos-elections-compact" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "proc-macro-crate", "proc-macro2 1.0.18", @@ -7302,7 +7317,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "sp-api", "sp-core", @@ -7312,7 +7327,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "backtrace", "log 0.4.8", @@ -7321,7 +7336,7 @@ dependencies = [ [[package]] name = "sp-rpc" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "serde", "sp-core", @@ -7330,7 +7345,7 @@ dependencies = [ [[package]] name = "sp-runtime" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "either", "hash256-std-hasher", @@ -7352,7 +7367,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "parity-scale-codec", "primitive-types", @@ -7367,7 +7382,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "Inflector", "proc-macro-crate", @@ -7379,7 +7394,7 @@ dependencies = [ [[package]] name = "sp-serializer" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "serde", "serde_json", @@ -7388,7 +7403,7 @@ dependencies = [ [[package]] name = "sp-session" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "parity-scale-codec", "sp-api", @@ -7401,7 +7416,7 @@ dependencies = [ [[package]] name = "sp-staking" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "parity-scale-codec", "sp-runtime", @@ -7411,7 +7426,7 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "hash-db", "itertools 0.9.0", @@ -7432,12 +7447,12 @@ dependencies = [ [[package]] name = "sp-std" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" [[package]] name = "sp-storage" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "impl-serde 0.2.3", "ref-cast", @@ -7449,7 +7464,7 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -7463,7 +7478,7 @@ dependencies = [ [[package]] name = "sp-tracing" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "log 0.4.8", "rental", @@ -7473,7 +7488,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "derive_more 0.99.8", "futures 0.3.5", @@ -7489,7 +7504,7 @@ dependencies = [ [[package]] name = "sp-trie" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "hash-db", "memory-db", @@ -7503,7 +7518,7 @@ dependencies = [ [[package]] name = "sp-utils" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "futures 0.3.5", "futures-core", @@ -7515,7 +7530,7 @@ dependencies = [ [[package]] name = "sp-version" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "impl-serde 0.2.3", "parity-scale-codec", @@ -7527,7 +7542,7 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -7667,7 +7682,7 @@ dependencies = [ [[package]] name = "substrate-browser-utils" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "chrono", "clear_on_drop", @@ -7694,7 +7709,7 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "platforms", ] @@ -7702,7 +7717,7 @@ dependencies = [ [[package]] name = "substrate-frame-rpc-system" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "frame-system-rpc-runtime-api", "futures 0.3.5", @@ -7725,7 +7740,7 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "async-std", "derive_more 0.99.8", @@ -7739,7 +7754,7 @@ dependencies = [ [[package]] name = "substrate-test-client" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "futures 0.3.5", "hash-db", @@ -7761,7 +7776,7 @@ dependencies = [ [[package]] name = "substrate-test-runtime" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "cfg-if", "frame-executive", @@ -7801,7 +7816,7 @@ dependencies = [ [[package]] name = "substrate-test-runtime-client" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" dependencies = [ "futures 0.3.5", "parity-scale-codec", @@ -7822,7 +7837,7 @@ dependencies = [ [[package]] name = "substrate-wasm-builder-runner" version = "1.0.6" -source = "git+https://github.com/paritytech/substrate#e8f901868997be15635cba9b21a99b212009adc8" +source = "git+https://github.com/paritytech/substrate#cf2367f6d9a75feafe78f621f13ca60c75da9fc5" [[package]] name = "substrate-wasm-builder-runner" @@ -8048,7 +8063,7 @@ dependencies = [ [[package]] name = "test-parachain-adder" -version = "0.8.13" +version = "0.8.14" dependencies = [ "dlmalloc", "parity-scale-codec", @@ -8089,7 +8104,7 @@ dependencies = [ [[package]] name = "test-parachain-halt" -version = "0.8.13" +version = "0.8.14" dependencies = [ "substrate-wasm-builder-runner 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -9018,7 +9033,7 @@ dependencies = [ [[package]] name = "westend-runtime" -version = "0.8.13" +version = "0.8.14" dependencies = [ "bitvec", "frame-benchmarking", diff --git a/Cargo.toml b/Cargo.toml index f6632f77a14d..2723f0fa7901 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,7 +4,7 @@ path = "src/main.rs" [package] name = "polkadot" -version = "0.8.13" +version = "0.8.14" authors = ["Parity Technologies "] edition = "2018" diff --git a/availability-store/Cargo.toml b/availability-store/Cargo.toml index 503e897ceadb..369e184b3b36 100644 --- a/availability-store/Cargo.toml +++ b/availability-store/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "polkadot-availability-store" description = "Persistent database for parachain data" -version = "0.8.13" +version = "0.8.14" authors = ["Parity Technologies "] edition = "2018" diff --git a/cli/Cargo.toml b/cli/Cargo.toml index b395ccba9dc3..ed97adc85aee 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "polkadot-cli" -version = "0.8.13" +version = "0.8.14" authors = ["Parity Technologies "] description = "Polkadot Relay-chain Client Node" edition = "2018" diff --git a/cli/src/command.rs b/cli/src/command.rs index 7b437a2c352d..d518b94ccf8d 100644 --- a/cli/src/command.rs +++ b/cli/src/command.rs @@ -30,19 +30,19 @@ fn get_exec_name() -> Option { } impl SubstrateCli for Cli { - fn impl_name() -> &'static str { "Parity Polkadot" } + fn impl_name() -> String { "Parity Polkadot".into() } - fn impl_version() -> &'static str { env!("SUBSTRATE_CLI_IMPL_VERSION") } + fn impl_version() -> String { env!("SUBSTRATE_CLI_IMPL_VERSION").into() } - fn description() -> &'static str { env!("CARGO_PKG_DESCRIPTION") } + fn description() -> String { env!("CARGO_PKG_DESCRIPTION").into() } - fn author() -> &'static str { env!("CARGO_PKG_AUTHORS") } + fn author() -> String { env!("CARGO_PKG_AUTHORS").into() } - fn support_url() -> &'static str { "https://github.com/paritytech/polkadot/issues/new" } + fn support_url() -> String { "https://github.com/paritytech/polkadot/issues/new".into() } fn copyright_start_year() -> i32 { 2017 } - fn executable_name() -> &'static str { "polkadot" } + fn executable_name() -> String { "polkadot".into() } fn load_spec(&self, id: &str) -> std::result::Result, String> { let id = if id == "" { diff --git a/collator/Cargo.toml b/collator/Cargo.toml index 42e733419fef..c00b24d07288 100644 --- a/collator/Cargo.toml +++ b/collator/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "polkadot-collator" -version = "0.8.13" +version = "0.8.14" authors = ["Parity Technologies "] description = "Collator node implementation" edition = "2018" diff --git a/collator/src/lib.rs b/collator/src/lib.rs index 51f3255a745b..7e3e0bd3420c 100644 --- a/collator/src/lib.rs +++ b/collator/src/lib.rs @@ -373,12 +373,15 @@ fn build_collator_service( /// Async function that will run the collator node with the given `RelayChainContext` and `ParachainContext` /// built by the given `BuildParachainContext` and arguments to the underlying polkadot node. -pub async fn start_collator

( +pub fn start_collator

( build_parachain_context: P, para_id: ParaId, key: Arc, config: Configuration, -) -> Result<(), polkadot_service::Error> +) -> Result< + (Pin + Send>>, sc_service::TaskManager), + polkadot_service::Error +> where P: 'static + BuildParachainContext, P::ParachainContext: Send + 'static, @@ -400,14 +403,15 @@ where None, )?; let spawn_handle = task_manager.spawn_handle(); - build_collator_service( + let future = build_collator_service( spawn_handle, handlers, client, para_id, key, build_parachain_context - )?.await; + )?; + Ok((future.boxed(), task_manager)) } else if config.chain_spec.is_westend() { let (task_manager, client, handlers) = service::westend_new_full( config, @@ -418,14 +422,15 @@ where None, )?; let spawn_handle = task_manager.spawn_handle(); - build_collator_service( + let future = build_collator_service( spawn_handle, handlers, client, para_id, key, build_parachain_context - )?.await; + )?; + Ok((future.boxed(), task_manager)) } else { let (task_manager, client, handles) = service::polkadot_new_full( config, @@ -436,17 +441,16 @@ where None, )?; let spawn_handle = task_manager.spawn_handle(); - build_collator_service( + let future = build_collator_service( spawn_handle, handles, client, para_id, key, - build_parachain_context, - )?.await; + build_parachain_context + )?; + Ok((future.boxed(), task_manager)) } - - Ok(()) } #[cfg(not(feature = "service-rewr"))] @@ -506,7 +510,7 @@ mod tests { fn check_send(_: T) {} let cli = Cli::from_iter(&["-dev"]); - let task_executor = |_, _| unimplemented!(); + let task_executor = |_, _| {}; let config = cli.create_configuration(&cli.run.base, task_executor.into()).unwrap(); check_send(start_collator( diff --git a/erasure-coding/Cargo.toml b/erasure-coding/Cargo.toml index 9c49e33f407c..614017000daa 100644 --- a/erasure-coding/Cargo.toml +++ b/erasure-coding/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "polkadot-erasure-coding" -version = "0.8.13" +version = "0.8.14" authors = ["Parity Technologies "] edition = "2018" diff --git a/network/Cargo.toml b/network/Cargo.toml index 0735fec5907f..804cdcb3f11b 100644 --- a/network/Cargo.toml +++ b/network/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "polkadot-network" -version = "0.8.13" +version = "0.8.14" authors = ["Parity Technologies "] description = "Polkadot-specific networking protocol" edition = "2018" diff --git a/network/test/Cargo.toml b/network/test/Cargo.toml index ad8cafe3f453..5e14454e2cad 100644 --- a/network/test/Cargo.toml +++ b/network/test/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "polkadot-network-test" -version = "0.8.13" +version = "0.8.14" license = "GPL-3.0" authors = ["Parity Technologies "] edition = "2018" diff --git a/network/test/src/lib.rs b/network/test/src/lib.rs index f8afc4fb0cb4..14463d7a42a2 100644 --- a/network/test/src/lib.rs +++ b/network/test/src/lib.rs @@ -758,13 +758,13 @@ pub trait TestNetFactory: Sized { futures::executor::block_on(futures::future::poll_fn::<(), _>(|cx| self.poll_until_idle(cx))); } - /// Polls the testnet. Processes all the pending actions and returns `NotReady`. + /// Polls the testnet. Processes all the pending actions. fn poll(&mut self, cx: &mut FutureContext) { self.mut_peers(|peers| { for peer in peers { trace!(target: "sync", "-- Polling {}", peer.id()); - if let Poll::Ready(res) = Pin::new(&mut peer.network).poll(cx) { - res.unwrap(); + if let Poll::Ready(()) = peer.network.poll_unpin(cx) { + panic!("NetworkWorker has terminated unexpectedly.") } trace!(target: "sync", "-- Polling complete {}", peer.id()); diff --git a/node/service/Cargo.toml b/node/service/Cargo.toml index f1a56acfad95..1036cff494a2 100644 --- a/node/service/Cargo.toml +++ b/node/service/Cargo.toml @@ -31,6 +31,7 @@ sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "mas sc-executor = { git = "https://github.com/paritytech/substrate", branch = "master" } sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" } sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master" } consensus_common = { package = "sp-consensus", git = "https://github.com/paritytech/substrate", branch = "master" } grandpa = { package = "sc-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "master" } grandpa_primitives = { package = "sp-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "master" } diff --git a/node/service/src/lib.rs b/node/service/src/lib.rs index c798d3e9aa71..c478e007545a 100644 --- a/node/service/src/lib.rs +++ b/node/service/src/lib.rs @@ -34,10 +34,11 @@ use polkadot_subsystem::{ Subsystem, SubsystemContext, SpawnedSubsystem, messages::{CandidateValidationMessage, CandidateBackingMessage}, }; +use sp_trie::PrefixedMemoryDB; pub use service::{ Role, PruningMode, TransactionPoolOptions, Error, RuntimeGenesis, TFullClient, TLightClient, TFullBackend, TLightBackend, TFullCallExecutor, TLightCallExecutor, - Configuration, ChainSpec, ServiceBuilderCommand, ServiceComponents, TaskManager, + Configuration, ChainSpec, ServiceComponents, TaskManager, }; pub use service::config::{DatabaseConfig, PrometheusConfig}; pub use sc_executor::NativeExecutionDispatch; @@ -576,18 +577,25 @@ macro_rules! new_light { } /// Builds a new object suitable for chain operations. -pub fn new_chain_ops(mut config: Configuration) - -> Result, ServiceError> +pub fn new_chain_ops(mut config: Configuration) -> Result< + ( + Arc>, + Arc>, + consensus_common::import_queue::BasicQueue>, + TaskManager, + ), + ServiceError +> where Runtime: ConstructRuntimeApi> + Send + Sync + 'static, Runtime::RuntimeApi: RuntimeApiCollection, Block>>, Dispatch: NativeExecutionDispatch + 'static, Extrinsic: RuntimeExtrinsic, - >::StateBackend: sp_api::StateBackend, { config.keystore = service::config::KeystoreConfig::InMemory; - Ok(new_full_start!(config, Runtime, Dispatch).0) + let (builder, _, _, _) = new_full_start!(config, Runtime, Dispatch); + Ok(builder.to_chain_ops_parts()) } /// Create a new Polkadot service for a full node. diff --git a/parachain/Cargo.toml b/parachain/Cargo.toml index fb1e1ce50351..2e0e0efff078 100644 --- a/parachain/Cargo.toml +++ b/parachain/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "polkadot-parachain" -version = "0.8.13" +version = "0.8.14" authors = ["Parity Technologies "] description = "Types and utilities for creating and working with parachains" edition = "2018" diff --git a/parachain/test-parachains/adder/Cargo.toml b/parachain/test-parachains/adder/Cargo.toml index 2cfb77566db6..1ec9e0a1196e 100644 --- a/parachain/test-parachains/adder/Cargo.toml +++ b/parachain/test-parachains/adder/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "test-parachain-adder" -version = "0.8.13" +version = "0.8.14" authors = ["Parity Technologies "] description = "Test parachain which adds to a number as its state transition" edition = "2018" diff --git a/parachain/test-parachains/adder/collator/src/main.rs b/parachain/test-parachains/adder/collator/src/main.rs index 326549fda713..42c3c824004a 100644 --- a/parachain/test-parachains/adder/collator/src/main.rs +++ b/parachain/test-parachains/adder/collator/src/main.rs @@ -28,7 +28,7 @@ use primitives::{ }; use collator::{ParachainContext, Network, BuildParachainContext, Cli, SubstrateCli}; use parking_lot::Mutex; -use futures::future::{Ready, ready, TryFutureExt}; +use futures::future::{Ready, ready, FutureExt}; const GENESIS: AdderHead = AdderHead { number: 0, @@ -135,12 +135,14 @@ fn main() -> Result<(), Box> { let cli = Cli::from_iter(&["-dev"]); let runner = cli.create_runner(&cli.run.base)?; runner.async_run(|config| { - collator::start_collator( + let (future, task_manager) = collator::start_collator( context, id, key, config, - ).map_err(|e| e.into()) + )?; + + Ok((future.map(Ok), task_manager)) })?; Ok(()) diff --git a/parachain/test-parachains/halt/Cargo.toml b/parachain/test-parachains/halt/Cargo.toml index b595b245d0da..93e36b4837f1 100644 --- a/parachain/test-parachains/halt/Cargo.toml +++ b/parachain/test-parachains/halt/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "test-parachain-halt" -version = "0.8.13" +version = "0.8.14" authors = ["Parity Technologies "] description = "Test parachain which executes forever" edition = "2018" diff --git a/primitives/Cargo.toml b/primitives/Cargo.toml index f3bc264c8cb4..c7eb22b32cfb 100644 --- a/primitives/Cargo.toml +++ b/primitives/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "polkadot-primitives" -version = "0.8.13" +version = "0.8.14" authors = ["Parity Technologies "] edition = "2018" diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml index ce2f6382b468..c92b706c0ecb 100644 --- a/rpc/Cargo.toml +++ b/rpc/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "polkadot-rpc" -version = "0.8.13" +version = "0.8.14" authors = ["Parity Technologies "] edition = "2018" diff --git a/runtime/common/Cargo.toml b/runtime/common/Cargo.toml index 2b31e989c898..58e20ce9c7fe 100644 --- a/runtime/common/Cargo.toml +++ b/runtime/common/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "polkadot-runtime-common" -version = "0.8.13" +version = "0.8.14" authors = ["Parity Technologies "] edition = "2018" diff --git a/runtime/common/src/parachains.rs b/runtime/common/src/parachains.rs index 36c3242c3a41..0c353a45f96c 100644 --- a/runtime/common/src/parachains.rs +++ b/runtime/common/src/parachains.rs @@ -333,7 +333,7 @@ pub trait Trait: CreateSignedTransaction> + attestations::Trait + ses } /// Origin for the parachains module. -#[derive(PartialEq, Eq, Clone)] +#[derive(PartialEq, Eq, Clone, Encode, Decode)] #[cfg_attr(feature = "std", derive(Debug))] pub enum Origin { /// It comes from a parachain. diff --git a/runtime/kusama/Cargo.toml b/runtime/kusama/Cargo.toml index dbe3934dd3ee..371d9fc5373e 100644 --- a/runtime/kusama/Cargo.toml +++ b/runtime/kusama/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "kusama-runtime" -version = "0.8.13" +version = "0.8.14" authors = ["Parity Technologies "] edition = "2018" build = "build.rs" diff --git a/runtime/kusama/src/lib.rs b/runtime/kusama/src/lib.rs index 17a539375870..f9ba963f0407 100644 --- a/runtime/kusama/src/lib.rs +++ b/runtime/kusama/src/lib.rs @@ -152,8 +152,10 @@ impl system::Trait for Runtime { impl scheduler::Trait for Runtime { type Event = Event; type Origin = Origin; + type PalletsOrigin = OriginCaller; type Call = Call; type MaximumWeight = MaximumBlockWeight; + type ScheduleOrigin = EnsureRoot; } parameter_types! { @@ -373,6 +375,7 @@ impl democracy::Trait for Runtime { type PreimageByteDeposit = PreimageByteDeposit; type Slash = Treasury; type Scheduler = Scheduler; + type PalletsOrigin = OriginCaller; type MaxVotes = MaxVotes; type OperationalPreimageOrigin = collective::EnsureMember; } @@ -891,8 +894,11 @@ impl proxy::Trait for Runtime { pub struct CustomOnRuntimeUpgrade; impl frame_support::traits::OnRuntimeUpgrade for CustomOnRuntimeUpgrade { fn on_runtime_upgrade() -> frame_support::weights::Weight { - treasury::Module::::migrate_retract_tip_for_tip_new(); - 500_000_000 + if scheduler::Module::::migrate_v1_to_t2() { + ::MaximumBlockWeight::get() + } else { + ::DbWeight::get().reads(1) + 500_000_000 + } } } diff --git a/runtime/polkadot/Cargo.toml b/runtime/polkadot/Cargo.toml index 96ec48d318e7..9df821f918b9 100644 --- a/runtime/polkadot/Cargo.toml +++ b/runtime/polkadot/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "polkadot-runtime" -version = "0.8.13" +version = "0.8.14" authors = ["Parity Technologies "] edition = "2018" build = "build.rs" diff --git a/runtime/polkadot/src/lib.rs b/runtime/polkadot/src/lib.rs index e71d38759cb3..cd63dfce0221 100644 --- a/runtime/polkadot/src/lib.rs +++ b/runtime/polkadot/src/lib.rs @@ -183,8 +183,10 @@ impl system::Trait for Runtime { impl scheduler::Trait for Runtime { type Event = Event; type Origin = Origin; + type PalletsOrigin = OriginCaller; type Call = Call; type MaximumWeight = MaximumBlockWeight; + type ScheduleOrigin = EnsureRoot; } parameter_types! { @@ -442,6 +444,7 @@ impl democracy::Trait for Runtime { type OperationalPreimageOrigin = collective::EnsureMember; type Slash = Treasury; type Scheduler = Scheduler; + type PalletsOrigin = OriginCaller; type MaxVotes = MaxVotes; } @@ -893,6 +896,17 @@ impl proxy::Trait for Runtime { type MaxProxies = MaxProxies; } +pub struct CustomOnRuntimeUpgrade; +impl frame_support::traits::OnRuntimeUpgrade for CustomOnRuntimeUpgrade { + fn on_runtime_upgrade() -> frame_support::weights::Weight { + if scheduler::Module::::migrate_v1_to_t2() { + ::MaximumBlockWeight::get() + } else { + ::DbWeight::get().reads(1) + } + } +} + construct_runtime! { pub enum Runtime where Block = Block, @@ -990,7 +1004,14 @@ pub type UncheckedExtrinsic = generic::UncheckedExtrinsic; /// Executive: handles dispatch to the various modules. -pub type Executive = executive::Executive, Runtime, AllModules>; +pub type Executive = executive::Executive< + Runtime, + Block, + system::ChainContext, + Runtime, + AllModules, + CustomOnRuntimeUpgrade +>; /// The payload being signed in transactions. pub type SignedPayload = generic::SignedPayload; diff --git a/runtime/test-runtime/Cargo.toml b/runtime/test-runtime/Cargo.toml index ba2f0f1a612d..e60473158eb8 100644 --- a/runtime/test-runtime/Cargo.toml +++ b/runtime/test-runtime/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "polkadot-test-runtime" -version = "0.8.13" +version = "0.8.14" authors = ["Parity Technologies "] edition = "2018" build = "build.rs" diff --git a/runtime/westend/Cargo.toml b/runtime/westend/Cargo.toml index 9e6af55afc08..0f00ede72307 100644 --- a/runtime/westend/Cargo.toml +++ b/runtime/westend/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "westend-runtime" -version = "0.8.13" +version = "0.8.14" authors = ["Parity Technologies "] edition = "2018" build = "build.rs" diff --git a/runtime/westend/src/constants.rs b/runtime/westend/src/constants.rs index 57250b6d9e59..ac25d621d856 100644 --- a/runtime/westend/src/constants.rs +++ b/runtime/westend/src/constants.rs @@ -24,7 +24,7 @@ pub mod currency { pub const MILLICENTS: Balance = CENTS / 1_000; pub const fn deposit(items: u32, bytes: u32) -> Balance { - items as Balance * 20 * DOLLARS + (bytes as Balance) * 100 * MILLICENTS + items as Balance * 1 * DOLLARS + (bytes as Balance) * 5 * MILLICENTS } } diff --git a/runtime/westend/src/lib.rs b/runtime/westend/src/lib.rs index 25d5e22e858b..3029c96d6ae0 100644 --- a/runtime/westend/src/lib.rs +++ b/runtime/westend/src/lib.rs @@ -58,6 +58,7 @@ use im_online::sr25519::AuthorityId as ImOnlineId; use authority_discovery_primitives::AuthorityId as AuthorityDiscoveryId; use transaction_payment_rpc_runtime_api::RuntimeDispatchInfo; use session::historical as session_historical; +use system::EnsureRoot; #[cfg(feature = "std")] pub use staking::StakerStatus; @@ -141,8 +142,10 @@ impl system::Trait for Runtime { impl scheduler::Trait for Runtime { type Event = Event; type Origin = Origin; + type PalletsOrigin = OriginCaller; type Call = Call; type MaximumWeight = MaximumBlockWeight; + type ScheduleOrigin = EnsureRoot; } parameter_types! { @@ -288,7 +291,7 @@ impl staking::Trait for Runtime { type BondingDuration = BondingDuration; type SlashDeferDuration = SlashDeferDuration; // A majority of the council can cancel the slash. - type SlashCancelOrigin = system::EnsureRoot; + type SlashCancelOrigin = EnsureRoot; type SessionInterface = Self; type RewardCurve = RewardCurve; type MaxNominatorRewardedPerValidator = MaxNominatorRewardedPerValidator; diff --git a/service/Cargo.toml b/service/Cargo.toml index 5eb47ec8875c..6a82aff1e15c 100644 --- a/service/Cargo.toml +++ b/service/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "polkadot-service" -version = "0.8.13" +version = "0.8.14" authors = ["Parity Technologies "] edition = "2018" @@ -31,6 +31,7 @@ sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "mas sc-executor = { git = "https://github.com/paritytech/substrate", branch = "master" } sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" } sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master" } consensus_common = { package = "sp-consensus", git = "https://github.com/paritytech/substrate", branch = "master" } grandpa = { package = "sc-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "master" } grandpa_primitives = { package = "sp-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "master" } diff --git a/service/src/lib.rs b/service/src/lib.rs index 5cf371ebec84..70d04df6301f 100644 --- a/service/src/lib.rs +++ b/service/src/lib.rs @@ -29,10 +29,11 @@ use service::{error::Error as ServiceError, ServiceBuilder}; use grandpa::{self, FinalityProofProvider as GrandpaFinalityProofProvider}; use sc_executor::native_executor_instance; use log::info; +use sp_trie::PrefixedMemoryDB; pub use service::{ Role, PruningMode, TransactionPoolOptions, Error, RuntimeGenesis, RpcHandlers, TFullClient, TLightClient, TFullBackend, TLightBackend, TFullCallExecutor, TLightCallExecutor, - Configuration, ChainSpec, ServiceBuilderCommand, ServiceComponents, TaskManager, + Configuration, ChainSpec, ServiceComponents, TaskManager, }; pub use service::config::{DatabaseConfig, PrometheusConfig}; pub use sc_executor::NativeExecutionDispatch; @@ -634,18 +635,25 @@ macro_rules! new_light { } /// Builds a new object suitable for chain operations. -pub fn new_chain_ops(mut config: Configuration) - -> Result, ServiceError> +pub fn new_chain_ops(mut config: Configuration) -> Result< + ( + Arc>, + Arc>, + consensus_common::import_queue::BasicQueue>, + TaskManager, + ), + ServiceError +> where Runtime: ConstructRuntimeApi> + Send + Sync + 'static, Runtime::RuntimeApi: RuntimeApiCollection, Block>>, Dispatch: NativeExecutionDispatch + 'static, Extrinsic: RuntimeExtrinsic, - >::StateBackend: sp_api::StateBackend, { config.keystore = service::config::KeystoreConfig::InMemory; - Ok(new_full_start!(config, Runtime, Dispatch).0) + let (builder, _, _, _) = new_full_start!(config, Runtime, Dispatch); + Ok(builder.to_chain_ops_parts()) } /// Create a new Polkadot service for a full node. diff --git a/statement-table/Cargo.toml b/statement-table/Cargo.toml index 831ae6cd4354..18ac58931c9d 100644 --- a/statement-table/Cargo.toml +++ b/statement-table/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "polkadot-statement-table" -version = "0.8.13" +version = "0.8.14" authors = ["Parity Technologies "] edition = "2018" diff --git a/validation/Cargo.toml b/validation/Cargo.toml index 42e417fef6f0..1b0db38d5560 100644 --- a/validation/Cargo.toml +++ b/validation/Cargo.toml @@ -1,10 +1,11 @@ [package] name = "polkadot-validation" -version = "0.8.13" +version = "0.8.14" authors = ["Parity Technologies "] edition = "2018" [dependencies] +ansi_term = "0.12.1" futures = "0.3.4" futures-timer = "2.0" parking_lot = "0.9.0" diff --git a/validation/src/validation_service/mod.rs b/validation/src/validation_service/mod.rs index 650950f24e6f..a67088ff503d 100644 --- a/validation/src/validation_service/mod.rs +++ b/validation/src/validation_service/mod.rs @@ -43,6 +43,7 @@ use sp_api::{ProvideRuntimeApi, ApiExt}; use runtime_primitives::traits::HashFor; use availability_store::Store as AvailabilityStore; +use ansi_term::Colour; use log::{warn, error, info, debug, trace}; use super::{Network, Collators, SharedTable, TableRouter}; @@ -373,12 +374,18 @@ impl ParachainValidationInstances where sign_with.as_ref().map(|k| k.public()), )?; - info!( - "Starting parachain attestation session on top of parent {:?}. Local parachain duty is {:?}", - parent_hash, - local_duty, - ); - + if let Some(ref duty) = local_duty { + info!( + "✍️ Starting parachain attestation session (parent: {}) with active duty {}", + parent_hash, + Colour::Red.bold().paint(format!("{:?}", duty)), + ); + } else { + debug!( + "✍️ Starting parachain attestation session (parent: {}). No local duty..", + parent_hash, + ); + } let active_parachains = self.client.runtime_api().active_parachains(&id)?; debug!(target: "validation", "Active parachains: {:?}", active_parachains);