From ee630db9433088aedf9e102fe14f274f8058c341 Mon Sep 17 00:00:00 2001 From: Gavin Wood Date: Mon, 19 Aug 2019 09:18:03 +0200 Subject: [PATCH] Runtime version affinity enabled in transactions. (#384) * Update to latest substrate * Update lock * Introduce tx version check * Move to release constants * fixes * More updates * More fixes --- polkadot/Cargo.lock | 157 ++++++++++++++++----------- polkadot/runtime/Cargo.toml | 8 +- polkadot/runtime/src/attestations.rs | 3 +- polkadot/runtime/src/claims.rs | 1 + polkadot/runtime/src/constants.rs | 8 +- polkadot/runtime/src/lib.rs | 15 ++- polkadot/runtime/src/parachains.rs | 5 +- polkadot/runtime/src/slots.rs | 1 + polkadot/service/src/chain_spec.rs | 8 +- 9 files changed, 130 insertions(+), 76 deletions(-) diff --git a/polkadot/Cargo.lock b/polkadot/Cargo.lock index 6d7d8ad7ef..07ec8fbe2e 100644 --- a/polkadot/Cargo.lock +++ b/polkadot/Cargo.lock @@ -766,7 +766,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "fork-tree" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7eb937e8ff7b7de2cd77a4116677e5e20605e25c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5364a422e6b29522c6b723e8b80dbae39d7b1352" dependencies = [ "parity-scale-codec 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2599,6 +2599,7 @@ dependencies = [ "serde_derive 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", "sr-io 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "sr-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", + "sr-staking-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "sr-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "sr-version 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "srml-authorship 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", @@ -2613,6 +2614,7 @@ dependencies = [ "srml-im-online 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "srml-indices 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "srml-membership 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", + "srml-offences 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "srml-session 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "srml-staking 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "srml-sudo 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", @@ -3376,7 +3378,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "sr-api-macros" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7eb937e8ff7b7de2cd77a4116677e5e20605e25c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5364a422e6b29522c6b723e8b80dbae39d7b1352" dependencies = [ "blake2-rfc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)", "proc-macro-crate 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3388,7 +3390,7 @@ dependencies = [ [[package]] name = "sr-io" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7eb937e8ff7b7de2cd77a4116677e5e20605e25c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5364a422e6b29522c6b723e8b80dbae39d7b1352" dependencies = [ "environmental 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "hash-db 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3405,7 +3407,7 @@ dependencies = [ [[package]] name = "sr-primitives" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7eb937e8ff7b7de2cd77a4116677e5e20605e25c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5364a422e6b29522c6b723e8b80dbae39d7b1352" dependencies = [ "integer-sqrt 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3420,10 +3422,20 @@ dependencies = [ "substrate-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", ] +[[package]] +name = "sr-staking-primitives" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5364a422e6b29522c6b723e8b80dbae39d7b1352" +dependencies = [ + "parity-scale-codec 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "sr-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", + "sr-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", +] + [[package]] name = "sr-std" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7eb937e8ff7b7de2cd77a4116677e5e20605e25c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5364a422e6b29522c6b723e8b80dbae39d7b1352" dependencies = [ "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -3431,7 +3443,7 @@ dependencies = [ [[package]] name = "sr-version" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7eb937e8ff7b7de2cd77a4116677e5e20605e25c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5364a422e6b29522c6b723e8b80dbae39d7b1352" dependencies = [ "impl-serde 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "parity-scale-codec 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3443,7 +3455,7 @@ dependencies = [ [[package]] name = "srml-authorship" version = "0.1.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7eb937e8ff7b7de2cd77a4116677e5e20605e25c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5364a422e6b29522c6b723e8b80dbae39d7b1352" dependencies = [ "parity-scale-codec 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", "sr-io 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", @@ -3458,13 +3470,14 @@ dependencies = [ [[package]] name = "srml-babe" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7eb937e8ff7b7de2cd77a4116677e5e20605e25c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5364a422e6b29522c6b723e8b80dbae39d7b1352" dependencies = [ "hex-literal 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "parity-scale-codec 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", "sr-io 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "sr-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", + "sr-staking-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "sr-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "srml-session 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "srml-support 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", @@ -3477,7 +3490,7 @@ dependencies = [ [[package]] name = "srml-balances" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7eb937e8ff7b7de2cd77a4116677e5e20605e25c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5364a422e6b29522c6b723e8b80dbae39d7b1352" dependencies = [ "parity-scale-codec 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", "safe-mix 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3492,7 +3505,7 @@ dependencies = [ [[package]] name = "srml-collective" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7eb937e8ff7b7de2cd77a4116677e5e20605e25c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5364a422e6b29522c6b723e8b80dbae39d7b1352" dependencies = [ "parity-scale-codec 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", "safe-mix 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3508,7 +3521,7 @@ dependencies = [ [[package]] name = "srml-democracy" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7eb937e8ff7b7de2cd77a4116677e5e20605e25c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5364a422e6b29522c6b723e8b80dbae39d7b1352" dependencies = [ "parity-scale-codec 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", "safe-mix 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3523,7 +3536,7 @@ dependencies = [ [[package]] name = "srml-elections" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7eb937e8ff7b7de2cd77a4116677e5e20605e25c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5364a422e6b29522c6b723e8b80dbae39d7b1352" dependencies = [ "parity-scale-codec 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", "safe-mix 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3539,7 +3552,7 @@ dependencies = [ [[package]] name = "srml-executive" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7eb937e8ff7b7de2cd77a4116677e5e20605e25c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5364a422e6b29522c6b723e8b80dbae39d7b1352" dependencies = [ "parity-scale-codec 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3553,7 +3566,7 @@ dependencies = [ [[package]] name = "srml-finality-tracker" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7eb937e8ff7b7de2cd77a4116677e5e20605e25c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5364a422e6b29522c6b723e8b80dbae39d7b1352" dependencies = [ "parity-scale-codec 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3567,12 +3580,13 @@ dependencies = [ [[package]] name = "srml-grandpa" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7eb937e8ff7b7de2cd77a4116677e5e20605e25c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5364a422e6b29522c6b723e8b80dbae39d7b1352" dependencies = [ "parity-scale-codec 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", "sr-io 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "sr-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", + "sr-staking-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "sr-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "srml-finality-tracker 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "srml-session 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", @@ -3585,12 +3599,13 @@ dependencies = [ [[package]] name = "srml-im-online" version = "0.1.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7eb937e8ff7b7de2cd77a4116677e5e20605e25c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5364a422e6b29522c6b723e8b80dbae39d7b1352" dependencies = [ "parity-scale-codec 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", "sr-io 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "sr-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", + "sr-staking-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "sr-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "srml-session 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "srml-support 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", @@ -3602,7 +3617,7 @@ dependencies = [ [[package]] name = "srml-indices" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7eb937e8ff7b7de2cd77a4116677e5e20605e25c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5364a422e6b29522c6b723e8b80dbae39d7b1352" dependencies = [ "parity-scale-codec 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", "safe-mix 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3619,7 +3634,7 @@ dependencies = [ [[package]] name = "srml-membership" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7eb937e8ff7b7de2cd77a4116677e5e20605e25c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5364a422e6b29522c6b723e8b80dbae39d7b1352" dependencies = [ "parity-scale-codec 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3633,7 +3648,7 @@ dependencies = [ [[package]] name = "srml-metadata" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7eb937e8ff7b7de2cd77a4116677e5e20605e25c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5364a422e6b29522c6b723e8b80dbae39d7b1352" dependencies = [ "parity-scale-codec 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3641,16 +3656,32 @@ dependencies = [ "substrate-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", ] +[[package]] +name = "srml-offences" +version = "1.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5364a422e6b29522c6b723e8b80dbae39d7b1352" +dependencies = [ + "parity-scale-codec 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", + "sr-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", + "sr-staking-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", + "sr-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", + "srml-balances 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", + "srml-support 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", + "srml-system 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", +] + [[package]] name = "srml-session" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7eb937e8ff7b7de2cd77a4116677e5e20605e25c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5364a422e6b29522c6b723e8b80dbae39d7b1352" dependencies = [ "parity-scale-codec 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", "safe-mix 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", "sr-io 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "sr-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", + "sr-staking-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "sr-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "srml-support 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "srml-system 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", @@ -3661,13 +3692,14 @@ dependencies = [ [[package]] name = "srml-staking" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7eb937e8ff7b7de2cd77a4116677e5e20605e25c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5364a422e6b29522c6b723e8b80dbae39d7b1352" dependencies = [ "parity-scale-codec 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", "safe-mix 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", "sr-io 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "sr-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", + "sr-staking-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "sr-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "srml-authorship 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "srml-session 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", @@ -3679,7 +3711,7 @@ dependencies = [ [[package]] name = "srml-sudo" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7eb937e8ff7b7de2cd77a4116677e5e20605e25c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5364a422e6b29522c6b723e8b80dbae39d7b1352" dependencies = [ "parity-scale-codec 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3694,7 +3726,7 @@ dependencies = [ [[package]] name = "srml-support" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7eb937e8ff7b7de2cd77a4116677e5e20605e25c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5364a422e6b29522c6b723e8b80dbae39d7b1352" dependencies = [ "bitmask 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", "once_cell 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3713,7 +3745,7 @@ dependencies = [ [[package]] name = "srml-support-procedural" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7eb937e8ff7b7de2cd77a4116677e5e20605e25c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5364a422e6b29522c6b723e8b80dbae39d7b1352" dependencies = [ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3725,7 +3757,7 @@ dependencies = [ [[package]] name = "srml-support-procedural-tools" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7eb937e8ff7b7de2cd77a4116677e5e20605e25c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5364a422e6b29522c6b723e8b80dbae39d7b1352" dependencies = [ "proc-macro-crate 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3737,7 +3769,7 @@ dependencies = [ [[package]] name = "srml-support-procedural-tools-derive" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7eb937e8ff7b7de2cd77a4116677e5e20605e25c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5364a422e6b29522c6b723e8b80dbae39d7b1352" dependencies = [ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3747,7 +3779,7 @@ dependencies = [ [[package]] name = "srml-system" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7eb937e8ff7b7de2cd77a4116677e5e20605e25c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5364a422e6b29522c6b723e8b80dbae39d7b1352" dependencies = [ "parity-scale-codec 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", "safe-mix 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3755,6 +3787,7 @@ dependencies = [ "sr-io 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "sr-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "sr-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", + "sr-version 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "srml-support 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "substrate-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", ] @@ -3762,7 +3795,7 @@ dependencies = [ [[package]] name = "srml-timestamp" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7eb937e8ff7b7de2cd77a4116677e5e20605e25c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5364a422e6b29522c6b723e8b80dbae39d7b1352" dependencies = [ "parity-scale-codec 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3776,7 +3809,7 @@ dependencies = [ [[package]] name = "srml-treasury" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7eb937e8ff7b7de2cd77a4116677e5e20605e25c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5364a422e6b29522c6b723e8b80dbae39d7b1352" dependencies = [ "parity-scale-codec 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3862,7 +3895,7 @@ dependencies = [ [[package]] name = "substrate-application-crypto" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7eb937e8ff7b7de2cd77a4116677e5e20605e25c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5364a422e6b29522c6b723e8b80dbae39d7b1352" dependencies = [ "parity-scale-codec 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3885,7 +3918,7 @@ dependencies = [ [[package]] name = "substrate-cli" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7eb937e8ff7b7de2cd77a4116677e5e20605e25c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5364a422e6b29522c6b723e8b80dbae39d7b1352" dependencies = [ "ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "app_dirs 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3920,7 +3953,7 @@ dependencies = [ [[package]] name = "substrate-client" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7eb937e8ff7b7de2cd77a4116677e5e20605e25c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5364a422e6b29522c6b723e8b80dbae39d7b1352" dependencies = [ "derive_more 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3948,7 +3981,7 @@ dependencies = [ [[package]] name = "substrate-client-db" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7eb937e8ff7b7de2cd77a4116677e5e20605e25c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5364a422e6b29522c6b723e8b80dbae39d7b1352" dependencies = [ "hash-db 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", "kvdb 0.1.0 (git+https://github.com/paritytech/parity-common?rev=b0317f649ab2c665b7987b8475878fc4d2e1f81d)", @@ -3971,7 +4004,7 @@ dependencies = [ [[package]] name = "substrate-consensus-babe" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7eb937e8ff7b7de2cd77a4116677e5e20605e25c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5364a422e6b29522c6b723e8b80dbae39d7b1352" dependencies = [ "fork-tree 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4006,7 +4039,7 @@ dependencies = [ [[package]] name = "substrate-consensus-babe-primitives" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7eb937e8ff7b7de2cd77a4116677e5e20605e25c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5364a422e6b29522c6b723e8b80dbae39d7b1352" dependencies = [ "parity-scale-codec 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", "schnorrkel 0.8.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4020,7 +4053,7 @@ dependencies = [ [[package]] name = "substrate-consensus-common" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7eb937e8ff7b7de2cd77a4116677e5e20605e25c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5364a422e6b29522c6b723e8b80dbae39d7b1352" dependencies = [ "derive_more 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)", "futures-preview 0.3.0-alpha.17 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4039,7 +4072,7 @@ dependencies = [ [[package]] name = "substrate-consensus-slots" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7eb937e8ff7b7de2cd77a4116677e5e20605e25c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5364a422e6b29522c6b723e8b80dbae39d7b1352" dependencies = [ "futures-preview 0.3.0-alpha.17 (registry+https://github.com/rust-lang/crates.io-index)", "futures-timer 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4057,7 +4090,7 @@ dependencies = [ [[package]] name = "substrate-consensus-uncles" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7eb937e8ff7b7de2cd77a4116677e5e20605e25c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5364a422e6b29522c6b723e8b80dbae39d7b1352" dependencies = [ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "sr-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", @@ -4071,7 +4104,7 @@ dependencies = [ [[package]] name = "substrate-executor" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7eb937e8ff7b7de2cd77a4116677e5e20605e25c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5364a422e6b29522c6b723e8b80dbae39d7b1352" dependencies = [ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "derive_more 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4095,7 +4128,7 @@ dependencies = [ [[package]] name = "substrate-finality-grandpa" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7eb937e8ff7b7de2cd77a4116677e5e20605e25c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5364a422e6b29522c6b723e8b80dbae39d7b1352" dependencies = [ "finality-grandpa 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "fork-tree 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", @@ -4124,7 +4157,7 @@ dependencies = [ [[package]] name = "substrate-finality-grandpa-primitives" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7eb937e8ff7b7de2cd77a4116677e5e20605e25c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5364a422e6b29522c6b723e8b80dbae39d7b1352" dependencies = [ "parity-scale-codec 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4137,7 +4170,7 @@ dependencies = [ [[package]] name = "substrate-inherents" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7eb937e8ff7b7de2cd77a4116677e5e20605e25c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5364a422e6b29522c6b723e8b80dbae39d7b1352" dependencies = [ "parity-scale-codec 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4148,7 +4181,7 @@ dependencies = [ [[package]] name = "substrate-keyring" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7eb937e8ff7b7de2cd77a4116677e5e20605e25c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5364a422e6b29522c6b723e8b80dbae39d7b1352" dependencies = [ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "sr-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", @@ -4160,7 +4193,7 @@ dependencies = [ [[package]] name = "substrate-keystore" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7eb937e8ff7b7de2cd77a4116677e5e20605e25c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5364a422e6b29522c6b723e8b80dbae39d7b1352" dependencies = [ "derive_more 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", "hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4175,7 +4208,7 @@ dependencies = [ [[package]] name = "substrate-network" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7eb937e8ff7b7de2cd77a4116677e5e20605e25c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5364a422e6b29522c6b723e8b80dbae39d7b1352" dependencies = [ "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4216,7 +4249,7 @@ dependencies = [ [[package]] name = "substrate-offchain" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7eb937e8ff7b7de2cd77a4116677e5e20605e25c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5364a422e6b29522c6b723e8b80dbae39d7b1352" dependencies = [ "futures-preview 0.3.0-alpha.17 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4234,7 +4267,7 @@ dependencies = [ [[package]] name = "substrate-offchain-primitives" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7eb937e8ff7b7de2cd77a4116677e5e20605e25c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5364a422e6b29522c6b723e8b80dbae39d7b1352" dependencies = [ "sr-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "substrate-client 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", @@ -4243,7 +4276,7 @@ dependencies = [ [[package]] name = "substrate-panic-handler" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7eb937e8ff7b7de2cd77a4116677e5e20605e25c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5364a422e6b29522c6b723e8b80dbae39d7b1352" dependencies = [ "backtrace 0.3.34 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4252,7 +4285,7 @@ dependencies = [ [[package]] name = "substrate-peerset" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7eb937e8ff7b7de2cd77a4116677e5e20605e25c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5364a422e6b29522c6b723e8b80dbae39d7b1352" dependencies = [ "futures-preview 0.3.0-alpha.17 (registry+https://github.com/rust-lang/crates.io-index)", "libp2p 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4265,7 +4298,7 @@ dependencies = [ [[package]] name = "substrate-primitives" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7eb937e8ff7b7de2cd77a4116677e5e20605e25c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5364a422e6b29522c6b723e8b80dbae39d7b1352" dependencies = [ "base58 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "blake2-rfc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4297,7 +4330,7 @@ dependencies = [ [[package]] name = "substrate-rpc" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7eb937e8ff7b7de2cd77a4116677e5e20605e25c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5364a422e6b29522c6b723e8b80dbae39d7b1352" dependencies = [ "derive_more 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4326,7 +4359,7 @@ dependencies = [ [[package]] name = "substrate-rpc-servers" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7eb937e8ff7b7de2cd77a4116677e5e20605e25c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5364a422e6b29522c6b723e8b80dbae39d7b1352" dependencies = [ "jsonrpc-http-server 12.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "jsonrpc-pubsub 12.2.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4340,7 +4373,7 @@ dependencies = [ [[package]] name = "substrate-serializer" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7eb937e8ff7b7de2cd77a4116677e5e20605e25c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5364a422e6b29522c6b723e8b80dbae39d7b1352" dependencies = [ "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4349,7 +4382,7 @@ dependencies = [ [[package]] name = "substrate-service" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7eb937e8ff7b7de2cd77a4116677e5e20605e25c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5364a422e6b29522c6b723e8b80dbae39d7b1352" dependencies = [ "derive_more 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)", "exit-future 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4387,7 +4420,7 @@ dependencies = [ [[package]] name = "substrate-session" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7eb937e8ff7b7de2cd77a4116677e5e20605e25c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5364a422e6b29522c6b723e8b80dbae39d7b1352" dependencies = [ "sr-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "sr-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", @@ -4398,7 +4431,7 @@ dependencies = [ [[package]] name = "substrate-state-db" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7eb937e8ff7b7de2cd77a4116677e5e20605e25c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5364a422e6b29522c6b723e8b80dbae39d7b1352" dependencies = [ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "parity-scale-codec 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4409,7 +4442,7 @@ dependencies = [ [[package]] name = "substrate-state-machine" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7eb937e8ff7b7de2cd77a4116677e5e20605e25c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5364a422e6b29522c6b723e8b80dbae39d7b1352" dependencies = [ "hash-db 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4426,7 +4459,7 @@ dependencies = [ [[package]] name = "substrate-telemetry" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7eb937e8ff7b7de2cd77a4116677e5e20605e25c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5364a422e6b29522c6b723e8b80dbae39d7b1352" dependencies = [ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4448,7 +4481,7 @@ dependencies = [ [[package]] name = "substrate-transaction-graph" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7eb937e8ff7b7de2cd77a4116677e5e20605e25c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5364a422e6b29522c6b723e8b80dbae39d7b1352" dependencies = [ "derive_more 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)", "futures-preview 0.3.0-alpha.17 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4462,7 +4495,7 @@ dependencies = [ [[package]] name = "substrate-transaction-pool" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7eb937e8ff7b7de2cd77a4116677e5e20605e25c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5364a422e6b29522c6b723e8b80dbae39d7b1352" dependencies = [ "derive_more 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4477,7 +4510,7 @@ dependencies = [ [[package]] name = "substrate-trie" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7eb937e8ff7b7de2cd77a4116677e5e20605e25c" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5364a422e6b29522c6b723e8b80dbae39d7b1352" dependencies = [ "hash-db 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", "memory-db 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -5600,6 +5633,7 @@ dependencies = [ "checksum sr-api-macros 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "" "checksum sr-io 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "" "checksum sr-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "" +"checksum sr-staking-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "" "checksum sr-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "" "checksum sr-version 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "" "checksum srml-authorship 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "" @@ -5615,6 +5649,7 @@ dependencies = [ "checksum srml-indices 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "" "checksum srml-membership 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "" "checksum srml-metadata 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "" +"checksum srml-offences 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "" "checksum srml-session 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "" "checksum srml-staking 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "" "checksum srml-sudo 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "" diff --git a/polkadot/runtime/Cargo.toml b/polkadot/runtime/Cargo.toml index f2afdba956..72f7fa9960 100644 --- a/polkadot/runtime/Cargo.toml +++ b/polkadot/runtime/Cargo.toml @@ -21,7 +21,7 @@ srml-support = { git = "https://github.com/paritytech/substrate", default-featur substrate-primitives = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" } client = { package = "substrate-client", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" } inherents = { package = "substrate-inherents", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" } -offchain_primitives = { package = "substrate-offchain-primitives", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" } +offchain-primitives = { package = "substrate-offchain-primitives", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" } authorship = { package = "srml-authorship", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" } balances = { package = "srml-balances", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" } collective = { package = "srml-collective", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" } @@ -33,7 +33,9 @@ grandpa = { package = "srml-grandpa", git = "https://github.com/paritytech/subst im-online = { package = "srml-im-online", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" } indices = { package = "srml-indices", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" } membership = { package = "srml-membership", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" } +offences = { package = "srml-offences", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" } sr-primitives = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" } +sr-staking-primitives = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" } session = { package = "srml-session", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" } staking = { package = "srml-staking", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" } sudo = { package = "srml-sudo", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" } @@ -68,7 +70,7 @@ std = [ "inherents/std", "substrate-primitives/std", "client/std", - "offchain_primitives/std", + "offchain-primitives/std", "rstd/std", "sr-io/std", "srml-support/std", @@ -83,7 +85,9 @@ std = [ "im-online/std", "indices/std", "membership/std", + "offences/std", "sr-primitives/std", + "sr-staking-primitives/std", "session/std", "staking/std", "sudo/std", diff --git a/polkadot/runtime/src/attestations.rs b/polkadot/runtime/src/attestations.rs index c00cca74f6..1c9f5acbeb 100644 --- a/polkadot/runtime/src/attestations.rs +++ b/polkadot/runtime/src/attestations.rs @@ -24,7 +24,8 @@ use codec::{Encode, Decode}; use srml_support::{decl_storage, decl_module, ensure}; use primitives::{Hash, parachain::{AttestedCandidate, CandidateReceipt, Id as ParaId}}; -use {system, session::{self, SessionIndex}}; +use sr_staking_primitives::SessionIndex; +use {system, session}; use srml_support::{ StorageValue, StorageMap, StorageDoubleMap, dispatch::Result, traits::Get, }; diff --git a/polkadot/runtime/src/claims.rs b/polkadot/runtime/src/claims.rs index 42ce9b1f4f..a9da5801cd 100644 --- a/polkadot/runtime/src/claims.rs +++ b/polkadot/runtime/src/claims.rs @@ -243,6 +243,7 @@ mod tests { type MaximumBlockWeight = MaximumBlockWeight; type AvailableBlockRatio = AvailableBlockRatio; type MaximumBlockLength = MaximumBlockLength; + type Version = (); } parameter_types! { diff --git a/polkadot/runtime/src/constants.rs b/polkadot/runtime/src/constants.rs index 2a7663a0fd..4a572e95ec 100644 --- a/polkadot/runtime/src/constants.rs +++ b/polkadot/runtime/src/constants.rs @@ -28,14 +28,14 @@ pub mod currency { pub mod time { use primitives::{Moment, BlockNumber}; // Kusama & mainnet -// pub const MILLISECS_PER_BLOCK: Moment = 6000; + pub const MILLISECS_PER_BLOCK: Moment = 6000; // Testnet - pub const MILLISECS_PER_BLOCK: Moment = 1000; +// pub const MILLISECS_PER_BLOCK: Moment = 1000; pub const SLOT_DURATION: Moment = MILLISECS_PER_BLOCK; // Kusama & mainnet -// pub const EPOCH_DURATION_IN_BLOCKS: BlockNumber = 4 * HOURS; + pub const EPOCH_DURATION_IN_BLOCKS: BlockNumber = 4 * HOURS; // Testnet - pub const EPOCH_DURATION_IN_BLOCKS: BlockNumber = 10 * MINUTES; +// pub const EPOCH_DURATION_IN_BLOCKS: BlockNumber = 10 * MINUTES; // These time units are defined in number of blocks. pub const MINUTES: BlockNumber = 60_000 / (MILLISECS_PER_BLOCK as BlockNumber); diff --git a/polkadot/runtime/src/lib.rs b/polkadot/runtime/src/lib.rs index 40dcc9ce08..01ba1568ea 100644 --- a/polkadot/runtime/src/lib.rs +++ b/polkadot/runtime/src/lib.rs @@ -50,6 +50,7 @@ use elections::VoteIndex; #[cfg(any(feature = "std", test))] use version::NativeVersion; use substrate_primitives::OpaqueMetadata; +use sr_staking_primitives::SessionIndex; use srml_support::{ parameter_types, construct_runtime, traits::{SplitTwoWays, Currency} }; @@ -142,6 +143,7 @@ parameter_types! { pub const MaximumBlockWeight: Weight = 1_000_000_000; pub const AvailableBlockRatio: Perbill = Perbill::from_percent(75); pub const MaximumBlockLength: u32 = 5 * 1024 * 1024; + pub const Version: RuntimeVersion = VERSION; } impl system::Trait for Runtime { @@ -160,6 +162,7 @@ impl system::Trait for Runtime { type MaximumBlockWeight = MaximumBlockWeight; type MaximumBlockLength = MaximumBlockLength; type AvailableBlockRatio = AvailableBlockRatio; + type Version = Version; } parameter_types! { @@ -275,7 +278,7 @@ impl session::historical::Trait for Runtime { } parameter_types! { - pub const SessionsPerEra: session::SessionIndex = 6; + pub const SessionsPerEra: SessionIndex = 6; pub const BondingDuration: staking::EraIndex = 24 * 28; } @@ -402,10 +405,18 @@ impl treasury::Trait for Runtime { type Burn = Burn; } +impl offences::Trait for Runtime { + type Event = Event; + type IdentificationTuple = session::historical::IdentificationTuple; + type OnOffenceHandler = Staking; +} + impl im_online::Trait for Runtime { type Call = Call; type Event = Event; type UncheckedExtrinsic = UncheckedExtrinsic; + type ReportUnresponsiveness = (); + type CurrentElectedSet = staking::CurrentElectedStashAccounts; } impl grandpa::Trait for Runtime { @@ -489,6 +500,7 @@ construct_runtime!( // Consensus support. Authorship: authorship::{Module, Call, Storage}, Staking: staking::{default, OfflineWorker}, + Offences: offences::{Module, Call, Storage, Event}, Session: session::{Module, Call, Storage, Event, Config}, FinalityTracker: finality_tracker::{Module, Call, Inherent}, Grandpa: grandpa::{Module, Call, Storage, Config, Event}, @@ -531,6 +543,7 @@ pub type BlockId = generic::BlockId; pub type SignedExtra = ( // RELEASE: remove this for release build. OnlyStakingAndClaims, + system::CheckVersion, system::CheckGenesis, system::CheckEra, system::CheckNonce, diff --git a/polkadot/runtime/src/parachains.rs b/polkadot/runtime/src/parachains.rs index 84c838319b..f0a33f6af7 100644 --- a/polkadot/runtime/src/parachains.rs +++ b/polkadot/runtime/src/parachains.rs @@ -936,6 +936,7 @@ mod tests { type MaximumBlockWeight = MaximumBlockWeight; type MaximumBlockLength = MaximumBlockLength; type AvailableBlockRatio = AvailableBlockRatio; + type Version = (); } parameter_types! { @@ -1003,7 +1004,7 @@ mod tests { } parameter_types! { - pub const SessionsPerEra: session::SessionIndex = 6; + pub const SessionsPerEra: sr_staking_primitives::SessionIndex = 6; pub const BondingDuration: staking::EraIndex = 24 * 28; pub const AttestationPeriod: BlockNumber = 100; } @@ -1098,8 +1099,6 @@ mod tests { stakers, validator_count: 10, minimum_validator_count: 8, - offline_slash: Perbill::from_percent(5), - offline_slash_grace: 0, invulnerables: vec![], .. Default::default() }.assimilate_storage(&mut t).unwrap(); diff --git a/polkadot/runtime/src/slots.rs b/polkadot/runtime/src/slots.rs index 8aa39f3fa1..2f7fb89e15 100644 --- a/polkadot/runtime/src/slots.rs +++ b/polkadot/runtime/src/slots.rs @@ -834,6 +834,7 @@ mod tests { type MaximumBlockWeight = MaximumBlockWeight; type MaximumBlockLength = MaximumBlockLength; type AvailableBlockRatio = AvailableBlockRatio; + type Version = (); } parameter_types! { diff --git a/polkadot/service/src/chain_spec.rs b/polkadot/service/src/chain_spec.rs index 9208601469..e606819296 100644 --- a/polkadot/service/src/chain_spec.rs +++ b/polkadot/service/src/chain_spec.rs @@ -120,13 +120,13 @@ fn staging_testnet_config_genesis() -> GenesisConfig { }), staking: Some(StakingConfig { current_era: 0, - offline_slash: Perbill::from_parts(1_000_000), validator_count: 7, - offline_slash_grace: 4, minimum_validator_count: 4, stakers: initial_authorities.iter().map(|x| (x.0.clone(), x.1.clone(), STASH, StakerStatus::Validator)).collect(), invulnerables: initial_authorities.iter().map(|x| x.0.clone()).collect(), force_era: Forcing::ForceNone, + slash_reward_fraction: Perbill::from_percent(10), + .. Default::default() }), democracy: Some(Default::default()), collective_Instance1: Some(CouncilConfig { @@ -253,13 +253,13 @@ pub fn testnet_genesis( current_era: 0, minimum_validator_count: 1, validator_count: 2, - offline_slash: Perbill::zero(), - offline_slash_grace: 0, stakers: initial_authorities.iter() .map(|x| (x.0.clone(), x.1.clone(), STASH, StakerStatus::Validator)) .collect(), invulnerables: initial_authorities.iter().map(|x| x.0.clone()).collect(), force_era: Forcing::NotForcing, + slash_reward_fraction: Perbill::from_percent(10), + .. Default::default() }), democracy: Some(DemocracyConfig::default()), collective_Instance1: Some(CouncilConfig {