diff --git a/Cargo.lock b/Cargo.lock
index 6ceb7edb..d4744cdf 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -150,6 +150,52 @@ dependencies = [
  "syn 1.0.11",
 ]
 
+[[package]]
+name = "async-macros"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "644a5a8de80f2085a1e7e57cd1544a2a7438f6e003c0790999bd43b92a77cdb2"
+dependencies = [
+ "futures-core",
+ "pin-utils",
+]
+
+[[package]]
+name = "async-std"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "513ee3c49800679a319912340f5601afda9e72848d7dea3a48bab489e8c1a46f"
+dependencies = [
+ "async-macros",
+ "async-task",
+ "broadcaster",
+ "crossbeam-channel",
+ "crossbeam-deque",
+ "crossbeam-utils 0.7.0",
+ "futures-core",
+ "futures-io",
+ "futures-timer 2.0.2",
+ "kv-log-macro",
+ "log 0.4.8",
+ "memchr",
+ "mio",
+ "mio-uds",
+ "num_cpus",
+ "once_cell 1.2.0",
+ "pin-project-lite",
+ "pin-utils",
+ "slab",
+]
+
+[[package]]
+name = "async-task"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "de6bd58f7b9cc49032559422595c81cbfcf04db2f2133592f70af19e258a1ced"
+dependencies = [
+ "crossbeam-utils 0.6.6",
+]
+
 [[package]]
 name = "atty"
 version = "0.2.13"
