Bump version to 1.0.0 globally (#2149)

* Bump versionb globally * Rebuild and fix * Rename fixes * Rebuild * Minor fix and code formatting for validator election * Fix tests * More test fixes * Fix several bugs in phragmen elections. * Rebuild, remove pointless closures
2026-05-30 03:31:05 +00:00 · 2019-04-01 15:16:06 +02:00
parent fbbd79e778
commit eca163ba64
89 changed files with 1626 additions and 1652 deletions
@@ -4,7 +4,7 @@ path = "node/src/main.rs"
 [package]
 name = "substrate"
-version = "0.11.0"
+version = "1.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 build = "build.rs"
 edition = "2018"
@@ -1,6 +1,6 @@
 [package]
 name = "substrate-basic-authorship"
-version = "0.1.0"
+version = "1.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
@@ -1,6 +1,6 @@
 [package]
 name = "substrate-cli"
-version = "0.3.0"
+version = "1.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "Substrate CLI interface."
 edition = "2018"
@@ -1,6 +1,6 @@
 [package]
 name = "substrate-client"
-version = "0.1.0"
+version = "1.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
@@ -1,6 +1,6 @@
 [package]
 name = "substrate-client-db"
-version = "0.1.0"
+version = "1.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
@@ -1,6 +1,6 @@
 [package]
 name = "substrate-consensus-aura"
-version = "0.1.0"
+version = "1.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "Aura consensus algorithm for substrate"
 edition = "2018"
@@ -1,6 +1,6 @@
 [package]
 name = "substrate-consensus-aura-primitives"
-version = "0.1.0"
+version = "1.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "Primitives for Aura consensus"
 edition = "2018"
@@ -1,6 +1,6 @@
 [package]
 name = "substrate-consensus-aura-slots"
-version = "0.1.0"
+version = "1.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "Generic slots-based utilities for consensus"
 edition = "2018"
@@ -1,6 +1,6 @@
 [package]
 name = "substrate-consensus-authorities"
-version = "0.1.0"
+version = "1.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "Primitives for Aura consensus"
 edition = "2018"
@@ -1,6 +1,6 @@
 [package]
 name = "substrate-consensus-common"
-version = "0.1.0"
+version = "1.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "Common utilities for substrate consensus"
 edition = "2018"
@@ -1,6 +1,6 @@
 [package]
 name = "substrate-consensus-rhd"
-version = "0.1.0"
+version = "1.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "Rhododendron Round-Based consensus-algorithm for substrate"
 edition = "2018"
@@ -1,6 +1,6 @@
 [package]
 name = "substrate-executor"
-version = "0.1.0"
+version = "1.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
@@ -108,11 +108,11 @@ dependencies = [
 [[package]]
 name = "runtime-test"
-version = "0.1.0"
+version = "1.0.0"
 dependencies = [
- "sr-io 0.1.0",
+ "sr-io 1.0.0",
- "sr-sandbox 0.1.0",
+ "sr-sandbox 1.0.0",
- "substrate-primitives 0.1.0",
+ "substrate-primitives 1.0.0",
 ]
 [[package]]
@@ -148,28 +148,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "sr-io"
-version = "0.1.0"
+version = "1.0.0"
 dependencies = [
 "hash-db 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "parity-codec 3.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "sr-std 0.1.0",
+ "sr-std 1.0.0",
- "substrate-primitives 0.1.0",
+ "substrate-primitives 1.0.0",
 ]
 [[package]]
 name = "sr-sandbox"
-version = "0.1.0"
+version = "1.0.0"
 dependencies = [
 "parity-codec 3.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "sr-std 0.1.0",
+ "sr-std 1.0.0",
- "substrate-primitives 0.1.0",
+ "substrate-primitives 1.0.0",
 ]
 [[package]]
 name = "sr-std"
-version = "0.1.0"
+version = "1.0.0"
 dependencies = [
 "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -181,7 +181,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "substrate-primitives"
-version = "0.1.0"
+version = "1.0.0"
 dependencies = [
 "byteorder 1.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "hash-db 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -189,7 +189,7 @@ dependencies = [
 "parity-codec 3.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "primitive-types 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "rustc-hex 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "sr-std 0.1.0",
+ "sr-std 1.0.0",
 ]
 [[package]]
@@ -1,6 +1,6 @@
 [package]
 name = "runtime-test"
-version = "0.1.0"
+version = "1.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
@@ -8,8 +8,8 @@ edition = "2018"
 crate-type = ["cdylib"]
 [dependencies]
-runtime_io = { package = "sr-io", path = "../../sr-io", version = "0.1", default-features = false }
+runtime_io = { package = "sr-io", path = "../../sr-io", default-features = false }
-sandbox = { package = "sr-sandbox", path = "../../sr-sandbox", version = "0.1", default-features = false }
+sandbox = { package = "sr-sandbox", path = "../../sr-sandbox", default-features = false }
 substrate-primitives = { path = "../../primitives", default-features = false }
 [profile.release]
@@ -1,6 +1,6 @@
 [package]
 name = "substrate-finality-grandpa"
-version = "0.1.0"
+version = "1.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
@@ -1,6 +1,6 @@
 [package]
 name = "substrate-finality-grandpa-primitives"
-version = "0.1.0"
+version = "1.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
@@ -1,6 +1,6 @@
 [package]
 name = "substrate-inherents"
-version = "0.1.0"
+version = "1.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
@@ -1,6 +1,6 @@
 [package]
 name = "substrate-keyring"
-version = "0.1.0"
+version = "1.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
@@ -1,6 +1,6 @@
 [package]
 name = "substrate-keystore"
-version = "0.1.0"
+version = "1.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
@@ -3,7 +3,7 @@ description = "libp2p implementation of the ethcore network library"
 homepage = "http://parity.io"
 license = "GPL-3.0"
 name = "substrate-network-libp2p"
-version = "0.1.0"
+version = "1.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
@@ -1,6 +1,6 @@
 [package]
 name = "substrate-panic-handler"
-version = "0.1.0"
+version = "1.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "Substrate panic handler."
 edition = "2018"
@@ -3,7 +3,7 @@ description = "Connectivity manager based on reputation"
 homepage = "http://parity.io"
 license = "GPL-3.0"
 name = "substrate-peerset"
-version = "0.1.0"
+version = "1.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
@@ -1,6 +1,6 @@
 [package]
 name = "substrate-primitives"
-version = "0.1.0"
+version = "1.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
@@ -1,6 +1,6 @@
 [package]
 name = "substrate-rpc-servers"
-version = "0.1.0"
+version = "1.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
@@ -10,5 +10,5 @@ pubsub = { package = "jsonrpc-pubsub", version = "10.0.1" }
 ws = { package = "jsonrpc-ws-server", version = "10.0.1" }
 log = "0.4"
 serde = "1.0"
-substrate-rpc = { path = "../rpc", version = "0.1" }
+substrate-rpc = { path = "../rpc" }
 sr-primitives = { path = "../sr-primitives" }
@@ -1,6 +1,6 @@
 [package]
 name = "substrate-rpc"
-version = "0.1.0"
+version = "1.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
@@ -1,6 +1,6 @@
 [package]
 name = "substrate-serializer"
-version = "0.1.0"
+version = "1.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
@@ -1,6 +1,6 @@
 [package]
 name = "substrate-service"
-version = "0.3.0"
+version = "1.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
@@ -1,6 +1,6 @@
 [package]
 name = "substrate-service-test"
-version = "0.3.0"
+version = "1.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
@@ -1,6 +1,6 @@
 [package]
 name = "sr-api-macros"
-version = "0.1.0"
+version = "1.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
@@ -1,6 +1,6 @@
 [package]
 name = "sr-io"
-version = "0.1.0"
+version = "1.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 build = "build.rs"
 edition = "2018"
@@ -1,6 +1,6 @@
 [package]
 name = "sr-primitives"
-version = "0.1.0"
+version = "1.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
@@ -1,6 +1,6 @@
 [package]
 name = "sr-sandbox"
-version = "0.1.0"
+version = "1.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 build = "build.rs"
 edition = "2018"
@@ -1,6 +1,6 @@
 [package]
 name = "sr-std"
-version = "0.1.0"
+version = "1.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 build = "build.rs"
 edition = "2018"
@@ -1,6 +1,6 @@
 [package]
 name = "sr-version"
-version = "0.1.0"
+version = "1.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
@@ -1,6 +1,6 @@
 [package]
 name = "substrate-state-db"
-version = "0.1.0"
+version = "1.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
@@ -1,6 +1,6 @@
 [package]
 name = "substrate-state-machine"
-version = "0.1.0"
+version = "1.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "Substrate State Machine"
 edition = "2018"
@@ -1,6 +1,6 @@
 [package]
 name = "substrate-telemetry"
-version = "0.3.1"
+version = "1.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "Telemetry utils"
 edition = "2018"
@@ -1,6 +1,6 @@
 [package]
 name = "substrate-test-client"
-version = "0.1.0"
+version = "1.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
@@ -1,6 +1,6 @@
 [package]
 name = "substrate-test-runtime"
-version = "0.1.0"
+version = "1.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
@@ -136,7 +136,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "bitmask"
 version = "0.5.0"
-source = "git+https://github.com/paritytech/bitmask#a84e147be602631617badd18b6b9af83391db4a9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "blake2"
@@ -789,30 +789,30 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "libp2p"
-version = "0.5.0"
+version = "0.6.0"
-source = "git+https://github.com/tomaka/libp2p-rs?branch=substrate-tmp-2019-03-20#e8e6ccec7409aa19939230d6720035e3ed28dfd6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
 "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
 "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p-core 0.5.0 (git+https://github.com/tomaka/libp2p-rs?branch=substrate-tmp-2019-03-20)",
+ "libp2p-core 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p-core-derive 0.5.0 (git+https://github.com/tomaka/libp2p-rs?branch=substrate-tmp-2019-03-20)",
+ "libp2p-core-derive 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p-dns 0.5.0 (git+https://github.com/tomaka/libp2p-rs?branch=substrate-tmp-2019-03-20)",
+ "libp2p-dns 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p-floodsub 0.5.0 (git+https://github.com/tomaka/libp2p-rs?branch=substrate-tmp-2019-03-20)",
+ "libp2p-floodsub 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p-identify 0.5.0 (git+https://github.com/tomaka/libp2p-rs?branch=substrate-tmp-2019-03-20)",
+ "libp2p-identify 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p-kad 0.5.0 (git+https://github.com/tomaka/libp2p-rs?branch=substrate-tmp-2019-03-20)",
+ "libp2p-kad 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p-mdns 0.5.0 (git+https://github.com/tomaka/libp2p-rs?branch=substrate-tmp-2019-03-20)",
+ "libp2p-mdns 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p-mplex 0.5.0 (git+https://github.com/tomaka/libp2p-rs?branch=substrate-tmp-2019-03-20)",
+ "libp2p-mplex 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p-noise 0.3.0 (git+https://github.com/tomaka/libp2p-rs?branch=substrate-tmp-2019-03-20)",
+ "libp2p-noise 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p-ping 0.5.0 (git+https://github.com/tomaka/libp2p-rs?branch=substrate-tmp-2019-03-20)",
+ "libp2p-ping 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p-plaintext 0.5.0 (git+https://github.com/tomaka/libp2p-rs?branch=substrate-tmp-2019-03-20)",
+ "libp2p-plaintext 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p-ratelimit 0.5.0 (git+https://github.com/tomaka/libp2p-rs?branch=substrate-tmp-2019-03-20)",
+ "libp2p-ratelimit 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p-secio 0.5.0 (git+https://github.com/tomaka/libp2p-rs?branch=substrate-tmp-2019-03-20)",
+ "libp2p-secio 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p-tcp 0.5.0 (git+https://github.com/tomaka/libp2p-rs?branch=substrate-tmp-2019-03-20)",
+ "libp2p-tcp 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p-uds 0.5.0 (git+https://github.com/tomaka/libp2p-rs?branch=substrate-tmp-2019-03-20)",
+ "libp2p-uds 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p-yamux 0.5.0 (git+https://github.com/tomaka/libp2p-rs?branch=substrate-tmp-2019-03-20)",
+ "libp2p-yamux 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "parity-multiaddr 0.2.0 (git+https://github.com/tomaka/libp2p-rs?branch=substrate-tmp-2019-03-20)",
+ "parity-multiaddr 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "parity-multihash 0.1.0 (git+https://github.com/tomaka/libp2p-rs?branch=substrate-tmp-2019-03-20)",
+ "parity-multihash 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "smallvec 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)",
 "stdweb 0.4.15 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -823,8 +823,8 @@ dependencies = [
 [[package]]
 name = "libp2p-core"
-version = "0.5.0"
+version = "0.6.0"
-source = "git+https://github.com/tomaka/libp2p-rs?branch=substrate-tmp-2019-03-20#e8e6ccec7409aa19939230d6720035e3ed28dfd6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "asn1_der 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "bs58 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -835,15 +835,15 @@ dependencies = [
 "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
 "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "multistream-select 0.3.0 (git+https://github.com/tomaka/libp2p-rs?branch=substrate-tmp-2019-03-20)",
+ "multistream-select 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "parity-multiaddr 0.2.0 (git+https://github.com/tomaka/libp2p-rs?branch=substrate-tmp-2019-03-20)",
+ "parity-multiaddr 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "parity-multihash 0.1.0 (git+https://github.com/tomaka/libp2p-rs?branch=substrate-tmp-2019-03-20)",
+ "parity-multihash 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "protobuf 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
 "ring 0.14.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "rw-stream-sink 0.1.1 (git+https://github.com/tomaka/libp2p-rs?branch=substrate-tmp-2019-03-20)",
+ "rw-stream-sink 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "secp256k1 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "sha2 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "smallvec 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -858,8 +858,8 @@ dependencies = [
 [[package]]
 name = "libp2p-core-derive"
-version = "0.5.0"
+version = "0.6.0"
-source = "git+https://github.com/tomaka/libp2p-rs?branch=substrate-tmp-2019-03-20#e8e6ccec7409aa19939230d6720035e3ed28dfd6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)",
 "syn 0.15.29 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -867,28 +867,28 @@ dependencies = [
 [[package]]
 name = "libp2p-dns"
-version = "0.5.0"
+version = "0.6.0"
-source = "git+https://github.com/tomaka/libp2p-rs?branch=substrate-tmp-2019-03-20#e8e6ccec7409aa19939230d6720035e3ed28dfd6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p-core 0.5.0 (git+https://github.com/tomaka/libp2p-rs?branch=substrate-tmp-2019-03-20)",
+ "libp2p-core 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "parity-multiaddr 0.2.0 (git+https://github.com/tomaka/libp2p-rs?branch=substrate-tmp-2019-03-20)",
+ "parity-multiaddr 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "tokio-dns-unofficial 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "libp2p-floodsub"
-version = "0.5.0"
+version = "0.6.0"
-source = "git+https://github.com/tomaka/libp2p-rs?branch=substrate-tmp-2019-03-20#e8e6ccec7409aa19939230d6720035e3ed28dfd6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "bs58 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
 "cuckoofilter 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p-core 0.5.0 (git+https://github.com/tomaka/libp2p-rs?branch=substrate-tmp-2019-03-20)",
+ "libp2p-core 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "protobuf 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
 "smallvec 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -899,15 +899,15 @@ dependencies = [
 [[package]]
 name = "libp2p-identify"
-version = "0.5.0"
+version = "0.6.0"
-source = "git+https://github.com/tomaka/libp2p-rs?branch=substrate-tmp-2019-03-20#e8e6ccec7409aa19939230d6720035e3ed28dfd6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
 "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p-core 0.5.0 (git+https://github.com/tomaka/libp2p-rs?branch=substrate-tmp-2019-03-20)",
+ "libp2p-core 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "parity-multiaddr 0.2.0 (git+https://github.com/tomaka/libp2p-rs?branch=substrate-tmp-2019-03-20)",
+ "parity-multiaddr 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "protobuf 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "smallvec 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -920,21 +920,22 @@ dependencies = [
 [[package]]
 name = "libp2p-kad"
-version = "0.5.0"
+version = "0.6.0"
-source = "git+https://github.com/tomaka/libp2p-rs?branch=substrate-tmp-2019-03-20#e8e6ccec7409aa19939230d6720035e3ed28dfd6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "arrayref 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
 "arrayvec 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
 "bigint 4.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "bs58 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
 "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p-core 0.5.0 (git+https://github.com/tomaka/libp2p-rs?branch=substrate-tmp-2019-03-20)",
+ "libp2p-core 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p-identify 0.5.0 (git+https://github.com/tomaka/libp2p-rs?branch=substrate-tmp-2019-03-20)",
+ "libp2p-identify 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p-ping 0.5.0 (git+https://github.com/tomaka/libp2p-rs?branch=substrate-tmp-2019-03-20)",
+ "libp2p-ping 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "parity-multiaddr 0.2.0 (git+https://github.com/tomaka/libp2p-rs?branch=substrate-tmp-2019-03-20)",
+ "parity-multiaddr 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "parity-multihash 0.1.0 (git+https://github.com/tomaka/libp2p-rs?branch=substrate-tmp-2019-03-20)",
+ "parity-multihash 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "protobuf 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -948,16 +949,16 @@ dependencies = [
 [[package]]
 name = "libp2p-mdns"
-version = "0.5.0"
+version = "0.6.0"
-source = "git+https://github.com/tomaka/libp2p-rs?branch=substrate-tmp-2019-03-20#e8e6ccec7409aa19939230d6720035e3ed28dfd6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "data-encoding 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "dns-parser 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p-core 0.5.0 (git+https://github.com/tomaka/libp2p-rs?branch=substrate-tmp-2019-03-20)",
+ "libp2p-core 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
- "parity-multiaddr 0.2.0 (git+https://github.com/tomaka/libp2p-rs?branch=substrate-tmp-2019-03-20)",
+ "parity-multiaddr 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
 "smallvec 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)",
 "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -969,13 +970,13 @@ dependencies = [
 [[package]]
 name = "libp2p-mplex"
-version = "0.5.0"
+version = "0.6.0"
-source = "git+https://github.com/tomaka/libp2p-rs?branch=substrate-tmp-2019-03-20#e8e6ccec7409aa19939230d6720035e3ed28dfd6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
 "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p-core 0.5.0 (git+https://github.com/tomaka/libp2p-rs?branch=substrate-tmp-2019-03-20)",
+ "libp2p-core 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "tokio-codec 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -985,13 +986,13 @@ dependencies = [
 [[package]]
 name = "libp2p-noise"
-version = "0.3.0"
+version = "0.4.0"
-source = "git+https://github.com/tomaka/libp2p-rs?branch=substrate-tmp-2019-03-20#e8e6ccec7409aa19939230d6720035e3ed28dfd6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "curve25519-dalek 1.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
 "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p-core 0.5.0 (git+https://github.com/tomaka/libp2p-rs?branch=substrate-tmp-2019-03-20)",
+ "libp2p-core 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
 "ring 0.14.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1003,15 +1004,15 @@ dependencies = [
 [[package]]
 name = "libp2p-ping"
-version = "0.5.0"
+version = "0.6.0"
-source = "git+https://github.com/tomaka/libp2p-rs?branch=substrate-tmp-2019-03-20#e8e6ccec7409aa19939230d6720035e3ed28dfd6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "arrayvec 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
 "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
 "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p-core 0.5.0 (git+https://github.com/tomaka/libp2p-rs?branch=substrate-tmp-2019-03-20)",
+ "libp2p-core 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "parity-multiaddr 0.2.0 (git+https://github.com/tomaka/libp2p-rs?branch=substrate-tmp-2019-03-20)",
+ "parity-multiaddr 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
 "tokio-codec 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1022,22 +1023,22 @@ dependencies = [
 [[package]]
 name = "libp2p-plaintext"
-version = "0.5.0"
+version = "0.6.0"
-source = "git+https://github.com/tomaka/libp2p-rs?branch=substrate-tmp-2019-03-20#e8e6ccec7409aa19939230d6720035e3ed28dfd6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p-core 0.5.0 (git+https://github.com/tomaka/libp2p-rs?branch=substrate-tmp-2019-03-20)",
+ "libp2p-core 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "libp2p-ratelimit"
-version = "0.5.0"
+version = "0.6.0"
-source = "git+https://github.com/tomaka/libp2p-rs?branch=substrate-tmp-2019-03-20#e8e6ccec7409aa19939230d6720035e3ed28dfd6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "aio-limited 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p-core 0.5.0 (git+https://github.com/tomaka/libp2p-rs?branch=substrate-tmp-2019-03-20)",
+ "libp2p-core 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "tokio-executor 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1045,8 +1046,8 @@ dependencies = [
 [[package]]
 name = "libp2p-secio"
-version = "0.5.0"
+version = "0.6.0"
-source = "git+https://github.com/tomaka/libp2p-rs?branch=substrate-tmp-2019-03-20#e8e6ccec7409aa19939230d6720035e3ed28dfd6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "aes-ctr 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "asn1_der 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1055,12 +1056,12 @@ dependencies = [
 "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
 "hmac 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p-core 0.5.0 (git+https://github.com/tomaka/libp2p-rs?branch=substrate-tmp-2019-03-20)",
+ "libp2p-core 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "protobuf 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
 "ring 0.14.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "rw-stream-sink 0.1.1 (git+https://github.com/tomaka/libp2p-rs?branch=substrate-tmp-2019-03-20)",
+ "rw-stream-sink 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "sha2 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "stdweb 0.4.15 (registry+https://github.com/rust-lang/crates.io-index)",
 "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1070,13 +1071,13 @@ dependencies = [
 [[package]]
 name = "libp2p-tcp"
-version = "0.5.0"
+version = "0.6.0"
-source = "git+https://github.com/tomaka/libp2p-rs?branch=substrate-tmp-2019-03-20#e8e6ccec7409aa19939230d6720035e3ed28dfd6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p-core 0.5.0 (git+https://github.com/tomaka/libp2p-rs?branch=substrate-tmp-2019-03-20)",
+ "libp2p-core 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "parity-multiaddr 0.2.0 (git+https://github.com/tomaka/libp2p-rs?branch=substrate-tmp-2019-03-20)",
+ "parity-multiaddr 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "tk-listen 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
 "tokio-tcp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1084,23 +1085,23 @@ dependencies = [
 [[package]]
 name = "libp2p-uds"
-version = "0.5.0"
+version = "0.6.0"
-source = "git+https://github.com/tomaka/libp2p-rs?branch=substrate-tmp-2019-03-20#e8e6ccec7409aa19939230d6720035e3ed28dfd6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p-core 0.5.0 (git+https://github.com/tomaka/libp2p-rs?branch=substrate-tmp-2019-03-20)",
+ "libp2p-core 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "parity-multiaddr 0.2.0 (git+https://github.com/tomaka/libp2p-rs?branch=substrate-tmp-2019-03-20)",
+ "parity-multiaddr 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "tokio-uds 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "libp2p-yamux"
-version = "0.5.0"
+version = "0.6.0"
-source = "git+https://github.com/tomaka/libp2p-rs?branch=substrate-tmp-2019-03-20#e8e6ccec7409aa19939230d6720035e3ed28dfd6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p-core 0.5.0 (git+https://github.com/tomaka/libp2p-rs?branch=substrate-tmp-2019-03-20)",
+ "libp2p-core 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
 "yamux 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1228,8 +1229,8 @@ dependencies = [
 [[package]]
 name = "multistream-select"
-version = "0.3.0"
+version = "0.4.0"
-source = "git+https://github.com/tomaka/libp2p-rs?branch=substrate-tmp-2019-03-20#e8e6ccec7409aa19939230d6720035e3ed28dfd6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
 "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1364,13 +1365,13 @@ dependencies = [
 [[package]]
 name = "parity-multiaddr"
 version = "0.2.0"
-source = "git+https://github.com/tomaka/libp2p-rs?branch=substrate-tmp-2019-03-20#e8e6ccec7409aa19939230d6720035e3ed28dfd6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "arrayref 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
 "bs58 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "data-encoding 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "parity-multihash 0.1.0 (git+https://github.com/tomaka/libp2p-rs?branch=substrate-tmp-2019-03-20)",
+ "parity-multihash 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)",
 "unsigned-varint 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -1378,7 +1379,7 @@ dependencies = [
 [[package]]
 name = "parity-multihash"
 version = "0.1.0"
-source = "git+https://github.com/tomaka/libp2p-rs?branch=substrate-tmp-2019-03-20#e8e6ccec7409aa19939230d6720035e3ed28dfd6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "blake2 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1788,7 +1789,7 @@ dependencies = [
 [[package]]
 name = "rw-stream-sink"
 version = "0.1.1"
-source = "git+https://github.com/tomaka/libp2p-rs?branch=substrate-tmp-2019-03-20#e8e6ccec7409aa19939230d6720035e3ed28dfd6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
 "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2005,7 +2006,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "sr-api-macros"
-version = "0.1.0"
+version = "1.0.0"
 dependencies = [
 "blake2-rfc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)",
 "proc-macro-crate 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2016,23 +2017,23 @@ dependencies = [
 [[package]]
 name = "sr-io"
-version = "0.1.0"
+version = "1.0.0"
 dependencies = [
 "environmental 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "hash-db 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "libsecp256k1 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "parity-codec 3.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "sr-std 0.1.0",
+ "sr-std 1.0.0",
- "substrate-primitives 0.1.0",
+ "substrate-primitives 1.0.0",
- "substrate-state-machine 0.1.0",
+ "substrate-state-machine 1.0.0",
- "substrate-trie 0.4.0",
+ "substrate-trie 1.0.0",
 "tiny-keccak 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "sr-primitives"
-version = "0.1.0"
+version = "1.0.0"
 dependencies = [
 "integer-sqrt 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2040,98 +2041,98 @@ dependencies = [
 "parity-codec 3.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde_derive 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)",
- "sr-io 0.1.0",
+ "sr-io 1.0.0",
- "sr-std 0.1.0",
+ "sr-std 1.0.0",
- "substrate-primitives 0.1.0",
+ "substrate-primitives 1.0.0",
 ]
 [[package]]
 name = "sr-std"
-version = "0.1.0"
+version = "1.0.0"
 dependencies = [
 "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "sr-version"
-version = "0.1.0"
+version = "1.0.0"
 dependencies = [
 "impl-serde 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "parity-codec 3.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde_derive 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)",
- "sr-primitives 0.1.0",
+ "sr-primitives 1.0.0",
- "sr-std 0.1.0",
+ "sr-std 1.0.0",
 ]
 [[package]]
 name = "srml-executive"
-version = "0.1.0"
+version = "1.0.0"
 dependencies = [
 "parity-codec 3.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)",
- "sr-io 0.1.0",
+ "sr-io 1.0.0",
- "sr-primitives 0.1.0",
+ "sr-primitives 1.0.0",
- "sr-std 0.1.0",
+ "sr-std 1.0.0",
- "srml-support 0.1.0",
+ "srml-support 1.0.0",
- "srml-system 0.1.0",
+ "srml-system 1.0.0",
 ]
 [[package]]
 name = "srml-metadata"
-version = "0.1.0"
+version = "1.0.0"
 dependencies = [
 "parity-codec 3.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde_derive 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)",
- "sr-std 0.1.0",
+ "sr-std 1.0.0",
- "substrate-primitives 0.1.0",
+ "substrate-primitives 1.0.0",
 ]
 [[package]]
 name = "srml-support"
-version = "0.1.0"
+version = "1.0.0"
 dependencies = [
- "bitmask 0.5.0 (git+https://github.com/paritytech/bitmask)",
+ "bitmask 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "hex-literal 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "once_cell 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
 "parity-codec 3.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "paste 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde_derive 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)",
- "sr-io 0.1.0",
+ "sr-io 1.0.0",
- "sr-primitives 0.1.0",
+ "sr-primitives 1.0.0",
- "sr-std 0.1.0",
+ "sr-std 1.0.0",
- "srml-metadata 0.1.0",
+ "srml-metadata 1.0.0",
- "srml-support-procedural 0.1.0",
+ "srml-support-procedural 1.0.0",
- "substrate-inherents 0.1.0",
+ "substrate-inherents 1.0.0",
 ]
 [[package]]
 name = "srml-support-procedural"
-version = "0.1.0"
+version = "1.0.0"
 dependencies = [
 "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
 "quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "sr-api-macros 0.1.0",
+ "sr-api-macros 1.0.0",
- "srml-support-procedural-tools 0.1.0",
+ "srml-support-procedural-tools 1.0.0",
 "syn 0.15.29 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "srml-support-procedural-tools"
-version = "0.1.0"
+version = "1.0.0"
 dependencies = [
 "proc-macro-crate 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
 "quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "srml-support-procedural-tools-derive 0.1.0",
+ "srml-support-procedural-tools-derive 1.0.0",
 "syn 0.15.29 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "srml-support-procedural-tools-derive"
-version = "0.1.0"
+version = "1.0.0"
 dependencies = [
 "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
 "quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2140,18 +2141,18 @@ dependencies = [
 [[package]]
 name = "srml-system"
-version = "0.1.0"
+version = "1.0.0"
 dependencies = [
 "hex-literal 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "parity-codec 3.2.0 (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.89 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde_derive 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)",
- "sr-io 0.1.0",
+ "sr-io 1.0.0",
- "sr-primitives 0.1.0",
+ "sr-primitives 1.0.0",
- "sr-std 0.1.0",
+ "sr-std 1.0.0",
- "srml-support 0.1.0",
+ "srml-support 1.0.0",
- "substrate-primitives 0.1.0",
+ "substrate-primitives 1.0.0",
 ]
 [[package]]
@@ -2250,7 +2251,7 @@ dependencies = [
 [[package]]
 name = "substrate-client"
-version = "0.1.0"
+version = "1.0.0"
 dependencies = [
 "error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2262,63 +2263,63 @@ dependencies = [
 "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "parity-codec 3.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "sr-api-macros 0.1.0",
+ "sr-api-macros 1.0.0",
- "sr-primitives 0.1.0",
+ "sr-primitives 1.0.0",
- "sr-std 0.1.0",
+ "sr-std 1.0.0",
- "sr-version 0.1.0",
+ "sr-version 1.0.0",
- "substrate-consensus-common 0.1.0",
+ "substrate-consensus-common 1.0.0",
- "substrate-executor 0.1.0",
+ "substrate-executor 1.0.0",
- "substrate-inherents 0.1.0",
+ "substrate-inherents 1.0.0",
- "substrate-keyring 0.1.0",
+ "substrate-keyring 1.0.0",
- "substrate-primitives 0.1.0",
+ "substrate-primitives 1.0.0",
- "substrate-state-machine 0.1.0",
+ "substrate-state-machine 1.0.0",
- "substrate-telemetry 0.3.1",
+ "substrate-telemetry 1.0.0",
- "substrate-trie 0.4.0",
+ "substrate-trie 1.0.0",
 ]
 [[package]]
 name = "substrate-consensus-aura-primitives"
-version = "0.1.0"
+version = "1.0.0"
 dependencies = [
- "sr-primitives 0.1.0",
+ "sr-primitives 1.0.0",
- "substrate-client 0.1.0",
+ "substrate-client 1.0.0",
 ]
 [[package]]
 name = "substrate-consensus-authorities"
-version = "0.1.0"
+version = "1.0.0"
 dependencies = [
 "parity-codec 3.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "sr-io 0.1.0",
+ "sr-io 1.0.0",
- "sr-primitives 0.1.0",
+ "sr-primitives 1.0.0",
- "sr-std 0.1.0",
+ "sr-std 1.0.0",
- "sr-version 0.1.0",
+ "sr-version 1.0.0",
- "srml-support 0.1.0",
+ "srml-support 1.0.0",
- "substrate-client 0.1.0",
+ "substrate-client 1.0.0",
- "substrate-primitives 0.1.0",
+ "substrate-primitives 1.0.0",
 ]
 [[package]]
 name = "substrate-consensus-common"
-version = "0.1.0"
+version = "1.0.0"
 dependencies = [
 "crossbeam-channel 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 "error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p 0.5.0 (git+https://github.com/tomaka/libp2p-rs?branch=substrate-tmp-2019-03-20)",
+ "libp2p 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "parity-codec 3.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "parity-codec-derive 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "sr-primitives 0.1.0",
+ "sr-primitives 1.0.0",
- "sr-version 0.1.0",
+ "sr-version 1.0.0",
- "substrate-inherents 0.1.0",
+ "substrate-inherents 1.0.0",
- "substrate-primitives 0.1.0",
+ "substrate-primitives 1.0.0",
 "tokio 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "substrate-executor"
-version = "0.1.0"
+version = "1.0.0"
 dependencies = [
 "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2329,49 +2330,49 @@ dependencies = [
 "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde_derive 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)",
- "sr-io 0.1.0",
+ "sr-io 1.0.0",
- "sr-version 0.1.0",
+ "sr-version 1.0.0",
- "substrate-panic-handler 0.1.0",
+ "substrate-panic-handler 1.0.0",
- "substrate-primitives 0.1.0",
+ "substrate-primitives 1.0.0",
- "substrate-serializer 0.1.0",
+ "substrate-serializer 1.0.0",
- "substrate-state-machine 0.1.0",
+ "substrate-state-machine 1.0.0",
- "substrate-trie 0.4.0",
+ "substrate-trie 1.0.0",
 "tiny-keccak 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "wasmi 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "substrate-inherents"
-version = "0.1.0"
+version = "1.0.0"
 dependencies = [
 "parity-codec 3.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "sr-primitives 0.1.0",
+ "sr-primitives 1.0.0",
- "sr-std 0.1.0",
+ "sr-std 1.0.0",
 ]
 [[package]]
 name = "substrate-keyring"
-version = "0.1.0"
+version = "1.0.0"
 dependencies = [
 "hex-literal 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "strum 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "strum_macros 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "substrate-primitives 0.1.0",
+ "substrate-primitives 1.0.0",
 ]
 [[package]]
 name = "substrate-offchain-primitives"
 version = "0.1.0"
 dependencies = [
- "sr-primitives 0.1.0",
+ "sr-primitives 1.0.0",
- "substrate-client 0.1.0",
+ "substrate-client 1.0.0",
 ]
 [[package]]
 name = "substrate-panic-handler"
-version = "0.1.0"
+version = "1.0.0"
 dependencies = [
 "backtrace 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
 "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2379,7 +2380,7 @@ dependencies = [
 [[package]]
 name = "substrate-primitives"
-version = "0.1.0"
+version = "1.0.0"
 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)",
@@ -2399,7 +2400,7 @@ dependencies = [
 "serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde_derive 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)",
 "sha2 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "sr-std 0.1.0",
+ "sr-std 1.0.0",
 "substrate-bip39 0.2.0 (git+https://github.com/paritytech/substrate-bip39)",
 "tiny-bip39 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "twox-hash 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2409,7 +2410,7 @@ dependencies = [
 [[package]]
 name = "substrate-serializer"
-version = "0.1.0"
+version = "1.0.0"
 dependencies = [
 "serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2417,7 +2418,7 @@ dependencies = [
 [[package]]
 name = "substrate-state-machine"
-version = "0.1.0"
+version = "1.0.0"
 dependencies = [
 "hash-db 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "heapsize 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2425,16 +2426,16 @@ dependencies = [
 "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "parity-codec 3.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "substrate-panic-handler 0.1.0",
+ "substrate-panic-handler 1.0.0",
- "substrate-primitives 0.1.0",
+ "substrate-primitives 1.0.0",
- "substrate-trie 0.4.0",
+ "substrate-trie 1.0.0",
 "trie-db 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "trie-root 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "substrate-telemetry"
-version = "0.3.1"
+version = "1.0.0"
 dependencies = [
 "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2451,7 +2452,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-runtime"
-version = "0.1.0"
+version = "1.0.0"
 dependencies = [
 "cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
 "hex-literal 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2459,31 +2460,31 @@ dependencies = [
 "parity-codec 3.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde_derive 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)",
- "sr-io 0.1.0",
+ "sr-io 1.0.0",
- "sr-primitives 0.1.0",
+ "sr-primitives 1.0.0",
- "sr-std 0.1.0",
+ "sr-std 1.0.0",
- "sr-version 0.1.0",
+ "sr-version 1.0.0",
- "srml-executive 0.1.0",
+ "srml-executive 1.0.0",
- "srml-support 0.1.0",
+ "srml-support 1.0.0",
- "substrate-client 0.1.0",
+ "substrate-client 1.0.0",
- "substrate-consensus-aura-primitives 0.1.0",
+ "substrate-consensus-aura-primitives 1.0.0",
- "substrate-consensus-authorities 0.1.0",
+ "substrate-consensus-authorities 1.0.0",
- "substrate-inherents 0.1.0",
+ "substrate-inherents 1.0.0",
- "substrate-keyring 0.1.0",
+ "substrate-keyring 1.0.0",
 "substrate-offchain-primitives 0.1.0",
- "substrate-primitives 0.1.0",
+ "substrate-primitives 1.0.0",
 ]
 [[package]]
 name = "substrate-test-runtime-wasm"
-version = "0.1.0"
+version = "1.0.0"
 dependencies = [
- "substrate-test-runtime 0.1.0",
+ "substrate-test-runtime 1.0.0",
 ]
 [[package]]
 name = "substrate-trie"
-version = "0.4.0"
+version = "1.0.0"
 dependencies = [
 "hash-db 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "memory-db 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3004,7 +3005,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum base58 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5024ee8015f02155eee35c711107ddd9a9bf3cb689cf2a9089c97e79b6e1ae83"
 "checksum bigint 4.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ebecac13b3c745150d7b6c3ea7572d372f09d627c2077e893bf26c5c7f70d282"
 "checksum bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "228047a76f468627ca71776ecdebd732a3423081fcf5125585bcd7c49886ce12"
-"checksum bitmask 0.5.0 (git+https://github.com/paritytech/bitmask)" = "<none>"
+"checksum bitmask 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5da9b3d9f6f585199287a473f4f8dfab6566cf827d15c00c219f53c645687ead"
 "checksum blake2 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "91721a6330935673395a0607df4d49a9cb90ae12d259f1b3e0a3f6e1d486872e"
 "checksum blake2-rfc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)" = "5d6d530bdd2d52966a6d03b7a964add7ae1a288d25214066fd4b600f0f796400"
 "checksum block-buffer 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1339a1042f5d9f295737ad4d9a6ab6bf81c84a933dba110b9200cd6d1448b814"
@@ -3088,23 +3089,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bc5729f27f159ddd61f4df6228e827e86643d4d3e7c32183cb30a1c08f604a14"
 "checksum lazycell 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b294d6fa9ee409a054354afc4352b0b9ef7ca222c69b8812cbea9e7d2bf3783f"
 "checksum libc 0.2.50 (registry+https://github.com/rust-lang/crates.io-index)" = "aab692d7759f5cd8c859e169db98ae5b52c924add2af5fbbca11d12fefb567c1"
-"checksum libp2p 0.5.0 (git+https://github.com/tomaka/libp2p-rs?branch=substrate-tmp-2019-03-20)" = "<none>"
+"checksum libp2p 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f5b9cd37b1ca54fa2fd0bbf0486adf2f55f8994f2be9410b65265050b24709b2"
-"checksum libp2p-core 0.5.0 (git+https://github.com/tomaka/libp2p-rs?branch=substrate-tmp-2019-03-20)" = "<none>"
+"checksum libp2p-core 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bf9c56e6f04cb649fdeb806e963d2da223e3ed17748d9e924fdb836c09f76307"
-"checksum libp2p-core-derive 0.5.0 (git+https://github.com/tomaka/libp2p-rs?branch=substrate-tmp-2019-03-20)" = "<none>"
+"checksum libp2p-core-derive 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "debea88a3d5de9fdaf7082bd6d238f2c4c6a0420f14bdf9e1c1083b3e7c69286"
-"checksum libp2p-dns 0.5.0 (git+https://github.com/tomaka/libp2p-rs?branch=substrate-tmp-2019-03-20)" = "<none>"
+"checksum libp2p-dns 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "350d0018af3668d954f61ce7311e7d64ab7c40f19a8eb895e4750efe24c3455f"
-"checksum libp2p-floodsub 0.5.0 (git+https://github.com/tomaka/libp2p-rs?branch=substrate-tmp-2019-03-20)" = "<none>"
+"checksum libp2p-floodsub 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bfbcf36cc58ad5d0252d8ebe9c1a87190693fe2cdbe40fb01d8046779f9a75ad"
-"checksum libp2p-identify 0.5.0 (git+https://github.com/tomaka/libp2p-rs?branch=substrate-tmp-2019-03-20)" = "<none>"
+"checksum libp2p-identify 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "82e98435973e958d7dea3f5074d7fca53d0dfce2e1ac6924119a21c2991fe443"
-"checksum libp2p-kad 0.5.0 (git+https://github.com/tomaka/libp2p-rs?branch=substrate-tmp-2019-03-20)" = "<none>"
+"checksum libp2p-kad 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "92bb0153418eaf0ea549008d1e22748a956c9c36af9374fbe7189d44607c14be"
-"checksum libp2p-mdns 0.5.0 (git+https://github.com/tomaka/libp2p-rs?branch=substrate-tmp-2019-03-20)" = "<none>"
+"checksum libp2p-mdns 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "dc915d0cde68a05d26a0dcb125eddce7dd2a425e97c5172ac300c1ee8716f55a"
-"checksum libp2p-mplex 0.5.0 (git+https://github.com/tomaka/libp2p-rs?branch=substrate-tmp-2019-03-20)" = "<none>"
+"checksum libp2p-mplex 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "355bb370dd12809792dc020638b280e7aaf8625318018abd311c51affd0a612d"
-"checksum libp2p-noise 0.3.0 (git+https://github.com/tomaka/libp2p-rs?branch=substrate-tmp-2019-03-20)" = "<none>"
+"checksum libp2p-noise 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e86291401f4a83f9fa81c03f8a7ccf0b03ce6aaa40cba058a7ec1026a65a6fe4"
-"checksum libp2p-ping 0.5.0 (git+https://github.com/tomaka/libp2p-rs?branch=substrate-tmp-2019-03-20)" = "<none>"
+"checksum libp2p-ping 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f3277f1f7eaadf5cdde6a76fb4afbf24e0eda6e2b04f288f526c6fa2e4293a6e"
-"checksum libp2p-plaintext 0.5.0 (git+https://github.com/tomaka/libp2p-rs?branch=substrate-tmp-2019-03-20)" = "<none>"
+"checksum libp2p-plaintext 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c4842a7ab54c12459b58b9e59cbeb03e3e1fd393fef48079472856f934352772"
-"checksum libp2p-ratelimit 0.5.0 (git+https://github.com/tomaka/libp2p-rs?branch=substrate-tmp-2019-03-20)" = "<none>"
+"checksum libp2p-ratelimit 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "32ba52ee76aaa94af533526ce5a22fbfcc69a560174fccee82f4cdb557411d33"
-"checksum libp2p-secio 0.5.0 (git+https://github.com/tomaka/libp2p-rs?branch=substrate-tmp-2019-03-20)" = "<none>"
+"checksum libp2p-secio 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "00f416e1e3d0214bd7df2be2b6be8ef61771d44292b973c9e02bfbbd7f62fe46"
-"checksum libp2p-tcp 0.5.0 (git+https://github.com/tomaka/libp2p-rs?branch=substrate-tmp-2019-03-20)" = "<none>"
+"checksum libp2p-tcp 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "af47af9997d69fc70aa13e6e7cd0d766614ebe74005e69e763221a64d9a0a5ef"
-"checksum libp2p-uds 0.5.0 (git+https://github.com/tomaka/libp2p-rs?branch=substrate-tmp-2019-03-20)" = "<none>"
+"checksum libp2p-uds 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bfa72d81501aad6998d3b1b964f68f438ef99c3aaf54d921e144e0477fa87568"
-"checksum libp2p-yamux 0.5.0 (git+https://github.com/tomaka/libp2p-rs?branch=substrate-tmp-2019-03-20)" = "<none>"
+"checksum libp2p-yamux 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0dbb8d08cb536a964727e77b868a026c6d92993f08e387d49163565575a478d9"
 "checksum libsecp256k1 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "688e8d65e495567c2c35ea0001b26b9debf0b4ea11f8cccc954233b75fc3428a"
 "checksum lock_api 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "62ebf1391f6acad60e5c8b43706dde4582df75c06698ab44511d15016bc2442c"
 "checksum log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c84ec4b527950aa83a329754b01dbe3f58361d1c5efacd1f6d68c494d08a17c6"
@@ -3118,7 +3119,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum mio-extras 2.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "46e73a04c2fa6250b8d802134d56d554a9ec2922bf977777c805ea5def61ce40"
 "checksum mio-uds 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)" = "966257a94e196b11bb43aca423754d87429960a768de9414f3691d6957abf125"
 "checksum miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919"
-"checksum multistream-select 0.3.0 (git+https://github.com/tomaka/libp2p-rs?branch=substrate-tmp-2019-03-20)" = "<none>"
+"checksum multistream-select 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f989d40aab0ed0d83c1cdb4856b5790e980b96548d1a921f280e985eb049f38d"
 "checksum net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "42550d9fb7b6684a6d404d9fa7250c2eb2646df731d1c06afc06dcee9e1bcf88"
 "checksum nodrop 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "2f9667ddcc6cc8a43afc9b7917599d7216aa09c463919ea32c59ed6cac8bc945"
 "checksum nohash-hasher 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0d138afcce92d219ccb6eb53d9b1e8a96ac0d633cfd3c53cd9856d96d1741bb8"
@@ -3134,8 +3135,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum parity-bytes 0.1.0 (git+https://github.com/paritytech/parity-common?rev=b0317f649ab2c665b7987b8475878fc4d2e1f81d)" = "<none>"
 "checksum parity-codec 3.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "21c9c3a1623c71ed83964ff28cac6126e178920f7646d32c337eacb9152b2907"
 "checksum parity-codec-derive 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "864e9f66b58c0b38f0d6b511b6576afa2b678ae801b64220553bced57ac12df9"
-"checksum parity-multiaddr 0.2.0 (git+https://github.com/tomaka/libp2p-rs?branch=substrate-tmp-2019-03-20)" = "<none>"
+"checksum parity-multiaddr 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "61ae6944d4435d41f4d0f12108c5cbb9207cbb14bc8f2b4984c6e930dc9c8e41"
-"checksum parity-multihash 0.1.0 (git+https://github.com/tomaka/libp2p-rs?branch=substrate-tmp-2019-03-20)" = "<none>"
+"checksum parity-multihash 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3e8eab0287ccde7821e337a124dc5a4f1d6e4c25d10cc91e3f9361615dd95076"
 "checksum parity-wasm 0.31.3 (registry+https://github.com/rust-lang/crates.io-index)" = "511379a8194230c2395d2f5fa627a5a7e108a9f976656ce723ae68fca4097bfc"
 "checksum parking_lot 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)" = "d4d05f1349491390b1730afba60bb20d55761bef489a954546b58b4b34e1e2ac"
 "checksum parking_lot 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "f0802bff09003b291ba756dc7e79313e51cc31667e94afbe847def490424cde5"
@@ -3181,7 +3182,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum rustc-demangle 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "adacaae16d02b6ec37fdc7acfcddf365978de76d1983d3ee22afc260e1ca9619"
 "checksum rustc-hex 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "403bb3a286107a04825a5f82e1270acc1e14028d3d554d7a1e08914549575ab8"
 "checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
-"checksum rw-stream-sink 0.1.1 (git+https://github.com/tomaka/libp2p-rs?branch=substrate-tmp-2019-03-20)" = "<none>"
+"checksum rw-stream-sink 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d548a40fe17c3a77d54b82457b79fcc9b8a288d509ca20fbf5aa1dac386d22d6"
 "checksum ryu 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "eb9e9b8cde282a9fe6a42dd4681319bfb63f121b8a8ee9439c6f4107e58a46f7"
 "checksum safe-mix 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7f7bf422d23a88c16d5090d455f182bc99c60af4df6a345c63428acf5129e347"
 "checksum schnorrkel 0.0.0 (git+https://github.com/w3f/schnorrkel)" = "<none>"
@@ -1,6 +1,6 @@
 [package]
 name = "substrate-test-runtime-wasm"
-version = "0.1.0"
+version = "1.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
@@ -1,6 +1,6 @@
 [package]
 name = "substrate-transaction-pool"
-version = "0.1.0"
+version = "1.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
@@ -1,6 +1,6 @@
 [package]
 name = "substrate-transaction-graph"
-version = "0.1.0"
+version = "1.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
@@ -1,6 +1,6 @@
 [package]
 name = "substrate-trie"
-version = "0.4.0"
+version = "1.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "Patricia trie stuff using a parity-codec node format"
 repository = "https://github.com/paritytech/parity-common"
@@ -1,6 +1,6 @@
 [package]
 name = "fork-tree"
-version = "0.1.0"
+version = "1.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
@@ -1,6 +1,6 @@
 [package]
 name = "node-template"
-version = "0.9.0"
+version = "1.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 build = "build.rs"
 edition = "2018"
@@ -1,6 +1,6 @@
 [package]
 name = "node-template-runtime"
-version = "0.9.0"
+version = "1.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
@@ -1,6 +1,6 @@
 [package]
 name = "node-template-runtime-wasm"
-version = "0.9.0"
+version = "1.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
@@ -1,6 +1,6 @@
 [package]
 name = "node-cli"
-version = "0.1.0"
+version = "1.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "Substrate node implementation in Rust."
 build = "build.rs"
@@ -1,6 +1,6 @@
 [package]
 name = "node-executor"
-version = "0.1.0"
+version = "1.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "Substrate node implementation in Rust."
 edition = "2018"
@@ -1,6 +1,6 @@
 [package]
 name = "node-primitives"
-version = "0.1.0"
+version = "1.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
@@ -1,6 +1,6 @@
 [package]
 name = "node-runtime"
-version = "0.1.0"
+version = "1.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
@@ -59,8 +59,8 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	spec_name: create_runtime_str!("node"),
 	impl_name: create_runtime_str!("substrate-node"),
 	authoring_version: 10,
-	spec_version: 53,
+	spec_version: 54,
-	impl_version: 53,
+	impl_version: 54,
 	apis: RUNTIME_API_VERSIONS,
 };
@@ -1,6 +1,6 @@
 [package]
 name = "node-runtime-wasm"
-version = "0.1.0"
+version = "1.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
@@ -1,6 +1,6 @@
 [package]
 name = "node-template-release"
-version = "0.1.0"
+version = "1.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
@@ -1,6 +1,6 @@
 [package]
 name = "srml-assets"
-version = "0.1.0"
+version = "1.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
@@ -1,6 +1,6 @@
 [package]
 name = "srml-aura"
-version = "0.1.0"
+version = "1.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
@@ -1,6 +1,6 @@
 [package]
 name = "srml-balances"
-version = "0.1.0"
+version = "1.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
@@ -1,6 +1,6 @@
 [package]
 name = "srml-consensus"
-version = "0.1.0"
+version = "1.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
@@ -70,7 +70,7 @@
 //! Log changes in the authorities set:
 //!
 //! ```rust,ignore
-//! <consensus::Module<T>>::on_finalise(5); // finalize UintAuthorityId(5)
+//! <consensus::Module<T>>::on_finalize(5); // finalize UintAuthorityId(5)
 //! ```
 //!
 //! ### Example from SRML
@@ -1,6 +1,6 @@
 [package]
 name = "srml-contract"
-version = "0.1.0"
+version = "1.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
@@ -1,6 +1,6 @@
 [package]
 name = "srml-council"
-version = "0.1.0"
+version = "1.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
@@ -1,6 +1,6 @@
 [package]
 name = "srml-democracy"
-version = "0.1.0"
+version = "1.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
@@ -1,6 +1,6 @@
 [package]
 name = "srml-example"
-version = "0.1.0"
+version = "1.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
@@ -1,6 +1,6 @@
 [package]
 name = "srml-executive"
-version = "0.1.0"
+version = "1.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
@@ -1,6 +1,6 @@
 [package]
 name = "srml-finality-tracker"
-version = "0.1.0"
+version = "1.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
@@ -1,6 +1,6 @@
 [package]
 name = "srml-grandpa"
-version = "0.1.0"
+version = "1.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
@@ -1,6 +1,6 @@
 [package]
 name = "srml-indices"
-version = "0.1.0"
+version = "1.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
@@ -1,6 +1,6 @@
 [package]
 name = "srml-metadata"
-version = "0.1.0"
+version = "1.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
@@ -1,6 +1,6 @@
 [package]
 name = "srml-session"
-version = "0.1.0"
+version = "1.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition =  "2018"
@@ -1,6 +1,6 @@
 [package]
 name = "srml-staking"
-version = "0.1.0"
+version = "1.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
@@ -944,16 +944,12 @@ impl<T: Trait> Module<T> {
 	///
 	/// Returns the new SlotStake value.
 	fn select_validators() -> BalanceOf<T> {
-		let rounds = || <ValidatorCount<T>>::get() as usize;
+		let maybe_elected_candidates = elect::<T, _, _, _>(
-		let validators = || <Validators<T>>::enumerate();
+			Self::validator_count() as usize,
-		let nominators = || <Nominators<T>>::enumerate();
+			Self::minimum_validator_count().max(1) as usize,
-		let min_validator_count = Self::minimum_validator_count() as usize;
+			<Validators<T>>::enumerate(),
-		let maybe_elected_candidates = elect::<T, _, _, _, _>(
+			<Nominators<T>>::enumerate(),
 			rounds,
 			validators,
 			nominators,
 			Self::slashable_balance_of,
 			min_validator_count,
 			ElectionConfig::<BalanceOf<T>> {
 				equalize: false,
 				tolerance: <BalanceOf<T>>::sa(10 as u64),
@@ -101,7 +101,7 @@ pub struct ExtBuilder {
 	nominate: bool,
 	validator_count: u32,
 	minimum_validator_count: u32,
-	fare: bool,
+	fair: bool,
 }
 impl Default for ExtBuilder {
@@ -116,7 +116,7 @@ impl Default for ExtBuilder {
 			nominate: true,
 			validator_count: 2,
 			minimum_validator_count: 0,
-			fare: true
+			fair: true
 		}
 	}
 }
@@ -154,8 +154,8 @@ impl ExtBuilder {
 		self.minimum_validator_count = count;
 		self
 	}
-	pub fn fare(mut self, is_fare: bool) -> Self {
+	pub fn fair(mut self, is_fair: bool) -> Self {
-		self.fare = is_fare;
+		self.fair = is_fair;
 		self
 	}
 	pub fn build(self) -> runtime_io::TestExternalities<Blake2Hasher> {
@@ -205,7 +205,7 @@ impl ExtBuilder {
 			stakers: if self.validator_pool {
 				vec![
 					(11, 10, balance_factor * 1000, StakerStatus::<AccountIdType>::Validator),
-					(21, 20, balance_factor * if self.fare { 1000 } else { 2000 }, StakerStatus::<AccountIdType>::Validator),
+					(21, 20, balance_factor * if self.fair { 1000 } else { 2000 }, StakerStatus::<AccountIdType>::Validator),
 					(31, 30, balance_factor * 1000, if self.validator_pool { StakerStatus::<AccountIdType>::Validator } else { StakerStatus::<AccountIdType>::Idle }),
 					(41, 40, balance_factor * 1000, if self.validator_pool { StakerStatus::<AccountIdType>::Validator } else { StakerStatus::<AccountIdType>::Idle }),
 					// nominator
@@ -214,7 +214,8 @@ impl ExtBuilder {
 			} else {
 				vec![
 					(11, 10, balance_factor * 1000, StakerStatus::<AccountIdType>::Validator),
-					(21, 20, balance_factor * if self.fare { 1000 } else { 2000 }, StakerStatus::<AccountIdType>::Validator),
+					(21, 20, balance_factor * if self.fair { 1000 } else { 2000 }, StakerStatus::<AccountIdType>::Validator),
 					(31, 30, 1, StakerStatus::<AccountIdType>::Validator),
 					// nominator
 					(101, 100, balance_factor * 500, if self.nominate { StakerStatus::<AccountIdType>::Nominator(vec![11, 21]) } else { StakerStatus::<AccountIdType>::Nominator(vec![]) })
 				]
@@ -92,59 +92,62 @@ pub struct Edge<AccountId> {
 ///
 /// Returns an Option of elected candidates, if election is performed.
 /// Returns None if not enough candidates exist.
-pub fn elect<T: Trait + 'static, FR, FN, FV, FS>(
+pub fn elect<T: Trait + 'static, FV, FN, FS>(
-		get_rounds: FR,
+	validator_count: usize,
 		get_validators: FV,
 		get_nominators: FN,
 		stash_of: FS,
 	minimum_validator_count: usize,
 	validator_iter: FV,
 	nominator_iter: FN,
 	stash_of: FS,
 	config: ElectionConfig<BalanceOf<T>>,
 ) -> Option<Vec<Candidate<T::AccountId, BalanceOf<T>>>> where
-	FR: Fn() -> usize,
+	FV: Iterator<Item=(T::AccountId, ValidatorPrefs<BalanceOf<T>>)>,
-	FV: Fn() -> Box<dyn Iterator<
+	FN: Iterator<Item=(T::AccountId, Vec<T::AccountId>)>,
 		Item =(T::AccountId, ValidatorPrefs<BalanceOf<T>>)
 	>>,
 	FN: Fn() -> Box<dyn Iterator<
 		Item =(T::AccountId, Vec<T::AccountId>)
 	>>,
 	for <'r> FS: Fn(&'r T::AccountId) -> BalanceOf<T>,
 {
-	let expand = |b: BalanceOf<T>|    <T::CurrencyToVote as Convert<BalanceOf<T>, u64>>::convert(b) as ExtendedBalance;
+	let into_currency = |b: BalanceOf<T>| <T::CurrencyToVote as Convert<BalanceOf<T>, u64>>::convert(b) as ExtendedBalance;
-	let shrink = |b: ExtendedBalance| <T::CurrencyToVote as Convert<ExtendedBalance, BalanceOf<T>>>::convert(b);
+	let into_votes = |b: ExtendedBalance| <T::CurrencyToVote as Convert<ExtendedBalance, BalanceOf<T>>>::convert(b);
 	let rounds = get_rounds();
 	let mut elected_candidates;
-	// 1- Pre-process candidates and place them in a container
+	// 1- Pre-process candidates and place them in a container, optimisation and add phantom votes.
-	let mut candidates = get_validators().map(|(who, _)| {
+	// Candidates who have 0 stake => have no votes or all null-votes. Kick them out not.
 	let mut nominators: Vec<Nominator<T::AccountId>> = Vec::with_capacity(validator_iter.size_hint().0 + nominator_iter.size_hint().0);
 	let mut candidates = validator_iter.map(|(who, _)| {
 			let stash_balance = stash_of(&who);
 			Candidate {
 				who,
 				exposure: Exposure { total: stash_balance, own: stash_balance, others: vec![] },
 				..Default::default()
 			}
-	}).collect::<Vec<Candidate<T::AccountId, BalanceOf<T>>>>();
+		})
-
+		.filter_map(|mut c| {
-	// 1.1- Add phantom votes.
+			c.approval_stake += into_currency(c.exposure.total);
-	let mut nominators: Vec<Nominator<T::AccountId>> = Vec::with_capacity(candidates.len());
+			if c.approval_stake.is_zero() {
-	candidates.iter_mut().enumerate().for_each(|(idx, c)| {
+				None
-		c.approval_stake += expand(c.exposure.total);
+			} else {
 				Some(c)
 			}
 		})
 		.enumerate()
 		.map(|(idx, c)| {
 			nominators.push(Nominator {
 				who: c.who.clone(),
 				edges: vec![ Edge { who: c.who.clone(), candidate_index: idx, ..Default::default() }],
-			budget: expand(c.exposure.total),
+				budget: into_currency(c.exposure.total),
 				load: Fraction::zero(),
 		})
 			});
 			c
 		})
 		.collect::<Vec<Candidate<T::AccountId, BalanceOf<T>>>>();
 	// 2- Collect the nominators with the associated votes.
 	// Also collect approval stake along the way.
-	nominators.extend(get_nominators().map(|(who, nominees)| {
+	nominators.extend(nominator_iter.map(|(who, nominees)| {
 		let nominator_stake = stash_of(&who);
 		let mut edges: Vec<Edge<T::AccountId>> = Vec::with_capacity(nominees.len());
 		for n in &nominees {
 			if let Some(idx) = candidates.iter_mut().position(|i| i.who == *n) {
 				candidates[idx].approval_stake = candidates[idx].approval_stake
-					.saturating_add(expand(nominator_stake));
+					.saturating_add(into_currency(nominator_stake));
 				edges.push(Edge { who: n.clone(), candidate_index: idx, ..Default::default() });
 			}
 		}
@@ -152,22 +155,18 @@ pub fn elect<T: Trait + 'static, FR, FN, FV, FS>(
 		Nominator {
 			who,
 			edges: edges,
-			budget: expand(nominator_stake),
+			budget: into_currency(nominator_stake),
 			load: Fraction::zero(),
 		}
 	}));
 	// 3- optimization:
 	// Candidates who have 0 stake => have no votes or all null-votes. Kick them out not.
 	let mut candidates = candidates.into_iter().filter(|c| c.approval_stake > 0)
 		.collect::<Vec<Candidate<T::AccountId, BalanceOf<T>>>>();
 	// 4- If we have more candidates then needed, run Phragmén.
-	if candidates.len() >= rounds {
+	if candidates.len() >= minimum_validator_count {
-		elected_candidates = Vec::with_capacity(rounds);
+		let validator_count = validator_count.min(candidates.len());
 		elected_candidates = Vec::with_capacity(validator_count);
 		// Main election loop
-		for _round in 0..rounds {
+		for _round in 0..validator_count {
 			// Loop 1: initialize score
 			for c in &mut candidates {
 				if !c.elected {
@@ -178,7 +177,7 @@ pub fn elect<T: Trait + 'static, FR, FN, FV, FS>(
 			for n in &nominators {
 				for e in &n.edges {
 					let c = &mut candidates[e.candidate_index];
-					if !c.elected {
+					if !c.elected && !c.approval_stake.is_zero() {
 						let temp = n.budget.saturating_mul(*n.load) / c.approval_stake;
 						c.score = Fraction::from_max_value((*c.score).saturating_add(temp));
 					}
@@ -186,12 +185,11 @@ pub fn elect<T: Trait + 'static, FR, FN, FV, FS>(
 			}
 			// Find the best
-			let winner = candidates
+			if let Some(winner) = candidates
 				.iter_mut()
 				.filter(|c| !c.elected)
 				.min_by_key(|c| *c.score)
-				.expect("candidates length is checked to be >0; qed");
+			{
 				// loop 3: update nominator and edge load
 				winner.elected = true;
 				for n in &mut nominators {
@@ -204,7 +202,11 @@ pub fn elect<T: Trait + 'static, FR, FN, FV, FS>(
 				}
 				elected_candidates.push(winner.clone());
-		} // end of all rounds
+			} else {
 				break
 			}
 		}
 		// end of all rounds
 		// 4.1- Update backing stake of candidates and nominators
 		for n in &mut nominators {
@@ -213,13 +215,13 @@ pub fn elect<T: Trait + 'static, FR, FN, FV, FS>(
 				if let Some(c) = elected_candidates.iter_mut().find(|c| c.who == e.who) {
 					e.elected = true;
 					// NOTE: for now, always divide last to avoid collapse to zero.
-					e.backing_stake = n.budget.saturating_mul(*e.load) / *n.load;
+					e.backing_stake = n.budget.saturating_mul(*e.load) / n.load.max(1);
 					c.backing_stake = c.backing_stake.saturating_add(e.backing_stake);
 					if c.who != n.who {
 						// Only update the exposure if this vote is from some other account.
-						c.exposure.total = c.exposure.total.saturating_add(shrink(e.backing_stake));
+						c.exposure.total = c.exposure.total.saturating_add(into_votes(e.backing_stake));
 						c.exposure.others.push(
-							IndividualExposure { who: n.who.clone(), value: shrink(e.backing_stake) }
+							IndividualExposure { who: n.who.clone(), value: into_votes(e.backing_stake) }
 						);
 					}
 				}
@@ -253,26 +255,10 @@ pub fn elect<T: Trait + 'static, FR, FN, FV, FS>(
 				}
 			}
 		}
 	} else {
 		if candidates.len() > minimum_validator_count {
 			// if we don't have enough candidates, just choose all that have some vote.
 			elected_candidates = candidates;
 			for n in &mut nominators {
 				let nominator = n.who.clone();
 				for e in &mut n.edges {
 					if let Some(c) = elected_candidates.iter_mut().find(|c| c.who == e.who && c.who != nominator) {
 						c.exposure.total = c.exposure.total.saturating_add(shrink(n.budget));
 						c.exposure.others.push(
 							IndividualExposure { who: n.who.clone(), value: shrink(n.budget) }
 						);
 					}
 				}
 			}
 	} else {
 		// if we have less than minimum, use the previous validator set.
 		return None
 	}
 	}
 	Some(elected_candidates)
 }
@@ -285,9 +271,9 @@ pub fn equalize<T: Trait + 'static>(
 	elected_candidates: &mut Vec<Candidate<T::AccountId, BalanceOf<T>>>,
 	_tolerance: BalanceOf<T>
 ) -> BalanceOf<T> {
-	let expand = |b: BalanceOf<T>|    <T::CurrencyToVote as Convert<BalanceOf<T>, u64>>::convert(b) as ExtendedBalance;
+	let into_currency = |b: BalanceOf<T>|    <T::CurrencyToVote as Convert<BalanceOf<T>, u64>>::convert(b) as ExtendedBalance;
-	let shrink = |b: ExtendedBalance| <T::CurrencyToVote as Convert<ExtendedBalance, BalanceOf<T>>>::convert(b);
+	let into_votes = |b: ExtendedBalance| <T::CurrencyToVote as Convert<ExtendedBalance, BalanceOf<T>>>::convert(b);
-	let tolerance = expand(_tolerance);
+	let tolerance = into_currency(_tolerance);
 	let mut elected_edges = nominator.edges
 		.iter_mut()
@@ -324,7 +310,7 @@ pub fn equalize<T: Trait + 'static>(
 		difference = max_stake.saturating_sub(min_stake);
 		difference = difference.saturating_add(nominator.budget.saturating_sub(stake_used));
 		if difference < tolerance {
-			return shrink(difference);
+			return into_votes(difference);
 		}
 	} else {
 		difference = nominator.budget;
@@ -335,7 +321,7 @@ pub fn equalize<T: Trait + 'static>(
 		// NOTE: no assertions in the runtime, but this should nonetheless be indicative.
 		//assert_eq!(elected_candidates[e.elected_idx].who, e.who);
 		elected_candidates[e.elected_idx].backing_stake -= e.backing_stake;
-		elected_candidates[e.elected_idx].exposure.total -= shrink(e.backing_stake);
+		elected_candidates[e.elected_idx].exposure.total -= into_votes(e.backing_stake);
 		e.backing_stake = 0;
 	});
@@ -367,11 +353,11 @@ pub fn equalize<T: Trait + 'static>(
 		e.backing_stake = (excess / split_ways as ExtendedBalance)
 			.saturating_add(last_stake)
 			.saturating_sub(c.backing_stake);
-		c.exposure.total = c.exposure.total.saturating_add(shrink(e.backing_stake));
+		c.exposure.total = c.exposure.total.saturating_add(into_votes(e.backing_stake));
 		c.backing_stake = c.backing_stake.saturating_add(e.backing_stake);
 		if let Some(i_expo) = c.exposure.others.iter_mut().find(|i| i.who == nominator_address) {
-			i_expo.value = shrink(e.backing_stake);
+			i_expo.value = into_votes(e.backing_stake);
 		}
 	});
-	shrink(difference)
+	into_votes(difference)
 }
@@ -45,6 +45,7 @@ fn basic_setup_works() {
 		// ValidatorPrefs are default, thus unstake_threshold is 3, other values are default for their type
 		assert_eq!(<Validators<Test>>::enumerate().collect::<Vec<_>>(), vec![
 			(31, ValidatorPrefs { unstake_threshold: 3, validator_payment: 0 }),
 			(21, ValidatorPrefs { unstake_threshold: 3, validator_payment: 0 }),
 			(11, ValidatorPrefs { unstake_threshold: 3, validator_payment: 0 })
 		]);
@@ -435,7 +436,7 @@ fn staking_should_work() {
 	with_externalities(&mut ExtBuilder::default()
 		.sessions_per_era(3)
 		.nominate(false)
-		.fare(false) // to give 20 more staked value
+		.fair(false) // to give 20 more staked value
 		.build(),
 	|| {
 		// remember + compare this along with the test.
@@ -518,17 +519,14 @@ fn less_than_needed_candidates_works() {
 	// The expected behavior is to choose all the candidates that have some vote.
 	with_externalities(&mut ExtBuilder::default()
 		.minimum_validator_count(1)
-		.validator_count(3)
+		.validator_count(4)
 		.nominate(false)
 		.build(),
 	|| {
 		assert_eq!(Staking::era_length(), 1);
-		assert_eq!(Staking::validator_count(), 3);
+		assert_eq!(Staking::validator_count(), 4);
 		assert_eq!(Staking::minimum_validator_count(), 1);
 		// initial validators
 		assert_eq_uvec!(Session::validators(), vec![20, 10]);
 		// 10 and 20 are now valid candidates.
 		// trigger era
 		System::set_block_number(1);
@@ -536,11 +534,12 @@ fn less_than_needed_candidates_works() {
 		assert_eq!(Staking::current_era(), 1);
 		// both validators will be chosen again. NO election algorithm is even executed.
-		assert_eq_uvec!(Session::validators(), vec![20, 10]);
+		assert_eq_uvec!(Session::validators(), vec![30, 20, 10]);
 		// But the exposure is updated in a simple way. No external votes exists. This is purely self-vote.
 		assert_eq!(Staking::stakers(10).others.iter().map(|e| e.who).collect::<Vec<BalanceOf<Test>>>(), vec![]);
 		assert_eq!(Staking::stakers(20).others.iter().map(|e| e.who).collect::<Vec<BalanceOf<Test>>>(), vec![]);
 		assert_eq!(Staking::stakers(30).others.iter().map(|e| e.who).collect::<Vec<BalanceOf<Test>>>(), vec![]);
 	});
 }
@@ -702,8 +701,6 @@ fn nominators_also_get_slashed() {
 		assert_eq!(Staking::offline_slash_grace(), 0);
 		// Account 10 has not been reported offline
 		assert_eq!(Staking::slash_count(&10), 0);
 		// initial validators
 		assert_eq_uvec!(Session::validators(), vec![20, 10]);
 	<OfflineSlash<Test>>::put(Perbill::from_percent(12));
 		// Set payee to controller
@@ -879,7 +876,7 @@ fn cannot_transfer_staked_balance_2() {
 	// 21 has 2000 free balance but 1000 at stake
 	with_externalities(&mut ExtBuilder::default()
 		.nominate(false)
-		.fare(true)
+		.fair(true)
 		.build(),
 	|| {
 		// Confirm account 21 is stashed
@@ -1182,7 +1179,7 @@ fn slot_stake_is_least_staked_validator_and_exposure_defines_maximum_punishment(
 	// Test that slot_stake is the maximum punishment that can happen to a validator
 	with_externalities(&mut ExtBuilder::default()
 		.nominate(false)
-		.fare(false)
+		.fair(false)
 		.build(),
 	|| {
 		// Confirm validator count is 2
@@ -1482,7 +1479,7 @@ fn phragmen_election_works_with_post_processing() {
 		assert_eq_uvec!(Session::validators(), vec![20, 10]);
 		// Bond [30, 31] as the third validator
-		assert_ok!(Staking::bond(Origin::signed(31), 30, 1000, RewardDestination::default()));
+		assert_ok!(Staking::bond_extra(Origin::signed(31), 999));
 		assert_ok!(Staking::validate(Origin::signed(30), ValidatorPrefs::default()));
 		// bond [2,1](A), [4,3](B), as 2 nominators
@@ -1494,17 +1491,12 @@ fn phragmen_election_works_with_post_processing() {
 		assert_ok!(Staking::bond(Origin::signed(3), 4, 1000, RewardDestination::default()));
 		assert_ok!(Staking::nominate(Origin::signed(4), vec![11, 31]));
-		let rounds =     || 2 as usize;
+		let winners = phragmen::elect::<Test, _, _, _>(
-		let validators = || <Validators<Test>>::enumerate();
+			2,
-		let nominators = || <Nominators<Test>>::enumerate();
+			Staking::minimum_validator_count() as usize,
-		let min_validator_count = Staking::minimum_validator_count() as usize;
+			<Validators<Test>>::enumerate(),
-
+			<Nominators<Test>>::enumerate(),
 		let winners = phragmen::elect::<Test, _, _, _, _>(
 			rounds,
 			validators,
 			nominators,
 			Staking::slashable_balance_of,
 			min_validator_count,
 			ElectionConfig::<BalanceOf<Test>> {
 				equalize: true,
 				tolerance: <BalanceOf<Test>>::sa(10 as u64),
@@ -1646,21 +1638,18 @@ fn bond_with_no_staked_value() {
 		let initial_balance_2 = Balances::free_balance(&2);
 		let initial_balance_4 = Balances::free_balance(&4);
 		// initial validators
 		assert_eq_uvec!(Session::validators(), vec![20, 10]);
 		// Stingy validator.
-		assert_ok!(Staking::bond(Origin::signed(1), 2, 0, RewardDestination::Controller));
+		assert_ok!(Staking::bond(Origin::signed(1), 2, 1, RewardDestination::Controller));
 		assert_ok!(Staking::validate(Origin::signed(2), ValidatorPrefs::default()));
 		System::set_block_number(1);
 		Session::check_rotate_session(System::block_number());
 		// Not elected even though we want 3.
-		assert_eq_uvec!(Session::validators(), vec![20, 10]);
+		assert_eq_uvec!(Session::validators(), vec![30, 20, 10]);
-		// min of 10 and 20.
+		// min of 10, 20 and 30 (30 got a payout into staking so it raised it from 1 to 11).
-		assert_eq!(Staking::slot_stake(), 1000);
+		assert_eq!(Staking::slot_stake(), 11);
 		// let's make the stingy one elected.
 		assert_ok!(Staking::bond(Origin::signed(3), 4, 500, RewardDestination::Controller));
@@ -1675,9 +1664,9 @@ fn bond_with_no_staked_value() {
 		// Stingy one is selected
 		assert_eq_uvec!(Session::validators(), vec![20, 10, 2]);
-		assert_eq!(Staking::stakers(1), Exposure { own: 0, total: 500, others: vec![IndividualExposure { who: 3, value: 500}]});
+		assert_eq!(Staking::stakers(1), Exposure { own: 1, total: 501, others: vec![IndividualExposure { who: 3, value: 500}]});
 		// New slot stake.
-		assert_eq!(Staking::slot_stake(), 500);
+		assert_eq!(Staking::slot_stake(), 501);
 		// no rewards paid to 2 and 4 yet
 		assert_eq!(Balances::free_balance(&2), initial_balance_2);
@@ -1687,10 +1676,10 @@ fn bond_with_no_staked_value() {
 		Session::check_rotate_session(System::block_number());
 		let reward = Staking::current_session_reward();
-		// 2 will not get any reward
+		// 2 will not get a reward of only 1
-		// 4 will get all the reward share
+		// 4 will get the rest
-		assert_eq!(Balances::free_balance(&2), initial_balance_2);
+		assert_eq!(Balances::free_balance(&2), initial_balance_2 + 1);
-		assert_eq!(Balances::free_balance(&4), initial_balance_4 + reward);
+		assert_eq!(Balances::free_balance(&4), initial_balance_4 + reward - 1);
 	});
 }
@@ -1704,14 +1693,13 @@ fn bond_with_little_staked_value_bounded_by_slot_stake() {
 		.minimum_validator_count(1)
 		.build(),
 	|| {
 		// setup
 		assert_ok!(Staking::chill(Origin::signed(30)));
 		assert_ok!(Staking::set_payee(Origin::signed(10), RewardDestination::Controller));
 		let initial_balance_2 = Balances::free_balance(&2);
 		let initial_balance_10 = Balances::free_balance(&10);
 		// initial validators
 		assert_eq_uvec!(Session::validators(), vec![20, 10]);
 		// Stingy validator.
 		assert_ok!(Staking::bond(Origin::signed(1), 2, 1, RewardDestination::Controller));
 		assert_ok!(Staking::validate(Origin::signed(2), ValidatorPrefs::default()));
@@ -1750,7 +1738,7 @@ fn phragmen_linear_worse_case_equalize() {
 	with_externalities(&mut ExtBuilder::default()
 		.nominate(false)
 		.validator_pool(true)
-		.fare(true)
+		.fair(true)
 		.build(),
 	|| {
 		let bond_validator = |a, b| {
@@ -1810,7 +1798,7 @@ fn phragmen_chooses_correct_number_of_validators() {
 	with_externalities(&mut ExtBuilder::default()
 		.nominate(true)
 		.validator_pool(true)
-		.fare(true)
+		.fair(true)
 		.validator_count(1)
 		.build(),
 	|| {
@@ -1,6 +1,6 @@
 [package]
 name = "srml-sudo"
-version = "0.1.0"
+version = "1.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
@@ -1,6 +1,6 @@
 [package]
 name = "srml-support"
-version = "0.1.0"
+version = "1.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
@@ -17,7 +17,7 @@ inherents = { package = "substrate-inherents", path = "../../core/inherents", de
 srml-support-procedural = { path = "./procedural" }
 paste = "0.1"
 once_cell = { version = "0.1.6", default-features = false, optional = true }
-bitmask = { git = "https://github.com/paritytech/bitmask", default-features = false }
+bitmask = { version = "0.5", default-features = false }
 [dev-dependencies]
 pretty_assertions = "0.5.1"
@@ -1,6 +1,6 @@
 [package]
 name = "srml-support-procedural"
-version = "0.1.0"
+version = "1.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
@@ -1,6 +1,6 @@
 [package]
 name = "srml-support-procedural-tools"
-version = "0.1.0"
+version = "1.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
@@ -1,6 +1,6 @@
 [package]
 name = "srml-support-procedural-tools-derive"
-version = "0.1.0"
+version = "1.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
@@ -1,6 +1,6 @@
 [package]
 name = "srml-system"
-version = "0.1.0"
+version = "1.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
@@ -1,6 +1,6 @@
 [package]
 name = "srml-timestamp"
-version = "0.1.0"
+version = "1.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
@@ -1,6 +1,6 @@
 [package]
 name = "srml-treasury"
-version = "0.1.0"
+version = "1.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
@@ -1,6 +1,6 @@
 [package]
 name = "subkey"
-version = "0.2.0"
+version = "1.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"