@@ -215,9 +261,9 @@ dependencies = [
 
 [[package]]
 name = "bindgen"
-version = "0.47.3"
+version = "0.49.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df683a55b54b41d5ea8ebfaebb5aa7e6b84e3f3006a78f010dadc9ca88469260"
+checksum = "4c07087f3d5731bf3fb375a81841b99597e25dc11bd3bc72d16d43adf6624a6e"
 dependencies = [
  "bitflags",
  "cexpr",
@@ -225,13 +271,14 @@ dependencies = [
  "clang-sys",
  "clap",
  "env_logger 0.6.2",
- "hashbrown 0.1.8",
+ "fxhash",
  "lazy_static",
  "log 0.4.8",
  "peeking_take_while",
  "proc-macro2 0.4.30",
  "quote 0.6.13",
  "regex",
+ "shlex",
  "which",
 ]
 
@@ -305,6 +352,20 @@ dependencies = [
  "byte-tools",
 ]
 
+[[package]]
+name = "broadcaster"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "07a1446420a56f1030271649ba0da46d23239b3a68c73591cea5247f15a788a0"
+dependencies = [
+ "futures-channel-preview",
+ "futures-core-preview",
+ "futures-sink-preview",
+ "futures-util-preview",
+ "parking_lot 0.9.0",
+ "slab",
+]
+
 [[package]]
 name = "bs58"
 version = "0.2.5"
@@ -367,6 +428,12 @@ dependencies = [
  "iovec",
 ]
 
+[[package]]
+name = "bytes"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1c85319f157e4e26c703678e68e26ab71a46c0199286fa670b21cc9fec13d895"
+
 [[package]]
 name = "c2-chacha"
 version = "0.2.3"
@@ -415,16 +482,17 @@ checksum = "31850b4a4d6bae316f7a09e691c944c28299298837edc0a03f755618c23cbc01"
 dependencies = [
  "num-integer",
  "num-traits",
+ "serde",
  "time",
 ]
 
 [[package]]
 name = "clang-sys"
-version = "0.26.4"
+version = "0.28.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ef0c1bcf2e99c649104bd7a7012d8f8802684400e03db0ec0af48583c6fa0e4"
+checksum = "81de550971c976f176130da4b2978d3b524eaa0fd9ac31f3ceb5ae1231fb4853"
 dependencies = [
- "glob",
+ "glob 0.3.0",
  "libc",
  "libloading",
 ]
@@ -524,11 +592,11 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-channel"
-version = "0.3.9"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8ec7fcd21571dc78f96cc96243cab8d8f035247c3efd16c687be154c3fa9efa"
+checksum = "acec9a3b0b3559f15aee4f90746c4e5e293b701c0f7d3925d24e01645267b68c"
 dependencies = [
- "crossbeam-utils 0.6.6",
+ "crossbeam-utils 0.7.0",
 ]
 
 [[package]]
@@ -662,6 +730,19 @@ dependencies = [
  "subtle 2.2.2",
 ]
 
+[[package]]
+name = "curve25519-dalek"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26778518a7f6cffa1d25a44b602b62b979bd88adb9e99ffec546998cf3404839"
+dependencies = [
+ "byteorder 1.3.2",
+ "digest",
+ "rand_core 0.5.1",
+ "subtle 2.2.2",
+ "zeroize 1.1.0",
+]
+
 [[package]]
 name = "data-encoding"
 version = "2.1.2"
@@ -694,6 +775,17 @@ dependencies = [
  "syn 0.15.44",
 ]
 
+[[package]]
+name = "derive_more"
+version = "0.99.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2159be042979966de68315bce7034bb000c775f22e3e834e1c52ff78f041cae8"
+dependencies = [
+ "proc-macro2 1.0.6",
+ "quote 1.0.2",
+ "syn 1.0.11",
+]
+
 [[package]]
 name = "digest"
 version = "0.8.1"
@@ -721,27 +813,13 @@ checksum = "923dea538cea0aa3025e8685b20d6ee21ef99c4f77e954a30febbaac5ec73a97"
 
 [[package]]
 name = "ed25519-dalek"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d07e8b8a8386c3b89a7a4b329fdfa4cb545de2545e9e2ebbc3dd3929253e426"
-dependencies = [
- "clear_on_drop",
- "curve25519-dalek",
- "failure",
- "rand 0.6.5",
-]
-
-[[package]]
-name = "ed25519-dalek"
-version = "1.0.0-pre.2"
+version = "1.0.0-pre.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "845aaacc16f01178f33349e7c992ecd0cee095aa5e577f0f4dee35971bd36455"
+checksum = "978710b352437433c97b2bff193f2fb1dfd58a093f863dd95e225a19baa599a2"
 dependencies = [
  "clear_on_drop",
- "curve25519-dalek",
- "failure",
- "rand_core 0.3.1",
- "rand_os",
+ "curve25519-dalek 2.0.0",
+ "rand 0.7.2",
  "sha2",
 ]
 
@@ -811,6 +889,15 @@ dependencies = [
  "parking_lot 0.7.1",
 ]
 
+[[package]]
+name = "exit-future"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e43f2f1833d64e33f15592464d6fdd70f349dda7b1a53088eb83cd94014008c5"
+dependencies = [
+ "futures 0.3.1",
+]
+
 [[package]]
 name = "failure"
 version = "0.1.6"
@@ -848,6 +935,19 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "finality-grandpa"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4106eb29c7e092f4a6ce6e7632abbbfdf85d94e63035d3790d2d16eeae83d3f4"
+dependencies = [
+ "futures 0.1.29",
+ "log 0.4.8",
+ "num-traits",
+ "parity-scale-codec",
+ "parking_lot 0.9.0",
+]
+
 [[package]]
 name = "fixed-hash"
 version = "0.5.1"
@@ -873,7 +973,7 @@ dependencies = [
  "libc",
  "libz-sys",
  "miniz_oxide",
- "tokio-io",
+ "tokio-io 0.1.12",
 ]
 
 [[package]]
@@ -900,9 +1000,131 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
 [[package]]
 name = "fork-tree"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?rev=dc4a8329b9c47790c25429a5df272b3648275c1b#dc4a8329b9c47790c25429a5df272b3648275c1b"
+source = "git+https://github.com/paritytech/substrate?rev=3d17cbd2fbcc337af49c861896ab4936b161bcee#3d17cbd2fbcc337af49c861896ab4936b161bcee"
+dependencies = [
+ "parity-scale-codec",
+]
+
+[[package]]
+name = "frame-executive"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate?rev=3d17cbd2fbcc337af49c861896ab4936b161bcee#3d17cbd2fbcc337af49c861896ab4936b161bcee"
+dependencies = [
+ "frame-support",
+ "frame-system",
+ "parity-scale-codec",
+ "serde",
+ "sp-io",
+ "sp-runtime",
+ "sp-std",
+]
+
+[[package]]
+name = "frame-metadata"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate?rev=3d17cbd2fbcc337af49c861896ab4936b161bcee#3d17cbd2fbcc337af49c861896ab4936b161bcee"
+dependencies = [
+ "parity-scale-codec",
+ "serde",
+ "sp-core",
+ "sp-std",
+]
+
+[[package]]
+name = "frame-support"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate?rev=3d17cbd2fbcc337af49c861896ab4936b161bcee#3d17cbd2fbcc337af49c861896ab4936b161bcee"
+dependencies = [
+ "bitmask",
+ "frame-metadata",
+ "frame-support-procedural",
+ "impl-trait-for-tuples",
+ "log 0.4.8",
+ "once_cell 0.2.4",
+ "parity-scale-codec",
+ "paste",
+ "serde",
+ "sp-arithmetic",
+ "sp-core",
+ "sp-inherents",
+ "sp-io",
+ "sp-runtime",
+ "sp-state-machine",
+ "sp-std",
+ "tracing",
+]
+
+[[package]]
+name = "frame-support-procedural"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate?rev=3d17cbd2fbcc337af49c861896ab4936b161bcee#3d17cbd2fbcc337af49c861896ab4936b161bcee"
+dependencies = [
+ "frame-support-procedural-tools",
+ "proc-macro2 1.0.6",
+ "quote 1.0.2",
+ "syn 1.0.11",
+]
+
+[[package]]
+name = "frame-support-procedural-tools"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate?rev=3d17cbd2fbcc337af49c861896ab4936b161bcee#3d17cbd2fbcc337af49c861896ab4936b161bcee"
+dependencies = [
+ "frame-support-procedural-tools-derive",
+ "proc-macro-crate",
+ "proc-macro2 1.0.6",
+ "quote 1.0.2",
+ "syn 1.0.11",
+]
+
+[[package]]
+name = "frame-support-procedural-tools-derive"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate?rev=3d17cbd2fbcc337af49c861896ab4936b161bcee#3d17cbd2fbcc337af49c861896ab4936b161bcee"
+dependencies = [
+ "proc-macro2 1.0.6",
+ "quote 1.0.2",
+ "syn 1.0.11",
+]
+
+[[package]]
+name = "frame-system"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate?rev=3d17cbd2fbcc337af49c861896ab4936b161bcee#3d17cbd2fbcc337af49c861896ab4936b161bcee"
+dependencies = [
+ "frame-support",
+ "impl-trait-for-tuples",
+ "parity-scale-codec",
+ "safe-mix",
+ "serde",
+ "sp-core",
+ "sp-io",
+ "sp-runtime",
+ "sp-std",
+ "sp-version",
+]
+
+[[package]]
+name = "frame-system-rpc-runtime-api"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate?rev=3d17cbd2fbcc337af49c861896ab4936b161bcee#3d17cbd2fbcc337af49c861896ab4936b161bcee"
 dependencies = [
  "parity-scale-codec",
+ "sp-api",
+]
+
+[[package]]
+name = "frame-utility"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate?rev=3d17cbd2fbcc337af49c861896ab4936b161bcee#3d17cbd2fbcc337af49c861896ab4936b161bcee"
+dependencies = [
+ "frame-support",
+ "frame-system",
+ "parity-scale-codec",
+ "serde",
+ "sp-io",
+ "sp-runtime",
+ "sp-std",
 ]
 
 [[package]]
@@ -1014,29 +1236,12 @@ dependencies = [
  "num_cpus",
 ]
 
-[[package]]
-name = "futures-executor-preview"
-version = "0.3.0-alpha.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75236e88bd9fe88e5e8bfcd175b665d0528fe03ca4c5207fabc028c8f9d93e98"
-dependencies = [
- "futures-core-preview",
- "futures-util-preview",
- "num_cpus",
-]
-
 [[package]]
 name = "futures-io"
 version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e676577d229e70952ab25f3945795ba5b16d63ca794ca9d2c860e5595d20b5ff"
 
-[[package]]
-name = "futures-io-preview"
-version = "0.3.0-alpha.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4914ae450db1921a56c91bde97a27846287d062087d4a652efc09bb3a01ebda"
-
 [[package]]
 name = "futures-macro"
 version = "0.3.1"
@@ -1049,20 +1254,6 @@ dependencies = [
  "syn 1.0.11",
 ]
 
-[[package]]
-name = "futures-preview"
-version = "0.3.0-alpha.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b1dce2a0267ada5c6ff75a8ba864b4e679a9e2aa44262af7a3b5516d530d76e"
-dependencies = [
- "futures-channel-preview",
- "futures-core-preview",
- "futures-executor-preview",
- "futures-io-preview",
- "futures-sink-preview",
- "futures-util-preview",
-]
-
 [[package]]
 name = "futures-sink"
 version = "0.3.1"
@@ -1092,6 +1283,12 @@ dependencies = [
  "pin-utils",
 ]
 
+[[package]]
+name = "futures-timer"
+version = "2.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1de7508b218029b0f01662ed8f61b1c964b3ae99d6f25462d0f55a595109df6"
+
 [[package]]
 name = "futures-util"
 version = "0.3.1"
@@ -1118,16 +1315,22 @@ version = "0.3.0-alpha.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5ce968633c17e5f97936bd2797b6e38fb56cf16a7422319f7ec2e30d3c470e8d"
 dependencies = [
- "futures 0.1.29",
  "futures-channel-preview",
  "futures-core-preview",
- "futures-io-preview",
  "futures-sink-preview",
- "memchr",
  "pin-utils",
  "slab",
 ]
 
+[[package]]
+name = "fxhash"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c"
+dependencies = [
+ "byteorder 1.3.2",
+]
+
 [[package]]
 name = "gcc"
 version = "0.3.55"
@@ -1182,6 +1385,12 @@ version = "0.2.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8be18de09a56b60ed0edf84bc9df007e30040691af7acd1c41874faac5895bfb"
 
+[[package]]
+name = "glob"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574"
+
 [[package]]
 name = "globset"
 version = "0.4.4"
@@ -1195,6 +1404,27 @@ dependencies = [
  "regex",
 ]
 
+[[package]]
+name = "grafana-data-source"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate?rev=3d17cbd2fbcc337af49c861896ab4936b161bcee#3d17cbd2fbcc337af49c861896ab4936b161bcee"
+dependencies = [
+ "async-std",
+ "chrono",
+ "derive_more 0.99.2",
+ "futures-timer 2.0.2",
+ "futures-util",
+ "futures-util-preview",
+ "hyper 0.13.0-alpha.4",
+ "lazy_static",
+ "log 0.4.8",
+ "parking_lot 0.9.0",
+ "serde",
+ "serde_json",
+ "tokio-executor 0.2.0-alpha.6",
+ "tokio-io 0.2.0-alpha.6",
+]
+
 [[package]]
 name = "h2"
 version = "0.1.26"
@@ -1202,7 +1432,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a5b34c246847f938a410a03c5458c7fee2274436675e76d8b903c08efc29c462"
 dependencies = [
  "byteorder 1.3.2",
- "bytes",
+ "bytes 0.4.12",
  "fnv",
  "futures 0.1.29",
  "http",
@@ -1210,7 +1440,28 @@ dependencies = [
  "log 0.4.8",
  "slab",
  "string",
- "tokio-io",
+ "tokio-io 0.1.12",
+]
+
+[[package]]
+name = "h2"
+version = "0.2.0-alpha.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0f107db1419ef8271686187b1a5d47c6431af4a7f4d98b495e7b7fc249bb0a78"
+dependencies = [
+ "bytes 0.4.12",
+ "fnv",
+ "futures-core-preview",
+ "futures-sink-preview",
+ "futures-util-preview",
+ "http",
+ "indexmap",
+ "log 0.4.8",
+ "slab",
+ "string",
+ "tokio-codec 0.2.0-alpha.6",
+ "tokio-io 0.2.0-alpha.6",
+ "tokio-sync 0.2.0-alpha.6",
 ]
 
 [[package]]
@@ -1277,15 +1528,9 @@ dependencies = [
 
 [[package]]
 name = "hex"
-version = "0.3.2"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "805026a5d0141ffc30abb3be3173848ad46a1b1664fe632428479619a3644d77"
-
-[[package]]
-name = "hex"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "023b39be39e3a2da62a94feb433e91e8bcd37676fbc8bea371daf52b7a769a3e"
+checksum = "023b39be39e3a2da62a94feb433e91e8bcd37676fbc8bea371daf52b7a769a3e"
 
 [[package]]
 name = "hex-literal"
@@ -1333,7 +1578,7 @@ version = "0.1.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d6ccf5ede3a895d8856620237b2f02972c1bbc78d2965ad7fe8838d4a0ed41f0"
 dependencies = [
- "bytes",
+ "bytes 0.4.12",
  "fnv",
  "itoa",
 ]
@@ -1344,12 +1589,22 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6741c859c1b2463a423a1dbce98d418e6c3c3fc720fb0d45528657320920292d"
 dependencies = [
- "bytes",
+ "bytes 0.4.12",
  "futures 0.1.29",
  "http",
  "tokio-buf",
 ]
 
+[[package]]
+name = "http-body"
+version = "0.2.0-alpha.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f3aef6f3de2bd8585f5b366f3f550b5774500b4764d00cf00f903c95749eec3"
+dependencies = [
+ "bytes 0.4.12",
+ "http",
+]
+
 [[package]]
 name = "httparse"
 version = "1.3.4"
@@ -1390,12 +1645,12 @@ version = "0.12.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9dbe6ed1438e1f8ad955a4701e9a944938e9519f6888d12d8558b645e247d5f6"
 dependencies = [
- "bytes",
+ "bytes 0.4.12",
  "futures 0.1.29",
  "futures-cpupool",
- "h2",
+ "h2 0.1.26",
  "http",
- "http-body",
+ "http-body 0.1.0",
  "httparse",
  "iovec",
  "itoa",
@@ -1403,15 +1658,42 @@ dependencies = [
  "net2",
  "rustc_version",
  "time",
- "tokio",
+ "tokio 0.1.22",
  "tokio-buf",
- "tokio-executor",
- "tokio-io",
+ "tokio-executor 0.1.9",
+ "tokio-io 0.1.12",
  "tokio-reactor",
  "tokio-tcp",
  "tokio-threadpool",
  "tokio-timer",
- "want",
+ "want 0.2.0",
+]
+
+[[package]]
+name = "hyper"
+version = "0.13.0-alpha.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2d05aa523087ac0b9d8b93dd80d5d482a697308ed3b0dca7b0667511a7fa7cdc"
+dependencies = [
+ "bytes 0.4.12",
+ "futures-channel-preview",
+ "futures-core-preview",
+ "futures-util-preview",
+ "h2 0.2.0-alpha.3",
+ "http",
+ "http-body 0.2.0-alpha.3",
+ "httparse",
+ "iovec",
+ "itoa",
+ "log 0.4.8",
+ "pin-project",
+ "time",
+ "tokio-executor 0.2.0-alpha.6",
+ "tokio-io 0.2.0-alpha.6",
+ "tokio-sync 0.2.0-alpha.6",
+ "tower-make",
+ "tower-service",
+ "want 0.3.0",
 ]
 
 [[package]]
@@ -1420,12 +1702,12 @@ version = "0.17.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "719d85c7df4a7f309a77d145340a063ea929dcb2e025bae46a80345cffec2952"
 dependencies = [
- "bytes",
+ "bytes 0.4.12",
  "ct-logs",
  "futures 0.1.29",
  "hyper 0.12.35",
  "rustls",
- "tokio-io",
+ "tokio-io 0.1.12",
  "tokio-rustls",
  "webpki",
  "webpki-roots 0.17.0",
@@ -1557,7 +1839,7 @@ dependencies = [
  "log 0.4.8",
  "serde",
  "serde_json",
- "tokio",
+ "tokio 0.1.22",
  "url 1.7.2",
  "websocket",
 ]
@@ -1629,13 +1911,13 @@ version = "14.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "95b7635e618a0edbbe0d2a2bbbc69874277c49383fcf6c3c0414491cfb517d22"
 dependencies = [
- "bytes",
+ "bytes 0.4.12",
  "globset",
  "jsonrpc-core",
  "lazy_static",
  "log 0.4.8",
- "tokio",
- "tokio-codec",
+ "tokio 0.1.22",
+ "tokio-codec 0.1.1",
  "unicase 2.6.0",
 ]
 
@@ -1669,10 +1951,20 @@ dependencies = [
  "winapi-build",
 ]
 
+[[package]]
+name = "kv-log-macro"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8c54d9f465d530a752e6ebdc217e081a7a614b48cb200f6f0aee21ba6bc9aabb"
+dependencies = [
+ "log 0.4.8",
+]
+
 [[package]]
 name = "kvdb"
-version = "0.1.0"
-source = "git+https://github.com/paritytech/parity-common?rev=b0317f649ab2c665b7987b8475878fc4d2e1f81d#b0317f649ab2c665b7987b8475878fc4d2e1f81d"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1b2f251f01a7224426abdb2563707d856f7de995d821744fd8fa8e2874f69e3"
 dependencies = [
  "elastic-array",
  "parity-bytes",
@@ -1680,17 +1972,19 @@ dependencies = [
 
 [[package]]
 name = "kvdb-memorydb"
-version = "0.1.0"
-source = "git+https://github.com/paritytech/parity-common?rev=b0317f649ab2c665b7987b8475878fc4d2e1f81d#b0317f649ab2c665b7987b8475878fc4d2e1f81d"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "296c12309ed36cb74d59206406adbf1971c3baa56d5410efdb508d8f1c60a351"
 dependencies = [
  "kvdb",
- "parking_lot 0.6.4",
+ "parking_lot 0.9.0",
 ]
 
 [[package]]
 name = "kvdb-rocksdb"
-version = "0.1.4"
-source = "git+https://github.com/paritytech/parity-common?rev=b0317f649ab2c665b7987b8475878fc4d2e1f81d#b0317f649ab2c665b7987b8475878fc4d2e1f81d"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3f82177237c1ae67d6ab208a6f790cab569a1d81c1ba02348e0736a99510be3"
 dependencies = [
  "elastic-array",
  "fs-swap",
@@ -1698,7 +1992,8 @@ dependencies = [
  "kvdb",
  "log 0.4.8",
  "num_cpus",
- "parking_lot 0.6.4",
+ "owning_ref",
+ "parking_lot 0.9.0",
  "regex",
  "rocksdb",
 ]
@@ -1714,6 +2009,9 @@ name = "lazy_static"
 version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+dependencies = [
+ "spin",
+]
 
 [[package]]
 name = "lazycell"
@@ -1743,7 +2041,7 @@ version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8fab3090cd3af0f0ff5e6c2cc0f6fe6607e9f9282680cf7cd3bdd4cda38ea722"
 dependencies = [
- "bytes",
+ "bytes 0.4.12",
  "futures 0.1.29",
  "lazy_static",
  "libp2p-core",
@@ -1769,9 +2067,9 @@ dependencies = [
  "parity-multihash 0.2.0",
  "parking_lot 0.9.0",
  "smallvec 0.6.13",
- "tokio-codec",
- "tokio-executor",
- "tokio-io",
+ "tokio-codec 0.1.1",
+ "tokio-executor 0.1.9",
+ "tokio-io 0.1.12",
  "wasm-timer",
 ]
 
@@ -1783,8 +2081,8 @@ checksum = "4a3def059145c191b6975e51784d5edc59e77e1ed5b25402fccac704dd7731f3"
 dependencies = [
  "asn1_der",
  "bs58 0.3.0",
- "bytes",
- "ed25519-dalek 1.0.0-pre.2",
+ "bytes 0.4.12",
+ "ed25519-dalek",
  "failure",
  "fnv",
  "futures 0.1.29",
@@ -1802,8 +2100,8 @@ dependencies = [
  "rw-stream-sink",
  "sha2",
  "smallvec 0.6.13",
- "tokio-executor",
- "tokio-io",
+ "tokio-executor 0.1.9",
+ "tokio-io 0.1.12",
  "unsigned-varint",
  "untrusted",
  "void",
@@ -1830,7 +2128,7 @@ dependencies = [
  "flate2",
  "futures 0.1.29",
  "libp2p-core",
- "tokio-io",
+ "tokio-io 0.1.12",
 ]
 
 [[package]]
@@ -1852,7 +2150,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "92c11b95281e8cb87eb83c204b3ca4988fa665ed9351199b5bcc323056f49816"
 dependencies = [
  "bs58 0.3.0",
- "bytes",
+ "bytes 0.4.12",
  "cuckoofilter",
  "fnv",
  "futures 0.1.29",
@@ -1861,7 +2159,7 @@ dependencies = [
  "protobuf",
  "rand 0.6.5",
  "smallvec 0.6.13",
- "tokio-io",
+ "tokio-io 0.1.12",
 ]
 
 [[package]]
@@ -1870,7 +2168,7 @@ version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b4e4b0b4bcf410f77361b08335022d5705df34970dc1744ff58d4bb902309547"
 dependencies = [
- "bytes",
+ "bytes 0.4.12",
  "futures 0.1.29",
  "libp2p-core",
  "libp2p-swarm",
@@ -1878,8 +2176,8 @@ dependencies = [
  "parity-multiaddr 0.6.0",
  "protobuf",
  "smallvec 0.6.13",
- "tokio-codec",
- "tokio-io",
+ "tokio-codec 0.1.1",
+ "tokio-io 0.1.12",
  "unsigned-varint",
  "wasm-timer",
 ]
@@ -1891,7 +2189,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7fd25360fc12b23edb1ed13f73426325a38d32e0927a46fec26ddb6873d7644d"
 dependencies = [
  "arrayvec 0.5.1",
- "bytes",
+ "bytes 0.4.12",
  "either",
  "fnv",
  "futures 0.1.29",
@@ -1904,8 +2202,8 @@ dependencies = [
  "rand 0.7.2",
  "sha2",
  "smallvec 0.6.13",
- "tokio-codec",
- "tokio-io",
+ "tokio-codec 0.1.1",
+ "tokio-io 0.1.12",
  "uint",
  "unsigned-varint",
  "void",
@@ -1928,7 +2226,7 @@ dependencies = [
  "parity-multiaddr 0.6.0",
  "rand 0.6.5",
  "smallvec 0.6.13",
- "tokio-io",
+ "tokio-io 0.1.12",
  "tokio-reactor",
  "tokio-udp",
  "void",
@@ -1941,14 +2239,14 @@ version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e2fe584816d993dc0f893396521a3c93191d78a6f28a892b150baa714a12c3e5"
 dependencies = [
- "bytes",
+ "bytes 0.4.12",
  "fnv",
  "futures 0.1.29",
  "libp2p-core",
  "log 0.4.8",
  "parking_lot 0.8.0",
- "tokio-codec",
- "tokio-io",
+ "tokio-codec 0.1.1",
+ "tokio-io 0.1.12",
  "unsigned-varint",
 ]
 
@@ -1958,8 +2256,8 @@ version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a30ec2640262a7ad6b1a8b28f6cd8281e620a6802f700adf9ff26e61487c333a"
 dependencies = [
- "bytes",
- "curve25519-dalek",
+ "bytes 0.4.12",
+ "curve25519-dalek 1.2.3",
  "futures 0.1.29",
  "lazy_static",
  "libp2p-core",
@@ -1968,7 +2266,7 @@ dependencies = [
  "rand 0.7.2",
  "ring",
  "snow",
- "tokio-io",
+ "tokio-io 0.1.12",
  "x25519-dalek",
  "zeroize 1.1.0",
 ]
@@ -1979,14 +2277,14 @@ version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5b975ad345eb9bb29ddc64670664a50a8ab3e66e28357abb0f83cfc0a9ca2d78"
 dependencies = [
- "bytes",
+ "bytes 0.4.12",
  "futures 0.1.29",
  "libp2p-core",
  "libp2p-swarm",
  "log 0.4.8",
  "parity-multiaddr 0.6.0",
  "rand 0.7.2",
- "tokio-io",
+ "tokio-io 0.1.12",
  "void",
  "wasm-timer",
 ]
@@ -1997,13 +2295,13 @@ version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7f4fe82189f5c20e8f0a11deaa04d492703c501cefd2428ad68f4f64aefab76f"
 dependencies = [
- "bytes",
+ "bytes 0.4.12",
  "futures 0.1.29",
  "libp2p-core",
  "log 0.4.8",
  "protobuf",
  "rw-stream-sink",
- "tokio-io",
+ "tokio-io 0.1.12",
  "void",
 ]
 
@@ -2014,7 +2312,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7ee09e259ceb7633a52fd17f187bedf94e3545b1746487beedbd3a0a07d99817"
 dependencies = [
  "aes-ctr",
- "bytes",
+ "bytes 0.4.12",
  "ctr",
  "futures 0.1.29",
  "hmac",
@@ -2028,8 +2326,8 @@ dependencies = [
  "ring",
  "rw-stream-sink",
  "sha2",
- "tokio-codec",
- "tokio-io",
+ "tokio-codec 0.1.1",
+ "tokio-io 0.1.12",
  "twofish",
  "untrusted",
  "wasm-bindgen",
@@ -2046,7 +2344,7 @@ dependencies = [
  "futures 0.1.29",
  "libp2p-core",
  "smallvec 0.6.13",
- "tokio-io",
+ "tokio-io 0.1.12",
  "void",
  "wasm-timer",
 ]
@@ -2057,13 +2355,13 @@ version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "234a7093d05651ab5630db926a4a42ca8978a65bab8c27c2ce2b66b200c76989"
 dependencies = [
- "bytes",
+ "bytes 0.4.12",
  "futures 0.1.29",
  "get_if_addrs",
  "ipnet",
  "libp2p-core",
  "log 0.4.8",
- "tokio-io",
+ "tokio-io 0.1.12",
  "tokio-tcp",
  "tokio-timer",
 ]
@@ -2090,7 +2388,7 @@ dependencies = [
  "js-sys",
  "libp2p-core",
  "parity-send-wrapper",
- "tokio-io",
+ "tokio-io 0.1.12",
  "wasm-bindgen",
  "wasm-bindgen-futures",
 ]
@@ -2101,14 +2399,14 @@ version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0d74d4fc229ad7e8d1a973178786bdcd5dadbdd7b9822c4477c8687df6f82f66"
 dependencies = [
- "bytes",
+ "bytes 0.4.12",
  "futures 0.1.29",
  "libp2p-core",
  "log 0.4.8",
  "rw-stream-sink",
  "soketto",
- "tokio-codec",
- "tokio-io",
+ "tokio-codec 0.1.1",
+ "tokio-io 0.1.12",
  "tokio-rustls",
  "url 2.1.0",
  "webpki-roots 0.18.0",
@@ -2123,19 +2421,19 @@ dependencies = [
  "futures 0.1.29",
  "libp2p-core",
  "log 0.4.8",
- "tokio-io",
+ "tokio-io 0.1.12",
  "yamux",
 ]
 
 [[package]]
 name = "librocksdb-sys"
-version = "5.18.3"
+version = "6.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d19778314deaa7048f2ea7d07b8aa12e1c227acebe975a37eeab6d2f8c74e41b"
+checksum = "0a0785e816e1e11e7599388a492c61ef80ddc2afc91e313e61662cce537809be"
 dependencies = [
  "bindgen",
  "cc",
- "glob",
+ "glob 0.3.0",
  "libc",
 ]
 
@@ -2229,9 +2527,9 @@ dependencies = [
 
 [[package]]
 name = "lru"
-version = "0.4.1"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a57ada89b072a15fa9e1b9d1e18d0e161fd25a47e0a3ae4868cf53aada8ba97"
+checksum = "0609345ddee5badacf857d4f547e0e5a2e987db77085c24cd887f73573a04237"
 dependencies = [
  "hashbrown 0.6.3",
 ]
@@ -2343,9 +2641,9 @@ dependencies = [
 
 [[package]]
 name = "mio-extras"
-version = "2.0.5"
+version = "2.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46e73a04c2fa6250b8d802134d56d554a9ec2922bf977777c805ea5def61ce40"
+checksum = "52403fe290012ce777c4626790c8951324a2b9e3316b3143779c72b029742f19"
 dependencies = [
  "lazycell",
  "log 0.4.8",
@@ -2378,15 +2676,15 @@ dependencies = [
 
 [[package]]
 name = "multistream-select"
-version = "0.6.0"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1242e4ecf2060b35fb58002988e4720fbb3a2cbd4c136d369c420fa028f69efe"
+checksum = "fc3ef54aab1b2e37e911bcb99e376dbe4c1e0710afcdb8428608e4f993b39c47"
 dependencies = [
- "bytes",
+ "bytes 0.4.12",
  "futures 0.1.29",
  "log 0.4.8",
  "smallvec 0.6.13",
- "tokio-io",
+ "tokio-io 0.1.12",
  "unsigned-varint",
 ]
 
@@ -2444,68 +2742,68 @@ dependencies = [
 [[package]]
 name = "node-primitives"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?rev=dc4a8329b9c47790c25429a5df272b3648275c1b#dc4a8329b9c47790c25429a5df272b3648275c1b"
+source = "git+https://github.com/paritytech/substrate?rev=3d17cbd2fbcc337af49c861896ab4936b161bcee#3d17cbd2fbcc337af49c861896ab4936b161bcee"
 dependencies = [
- "sr-primitives",
- "substrate-primitives",
+ "sp-core",
+ "sp-runtime",
 ]
 
 [[package]]
 name = "node-runtime"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?rev=dc4a8329b9c47790c25429a5df272b3648275c1b#dc4a8329b9c47790c25429a5df272b3648275c1b"
+source = "git+https://github.com/paritytech/substrate?rev=3d17cbd2fbcc337af49c861896ab4936b161bcee#3d17cbd2fbcc337af49c861896ab4936b161bcee"
 dependencies = [
+ "frame-executive",
+ "frame-support",
+ "frame-system",
+ "frame-system-rpc-runtime-api",
+ "frame-utility",
  "integer-sqrt",
  "node-primitives",
- "paint-authority-discovery",
- "paint-authorship",
- "paint-babe",
- "paint-balances",
- "paint-collective",
- "paint-contracts",
- "paint-contracts-rpc-runtime-api",
- "paint-democracy",
- "paint-elections-phragmen",
- "paint-executive",
- "paint-finality-tracker",
- "paint-grandpa",
- "paint-im-online",
- "paint-indices",
- "paint-membership",
- "paint-nicks",
- "paint-offences",
- "paint-randomness-collective-flip",
- "paint-session",
- "paint-staking",
- "paint-staking-reward-curve",
- "paint-sudo",
- "paint-support",
- "paint-system",
- "paint-system-rpc-runtime-api",
- "paint-timestamp",
- "paint-transaction-payment",
- "paint-transaction-payment-rpc-runtime-api",
- "paint-treasury",
- "paint-utility",
+ "pallet-authority-discovery",
+ "pallet-authorship",
+ "pallet-babe",
+ "pallet-balances",
+ "pallet-collective",
+ "pallet-contracts",
+ "pallet-contracts-rpc-runtime-api",
+ "pallet-democracy",
+ "pallet-elections-phragmen",
+ "pallet-finality-tracker",
+ "pallet-grandpa",
+ "pallet-im-online",
+ "pallet-indices",
+ "pallet-membership",
+ "pallet-nicks",
+ "pallet-offences",
+ "pallet-randomness-collective-flip",
+ "pallet-session",
+ "pallet-staking",
+ "pallet-staking-reward-curve",
+ "pallet-sudo",
+ "pallet-timestamp",
+ "pallet-transaction-payment",
+ "pallet-transaction-payment-rpc-runtime-api",
+ "pallet-treasury",
  "parity-scale-codec",
  "rustc-hex",
  "safe-mix",
  "serde",
- "sr-api",
- "sr-primitives",
- "sr-staking-primitives",
- "sr-std",
- "sr-version",
- "substrate-authority-discovery-primitives",
- "substrate-block-builder-runtime-api",
- "substrate-consensus-babe-primitives",
- "substrate-inherents",
- "substrate-keyring",
- "substrate-offchain-primitives",
- "substrate-primitives",
- "substrate-session",
- "substrate-transaction-pool-runtime-api",
- "substrate-wasm-builder-runner 1.0.4 (git+https://github.com/paritytech/substrate?rev=dc4a8329b9c47790c25429a5df272b3648275c1b)",
+ "sp-api",
+ "sp-authority-discovery",
+ "sp-block-builder",
+ "sp-consensus-babe",
+ "sp-core",
+ "sp-inherents",
+ "sp-keyring",
+ "sp-offchain",
+ "sp-runtime",
+ "sp-session",
+ "sp-staking",
+ "sp-std",
+ "sp-transaction-pool",
+ "sp-version",
+ "substrate-wasm-builder-runner 1.0.4 (git+https://github.com/paritytech/substrate?rev=3d17cbd2fbcc337af49c861896ab4936b161bcee)",
 ]
 
 [[package]]
@@ -2607,6 +2905,12 @@ version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d584f08c2d717d5c23a6414fc2822b71c651560713e54fa7eace675f758a355e"
 
+[[package]]
+name = "once_cell"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "891f486f630e5c5a4916c7e16c4b24a53e78c860b646e9f8e005e4f16847bfed"
+
 [[package]]
 name = "opaque-debug"
 version = "0.2.3"
@@ -2660,422 +2964,340 @@ dependencies = [
 ]
 
 [[package]]
-name = "paint-aura"
+name = "pallet-aura"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?rev=dc4a8329b9c47790c25429a5df272b3648275c1b#dc4a8329b9c47790c25429a5df272b3648275c1b"
+source = "git+https://github.com/paritytech/substrate?rev=3d17cbd2fbcc337af49c861896ab4936b161bcee#3d17cbd2fbcc337af49c861896ab4936b161bcee"
 dependencies = [
- "paint-session",
- "paint-support",
- "paint-system",
- "paint-timestamp",
+ "frame-support",
+ "frame-system",
+ "pallet-session",
+ "pallet-timestamp",
  "parity-scale-codec",
  "serde",
- "sr-io",
- "sr-primitives",
- "sr-std",
- "substrate-application-crypto",
- "substrate-consensus-aura-primitives",
- "substrate-inherents",
- "substrate-primitives",
+ "sp-application-crypto",
+ "sp-consensus-aura",
+ "sp-core",
+ "sp-inherents",
+ "sp-io",
+ "sp-runtime",
+ "sp-std",
+ "sp-timestamp",
 ]
 
 [[package]]
-name = "paint-authority-discovery"
+name = "pallet-authority-discovery"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate?rev=dc4a8329b9c47790c25429a5df272b3648275c1b#dc4a8329b9c47790c25429a5df272b3648275c1b"
+source = "git+https://github.com/paritytech/substrate?rev=3d17cbd2fbcc337af49c861896ab4936b161bcee#3d17cbd2fbcc337af49c861896ab4936b161bcee"
 dependencies = [
- "paint-session",
- "paint-support",
- "paint-system",
+ "frame-support",
+ "frame-system",
+ "pallet-session",
  "parity-scale-codec",
  "serde",
- "sr-io",
- "sr-primitives",
- "sr-std",
- "substrate-application-crypto",
- "substrate-authority-discovery-primitives",
- "substrate-primitives",
+ "sp-application-crypto",
+ "sp-authority-discovery",
+ "sp-core",
+ "sp-io",
+ "sp-runtime",
+ "sp-std",
 ]
 
 [[package]]
-name = "paint-authorship"
+name = "pallet-authorship"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate?rev=dc4a8329b9c47790c25429a5df272b3648275c1b#dc4a8329b9c47790c25429a5df272b3648275c1b"
+source = "git+https://github.com/paritytech/substrate?rev=3d17cbd2fbcc337af49c861896ab4936b161bcee#3d17cbd2fbcc337af49c861896ab4936b161bcee"
 dependencies = [
+ "frame-support",
+ "frame-system",
  "impl-trait-for-tuples",
- "paint-support",
- "paint-system",
  "parity-scale-codec",
- "sr-io",
- "sr-primitives",
- "sr-std",
- "substrate-inherents",
- "substrate-primitives",
+ "sp-authorship",
+ "sp-core",
+ "sp-inherents",
+ "sp-io",
+ "sp-runtime",
+ "sp-std",
 ]
 
 [[package]]
-name = "paint-babe"
+name = "pallet-babe"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?rev=dc4a8329b9c47790c25429a5df272b3648275c1b#dc4a8329b9c47790c25429a5df272b3648275c1b"
+source = "git+https://github.com/paritytech/substrate?rev=3d17cbd2fbcc337af49c861896ab4936b161bcee#3d17cbd2fbcc337af49c861896ab4936b161bcee"
 dependencies = [
+ "frame-support",
+ "frame-system",
  "hex-literal",
- "paint-session",
- "paint-support",
- "paint-system",
- "paint-timestamp",
+ "pallet-session",
+ "pallet-timestamp",
  "parity-scale-codec",
  "serde",
- "sr-io",
- "sr-primitives",
- "sr-staking-primitives",
- "sr-std",
- "substrate-consensus-babe-primitives",
- "substrate-inherents",
+ "sp-consensus-babe",
+ "sp-inherents",
+ "sp-io",
+ "sp-runtime",
+ "sp-staking",
+ "sp-std",
+ "sp-timestamp",
 ]
 
 [[package]]
-name = "paint-balances"
+name = "pallet-balances"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?rev=dc4a8329b9c47790c25429a5df272b3648275c1b#dc4a8329b9c47790c25429a5df272b3648275c1b"
+source = "git+https://github.com/paritytech/substrate?rev=3d17cbd2fbcc337af49c861896ab4936b161bcee#3d17cbd2fbcc337af49c861896ab4936b161bcee"
 dependencies = [
- "paint-support",
- "paint-system",
+ "frame-support",
+ "frame-system",
  "parity-scale-codec",
  "safe-mix",
  "serde",
- "sr-primitives",
- "sr-std",
- "substrate-keyring",
+ "sp-runtime",
+ "sp-std",
 ]
 
 [[package]]
-name = "paint-collective"
+name = "pallet-collective"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?rev=dc4a8329b9c47790c25429a5df272b3648275c1b#dc4a8329b9c47790c25429a5df272b3648275c1b"
+source = "git+https://github.com/paritytech/substrate?rev=3d17cbd2fbcc337af49c861896ab4936b161bcee#3d17cbd2fbcc337af49c861896ab4936b161bcee"
 dependencies = [
- "paint-support",
- "paint-system",
+ "frame-support",
+ "frame-system",
  "parity-scale-codec",
  "safe-mix",
  "serde",
- "sr-io",
- "sr-primitives",
- "sr-std",
- "substrate-primitives",
+ "sp-core",
+ "sp-io",
+ "sp-runtime",
+ "sp-std",
 ]
 
 [[package]]
-name = "paint-contracts"
+name = "pallet-contracts"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?rev=dc4a8329b9c47790c25429a5df272b3648275c1b#dc4a8329b9c47790c25429a5df272b3648275c1b"
+source = "git+https://github.com/paritytech/substrate?rev=3d17cbd2fbcc337af49c861896ab4936b161bcee#3d17cbd2fbcc337af49c861896ab4936b161bcee"
 dependencies = [
- "paint-support",
- "paint-system",
+ "frame-support",
+ "frame-system",
  "parity-scale-codec",
- "parity-wasm 0.40.3",
+ "parity-wasm",
  "pwasm-utils",
  "serde",
- "sr-io",
- "sr-primitives",
- "sr-sandbox",
- "sr-std",
- "substrate-primitives",
- "wasmi-validation 0.2.0",
+ "sp-core",
+ "sp-io",
+ "sp-runtime",
+ "sp-sandbox",
+ "sp-std",
+ "wasmi-validation",
 ]
 
 [[package]]
-name = "paint-contracts-rpc-runtime-api"
+name = "pallet-contracts-rpc-runtime-api"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?rev=dc4a8329b9c47790c25429a5df272b3648275c1b#dc4a8329b9c47790c25429a5df272b3648275c1b"
+source = "git+https://github.com/paritytech/substrate?rev=3d17cbd2fbcc337af49c861896ab4936b161bcee#3d17cbd2fbcc337af49c861896ab4936b161bcee"
 dependencies = [
  "parity-scale-codec",
- "serde",
- "sr-api",
- "sr-primitives",
- "sr-std",
+ "sp-api",
+ "sp-runtime",
+ "sp-std",
 ]
 
 [[package]]
-name = "paint-democracy"
+name = "pallet-democracy"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?rev=dc4a8329b9c47790c25429a5df272b3648275c1b#dc4a8329b9c47790c25429a5df272b3648275c1b"
+source = "git+https://github.com/paritytech/substrate?rev=3d17cbd2fbcc337af49c861896ab4936b161bcee#3d17cbd2fbcc337af49c861896ab4936b161bcee"
 dependencies = [
- "paint-support",
- "paint-system",
+ "frame-support",
+ "frame-system",
  "parity-scale-codec",
  "safe-mix",
  "serde",
- "sr-io",
- "sr-primitives",
- "sr-std",
-]
-
-[[package]]
-name = "paint-elections-phragmen"
-version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?rev=dc4a8329b9c47790c25429a5df272b3648275c1b#dc4a8329b9c47790c25429a5df272b3648275c1b"
-dependencies = [
- "paint-support",
- "paint-system",
- "parity-scale-codec",
- "sr-primitives",
- "sr-std",
- "substrate-phragmen",
+ "sp-io",
+ "sp-runtime",
+ "sp-std",
 ]
 
 [[package]]
-name = "paint-executive"
+name = "pallet-elections-phragmen"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?rev=dc4a8329b9c47790c25429a5df272b3648275c1b#dc4a8329b9c47790c25429a5df272b3648275c1b"
+source = "git+https://github.com/paritytech/substrate?rev=3d17cbd2fbcc337af49c861896ab4936b161bcee#3d17cbd2fbcc337af49c861896ab4936b161bcee"
 dependencies = [
- "paint-support",
- "paint-system",
+ "frame-support",
+ "frame-system",
  "parity-scale-codec",
- "serde",
- "sr-io",
- "sr-primitives",
- "sr-std",
+ "sp-phragmen",
+ "sp-runtime",
+ "sp-std",
 ]
 
 [[package]]
-name = "paint-finality-tracker"
+name = "pallet-finality-tracker"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?rev=dc4a8329b9c47790c25429a5df272b3648275c1b#dc4a8329b9c47790c25429a5df272b3648275c1b"
+source = "git+https://github.com/paritytech/substrate?rev=3d17cbd2fbcc337af49c861896ab4936b161bcee#3d17cbd2fbcc337af49c861896ab4936b161bcee"
 dependencies = [
+ "frame-support",
+ "frame-system",
  "impl-trait-for-tuples",
- "paint-support",
- "paint-system",
  "parity-scale-codec",
  "serde",
- "sr-primitives",
- "sr-std",
- "substrate-inherents",
+ "sp-finality-tracker",
+ "sp-inherents",
+ "sp-runtime",
+ "sp-std",
 ]
 
 [[package]]
-name = "paint-grandpa"
+name = "pallet-grandpa"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?rev=dc4a8329b9c47790c25429a5df272b3648275c1b#dc4a8329b9c47790c25429a5df272b3648275c1b"
+source = "git+https://github.com/paritytech/substrate?rev=3d17cbd2fbcc337af49c861896ab4936b161bcee#3d17cbd2fbcc337af49c861896ab4936b161bcee"
 dependencies = [
- "paint-finality-tracker",
- "paint-session",
- "paint-support",
- "paint-system",
+ "frame-support",
+ "frame-system",
+ "pallet-finality-tracker",
+ "pallet-session",
  "parity-scale-codec",
  "serde",
- "sr-primitives",
- "sr-staking-primitives",
- "sr-std",
- "substrate-finality-grandpa-primitives",
- "substrate-primitives",
+ "sp-core",
+ "sp-finality-grandpa",
+ "sp-runtime",
+ "sp-staking",
+ "sp-std",
 ]
 
 [[package]]
-name = "paint-im-online"
+name = "pallet-im-online"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate?rev=dc4a8329b9c47790c25429a5df272b3648275c1b#dc4a8329b9c47790c25429a5df272b3648275c1b"
+source = "git+https://github.com/paritytech/substrate?rev=3d17cbd2fbcc337af49c861896ab4936b161bcee#3d17cbd2fbcc337af49c861896ab4936b161bcee"
 dependencies = [
- "paint-authorship",
- "paint-session",
- "paint-support",
- "paint-system",
+ "frame-support",
+ "frame-system",
+ "pallet-authorship",
+ "pallet-session",
  "parity-scale-codec",
  "serde",
- "sr-io",
- "sr-primitives",
- "sr-staking-primitives",
- "sr-std",
- "substrate-application-crypto",
- "substrate-primitives",
+ "sp-application-crypto",
+ "sp-core",
+ "sp-io",
+ "sp-runtime",
+ "sp-staking",
+ "sp-std",
 ]
 
 [[package]]
-name = "paint-indices"
+name = "pallet-indices"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?rev=dc4a8329b9c47790c25429a5df272b3648275c1b#dc4a8329b9c47790c25429a5df272b3648275c1b"
+source = "git+https://github.com/paritytech/substrate?rev=3d17cbd2fbcc337af49c861896ab4936b161bcee#3d17cbd2fbcc337af49c861896ab4936b161bcee"
 dependencies = [
- "paint-support",
- "paint-system",
+ "frame-support",
+ "frame-system",
  "parity-scale-codec",
  "safe-mix",
  "serde",
- "sr-io",
- "sr-primitives",
- "sr-std",
- "substrate-keyring",
- "substrate-primitives",
+ "sp-core",
+ "sp-io",
+ "sp-keyring",
+ "sp-runtime",
+ "sp-std",
 ]
 
 [[package]]
-name = "paint-membership"
+name = "pallet-membership"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?rev=dc4a8329b9c47790c25429a5df272b3648275c1b#dc4a8329b9c47790c25429a5df272b3648275c1b"
+source = "git+https://github.com/paritytech/substrate?rev=3d17cbd2fbcc337af49c861896ab4936b161bcee#3d17cbd2fbcc337af49c861896ab4936b161bcee"
 dependencies = [
- "paint-support",
- "paint-system",
+ "frame-support",
+ "frame-system",
  "parity-scale-codec",
  "serde",
- "sr-io",
- "sr-primitives",
- "sr-std",
+ "sp-io",
+ "sp-runtime",
+ "sp-std",
 ]
 
 [[package]]
-name = "paint-metadata"
+name = "pallet-nicks"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?rev=dc4a8329b9c47790c25429a5df272b3648275c1b#dc4a8329b9c47790c25429a5df272b3648275c1b"
+source = "git+https://github.com/paritytech/substrate?rev=3d17cbd2fbcc337af49c861896ab4936b161bcee#3d17cbd2fbcc337af49c861896ab4936b161bcee"
 dependencies = [
+ "frame-support",
+ "frame-system",
  "parity-scale-codec",
  "serde",
- "sr-std",
- "substrate-primitives",
+ "sp-io",
+ "sp-runtime",
+ "sp-std",
 ]
 
 [[package]]
-name = "paint-nicks"
-version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?rev=dc4a8329b9c47790c25429a5df272b3648275c1b#dc4a8329b9c47790c25429a5df272b3648275c1b"
-dependencies = [
- "paint-support",
- "paint-system",
- "parity-scale-codec",
- "serde",
- "sr-io",
- "sr-primitives",
- "sr-std",
-]
-
-[[package]]
-name = "paint-offences"
+name = "pallet-offences"
 version = "1.0.0"
-source = "git+https://github.com/paritytech/substrate?rev=dc4a8329b9c47790c25429a5df272b3648275c1b#dc4a8329b9c47790c25429a5df272b3648275c1b"
+source = "git+https://github.com/paritytech/substrate?rev=3d17cbd2fbcc337af49c861896ab4936b161bcee#3d17cbd2fbcc337af49c861896ab4936b161bcee"
 dependencies = [
- "paint-balances",
- "paint-support",
- "paint-system",
+ "frame-support",
+ "frame-system",
+ "pallet-balances",
  "parity-scale-codec",
  "serde",
- "sr-primitives",
- "sr-staking-primitives",
- "sr-std",
+ "sp-runtime",
+ "sp-staking",
+ "sp-std",
 ]
 
 [[package]]
-name = "paint-randomness-collective-flip"
+name = "pallet-randomness-collective-flip"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?rev=dc4a8329b9c47790c25429a5df272b3648275c1b#dc4a8329b9c47790c25429a5df272b3648275c1b"
+source = "git+https://github.com/paritytech/substrate?rev=3d17cbd2fbcc337af49c861896ab4936b161bcee#3d17cbd2fbcc337af49c861896ab4936b161bcee"
 dependencies = [
- "paint-support",
- "paint-system",
+ "frame-support",
+ "frame-system",
  "parity-scale-codec",
  "safe-mix",
- "sr-primitives",
- "sr-std",
+ "sp-runtime",
+ "sp-std",
 ]
 
 [[package]]
-name = "paint-session"
+name = "pallet-session"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?rev=dc4a8329b9c47790c25429a5df272b3648275c1b#dc4a8329b9c47790c25429a5df272b3648275c1b"
+source = "git+https://github.com/paritytech/substrate?rev=3d17cbd2fbcc337af49c861896ab4936b161bcee#3d17cbd2fbcc337af49c861896ab4936b161bcee"
 dependencies = [
+ "frame-support",
+ "frame-system",
  "impl-trait-for-tuples",
- "paint-support",
- "paint-system",
- "paint-timestamp",
+ "pallet-timestamp",
  "parity-scale-codec",
  "safe-mix",
  "serde",
- "sr-io",
- "sr-primitives",
- "sr-staking-primitives",
- "sr-std",
- "substrate-trie",
+ "sp-io",
+ "sp-runtime",
+ "sp-staking",
+ "sp-std",
+ "sp-trie",
 ]
 
 [[package]]
-name = "paint-staking"
+name = "pallet-staking"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?rev=dc4a8329b9c47790c25429a5df272b3648275c1b#dc4a8329b9c47790c25429a5df272b3648275c1b"
+source = "git+https://github.com/paritytech/substrate?rev=3d17cbd2fbcc337af49c861896ab4936b161bcee#3d17cbd2fbcc337af49c861896ab4936b161bcee"
 dependencies = [
- "paint-authorship",
- "paint-session",
- "paint-support",
- "paint-system",
+ "frame-support",
+ "frame-system",
+ "pallet-authorship",
+ "pallet-session",
  "parity-scale-codec",
  "safe-mix",
  "serde",
- "sr-io",
- "sr-primitives",
- "sr-staking-primitives",
- "sr-std",
- "substrate-keyring",
- "substrate-phragmen",
-]
-
-[[package]]
-name = "paint-staking-reward-curve"
-version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?rev=dc4a8329b9c47790c25429a5df272b3648275c1b#dc4a8329b9c47790c25429a5df272b3648275c1b"
-dependencies = [
- "proc-macro-crate",
- "proc-macro2 1.0.6",
- "quote 1.0.2",
- "syn 1.0.11",
-]
-
-[[package]]
-name = "paint-sudo"
-version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?rev=dc4a8329b9c47790c25429a5df272b3648275c1b#dc4a8329b9c47790c25429a5df272b3648275c1b"
-dependencies = [
- "paint-support",
- "paint-system",
- "parity-scale-codec",
- "serde",
- "sr-io",
- "sr-primitives",
- "sr-std",
-]
-
-[[package]]
-name = "paint-support"
-version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?rev=dc4a8329b9c47790c25429a5df272b3648275c1b#dc4a8329b9c47790c25429a5df272b3648275c1b"
-dependencies = [
- "bitmask",
- "impl-trait-for-tuples",
- "log 0.4.8",
- "once_cell 0.2.4",
- "paint-metadata",
- "paint-support-procedural",
- "parity-scale-codec",
- "paste",
- "serde",
- "sr-io",
- "sr-primitives",
- "sr-std",
- "substrate-inherents",
- "substrate-primitives",
- "substrate-state-machine",
-]
-
-[[package]]
-name = "paint-support-procedural"
-version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?rev=dc4a8329b9c47790c25429a5df272b3648275c1b#dc4a8329b9c47790c25429a5df272b3648275c1b"
-dependencies = [
- "paint-support-procedural-tools",
- "proc-macro2 1.0.6",
- "quote 1.0.2",
- "syn 1.0.11",
+ "sp-io",
+ "sp-keyring",
+ "sp-phragmen",
+ "sp-runtime",
+ "sp-staking",
+ "sp-std",
 ]
 
 [[package]]
-name = "paint-support-procedural-tools"
+name = "pallet-staking-reward-curve"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?rev=dc4a8329b9c47790c25429a5df272b3648275c1b#dc4a8329b9c47790c25429a5df272b3648275c1b"
+source = "git+https://github.com/paritytech/substrate?rev=3d17cbd2fbcc337af49c861896ab4936b161bcee#3d17cbd2fbcc337af49c861896ab4936b161bcee"
 dependencies = [
- "paint-support-procedural-tools-derive",
  "proc-macro-crate",
  "proc-macro2 1.0.6",
  "quote 1.0.2",
@@ -3083,113 +3305,80 @@ dependencies = [
 ]
 
 [[package]]
-name = "paint-support-procedural-tools-derive"
-version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?rev=dc4a8329b9c47790c25429a5df272b3648275c1b#dc4a8329b9c47790c25429a5df272b3648275c1b"
-dependencies = [
- "proc-macro2 1.0.6",
- "quote 1.0.2",
- "syn 1.0.11",
-]
-
-[[package]]
-name = "paint-system"
+name = "pallet-sudo"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?rev=dc4a8329b9c47790c25429a5df272b3648275c1b#dc4a8329b9c47790c25429a5df272b3648275c1b"
+source = "git+https://github.com/paritytech/substrate?rev=3d17cbd2fbcc337af49c861896ab4936b161bcee#3d17cbd2fbcc337af49c861896ab4936b161bcee"
 dependencies = [
- "impl-trait-for-tuples",
- "paint-support",
+ "frame-support",
+ "frame-system",
  "parity-scale-codec",
- "safe-mix",
  "serde",
- "sr-io",
- "sr-primitives",
- "sr-std",
- "sr-version",
- "substrate-primitives",
-]
-
-[[package]]
-name = "paint-system-rpc-runtime-api"
-version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?rev=dc4a8329b9c47790c25429a5df272b3648275c1b#dc4a8329b9c47790c25429a5df272b3648275c1b"
-dependencies = [
- "parity-scale-codec",
- "sr-api",
+ "sp-io",
+ "sp-runtime",
+ "sp-std",
 ]
 
 [[package]]
-name = "paint-timestamp"
+name = "pallet-timestamp"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?rev=dc4a8329b9c47790c25429a5df272b3648275c1b#dc4a8329b9c47790c25429a5df272b3648275c1b"
+source = "git+https://github.com/paritytech/substrate?rev=3d17cbd2fbcc337af49c861896ab4936b161bcee#3d17cbd2fbcc337af49c861896ab4936b161bcee"
 dependencies = [
+ "frame-support",
+ "frame-system",
  "impl-trait-for-tuples",
- "paint-support",
- "paint-system",
  "parity-scale-codec",
  "serde",
- "sr-primitives",
- "sr-std",
- "substrate-inherents",
-]
-
-[[package]]
-name = "paint-transaction-payment"
-version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?rev=dc4a8329b9c47790c25429a5df272b3648275c1b#dc4a8329b9c47790c25429a5df272b3648275c1b"
-dependencies = [
- "paint-support",
- "paint-system",
- "paint-transaction-payment-rpc-runtime-api",
- "parity-scale-codec",
- "sr-primitives",
- "sr-std",
+ "sp-inherents",
+ "sp-runtime",
+ "sp-std",
+ "sp-timestamp",
 ]
 
 [[package]]
-name = "paint-transaction-payment-rpc-runtime-api"
+name = "pallet-transaction-payment"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?rev=dc4a8329b9c47790c25429a5df272b3648275c1b#dc4a8329b9c47790c25429a5df272b3648275c1b"
+source = "git+https://github.com/paritytech/substrate?rev=3d17cbd2fbcc337af49c861896ab4936b161bcee#3d17cbd2fbcc337af49c861896ab4936b161bcee"
 dependencies = [
+ "frame-support",
+ "frame-system",
+ "pallet-transaction-payment-rpc-runtime-api",
  "parity-scale-codec",
- "serde",
- "sr-api",
- "sr-primitives",
- "sr-std",
+ "sp-runtime",
+ "sp-std",
 ]
 
 [[package]]
-name = "paint-treasury"
+name = "pallet-transaction-payment-rpc-runtime-api"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?rev=dc4a8329b9c47790c25429a5df272b3648275c1b#dc4a8329b9c47790c25429a5df272b3648275c1b"
+source = "git+https://github.com/paritytech/substrate?rev=3d17cbd2fbcc337af49c861896ab4936b161bcee#3d17cbd2fbcc337af49c861896ab4936b161bcee"
 dependencies = [
- "paint-balances",
- "paint-support",
- "paint-system",
+ "frame-support",
  "parity-scale-codec",
  "serde",
- "sr-primitives",
- "sr-std",
+ "sp-api",
+ "sp-runtime",
+ "sp-std",
 ]
 
 [[package]]
-name = "paint-utility"
+name = "pallet-treasury"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?rev=dc4a8329b9c47790c25429a5df272b3648275c1b#dc4a8329b9c47790c25429a5df272b3648275c1b"
+source = "git+https://github.com/paritytech/substrate?rev=3d17cbd2fbcc337af49c861896ab4936b161bcee#3d17cbd2fbcc337af49c861896ab4936b161bcee"
 dependencies = [
- "paint-support",
- "paint-system",
+ "frame-support",
+ "frame-system",
+ "pallet-balances",
  "parity-scale-codec",
  "serde",
- "sr-io",
- "sr-primitives",
- "sr-std",
+ "sp-runtime",
+ "sp-std",
 ]
 
 [[package]]
 name = "parity-bytes"
-version = "0.1.0"
-source = "git+https://github.com/paritytech/parity-common?rev=b0317f649ab2c665b7987b8475878fc4d2e1f81d#b0317f649ab2c665b7987b8475878fc4d2e1f81d"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c276d76c5333b8c2579e02d49a06733a55b8282d2d9b13e8d53b6406bd7e30a"
 
 [[package]]
 name = "parity-multiaddr"
@@ -3200,7 +3389,7 @@ dependencies = [
  "arrayref",
  "bs58 0.2.5",
  "byteorder 1.3.2",
- "bytes",
+ "bytes 0.4.12",
  "data-encoding",
  "parity-multihash 0.1.3",
  "percent-encoding 1.0.1",
@@ -3218,7 +3407,7 @@ dependencies = [
  "arrayref",
  "bs58 0.3.0",
  "byteorder 1.3.2",
- "bytes",
+ "bytes 0.4.12",
  "data-encoding",
  "parity-multihash 0.2.0",
  "percent-encoding 2.1.0",
@@ -3234,7 +3423,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "df3a17dc27848fd99e4f87eb0f8c9baba6ede0a6d555400c850ca45254ef4ce3"
 dependencies = [
  "blake2",
- "bytes",
+ "bytes 0.4.12",
  "rand 0.6.5",
  "sha-1",
  "sha2",
@@ -3249,7 +3438,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c70cad855872dd51ce6679e823efb6434061a2c1782a1686438aabf506392cdd"
 dependencies = [
  "blake2",
- "bytes",
+ "bytes 0.4.12",
  "rand 0.6.5",
  "sha-1",
  "sha2",
@@ -3299,28 +3488,12 @@ dependencies = [
  "winapi 0.3.8",
 ]
 
-[[package]]
-name = "parity-wasm"
-version = "0.40.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e39faaa292a687ea15120b1ac31899b13586446521df6c149e46f1584671e0f"
-
 [[package]]
 name = "parity-wasm"
 version = "0.41.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ddfc878dac00da22f8f61e7af3157988424567ab01d9920b962ef7dcbd7cd865"
 
-[[package]]
-name = "parking_lot"
-version = "0.6.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0802bff09003b291ba756dc7e79313e51cc31667e94afbe847def490424cde5"
-dependencies = [
- "lock_api 0.1.5",
- "parking_lot_core 0.3.1",
-]
-
 [[package]]
 name = "parking_lot"
 version = "0.7.1"
@@ -3353,19 +3526,6 @@ dependencies = [
  "rustc_version",
 ]
 
-[[package]]
-name = "parking_lot_core"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad7f7e6ebdc79edff6fdcb87a55b620174f7a989e3eb31b65231f4af57f00b8c"
-dependencies = [
- "libc",
- "rand 0.5.6",
- "rustc_version",
- "smallvec 0.6.13",
- "winapi 0.3.8",
-]
-
 [[package]]
 name = "parking_lot_core"
 version = "0.4.0"
@@ -3460,6 +3620,32 @@ version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
 
+[[package]]
+name = "pin-project"
+version = "0.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94b90146c7216e4cb534069fb91366de4ea0ea353105ee45ed297e2d1619e469"
+dependencies = [
+ "pin-project-internal",
+]
+
+[[package]]
+name = "pin-project-internal"
+version = "0.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44ca92f893f0656d3cba8158dd0f2b99b94de256a4a54e870bd6922fcc6c8355"
+dependencies = [
+ "proc-macro2 1.0.6",
+ "quote 1.0.2",
+ "syn 1.0.11",
+]
+
+[[package]]
+name = "pin-project-lite"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0af6cbca0e6e3ce8692ee19fb8d734b641899e07b68eb73e9bbbd32f1703991"
+
 [[package]]
 name = "pin-utils"
 version = "0.1.0-alpha.4"
@@ -3564,13 +3750,13 @@ checksum = "40361836defdd5871ff7e84096c6f6444af7fc157f8ef1789f54f147687caa20"
 
 [[package]]
 name = "pwasm-utils"
-version = "0.11.0"
+version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d473123ba135028544926f7aa6f34058d8bc6f120c4fcd3777f84af724280b3"
+checksum = "4f7a12f176deee919f4ba55326ee17491c8b707d0987aed822682c821b660192"
 dependencies = [
  "byteorder 1.3.2",
  "log 0.4.8",
- "parity-wasm 0.40.3",
+ "parity-wasm",
 ]
 
 [[package]]
@@ -3616,19 +3802,19 @@ name = "radicle_registry_client"
 version = "0.1.0"
 dependencies = [
  "env_logger 0.7.1",
+ "frame-support",
+ "frame-system",
  "futures 0.1.29",
  "futures 0.3.1",
  "log 0.4.8",
- "paint-support",
- "paint-system",
- "paint-transaction-payment",
+ "pallet-transaction-payment",
  "parity-scale-codec",
  "radicle_registry_runtime",
- "sr-io",
- "sr-primitives",
- "substrate-primitives",
+ "sp-core",
+ "sp-io",
+ "sp-runtime",
  "substrate-subxt",
- "tokio",
+ "tokio 0.1.22",
 ]
 
 [[package]]
@@ -3637,25 +3823,30 @@ version = "0.1.0"
 dependencies = [
  "ctrlc",
  "derive_more 0.15.0",
- "exit-future",
+ "exit-future 0.1.4",
  "futures 0.1.29",
+ "futures 0.3.1",
  "log 0.4.8",
  "parity-scale-codec",
  "parking_lot 0.9.0",
  "radicle_registry_runtime",
- "sr-io",
- "substrate-basic-authorship",
- "substrate-cli",
- "substrate-client",
- "substrate-consensus-aura",
- "substrate-consensus-aura-primitives",
- "substrate-executor",
- "substrate-inherents",
- "substrate-network",
- "substrate-primitives",
- "substrate-service",
- "substrate-transaction-pool",
- "tokio",
+ "sc-basic-authority",
+ "sc-cli",
+ "sc-client",
+ "sc-consensus-aura",
+ "sc-executor",
+ "sc-finality-grandpa",
+ "sc-network",
+ "sc-service",
+ "sc-transaction-pool",
+ "sp-consensus",
+ "sp-consensus-aura",
+ "sp-core",
+ "sp-finality-grandpa",
+ "sp-inherents",
+ "sp-io",
+ "sp-transaction-pool",
+ "tokio 0.1.22",
  "trie-root",
 ]
 
@@ -3663,32 +3854,33 @@ dependencies = [
 name = "radicle_registry_runtime"
 version = "0.1.0"
 dependencies = [
+ "frame-executive",
+ "frame-support",
+ "frame-system",
  "futures 0.1.29",
- "paint-aura",
- "paint-balances",
- "paint-executive",
- "paint-randomness-collective-flip",
- "paint-sudo",
- "paint-support",
- "paint-system",
- "paint-timestamp",
- "paint-transaction-payment",
+ "pallet-aura",
+ "pallet-balances",
+ "pallet-grandpa",
+ "pallet-randomness-collective-flip",
+ "pallet-sudo",
+ "pallet-timestamp",
+ "pallet-transaction-payment",
  "parity-scale-codec",
  "radicle_registry_client",
  "rand 0.7.2",
  "serde",
- "sr-api",
- "sr-io",
- "sr-primitives",
- "sr-std",
- "sr-version",
- "substrate-block-builder-runtime-api",
- "substrate-consensus-aura-primitives",
- "substrate-inherents",
- "substrate-offchain-primitives",
- "substrate-primitives",
- "substrate-session",
- "substrate-transaction-pool-runtime-api",
+ "sp-api",
+ "sp-block-builder",
+ "sp-consensus-aura",
+ "sp-core",
+ "sp-inherents",
+ "sp-io",
+ "sp-offchain",
+ "sp-runtime",
+ "sp-session",
+ "sp-std",
+ "sp-transaction-pool",
+ "sp-version",
  "substrate-wasm-builder-runner 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -3715,19 +3907,6 @@ dependencies = [
  "winapi 0.3.8",
 ]
 
-[[package]]
-name = "rand"
-version = "0.5.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c618c47cd3ebd209790115ab837de41425723956ad3ce2e6a7f09890947cacb9"
-dependencies = [
- "cloudabi",
- "fuchsia-cprng",
- "libc",
- "rand_core 0.3.1",
- "winapi 0.3.8",
-]
-
 [[package]]
 name = "rand"
 version = "0.6.5"
@@ -3958,9 +4137,9 @@ dependencies = [
 
 [[package]]
 name = "rocksdb"
-version = "0.11.0"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1651697fefd273bfb4fd69466cc2a9d20de557a0213b97233b22b5e95924b5e"
+checksum = "12069b106981c6103d3eab7dd1c86751482d0779a520b7c14954c8b586c1e643"
 dependencies = [
  "libc",
  "librocksdb-sys",
@@ -4016,9 +4195,9 @@ version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2f9cbe61c20455d3015b2bb7be39e1872310283b8e5a52f5b242b0ac7581fe78"
 dependencies = [
- "bytes",
+ "bytes 0.4.12",
  "futures 0.1.29",
- "tokio-io",
+ "tokio-io 0.1.12",
 ]
 
 [[package]]
@@ -4043,74 +4222,657 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072"
 
 [[package]]
-name = "schannel"
-version = "0.1.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87f550b06b6cba9c8b8be3ee73f391990116bf527450d2556e9b9ce263b9a021"
+name = "sc-basic-authority"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate?rev=3d17cbd2fbcc337af49c861896ab4936b161bcee#3d17cbd2fbcc337af49c861896ab4936b161bcee"
 dependencies = [
- "lazy_static",
- "winapi 0.3.8",
+ "futures 0.3.1",
+ "log 0.4.8",
+ "parity-scale-codec",
+ "sc-block-builder",
+ "sc-client",
+ "sc-client-api",
+ "sc-telemetry",
+ "sp-blockchain",
+ "sp-consensus",
+ "sp-core",
+ "sp-inherents",
+ "sp-runtime",
+ "sp-transaction-pool",
+ "tokio-executor 0.2.0-alpha.6",
 ]
 
 [[package]]
-name = "schnorrkel"
-version = "0.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eacd8381b3c37840c9c9f40472af529e49975bdcbc24f83c31059fd6539023d3"
+name = "sc-block-builder"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate?rev=3d17cbd2fbcc337af49c861896ab4936b161bcee#3d17cbd2fbcc337af49c861896ab4936b161bcee"
 dependencies = [
- "curve25519-dalek",
- "failure",
- "merlin",
- "rand 0.6.5",
- "rand_core 0.4.2",
- "rand_os",
- "sha2",
- "subtle 2.2.2",
- "zeroize 0.9.3",
+ "parity-scale-codec",
+ "sp-api",
+ "sp-block-builder",
+ "sp-blockchain",
+ "sp-core",
+ "sp-runtime",
+ "sp-state-machine",
 ]
 
 [[package]]
-name = "scopeguard"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27"
-
-[[package]]
-name = "scopeguard"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b42e15e59b18a828bbf5c58ea01debb36b9b096346de35d941dcb89009f24a0d"
-
-[[package]]
-name = "sct"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3042af939fca8c3453b7af0f1c66e533a15a86169e39de2657310ade8f98d3c"
+name = "sc-chain-spec"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate?rev=3d17cbd2fbcc337af49c861896ab4936b161bcee#3d17cbd2fbcc337af49c861896ab4936b161bcee"
 dependencies = [
- "ring",
- "untrusted",
+ "impl-trait-for-tuples",
+ "sc-chain-spec-derive",
+ "sc-network",
+ "sc-telemetry",
+ "serde",
+ "serde_json",
+ "sp-core",
+ "sp-runtime",
 ]
 
 [[package]]
-name = "security-framework"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ef2429d7cefe5fd28bd1d2ed41c944547d4ff84776f5935b456da44593a16df"
+name = "sc-chain-spec-derive"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate?rev=3d17cbd2fbcc337af49c861896ab4936b161bcee#3d17cbd2fbcc337af49c861896ab4936b161bcee"
 dependencies = [
- "core-foundation",
- "core-foundation-sys",
- "libc",
- "security-framework-sys",
+ "proc-macro-crate",
+ "proc-macro2 1.0.6",
+ "quote 1.0.2",
+ "syn 1.0.11",
 ]
 
 [[package]]
-name = "security-framework-sys"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e31493fc37615debb8c5090a7aeb4a9730bc61e77ab10b9af59f1a202284f895"
+name = "sc-cli"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate?rev=3d17cbd2fbcc337af49c861896ab4936b161bcee#3d17cbd2fbcc337af49c861896ab4936b161bcee"
 dependencies = [
- "core-foundation-sys",
-]
+ "ansi_term 0.12.1",
+ "app_dirs",
+ "atty",
+ "clap",
+ "derive_more 0.99.2",
+ "env_logger 0.7.1",
+ "fdlimit",
+ "futures 0.3.1",
+ "lazy_static",
+ "log 0.4.8",
+ "names",
+ "regex",
+ "rpassword",
+ "sc-client-api",
+ "sc-network",
+ "sc-service",
+ "sc-telemetry",
+ "sc-tracing",
+ "serde_json",
+ "sp-blockchain",
+ "sp-core",
+ "sp-keyring",
+ "sp-panic-handler",
+ "sp-runtime",
+ "sp-state-machine",
+ "structopt",
+ "time",
+ "tokio 0.2.4",
+]
+
+[[package]]
+name = "sc-client"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate?rev=3d17cbd2fbcc337af49c861896ab4936b161bcee#3d17cbd2fbcc337af49c861896ab4936b161bcee"
+dependencies = [
+ "derive_more 0.99.2",
+ "fnv",
+ "futures 0.3.1",
+ "hash-db",
+ "hex-literal",
+ "kvdb",
+ "log 0.4.8",
+ "parity-scale-codec",
+ "parking_lot 0.9.0",
+ "sc-block-builder",
+ "sc-client-api",
+ "sc-executor",
+ "sc-telemetry",
+ "sp-api",
+ "sp-blockchain",
+ "sp-consensus",
+ "sp-core",
+ "sp-externalities",
+ "sp-inherents",
+ "sp-keyring",
+ "sp-runtime",
+ "sp-state-machine",
+ "sp-std",
+ "sp-trie",
+ "sp-version",
+ "tracing",
+]
+
+[[package]]
+name = "sc-client-api"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate?rev=3d17cbd2fbcc337af49c861896ab4936b161bcee#3d17cbd2fbcc337af49c861896ab4936b161bcee"
+dependencies = [
+ "derive_more 0.99.2",
+ "fnv",
+ "futures 0.3.1",
+ "hash-db",
+ "hex-literal",
+ "kvdb",
+ "log 0.4.8",
+ "parity-scale-codec",
+ "parking_lot 0.9.0",
+ "sc-executor",
+ "sc-telemetry",
+ "sp-api",
+ "sp-blockchain",
+ "sp-consensus",
+ "sp-core",
+ "sp-externalities",
+ "sp-inherents",
+ "sp-keyring",
+ "sp-runtime",
+ "sp-state-machine",
+ "sp-std",
+ "sp-transaction-pool",
+ "sp-trie",
+ "sp-version",
+]
+
+[[package]]
+name = "sc-client-db"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate?rev=3d17cbd2fbcc337af49c861896ab4936b161bcee#3d17cbd2fbcc337af49c861896ab4936b161bcee"
+dependencies = [
+ "hash-db",
+ "kvdb",
+ "kvdb-memorydb",
+ "kvdb-rocksdb",
+ "linked-hash-map",
+ "log 0.4.8",
+ "parity-scale-codec",
+ "parking_lot 0.9.0",
+ "sc-client",
+ "sc-client-api",
+ "sc-executor",
+ "sc-state-db",
+ "sp-blockchain",
+ "sp-consensus",
+ "sp-core",
+ "sp-runtime",
+ "sp-state-machine",
+ "sp-trie",
+]
+
+[[package]]
+name = "sc-consensus-aura"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate?rev=3d17cbd2fbcc337af49c861896ab4936b161bcee#3d17cbd2fbcc337af49c861896ab4936b161bcee"
+dependencies = [
+ "derive_more 0.99.2",
+ "futures 0.1.29",
+ "futures 0.3.1",
+ "futures-timer 0.4.0",
+ "log 0.4.8",
+ "parity-scale-codec",
+ "parking_lot 0.9.0",
+ "sc-client",
+ "sc-client-api",
+ "sc-consensus-slots",
+ "sc-keystore",
+ "sc-telemetry",
+ "sp-api",
+ "sp-application-crypto",
+ "sp-block-builder",
+ "sp-blockchain",
+ "sp-consensus",
+ "sp-consensus-aura",
+ "sp-core",
+ "sp-inherents",
+ "sp-io",
+ "sp-runtime",
+ "sp-timestamp",
+ "sp-version",
+]
+
+[[package]]
+name = "sc-consensus-slots"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate?rev=3d17cbd2fbcc337af49c861896ab4936b161bcee#3d17cbd2fbcc337af49c861896ab4936b161bcee"
+dependencies = [
+ "futures 0.3.1",
+ "futures-timer 2.0.2",
+ "log 0.4.8",
+ "parity-scale-codec",
+ "parking_lot 0.9.0",
+ "sc-client-api",
+ "sc-telemetry",
+ "sp-blockchain",
+ "sp-consensus",
+ "sp-core",
+ "sp-inherents",
+ "sp-runtime",
+]
+
+[[package]]
+name = "sc-executor"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate?rev=3d17cbd2fbcc337af49c861896ab4936b161bcee#3d17cbd2fbcc337af49c861896ab4936b161bcee"
+dependencies = [
+ "derive_more 0.99.2",
+ "lazy_static",
+ "libsecp256k1",
+ "log 0.4.8",
+ "parity-scale-codec",
+ "parity-wasm",
+ "parking_lot 0.9.0",
+ "sp-core",
+ "sp-externalities",
+ "sp-io",
+ "sp-panic-handler",
+ "sp-runtime-interface",
+ "sp-serializer",
+ "sp-trie",
+ "sp-version",
+ "sp-wasm-interface",
+ "wasmi",
+]
+
+[[package]]
+name = "sc-finality-grandpa"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate?rev=3d17cbd2fbcc337af49c861896ab4936b161bcee#3d17cbd2fbcc337af49c861896ab4936b161bcee"
+dependencies = [
+ "finality-grandpa",
+ "fork-tree",
+ "futures 0.1.29",
+ "futures 0.3.1",
+ "log 0.4.8",
+ "parity-scale-codec",
+ "parking_lot 0.9.0",
+ "rand 0.7.2",
+ "sc-client",
+ "sc-client-api",
+ "sc-keystore",
+ "sc-network",
+ "sc-telemetry",
+ "serde_json",
+ "sp-blockchain",
+ "sp-consensus",
+ "sp-core",
+ "sp-finality-grandpa",
+ "sp-finality-tracker",
+ "sp-inherents",
+ "sp-runtime",
+ "tokio-executor 0.1.9",
+ "tokio-timer",
+]
+
+[[package]]
+name = "sc-keystore"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate?rev=3d17cbd2fbcc337af49c861896ab4936b161bcee#3d17cbd2fbcc337af49c861896ab4936b161bcee"
+dependencies = [
+ "derive_more 0.99.2",
+ "hex",
+ "parking_lot 0.9.0",
+ "rand 0.7.2",
+ "serde_json",
+ "sp-application-crypto",
+ "sp-core",
+ "subtle 2.2.2",
+]
+
+[[package]]
+name = "sc-network"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate?rev=3d17cbd2fbcc337af49c861896ab4936b161bcee#3d17cbd2fbcc337af49c861896ab4936b161bcee"
+dependencies = [
+ "bitflags",
+ "bytes 0.4.12",
+ "derive_more 0.99.2",
+ "either",
+ "erased-serde",
+ "fnv",
+ "fork-tree",
+ "futures 0.1.29",
+ "futures 0.3.1",
+ "futures-timer 0.4.0",
+ "libp2p",
+ "linked-hash-map",
+ "linked_hash_set",
+ "log 0.4.8",
+ "lru",
+ "parity-scale-codec",
+ "parking_lot 0.9.0",
+ "rand 0.7.2",
+ "rustc-hex",
+ "sc-block-builder",
+ "sc-client",
+ "sc-client-api",
+ "sc-peerset",
+ "serde",
+ "serde_json",
+ "slog",
+ "slog_derive",
+ "smallvec 0.6.13",
+ "sp-arithmetic",
+ "sp-blockchain",
+ "sp-consensus",
+ "sp-consensus-babe",
+ "sp-core",
+ "sp-runtime",
+ "tokio-io 0.1.12",
+ "unsigned-varint",
+ "void",
+ "zeroize 1.1.0",
+]
+
+[[package]]
+name = "sc-offchain"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate?rev=3d17cbd2fbcc337af49c861896ab4936b161bcee#3d17cbd2fbcc337af49c861896ab4936b161bcee"
+dependencies = [
+ "bytes 0.4.12",
+ "fnv",
+ "futures 0.1.29",
+ "futures 0.3.1",
+ "futures-timer 2.0.2",
+ "hyper 0.12.35",
+ "hyper-rustls",
+ "log 0.4.8",
+ "num_cpus",
+ "parity-scale-codec",
+ "parking_lot 0.9.0",
+ "rand 0.7.2",
+ "sc-client-api",
+ "sc-keystore",
+ "sc-network",
+ "sp-api",
+ "sp-core",
+ "sp-offchain",
+ "sp-runtime",
+ "threadpool",
+]
+
+[[package]]
+name = "sc-peerset"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate?rev=3d17cbd2fbcc337af49c861896ab4936b161bcee#3d17cbd2fbcc337af49c861896ab4936b161bcee"
+dependencies = [
+ "futures 0.3.1",
+ "libp2p",
+ "log 0.4.8",
+ "serde_json",
+]
+
+[[package]]
+name = "sc-rpc"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate?rev=3d17cbd2fbcc337af49c861896ab4936b161bcee#3d17cbd2fbcc337af49c861896ab4936b161bcee"
+dependencies = [
+ "futures 0.3.1",
+ "hash-db",
+ "jsonrpc-core",
+ "jsonrpc-pubsub",
+ "log 0.4.8",
+ "parity-scale-codec",
+ "parking_lot 0.9.0",
+ "sc-client",
+ "sc-client-api",
+ "sc-executor",
+ "sc-keystore",
+ "sc-rpc-api",
+ "serde_json",
+ "sp-api",
+ "sp-blockchain",
+ "sp-core",
+ "sp-rpc",
+ "sp-runtime",
+ "sp-session",
+ "sp-state-machine",
+ "sp-transaction-pool",
+ "sp-version",
+]
+
+[[package]]
+name = "sc-rpc-api"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate?rev=3d17cbd2fbcc337af49c861896ab4936b161bcee#3d17cbd2fbcc337af49c861896ab4936b161bcee"
+dependencies = [
+ "derive_more 0.99.2",
+ "futures 0.3.1",
+ "jsonrpc-core",
+ "jsonrpc-core-client",
+ "jsonrpc-derive",
+ "jsonrpc-pubsub",
+ "log 0.4.8",
+ "parity-scale-codec",
+ "parking_lot 0.9.0",
+ "serde",
+ "serde_json",
+ "sp-core",
+ "sp-rpc",
+ "sp-transaction-pool",
+ "sp-version",
+]
+
+[[package]]
+name = "sc-rpc-server"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate?rev=3d17cbd2fbcc337af49c861896ab4936b161bcee#3d17cbd2fbcc337af49c861896ab4936b161bcee"
+dependencies = [
+ "jsonrpc-core",
+ "jsonrpc-http-server",
+ "jsonrpc-pubsub",
+ "jsonrpc-ws-server",
+ "log 0.4.8",
+ "serde",
+ "serde_json",
+ "sp-runtime",
+]
+
+[[package]]
+name = "sc-service"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate?rev=3d17cbd2fbcc337af49c861896ab4936b161bcee#3d17cbd2fbcc337af49c861896ab4936b161bcee"
+dependencies = [
+ "derive_more 0.99.2",
+ "exit-future 0.2.0",
+ "futures 0.1.29",
+ "futures 0.3.1",
+ "grafana-data-source",
+ "lazy_static",
+ "log 0.4.8",
+ "parity-multiaddr 0.5.0",
+ "parity-scale-codec",
+ "parking_lot 0.9.0",
+ "sc-chain-spec",
+ "sc-client",
+ "sc-client-api",
+ "sc-client-db",
+ "sc-executor",
+ "sc-keystore",
+ "sc-network",
+ "sc-offchain",
+ "sc-rpc",
+ "sc-rpc-server",
+ "sc-telemetry",
+ "sc-tracing",
+ "sc-transaction-pool",
+ "serde",
+ "serde_json",
+ "slog",
+ "sp-api",
+ "sp-application-crypto",
+ "sp-blockchain",
+ "sp-consensus",
+ "sp-core",
+ "sp-io",
+ "sp-runtime",
+ "sp-session",
+ "sp-transaction-pool",
+ "sysinfo",
+ "target_info",
+ "tokio-executor 0.1.9",
+ "tokio-timer",
+ "tracing",
+]
+
+[[package]]
+name = "sc-state-db"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate?rev=3d17cbd2fbcc337af49c861896ab4936b161bcee#3d17cbd2fbcc337af49c861896ab4936b161bcee"
+dependencies = [
+ "log 0.4.8",
+ "parity-scale-codec",
+ "parking_lot 0.9.0",
+ "sp-core",
+]
+
+[[package]]
+name = "sc-telemetry"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate?rev=3d17cbd2fbcc337af49c861896ab4936b161bcee#3d17cbd2fbcc337af49c861896ab4936b161bcee"
+dependencies = [
+ "bytes 0.4.12",
+ "futures 0.1.29",
+ "futures 0.3.1",
+ "futures-timer 2.0.2",
+ "libp2p",
+ "log 0.4.8",
+ "parking_lot 0.9.0",
+ "rand 0.7.2",
+ "serde",
+ "slog",
+ "slog-json",
+ "slog-scope",
+ "take_mut",
+ "tokio-io 0.1.12",
+ "void",
+]
+
+[[package]]
+name = "sc-tracing"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate?rev=3d17cbd2fbcc337af49c861896ab4936b161bcee#3d17cbd2fbcc337af49c861896ab4936b161bcee"
+dependencies = [
+ "erased-serde",
+ "grafana-data-source",
+ "log 0.4.8",
+ "parking_lot 0.9.0",
+ "sc-telemetry",
+ "serde",
+ "serde_json",
+ "slog",
+ "tracing-core",
+]
+
+[[package]]
+name = "sc-transaction-graph"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate?rev=3d17cbd2fbcc337af49c861896ab4936b161bcee#3d17cbd2fbcc337af49c861896ab4936b161bcee"
+dependencies = [
+ "derive_more 0.99.2",
+ "futures 0.3.1",
+ "log 0.4.8",
+ "parking_lot 0.9.0",
+ "serde",
+ "sp-core",
+ "sp-runtime",
+ "sp-transaction-pool",
+]
+
+[[package]]
+name = "sc-transaction-pool"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate?rev=3d17cbd2fbcc337af49c861896ab4936b161bcee#3d17cbd2fbcc337af49c861896ab4936b161bcee"
+dependencies = [
+ "derive_more 0.99.2",
+ "futures 0.3.1",
+ "log 0.4.8",
+ "parity-scale-codec",
+ "parking_lot 0.9.0",
+ "sc-client-api",
+ "sc-transaction-graph",
+ "sp-api",
+ "sp-blockchain",
+ "sp-core",
+ "sp-runtime",
+ "sp-transaction-pool",
+]
+
+[[package]]
+name = "schannel"
+version = "0.1.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87f550b06b6cba9c8b8be3ee73f391990116bf527450d2556e9b9ce263b9a021"
+dependencies = [
+ "lazy_static",
+ "winapi 0.3.8",
+]
+
+[[package]]
+name = "schnorrkel"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eacd8381b3c37840c9c9f40472af529e49975bdcbc24f83c31059fd6539023d3"
+dependencies = [
+ "curve25519-dalek 1.2.3",
+ "failure",
+ "merlin",
+ "rand 0.6.5",
+ "rand_core 0.4.2",
+ "rand_os",
+ "sha2",
+ "subtle 2.2.2",
+ "zeroize 0.9.3",
+]
+
+[[package]]
+name = "scopeguard"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27"
+
+[[package]]
+name = "scopeguard"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b42e15e59b18a828bbf5c58ea01debb36b9b096346de35d941dcb89009f24a0d"
+
+[[package]]
+name = "sct"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3042af939fca8c3453b7af0f1c66e533a15a86169e39de2657310ade8f98d3c"
+dependencies = [
+ "ring",
+ "untrusted",
+]
+
+[[package]]
+name = "security-framework"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ef2429d7cefe5fd28bd1d2ed41c944547d4ff84776f5935b456da44593a16df"
+dependencies = [
+ "core-foundation",
+ "core-foundation-sys",
+ "libc",
+ "security-framework-sys",
+]
+
+[[package]]
+name = "security-framework-sys"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e31493fc37615debb8c5090a7aeb4a9730bc61e77ab10b9af59f1a202284f895"
+dependencies = [
+ "core-foundation-sys",
+]
 
 [[package]]
 name = "semver"
@@ -4217,6 +4979,12 @@ dependencies = [
  "winapi-build",
 ]
 
+[[package]]
+name = "shlex"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2"
+
 [[package]]
 name = "slab"
 version = "0.4.2"
@@ -4232,17 +5000,6 @@ dependencies = [
  "erased-serde",
 ]
 
-[[package]]
-name = "slog-async"
-version = "2.3.0"
-source = "git+https://github.com/paritytech/slog-async#107848e7ded5e80dc43f6296c2b96039eb92c0a5"
-dependencies = [
- "crossbeam-channel",
- "slog",
- "take_mut",
- "thread_local",
-]
-
 [[package]]
 name = "slog-json"
 version = "2.3.0"
@@ -4269,13 +5026,13 @@ dependencies = [
 
 [[package]]
 name = "slog_derive"
-version = "0.1.1"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9eff3b513cf2e0d1a60e1aba152dc72bedc5b05585722bb3cebd7bcb1e31b98f"
+checksum = "a945ec7f7ce853e89ffa36be1e27dce9a43e82ff9093bf3461c30d5da74ed11b"
 dependencies = [
- "proc-macro2 0.4.30",
- "quote 0.6.13",
- "syn 0.15.44",
+ "proc-macro2 1.0.6",
+ "quote 1.0.2",
+ "syn 1.0.11",
 ]
 
 [[package]]
@@ -4313,7 +5070,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bceb1a3a15232d013d9a3b7cac9e5ce8e2313f348f01d4bc1097e5e53aa07095"
 dependencies = [
  "base64 0.10.1",
- "bytes",
+ "bytes 0.4.12",
  "flate2",
  "futures 0.1.29",
  "http",
@@ -4322,312 +5079,36 @@ dependencies = [
  "rand 0.6.5",
  "sha1",
  "smallvec 0.6.13",
- "tokio-codec",
- "tokio-io",
-]
-
-[[package]]
-name = "sourcefile"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4bf77cb82ba8453b42b6ae1d692e4cdc92f9a47beaf89a847c8be83f4e328ad3"
-
-[[package]]
-name = "spin"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
-
-[[package]]
-name = "sr-api"
-version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?rev=dc4a8329b9c47790c25429a5df272b3648275c1b#dc4a8329b9c47790c25429a5df272b3648275c1b"
-dependencies = [
- "parity-scale-codec",
- "sr-api-proc-macro",
- "sr-primitives",
- "sr-std",
- "sr-version",
- "substrate-primitives",
- "substrate-state-machine",
-]
-
-[[package]]
-name = "sr-api-proc-macro"
-version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?rev=dc4a8329b9c47790c25429a5df272b3648275c1b#dc4a8329b9c47790c25429a5df272b3648275c1b"
-dependencies = [
- "blake2-rfc",
- "proc-macro-crate",
- "proc-macro2 1.0.6",
- "quote 1.0.2",
- "syn 1.0.11",
-]
-
-[[package]]
-name = "sr-arithmetic"
-version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?rev=dc4a8329b9c47790c25429a5df272b3648275c1b#dc4a8329b9c47790c25429a5df272b3648275c1b"
-dependencies = [
- "integer-sqrt",
- "num-traits",
- "parity-scale-codec",
- "serde",
- "sr-std",
- "substrate-debug-derive",
-]
-
-[[package]]
-name = "sr-io"
-version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?rev=dc4a8329b9c47790c25429a5df272b3648275c1b#dc4a8329b9c47790c25429a5df272b3648275c1b"
-dependencies = [
- "hash-db",
- "libsecp256k1",
- "log 0.4.8",
- "parity-scale-codec",
- "sr-std",
- "substrate-externalities",
- "substrate-primitives",
- "substrate-runtime-interface",
- "substrate-state-machine",
- "substrate-trie",
-]
-
-[[package]]
-name = "sr-primitives"
-version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?rev=dc4a8329b9c47790c25429a5df272b3648275c1b#dc4a8329b9c47790c25429a5df272b3648275c1b"
-dependencies = [
- "impl-trait-for-tuples",
- "log 0.4.8",
- "parity-scale-codec",
- "paste",
- "rand 0.7.2",
- "serde",
- "sr-arithmetic",
- "sr-io",
- "sr-std",
- "substrate-application-crypto",
- "substrate-inherents",
- "substrate-primitives",
-]
-
-[[package]]
-name = "sr-sandbox"
-version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?rev=dc4a8329b9c47790c25429a5df272b3648275c1b#dc4a8329b9c47790c25429a5df272b3648275c1b"
-dependencies = [
- "parity-scale-codec",
- "sr-io",
- "sr-std",
- "substrate-primitives",
- "wasmi",
-]
-
-[[package]]
-name = "sr-staking-primitives"
-version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?rev=dc4a8329b9c47790c25429a5df272b3648275c1b#dc4a8329b9c47790c25429a5df272b3648275c1b"
-dependencies = [
- "parity-scale-codec",
- "sr-primitives",
- "sr-std",
-]
-
-[[package]]
-name = "sr-std"
-version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?rev=dc4a8329b9c47790c25429a5df272b3648275c1b#dc4a8329b9c47790c25429a5df272b3648275c1b"
-
-[[package]]
-name = "sr-version"
-version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?rev=dc4a8329b9c47790c25429a5df272b3648275c1b#dc4a8329b9c47790c25429a5df272b3648275c1b"
-dependencies = [
- "impl-serde",
- "parity-scale-codec",
- "serde",
- "sr-primitives",
- "sr-std",
-]
-
-[[package]]
-name = "stable_deref_trait"
-version = "1.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8"
-
-[[package]]
-name = "static_assertions"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
-
-[[package]]
-name = "stream-cipher"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8131256a5896cabcf5eb04f4d6dacbe1aefda854b0d9896e09cb58829ec5638c"
-dependencies = [
- "generic-array",
-]
-
-[[package]]
-name = "string"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d24114bfcceb867ca7f71a0d3fe45d45619ec47a6fbfa98cb14e14250bfa5d6d"
-dependencies = [
- "bytes",
-]
-
-[[package]]
-name = "strsim"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
-
-[[package]]
-name = "structopt"
-version = "0.3.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30b3a3e93f5ad553c38b3301c8a0a0cec829a36783f6a0c467fc4bf553a5f5bf"
-dependencies = [
- "clap",
- "structopt-derive",
-]
-
-[[package]]
-name = "structopt-derive"
-version = "0.3.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea692d40005b3ceba90a9fe7a78fa8d4b82b0ce627eebbffc329aab850f3410e"
-dependencies = [
- "heck",
- "proc-macro-error",
- "proc-macro2 1.0.6",
- "quote 1.0.2",
- "syn 1.0.11",
-]
-
-[[package]]
-name = "strum"
-version = "0.15.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5d1c33039533f051704951680f1adfd468fd37ac46816ded0d9ee068e60f05f"
-
-[[package]]
-name = "strum_macros"
-version = "0.15.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "47cd23f5c7dee395a00fa20135e2ec0fffcdfa151c56182966d7a3261343432e"
-dependencies = [
- "heck",
- "proc-macro2 0.4.30",
- "quote 0.6.13",
- "syn 0.15.44",
-]
-
-[[package]]
-name = "substrate-application-crypto"
-version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?rev=dc4a8329b9c47790c25429a5df272b3648275c1b#dc4a8329b9c47790c25429a5df272b3648275c1b"
-dependencies = [
- "parity-scale-codec",
- "serde",
- "sr-io",
- "sr-std",
- "substrate-primitives",
-]
-
-[[package]]
-name = "substrate-authority-discovery-primitives"
-version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?rev=dc4a8329b9c47790c25429a5df272b3648275c1b#dc4a8329b9c47790c25429a5df272b3648275c1b"
-dependencies = [
- "parity-scale-codec",
- "sr-api",
- "sr-primitives",
- "sr-std",
- "substrate-application-crypto",
-]
-
-[[package]]
-name = "substrate-basic-authorship"
-version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?rev=dc4a8329b9c47790c25429a5df272b3648275c1b#dc4a8329b9c47790c25429a5df272b3648275c1b"
-dependencies = [
- "futures-preview",
- "log 0.4.8",
- "parity-scale-codec",
- "sr-primitives",
- "substrate-block-builder",
- "substrate-client",
- "substrate-client-api",
- "substrate-consensus-common",
- "substrate-inherents",
- "substrate-primitives",
- "substrate-telemetry",
- "substrate-transaction-pool",
-]
-
-[[package]]
-name = "substrate-bip39"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3be511be555a3633e71739a79e4ddff6a6aaa6579fa6114182a51d72c3eb93c5"
-dependencies = [
- "hmac",
- "pbkdf2",
- "schnorrkel",
- "sha2",
-]
-
-[[package]]
-name = "substrate-block-builder"
-version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?rev=dc4a8329b9c47790c25429a5df272b3648275c1b#dc4a8329b9c47790c25429a5df272b3648275c1b"
-dependencies = [
- "parity-scale-codec",
- "sr-api",
- "sr-primitives",
- "substrate-block-builder-runtime-api",
- "substrate-primitives",
- "substrate-state-machine",
-]
-
-[[package]]
-name = "substrate-block-builder-runtime-api"
-version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?rev=dc4a8329b9c47790c25429a5df272b3648275c1b#dc4a8329b9c47790c25429a5df272b3648275c1b"
-dependencies = [
- "sr-api",
- "sr-primitives",
- "sr-std",
- "substrate-inherents",
+ "tokio-codec 0.1.1",
+ "tokio-io 0.1.12",
 ]
 
 [[package]]
-name = "substrate-chain-spec"
+name = "sourcefile"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4bf77cb82ba8453b42b6ae1d692e4cdc92f9a47beaf89a847c8be83f4e328ad3"
+
+[[package]]
+name = "sp-api"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?rev=dc4a8329b9c47790c25429a5df272b3648275c1b#dc4a8329b9c47790c25429a5df272b3648275c1b"
+source = "git+https://github.com/paritytech/substrate?rev=3d17cbd2fbcc337af49c861896ab4936b161bcee#3d17cbd2fbcc337af49c861896ab4936b161bcee"
 dependencies = [
- "impl-trait-for-tuples",
- "serde",
- "serde_json",
- "sr-primitives",
- "substrate-chain-spec-derive",
- "substrate-network",
- "substrate-primitives",
- "substrate-telemetry",
+ "parity-scale-codec",
+ "sp-api-proc-macro",
+ "sp-core",
+ "sp-runtime",
+ "sp-state-machine",
+ "sp-std",
+ "sp-version",
 ]
 
 [[package]]
-name = "substrate-chain-spec-derive"
+name = "sp-api-proc-macro"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?rev=dc4a8329b9c47790c25429a5df272b3648275c1b#dc4a8329b9c47790c25429a5df272b3648275c1b"
+source = "git+https://github.com/paritytech/substrate?rev=3d17cbd2fbcc337af49c861896ab4936b161bcee#3d17cbd2fbcc337af49c861896ab4936b161bcee"
 dependencies = [
+ "blake2-rfc",
  "proc-macro-crate",
  "proc-macro2 1.0.6",
  "quote 1.0.2",
@@ -4635,796 +5116,606 @@ dependencies = [
 ]
 
 [[package]]
-name = "substrate-cli"
+name = "sp-application-crypto"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?rev=dc4a8329b9c47790c25429a5df272b3648275c1b#dc4a8329b9c47790c25429a5df272b3648275c1b"
+source = "git+https://github.com/paritytech/substrate?rev=3d17cbd2fbcc337af49c861896ab4936b161bcee#3d17cbd2fbcc337af49c861896ab4936b161bcee"
 dependencies = [
- "ansi_term 0.12.1",
- "app_dirs",
- "atty",
- "clap",
- "derive_more 0.15.0",
- "env_logger 0.7.1",
- "exit-future",
- "fdlimit",
- "futures 0.1.29",
- "futures-preview",
- "lazy_static",
- "log 0.4.8",
- "names",
- "regex",
- "rpassword",
- "serde_json",
- "sr-primitives",
- "structopt",
- "substrate-client-api",
- "substrate-header-metadata",
- "substrate-keyring",
- "substrate-network",
- "substrate-panic-handler",
- "substrate-primitives",
- "substrate-service",
- "substrate-state-machine",
- "substrate-telemetry",
- "time",
- "tokio",
+ "parity-scale-codec",
+ "serde",
+ "sp-core",
+ "sp-io",
+ "sp-std",
 ]
 
 [[package]]
-name = "substrate-client"
-version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?rev=dc4a8329b9c47790c25429a5df272b3648275c1b#dc4a8329b9c47790c25429a5df272b3648275c1b"
-dependencies = [
- "derive_more 0.15.0",
- "fnv",
- "futures 0.1.29",
- "futures-preview",
- "hash-db",
- "hex-literal",
- "kvdb",
- "log 0.4.8",
- "parity-scale-codec",
- "parking_lot 0.9.0",
- "sr-api",
- "sr-primitives",
- "sr-std",
- "sr-version",
- "substrate-block-builder",
- "substrate-client-api",
- "substrate-consensus-common",
- "substrate-executor",
- "substrate-header-metadata",
- "substrate-inherents",
- "substrate-keyring",
- "substrate-primitives",
- "substrate-state-machine",
- "substrate-telemetry",
- "substrate-trie",
-]
-
-[[package]]
-name = "substrate-client-api"
+name = "sp-arithmetic"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?rev=dc4a8329b9c47790c25429a5df272b3648275c1b#dc4a8329b9c47790c25429a5df272b3648275c1b"
+source = "git+https://github.com/paritytech/substrate?rev=3d17cbd2fbcc337af49c861896ab4936b161bcee#3d17cbd2fbcc337af49c861896ab4936b161bcee"
 dependencies = [
- "derive_more 0.15.0",
- "fnv",
- "futures 0.1.29",
- "futures-preview",
- "hash-db",
- "hex-literal",
- "kvdb",
- "log 0.4.8",
+ "integer-sqrt",
+ "num-traits",
  "parity-scale-codec",
- "parking_lot 0.9.0",
- "sr-api",
- "sr-primitives",
- "sr-std",
- "sr-version",
- "substrate-block-builder",
- "substrate-consensus-common",
- "substrate-executor",
- "substrate-header-metadata",
- "substrate-inherents",
- "substrate-keyring",
- "substrate-primitives",
- "substrate-state-machine",
- "substrate-telemetry",
- "substrate-trie",
-]
-
-[[package]]
-name = "substrate-client-db"
+ "serde",
+ "sp-debug-derive",
+ "sp-std",
+]
+
+[[package]]
+name = "sp-authority-discovery"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?rev=dc4a8329b9c47790c25429a5df272b3648275c1b#dc4a8329b9c47790c25429a5df272b3648275c1b"
+source = "git+https://github.com/paritytech/substrate?rev=3d17cbd2fbcc337af49c861896ab4936b161bcee#3d17cbd2fbcc337af49c861896ab4936b161bcee"
 dependencies = [
- "hash-db",
- "kvdb",
- "kvdb-memorydb",
- "kvdb-rocksdb",
- "linked-hash-map",
- "log 0.4.8",
  "parity-scale-codec",
- "parking_lot 0.9.0",
- "sr-primitives",
- "substrate-client",
- "substrate-client-api",
- "substrate-consensus-common",
- "substrate-executor",
- "substrate-header-metadata",
- "substrate-primitives",
- "substrate-state-db",
- "substrate-state-machine",
- "substrate-trie",
+ "sp-api",
+ "sp-application-crypto",
+ "sp-runtime",
+ "sp-std",
 ]
 
 [[package]]
-name = "substrate-consensus-aura"
+name = "sp-authorship"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?rev=dc4a8329b9c47790c25429a5df272b3648275c1b#dc4a8329b9c47790c25429a5df272b3648275c1b"
+source = "git+https://github.com/paritytech/substrate?rev=3d17cbd2fbcc337af49c861896ab4936b161bcee#3d17cbd2fbcc337af49c861896ab4936b161bcee"
 dependencies = [
- "derive_more 0.15.0",
- "futures 0.1.29",
- "futures-preview",
- "futures-timer",
- "log 0.4.8",
- "paint-aura",
  "parity-scale-codec",
- "parking_lot 0.9.0",
- "sr-api",
- "sr-io",
- "sr-primitives",
- "sr-version",
- "substrate-application-crypto",
- "substrate-block-builder-runtime-api",
- "substrate-client",
- "substrate-client-api",
- "substrate-consensus-aura-primitives",
- "substrate-consensus-common",
- "substrate-consensus-slots",
- "substrate-inherents",
- "substrate-keystore",
- "substrate-primitives",
- "substrate-telemetry",
-]
-
-[[package]]
-name = "substrate-consensus-aura-primitives"
+ "sp-inherents",
+ "sp-runtime",
+ "sp-std",
+]
+
+[[package]]
+name = "sp-block-builder"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?rev=dc4a8329b9c47790c25429a5df272b3648275c1b#dc4a8329b9c47790c25429a5df272b3648275c1b"
+source = "git+https://github.com/paritytech/substrate?rev=3d17cbd2fbcc337af49c861896ab4936b161bcee#3d17cbd2fbcc337af49c861896ab4936b161bcee"
 dependencies = [
  "parity-scale-codec",
- "sr-api",
- "sr-primitives",
- "sr-std",
- "substrate-application-crypto",
+ "sp-api",
+ "sp-inherents",
+ "sp-runtime",
+ "sp-std",
 ]
 
 [[package]]
-name = "substrate-consensus-babe-primitives"
+name = "sp-blockchain"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?rev=dc4a8329b9c47790c25429a5df272b3648275c1b#dc4a8329b9c47790c25429a5df272b3648275c1b"
+source = "git+https://github.com/paritytech/substrate?rev=3d17cbd2fbcc337af49c861896ab4936b161bcee#3d17cbd2fbcc337af49c861896ab4936b161bcee"
 dependencies = [
+ "derive_more 0.99.2",
+ "log 0.4.8",
+ "lru",
  "parity-scale-codec",
- "schnorrkel",
- "sr-api",
- "sr-primitives",
- "sr-std",
- "substrate-application-crypto",
- "substrate-consensus-slots",
+ "parking_lot 0.9.0",
+ "sp-block-builder",
+ "sp-consensus",
+ "sp-runtime",
+ "sp-state-machine",
 ]
 
 [[package]]
-name = "substrate-consensus-common"
+name = "sp-consensus"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?rev=dc4a8329b9c47790c25429a5df272b3648275c1b#dc4a8329b9c47790c25429a5df272b3648275c1b"
+source = "git+https://github.com/paritytech/substrate?rev=3d17cbd2fbcc337af49c861896ab4936b161bcee#3d17cbd2fbcc337af49c861896ab4936b161bcee"
 dependencies = [
- "derive_more 0.15.0",
- "futures-preview",
- "futures-timer",
+ "derive_more 0.99.2",
+ "futures 0.3.1",
+ "futures-timer 0.4.0",
  "libp2p",
  "log 0.4.8",
  "parity-scale-codec",
  "parking_lot 0.9.0",
- "sr-primitives",
- "sr-std",
- "sr-version",
- "substrate-inherents",
- "substrate-primitives",
+ "sp-core",
+ "sp-inherents",
+ "sp-runtime",
+ "sp-std",
+ "sp-version",
 ]
 
 [[package]]
-name = "substrate-consensus-slots"
+name = "sp-consensus-aura"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?rev=dc4a8329b9c47790c25429a5df272b3648275c1b#dc4a8329b9c47790c25429a5df272b3648275c1b"
+source = "git+https://github.com/paritytech/substrate?rev=3d17cbd2fbcc337af49c861896ab4936b161bcee#3d17cbd2fbcc337af49c861896ab4936b161bcee"
 dependencies = [
- "futures-preview",
- "futures-timer",
- "log 0.4.8",
  "parity-scale-codec",
- "parking_lot 0.9.0",
- "sr-primitives",
- "substrate-client-api",
- "substrate-consensus-common",
- "substrate-inherents",
- "substrate-primitives",
- "substrate-telemetry",
+ "sp-api",
+ "sp-application-crypto",
+ "sp-inherents",
+ "sp-runtime",
+ "sp-std",
+ "sp-timestamp",
 ]
 
 [[package]]
-name = "substrate-debug-derive"
+name = "sp-consensus-babe"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?rev=dc4a8329b9c47790c25429a5df272b3648275c1b#dc4a8329b9c47790c25429a5df272b3648275c1b"
+source = "git+https://github.com/paritytech/substrate?rev=3d17cbd2fbcc337af49c861896ab4936b161bcee#3d17cbd2fbcc337af49c861896ab4936b161bcee"
 dependencies = [
- "proc-macro2 1.0.6",
- "quote 1.0.2",
- "syn 1.0.11",
+ "parity-scale-codec",
+ "schnorrkel",
+ "sp-api",
+ "sp-application-crypto",
+ "sp-consensus",
+ "sp-inherents",
+ "sp-runtime",
+ "sp-std",
+ "sp-timestamp",
 ]
 
 [[package]]
-name = "substrate-executor"
+name = "sp-core"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?rev=dc4a8329b9c47790c25429a5df272b3648275c1b#dc4a8329b9c47790c25429a5df272b3648275c1b"
+source = "git+https://github.com/paritytech/substrate?rev=3d17cbd2fbcc337af49c861896ab4936b161bcee#3d17cbd2fbcc337af49c861896ab4936b161bcee"
 dependencies = [
- "derive_more 0.15.0",
+ "base58",
+ "blake2-rfc",
+ "byteorder 1.3.2",
+ "ed25519-dalek",
+ "hash-db",
+ "hash256-std-hasher",
+ "hex",
+ "impl-serde",
  "lazy_static",
  "libsecp256k1",
  "log 0.4.8",
+ "num-traits",
  "parity-scale-codec",
- "parity-wasm 0.40.3",
  "parking_lot 0.9.0",
- "sr-io",
- "sr-version",
- "substrate-externalities",
- "substrate-panic-handler",
- "substrate-primitives",
- "substrate-runtime-interface",
- "substrate-serializer",
- "substrate-trie",
- "substrate-wasm-interface",
- "wasmi",
-]
-
-[[package]]
-name = "substrate-externalities"
-version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?rev=dc4a8329b9c47790c25429a5df272b3648275c1b#dc4a8329b9c47790c25429a5df272b3648275c1b"
-dependencies = [
- "environmental",
  "primitive-types",
- "sr-std",
- "substrate-primitives-storage",
+ "rand 0.7.2",
+ "regex",
+ "rustc-hex",
+ "schnorrkel",
+ "serde",
+ "sha2",
+ "sp-debug-derive",
+ "sp-externalities",
+ "sp-runtime-interface",
+ "sp-std",
+ "sp-storage",
+ "substrate-bip39",
+ "tiny-bip39",
+ "tiny-keccak",
+ "twox-hash",
+ "wasmi",
+ "zeroize 1.1.0",
 ]
 
 [[package]]
-name = "substrate-finality-grandpa-primitives"
+name = "sp-debug-derive"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?rev=dc4a8329b9c47790c25429a5df272b3648275c1b#dc4a8329b9c47790c25429a5df272b3648275c1b"
+source = "git+https://github.com/paritytech/substrate?rev=3d17cbd2fbcc337af49c861896ab4936b161bcee#3d17cbd2fbcc337af49c861896ab4936b161bcee"
 dependencies = [
- "parity-scale-codec",
- "serde",
- "sr-api",
- "sr-primitives",
- "sr-std",
- "substrate-application-crypto",
+ "proc-macro2 1.0.6",
+ "quote 1.0.2",
+ "syn 1.0.11",
 ]
 
 [[package]]
-name = "substrate-header-metadata"
+name = "sp-externalities"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?rev=dc4a8329b9c47790c25429a5df272b3648275c1b#dc4a8329b9c47790c25429a5df272b3648275c1b"
+source = "git+https://github.com/paritytech/substrate?rev=3d17cbd2fbcc337af49c861896ab4936b161bcee#3d17cbd2fbcc337af49c861896ab4936b161bcee"
 dependencies = [
- "lru",
- "parking_lot 0.9.0",
- "sr-primitives",
+ "environmental",
+ "sp-std",
+ "sp-storage",
 ]
 
 [[package]]
-name = "substrate-inherents"
+name = "sp-finality-grandpa"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?rev=dc4a8329b9c47790c25429a5df272b3648275c1b#dc4a8329b9c47790c25429a5df272b3648275c1b"
+source = "git+https://github.com/paritytech/substrate?rev=3d17cbd2fbcc337af49c861896ab4936b161bcee#3d17cbd2fbcc337af49c861896ab4936b161bcee"
 dependencies = [
- "derive_more 0.15.0",
  "parity-scale-codec",
- "parking_lot 0.9.0",
- "sr-std",
- "substrate-primitives",
+ "serde",
+ "sp-api",
+ "sp-application-crypto",
+ "sp-runtime",
+ "sp-std",
 ]
 
 [[package]]
-name = "substrate-keyring"
+name = "sp-finality-tracker"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?rev=dc4a8329b9c47790c25429a5df272b3648275c1b#dc4a8329b9c47790c25429a5df272b3648275c1b"
+source = "git+https://github.com/paritytech/substrate?rev=3d17cbd2fbcc337af49c861896ab4936b161bcee#3d17cbd2fbcc337af49c861896ab4936b161bcee"
 dependencies = [
- "lazy_static",
- "sr-primitives",
- "strum",
- "strum_macros",
- "substrate-primitives",
+ "parity-scale-codec",
+ "sp-inherents",
+ "sp-std",
 ]
 
 [[package]]
-name = "substrate-keystore"
+name = "sp-inherents"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?rev=dc4a8329b9c47790c25429a5df272b3648275c1b#dc4a8329b9c47790c25429a5df272b3648275c1b"
+source = "git+https://github.com/paritytech/substrate?rev=3d17cbd2fbcc337af49c861896ab4936b161bcee#3d17cbd2fbcc337af49c861896ab4936b161bcee"
 dependencies = [
- "derive_more 0.15.0",
- "hex 0.3.2",
+ "derive_more 0.99.2",
+ "parity-scale-codec",
  "parking_lot 0.9.0",
- "rand 0.7.2",
- "serde_json",
- "substrate-application-crypto",
- "substrate-primitives",
- "subtle 2.2.2",
+ "sp-core",
+ "sp-std",
 ]
 
 [[package]]
-name = "substrate-network"
+name = "sp-io"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?rev=dc4a8329b9c47790c25429a5df272b3648275c1b#dc4a8329b9c47790c25429a5df272b3648275c1b"
+source = "git+https://github.com/paritytech/substrate?rev=3d17cbd2fbcc337af49c861896ab4936b161bcee#3d17cbd2fbcc337af49c861896ab4936b161bcee"
 dependencies = [
- "bitflags",
- "bytes",
- "derive_more 0.15.0",
- "either",
- "erased-serde",
- "fnv",
- "fork-tree",
- "futures 0.1.29",
- "futures-preview",
- "futures-timer",
- "libp2p",
- "linked-hash-map",
- "linked_hash_set",
+ "hash-db",
+ "libsecp256k1",
  "log 0.4.8",
- "lru",
  "parity-scale-codec",
- "parking_lot 0.9.0",
- "rand 0.7.2",
- "rustc-hex",
- "serde",
- "serde_json",
- "slog",
- "slog_derive",
- "smallvec 0.6.13",
- "sr-arithmetic",
- "sr-primitives",
- "substrate-block-builder",
- "substrate-client",
- "substrate-client-api",
- "substrate-consensus-babe-primitives",
- "substrate-consensus-common",
- "substrate-header-metadata",
- "substrate-peerset",
- "substrate-primitives",
- "tokio-io",
- "unsigned-varint",
- "void",
- "zeroize 0.10.1",
+ "sp-core",
+ "sp-externalities",
+ "sp-runtime-interface",
+ "sp-state-machine",
+ "sp-std",
+ "sp-trie",
 ]
 
 [[package]]
-name = "substrate-offchain"
+name = "sp-keyring"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?rev=dc4a8329b9c47790c25429a5df272b3648275c1b#dc4a8329b9c47790c25429a5df272b3648275c1b"
+source = "git+https://github.com/paritytech/substrate?rev=3d17cbd2fbcc337af49c861896ab4936b161bcee#3d17cbd2fbcc337af49c861896ab4936b161bcee"
 dependencies = [
- "bytes",
- "fnv",
- "futures 0.1.29",
- "futures-preview",
- "futures-timer",
- "hyper 0.12.35",
- "hyper-rustls",
- "log 0.4.8",
- "num_cpus",
- "parity-scale-codec",
- "parking_lot 0.9.0",
- "rand 0.7.2",
- "sr-api",
- "sr-primitives",
- "substrate-client-api",
- "substrate-keystore",
- "substrate-network",
- "substrate-offchain-primitives",
- "substrate-primitives",
- "substrate-transaction-pool",
- "threadpool",
+ "lazy_static",
+ "sp-core",
+ "sp-runtime",
+ "strum",
 ]
 
 [[package]]
-name = "substrate-offchain-primitives"
+name = "sp-offchain"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?rev=dc4a8329b9c47790c25429a5df272b3648275c1b#dc4a8329b9c47790c25429a5df272b3648275c1b"
+source = "git+https://github.com/paritytech/substrate?rev=3d17cbd2fbcc337af49c861896ab4936b161bcee#3d17cbd2fbcc337af49c861896ab4936b161bcee"
 dependencies = [
- "sr-api",
- "sr-primitives",
+ "sp-api",
+ "sp-runtime",
 ]
 
 [[package]]
-name = "substrate-panic-handler"
+name = "sp-panic-handler"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?rev=dc4a8329b9c47790c25429a5df272b3648275c1b#dc4a8329b9c47790c25429a5df272b3648275c1b"
+source = "git+https://github.com/paritytech/substrate?rev=3d17cbd2fbcc337af49c861896ab4936b161bcee#3d17cbd2fbcc337af49c861896ab4936b161bcee"
 dependencies = [
  "backtrace",
  "log 0.4.8",
 ]
 
 [[package]]
-name = "substrate-peerset"
+name = "sp-phragmen"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?rev=dc4a8329b9c47790c25429a5df272b3648275c1b#dc4a8329b9c47790c25429a5df272b3648275c1b"
+source = "git+https://github.com/paritytech/substrate?rev=3d17cbd2fbcc337af49c861896ab4936b161bcee#3d17cbd2fbcc337af49c861896ab4936b161bcee"
 dependencies = [
- "futures-preview",
- "libp2p",
- "log 0.4.8",
- "serde_json",
+ "serde",
+ "sp-runtime",
+ "sp-std",
 ]
 
 [[package]]
-name = "substrate-phragmen"
+name = "sp-rpc"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?rev=dc4a8329b9c47790c25429a5df272b3648275c1b#dc4a8329b9c47790c25429a5df272b3648275c1b"
+source = "git+https://github.com/paritytech/substrate?rev=3d17cbd2fbcc337af49c861896ab4936b161bcee#3d17cbd2fbcc337af49c861896ab4936b161bcee"
 dependencies = [
  "serde",
- "sr-primitives",
- "sr-std",
+ "sp-core",
 ]
 
 [[package]]
-name = "substrate-primitives"
+name = "sp-runtime"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?rev=dc4a8329b9c47790c25429a5df272b3648275c1b#dc4a8329b9c47790c25429a5df272b3648275c1b"
+source = "git+https://github.com/paritytech/substrate?rev=3d17cbd2fbcc337af49c861896ab4936b161bcee#3d17cbd2fbcc337af49c861896ab4936b161bcee"
 dependencies = [
- "base58",
- "blake2-rfc",
- "byteorder 1.3.2",
- "ed25519-dalek 0.9.1",
- "hash-db",
- "hash256-std-hasher",
- "hex 0.4.0",
- "impl-serde",
- "lazy_static",
- "libsecp256k1",
+ "impl-trait-for-tuples",
  "log 0.4.8",
- "num-traits",
  "parity-scale-codec",
- "parking_lot 0.9.0",
- "primitive-types",
+ "paste",
  "rand 0.7.2",
- "regex",
- "rustc-hex",
- "schnorrkel",
  "serde",
- "sha2",
- "sr-std",
- "substrate-bip39",
- "substrate-debug-derive",
- "substrate-externalities",
- "substrate-primitives-storage",
- "substrate-runtime-interface",
- "tiny-bip39",
- "tiny-keccak",
- "twox-hash",
- "wasmi",
- "zeroize 0.10.1",
+ "sp-application-crypto",
+ "sp-arithmetic",
+ "sp-core",
+ "sp-inherents",
+ "sp-io",
+ "sp-std",
 ]
 
 [[package]]
-name = "substrate-primitives-storage"
+name = "sp-runtime-interface"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?rev=dc4a8329b9c47790c25429a5df272b3648275c1b#dc4a8329b9c47790c25429a5df272b3648275c1b"
+source = "git+https://github.com/paritytech/substrate?rev=3d17cbd2fbcc337af49c861896ab4936b161bcee#3d17cbd2fbcc337af49c861896ab4936b161bcee"
 dependencies = [
- "impl-serde",
- "serde",
- "sr-std",
- "substrate-debug-derive",
+ "environmental",
+ "parity-scale-codec",
+ "primitive-types",
+ "sp-externalities",
+ "sp-runtime-interface-proc-macro",
+ "sp-std",
+ "sp-wasm-interface",
+ "static_assertions",
 ]
 
 [[package]]
-name = "substrate-rpc"
+name = "sp-runtime-interface-proc-macro"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?rev=dc4a8329b9c47790c25429a5df272b3648275c1b#dc4a8329b9c47790c25429a5df272b3648275c1b"
+source = "git+https://github.com/paritytech/substrate?rev=3d17cbd2fbcc337af49c861896ab4936b161bcee#3d17cbd2fbcc337af49c861896ab4936b161bcee"
 dependencies = [
- "futures-preview",
- "hash-db",
- "jsonrpc-core",
- "jsonrpc-pubsub",
- "log 0.4.8",
- "parity-scale-codec",
- "parking_lot 0.9.0",
- "serde_json",
- "sr-api",
- "sr-primitives",
- "sr-version",
- "substrate-client",
- "substrate-client-api",
- "substrate-executor",
- "substrate-keystore",
- "substrate-primitives",
- "substrate-rpc-api",
- "substrate-rpc-primitives",
- "substrate-session",
- "substrate-state-machine",
- "substrate-transaction-pool",
-]
-
-[[package]]
-name = "substrate-rpc-api"
+ "Inflector",
+ "proc-macro-crate",
+ "proc-macro2 1.0.6",
+ "quote 1.0.2",
+ "syn 1.0.11",
+]
+
+[[package]]
+name = "sp-sandbox"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?rev=dc4a8329b9c47790c25429a5df272b3648275c1b#dc4a8329b9c47790c25429a5df272b3648275c1b"
+source = "git+https://github.com/paritytech/substrate?rev=3d17cbd2fbcc337af49c861896ab4936b161bcee#3d17cbd2fbcc337af49c861896ab4936b161bcee"
 dependencies = [
- "derive_more 0.15.0",
- "futures-preview",
- "jsonrpc-core",
- "jsonrpc-core-client",
- "jsonrpc-derive",
- "jsonrpc-pubsub",
- "log 0.4.8",
  "parity-scale-codec",
- "parking_lot 0.9.0",
- "serde",
- "serde_json",
- "sr-version",
- "substrate-primitives",
- "substrate-rpc-primitives",
- "substrate-transaction-graph",
+ "sp-core",
+ "sp-io",
+ "sp-std",
+ "wasmi",
 ]
 
 [[package]]
-name = "substrate-rpc-primitives"
+name = "sp-serializer"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?rev=dc4a8329b9c47790c25429a5df272b3648275c1b#dc4a8329b9c47790c25429a5df272b3648275c1b"
+source = "git+https://github.com/paritytech/substrate?rev=3d17cbd2fbcc337af49c861896ab4936b161bcee#3d17cbd2fbcc337af49c861896ab4936b161bcee"
 dependencies = [
  "serde",
- "substrate-primitives",
+ "serde_json",
 ]
 
 [[package]]
-name = "substrate-rpc-servers"
+name = "sp-session"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?rev=dc4a8329b9c47790c25429a5df272b3648275c1b#dc4a8329b9c47790c25429a5df272b3648275c1b"
+source = "git+https://github.com/paritytech/substrate?rev=3d17cbd2fbcc337af49c861896ab4936b161bcee#3d17cbd2fbcc337af49c861896ab4936b161bcee"
 dependencies = [
- "jsonrpc-core",
- "jsonrpc-http-server",
- "jsonrpc-pubsub",
- "jsonrpc-ws-server",
- "log 0.4.8",
- "serde",
- "serde_json",
- "sr-primitives",
+ "sp-api",
+ "sp-runtime",
+ "sp-std",
 ]
 
 [[package]]
-name = "substrate-runtime-interface"
+name = "sp-staking"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?rev=dc4a8329b9c47790c25429a5df272b3648275c1b#dc4a8329b9c47790c25429a5df272b3648275c1b"
+source = "git+https://github.com/paritytech/substrate?rev=3d17cbd2fbcc337af49c861896ab4936b161bcee#3d17cbd2fbcc337af49c861896ab4936b161bcee"
 dependencies = [
- "environmental",
  "parity-scale-codec",
- "primitive-types",
- "sr-std",
- "static_assertions",
- "substrate-externalities",
- "substrate-runtime-interface-proc-macro",
- "substrate-wasm-interface",
+ "sp-runtime",
+ "sp-std",
 ]
 
 [[package]]
-name = "substrate-runtime-interface-proc-macro"
+name = "sp-state-machine"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?rev=dc4a8329b9c47790c25429a5df272b3648275c1b#dc4a8329b9c47790c25429a5df272b3648275c1b"
+source = "git+https://github.com/paritytech/substrate?rev=3d17cbd2fbcc337af49c861896ab4936b161bcee#3d17cbd2fbcc337af49c861896ab4936b161bcee"
 dependencies = [
- "Inflector",
- "proc-macro-crate",
- "proc-macro2 1.0.6",
- "quote 1.0.2",
- "syn 1.0.11",
+ "hash-db",
+ "log 0.4.8",
+ "num-traits",
+ "parity-scale-codec",
+ "parking_lot 0.9.0",
+ "rand 0.7.2",
+ "sp-core",
+ "sp-externalities",
+ "sp-panic-handler",
+ "sp-trie",
+ "trie-db",
+ "trie-root",
 ]
 
 [[package]]
-name = "substrate-serializer"
+name = "sp-std"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?rev=dc4a8329b9c47790c25429a5df272b3648275c1b#dc4a8329b9c47790c25429a5df272b3648275c1b"
-dependencies = [
- "serde",
- "serde_json",
-]
+source = "git+https://github.com/paritytech/substrate?rev=3d17cbd2fbcc337af49c861896ab4936b161bcee#3d17cbd2fbcc337af49c861896ab4936b161bcee"
 
 [[package]]
-name = "substrate-service"
+name = "sp-storage"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?rev=dc4a8329b9c47790c25429a5df272b3648275c1b#dc4a8329b9c47790c25429a5df272b3648275c1b"
+source = "git+https://github.com/paritytech/substrate?rev=3d17cbd2fbcc337af49c861896ab4936b161bcee#3d17cbd2fbcc337af49c861896ab4936b161bcee"
 dependencies = [
- "derive_more 0.15.0",
- "exit-future",
- "futures 0.1.29",
- "futures-preview",
- "lazy_static",
- "log 0.4.8",
- "parity-multiaddr 0.5.0",
- "parity-scale-codec",
- "parking_lot 0.9.0",
+ "impl-serde",
  "serde",
- "serde_json",
- "slog",
- "sr-api",
- "sr-io",
- "sr-primitives",
- "substrate-application-crypto",
- "substrate-chain-spec",
- "substrate-client",
- "substrate-client-api",
- "substrate-client-db",
- "substrate-consensus-common",
- "substrate-executor",
- "substrate-keystore",
- "substrate-network",
- "substrate-offchain",
- "substrate-primitives",
- "substrate-rpc",
- "substrate-rpc-servers",
- "substrate-session",
- "substrate-telemetry",
- "substrate-transaction-pool",
- "substrate-transaction-pool-runtime-api",
- "sysinfo",
- "target_info",
- "tokio-executor",
- "tokio-timer",
+ "sp-debug-derive",
+ "sp-std",
 ]
 
 [[package]]
-name = "substrate-session"
+name = "sp-timestamp"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?rev=dc4a8329b9c47790c25429a5df272b3648275c1b#dc4a8329b9c47790c25429a5df272b3648275c1b"
+source = "git+https://github.com/paritytech/substrate?rev=3d17cbd2fbcc337af49c861896ab4936b161bcee#3d17cbd2fbcc337af49c861896ab4936b161bcee"
 dependencies = [
- "sr-api",
- "sr-primitives",
- "sr-std",
+ "impl-trait-for-tuples",
+ "parity-scale-codec",
+ "sp-api",
+ "sp-inherents",
+ "sp-runtime",
+ "sp-std",
 ]
 
 [[package]]
-name = "substrate-state-db"
+name = "sp-transaction-pool"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?rev=dc4a8329b9c47790c25429a5df272b3648275c1b#dc4a8329b9c47790c25429a5df272b3648275c1b"
+source = "git+https://github.com/paritytech/substrate?rev=3d17cbd2fbcc337af49c861896ab4936b161bcee#3d17cbd2fbcc337af49c861896ab4936b161bcee"
 dependencies = [
+ "derive_more 0.99.2",
+ "futures 0.3.1",
  "log 0.4.8",
  "parity-scale-codec",
- "parking_lot 0.9.0",
- "substrate-primitives",
+ "serde",
+ "sp-api",
+ "sp-runtime",
 ]
 
 [[package]]
-name = "substrate-state-machine"
+name = "sp-trie"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?rev=dc4a8329b9c47790c25429a5df272b3648275c1b#dc4a8329b9c47790c25429a5df272b3648275c1b"
+source = "git+https://github.com/paritytech/substrate?rev=3d17cbd2fbcc337af49c861896ab4936b161bcee#3d17cbd2fbcc337af49c861896ab4936b161bcee"
 dependencies = [
  "hash-db",
- "log 0.4.8",
- "num-traits",
+ "memory-db",
  "parity-scale-codec",
- "parking_lot 0.9.0",
- "rand 0.7.2",
- "substrate-externalities",
- "substrate-panic-handler",
- "substrate-primitives",
- "substrate-trie",
+ "sp-core",
+ "sp-std",
  "trie-db",
  "trie-root",
 ]
 
 [[package]]
-name = "substrate-subxt"
-version = "0.2.0"
+name = "sp-version"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate?rev=3d17cbd2fbcc337af49c861896ab4936b161bcee#3d17cbd2fbcc337af49c861896ab4936b161bcee"
 dependencies = [
- "derive_more 0.14.1",
- "env_logger 0.6.2",
- "futures 0.1.29",
- "jsonrpc-core-client",
- "log 0.4.8",
- "node-runtime",
- "num-traits",
- "paint-balances",
- "paint-contracts",
- "paint-indices",
- "paint-metadata",
- "paint-support",
- "paint-system",
+ "impl-serde",
  "parity-scale-codec",
  "serde",
- "sr-primitives",
- "sr-version",
- "substrate-keyring",
- "substrate-primitives",
- "substrate-rpc-api",
- "substrate-rpc-primitives",
- "substrate-transaction-graph",
- "tokio",
- "url 1.7.2",
- "wabt",
+ "sp-runtime",
+ "sp-std",
 ]
 
 [[package]]
-name = "substrate-telemetry"
+name = "sp-wasm-interface"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?rev=dc4a8329b9c47790c25429a5df272b3648275c1b#dc4a8329b9c47790c25429a5df272b3648275c1b"
+source = "git+https://github.com/paritytech/substrate?rev=3d17cbd2fbcc337af49c861896ab4936b161bcee#3d17cbd2fbcc337af49c861896ab4936b161bcee"
 dependencies = [
- "bytes",
- "futures 0.1.29",
- "futures-preview",
- "futures-timer",
- "libp2p",
- "log 0.4.8",
- "parking_lot 0.9.0",
- "rand 0.7.2",
- "serde",
- "slog",
- "slog-async",
- "slog-json",
- "slog-scope",
- "tokio-io",
- "void",
+ "impl-trait-for-tuples",
+ "wasmi",
 ]
 
 [[package]]
-name = "substrate-transaction-graph"
-version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?rev=dc4a8329b9c47790c25429a5df272b3648275c1b#dc4a8329b9c47790c25429a5df272b3648275c1b"
+name = "spin"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
+
+[[package]]
+name = "stable_deref_trait"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8"
+
+[[package]]
+name = "static_assertions"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
+
+[[package]]
+name = "stream-cipher"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8131256a5896cabcf5eb04f4d6dacbe1aefda854b0d9896e09cb58829ec5638c"
 dependencies = [
- "derive_more 0.15.0",
- "futures-preview",
- "log 0.4.8",
- "parking_lot 0.9.0",
- "serde",
- "sr-primitives",
- "substrate-primitives",
+ "generic-array",
 ]
 
 [[package]]
-name = "substrate-transaction-pool"
-version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?rev=dc4a8329b9c47790c25429a5df272b3648275c1b#dc4a8329b9c47790c25429a5df272b3648275c1b"
+name = "string"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d24114bfcceb867ca7f71a0d3fe45d45619ec47a6fbfa98cb14e14250bfa5d6d"
 dependencies = [
- "derive_more 0.15.0",
- "futures 0.3.1",
- "log 0.4.8",
- "parity-scale-codec",
- "parking_lot 0.9.0",
- "sr-api",
- "sr-primitives",
- "substrate-primitives",
- "substrate-transaction-graph",
- "substrate-transaction-pool-runtime-api",
+ "bytes 0.4.12",
 ]
 
 [[package]]
-name = "substrate-transaction-pool-runtime-api"
-version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?rev=dc4a8329b9c47790c25429a5df272b3648275c1b#dc4a8329b9c47790c25429a5df272b3648275c1b"
+name = "strsim"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
+
+[[package]]
+name = "structopt"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "30b3a3e93f5ad553c38b3301c8a0a0cec829a36783f6a0c467fc4bf553a5f5bf"
 dependencies = [
- "sr-api",
- "sr-primitives",
- "substrate-primitives",
+ "clap",
+ "structopt-derive",
 ]
 
 [[package]]
-name = "substrate-trie"
-version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?rev=dc4a8329b9c47790c25429a5df272b3648275c1b#dc4a8329b9c47790c25429a5df272b3648275c1b"
+name = "structopt-derive"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ea692d40005b3ceba90a9fe7a78fa8d4b82b0ce627eebbffc329aab850f3410e"
 dependencies = [
- "hash-db",
- "memory-db",
+ "heck",
+ "proc-macro-error",
+ "proc-macro2 1.0.6",
+ "quote 1.0.2",
+ "syn 1.0.11",
+]
+
+[[package]]
+name = "strum"
+version = "0.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6138f8f88a16d90134763314e3fc76fa3ed6a7db4725d6acf9a3ef95a3188d22"
+dependencies = [
+ "strum_macros",
+]
+
+[[package]]
+name = "strum_macros"
+version = "0.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0054a7df764039a6cd8592b9de84be4bec368ff081d203a7d5371cbfa8e65c81"
+dependencies = [
+ "heck",
+ "proc-macro2 1.0.6",
+ "quote 1.0.2",
+ "syn 1.0.11",
+]
+
+[[package]]
+name = "substrate-bip39"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3be511be555a3633e71739a79e4ddff6a6aaa6579fa6114182a51d72c3eb93c5"
+dependencies = [
+ "hmac",
+ "pbkdf2",
+ "schnorrkel",
+ "sha2",
+]
+
+[[package]]
+name = "substrate-subxt"
+version = "0.3.0"
+dependencies = [
+ "derive_more 0.14.1",
+ "env_logger 0.6.2",
+ "frame-metadata",
+ "frame-support",
+ "frame-system",
+ "futures 0.1.29",
+ "jsonrpc-core-client",
+ "log 0.4.8",
+ "node-runtime",
+ "num-traits",
+ "pallet-balances",
+ "pallet-contracts",
+ "pallet-indices",
  "parity-scale-codec",
- "sr-std",
- "substrate-primitives",
- "trie-db",
- "trie-root",
+ "sc-rpc-api",
+ "serde",
+ "sp-core",
+ "sp-keyring",
+ "sp-rpc",
+ "sp-runtime",
+ "sp-transaction-pool",
+ "sp-version",
+ "tokio 0.1.22",
+ "url 1.7.2",
+ "wabt",
 ]
 
 [[package]]
 name = "substrate-wasm-builder-runner"
 version = "1.0.4"
-source = "git+https://github.com/paritytech/substrate?rev=dc4a8329b9c47790c25429a5df272b3648275c1b#dc4a8329b9c47790c25429a5df272b3648275c1b"
+source = "git+https://github.com/paritytech/substrate?rev=3d17cbd2fbcc337af49c861896ab4936b161bcee#3d17cbd2fbcc337af49c861896ab4936b161bcee"
 
 [[package]]
 name = "substrate-wasm-builder-runner"
@@ -5432,15 +5723,6 @@ version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bd48273fe9d7f92c1f7d6c1c537bb01c8068f925b47ad2cd8367e11dc32f8550"
 
-[[package]]
-name = "substrate-wasm-interface"
-version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?rev=dc4a8329b9c47790c25429a5df272b3648275c1b#dc4a8329b9c47790c25429a5df272b3648275c1b"
-dependencies = [
- "impl-trait-for-tuples",
- "wasmi",
-]
-
 [[package]]
 name = "subtle"
 version = "1.0.0"
@@ -5603,17 +5885,17 @@ version = "0.1.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5a09c0b5bb588872ab2f09afa13ee6e9dac11e10a0ec9e8e3ba39a5a5d530af6"
 dependencies = [
- "bytes",
+ "bytes 0.4.12",
  "futures 0.1.29",
  "mio",
  "num_cpus",
- "tokio-codec",
+ "tokio-codec 0.1.1",
  "tokio-current-thread",
- "tokio-executor",
+ "tokio-executor 0.1.9",
  "tokio-fs",
- "tokio-io",
+ "tokio-io 0.1.12",
  "tokio-reactor",
- "tokio-sync",
+ "tokio-sync 0.1.7",
  "tokio-tcp",
  "tokio-threadpool",
  "tokio-timer",
@@ -5621,13 +5903,23 @@ dependencies = [
  "tokio-uds",
 ]
 
+[[package]]
+name = "tokio"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bcced6bb623d4bff3739c176c415f13c418f426395c169c9c3cd9a492c715b16"
+dependencies = [
+ "bytes 0.5.2",
+ "pin-project-lite",
+]
+
 [[package]]
 name = "tokio-buf"
 version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8fb220f46c53859a4b7ec083e41dec9778ff0b1851c0942b211edb89e0ccdc46"
 dependencies = [
- "bytes",
+ "bytes 0.4.12",
  "either",
  "futures 0.1.29",
 ]
@@ -5638,9 +5930,22 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5c501eceaf96f0e1793cf26beb63da3d11c738c4a943fdf3746d81d64684c39f"
 dependencies = [
- "bytes",
+ "bytes 0.4.12",
  "futures 0.1.29",
- "tokio-io",
+ "tokio-io 0.1.12",
+]
+
+[[package]]
+name = "tokio-codec"
+version = "0.2.0-alpha.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9f5d22fd1e84bd4045d28813491cb7d7caae34d45c80517c2213f09a85e8787a"
+dependencies = [
+ "bytes 0.4.12",
+ "futures-core-preview",
+ "futures-sink-preview",
+ "log 0.4.8",
+ "tokio-io 0.2.0-alpha.6",
 ]
 
 [[package]]
@@ -5650,7 +5955,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d16217cad7f1b840c5a97dfb3c43b0c871fef423a6e8d2118c604e843662a443"
 dependencies = [
  "futures 0.1.29",
- "tokio-executor",
+ "tokio-executor 0.1.9",
 ]
 
 [[package]]
@@ -5662,7 +5967,7 @@ dependencies = [
  "futures 0.1.29",
  "futures-cpupool",
  "lazy_static",
- "tokio",
+ "tokio 0.1.22",
 ]
 
 [[package]]
@@ -5675,6 +5980,17 @@ dependencies = [
  "futures 0.1.29",
 ]
 
+[[package]]
+name = "tokio-executor"
+version = "0.2.0-alpha.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ee9ceecf69145923834ea73f32ba40c790fd877b74a7817dd0b089f1eb9c7c8"
+dependencies = [
+ "futures-util-preview",
+ "lazy_static",
+ "tokio-sync 0.2.0-alpha.6",
+]
+
 [[package]]
 name = "tokio-fs"
 version = "0.1.6"
@@ -5682,7 +5998,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3fe6dc22b08d6993916647d108a1a7d15b9cd29c4f4496c62b92c45b5041b7af"
 dependencies = [
  "futures 0.1.29",
- "tokio-io",
+ "tokio-io 0.1.12",
  "tokio-threadpool",
 ]
 
@@ -5692,11 +6008,24 @@ version = "0.1.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5090db468dad16e1a7a54c8c67280c5e4b544f3d3e018f0b913b400261f85926"
 dependencies = [
- "bytes",
+ "bytes 0.4.12",
  "futures 0.1.29",
  "log 0.4.8",
 ]
 
+[[package]]
+name = "tokio-io"
+version = "0.2.0-alpha.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "112784d5543df30660b04a72ca423bfbd90e8bb32f94dcf610f15401218b22c5"
+dependencies = [
+ "bytes 0.4.12",
+ "futures-core-preview",
+ "log 0.4.8",
+ "memchr",
+ "pin-project",
+]
+
 [[package]]
 name = "tokio-reactor"
 version = "0.1.11"
@@ -5711,9 +6040,9 @@ dependencies = [
  "num_cpus",
  "parking_lot 0.9.0",
  "slab",
- "tokio-executor",
- "tokio-io",
- "tokio-sync",
+ "tokio-executor 0.1.9",
+ "tokio-io 0.1.12",
+ "tokio-sync 0.1.7",
 ]
 
 [[package]]
@@ -5722,11 +6051,11 @@ version = "0.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1df2fa53ac211c136832f530ccb081af9af891af22d685a9493e232c7a359bc2"
 dependencies = [
- "bytes",
+ "bytes 0.4.12",
  "futures 0.1.29",
  "iovec",
  "rustls",
- "tokio-io",
+ "tokio-io 0.1.12",
  "webpki",
 ]
 
@@ -5740,17 +6069,28 @@ dependencies = [
  "futures 0.1.29",
 ]
 
+[[package]]
+name = "tokio-sync"
+version = "0.2.0-alpha.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4f1aaeb685540f7407ea0e27f1c9757d258c7c6bf4e3eb19da6fc59b747239d2"
+dependencies = [
+ "fnv",
+ "futures-core-preview",
+ "futures-util-preview",
+]
+
 [[package]]
 name = "tokio-tcp"
 version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1d14b10654be682ac43efee27401d792507e30fd8d26389e1da3b185de2e4119"
 dependencies = [
- "bytes",
+ "bytes 0.4.12",
  "futures 0.1.29",
  "iovec",
  "mio",
- "tokio-io",
+ "tokio-io 0.1.12",
  "tokio-reactor",
 ]
 
@@ -5768,7 +6108,7 @@ dependencies = [
  "log 0.4.8",
  "num_cpus",
  "slab",
- "tokio-executor",
+ "tokio-executor 0.1.9",
 ]
 
 [[package]]
@@ -5780,7 +6120,7 @@ dependencies = [
  "crossbeam-utils 0.6.6",
  "futures 0.1.29",
  "slab",
- "tokio-executor",
+ "tokio-executor 0.1.9",
 ]
 
 [[package]]
@@ -5791,7 +6131,7 @@ checksum = "354b8cd83825b3c20217a9dc174d6a0c67441a2fae5c41bcb1ea6679f6ae0f7c"
 dependencies = [
  "futures 0.1.29",
  "native-tls",
- "tokio-io",
+ "tokio-io 0.1.12",
 ]
 
 [[package]]
@@ -5800,12 +6140,12 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f02298505547f73e60f568359ef0d016d5acd6e830ab9bc7c4a5b3403440121b"
 dependencies = [
- "bytes",
+ "bytes 0.4.12",
  "futures 0.1.29",
  "log 0.4.8",
  "mio",
- "tokio-codec",
- "tokio-io",
+ "tokio-codec 0.1.1",
+ "tokio-io 0.1.12",
  "tokio-reactor",
 ]
 
@@ -5815,15 +6155,15 @@ version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "037ffc3ba0e12a0ab4aca92e5234e0dedeb48fddf6ccd260f1f150a36a9f2445"
 dependencies = [
- "bytes",
+ "bytes 0.4.12",
  "futures 0.1.29",
  "iovec",
  "libc",
  "log 0.4.8",
  "mio",
  "mio-uds",
- "tokio-codec",
- "tokio-io",
+ "tokio-codec 0.1.1",
+ "tokio-io 0.1.12",
  "tokio-reactor",
 ]
 
@@ -5836,6 +6176,54 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "tower-make"
+version = "0.3.0-alpha.2a"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "316d47dd40cde4ac5d88110eaf9a10a4e2a68612d9c056cd2aa24e37dcb484cd"
+dependencies = [
+ "tokio-io 0.2.0-alpha.6",
+ "tower-service",
+]
+
+[[package]]
+name = "tower-service"
+version = "0.3.0-alpha.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "63ff37396cd966ce43bea418bfa339f802857495f797dafa00bea5b7221ebdfa"
+
+[[package]]
+name = "tracing"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ff4e4f59e752cb3beb5b61c6d5e11191c7946231ba84faec2902c9efdd8691c5"
+dependencies = [
+ "cfg-if",
+ "spin",
+ "tracing-attributes",
+ "tracing-core",
+]
+
+[[package]]
+name = "tracing-attributes"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4263b12c3d3c403274493eb805966093b53214124796552d674ca1dd5d27c2b"
+dependencies = [
+ "quote 1.0.2",
+ "syn 1.0.11",
+]
+
+[[package]]
+name = "tracing-core"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bc913647c520c959b6d21e35ed8fa6984971deca9f0a2fcb8c51207e0c56af1d"
+dependencies = [
+ "lazy_static",
+ "spin",
+]
+
 [[package]]
 name = "traitobject"
 version = "0.1.0"
@@ -5844,9 +6232,9 @@ checksum = "efd1f82c56340fdf16f2a953d7bda4f8fdffba13d93b00844c25572110b26079"
 
 [[package]]
 name = "trie-db"
-version = "0.15.2"
+version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0b62d27e8aa1c07414549ac872480ac82380bab39e730242ab08d82d7cc098a"
+checksum = "784a9813d23f18bccab728ab039c39b8a87d0d6956dcdece39e92f5cffe5076e"
 dependencies = [
  "elastic-array",
  "hash-db",
@@ -5980,8 +6368,8 @@ version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a7f0023a96687fe169081e8adce3f65e3874426b7886e9234d490af2dc077959"
 dependencies = [
- "bytes",
- "tokio-codec",
+ "bytes 0.4.12",
+ "tokio-codec 0.1.1",
 ]
 
 [[package]]
@@ -6062,7 +6450,7 @@ checksum = "af5d153dc96aad7dc13ab90835b892c69867948112d95299e522d370c4e13a08"
 dependencies = [
  "cc",
  "cmake",
- "glob",
+ "glob 0.2.11",
 ]
 
 [[package]]
@@ -6076,6 +6464,16 @@ dependencies = [
  "try-lock",
 ]
 
+[[package]]
+name = "want"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0"
+dependencies = [
+ "log 0.4.8",
+ "try-lock",
+]
+
 [[package]]
 name = "wasi"
 version = "0.7.0"
@@ -6189,17 +6587,8 @@ dependencies = [
  "memory_units",
  "num-rational",
  "num-traits",
- "parity-wasm 0.41.0",
- "wasmi-validation 0.3.0",
-]
-
-[[package]]
-name = "wasmi-validation"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6bc0356e3df56e639fc7f7d8a99741915531e27ed735d911ed83d7e1339c8188"
-dependencies = [
- "parity-wasm 0.40.3",
+ "parity-wasm",
+ "wasmi-validation",
 ]
 
 [[package]]
@@ -6208,7 +6597,7 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ea78c597064ba73596099281e2f4cfc019075122a65cdda3205af94f0b264d93"
 dependencies = [
- "parity-wasm 0.41.0",
+ "parity-wasm",
 ]
 
 [[package]]
@@ -6258,13 +6647,13 @@ version = "0.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "413b37840b9e27b340ce91b319ede10731de8c72f5bc4cb0206ec1ca4ce581d0"
 dependencies = [
- "bytes",
+ "bytes 0.4.12",
  "futures 0.1.29",
  "hyper 0.10.16",
  "native-tls",
  "rand 0.6.5",
- "tokio-codec",
- "tokio-io",
+ "tokio-codec 0.1.1",
+ "tokio-io 0.1.12",
  "tokio-reactor",
  "tokio-tcp",
  "tokio-tls",
@@ -6282,13 +6671,13 @@ dependencies = [
  "base64 0.10.1",
  "bitflags",
  "byteorder 1.3.2",
- "bytes",
+ "bytes 0.4.12",
  "futures 0.1.29",
  "native-tls",
  "rand 0.6.5",
  "sha1",
- "tokio-codec",
- "tokio-io",
+ "tokio-codec 0.1.1",
+ "tokio-io 0.1.12",
  "tokio-tcp",
  "tokio-tls",
 ]
@@ -6372,7 +6761,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c51a2c47b5798ccc774ffb93ff536aec7c4275d722fd9c740c83cdd1af1f2d94"
 dependencies = [
  "byteorder 1.3.2",
- "bytes",
+ "bytes 0.4.12",
  "httparse",
  "log 0.4.8",
  "mio",
@@ -6400,7 +6789,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7ee1585dc1484373cbc1cee7aafda26634665cf449436fd6e24bfd1fad230538"
 dependencies = [
  "clear_on_drop",
- "curve25519-dalek",
+ "curve25519-dalek 1.2.3",
  "rand_core 0.3.1",
 ]
 
@@ -6416,15 +6805,15 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2758f29014c1cb7a6e74c1b1160ac8c8203be342d35b73462fc6a13cc6385423"
 dependencies = [
- "bytes",
+ "bytes 0.4.12",
  "futures 0.1.29",
  "log 0.4.8",
  "nohash-hasher",
  "parking_lot 0.9.0",
  "quick-error",
  "rand 0.7.2",
- "tokio-codec",
- "tokio-io",
+ "tokio-codec 0.1.1",
+ "tokio-io 0.1.12",
 ]
 
 [[package]]
@@ -6433,12 +6822,6 @@ version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "45af6a010d13e4cf5b54c94ba5a2b2eba5596b9e46bf5875612d332a1f2b3f86"
 
-[[package]]
-name = "zeroize"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4090487fa66630f7b166fba2bbb525e247a5449f41c468cc1d98f8ae6ac03120"
-
 [[package]]
 name = "zeroize"
 version = "1.1.0"
diff --git a/ci/run b/ci/run
index fde7afac..a0a2711a 100755
--- a/ci/run
+++ b/ci/run
@@ -15,7 +15,7 @@ fi
 TIMEFORMAT='elapsed time: %R (user: %U, system: %S)'
 
 echo "--- Load cache"
-declare -i cache_version=11
+declare -i cache_version=12
 target_cache=/cache/target-v${cache_version}
 target_cache_key_file="$target_cache/_key"
 cache_key="$(sha256sum Cargo.lock | cut -f 1 -d ' ')"
diff --git a/client/Cargo.toml b/client/Cargo.toml
index c808d974..142eb534 100644
--- a/client/Cargo.toml
+++ b/client/Cargo.toml
@@ -15,26 +15,26 @@ log = "0.4"
 parity-scale-codec = "1.0"
 tokio = "0.1"
 
-[dependencies.paint-system]
+[dependencies.frame-system]
 git = "https://github.com/paritytech/substrate"
-rev = "dc4a8329b9c47790c25429a5df272b3648275c1b"
+rev = "3d17cbd2fbcc337af49c861896ab4936b161bcee"
 
-[dependencies.paint-support]
+[dependencies.frame-support]
 git = "https://github.com/paritytech/substrate"
-rev = "dc4a8329b9c47790c25429a5df272b3648275c1b"
+rev = "3d17cbd2fbcc337af49c861896ab4936b161bcee"
 
-[dependencies.paint-transaction-payment]
+[dependencies.pallet-transaction-payment]
 git = "https://github.com/paritytech/substrate"
-rev = "dc4a8329b9c47790c25429a5df272b3648275c1b"
+rev = "3d17cbd2fbcc337af49c861896ab4936b161bcee"
 
-[dependencies.substrate-primitives]
+[dependencies.sp-core]
 git = "https://github.com/paritytech/substrate"
-rev = "dc4a8329b9c47790c25429a5df272b3648275c1b"
+rev = "3d17cbd2fbcc337af49c861896ab4936b161bcee"
 
-[dependencies.sr-primitives]
+[dependencies.sp-runtime]
 git = "https://github.com/paritytech/substrate"
-rev = "dc4a8329b9c47790c25429a5df272b3648275c1b"
+rev = "3d17cbd2fbcc337af49c861896ab4936b161bcee"
 
-[dependencies.sr-io]
+[dependencies.sp-io]
 git = "https://github.com/paritytech/substrate"
-rev = "dc4a8329b9c47790c25429a5df272b3648275c1b"
+rev = "3d17cbd2fbcc337af49c861896ab4936b161bcee"
diff --git a/client/src/backend/emulator.rs b/client/src/backend/emulator.rs
index 23e1e813..f4a175f9 100644
--- a/client/src/backend/emulator.rs
+++ b/client/src/backend/emulator.rs
@@ -3,7 +3,7 @@
 use futures01::future;
 use std::sync::{Arc, Mutex};
 
-use sr_primitives::{traits::Hash as _, BuildStorage as _};
+use sp_runtime::{traits::Hash as _, BuildStorage as _};
 
 use radicle_registry_runtime::{BalancesConfig, Executive, GenesisConfig, Hash, Hashing, Runtime};
 
@@ -21,14 +21,14 @@ use crate::interface::*;
 /// The responses returned from the client never result in an [Error].
 #[derive(Clone)]
 pub struct Emulator {
-    test_ext: Arc<Mutex<sr_io::TestExternalities>>,
+    test_ext: Arc<Mutex<sp_io::TestExternalities>>,
     genesis_hash: Hash,
 }
 
 impl Emulator {
     pub fn new() -> Self {
         let genesis_config = make_genesis_config();
-        let mut test_ext = sr_io::TestExternalities::new(genesis_config.build_storage().unwrap());
+        let mut test_ext = sp_io::TestExternalities::new(genesis_config.build_storage().unwrap());
         let genesis_hash = init_runtime(&mut test_ext);
         Emulator {
             test_ext: Arc::new(Mutex::new(test_ext)),
@@ -45,11 +45,11 @@ impl backend::Backend for Emulator {
         let tx_hash = Hashing::hash_of(&extrinsic);
         let test_ext = &mut self.test_ext.lock().unwrap();
         let events = test_ext.execute_with(move || {
-            let event_start_index = paint_system::Module::<Runtime>::event_count();
+            let event_start_index = frame_system::Module::<Runtime>::event_count();
             // We ignore the dispatch result. It is provided through the system event
             // TODO Pass on apply errors instead of unwrapping.
             let _dispatch_result = Executive::apply_extrinsic(extrinsic).unwrap();
-            paint_system::Module::<Runtime>::events()
+            frame_system::Module::<Runtime>::events()
                 .into_iter()
                 .skip(event_start_index as usize)
                 .map(|event_record| event_record.event)
@@ -64,7 +64,7 @@ impl backend::Backend for Emulator {
 
     fn fetch(&self, key: &[u8]) -> Response<Option<Vec<u8>>, Error> {
         let test_ext = &mut self.test_ext.lock().unwrap();
-        let maybe_data = test_ext.execute_with(|| sr_io::storage::get(key));
+        let maybe_data = test_ext.execute_with(|| sp_io::storage::get(key));
         Box::new(future::ok(maybe_data))
     }
 
@@ -78,8 +78,8 @@ impl backend::Backend for Emulator {
 /// Initializes the balance of the `//Alice` account with `2^60` tokens.
 fn make_genesis_config() -> GenesisConfig {
     GenesisConfig {
-        paint_aura: None,
-        paint_balances: Some(BalancesConfig {
+        pallet_aura: None,
+        pallet_balances: Some(BalancesConfig {
             balances: vec![(
                 ed25519::Pair::from_string("//Alice", None)
                     .unwrap()
@@ -88,23 +88,24 @@ fn make_genesis_config() -> GenesisConfig {
             )],
             vesting: vec![],
         }),
-        paint_sudo: None,
+        pallet_sudo: None,
+        grandpa: None,
         system: None,
     }
 }
 
 /// Initialize the runtime state so that it is usable and return the genesis hash.
-fn init_runtime(test_ext: &mut sr_io::TestExternalities) -> Hash {
+fn init_runtime(test_ext: &mut sp_io::TestExternalities) -> Hash {
     test_ext.execute_with(|| {
         // Insert the genesis block (number `1`) into the system. We don’t care about the
         // other parameters, they are not relevant.
-        paint_system::Module::<Runtime>::initialize(
+        frame_system::Module::<Runtime>::initialize(
             &1,
             &[0u8; 32].into(),
             &[0u8; 32].into(),
             &Default::default(),
         );
         // Now we can retrieve the block hash. But here the block number is zero-based.
-        paint_system::Module::<Runtime>::block_hash(0)
+        frame_system::Module::<Runtime>::block_hash(0)
     })
 }
diff --git a/client/src/backend/remote_node.rs b/client/src/backend/remote_node.rs
index cc71706f..3846b30b 100644
--- a/client/src/backend/remote_node.rs
+++ b/client/src/backend/remote_node.rs
@@ -1,7 +1,6 @@
-//! [backend::Backend] implementation for a remote full node
 use futures01::future::Future;
-use sr_primitives::traits::Hash as _;
-use substrate_primitives::storage::StorageKey;
+use sp_core::storage::StorageKey;
+use sp_runtime::traits::Hash as _;
 
 use radicle_registry_runtime::{opaque::Block as OpaqueBlock, Event, Hash, Hashing, Runtime};
 
@@ -112,7 +111,7 @@ fn extract_events(block: OpaqueBlock, ext_success: ExtrinsicSuccess) -> Option<V
         .events
         .iter()
         .filter_map(|event_record| match event_record.phase {
-            paint_system::Phase::ApplyExtrinsic(i) if i == xt_index as u32 => {
+            frame_system::Phase::ApplyExtrinsic(i) if i == xt_index as u32 => {
                 Some(event_record.event.clone())
             }
             _ => None,
diff --git a/client/src/call.rs b/client/src/call.rs
index 27666f76..557675c6 100644
--- a/client/src/call.rs
+++ b/client/src/call.rs
@@ -1,9 +1,8 @@
 //! Defines [Call] trait and implementations for all transaction parameters.
 
-use radicle_registry_runtime::{
-    balances, registry, registry::CheckpointId, Call as RuntimeCall, Event,
-};
-use sr_primitives::DispatchError;
+use frame_support::weights::DispatchInfo;
+use radicle_registry_runtime::{balances, registry, Call as RuntimeCall, Event};
+use sp_runtime::DispatchError;
 
 /// Indicates that parsing the events into the approriate call result failed.
 type EventParseError = String;
@@ -31,7 +30,7 @@ impl Call for registry::RegisterProjectParams {
     fn result_from_events(events: Vec<Event>) -> Result<Self::Result, EventParseError> {
         let dispatch_result = get_dispatch_result(&events)?;
         match dispatch_result {
-            Ok(()) => find_event(&events, "ProjectRegistered", |event| match event {
+            Ok(_dispatch_info) => find_event(&events, "ProjectRegistered", |event| match event {
                 Event::registry(registry::Event::ProjectRegistered(_project_id, _account_id)) => {
                     Some(Ok(()))
                 }
@@ -47,12 +46,12 @@ impl Call for registry::RegisterProjectParams {
 }
 
 impl Call for registry::CreateCheckpointParams {
-    type Result = Result<CheckpointId, Option<&'static str>>;
+    type Result = Result<registry::CheckpointId, Option<&'static str>>;
 
     fn result_from_events(events: Vec<Event>) -> Result<Self::Result, EventParseError> {
         let dispatch_result = get_dispatch_result(&events)?;
         match dispatch_result {
-            Ok(()) => find_event(&events, "CheckpointCreated", |event| match event {
+            Ok(_dispatch_info) => find_event(&events, "CheckpointCreated", |event| match event {
                 Event::registry(registry::Event::CheckpointCreated(checkpoint_id)) => {
                     Some(Ok(*checkpoint_id))
                 }
@@ -73,7 +72,7 @@ impl Call for registry::SetCheckpointParams {
     fn result_from_events(events: Vec<Event>) -> Result<Self::Result, EventParseError> {
         let dispatch_result = get_dispatch_result(&events)?;
         match dispatch_result {
-            Ok(()) => find_event(&events, "CheckpointSet", |event| match event {
+            Ok(_dispatch_info) => find_event(&events, "CheckpointSet", |event| match event {
                 Event::registry(registry::Event::CheckpointSet(_project_id, _checkpoint_id)) => {
                     Some(Ok(()))
                 }
@@ -93,7 +92,9 @@ impl Call for crate::TransferParams {
 
     fn result_from_events(events: Vec<Event>) -> Result<Self::Result, EventParseError> {
         let dispatch_result = get_dispatch_result(&events)?;
-        Ok(dispatch_result.map_err(|dispatch_error| dispatch_error.message))
+        Ok(dispatch_result
+            .map_err(|dispatch_error| dispatch_error.message)
+            .map(|_| ()))
     }
 
     fn into_runtime_call(self) -> RuntimeCall {
@@ -106,7 +107,9 @@ impl Call for registry::TransferFromProjectParams {
 
     fn result_from_events(events: Vec<Event>) -> Result<Self::Result, EventParseError> {
         let dispatch_result = get_dispatch_result(&events)?;
-        Ok(dispatch_result.map_err(|dispatch_error| dispatch_error.message))
+        Ok(dispatch_result
+            .map_err(|dispatch_error| dispatch_error.message)
+            .map(|_| ()))
     }
 
     fn into_runtime_call(self) -> RuntimeCall {
@@ -116,17 +119,21 @@ impl Call for registry::TransferFromProjectParams {
 
 /// Extract the dispatch result of an extrinsic from the extrinsic events.
 ///
-/// Looks for the [paint_system::Event] in the list of events and returns the inner result based on
+/// Looks for the [frame_system::Event] in the list of events and returns the inner result based on
 /// the event.
 ///
-/// Returns an outer [EventParseError] if no [paint_system::Event] was present in `events`.
+/// Returns an outer [EventParseError] if no [frame_system::Event] was present in `events`.
 ///
 /// Because of an issue with substrate the `message` field of [DispatchError] will always be `None`
-fn get_dispatch_result(events: &[Event]) -> Result<Result<(), DispatchError>, EventParseError> {
+fn get_dispatch_result(
+    events: &[Event],
+) -> Result<Result<DispatchInfo, DispatchError>, EventParseError> {
     find_event(events, "System", |event| match event {
         Event::system(system_event) => match system_event {
-            paint_system::Event::ExtrinsicSuccess => Some(Ok(())),
-            paint_system::Event::ExtrinsicFailed(ref dispatch_error) => Some(Err(*dispatch_error)),
+            frame_system::Event::ExtrinsicSuccess(ref dispatch_info) => Some(Ok(*dispatch_info)),
+            frame_system::Event::ExtrinsicFailed(ref dispatch_error, _) => {
+                Some(Err(*dispatch_error))
+            }
         },
         _ => None,
     })
diff --git a/client/src/interface.rs b/client/src/interface.rs
index b98c8daf..d9065f43 100644
--- a/client/src/interface.rs
+++ b/client/src/interface.rs
@@ -14,8 +14,8 @@ pub use radicle_registry_runtime::{
     },
     AccountId, Balance, Event, Hashing, Index, String32,
 };
-pub use substrate_primitives::crypto::{Pair as CryptoPair, Public as CryptoPublic};
-pub use substrate_primitives::{ed25519, H256};
+pub use sp_core::crypto::{Pair as CryptoPair, Public as CryptoPublic};
+pub use sp_core::{ed25519, H256};
 
 pub use crate::call::Call;
 pub use crate::transaction::{Transaction, TransactionExtra};
diff --git a/client/src/lib.rs b/client/src/lib.rs
index dae7d5e6..cc206b45 100644
--- a/client/src/lib.rs
+++ b/client/src/lib.rs
@@ -21,9 +21,9 @@ use std::sync::Arc;
 
 use parity_scale_codec::{Decode, FullCodec};
 
-use paint_support::storage::generator::{StorageMap, StorageValue};
+use frame_support::storage::generator::{StorageMap, StorageValue};
 use radicle_registry_runtime::{balances, registry, Runtime};
-use sr_primitives::traits::Hash as _;
+use sp_runtime::traits::Hash as _;
 
 mod backend;
 mod call;
@@ -195,7 +195,7 @@ impl ClientT for Client {
     }
 
     fn account_nonce(&self, account_id: &AccountId) -> Response<Index, Error> {
-        Box::new(self.fetch_map_value::<paint_system::AccountNonce<Runtime>, _, _>(*account_id))
+        Box::new(self.fetch_map_value::<frame_system::AccountNonce<Runtime>, _, _>(*account_id))
     }
 
     fn transfer(
diff --git a/client/src/transaction.rs b/client/src/transaction.rs
index 4eeb1461..8a902620 100644
--- a/client/src/transaction.rs
+++ b/client/src/transaction.rs
@@ -1,16 +1,16 @@
 //! Provides [Transaction] and [TransactionExtra].
 use parity_scale_codec::Encode;
 use radicle_registry_runtime::UncheckedExtrinsic;
-use sr_primitives::generic::{Era, SignedPayload};
-use sr_primitives::traits::SignedExtension;
+use sp_runtime::generic::{Era, SignedPayload};
+use sp_runtime::traits::SignedExtension;
 use std::marker::PhantomData;
 
 pub use radicle_registry_runtime::{
     registry::{Project, ProjectId},
     AccountId, Balance,
 };
-pub use substrate_primitives::crypto::{Pair as CryptoPair, Public as CryptoPublic};
-pub use substrate_primitives::ed25519;
+pub use sp_core::crypto::{Pair as CryptoPair, Public as CryptoPublic};
+pub use sp_core::ed25519;
 
 pub use crate::call::Call;
 pub use radicle_registry_runtime::{Call as RuntimeCall, Hash, Index, SignedExtra};
@@ -82,12 +82,12 @@ fn transaction_extra_to_runtime_extra(
     SignedExtra,
     <SignedExtra as SignedExtension>::AdditionalSigned,
 ) {
-    let check_version = paint_system::CheckVersion::new();
-    let check_genesis = paint_system::CheckGenesis::new();
-    let check_era = paint_system::CheckEra::from(Era::Immortal);
-    let check_nonce = paint_system::CheckNonce::from(extra.nonce);
-    let check_weight = paint_system::CheckWeight::new();
-    let charge_transaction_payment = paint_transaction_payment::ChargeTransactionPayment::from(0);
+    let check_version = frame_system::CheckVersion::new();
+    let check_genesis = frame_system::CheckGenesis::new();
+    let check_era = frame_system::CheckEra::from(Era::Immortal);
+    let check_nonce = frame_system::CheckNonce::from(extra.nonce);
+    let check_weight = frame_system::CheckWeight::new();
+    let charge_transaction_payment = pallet_transaction_payment::ChargeTransactionPayment::from(0);
 
     let additional_signed = (
         check_version
@@ -124,22 +124,23 @@ fn transaction_extra_to_runtime_extra(
 mod test {
     use super::*;
     use radicle_registry_runtime::{GenesisConfig, Runtime};
-    use sr_primitives::traits::{Checkable, IdentityLookup};
-    use sr_primitives::BuildStorage as _;
+    use sp_runtime::traits::{Checkable, IdentityLookup};
+    use sp_runtime::BuildStorage as _;
 
     #[test]
     /// Assert that extrinsics created with [create_and_sign] are validated by the runtime.
     fn check_extrinsic() {
         let genesis_config = GenesisConfig {
-            paint_aura: None,
-            paint_balances: None,
-            paint_sudo: None,
+            pallet_aura: None,
+            pallet_balances: None,
+            pallet_sudo: None,
             system: None,
+            grandpa: None,
         };
-        let mut test_ext = sr_io::TestExternalities::new(genesis_config.build_storage().unwrap());
+        let mut test_ext = sp_io::TestExternalities::new(genesis_config.build_storage().unwrap());
         let (key_pair, _) = ed25519::Pair::generate();
 
-        type System = paint_system::Module<Runtime>;
+        type System = frame_system::Module<Runtime>;
         let genesis_hash = test_ext.execute_with(|| {
             System::initialize(
                 &1,
@@ -152,7 +153,7 @@ mod test {
 
         let xt = signed_extrinsic(
             &key_pair,
-            paint_system::Call::fill_block().into(),
+            frame_system::Call::fill_block().into(),
             TransactionExtra {
                 nonce: 0,
                 genesis_hash,
diff --git a/node/Cargo.toml b/node/Cargo.toml
index caea6369..3250a9c7 100644
--- a/node/Cargo.toml
+++ b/node/Cargo.toml
@@ -7,7 +7,8 @@ version = "0.1.0"
 [dependencies]
 derive_more = "0.15.0"
 exit-future = "0.1.4"
-futures = "0.1.29"
+futures01 = { package = "futures", version = "0.1.29" }
+futures03 = { package = "futures", version = "0.3.1", features = ["compat"] }
 log = "0.4.8"
 parking_lot = "0.9.0"
 tokio = "0.1.22"
@@ -26,55 +27,75 @@ path = "../runtime"
 
 [dependencies.aura]
 git = "https://github.com/paritytech/substrate"
-rev = "dc4a8329b9c47790c25429a5df272b3648275c1b"
-package = "substrate-consensus-aura"
+rev = "3d17cbd2fbcc337af49c861896ab4936b161bcee"
+package = "sc-consensus-aura"
 
 [dependencies.aura-primitives]
 git = "https://github.com/paritytech/substrate"
-rev = "dc4a8329b9c47790c25429a5df272b3648275c1b"
-package = "substrate-consensus-aura-primitives"
+rev = "3d17cbd2fbcc337af49c861896ab4936b161bcee"
+package = "sp-consensus-aura"
 
 [dependencies.basic-authorship]
 git = "https://github.com/paritytech/substrate"
-rev = "dc4a8329b9c47790c25429a5df272b3648275c1b"
-package = "substrate-basic-authorship"
+rev = "3d17cbd2fbcc337af49c861896ab4936b161bcee"
+package = "sc-basic-authority"
 
 [dependencies.inherents]
 git = "https://github.com/paritytech/substrate"
-rev = "dc4a8329b9c47790c25429a5df272b3648275c1b"
-package = "substrate-inherents"
+rev = "3d17cbd2fbcc337af49c861896ab4936b161bcee"
+package = "sp-inherents"
 
 [dependencies.network]
 git = "https://github.com/paritytech/substrate"
-rev = "dc4a8329b9c47790c25429a5df272b3648275c1b"
-package = "substrate-network"
+rev = "3d17cbd2fbcc337af49c861896ab4936b161bcee"
+package = "sc-network"
 
 [dependencies.primitives]
 git = "https://github.com/paritytech/substrate"
-rev = "dc4a8329b9c47790c25429a5df272b3648275c1b"
-package = "substrate-primitives"
+rev = "3d17cbd2fbcc337af49c861896ab4936b161bcee"
+package = "sp-core"
 
-[dependencies.sr-io]
+[dependencies.sp-io]
 git = "https://github.com/paritytech/substrate"
-rev = "dc4a8329b9c47790c25429a5df272b3648275c1b"
+rev = "3d17cbd2fbcc337af49c861896ab4936b161bcee"
 
-[dependencies.substrate-cli]
+[dependencies.sc-cli]
 git = "https://github.com/paritytech/substrate"
-rev = "dc4a8329b9c47790c25429a5df272b3648275c1b"
+rev = "3d17cbd2fbcc337af49c861896ab4936b161bcee"
 
-[dependencies.substrate-client]
+[dependencies.sc-client]
 git = "https://github.com/paritytech/substrate"
-rev = "dc4a8329b9c47790c25429a5df272b3648275c1b"
+rev = "3d17cbd2fbcc337af49c861896ab4936b161bcee"
 
-[dependencies.substrate-executor]
+[dependencies.sc-executor]
 git = "https://github.com/paritytech/substrate"
-rev = "dc4a8329b9c47790c25429a5df272b3648275c1b"
+rev = "3d17cbd2fbcc337af49c861896ab4936b161bcee"
 
-[dependencies.substrate-service]
+[dependencies.sc-service]
 git = "https://github.com/paritytech/substrate"
-rev = "dc4a8329b9c47790c25429a5df272b3648275c1b"
+rev = "3d17cbd2fbcc337af49c861896ab4936b161bcee"
 
 [dependencies.transaction-pool]
 git = "https://github.com/paritytech/substrate"
-rev = "dc4a8329b9c47790c25429a5df272b3648275c1b"
-package = "substrate-transaction-pool"
+rev = "3d17cbd2fbcc337af49c861896ab4936b161bcee"
+package = "sc-transaction-pool"
+
+[dependencies.consensus-common]
+git = "https://github.com/paritytech/substrate"
+rev = "3d17cbd2fbcc337af49c861896ab4936b161bcee"
+package = "sp-consensus"
+
+[dependencies.txpool-api]
+git = "https://github.com/paritytech/substrate"
+rev = "3d17cbd2fbcc337af49c861896ab4936b161bcee"
+package = "sp-transaction-pool"
+
+[dependencies.grandpa]
+git = "https://github.com/paritytech/substrate"
+rev = "3d17cbd2fbcc337af49c861896ab4936b161bcee"
+package = "sc-finality-grandpa"
+
+[dependencies.grandpa-primitives]
+git = "https://github.com/paritytech/substrate"
+rev = "3d17cbd2fbcc337af49c861896ab4936b161bcee"
+package = "sp-finality-grandpa"
diff --git a/node/src/chain_spec.rs b/node/src/chain_spec.rs
index f56ba9f2..4f6f3c61 100644
--- a/node/src/chain_spec.rs
+++ b/node/src/chain_spec.rs
@@ -1,11 +1,13 @@
 use aura_primitives::sr25519::AuthorityId as AuraId;
+use grandpa_primitives::AuthorityId as GrandpaId;
 use primitives::{Pair, Public};
 use radicle_registry_runtime::{
-    AccountId, AuraConfig, BalancesConfig, GenesisConfig, SudoConfig, SystemConfig, WASM_BINARY,
+    AccountId, AuraConfig, BalancesConfig, GenesisConfig, GrandpaConfig, SudoConfig, SystemConfig,
+    WASM_BINARY,
 };
 
 /// Specialized `ChainSpec`. This is a specialization of the general Substrate ChainSpec type.
-pub type ChainSpec = substrate_service::ChainSpec<GenesisConfig>;
+pub type ChainSpec = sc_service::ChainSpec<GenesisConfig>;
 
 pub fn dev() -> ChainSpec {
     ChainSpec::from_genesis(
@@ -34,14 +36,15 @@ fn dev_genesis_config() -> GenesisConfig {
         get_from_seed::<AccountId>("Alice//stash"),
         get_from_seed::<AccountId>("Bob//stash"),
     ];
-    let authorities = vec![get_from_seed::<AuraId>("Alice")];
+    let aura_authorities = vec![get_from_seed::<AuraId>("Alice")];
+    let grandpa_authorities = vec![(get_from_seed::<GrandpaId>("Alice"), 1)];
     let root_key = get_from_seed::<AccountId>("Alice");
     GenesisConfig {
         system: Some(SystemConfig {
             code: WASM_BINARY.to_vec(),
             changes_trie_config: Default::default(),
         }),
-        paint_balances: Some(BalancesConfig {
+        pallet_balances: Some(BalancesConfig {
             balances: endowed_accounts
                 .iter()
                 .cloned()
@@ -49,7 +52,12 @@ fn dev_genesis_config() -> GenesisConfig {
                 .collect(),
             vesting: vec![],
         }),
-        paint_sudo: Some(SudoConfig { key: root_key }),
-        paint_aura: Some(AuraConfig { authorities }),
+        pallet_sudo: Some(SudoConfig { key: root_key }),
+        pallet_aura: Some(AuraConfig {
+            authorities: aura_authorities,
+        }),
+        grandpa: Some(GrandpaConfig {
+            authorities: grandpa_authorities,
+        }),
     }
 }
diff --git a/node/src/cli.rs b/node/src/cli.rs
index 74a45b69..ce6a0f40 100644
--- a/node/src/cli.rs
+++ b/node/src/cli.rs
@@ -1,12 +1,17 @@
 use crate::chain_spec;
 use crate::service;
 use aura_primitives::sr25519::AuthorityPair as AuraPair;
-use futures::{future, sync::oneshot, Future};
+use futures03::{
+    channel::oneshot,
+    compat::Future01CompatExt,
+    future::{select, Map},
+    FutureExt, TryFutureExt,
+};
 use log::info;
+pub use sc_cli::{error, IntoExit, VersionInfo};
+use sc_cli::{informant, parse_and_prepare, NoCustom, ParseAndPrepare};
+use sc_service::{AbstractService, Configuration, Roles as ServiceRoles};
 use std::cell::RefCell;
-pub use substrate_cli::{error, IntoExit, VersionInfo};
-use substrate_cli::{informant, parse_and_prepare, NoCustom, ParseAndPrepare};
-use substrate_service::{AbstractService, Configuration, Roles as ServiceRoles};
 use tokio::runtime::Runtime;
 
 /// Parse command line arguments into service configuration.
@@ -55,6 +60,11 @@ where
             load_spec,
             exit,
         ),
+        ParseAndPrepare::CheckBlock(cmd) => cmd.run_with_builder(
+            |config: Config<_>| Ok(new_full_start!(config).0),
+            load_spec,
+            exit,
+        ),
         ParseAndPrepare::PurgeChain(cmd) => cmd.run(load_spec),
         ParseAndPrepare::RevertChain(cmd) => {
             cmd.run_with_builder(|config: Config<_>| Ok(new_full_start!(config).0), load_spec)
@@ -81,36 +91,40 @@ where
     T: AbstractService,
     E: IntoExit,
 {
-    let (exit_send, exit) = exit_future::signal();
+    let (exit_send, exit) = oneshot::channel();
 
     let informant = informant::build(&service);
-    runtime.executor().spawn(exit.until(informant).map(|_| ()));
+    let future = select(exit, informant).map(|_| Ok(())).compat();
+
+    runtime.executor().spawn(future);
 
     // we eagerly drop the service so that the internal exit future is fired,
     // but we need to keep holding a reference to the global telemetry guard
     let _telemetry = service.telemetry();
 
     let service_res = {
-        let exit = e
-            .into_exit()
-            .map_err(|_| error::Error::Other("Exit future failed.".into()));
-        let service = service.map_err(error::Error::Service);
-        let select = service.select(exit).map(|_| ()).map_err(|(err, _)| err);
+        let exit = e.into_exit();
+        let service = service.map_err(error::Error::Service).compat();
+        let select = select(service, exit).map(|_| Ok(())).compat();
         runtime.block_on(select)
     };
 
-    exit_send.fire();
+    let _ = exit_send.send(());
 
     // TODO [andre]: timeout this future #1318
+    use futures01::Future;
     let _ = runtime.shutdown_on_idle().wait();
 
     service_res
 }
 
+type Fut = oneshot::Receiver<()>;
+type Func = fn(Result<(), oneshot::Canceled>) -> ();
+
 // handles ctrl-c
 pub struct Exit;
 impl IntoExit for Exit {
-    type Exit = future::MapErr<oneshot::Receiver<()>, fn(oneshot::Canceled) -> ()>;
+    type Exit = Map<Fut, Func>;
     fn into_exit(self) -> Self::Exit {
         // can't use signal directly here because CtrlC takes only `Fn`.
         let (exit_send, exit) = oneshot::channel();
@@ -127,6 +141,6 @@ impl IntoExit for Exit {
         })
         .expect("Error setting Ctrl-C handler");
 
-        exit.map_err(drop)
+        exit.map(drop)
     }
 }
diff --git a/node/src/main.rs b/node/src/main.rs
index 3a0a78d3..6634fbb1 100644
--- a/node/src/main.rs
+++ b/node/src/main.rs
@@ -8,7 +8,7 @@ mod chain_spec;
 mod service;
 mod cli;
 
-pub use substrate_cli::{error, IntoExit, VersionInfo};
+pub use sc_cli::{error, IntoExit, VersionInfo};
 
 fn main() {
     let version = VersionInfo {
diff --git a/node/src/service.rs b/node/src/service.rs
index cc2d1fd4..8bbc64e7 100644
--- a/node/src/service.rs
+++ b/node/src/service.rs
@@ -1,18 +1,17 @@
 //! Service and ServiceFactory implementation. Specialized wrapper over substrate service.
 
 use aura_primitives::sr25519::AuthorityPair as AuraPair;
-use futures::prelude::*;
+use grandpa::{self, FinalityProofProvider as GrandpaFinalityProofProvider};
 use inherents::InherentDataProviders;
 use network::construct_simple_protocol;
 use radicle_registry_runtime::{self, opaque::Block, GenesisConfig, RuntimeApi};
+use sc_client::LongestChain;
+use sc_executor::native_executor_instance;
+pub use sc_executor::NativeExecutor;
+use sc_service::{error::Error as ServiceError, AbstractService, Configuration, ServiceBuilder};
 use std::sync::Arc;
-use substrate_client::LongestChain;
-use substrate_executor::native_executor_instance;
-pub use substrate_executor::NativeExecutor;
-use substrate_service::{
-    error::Error as ServiceError, AbstractService, Configuration, ServiceBuilder,
-};
-use transaction_pool::{self, txpool::Pool as TransactionPool};
+use std::time::Duration;
+use transaction_pool;
 
 // Our native executor instance.
 native_executor_instance!(
@@ -32,37 +31,51 @@ construct_simple_protocol! {
 /// be able to perform chain operations.
 macro_rules! new_full_start {
     ($config:expr) => {{
+        let mut import_setup = None;
         let inherent_data_providers = inherents::InherentDataProviders::new();
 
-        let builder = substrate_service::ServiceBuilder::new_full::<
+        let builder = sc_service::ServiceBuilder::new_full::<
             radicle_registry_runtime::opaque::Block,
             radicle_registry_runtime::RuntimeApi,
             crate::service::Executor,
         >($config)?
-        .with_select_chain(|_config, backend| {
-            Ok(substrate_client::LongestChain::new(backend.clone()))
+        .with_select_chain(|_config, backend| Ok(sc_client::LongestChain::new(backend.clone())))?
+        .with_transaction_pool(|config, client, _fetcher| {
+            let pool_api = transaction_pool::FullChainApi::new(client.clone());
+            let pool = transaction_pool::BasicPool::new(config, pool_api);
+            let maintainer =
+                transaction_pool::FullBasicPoolMaintainer::new(pool.pool().clone(), client);
+            let maintainable_pool = txpool_api::MaintainableTransactionPool::new(pool, maintainer);
+            Ok(maintainable_pool)
         })?
-        .with_transaction_pool(|config, client| {
-            Ok(transaction_pool::txpool::Pool::new(
-                config,
-                transaction_pool::FullChainApi::new(client),
-            ))
-        })?
-        .with_import_queue(|_config, client, _select_chain, transaction_pool| {
+        .with_import_queue(|_config, client, mut select_chain, transaction_pool| {
+            let select_chain = select_chain
+                .take()
+                .ok_or_else(|| sc_service::Error::SelectChainRequired)?;
+
+            let (grandpa_block_import, grandpa_link) =
+                grandpa::block_import::<_, _, _, radicle_registry_runtime::RuntimeApi, _>(
+                    client.clone(),
+                    &*client,
+                    select_chain,
+                )?;
+
             let import_queue = aura::import_queue::<_, _, AuraPair, _>(
                 aura::SlotDuration::get_or_compute(&*client)?,
-                Box::new(client.clone()),
-                None,
+                Box::new(grandpa_block_import.clone()),
+                Some(Box::new(grandpa_block_import.clone())),
                 None,
                 client,
                 inherent_data_providers.clone(),
                 Some(transaction_pool),
             )?;
 
+            import_setup = Some((grandpa_block_import, grandpa_link));
+
             Ok(import_queue)
         })?;
 
-        (builder, inherent_data_providers)
+        (builder, import_setup, inherent_data_providers)
     }};
 }
 
@@ -72,15 +85,28 @@ pub fn new_full<C: Send + Default + 'static>(
 ) -> Result<impl AbstractService, ServiceError> {
     let is_authority = config.roles.is_authority();
     let force_authoring = config.force_authoring;
+    let name = config.name.clone();
+    let disable_grandpa = config.disable_grandpa;
+
+    // sentry nodes announce themselves as authorities to the network
+    // and should run the same protocols authorities do, but it should
+    // never actively participate in any consensus process.
+    let participates_in_consensus = is_authority && !config.sentry_mode;
+
+    let (builder, mut import_setup, inherent_data_providers) = new_full_start!(config);
 
-    let (builder, inherent_data_providers) = new_full_start!(config);
+    let (block_import, grandpa_link) = import_setup.take().expect(
+        "Link Half and Block Import are present for Full Services or setup failed before. qed",
+    );
 
     let service = builder
         .with_network_protocol(|_| Ok(NodeProtocol::new()))?
-        .with_finality_proof_provider(|_client, _backend| Ok(Arc::new(())))?
+        .with_finality_proof_provider(|client, backend| {
+            Ok(Arc::new(GrandpaFinalityProofProvider::new(backend, client)) as _)
+        })?
         .build()?;
 
-    if is_authority {
+    if participates_in_consensus {
         let proposer = basic_authorship::ProposerFactory {
             client: service.client(),
             transaction_pool: service.transaction_pool(),
@@ -91,23 +117,78 @@ pub fn new_full<C: Send + Default + 'static>(
             .select_chain()
             .ok_or(ServiceError::SelectChainRequired)?;
 
-        let aura = aura::start_aura::<_, _, _, _, _, AuraPair, _, _, _>(
+        let can_author_with =
+            consensus_common::CanAuthorWithNativeVersion::new(client.executor().clone());
+
+        let aura = aura::start_aura::<_, _, _, _, _, AuraPair, _, _, _, _>(
             aura::SlotDuration::get_or_compute(&*client)?,
             client.clone(),
             select_chain,
-            client.clone(),
+            block_import,
             proposer,
             service.network(),
             inherent_data_providers.clone(),
             force_authoring,
             service.keystore(),
+            can_author_with,
         )?;
 
-        let select = aura.select(service.on_exit()).then(|_| Ok(()));
-
         // the AURA authoring task is considered essential, i.e. if it
         // fails we take down the service with it.
-        service.spawn_essential_task(select);
+        service.spawn_essential_task(aura);
+    }
+
+    // if the node isn't actively participating in consensus then it doesn't
+    // need a keystore, regardless of which protocol we use below.
+    let keystore = if participates_in_consensus {
+        Some(service.keystore())
+    } else {
+        None
+    };
+
+    let grandpa_config = grandpa::Config {
+        // FIXME #1578 make this available through chainspec
+        gossip_duration: Duration::from_millis(333),
+        justification_period: 512,
+        name: Some(name),
+        observer_enabled: true,
+        keystore,
+        is_authority,
+    };
+
+    match (is_authority, disable_grandpa) {
+        (false, false) => {
+            // start the lightweight GRANDPA observer
+            service.spawn_task(grandpa::run_grandpa_observer(
+                grandpa_config,
+                grandpa_link,
+                service.network(),
+                service.on_exit(),
+            )?);
+        }
+        (true, false) => {
+            // start the full GRANDPA voter
+            let voter_config = grandpa::GrandpaParams {
+                config: grandpa_config,
+                link: grandpa_link,
+                network: service.network(),
+                inherent_data_providers,
+                on_exit: service.on_exit(),
+                telemetry_on_connect: Some(service.telemetry_on_connect_stream()),
+                voting_rule: grandpa::VotingRulesBuilder::default().build(),
+            };
+
+            // the GRANDPA voter task is considered infallible, i.e.
+            // if it fails we take down the service with it.
+            service.spawn_essential_task(grandpa::run_grandpa_voter(voter_config)?);
+        }
+        (_, true) => {
+            grandpa::setup_disabled_grandpa(
+                service.client(),
+                &inherent_data_providers,
+                service.network(),
+            )?;
+        }
     }
 
     Ok(service)
@@ -121,26 +202,52 @@ pub fn new_light<C: Send + Default + 'static>(
 
     ServiceBuilder::new_light::<Block, RuntimeApi, Executor>(config)?
         .with_select_chain(|_config, backend| Ok(LongestChain::new(backend.clone())))?
-        .with_transaction_pool(|config, client| {
-            Ok(TransactionPool::new(
-                config,
-                transaction_pool::FullChainApi::new(client),
-            ))
-        })?
-        .with_import_queue(|_config, client, _select_chain, _tx_pool| {
-            let import_queue = aura::import_queue::<_, _, AuraPair, ()>(
-                aura::SlotDuration::get_or_compute(&*client)?,
-                Box::new(client.clone()),
-                None,
-                None,
-                client.clone(),
-                inherent_data_providers.clone(),
-                None,
-            )?;
-
-            Ok(import_queue)
+        .with_transaction_pool(|config, client, fetcher| {
+            let fetcher = fetcher
+                .ok_or_else(|| "Trying to start light transaction pool without active fetcher")?;
+            let pool_api = transaction_pool::LightChainApi::new(client.clone(), fetcher.clone());
+            let pool = transaction_pool::BasicPool::new(config, pool_api);
+            let maintainer = transaction_pool::LightBasicPoolMaintainer::with_defaults(
+                pool.pool().clone(),
+                client,
+                fetcher,
+            );
+            let maintainable_pool = txpool_api::MaintainableTransactionPool::new(pool, maintainer);
+            Ok(maintainable_pool)
         })?
+        .with_import_queue_and_fprb(
+            |_config, client, backend, fetcher, _select_chain, _tx_pool| {
+                let fetch_checker = fetcher
+                    .map(|fetcher| fetcher.checker().clone())
+                    .ok_or_else(|| {
+                        "Trying to start light import queue without active fetch checker"
+                    })?;
+                let grandpa_block_import = grandpa::light_block_import::<_, _, _, RuntimeApi>(
+                    client.clone(),
+                    backend,
+                    &*client.clone(),
+                    Arc::new(fetch_checker),
+                )?;
+                let finality_proof_import = grandpa_block_import.clone();
+                let finality_proof_request_builder =
+                    finality_proof_import.create_finality_proof_request_builder();
+
+                let import_queue = aura::import_queue::<_, _, AuraPair, ()>(
+                    aura::SlotDuration::get_or_compute(&*client)?,
+                    Box::new(grandpa_block_import),
+                    None,
+                    Some(Box::new(finality_proof_import)),
+                    client,
+                    inherent_data_providers.clone(),
+                    None,
+                )?;
+
+                Ok((import_queue, finality_proof_request_builder))
+            },
+        )?
         .with_network_protocol(|_| Ok(NodeProtocol::new()))?
-        .with_finality_proof_provider(|_client, _backend| Ok(Arc::new(())))?
+        .with_finality_proof_provider(|client, backend| {
+            Ok(Arc::new(GrandpaFinalityProofProvider::new(backend, client)) as _)
+        })?
         .build()
 }
diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml
index 2f2866ce..364e3763 100644
--- a/runtime/Cargo.toml
+++ b/runtime/Cargo.toml
@@ -9,25 +9,26 @@ default = ["std"]
 std = [
     "codec/std",
     "serde",
-    "sr-primitives/std",
-    "sr-io/std",
-    "sr-std/std",
-    "sr-version/std",
-    "paint-aura/std",
-    "paint-balances/std",
-    "paint-executive/std",
-    "paint-sudo/std",
-    "paint-support/std",
-    "paint-system/std",
-    "paint-timestamp/std",
-    "paint-transaction-payment/std",
-    "sr-api/std",
-    "substrate-block-builder-runtime-api/std",
-    "substrate-consensus-aura-primitives/std",
-    "substrate-offchain-primitives/std",
-    "substrate-primitives/std",
-    "substrate-session/std",
-    "substrate-transaction-pool-runtime-api/std",
+    "sp-runtime/std",
+    "sp-io/std",
+    "sp-std/std",
+    "sp-session/std",
+    "pallet-aura/std",
+    "pallet-balances/std",
+    "frame-executive/std",
+    "pallet-sudo/std",
+    "frame-support/std",
+    "frame-system/std",
+    "pallet-timestamp/std",
+    "pallet-transaction-payment/std",
+    "sp-api/std",
+    "sp-block-builder/std",
+    "sp-consensus-aura/std",
+    "grandpa/std",
+    "sp-offchain/std",
+    "sp-core/std",
+    "sp-version/std",
+    "sp-transaction-pool/std",
 ]
 
 [dependencies.codec]
@@ -41,111 +42,117 @@ features = ["derive"]
 optional = true
 version = "1.0.101"
 
-[dependencies.paint-aura]
+[dependencies.pallet-aura]
 git = "https://github.com/paritytech/substrate"
-rev = "dc4a8329b9c47790c25429a5df272b3648275c1b"
+rev = "3d17cbd2fbcc337af49c861896ab4936b161bcee"
 default-features = false
 
-[dependencies.substrate-consensus-aura-primitives]
+[dependencies.sp-consensus-aura]
 git = "https://github.com/paritytech/substrate"
-rev = "dc4a8329b9c47790c25429a5df272b3648275c1b"
+rev = "3d17cbd2fbcc337af49c861896ab4936b161bcee"
 default-features = false
 
-[dependencies.paint-balances]
+[dependencies.pallet-balances]
 git = "https://github.com/paritytech/substrate"
-rev = "dc4a8329b9c47790c25429a5df272b3648275c1b"
+rev = "3d17cbd2fbcc337af49c861896ab4936b161bcee"
 default_features = false
 
-[dependencies.sr-api]
+[dependencies.sp-api]
 git = "https://github.com/paritytech/substrate"
-rev = "dc4a8329b9c47790c25429a5df272b3648275c1b"
+rev = "3d17cbd2fbcc337af49c861896ab4936b161bcee"
 default_features = false
 
-[dependencies.paint-executive]
+[dependencies.frame-executive]
 git = "https://github.com/paritytech/substrate"
-rev = "dc4a8329b9c47790c25429a5df272b3648275c1b"
-package = "paint-executive"
+rev = "3d17cbd2fbcc337af49c861896ab4936b161bcee"
+package = "frame-executive"
 default_features = false
 
-[dependencies.substrate-offchain-primitives]
+[dependencies.sp-offchain]
 git = "https://github.com/paritytech/substrate"
-rev = "dc4a8329b9c47790c25429a5df272b3648275c1b"
+rev = "3d17cbd2fbcc337af49c861896ab4936b161bcee"
 default-features = false
 
-[dependencies.substrate-primitives]
+[dependencies.sp-core]
 git = "https://github.com/paritytech/substrate"
-rev = "dc4a8329b9c47790c25429a5df272b3648275c1b"
+rev = "3d17cbd2fbcc337af49c861896ab4936b161bcee"
 default_features = false
 
-[dependencies.sr-std]
+[dependencies.sp-std]
 git = "https://github.com/paritytech/substrate"
-rev = "dc4a8329b9c47790c25429a5df272b3648275c1b"
+rev = "3d17cbd2fbcc337af49c861896ab4936b161bcee"
 default_features = false
 
-[dependencies.sr-io]
+[dependencies.sp-io]
 git = "https://github.com/paritytech/substrate"
-rev = "dc4a8329b9c47790c25429a5df272b3648275c1b"
+rev = "3d17cbd2fbcc337af49c861896ab4936b161bcee"
 default_features = false
 
-[dependencies.sr-primitives]
+[dependencies.sp-runtime]
 git = "https://github.com/paritytech/substrate"
-rev = "dc4a8329b9c47790c25429a5df272b3648275c1b"
+rev = "3d17cbd2fbcc337af49c861896ab4936b161bcee"
 default_features = false
 
-[dependencies.paint-randomness-collective-flip]
+[dependencies.pallet-randomness-collective-flip]
 git = "https://github.com/paritytech/substrate"
-rev = "dc4a8329b9c47790c25429a5df272b3648275c1b"
+rev = "3d17cbd2fbcc337af49c861896ab4936b161bcee"
 default_features = false
 
-[dependencies.substrate-session]
+[dependencies.sp-session]
 git = "https://github.com/paritytech/substrate"
-rev = "dc4a8329b9c47790c25429a5df272b3648275c1b"
+rev = "3d17cbd2fbcc337af49c861896ab4936b161bcee"
 default-features = false
 
-[dependencies.substrate-block-builder-runtime-api]
+[dependencies.sp-block-builder]
 git = "https://github.com/paritytech/substrate"
-rev = "dc4a8329b9c47790c25429a5df272b3648275c1b"
+rev = "3d17cbd2fbcc337af49c861896ab4936b161bcee"
 default-features = false
 
-[dependencies.substrate-transaction-pool-runtime-api]
+[dependencies.sp-transaction-pool]
 git = "https://github.com/paritytech/substrate"
-rev = "dc4a8329b9c47790c25429a5df272b3648275c1b"
+rev = "3d17cbd2fbcc337af49c861896ab4936b161bcee"
 default-features = false
 
-[dependencies.substrate-inherents]
+[dependencies.sp-inherents]
 git = "https://github.com/paritytech/substrate"
-rev = "dc4a8329b9c47790c25429a5df272b3648275c1b"
+rev = "3d17cbd2fbcc337af49c861896ab4936b161bcee"
 default-features = false
 
-[dependencies.paint-sudo]
+[dependencies.pallet-sudo]
 git = "https://github.com/paritytech/substrate"
-rev = "dc4a8329b9c47790c25429a5df272b3648275c1b"
-package = "paint-sudo"
+rev = "3d17cbd2fbcc337af49c861896ab4936b161bcee"
+package = "pallet-sudo"
 default_features = false
 
-[dependencies.paint-support]
+[dependencies.frame-support]
 git = "https://github.com/paritytech/substrate"
-rev = "dc4a8329b9c47790c25429a5df272b3648275c1b"
+rev = "3d17cbd2fbcc337af49c861896ab4936b161bcee"
 default_features = false
 
-[dependencies.paint-system]
+[dependencies.frame-system]
 git = "https://github.com/paritytech/substrate"
-rev = "dc4a8329b9c47790c25429a5df272b3648275c1b"
+rev = "3d17cbd2fbcc337af49c861896ab4936b161bcee"
 default_features = false
 
-[dependencies.paint-timestamp]
+[dependencies.pallet-timestamp]
 git = "https://github.com/paritytech/substrate"
-rev = "dc4a8329b9c47790c25429a5df272b3648275c1b"
+rev = "3d17cbd2fbcc337af49c861896ab4936b161bcee"
 default_features = false
 
-[dependencies.paint-transaction-payment]
+[dependencies.pallet-transaction-payment]
 git = "https://github.com/paritytech/substrate"
-rev = "dc4a8329b9c47790c25429a5df272b3648275c1b"
+rev = "3d17cbd2fbcc337af49c861896ab4936b161bcee"
 default_features = false
 
-[dependencies.sr-version]
+[dependencies.sp-version]
 git = "https://github.com/paritytech/substrate"
-rev = "dc4a8329b9c47790c25429a5df272b3648275c1b"
+rev = "3d17cbd2fbcc337af49c861896ab4936b161bcee"
+default_features = false
+
+[dependencies.grandpa]
+git = "https://github.com/paritytech/substrate"
+rev = "3d17cbd2fbcc337af49c861896ab4936b161bcee"
+package = "pallet-grandpa"
 default_features = false
 
 [build-dependencies]
diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs
index b5139543..28981976 100644
--- a/runtime/src/lib.rs
+++ b/runtime/src/lib.rs
@@ -13,21 +13,23 @@ include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs"));
 
 extern crate alloc;
 
-use paint_support::{construct_runtime, parameter_types, traits::Randomness};
-use sr_primitives::traits::{BlakeTwo256, Block as BlockT, ConvertInto, NumberFor};
-use sr_primitives::weights::Weight;
-use sr_primitives::{
+use frame_support::weights::Weight;
+use frame_support::{construct_runtime, parameter_types, traits::Randomness};
+use sp_core::{ed25519, OpaqueMetadata};
+use sp_runtime::traits::{BlakeTwo256, Block as BlockT, ConvertInto, NumberFor};
+use sp_runtime::{
     create_runtime_str, generic, impl_opaque_keys, transaction_validity::TransactionValidity,
-    ApplyResult, Perbill,
+    ApplyExtrinsicResult, Perbill,
 };
-use sr_std::prelude::*;
-use substrate_primitives::{ed25519, OpaqueMetadata};
+use sp_std::prelude::*;
 
-use sr_api::impl_runtime_apis;
+use grandpa::fg_primitives;
+use grandpa::{AuthorityId as GrandpaId, AuthorityWeight as GrandpaWeight};
+use sp_api::impl_runtime_apis;
+use sp_consensus_aura::sr25519::AuthorityId as AuraId;
 #[cfg(feature = "std")]
-use sr_version::NativeVersion;
-use sr_version::RuntimeVersion;
-use substrate_consensus_aura_primitives::sr25519::AuthorityId as AuraId;
+use sp_version::NativeVersion;
+use sp_version::RuntimeVersion;
 
 /// An index to a block.
 pub type BlockNumber = u32;
@@ -55,19 +57,19 @@ pub type Hashing = BlakeTwo256;
 /// A hash of some data used by the chain.
 ///
 /// Same as [Hashing::Output].
-pub type Hash = substrate_primitives::H256;
+pub type Hash = sp_core::H256;
 
 /// Digest item type.
 pub type DigestItem = generic::DigestItem<Hash>;
 
-pub type EventRecord = paint_system::EventRecord<Event, Hash>;
+pub type EventRecord = frame_system::EventRecord<Event, Hash>;
 
 pub mod registry;
 
 mod string32;
 pub use string32::String32;
 
-pub use paint_balances as balances;
+pub use pallet_balances as balances;
 
 /// Opaque types. These are used by the CLI to instantiate machinery that don't need to know
 /// the specifics of the runtime. They can then be made to be agnostic over specific formats
@@ -76,7 +78,7 @@ pub use paint_balances as balances;
 pub mod opaque {
     use super::*;
 
-    pub use sr_primitives::OpaqueExtrinsic as UncheckedExtrinsic;
+    pub use sp_runtime::OpaqueExtrinsic as UncheckedExtrinsic;
 
     /// Opaque block header type.
     pub type Header = generic::Header<BlockNumber, BlakeTwo256>;
@@ -88,6 +90,7 @@ pub mod opaque {
     impl_opaque_keys! {
         pub struct SessionKeys {
             pub aura: Aura,
+            pub granda: Grandpa,
         }
     }
 }
@@ -119,13 +122,13 @@ parameter_types! {
     pub const Version: RuntimeVersion = VERSION;
 }
 
-impl paint_system::Trait for Runtime {
+impl frame_system::Trait for Runtime {
     /// The identifier used to distinguish between accounts.
     type AccountId = AccountId;
     /// The aggregated dispatch type that is available for extrinsics.
     type Call = Call;
     /// The lookup mechanism to get account ID from whatever is passed in dispatchers.
-    type Lookup = sr_primitives::traits::IdentityLookup<AccountId>;
+    type Lookup = sp_runtime::traits::IdentityLookup<AccountId>;
     /// The index type for storing how many extrinsics an account has signed.
     type Index = Index;
     /// The index type for blocks.
@@ -151,16 +154,20 @@ impl paint_system::Trait for Runtime {
     type Version = Version;
 }
 
-impl paint_aura::Trait for Runtime {
+impl pallet_aura::Trait for Runtime {
     type AuthorityId = AuraId;
 }
 
+impl grandpa::Trait for Runtime {
+    type Event = Event;
+}
+
 parameter_types! {
     /// Minimum time between blocks in milliseconds
     pub const MinimumPeriod: u64 = 300;
 }
 
-impl paint_timestamp::Trait for Runtime {
+impl pallet_timestamp::Trait for Runtime {
     /// A timestamp: milliseconds since the unix epoch.
     type Moment = u64;
     type OnTimestampSet = Aura;
@@ -175,8 +182,8 @@ parameter_types! {
     pub const TransactionByteFee: u128 = 0;
 }
 
-impl paint_transaction_payment::Trait for Runtime {
-    type Currency = paint_balances::Module<Runtime>;
+impl pallet_transaction_payment::Trait for Runtime {
+    type Currency = pallet_balances::Module<Runtime>;
     type OnTransactionPayment = ();
     type TransactionBaseFee = TransactionBaseFee;
     type TransactionByteFee = TransactionByteFee;
@@ -184,7 +191,7 @@ impl paint_transaction_payment::Trait for Runtime {
     type FeeMultiplierUpdate = ();
 }
 
-impl paint_balances::Trait for Runtime {
+impl pallet_balances::Trait for Runtime {
     /// The type for recording an account's balance.
     type Balance = Balance;
     /// What to do if an account's free balance gets zeroed.
@@ -200,7 +207,7 @@ impl paint_balances::Trait for Runtime {
     type CreationFee = CreationFee;
 }
 
-impl paint_sudo::Trait for Runtime {
+impl pallet_sudo::Trait for Runtime {
     type Event = Event;
     type Proposal = Call;
 }
@@ -209,7 +216,7 @@ impl registry::Trait for Runtime {
     type Event = Event;
 }
 
-use paint_system as system;
+use frame_system as system;
 
 construct_runtime!(
         pub enum Runtime where
@@ -218,11 +225,12 @@ construct_runtime!(
                 UncheckedExtrinsic = UncheckedExtrinsic
         {
                 System: system::{Module, Call, Storage, Config, Event},
-                Timestamp: paint_timestamp::{Module, Call, Storage, Inherent},
-                RandomnessCollectiveFlip: paint_randomness_collective_flip::{Module, Storage},
-                Aura: paint_aura::{Module, Config<T>, Inherent(Timestamp)},
-                Balances: paint_balances::{default, Error},
-                Sudo: paint_sudo,
+                Timestamp: pallet_timestamp::{Module, Call, Storage, Inherent},
+                RandomnessCollectiveFlip: pallet_randomness_collective_flip::{Module, Storage},
+                Aura: pallet_aura::{Module, Config<T>, Inherent(Timestamp)},
+                Grandpa: grandpa::{Module, Call, Storage, Config, Event},
+                Balances: pallet_balances::{default, Error},
+                Sudo: pallet_sudo,
                 Registry: registry::{Module, Call, Storage, Event},
         }
 );
@@ -237,28 +245,28 @@ pub type SignedBlock = generic::SignedBlock<Block>;
 pub type BlockId = generic::BlockId<Block>;
 /// The SignedExtension to the basic transaction logic.
 pub type SignedExtra = (
-    paint_system::CheckVersion<Runtime>,
-    paint_system::CheckGenesis<Runtime>,
-    paint_system::CheckEra<Runtime>,
-    paint_system::CheckNonce<Runtime>,
-    paint_system::CheckWeight<Runtime>,
-    paint_transaction_payment::ChargeTransactionPayment<Runtime>,
+    frame_system::CheckVersion<Runtime>,
+    frame_system::CheckGenesis<Runtime>,
+    frame_system::CheckEra<Runtime>,
+    frame_system::CheckNonce<Runtime>,
+    frame_system::CheckWeight<Runtime>,
+    pallet_transaction_payment::ChargeTransactionPayment<Runtime>,
 );
 /// Unchecked extrinsic type as expected by this runtime.
 pub type UncheckedExtrinsic = generic::UncheckedExtrinsic<AccountId, Call, Signature, SignedExtra>;
 /// Extrinsic type that has already been checked.
 pub type CheckedExtrinsic = generic::CheckedExtrinsic<AccountId, Call, SignedExtra>;
 /// Executive: handles dispatch to the various modules.
-pub type Executive = paint_executive::Executive<
+pub type Executive = frame_executive::Executive<
     Runtime,
     Block,
-    paint_system::ChainContext<Runtime>,
+    frame_system::ChainContext<Runtime>,
     Runtime,
     AllModules,
 >;
 
 impl_runtime_apis! {
-    impl sr_api::Core<Block> for Runtime {
+    impl sp_api::Core<Block> for Runtime {
         fn version() -> RuntimeVersion {
             VERSION
         }
@@ -272,14 +280,14 @@ impl_runtime_apis! {
         }
     }
 
-    impl sr_api::Metadata<Block> for Runtime {
+    impl sp_api::Metadata<Block> for Runtime {
         fn metadata() -> OpaqueMetadata {
             Runtime::metadata().into()
         }
     }
 
-    impl substrate_block_builder_runtime_api::BlockBuilder<Block> for Runtime {
-        fn apply_extrinsic(extrinsic: <Block as BlockT>::Extrinsic) -> ApplyResult {
+    impl sp_block_builder::BlockBuilder<Block> for Runtime {
+        fn apply_extrinsic(extrinsic: <Block as BlockT>::Extrinsic) -> ApplyExtrinsicResult {
             Executive::apply_extrinsic(extrinsic)
         }
 
@@ -287,14 +295,14 @@ impl_runtime_apis! {
             Executive::finalize_block()
         }
 
-        fn inherent_extrinsics(data: substrate_inherents::InherentData) -> Vec<<Block as BlockT>::Extrinsic> {
+        fn inherent_extrinsics(data: sp_inherents::InherentData) -> Vec<<Block as BlockT>::Extrinsic> {
             data.create_extrinsics()
         }
 
         fn check_inherents(
             block: Block,
-            data: substrate_inherents::InherentData,
-        ) -> substrate_inherents::CheckInherentsResult {
+            data: sp_inherents::InherentData,
+        ) -> sp_inherents::CheckInherentsResult {
             data.check_extrinsics(&block)
         }
 
@@ -303,19 +311,19 @@ impl_runtime_apis! {
         }
     }
 
-    impl substrate_transaction_pool_runtime_api::TaggedTransactionQueue<Block> for Runtime {
+    impl sp_transaction_pool::runtime_api::TaggedTransactionQueue<Block> for Runtime {
         fn validate_transaction(tx: <Block as BlockT>::Extrinsic) -> TransactionValidity {
             Executive::validate_transaction(tx)
         }
     }
 
-    impl substrate_offchain_primitives::OffchainWorkerApi<Block> for Runtime {
+    impl sp_offchain::OffchainWorkerApi<Block> for Runtime {
         fn offchain_worker(number: NumberFor<Block>) {
             Executive::offchain_worker(number)
         }
     }
 
-    impl substrate_consensus_aura_primitives::AuraApi<Block, AuraId> for Runtime {
+    impl sp_consensus_aura::AuraApi<Block, AuraId> for Runtime {
         fn slot_duration() -> u64 {
             Aura::slot_duration()
         }
@@ -325,9 +333,15 @@ impl_runtime_apis! {
         }
     }
 
-    impl substrate_session::SessionKeys<Block> for Runtime {
+    impl sp_session::SessionKeys<Block> for Runtime {
         fn generate_session_keys(seed: Option<Vec<u8>>) -> Vec<u8> {
             opaque::SessionKeys::generate(seed)
         }
     }
+
+    impl fg_primitives::GrandpaApi<Block> for Runtime {
+        fn grandpa_authorities() -> Vec<(GrandpaId, GrandpaWeight)> {
+            Grandpa::grandpa_authorities()
+        }
+    }
 }
diff --git a/runtime/src/registry.rs b/runtime/src/registry.rs
index c710af80..6a26298a 100644
--- a/runtime/src/registry.rs
+++ b/runtime/src/registry.rs
@@ -1,22 +1,23 @@
 use alloc::prelude::v1::*;
 use alloc::vec;
 use codec::{Decode, Encode};
-use paint_support::{
+use frame_support::weights::SimpleDispatchInfo;
+use frame_support::{
     decl_event, decl_module, decl_storage,
     dispatch::Result as DispatchResult,
     storage::StorageMap as _,
     storage::StorageValue as _,
-    traits::{Currency, ExistenceRequirement, Randomness as _},
+    traits::{Currency, ExistenceRequirement},
 };
-use sr_primitives::weights::SimpleDispatchInfo;
 
-use substrate_primitives::{crypto::UncheckedFrom, H256};
+use sp_core::{crypto::UncheckedFrom, H256};
 
-use paint_system as system;
-use paint_system::ensure_signed;
+use frame_support::traits::Randomness;
+use frame_system as system;
+use frame_system::ensure_signed;
 
 use crate::{AccountId, Balance, Hash, Hashing, String32};
-use sr_primitives::traits::Hash as _;
+use sp_runtime::traits::Hash as _;
 
 /// The name a project is registered with.
 pub type ProjectName = String32;
@@ -78,9 +79,9 @@ pub struct TransferFromProjectParams {
 }
 
 pub trait Trait:
-    paint_system::Trait<AccountId = AccountId, Origin = crate::Origin, Hash = Hash>
+    frame_system::Trait<AccountId = AccountId, Origin = crate::Origin, Hash = Hash>
 {
-    type Event: From<Event> + Into<<Self as paint_system::Trait>::Event>;
+    type Event: From<Event> + Into<<Self as frame_system::Trait>::Event>;
 }
 
 pub mod store {
@@ -156,7 +157,7 @@ decl_module! {
                 Some (_) => return Err("A project with the supplied ID already exists."),
             };
             let account_id = AccountId::unchecked_from(
-                paint_randomness_collective_flip::Module::<T>::random(b"project-account-id")
+                pallet_randomness_collective_flip::Module::<T>::random(b"project-account-id")
             );
             let project = Project {
                 id: project_id.clone(),
diff --git a/runtime/src/string32.rs b/runtime/src/string32.rs
index e2e2e91a..d9e5b5ad 100644
--- a/runtime/src/string32.rs
+++ b/runtime/src/string32.rs
@@ -3,8 +3,8 @@ use alloc::format;
 use alloc::prelude::v1::*;
 use codec::{Decode, Encode, Error as CodecError, Input};
 
-use sr_std::fmt;
-use sr_std::str::FromStr;
+use sp_std::fmt;
+use sp_std::str::FromStr;
 
 /// Type to represent project names and domains.
 ///
diff --git a/subxt/Cargo.toml b/subxt/Cargo.toml
index 9c62b552..f7080df3 100644
--- a/subxt/Cargo.toml
+++ b/subxt/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "substrate-subxt"
-version = "0.2.0"
+version = "0.3.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 
@@ -23,56 +23,57 @@ serde = { version = "1.0", features = ["derive"] }
 url = "1.7"
 
 [dependencies.runtime_metadata]
-package = "paint-metadata"
+package = "frame-metadata"
 git = "https://github.com/paritytech/substrate"
-rev = "dc4a8329b9c47790c25429a5df272b3648275c1b"
+rev = "3d17cbd2fbcc337af49c861896ab4936b161bcee"
 
 [dependencies.runtime_primitives]
-package = "sr-primitives"
+package = "sp-runtime"
 git = "https://github.com/paritytech/substrate"
-rev = "dc4a8329b9c47790c25429a5df272b3648275c1b"
+rev = "3d17cbd2fbcc337af49c861896ab4936b161bcee"
 
 [dependencies.runtime_support]
-package = "paint-support"
+package = "frame-support"
 git = "https://github.com/paritytech/substrate"
-rev = "dc4a8329b9c47790c25429a5df272b3648275c1b"
+rev = "3d17cbd2fbcc337af49c861896ab4936b161bcee"
 
-[dependencies.sr-version]
+[dependencies.sp-version]
 git = "https://github.com/paritytech/substrate"
-rev = "dc4a8329b9c47790c25429a5df272b3648275c1b"
+rev = "3d17cbd2fbcc337af49c861896ab4936b161bcee"
 
-[dependencies.paint-balances]
+[dependencies.pallet-balances]
 git = "https://github.com/paritytech/substrate"
-rev = "dc4a8329b9c47790c25429a5df272b3648275c1b"
+rev = "3d17cbd2fbcc337af49c861896ab4936b161bcee"
 
-[dependencies.paint-contracts]
+[dependencies.pallet-contracts]
 git = "https://github.com/paritytech/substrate"
-rev = "dc4a8329b9c47790c25429a5df272b3648275c1b"
+rev = "3d17cbd2fbcc337af49c861896ab4936b161bcee"
 
-[dependencies.paint-indices]
+[dependencies.pallet-indices]
 git = "https://github.com/paritytech/substrate"
-rev = "dc4a8329b9c47790c25429a5df272b3648275c1b"
+rev = "3d17cbd2fbcc337af49c861896ab4936b161bcee"
 
-[dependencies.paint-system]
+[dependencies.frame-system]
 git = "https://github.com/paritytech/substrate"
-rev = "dc4a8329b9c47790c25429a5df272b3648275c1b"
+rev = "3d17cbd2fbcc337af49c861896ab4936b161bcee"
 
-[dependencies.substrate-primitives]
+[dependencies.sp-core]
 git = "https://github.com/paritytech/substrate"
-rev = "dc4a8329b9c47790c25429a5df272b3648275c1b"
+rev = "3d17cbd2fbcc337af49c861896ab4936b161bcee"
 
-[dependencies.substrate-rpc-api]
+[dependencies.sc-rpc-api]
 git = "https://github.com/paritytech/substrate"
-rev = "dc4a8329b9c47790c25429a5df272b3648275c1b"
+rev = "3d17cbd2fbcc337af49c861896ab4936b161bcee"
+package = "sc-rpc-api"
 
-[dependencies.substrate-rpc-primitives]
+[dependencies.sp-rpc]
 git = "https://github.com/paritytech/substrate"
-rev = "dc4a8329b9c47790c25429a5df272b3648275c1b"
+rev = "3d17cbd2fbcc337af49c861896ab4936b161bcee"
 
-[dependencies.txpool]
-package = "substrate-transaction-graph"
+[dependencies.txpool-api]
+package = "sp-transaction-pool"
 git = "https://github.com/paritytech/substrate"
-rev = "dc4a8329b9c47790c25429a5df272b3648275c1b"
+rev = "3d17cbd2fbcc337af49c861896ab4936b161bcee"
 
 
 [dev-dependencies]
@@ -82,8 +83,8 @@ wabt = "0.9.0"
 
 [dev-dependencies.node-runtime]
 git = "https://github.com/paritytech/substrate"
-rev = "dc4a8329b9c47790c25429a5df272b3648275c1b"
+rev = "3d17cbd2fbcc337af49c861896ab4936b161bcee"
 
-[dev-dependencies.substrate-keyring]
+[dev-dependencies.sp-keyring]
 git = "https://github.com/paritytech/substrate"
-rev = "dc4a8329b9c47790c25429a5df272b3648275c1b"
+rev = "3d17cbd2fbcc337af49c861896ab4936b161bcee"
diff --git a/subxt/src/error.rs b/subxt/src/error.rs
index e3631cf1..2c82c485 100644
--- a/subxt/src/error.rs
+++ b/subxt/src/error.rs
@@ -19,7 +19,7 @@ use jsonrpc_core_client::RpcError;
 use parity_scale_codec::Error as CodecError;
 use runtime_primitives::transaction_validity::TransactionValidityError;
 use std::io::Error as IoError;
-use substrate_primitives::crypto::SecretStringError;
+use sp_core::crypto::SecretStringError;
 
 /// Error enum.
 #[derive(Debug, derive_more::From, derive_more::Display)]
diff --git a/subxt/src/extrinsic.rs b/subxt/src/extrinsic.rs
index 59e28f9d..5dcd4f87 100644
--- a/subxt/src/extrinsic.rs
+++ b/subxt/src/extrinsic.rs
@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with substrate-subxt.  If not, see <http://www.gnu.org/licenses/>.
 
-use crate::paint::{
+use crate::frame::{
     balances::Balances,
     system::System,
 };
@@ -37,10 +37,10 @@ use runtime_primitives::{
     transaction_validity::TransactionValidityError,
 };
 use std::marker::PhantomData;
-use substrate_primitives::Pair;
+use sp_core::Pair;
 
 /// SignedExtra checks copied from substrate, in order to remove requirement to implement
-/// substrate's `paint_system::Trait`
+/// substrate's `frame_system::Trait`
 
 /// Ensure the runtime version registered in the transaction is the same as at present.
 ///
@@ -64,6 +64,7 @@ where
     type Call = ();
     type AdditionalSigned = u32;
     type Pre = ();
+    type DispatchInfo = ();
     fn additional_signed(
         &self,
     ) -> Result<Self::AdditionalSigned, TransactionValidityError> {
@@ -93,6 +94,7 @@ where
     type Call = ();
     type AdditionalSigned = T::Hash;
     type Pre = ();
+    type DispatchInfo = ();
     fn additional_signed(
         &self,
     ) -> Result<Self::AdditionalSigned, TransactionValidityError> {
@@ -124,6 +126,7 @@ where
     type Call = ();
     type AdditionalSigned = T::Hash;
     type Pre = ();
+    type DispatchInfo = ();
     fn additional_signed(
         &self,
     ) -> Result<Self::AdditionalSigned, TransactionValidityError> {
@@ -143,6 +146,7 @@ where
     type Call = ();
     type AdditionalSigned = ();
     type Pre = ();
+    type DispatchInfo = ();
     fn additional_signed(
         &self,
     ) -> Result<Self::AdditionalSigned, TransactionValidityError> {
@@ -162,6 +166,7 @@ where
     type Call = ();
     type AdditionalSigned = ();
     type Pre = ();
+    type DispatchInfo = ();
     fn additional_signed(
         &self,
     ) -> Result<Self::AdditionalSigned, TransactionValidityError> {
@@ -182,6 +187,7 @@ where
     type Call = ();
     type AdditionalSigned = ();
     type Pre = ();
+    type DispatchInfo = ();
     fn additional_signed(
         &self,
     ) -> Result<Self::AdditionalSigned, TransactionValidityError> {
@@ -201,6 +207,7 @@ where
     type Call = ();
     type AdditionalSigned = ();
     type Pre = ();
+    type DispatchInfo = ();
     fn additional_signed(
         &self,
     ) -> Result<Self::AdditionalSigned, TransactionValidityError> {
@@ -261,6 +268,7 @@ impl<T: System + Balances + Send + Sync> SignedExtension for DefaultExtra<T> {
     type AdditionalSigned =
         <<Self as SignedExtra<T>>::Extra as SignedExtension>::AdditionalSigned;
     type Pre = ();
+    type DispatchInfo = ();
 
     fn additional_signed(
         &self,
diff --git a/subxt/src/paint/balances.rs b/subxt/src/frame/balances.rs
similarity index 92%
rename from subxt/src/paint/balances.rs
rename to subxt/src/frame/balances.rs
index 09ec0adf..9930bb42 100644
--- a/subxt/src/paint/balances.rs
+++ b/subxt/src/frame/balances.rs
@@ -1,4 +1,4 @@
-//! Implements support for the paint_balances module.
+//! Implements support for the frame_balances module.
 use crate::{
     codec::{
         compact,
@@ -6,7 +6,7 @@ use crate::{
     },
     error::Error,
     metadata::MetadataError,
-    paint::{
+    frame::{
         system::System,
         ModuleCalls,
     },
@@ -28,9 +28,9 @@ use runtime_primitives::traits::{
 };
 use runtime_support::Parameter;
 use std::fmt::Debug;
-use substrate_primitives::Pair;
+use sp_core::Pair;
 
-/// The subset of the `paint_balances::Trait` that a client must implement.
+/// The subset of the `frame_balances::Trait` that a client must implement.
 pub trait Balances: System {
     /// The balance of an account.
     type Balance: Parameter
@@ -45,9 +45,9 @@ pub trait Balances: System {
 }
 
 /// Blanket impl for using existing runtime types
-impl<T: paint_system::Trait + paint_balances::Trait + Debug> Balances for T
+impl<T: frame_system::Trait + pallet_balances::Trait + Debug> Balances for T
 where
-    <T as paint_system::Trait>::Header: serde::de::DeserializeOwned,
+    <T as frame_system::Trait>::Header: serde::de::DeserializeOwned,
 {
     type Balance = T::Balance;
 }
@@ -110,7 +110,7 @@ pub trait BalancesXt {
     /// Signature type
     type Signature: Verify;
 
-    /// Create a call for the paint balances module
+    /// Create a call for the frame balances module
     fn balances<F>(
         &self,
         f: F,
diff --git a/subxt/src/paint/contracts.rs b/subxt/src/frame/contracts.rs
similarity index 91%
rename from subxt/src/paint/contracts.rs
rename to subxt/src/frame/contracts.rs
index 4681539b..fc7bf3db 100644
--- a/subxt/src/paint/contracts.rs
+++ b/subxt/src/frame/contracts.rs
@@ -1,11 +1,11 @@
-//! Implements support for the paint_contracts module.
+//! Implements support for the frame_contracts module.
 use crate::{
     codec::{
         compact,
         Encoded,
     },
     metadata::MetadataError,
-    paint::{
+    frame::{
         balances::Balances,
         system::System,
         ModuleCalls,
@@ -17,24 +17,24 @@ use runtime_primitives::traits::{
     IdentifyAccount,
     Verify,
 };
-use substrate_primitives::Pair;
+use sp_core::Pair;
 
 /// Gas units are chosen to be represented by u64 so that gas metering
 /// instructions can operate on them efficiently.
 pub type Gas = u64;
 
-/// The subset of the `paint_contracts::Trait` that a client must implement.
+/// The subset of the `frame_contracts::Trait` that a client must implement.
 pub trait Contracts: System + Balances {}
 
 /// Blanket impl for using existing runtime types
 impl<
-        T: paint_contracts::Trait
-            + paint_system::Trait
-            + paint_balances::Trait
+        T: pallet_contracts::Trait
+            + frame_system::Trait
+            + pallet_balances::Trait
             + std::fmt::Debug,
     > Contracts for T
 where
-    <T as paint_system::Trait>::Header: serde::de::DeserializeOwned,
+    <T as frame_system::Trait>::Header: serde::de::DeserializeOwned,
 {
 }
 
@@ -47,7 +47,7 @@ pub trait ContractsXt {
     /// Signature type
     type Signature: Verify;
 
-    /// Create a call for the paint contracts module
+    /// Create a call for the frame contracts module
     fn contracts<F>(
         &self,
         f: F,
diff --git a/subxt/src/paint/mod.rs b/subxt/src/frame/mod.rs
similarity index 100%
rename from subxt/src/paint/mod.rs
rename to subxt/src/frame/mod.rs
diff --git a/subxt/src/paint/system.rs b/subxt/src/frame/system.rs
similarity index 92%
rename from subxt/src/paint/system.rs
rename to subxt/src/frame/system.rs
index 568c96c3..44fc738c 100644
--- a/subxt/src/paint/system.rs
+++ b/subxt/src/frame/system.rs
@@ -1,9 +1,9 @@
-//! Implements support for the paint_system module.
+//! Implements support for the frame_system module.
 use crate::{
     codec::Encoded,
     error::Error,
     metadata::MetadataError,
-    paint::{
+    frame::{
         balances::Balances,
         ModuleCalls,
     },
@@ -34,9 +34,9 @@ use runtime_primitives::traits::{
 use runtime_support::Parameter;
 use serde::de::DeserializeOwned;
 use std::fmt::Debug;
-use substrate_primitives::Pair;
+use sp_core::Pair;
 
-/// The subset of the `paint::Trait` that a client must implement.
+/// The subset of the `frame::Trait` that a client must implement.
 pub trait System: 'static + Eq + Clone + Debug {
     /// Account index (aka nonce) type. This stores the number of previous
     /// transactions associated with a sender account.
@@ -87,7 +87,7 @@ pub trait System: 'static + Eq + Clone + Debug {
         + Ord
         + Default;
 
-    /// The address type. This instead of `<paint_system::Trait::Lookup as StaticLookup>::Source`.
+    /// The address type. This instead of `<frame_system::Trait::Lookup as StaticLookup>::Source`.
     type Address: Codec + Clone + PartialEq + Debug;
 
     /// The block header.
@@ -100,9 +100,9 @@ pub trait System: 'static + Eq + Clone + Debug {
 }
 
 /// Blanket impl for using existing runtime types
-impl<T: paint_system::Trait + Debug> System for T
+impl<T: frame_system::Trait + Debug> System for T
 where
-    <T as paint_system::Trait>::Header: serde::de::DeserializeOwned,
+    <T as frame_system::Trait>::Header: serde::de::DeserializeOwned,
 {
     type Index = T::Index;
     type BlockNumber = T::BlockNumber;
@@ -158,7 +158,7 @@ pub trait SystemXt {
     /// Signature type
     type Signature: Verify;
 
-    /// Create a call for the paint system module
+    /// Create a call for the frame system module
     fn system<F>(
         &self,
         f: F,
diff --git a/subxt/src/lib.rs b/subxt/src/lib.rs
index dcbe872f..11f22f61 100644
--- a/subxt/src/lib.rs
+++ b/subxt/src/lib.rs
@@ -40,9 +40,9 @@ use runtime_primitives::{
     },
     MultiSignature,
 };
-use sr_version::RuntimeVersion;
+use sp_version::RuntimeVersion;
 use std::marker::PhantomData;
-use substrate_primitives::{
+use sp_core::{
     storage::{
         StorageChangeSet,
         StorageKey,
@@ -58,7 +58,7 @@ use crate::{
         SignedExtra,
     },
     metadata::MetadataError,
-    paint::{
+    frame::{
         balances::Balances,
         system::{
             System,
@@ -77,13 +77,13 @@ use crate::{
 mod codec;
 mod error;
 mod extrinsic;
+mod frame;
 mod metadata;
-mod paint;
 mod rpc;
 mod runtimes;
 
 pub use error::Error;
-pub use paint::*;
+pub use frame::*;
 pub use rpc::ExtrinsicSuccess;
 pub use runtimes::*;
 
@@ -332,16 +332,16 @@ where
     }
 }
 
-impl<T: paint_system::Trait + 'static + System, P, S: 'static, V> XtBuilder<T, P, S, V>
+impl<T: frame_system::Trait + 'static + System, P, S: 'static, V> XtBuilder<T, P, S, V>
 where
     P: Pair,
-    <T as paint_system::Trait>::Call: Encode,
+    <T as frame_system::Trait>::Call: Encode,
 {
-    /// Sets the module call to a new value of the [paint_system::Trait::Call] type associated with
+    /// Sets the module call to a new value of the [frame_system::Trait::Call] type associated with
     /// the runtime.
     pub fn set_system_call(
         &self,
-        call: impl Into<<T as paint_system::Trait>::Call>,
+        call: impl Into<<T as frame_system::Trait>::Call>,
     ) -> XtBuilder<T, P, S, Valid> {
         let call = Ok(Encoded(call.into().encode()));
         XtBuilder {
diff --git a/subxt/src/metadata.rs b/subxt/src/metadata.rs
index 8f8e46fe..e625aafe 100644
--- a/subxt/src/metadata.rs
+++ b/subxt/src/metadata.rs
@@ -18,7 +18,7 @@ use std::{
     marker::PhantomData,
     str::FromStr,
 };
-use substrate_primitives::storage::StorageKey;
+use sp_core::storage::StorageKey;
 
 #[derive(Debug, Clone, derive_more::Display)]
 pub enum MetadataError {
@@ -174,14 +174,14 @@ impl<K: Encode, V: Decode + Clone> StorageMap<K, V> {
         bytes.extend(key.encode());
         let hash = match self.hasher {
             StorageHasher::Blake2_128 => {
-                substrate_primitives::blake2_128(&bytes).to_vec()
+                sp_core::blake2_128(&bytes).to_vec()
             }
             StorageHasher::Blake2_256 => {
-                substrate_primitives::blake2_256(&bytes).to_vec()
+                sp_core::blake2_256(&bytes).to_vec()
             }
-            StorageHasher::Twox128 => substrate_primitives::twox_128(&bytes).to_vec(),
-            StorageHasher::Twox256 => substrate_primitives::twox_256(&bytes).to_vec(),
-            StorageHasher::Twox64Concat => substrate_primitives::twox_64(&bytes).to_vec(),
+            StorageHasher::Twox128 => sp_core::twox_128(&bytes).to_vec(),
+            StorageHasher::Twox256 => sp_core::twox_256(&bytes).to_vec(),
+            StorageHasher::Twox64Concat => sp_core::twox_64(&bytes).to_vec(),
         };
         StorageKey(hash)
     }
@@ -281,7 +281,7 @@ impl TryFrom<RuntimeMetadataPrefixed> for Metadata {
             Err(Error::InvalidPrefix)?;
         }
         let meta = match metadata.1 {
-            RuntimeMetadata::V8(meta) => meta,
+            RuntimeMetadata::V9(meta) => meta,
             _ => Err(Error::InvalidVersion)?,
         };
         let mut modules = HashMap::new();
diff --git a/subxt/src/rpc.rs b/subxt/src/rpc.rs
index 3eaddac7..4ad4ddc8 100644
--- a/subxt/src/rpc.rs
+++ b/subxt/src/rpc.rs
@@ -17,7 +17,7 @@
 use crate::{
     error::Error,
     metadata::Metadata,
-    paint::{
+    frame::{
         balances::Balances,
         system::System,
     },
@@ -39,15 +39,19 @@ use runtime_primitives::{
     },
     OpaqueExtrinsic,
 };
-use sr_version::RuntimeVersion;
+use sp_version::RuntimeVersion;
 use std::convert::TryInto;
-use substrate_primitives::storage::StorageKey;
-use substrate_rpc_api::{
+use sp_core::storage::StorageKey;
+use sc_rpc_api::{
     author::AuthorClient,
     chain::ChainClient,
     state::StateClient,
 };
-use substrate_rpc_primitives::number::NumberOrHex;
+use sp_rpc::{
+    list::ListOrValue,
+    number::NumberOrHex,
+};
+use txpool_api::TransactionStatus;
 
 pub type ChainBlock<T> = SignedBlock<Block<<T as System>::Header, OpaqueExtrinsic>>;
 pub type BlockNumber<T> = NumberOrHex<<T as System>::BlockNumber>;
@@ -94,10 +98,15 @@ impl<T: System> Rpc<T> {
     pub fn genesis_hash(&self) -> impl Future<Item = T::Hash, Error = Error> {
         let block_zero = T::BlockNumber::min_value();
         self.chain
-            .block_hash(Some(NumberOrHex::Number(block_zero)))
+            .block_hash(Some(ListOrValue::Value(NumberOrHex::Number(block_zero))))
             .map_err(Into::into)
-            .and_then(|genesis_hash| {
-                future::result(genesis_hash.ok_or("Genesis hash not found".into()))
+            .and_then(|list_or_value| {
+                future::result(
+                    match list_or_value {
+                        ListOrValue::Value(genesis_hash) => genesis_hash.ok_or_else(|| "Genesis hash not found".into()),
+                        ListOrValue::List(_) => Err("Expected a Value, got a List".into()),
+                    }
+                )
             })
     }
 
@@ -115,9 +124,17 @@ impl<T: System> Rpc<T> {
     /// Get a block hash, returns hash of latest block by default
     pub fn block_hash(
         &self,
-        hash: Option<BlockNumber<T>>,
+        block_number: Option<BlockNumber<T>>,
     ) -> impl Future<Item = Option<T::Hash>, Error = Error> {
-        self.chain.block_hash(hash).map_err(Into::into)
+        self.chain
+            .block_hash(block_number.map(ListOrValue::Value))
+            .map_err(Into::into)
+            .and_then(|list_or_value| {
+                match list_or_value {
+                    ListOrValue::Value(hash) => Ok(hash),
+                    ListOrValue::List(_) => Err("Expected a Value, got a List".into()),
+                }
+            })
     }
 
     /// Get a Block
@@ -145,11 +162,10 @@ use futures::{
 };
 use jsonrpc_core_client::TypedSubscriptionStream;
 use runtime_primitives::traits::Hash;
-use substrate_primitives::{
+use sp_core::{
     storage::StorageChangeSet,
     twox_128,
 };
-use txpool::watcher::Status;
 
 type MapClosure<T> = Box<dyn Fn(T) -> T + Send>;
 pub type MapStream<T> = stream::Map<TypedSubscriptionStream<T>, MapClosure<T>>;
@@ -239,15 +255,15 @@ impl<T: System + Balances + 'static> Rpc<T> {
                             log::info!("received status {:?}", status);
                             match status {
                                 // ignore in progress extrinsic for now
-                                Status::Future | Status::Ready | Status::Broadcast(_) => {
+                                TransactionStatus::Future | TransactionStatus::Ready | TransactionStatus::Broadcast(_) => {
                                     None
                                 }
-                                Status::Finalized(block_hash) => Some(Ok(block_hash)),
-                                Status::Usurped(_) => {
+                                TransactionStatus::Finalized(block_hash) => Some(Ok(block_hash)),
+                                TransactionStatus::Usurped(_) => {
                                     Some(Err("Extrinsic Usurped".into()))
                                 }
-                                Status::Dropped => Some(Err("Extrinsic Dropped".into())),
-                                Status::Invalid => Some(Err("Extrinsic Invalid".into())),
+                                TransactionStatus::Dropped => Some(Err("Extrinsic Dropped".into())),
+                                TransactionStatus::Invalid => Some(Err("Extrinsic Invalid".into())),
                             }
                         })
                         .into_future()
@@ -294,7 +310,7 @@ pub struct ExtrinsicSuccess<T: System> {
     /// Extrinsic hash.
     pub extrinsic: T::Hash,
     /// Raw runtime events, can be decoded by the caller.
-    pub events: Vec<paint_system::EventRecord<T::Event, T::Hash>>,
+    pub events: Vec<frame_system::EventRecord<T::Event, T::Hash>>,
 }
 
 /// Waits for events for the block triggered by the extrinsic
diff --git a/subxt/src/runtimes.rs b/subxt/src/runtimes.rs
index 6dd5c849..ef1dfeb8 100644
--- a/subxt/src/runtimes.rs
+++ b/subxt/src/runtimes.rs
@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with substrate-subxt.  If not, see <http://www.gnu.org/licenses/>.
 
-use crate::paint::{
+use crate::frame::{
     balances::Balances,
     contracts::Contracts,
     system::System,
@@ -41,10 +41,10 @@ pub struct DefaultNodeRuntime;
 impl System for DefaultNodeRuntime {
     type Index = u32;
     type BlockNumber = u32;
-    type Hash = substrate_primitives::H256;
+    type Hash = sp_core::H256;
     type Hashing = BlakeTwo256;
     type AccountId = <<MultiSignature as Verify>::Signer as IdentifyAccount>::AccountId;
-    type Address = paint_indices::address::Address<Self::AccountId, u32>;
+    type Address = pallet_indices::address::Address<Self::AccountId, u32>;
     type Header = Header<Self::BlockNumber, BlakeTwo256>;
     type Event = ();
 }