diff --git a/Cargo.lock b/Cargo.lock
index 7b4a648c5409..c1cb0617f544 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1267,7 +1267,7 @@ checksum = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3"
 [[package]]
 name = "fork-tree"
 version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#f1d7d1d4d4f648536eefce6eefda6d0d2d1abb63"
+source = "git+https://github.com/paritytech/substrate#b0efaa2cd7f4ff7f4b6b57502ee3a17193f13819"
 dependencies = [
  "parity-scale-codec",
 ]
@@ -1275,12 +1275,13 @@ dependencies = [
 [[package]]
 name = "frame-benchmarking"
 version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#f1d7d1d4d4f648536eefce6eefda6d0d2d1abb63"
+source = "git+https://github.com/paritytech/substrate#b0efaa2cd7f4ff7f4b6b57502ee3a17193f13819"
 dependencies = [
  "frame-support",
  "frame-system",
  "linregress",
  "parity-scale-codec",
+ "paste",
  "sp-api",
  "sp-io",
  "sp-runtime",
@@ -1291,7 +1292,7 @@ dependencies = [
 [[package]]
 name = "frame-benchmarking-cli"
 version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#f1d7d1d4d4f648536eefce6eefda6d0d2d1abb63"
+source = "git+https://github.com/paritytech/substrate#b0efaa2cd7f4ff7f4b6b57502ee3a17193f13819"
 dependencies = [
  "frame-benchmarking",
  "parity-scale-codec",
@@ -1310,7 +1311,7 @@ dependencies = [
 [[package]]
 name = "frame-executive"
 version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#f1d7d1d4d4f648536eefce6eefda6d0d2d1abb63"
+source = "git+https://github.com/paritytech/substrate#b0efaa2cd7f4ff7f4b6b57502ee3a17193f13819"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -1323,7 +1324,7 @@ dependencies = [
 [[package]]
 name = "frame-metadata"
 version = "11.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#f1d7d1d4d4f648536eefce6eefda6d0d2d1abb63"
+source = "git+https://github.com/paritytech/substrate#b0efaa2cd7f4ff7f4b6b57502ee3a17193f13819"
 dependencies = [
  "parity-scale-codec",
  "serde",
@@ -1334,7 +1335,7 @@ dependencies = [
 [[package]]
 name = "frame-support"
 version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#f1d7d1d4d4f648536eefce6eefda6d0d2d1abb63"
+source = "git+https://github.com/paritytech/substrate#b0efaa2cd7f4ff7f4b6b57502ee3a17193f13819"
 dependencies = [
  "bitmask",
  "frame-metadata",
@@ -1358,7 +1359,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural"
 version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#f1d7d1d4d4f648536eefce6eefda6d0d2d1abb63"
+source = "git+https://github.com/paritytech/substrate#b0efaa2cd7f4ff7f4b6b57502ee3a17193f13819"
 dependencies = [
  "frame-support-procedural-tools",
  "proc-macro2 1.0.9",
@@ -1369,7 +1370,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural-tools"
 version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#f1d7d1d4d4f648536eefce6eefda6d0d2d1abb63"
+source = "git+https://github.com/paritytech/substrate#b0efaa2cd7f4ff7f4b6b57502ee3a17193f13819"
 dependencies = [
  "frame-support-procedural-tools-derive",
  "proc-macro-crate",
@@ -1381,7 +1382,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural-tools-derive"
 version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#f1d7d1d4d4f648536eefce6eefda6d0d2d1abb63"
+source = "git+https://github.com/paritytech/substrate#b0efaa2cd7f4ff7f4b6b57502ee3a17193f13819"
 dependencies = [
  "proc-macro2 1.0.9",
  "quote 1.0.3",
@@ -1391,7 +1392,7 @@ dependencies = [
 [[package]]
 name = "frame-system"
 version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#f1d7d1d4d4f648536eefce6eefda6d0d2d1abb63"
+source = "git+https://github.com/paritytech/substrate#b0efaa2cd7f4ff7f4b6b57502ee3a17193f13819"
 dependencies = [
  "frame-support",
  "impl-trait-for-tuples",
@@ -1407,7 +1408,7 @@ dependencies = [
 [[package]]
 name = "frame-system-rpc-runtime-api"
 version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#f1d7d1d4d4f648536eefce6eefda6d0d2d1abb63"
+source = "git+https://github.com/paritytech/substrate#b0efaa2cd7f4ff7f4b6b57502ee3a17193f13819"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -3376,7 +3377,7 @@ dependencies = [
 [[package]]
 name = "pallet-authority-discovery"
 version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#f1d7d1d4d4f648536eefce6eefda6d0d2d1abb63"
+source = "git+https://github.com/paritytech/substrate#b0efaa2cd7f4ff7f4b6b57502ee3a17193f13819"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3394,7 +3395,7 @@ dependencies = [
 [[package]]
 name = "pallet-authorship"
 version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#f1d7d1d4d4f648536eefce6eefda6d0d2d1abb63"
+source = "git+https://github.com/paritytech/substrate#b0efaa2cd7f4ff7f4b6b57502ee3a17193f13819"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3411,7 +3412,7 @@ dependencies = [
 [[package]]
 name = "pallet-babe"
 version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#f1d7d1d4d4f648536eefce6eefda6d0d2d1abb63"
+source = "git+https://github.com/paritytech/substrate#b0efaa2cd7f4ff7f4b6b57502ee3a17193f13819"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3432,7 +3433,7 @@ dependencies = [
 [[package]]
 name = "pallet-balances"
 version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#f1d7d1d4d4f648536eefce6eefda6d0d2d1abb63"
+source = "git+https://github.com/paritytech/substrate#b0efaa2cd7f4ff7f4b6b57502ee3a17193f13819"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -3447,7 +3448,7 @@ dependencies = [
 [[package]]
 name = "pallet-collective"
 version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#f1d7d1d4d4f648536eefce6eefda6d0d2d1abb63"
+source = "git+https://github.com/paritytech/substrate#b0efaa2cd7f4ff7f4b6b57502ee3a17193f13819"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -3463,7 +3464,7 @@ dependencies = [
 [[package]]
 name = "pallet-democracy"
 version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#f1d7d1d4d4f648536eefce6eefda6d0d2d1abb63"
+source = "git+https://github.com/paritytech/substrate#b0efaa2cd7f4ff7f4b6b57502ee3a17193f13819"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -3478,7 +3479,7 @@ dependencies = [
 [[package]]
 name = "pallet-elections-phragmen"
 version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#f1d7d1d4d4f648536eefce6eefda6d0d2d1abb63"
+source = "git+https://github.com/paritytech/substrate#b0efaa2cd7f4ff7f4b6b57502ee3a17193f13819"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3492,7 +3493,7 @@ dependencies = [
 [[package]]
 name = "pallet-finality-tracker"
 version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#f1d7d1d4d4f648536eefce6eefda6d0d2d1abb63"
+source = "git+https://github.com/paritytech/substrate#b0efaa2cd7f4ff7f4b6b57502ee3a17193f13819"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3508,7 +3509,7 @@ dependencies = [
 [[package]]
 name = "pallet-grandpa"
 version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#f1d7d1d4d4f648536eefce6eefda6d0d2d1abb63"
+source = "git+https://github.com/paritytech/substrate#b0efaa2cd7f4ff7f4b6b57502ee3a17193f13819"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3526,7 +3527,7 @@ dependencies = [
 [[package]]
 name = "pallet-identity"
 version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#f1d7d1d4d4f648536eefce6eefda6d0d2d1abb63"
+source = "git+https://github.com/paritytech/substrate#b0efaa2cd7f4ff7f4b6b57502ee3a17193f13819"
 dependencies = [
  "enumflags2",
  "frame-benchmarking",
@@ -3542,7 +3543,7 @@ dependencies = [
 [[package]]
 name = "pallet-im-online"
 version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#f1d7d1d4d4f648536eefce6eefda6d0d2d1abb63"
+source = "git+https://github.com/paritytech/substrate#b0efaa2cd7f4ff7f4b6b57502ee3a17193f13819"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3561,7 +3562,7 @@ dependencies = [
 [[package]]
 name = "pallet-indices"
 version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#f1d7d1d4d4f648536eefce6eefda6d0d2d1abb63"
+source = "git+https://github.com/paritytech/substrate#b0efaa2cd7f4ff7f4b6b57502ee3a17193f13819"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3577,7 +3578,7 @@ dependencies = [
 [[package]]
 name = "pallet-membership"
 version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#f1d7d1d4d4f648536eefce6eefda6d0d2d1abb63"
+source = "git+https://github.com/paritytech/substrate#b0efaa2cd7f4ff7f4b6b57502ee3a17193f13819"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3591,7 +3592,7 @@ dependencies = [
 [[package]]
 name = "pallet-nicks"
 version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#f1d7d1d4d4f648536eefce6eefda6d0d2d1abb63"
+source = "git+https://github.com/paritytech/substrate#b0efaa2cd7f4ff7f4b6b57502ee3a17193f13819"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3605,7 +3606,7 @@ dependencies = [
 [[package]]
 name = "pallet-offences"
 version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#f1d7d1d4d4f648536eefce6eefda6d0d2d1abb63"
+source = "git+https://github.com/paritytech/substrate#b0efaa2cd7f4ff7f4b6b57502ee3a17193f13819"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3620,7 +3621,7 @@ dependencies = [
 [[package]]
 name = "pallet-randomness-collective-flip"
 version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#f1d7d1d4d4f648536eefce6eefda6d0d2d1abb63"
+source = "git+https://github.com/paritytech/substrate#b0efaa2cd7f4ff7f4b6b57502ee3a17193f13819"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3633,7 +3634,7 @@ dependencies = [
 [[package]]
 name = "pallet-recovery"
 version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#f1d7d1d4d4f648536eefce6eefda6d0d2d1abb63"
+source = "git+https://github.com/paritytech/substrate#b0efaa2cd7f4ff7f4b6b57502ee3a17193f13819"
 dependencies = [
  "enumflags2",
  "frame-support",
@@ -3648,7 +3649,7 @@ dependencies = [
 [[package]]
 name = "pallet-scheduler"
 version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#f1d7d1d4d4f648536eefce6eefda6d0d2d1abb63"
+source = "git+https://github.com/paritytech/substrate#b0efaa2cd7f4ff7f4b6b57502ee3a17193f13819"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -3663,7 +3664,7 @@ dependencies = [
 [[package]]
 name = "pallet-session"
 version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#f1d7d1d4d4f648536eefce6eefda6d0d2d1abb63"
+source = "git+https://github.com/paritytech/substrate#b0efaa2cd7f4ff7f4b6b57502ee3a17193f13819"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3681,7 +3682,7 @@ dependencies = [
 [[package]]
 name = "pallet-society"
 version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#f1d7d1d4d4f648536eefce6eefda6d0d2d1abb63"
+source = "git+https://github.com/paritytech/substrate#b0efaa2cd7f4ff7f4b6b57502ee3a17193f13819"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3696,7 +3697,7 @@ dependencies = [
 [[package]]
 name = "pallet-staking"
 version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#f1d7d1d4d4f648536eefce6eefda6d0d2d1abb63"
+source = "git+https://github.com/paritytech/substrate#b0efaa2cd7f4ff7f4b6b57502ee3a17193f13819"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3717,7 +3718,7 @@ dependencies = [
 [[package]]
 name = "pallet-staking-reward-curve"
 version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#f1d7d1d4d4f648536eefce6eefda6d0d2d1abb63"
+source = "git+https://github.com/paritytech/substrate#b0efaa2cd7f4ff7f4b6b57502ee3a17193f13819"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2 1.0.9",
@@ -3728,7 +3729,7 @@ dependencies = [
 [[package]]
 name = "pallet-sudo"
 version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#f1d7d1d4d4f648536eefce6eefda6d0d2d1abb63"
+source = "git+https://github.com/paritytech/substrate#b0efaa2cd7f4ff7f4b6b57502ee3a17193f13819"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3742,7 +3743,7 @@ dependencies = [
 [[package]]
 name = "pallet-timestamp"
 version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#f1d7d1d4d4f648536eefce6eefda6d0d2d1abb63"
+source = "git+https://github.com/paritytech/substrate#b0efaa2cd7f4ff7f4b6b57502ee3a17193f13819"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -3759,7 +3760,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment"
 version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#f1d7d1d4d4f648536eefce6eefda6d0d2d1abb63"
+source = "git+https://github.com/paritytech/substrate#b0efaa2cd7f4ff7f4b6b57502ee3a17193f13819"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3772,7 +3773,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment-rpc"
 version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#f1d7d1d4d4f648536eefce6eefda6d0d2d1abb63"
+source = "git+https://github.com/paritytech/substrate#b0efaa2cd7f4ff7f4b6b57502ee3a17193f13819"
 dependencies = [
  "jsonrpc-core",
  "jsonrpc-core-client",
@@ -3790,7 +3791,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment-rpc-runtime-api"
 version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#f1d7d1d4d4f648536eefce6eefda6d0d2d1abb63"
+source = "git+https://github.com/paritytech/substrate#b0efaa2cd7f4ff7f4b6b57502ee3a17193f13819"
 dependencies = [
  "frame-support",
  "parity-scale-codec",
@@ -3803,7 +3804,7 @@ dependencies = [
 [[package]]
 name = "pallet-treasury"
 version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#f1d7d1d4d4f648536eefce6eefda6d0d2d1abb63"
+source = "git+https://github.com/paritytech/substrate#b0efaa2cd7f4ff7f4b6b57502ee3a17193f13819"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3817,7 +3818,7 @@ dependencies = [
 [[package]]
 name = "pallet-utility"
 version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#f1d7d1d4d4f648536eefce6eefda6d0d2d1abb63"
+source = "git+https://github.com/paritytech/substrate#b0efaa2cd7f4ff7f4b6b57502ee3a17193f13819"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3832,7 +3833,7 @@ dependencies = [
 [[package]]
 name = "pallet-vesting"
 version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#f1d7d1d4d4f648536eefce6eefda6d0d2d1abb63"
+source = "git+https://github.com/paritytech/substrate#b0efaa2cd7f4ff7f4b6b57502ee3a17193f13819"
 dependencies = [
  "enumflags2",
  "frame-support",
@@ -4104,6 +4105,12 @@ version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6"
 
+[[package]]
+name = "platforms"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "feb3b2b1033b8a60b4da6ee470325f887758c95d5320f52f9ce0df055a55940e"
+
 [[package]]
 name = "polkadot"
 version = "0.7.29-pre1"
@@ -4114,7 +4121,6 @@ dependencies = [
  "parity-util-mem",
  "polkadot-cli",
  "polkadot-service",
- "vergen",
 ]
 
 [[package]]
@@ -4157,11 +4163,13 @@ dependencies = [
  "sc-client-api",
  "sc-client-db",
  "sc-executor",
+ "sc-service",
  "sp-api",
  "sp-core",
  "sp-runtime",
  "structopt",
  "substrate-browser-utils",
+ "substrate-build-script-utils",
  "tokio 0.2.13",
  "wasm-bindgen",
  "wasm-bindgen-futures",
@@ -5327,7 +5335,7 @@ dependencies = [
 [[package]]
 name = "sc-authority-discovery"
 version = "0.8.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#f1d7d1d4d4f648536eefce6eefda6d0d2d1abb63"
+source = "git+https://github.com/paritytech/substrate#b0efaa2cd7f4ff7f4b6b57502ee3a17193f13819"
 dependencies = [
  "bytes 0.5.4",
  "derive_more 0.99.3",
@@ -5354,7 +5362,7 @@ dependencies = [
 [[package]]
 name = "sc-block-builder"
 version = "0.8.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#f1d7d1d4d4f648536eefce6eefda6d0d2d1abb63"
+source = "git+https://github.com/paritytech/substrate#b0efaa2cd7f4ff7f4b6b57502ee3a17193f13819"
 dependencies = [
  "parity-scale-codec",
  "sc-client-api",
@@ -5370,7 +5378,7 @@ dependencies = [
 [[package]]
 name = "sc-chain-spec"
 version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#f1d7d1d4d4f648536eefce6eefda6d0d2d1abb63"
+source = "git+https://github.com/paritytech/substrate#b0efaa2cd7f4ff7f4b6b57502ee3a17193f13819"
 dependencies = [
  "impl-trait-for-tuples",
  "sc-chain-spec-derive",
@@ -5385,7 +5393,7 @@ dependencies = [
 [[package]]
 name = "sc-chain-spec-derive"
 version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#f1d7d1d4d4f648536eefce6eefda6d0d2d1abb63"
+source = "git+https://github.com/paritytech/substrate#b0efaa2cd7f4ff7f4b6b57502ee3a17193f13819"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2 1.0.9",
@@ -5396,7 +5404,7 @@ dependencies = [
 [[package]]
 name = "sc-cli"
 version = "0.8.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#f1d7d1d4d4f648536eefce6eefda6d0d2d1abb63"
+source = "git+https://github.com/paritytech/substrate#b0efaa2cd7f4ff7f4b6b57502ee3a17193f13819"
 dependencies = [
  "ansi_term 0.12.1",
  "app_dirs",
@@ -5437,7 +5445,7 @@ dependencies = [
 [[package]]
 name = "sc-client"
 version = "0.8.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#f1d7d1d4d4f648536eefce6eefda6d0d2d1abb63"
+source = "git+https://github.com/paritytech/substrate#b0efaa2cd7f4ff7f4b6b57502ee3a17193f13819"
 dependencies = [
  "derive_more 0.99.3",
  "fnv",
@@ -5472,7 +5480,7 @@ dependencies = [
 [[package]]
 name = "sc-client-api"
 version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#f1d7d1d4d4f648536eefce6eefda6d0d2d1abb63"
+source = "git+https://github.com/paritytech/substrate#b0efaa2cd7f4ff7f4b6b57502ee3a17193f13819"
 dependencies = [
  "derive_more 0.99.3",
  "fnv",
@@ -5506,7 +5514,7 @@ dependencies = [
 [[package]]
 name = "sc-client-db"
 version = "0.8.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#f1d7d1d4d4f648536eefce6eefda6d0d2d1abb63"
+source = "git+https://github.com/paritytech/substrate#b0efaa2cd7f4ff7f4b6b57502ee3a17193f13819"
 dependencies = [
  "hash-db",
  "kvdb",
@@ -5534,7 +5542,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-babe"
 version = "0.8.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#f1d7d1d4d4f648536eefce6eefda6d0d2d1abb63"
+source = "git+https://github.com/paritytech/substrate#b0efaa2cd7f4ff7f4b6b57502ee3a17193f13819"
 dependencies = [
  "derive_more 0.99.3",
  "fork-tree",
@@ -5576,7 +5584,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-epochs"
 version = "0.8.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#f1d7d1d4d4f648536eefce6eefda6d0d2d1abb63"
+source = "git+https://github.com/paritytech/substrate#b0efaa2cd7f4ff7f4b6b57502ee3a17193f13819"
 dependencies = [
  "fork-tree",
  "parity-scale-codec",
@@ -5589,7 +5597,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-slots"
 version = "0.8.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#f1d7d1d4d4f648536eefce6eefda6d0d2d1abb63"
+source = "git+https://github.com/paritytech/substrate#b0efaa2cd7f4ff7f4b6b57502ee3a17193f13819"
 dependencies = [
  "futures 0.3.4",
  "futures-timer 3.0.2",
@@ -5610,7 +5618,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-uncles"
 version = "0.8.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#f1d7d1d4d4f648536eefce6eefda6d0d2d1abb63"
+source = "git+https://github.com/paritytech/substrate#b0efaa2cd7f4ff7f4b6b57502ee3a17193f13819"
 dependencies = [
  "log 0.4.8",
  "sc-client-api",
@@ -5624,7 +5632,7 @@ dependencies = [
 [[package]]
 name = "sc-executor"
 version = "0.8.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#f1d7d1d4d4f648536eefce6eefda6d0d2d1abb63"
+source = "git+https://github.com/paritytech/substrate#b0efaa2cd7f4ff7f4b6b57502ee3a17193f13819"
 dependencies = [
  "derive_more 0.99.3",
  "lazy_static",
@@ -5651,7 +5659,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-common"
 version = "0.8.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#f1d7d1d4d4f648536eefce6eefda6d0d2d1abb63"
+source = "git+https://github.com/paritytech/substrate#b0efaa2cd7f4ff7f4b6b57502ee3a17193f13819"
 dependencies = [
  "derive_more 0.99.3",
  "log 0.4.8",
@@ -5667,7 +5675,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-wasmi"
 version = "0.8.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#f1d7d1d4d4f648536eefce6eefda6d0d2d1abb63"
+source = "git+https://github.com/paritytech/substrate#b0efaa2cd7f4ff7f4b6b57502ee3a17193f13819"
 dependencies = [
  "log 0.4.8",
  "parity-scale-codec",
@@ -5683,7 +5691,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-wasmtime"
 version = "0.8.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#f1d7d1d4d4f648536eefce6eefda6d0d2d1abb63"
+source = "git+https://github.com/paritytech/substrate#b0efaa2cd7f4ff7f4b6b57502ee3a17193f13819"
 dependencies = [
  "log 0.4.8",
  "parity-scale-codec",
@@ -5700,7 +5708,7 @@ dependencies = [
 [[package]]
 name = "sc-finality-grandpa"
 version = "0.8.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#f1d7d1d4d4f648536eefce6eefda6d0d2d1abb63"
+source = "git+https://github.com/paritytech/substrate#b0efaa2cd7f4ff7f4b6b57502ee3a17193f13819"
 dependencies = [
  "assert_matches",
  "finality-grandpa",
@@ -5736,7 +5744,7 @@ dependencies = [
 [[package]]
 name = "sc-informant"
 version = "0.8.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#f1d7d1d4d4f648536eefce6eefda6d0d2d1abb63"
+source = "git+https://github.com/paritytech/substrate#b0efaa2cd7f4ff7f4b6b57502ee3a17193f13819"
 dependencies = [
  "ansi_term 0.12.1",
  "futures 0.3.4",
@@ -5753,7 +5761,7 @@ dependencies = [
 [[package]]
 name = "sc-keystore"
 version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#f1d7d1d4d4f648536eefce6eefda6d0d2d1abb63"
+source = "git+https://github.com/paritytech/substrate#b0efaa2cd7f4ff7f4b6b57502ee3a17193f13819"
 dependencies = [
  "derive_more 0.99.3",
  "hex",
@@ -5768,7 +5776,7 @@ dependencies = [
 [[package]]
 name = "sc-network"
 version = "0.8.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#f1d7d1d4d4f648536eefce6eefda6d0d2d1abb63"
+source = "git+https://github.com/paritytech/substrate#b0efaa2cd7f4ff7f4b6b57502ee3a17193f13819"
 dependencies = [
  "bitflags",
  "bytes 0.5.4",
@@ -5820,7 +5828,7 @@ dependencies = [
 [[package]]
 name = "sc-network-gossip"
 version = "0.8.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#f1d7d1d4d4f648536eefce6eefda6d0d2d1abb63"
+source = "git+https://github.com/paritytech/substrate#b0efaa2cd7f4ff7f4b6b57502ee3a17193f13819"
 dependencies = [
  "futures 0.3.4",
  "futures-timer 3.0.2",
@@ -5836,7 +5844,7 @@ dependencies = [
 [[package]]
 name = "sc-network-test"
 version = "0.8.0-dev"
-source = "git+https://github.com/paritytech/substrate#f1d7d1d4d4f648536eefce6eefda6d0d2d1abb63"
+source = "git+https://github.com/paritytech/substrate#b0efaa2cd7f4ff7f4b6b57502ee3a17193f13819"
 dependencies = [
  "env_logger 0.7.1",
  "futures 0.3.4",
@@ -5862,7 +5870,7 @@ dependencies = [
 [[package]]
 name = "sc-offchain"
 version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#f1d7d1d4d4f648536eefce6eefda6d0d2d1abb63"
+source = "git+https://github.com/paritytech/substrate#b0efaa2cd7f4ff7f4b6b57502ee3a17193f13819"
 dependencies = [
  "bytes 0.5.4",
  "fnv",
@@ -5889,7 +5897,7 @@ dependencies = [
 [[package]]
 name = "sc-peerset"
 version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#f1d7d1d4d4f648536eefce6eefda6d0d2d1abb63"
+source = "git+https://github.com/paritytech/substrate#b0efaa2cd7f4ff7f4b6b57502ee3a17193f13819"
 dependencies = [
  "futures 0.3.4",
  "libp2p",
@@ -5902,7 +5910,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc"
 version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#f1d7d1d4d4f648536eefce6eefda6d0d2d1abb63"
+source = "git+https://github.com/paritytech/substrate#b0efaa2cd7f4ff7f4b6b57502ee3a17193f13819"
 dependencies = [
  "futures 0.3.4",
  "hash-db",
@@ -5934,7 +5942,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc-api"
 version = "0.8.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#f1d7d1d4d4f648536eefce6eefda6d0d2d1abb63"
+source = "git+https://github.com/paritytech/substrate#b0efaa2cd7f4ff7f4b6b57502ee3a17193f13819"
 dependencies = [
  "derive_more 0.99.3",
  "futures 0.3.4",
@@ -5957,7 +5965,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc-server"
 version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#f1d7d1d4d4f648536eefce6eefda6d0d2d1abb63"
+source = "git+https://github.com/paritytech/substrate#b0efaa2cd7f4ff7f4b6b57502ee3a17193f13819"
 dependencies = [
  "jsonrpc-core",
  "jsonrpc-http-server",
@@ -5972,7 +5980,7 @@ dependencies = [
 [[package]]
 name = "sc-service"
 version = "0.8.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#f1d7d1d4d4f648536eefce6eefda6d0d2d1abb63"
+source = "git+https://github.com/paritytech/substrate#b0efaa2cd7f4ff7f4b6b57502ee3a17193f13819"
 dependencies = [
  "derive_more 0.99.3",
  "exit-future",
@@ -6016,7 +6024,6 @@ dependencies = [
  "sp-utils",
  "substrate-prometheus-endpoint",
  "sysinfo",
- "target_info",
  "tracing",
  "wasm-timer",
 ]
@@ -6024,7 +6031,7 @@ dependencies = [
 [[package]]
 name = "sc-state-db"
 version = "0.8.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#f1d7d1d4d4f648536eefce6eefda6d0d2d1abb63"
+source = "git+https://github.com/paritytech/substrate#b0efaa2cd7f4ff7f4b6b57502ee3a17193f13819"
 dependencies = [
  "log 0.4.8",
  "parity-scale-codec",
@@ -6038,7 +6045,7 @@ dependencies = [
 [[package]]
 name = "sc-telemetry"
 version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#f1d7d1d4d4f648536eefce6eefda6d0d2d1abb63"
+source = "git+https://github.com/paritytech/substrate#b0efaa2cd7f4ff7f4b6b57502ee3a17193f13819"
 dependencies = [
  "bytes 0.5.4",
  "futures 0.3.4",
@@ -6060,7 +6067,7 @@ dependencies = [
 [[package]]
 name = "sc-tracing"
 version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#f1d7d1d4d4f648536eefce6eefda6d0d2d1abb63"
+source = "git+https://github.com/paritytech/substrate#b0efaa2cd7f4ff7f4b6b57502ee3a17193f13819"
 dependencies = [
  "erased-serde",
  "log 0.4.8",
@@ -6075,7 +6082,7 @@ dependencies = [
 [[package]]
 name = "sc-transaction-graph"
 version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#f1d7d1d4d4f648536eefce6eefda6d0d2d1abb63"
+source = "git+https://github.com/paritytech/substrate#b0efaa2cd7f4ff7f4b6b57502ee3a17193f13819"
 dependencies = [
  "derive_more 0.99.3",
  "futures 0.3.4",
@@ -6095,7 +6102,7 @@ dependencies = [
 [[package]]
 name = "sc-transaction-pool"
 version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#f1d7d1d4d4f648536eefce6eefda6d0d2d1abb63"
+source = "git+https://github.com/paritytech/substrate#b0efaa2cd7f4ff7f4b6b57502ee3a17193f13819"
 dependencies = [
  "derive_more 0.99.3",
  "futures 0.3.4",
@@ -6477,7 +6484,7 @@ dependencies = [
 [[package]]
 name = "sp-allocator"
 version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#f1d7d1d4d4f648536eefce6eefda6d0d2d1abb63"
+source = "git+https://github.com/paritytech/substrate#b0efaa2cd7f4ff7f4b6b57502ee3a17193f13819"
 dependencies = [
  "derive_more 0.99.3",
  "log 0.4.8",
@@ -6489,7 +6496,7 @@ dependencies = [
 [[package]]
 name = "sp-api"
 version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#f1d7d1d4d4f648536eefce6eefda6d0d2d1abb63"
+source = "git+https://github.com/paritytech/substrate#b0efaa2cd7f4ff7f4b6b57502ee3a17193f13819"
 dependencies = [
  "hash-db",
  "parity-scale-codec",
@@ -6504,7 +6511,7 @@ dependencies = [
 [[package]]
 name = "sp-api-proc-macro"
 version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#f1d7d1d4d4f648536eefce6eefda6d0d2d1abb63"
+source = "git+https://github.com/paritytech/substrate#b0efaa2cd7f4ff7f4b6b57502ee3a17193f13819"
 dependencies = [
  "blake2-rfc",
  "proc-macro-crate",
@@ -6516,7 +6523,7 @@ dependencies = [
 [[package]]
 name = "sp-application-crypto"
 version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#f1d7d1d4d4f648536eefce6eefda6d0d2d1abb63"
+source = "git+https://github.com/paritytech/substrate#b0efaa2cd7f4ff7f4b6b57502ee3a17193f13819"
 dependencies = [
  "parity-scale-codec",
  "serde",
@@ -6528,7 +6535,7 @@ dependencies = [
 [[package]]
 name = "sp-arithmetic"
 version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#f1d7d1d4d4f648536eefce6eefda6d0d2d1abb63"
+source = "git+https://github.com/paritytech/substrate#b0efaa2cd7f4ff7f4b6b57502ee3a17193f13819"
 dependencies = [
  "integer-sqrt",
  "num-traits 0.2.11",
@@ -6541,7 +6548,7 @@ dependencies = [
 [[package]]
 name = "sp-authority-discovery"
 version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#f1d7d1d4d4f648536eefce6eefda6d0d2d1abb63"
+source = "git+https://github.com/paritytech/substrate#b0efaa2cd7f4ff7f4b6b57502ee3a17193f13819"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -6553,7 +6560,7 @@ dependencies = [
 [[package]]
 name = "sp-authorship"
 version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#f1d7d1d4d4f648536eefce6eefda6d0d2d1abb63"
+source = "git+https://github.com/paritytech/substrate#b0efaa2cd7f4ff7f4b6b57502ee3a17193f13819"
 dependencies = [
  "parity-scale-codec",
  "sp-inherents",
@@ -6564,7 +6571,7 @@ dependencies = [
 [[package]]
 name = "sp-block-builder"
 version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#f1d7d1d4d4f648536eefce6eefda6d0d2d1abb63"
+source = "git+https://github.com/paritytech/substrate#b0efaa2cd7f4ff7f4b6b57502ee3a17193f13819"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -6576,7 +6583,7 @@ dependencies = [
 [[package]]
 name = "sp-blockchain"
 version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#f1d7d1d4d4f648536eefce6eefda6d0d2d1abb63"
+source = "git+https://github.com/paritytech/substrate#b0efaa2cd7f4ff7f4b6b57502ee3a17193f13819"
 dependencies = [
  "derive_more 0.99.3",
  "log 0.4.8",
@@ -6592,7 +6599,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus"
 version = "0.8.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#f1d7d1d4d4f648536eefce6eefda6d0d2d1abb63"
+source = "git+https://github.com/paritytech/substrate#b0efaa2cd7f4ff7f4b6b57502ee3a17193f13819"
 dependencies = [
  "derive_more 0.99.3",
  "futures 0.3.4",
@@ -6615,7 +6622,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-aura"
 version = "0.8.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#f1d7d1d4d4f648536eefce6eefda6d0d2d1abb63"
+source = "git+https://github.com/paritytech/substrate#b0efaa2cd7f4ff7f4b6b57502ee3a17193f13819"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -6629,7 +6636,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-babe"
 version = "0.8.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#f1d7d1d4d4f648536eefce6eefda6d0d2d1abb63"
+source = "git+https://github.com/paritytech/substrate#b0efaa2cd7f4ff7f4b6b57502ee3a17193f13819"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -6645,7 +6652,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-vrf"
 version = "0.8.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#f1d7d1d4d4f648536eefce6eefda6d0d2d1abb63"
+source = "git+https://github.com/paritytech/substrate#b0efaa2cd7f4ff7f4b6b57502ee3a17193f13819"
 dependencies = [
  "parity-scale-codec",
  "schnorrkel",
@@ -6657,7 +6664,7 @@ dependencies = [
 [[package]]
 name = "sp-core"
 version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#f1d7d1d4d4f648536eefce6eefda6d0d2d1abb63"
+source = "git+https://github.com/paritytech/substrate#b0efaa2cd7f4ff7f4b6b57502ee3a17193f13819"
 dependencies = [
  "base58",
  "blake2-rfc",
@@ -6697,7 +6704,7 @@ dependencies = [
 [[package]]
 name = "sp-debug-derive"
 version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#f1d7d1d4d4f648536eefce6eefda6d0d2d1abb63"
+source = "git+https://github.com/paritytech/substrate#b0efaa2cd7f4ff7f4b6b57502ee3a17193f13819"
 dependencies = [
  "proc-macro2 1.0.9",
  "quote 1.0.3",
@@ -6707,7 +6714,7 @@ dependencies = [
 [[package]]
 name = "sp-externalities"
 version = "0.8.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#f1d7d1d4d4f648536eefce6eefda6d0d2d1abb63"
+source = "git+https://github.com/paritytech/substrate#b0efaa2cd7f4ff7f4b6b57502ee3a17193f13819"
 dependencies = [
  "environmental",
  "sp-std",
@@ -6717,7 +6724,7 @@ dependencies = [
 [[package]]
 name = "sp-finality-grandpa"
 version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#f1d7d1d4d4f648536eefce6eefda6d0d2d1abb63"
+source = "git+https://github.com/paritytech/substrate#b0efaa2cd7f4ff7f4b6b57502ee3a17193f13819"
 dependencies = [
  "parity-scale-codec",
  "serde",
@@ -6730,7 +6737,7 @@ dependencies = [
 [[package]]
 name = "sp-finality-tracker"
 version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#f1d7d1d4d4f648536eefce6eefda6d0d2d1abb63"
+source = "git+https://github.com/paritytech/substrate#b0efaa2cd7f4ff7f4b6b57502ee3a17193f13819"
 dependencies = [
  "parity-scale-codec",
  "sp-inherents",
@@ -6740,7 +6747,7 @@ dependencies = [
 [[package]]
 name = "sp-inherents"
 version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#f1d7d1d4d4f648536eefce6eefda6d0d2d1abb63"
+source = "git+https://github.com/paritytech/substrate#b0efaa2cd7f4ff7f4b6b57502ee3a17193f13819"
 dependencies = [
  "derive_more 0.99.3",
  "parity-scale-codec",
@@ -6752,7 +6759,7 @@ dependencies = [
 [[package]]
 name = "sp-io"
 version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#f1d7d1d4d4f648536eefce6eefda6d0d2d1abb63"
+source = "git+https://github.com/paritytech/substrate#b0efaa2cd7f4ff7f4b6b57502ee3a17193f13819"
 dependencies = [
  "hash-db",
  "libsecp256k1",
@@ -6770,7 +6777,7 @@ dependencies = [
 [[package]]
 name = "sp-keyring"
 version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#f1d7d1d4d4f648536eefce6eefda6d0d2d1abb63"
+source = "git+https://github.com/paritytech/substrate#b0efaa2cd7f4ff7f4b6b57502ee3a17193f13819"
 dependencies = [
  "lazy_static",
  "sp-core",
@@ -6781,7 +6788,7 @@ dependencies = [
 [[package]]
 name = "sp-offchain"
 version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#f1d7d1d4d4f648536eefce6eefda6d0d2d1abb63"
+source = "git+https://github.com/paritytech/substrate#b0efaa2cd7f4ff7f4b6b57502ee3a17193f13819"
 dependencies = [
  "sp-api",
  "sp-runtime",
@@ -6790,7 +6797,7 @@ dependencies = [
 [[package]]
 name = "sp-panic-handler"
 version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#f1d7d1d4d4f648536eefce6eefda6d0d2d1abb63"
+source = "git+https://github.com/paritytech/substrate#b0efaa2cd7f4ff7f4b6b57502ee3a17193f13819"
 dependencies = [
  "backtrace",
  "log 0.4.8",
@@ -6799,7 +6806,7 @@ dependencies = [
 [[package]]
 name = "sp-phragmen"
 version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#f1d7d1d4d4f648536eefce6eefda6d0d2d1abb63"
+source = "git+https://github.com/paritytech/substrate#b0efaa2cd7f4ff7f4b6b57502ee3a17193f13819"
 dependencies = [
  "parity-scale-codec",
  "serde",
@@ -6811,7 +6818,7 @@ dependencies = [
 [[package]]
 name = "sp-phragmen-compact"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#f1d7d1d4d4f648536eefce6eefda6d0d2d1abb63"
+source = "git+https://github.com/paritytech/substrate#b0efaa2cd7f4ff7f4b6b57502ee3a17193f13819"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2 1.0.9",
@@ -6822,7 +6829,7 @@ dependencies = [
 [[package]]
 name = "sp-rpc"
 version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#f1d7d1d4d4f648536eefce6eefda6d0d2d1abb63"
+source = "git+https://github.com/paritytech/substrate#b0efaa2cd7f4ff7f4b6b57502ee3a17193f13819"
 dependencies = [
  "serde",
  "sp-core",
@@ -6831,7 +6838,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime"
 version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#f1d7d1d4d4f648536eefce6eefda6d0d2d1abb63"
+source = "git+https://github.com/paritytech/substrate#b0efaa2cd7f4ff7f4b6b57502ee3a17193f13819"
 dependencies = [
  "hash256-std-hasher",
  "impl-trait-for-tuples",
@@ -6852,7 +6859,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime-interface"
 version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#f1d7d1d4d4f648536eefce6eefda6d0d2d1abb63"
+source = "git+https://github.com/paritytech/substrate#b0efaa2cd7f4ff7f4b6b57502ee3a17193f13819"
 dependencies = [
  "parity-scale-codec",
  "primitive-types",
@@ -6866,7 +6873,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime-interface-proc-macro"
 version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#f1d7d1d4d4f648536eefce6eefda6d0d2d1abb63"
+source = "git+https://github.com/paritytech/substrate#b0efaa2cd7f4ff7f4b6b57502ee3a17193f13819"
 dependencies = [
  "Inflector",
  "proc-macro-crate",
@@ -6878,7 +6885,7 @@ dependencies = [
 [[package]]
 name = "sp-serializer"
 version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#f1d7d1d4d4f648536eefce6eefda6d0d2d1abb63"
+source = "git+https://github.com/paritytech/substrate#b0efaa2cd7f4ff7f4b6b57502ee3a17193f13819"
 dependencies = [
  "serde",
  "serde_json",
@@ -6887,7 +6894,7 @@ dependencies = [
 [[package]]
 name = "sp-session"
 version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#f1d7d1d4d4f648536eefce6eefda6d0d2d1abb63"
+source = "git+https://github.com/paritytech/substrate#b0efaa2cd7f4ff7f4b6b57502ee3a17193f13819"
 dependencies = [
  "sp-api",
  "sp-core",
@@ -6898,7 +6905,7 @@ dependencies = [
 [[package]]
 name = "sp-staking"
 version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#f1d7d1d4d4f648536eefce6eefda6d0d2d1abb63"
+source = "git+https://github.com/paritytech/substrate#b0efaa2cd7f4ff7f4b6b57502ee3a17193f13819"
 dependencies = [
  "parity-scale-codec",
  "sp-runtime",
@@ -6908,7 +6915,7 @@ dependencies = [
 [[package]]
 name = "sp-state-machine"
 version = "0.8.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#f1d7d1d4d4f648536eefce6eefda6d0d2d1abb63"
+source = "git+https://github.com/paritytech/substrate#b0efaa2cd7f4ff7f4b6b57502ee3a17193f13819"
 dependencies = [
  "hash-db",
  "log 0.4.8",
@@ -6927,12 +6934,12 @@ dependencies = [
 [[package]]
 name = "sp-std"
 version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#f1d7d1d4d4f648536eefce6eefda6d0d2d1abb63"
+source = "git+https://github.com/paritytech/substrate#b0efaa2cd7f4ff7f4b6b57502ee3a17193f13819"
 
 [[package]]
 name = "sp-storage"
 version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#f1d7d1d4d4f648536eefce6eefda6d0d2d1abb63"
+source = "git+https://github.com/paritytech/substrate#b0efaa2cd7f4ff7f4b6b57502ee3a17193f13819"
 dependencies = [
  "impl-serde 0.2.3",
  "serde",
@@ -6943,7 +6950,7 @@ dependencies = [
 [[package]]
 name = "sp-timestamp"
 version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#f1d7d1d4d4f648536eefce6eefda6d0d2d1abb63"
+source = "git+https://github.com/paritytech/substrate#b0efaa2cd7f4ff7f4b6b57502ee3a17193f13819"
 dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec",
@@ -6957,7 +6964,7 @@ dependencies = [
 [[package]]
 name = "sp-transaction-pool"
 version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#f1d7d1d4d4f648536eefce6eefda6d0d2d1abb63"
+source = "git+https://github.com/paritytech/substrate#b0efaa2cd7f4ff7f4b6b57502ee3a17193f13819"
 dependencies = [
  "derive_more 0.99.3",
  "futures 0.3.4",
@@ -6972,7 +6979,7 @@ dependencies = [
 [[package]]
 name = "sp-trie"
 version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#f1d7d1d4d4f648536eefce6eefda6d0d2d1abb63"
+source = "git+https://github.com/paritytech/substrate#b0efaa2cd7f4ff7f4b6b57502ee3a17193f13819"
 dependencies = [
  "hash-db",
  "memory-db",
@@ -6986,7 +6993,7 @@ dependencies = [
 [[package]]
 name = "sp-utils"
 version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#f1d7d1d4d4f648536eefce6eefda6d0d2d1abb63"
+source = "git+https://github.com/paritytech/substrate#b0efaa2cd7f4ff7f4b6b57502ee3a17193f13819"
 dependencies = [
  "futures 0.3.4",
  "futures-core",
@@ -6997,7 +7004,7 @@ dependencies = [
 [[package]]
 name = "sp-version"
 version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#f1d7d1d4d4f648536eefce6eefda6d0d2d1abb63"
+source = "git+https://github.com/paritytech/substrate#b0efaa2cd7f4ff7f4b6b57502ee3a17193f13819"
 dependencies = [
  "impl-serde 0.2.3",
  "parity-scale-codec",
@@ -7009,7 +7016,7 @@ dependencies = [
 [[package]]
 name = "sp-wasm-interface"
 version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#f1d7d1d4d4f648536eefce6eefda6d0d2d1abb63"
+source = "git+https://github.com/paritytech/substrate#b0efaa2cd7f4ff7f4b6b57502ee3a17193f13819"
 dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec",
@@ -7137,7 +7144,7 @@ dependencies = [
 [[package]]
 name = "substrate-browser-utils"
 version = "0.8.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#f1d7d1d4d4f648536eefce6eefda6d0d2d1abb63"
+source = "git+https://github.com/paritytech/substrate#b0efaa2cd7f4ff7f4b6b57502ee3a17193f13819"
 dependencies = [
  "chrono",
  "clear_on_drop",
@@ -7160,10 +7167,18 @@ dependencies = [
  "wasm-bindgen-futures",
 ]
 
+[[package]]
+name = "substrate-build-script-utils"
+version = "2.0.0-alpha.5"
+source = "git+https://github.com/paritytech/substrate#b0efaa2cd7f4ff7f4b6b57502ee3a17193f13819"
+dependencies = [
+ "platforms",
+]
+
 [[package]]
 name = "substrate-frame-rpc-system"
 version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#f1d7d1d4d4f648536eefce6eefda6d0d2d1abb63"
+source = "git+https://github.com/paritytech/substrate#b0efaa2cd7f4ff7f4b6b57502ee3a17193f13819"
 dependencies = [
  "frame-system-rpc-runtime-api",
  "futures 0.3.4",
@@ -7184,7 +7199,7 @@ dependencies = [
 [[package]]
 name = "substrate-prometheus-endpoint"
 version = "0.8.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#f1d7d1d4d4f648536eefce6eefda6d0d2d1abb63"
+source = "git+https://github.com/paritytech/substrate#b0efaa2cd7f4ff7f4b6b57502ee3a17193f13819"
 dependencies = [
  "async-std",
  "derive_more 0.99.3",
@@ -7198,7 +7213,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-client"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#f1d7d1d4d4f648536eefce6eefda6d0d2d1abb63"
+source = "git+https://github.com/paritytech/substrate#b0efaa2cd7f4ff7f4b6b57502ee3a17193f13819"
 dependencies = [
  "futures 0.3.4",
  "hash-db",
@@ -7218,7 +7233,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-runtime"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#f1d7d1d4d4f648536eefce6eefda6d0d2d1abb63"
+source = "git+https://github.com/paritytech/substrate#b0efaa2cd7f4ff7f4b6b57502ee3a17193f13819"
 dependencies = [
  "cfg-if",
  "frame-executive",
@@ -7257,7 +7272,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-runtime-client"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#f1d7d1d4d4f648536eefce6eefda6d0d2d1abb63"
+source = "git+https://github.com/paritytech/substrate#b0efaa2cd7f4ff7f4b6b57502ee3a17193f13819"
 dependencies = [
  "futures 0.3.4",
  "parity-scale-codec",
@@ -7275,7 +7290,7 @@ dependencies = [
 [[package]]
 name = "substrate-wasm-builder-runner"
 version = "1.0.5"
-source = "git+https://github.com/paritytech/substrate#f1d7d1d4d4f648536eefce6eefda6d0d2d1abb63"
+source = "git+https://github.com/paritytech/substrate#b0efaa2cd7f4ff7f4b6b57502ee3a17193f13819"
 
 [[package]]
 name = "substrate-wasm-builder-runner"
@@ -7456,12 +7471,6 @@ version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ab0e7238dcc7b40a7be719a25365910f6807bd864f4cce6b2e6b873658e2b19d"
 
-[[package]]
-name = "target_info"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c63f48baada5c52e65a29eef93ab4f8982681b67f9e8d29c7b05abcfec2b9ffe"
-
 [[package]]
 name = "tempfile"
 version = "3.1.0"
@@ -8119,16 +8128,6 @@ version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a"
 
-[[package]]
-name = "vergen"
-version = "3.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ce50d8996df1f85af15f2cd8d33daae6e479575123ef4314a51a70a230739cb"
-dependencies = [
- "bitflags",
- "chrono",
-]
-
 [[package]]
 name = "version_check"
 version = "0.9.1"
diff --git a/Cargo.toml b/Cargo.toml
index 2fe3d06ba2d3..10034f7ed07d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -6,7 +6,6 @@ path = "src/main.rs"
 name = "polkadot"
 version = "0.7.29-pre1"
 authors = ["Parity Technologies <admin@parity.io>"]
-build = "build.rs"
 edition = "2018"
 
 [dependencies]
@@ -15,9 +14,6 @@ futures = "0.3.4"
 service = { package = "polkadot-service", path = "service" }
 parity-util-mem = { version = "*", default-features = false, features = ["jemalloc-global"] }
 
-[build-dependencies]
-vergen = "3.0.4"
-
 [dev-dependencies]
 assert_cmd = "0.12"
 nix = "0.17"
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
index fc0ea15d5d0a..40eb07c106a2 100644
--- a/cli/Cargo.toml
+++ b/cli/Cargo.toml
@@ -2,7 +2,7 @@
 name = "polkadot-cli"
 version = "0.7.29-pre1"
 authors = ["Parity Technologies <admin@parity.io>"]
-description = "Polkadot node implementation in Rust."
+description = "Polkadot Relay-chain Client Node"
 edition = "2018"
 
 [package.metadata.wasm-pack.profile.release]
@@ -29,11 +29,15 @@ service = { package = "polkadot-service", path = "../service", default-features
 tokio = { version = "0.2.13", features = ["rt-threaded"], optional = true }
 frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "master", optional = true }
 sc-cli = { git = "https://github.com/paritytech/substrate", branch = "master", optional = true }
+sc-service = { git = "https://github.com/paritytech/substrate", branch = "master", optional = true }
 
 wasm-bindgen = { version = "0.2.57", optional = true }
 wasm-bindgen-futures = { version = "0.4.7", optional = true }
 browser-utils = { package = "substrate-browser-utils", git = "https://github.com/paritytech/substrate", branch = "master", optional = true }
 
+[build-dependencies]
+substrate-build-script-utils = { git = "https://github.com/paritytech/substrate", branch = "master" }
+
 [features]
 default = [ "wasmtime", "rocksdb", "cli" ]
 wasmtime = [ "sc-cli/wasmtime" ]
@@ -41,6 +45,7 @@ rocksdb = [ "service/rocksdb" ]
 cli = [
 	"tokio",
 	"sc-cli",
+	"sc-service",
 	"frame-benchmarking-cli",
 	"service/full-node",
 ]
diff --git a/build.rs b/cli/build.rs
similarity index 74%
rename from build.rs
rename to cli/build.rs
index efaf5533ad0d..a299afe20931 100644
--- a/build.rs
+++ b/cli/build.rs
@@ -14,13 +14,6 @@
 // You should have received a copy of the GNU General Public License
 // along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
 
-extern crate vergen;
-
-use vergen::{ConstantsFlags, generate_cargo_keys};
-
-const ERROR_MSG: &'static str = "Failed to generate metadata files";
-
 fn main() {
-	generate_cargo_keys(ConstantsFlags::all()).expect(ERROR_MSG);
-	println!("cargo:rerun-if-changed=.git/HEAD");
+	substrate_build_script_utils::generate_cargo_keys();
 }
diff --git a/cli/src/browser.rs b/cli/src/browser.rs
index 3f24cc79c400..6f3a4000843a 100644
--- a/cli/src/browser.rs
+++ b/cli/src/browser.rs
@@ -39,10 +39,10 @@ async fn start_inner(chain_spec: String, log_level: String) -> Result<Client, Bo
 	let config = browser_configuration(chain_spec).await?;
 
 	info!("Polkadot browser node");
-	info!("  version {}", config.full_version());
+	info!("  version {}", config.impl_version);
 	info!("  by Parity Technologies, 2017-2020");
-	info!("📋 Chain specification: {}", config.expect_chain_spec().name());
-	info!("🏷  Node name: {}", config.name);
+	info!("📋 Chain specification: {}", config.chain_spec.name());
+	info!("🏷  Node name: {}", config.network.node_name);
 	info!("👤 Role: {}", config.display_role());
 
 	// Create the service. This is the most heavy initialization step.
diff --git a/cli/src/chain_spec.rs b/cli/src/chain_spec.rs
deleted file mode 100644
index 850c0fc49765..000000000000
--- a/cli/src/chain_spec.rs
+++ /dev/null
@@ -1,88 +0,0 @@
-// Copyright 2017-2020 Parity Technologies (UK) Ltd.
-// This file is part of Polkadot.
-
-// Polkadot is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Polkadot is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Predefined chains.
-
-use service;
-
-/// The chain specification (this should eventually be replaced by a more general JSON-based chain
-/// specification).
-#[derive(Clone, Debug)]
-pub enum ChainSpec {
-	/// Whatever the current polkadot runtime is, with just Alice as an auth.
-	PolkadotDevelopment,
-	/// Whatever the current pokadot runtime is, with simple Alice/Bob auths.
-	PolkadotLocalTestnet,
-	/// The Kusama network.
-	Kusama,
-	/// Whatever the current kusama runtime is, with just Alice as an auth.
-	KusamaDevelopment,
-	/// The Westend network,
-	Westend,
-	/// Whatever the current polkadot runtime is with the "global testnet" defaults.
-	PolkadotStagingTestnet,
-	/// Whatever the current kusama runtime is with the "global testnet" defaults.
-	KusamaStagingTestnet,
-	/// Whatever the current kusama runtime is, with simple Alice/Bob auths.
-	KusamaLocalTestnet,
-}
-
-impl Default for ChainSpec {
-	fn default() -> Self {
-		ChainSpec::Kusama
-	}
-}
-
-/// Get a chain config from a spec setting.
-impl ChainSpec {
-	pub(crate) fn load(self) -> Result<Box<dyn service::ChainSpec>, String> {
-		Ok(match self {
-			ChainSpec::PolkadotDevelopment => Box::new(service::chain_spec::polkadot_development_config()),
-			ChainSpec::PolkadotLocalTestnet => Box::new(service::chain_spec::polkadot_local_testnet_config()),
-			ChainSpec::PolkadotStagingTestnet => Box::new(service::chain_spec::polkadot_staging_testnet_config()),
-			ChainSpec::KusamaDevelopment =>Box::new(service::chain_spec::kusama_development_config()),
-			ChainSpec::KusamaLocalTestnet => Box::new(service::chain_spec::kusama_local_testnet_config()),
-			ChainSpec::KusamaStagingTestnet => Box::new(service::chain_spec::kusama_staging_testnet_config()),
-			ChainSpec::Westend => Box::new(service::chain_spec::westend_config()?),
-			ChainSpec::Kusama => Box::new(service::chain_spec::kusama_config()?),
-		})
-	}
-
-	pub(crate) fn from(s: &str) -> Option<Self> {
-		match s {
-			"polkadot-dev" | "dev" => Some(ChainSpec::PolkadotDevelopment),
-			"polkadot-local" => Some(ChainSpec::PolkadotLocalTestnet),
-			"polkadot-staging" => Some(ChainSpec::PolkadotStagingTestnet),
-			"kusama-dev" => Some(ChainSpec::KusamaDevelopment),
-			"kusama-local" => Some(ChainSpec::KusamaLocalTestnet),
-			"kusama-staging" => Some(ChainSpec::KusamaStagingTestnet),
-			"kusama" => Some(ChainSpec::Kusama),
-			"westend" => Some(ChainSpec::Westend),
-			"" => Some(ChainSpec::default()),
-			_ => None,
-		}
-	}
-}
-
-/// Load the `ChainSpec` for the given `id`.
-/// `force_kusama` treats chain specs coming from a file as kusama specs.
-pub fn load_spec(id: &str, force_kusama: bool) -> Result<Box<dyn service::ChainSpec>, String> {
-	Ok(match ChainSpec::from(id) {
-		Some(spec) => spec.load()?,
-		None if force_kusama => Box::new(service::KusamaChainSpec::from_json_file(std::path::PathBuf::from(id))?),
-		None => Box::new(service::PolkadotChainSpec::from_json_file(std::path::PathBuf::from(id))?),
-	})
-}
diff --git a/cli/src/cli.rs b/cli/src/cli.rs
index 41ec21bcb701..0ec75afa2677 100644
--- a/cli/src/cli.rs
+++ b/cli/src/cli.rs
@@ -54,23 +54,6 @@ pub struct RunCmd {
 	/// Force using Kusama native runtime.
 	#[structopt(long = "force-kusama")]
 	pub force_kusama: bool,
-}
-
-#[allow(missing_docs)]
-#[derive(Debug, StructOpt, Clone)]
-#[structopt(settings = &[
-	structopt::clap::AppSettings::GlobalVersion,
-	structopt::clap::AppSettings::ArgsNegateSubcommands,
-	structopt::clap::AppSettings::SubcommandsNegateReqs,
-])]
-pub struct Cli {
-	#[allow(missing_docs)]
-	#[structopt(subcommand)]
-	pub subcommand: Option<Subcommand>,
-
-	#[allow(missing_docs)]
-	#[structopt(flatten)]
-	pub run: RunCmd,
 
 	#[allow(missing_docs)]
 	#[structopt(long = "enable-authority-discovery")]
@@ -85,3 +68,15 @@ pub struct Cli {
 	#[structopt(long = "grandpa-pause", number_of_values(2))]
 	pub grandpa_pause: Vec<u32>,
 }
+
+#[allow(missing_docs)]
+#[derive(Debug, StructOpt, Clone)]
+pub struct Cli {
+	#[allow(missing_docs)]
+	#[structopt(subcommand)]
+	pub subcommand: Option<Subcommand>,
+
+	#[allow(missing_docs)]
+	#[structopt(flatten)]
+	pub run: RunCmd,
+}
diff --git a/cli/src/command.rs b/cli/src/command.rs
index cf05e29d1dfa..38c9cbc9c008 100644
--- a/cli/src/command.rs
+++ b/cli/src/command.rs
@@ -18,44 +18,58 @@ use log::info;
 use sp_runtime::traits::BlakeTwo256;
 use service::{IsKusama, Block, self, RuntimeApiCollection, TFullClient};
 use sp_api::ConstructRuntimeApi;
+use sc_cli::{SubstrateCli, Result};
 use sc_executor::NativeExecutionDispatch;
-use crate::chain_spec::load_spec;
 use crate::cli::{Cli, Subcommand};
-use sc_cli::VersionInfo;
+
+impl SubstrateCli for Cli {
+	fn impl_name() -> &'static str { "parity-polkadot" }
+
+	fn impl_version() -> &'static str { env!("SUBSTRATE_CLI_IMPL_VERSION") }
+
+	fn description() -> &'static str { env!("CARGO_PKG_DESCRIPTION") }
+
+	fn author() -> &'static str { env!("CARGO_PKG_AUTHORS") }
+
+	fn support_url() -> &'static str { "https://github.com/paritytech/polkadot/issues/new" }
+
+	fn copyright_start_year() -> i32 { 2017 }
+
+	fn executable_name() -> &'static str { "polkadot" }
+
+	fn load_spec(&self, id: &str) -> std::result::Result<Box<dyn sc_service::ChainSpec>, String> {
+		Ok(match id {
+			"polkadot-dev" | "dev" => Box::new(service::chain_spec::polkadot_development_config()),
+			"polkadot-local" => Box::new(service::chain_spec::polkadot_local_testnet_config()),
+			"polkadot-staging" => Box::new(service::chain_spec::polkadot_staging_testnet_config()),
+			"kusama-dev" => Box::new(service::chain_spec::kusama_development_config()),
+			"kusama-local" => Box::new(service::chain_spec::kusama_local_testnet_config()),
+			"kusama-staging" => Box::new(service::chain_spec::kusama_staging_testnet_config()),
+			"westend" => Box::new(service::chain_spec::westend_config()?),
+			"kusama" | "" => Box::new(service::chain_spec::kusama_config()?),
+			path if self.run.force_kusama => {
+				Box::new(service::KusamaChainSpec::from_json_file(std::path::PathBuf::from(path))?)
+			},
+			path => Box::new(service::PolkadotChainSpec::from_json_file(std::path::PathBuf::from(path))?),
+		})
+	}
+}
 
 /// Parses polkadot specific CLI arguments and run the service.
-pub fn run(version: VersionInfo) -> sc_cli::Result<()> {
-	let opt = sc_cli::from_args::<Cli>(&version);
-
-	let mut config = service::Configuration::from_version(&version);
-	config.impl_name = "parity-polkadot";
-	let force_kusama = opt.run.force_kusama;
-
-	let grandpa_pause = if opt.grandpa_pause.is_empty() {
-		None
-	} else {
-		// should be enforced by cli parsing
-		assert_eq!(opt.grandpa_pause.len(), 2);
-		Some((opt.grandpa_pause[0], opt.grandpa_pause[1]))
-	};
-
-	match opt.subcommand {
+pub fn run() -> Result<()> {
+	let cli = Cli::from_args();
+
+	match &cli.subcommand {
 		None => {
-			opt.run.base.init(&version)?;
-			opt.run.base.update_config(
-				&mut config,
-				|id| load_spec(id, force_kusama),
-				&version
-			)?;
-
-			let is_kusama = config.expect_chain_spec().is_kusama();
-
-			info!("{}", version.name);
-			info!("  version {}", config.full_version());
-			info!("  by {}, 2017-2020", version.author);
-			info!("📋 Chain specification: {}", config.expect_chain_spec().name());
-			info!("🏷  Node name: {}", config.name);
-			info!("👤 Role: {}", config.display_role());
+			let runtime = cli.create_runner(&cli.run.base)?;
+			let config = runtime.config();
+			let is_kusama = config.chain_spec.is_kusama();
+			let authority_discovery_enabled = cli.run.authority_discovery_enabled;
+			let grandpa_pause = if cli.run.grandpa_pause.is_empty() {
+				None
+			} else {
+				Some((cli.run.grandpa_pause[0], cli.run.grandpa_pause[1]))
+			};
 
 			if is_kusama {
 				info!("⛓  Native runtime: {}", service::KusamaExecutor::native_version().runtime_version);
@@ -65,71 +79,73 @@ pub fn run(version: VersionInfo) -> sc_cli::Result<()> {
 				info!("     KUSAMA FOUNDATION      ");
 				info!("----------------------------");
 
-				run_service_until_exit::<
+				run_node::<
 					service::kusama_runtime::RuntimeApi,
 					service::KusamaExecutor,
 					service::kusama_runtime::UncheckedExtrinsic,
-				>(config, opt.authority_discovery_enabled, grandpa_pause)
+				>(runtime, authority_discovery_enabled, grandpa_pause)
 			} else {
 				info!("⛓  Native runtime: {}", service::PolkadotExecutor::native_version().runtime_version);
 
-				run_service_until_exit::<
+				run_node::<
 					service::polkadot_runtime::RuntimeApi,
 					service::PolkadotExecutor,
 					service::polkadot_runtime::UncheckedExtrinsic,
-				>(config, opt.authority_discovery_enabled, grandpa_pause)
+				>(runtime, authority_discovery_enabled, grandpa_pause)
 			}
 		},
-		Some(Subcommand::Base(cmd)) => {
-			cmd.init(&version)?;
-			cmd.update_config(
-				&mut config,
-				|id| load_spec(id, force_kusama),
-				&version
-			)?;
-
-			let is_kusama = config.expect_chain_spec().is_kusama();
+		Some(Subcommand::Base(subcommand)) => {
+			let runtime = cli.create_runner(subcommand)?;
+			let is_kusama = runtime.config().chain_spec.is_kusama();
 
 			if is_kusama {
-				cmd.run(config, service::new_chain_ops::<
-					service::kusama_runtime::RuntimeApi,
-					service::KusamaExecutor,
-					service::kusama_runtime::UncheckedExtrinsic,
-				>)
+				runtime.run_subcommand(subcommand, |config|
+					service::new_chain_ops::<
+						service::kusama_runtime::RuntimeApi,
+						service::KusamaExecutor,
+						service::kusama_runtime::UncheckedExtrinsic,
+					>(config)
+				)
 			} else {
-				cmd.run(config, service::new_chain_ops::<
-					service::polkadot_runtime::RuntimeApi,
-					service::PolkadotExecutor,
-					service::polkadot_runtime::UncheckedExtrinsic,
-				>)
+				runtime.run_subcommand(subcommand, |config|
+					service::new_chain_ops::<
+						service::polkadot_runtime::RuntimeApi,
+						service::PolkadotExecutor,
+						service::polkadot_runtime::UncheckedExtrinsic,
+					>(config)
+				)
 			}
 		},
-		Some(Subcommand::ValidationWorker(args)) => {
+		Some(Subcommand::ValidationWorker(cmd)) => {
 			sc_cli::init_logger("");
 
 			if cfg!(feature = "browser") {
 				Err(sc_cli::Error::Input("Cannot run validation worker in browser".into()))
 			} else {
 				#[cfg(not(feature = "browser"))]
-				service::run_validation_worker(&args.mem_id)?;
+				service::run_validation_worker(&cmd.mem_id)?;
 				Ok(())
 			}
 		},
 		Some(Subcommand::Benchmark(cmd)) => {
-			cmd.init(&version)?;
-			cmd.update_config(&mut config, |id| load_spec(id, force_kusama), &version)?;
-			let is_kusama = config.expect_chain_spec().is_kusama();
+			let runtime = cli.create_runner(cmd)?;
+			let is_kusama = runtime.config().chain_spec.is_kusama();
+
 			if is_kusama {
-				cmd.run::<service::kusama_runtime::Block, service::KusamaExecutor>(config)
+				runtime.sync_run(|config| {
+					cmd.run::<service::kusama_runtime::Block, service::KusamaExecutor>(config)
+				})
 			} else {
-				cmd.run::<service::polkadot_runtime::Block, service::PolkadotExecutor>(config)
+				runtime.sync_run(|config| {
+					cmd.run::<service::polkadot_runtime::Block, service::PolkadotExecutor>(config)
+				})
 			}
 		},
 	}
 }
 
-fn run_service_until_exit<R, D, E>(
-	config: service::Configuration,
+fn run_node<R, D, E>(
+	runtime: sc_cli::Runner<Cli>,
 	authority_discovery_enabled: bool,
 	grandpa_pause: Option<(u32, u32)>,
 ) -> sc_cli::Result<()>
@@ -151,26 +167,17 @@ where
 		TLightClient<R, D>
 	>,
 {
-	match config.role {
-		service::Role::Light =>
-			sc_cli::run_service_until_exit(
-				config,
-				|config| service::new_light::<R, D, E>(config),
-			),
-		_ =>
-			sc_cli::run_service_until_exit(
-				config,
-				|config| service::new_full::<R, D, E>(
-					config,
-					None,
-					None,
-					authority_discovery_enabled,
-					6000,
-					grandpa_pause,
-				)
-					.map(|(s, _)| s),
-			),
-	}
+	runtime.run_node(
+		|config| service::new_light::<R, D, E>(config),
+		|config| service::new_full::<R, D, E>(
+			config,
+			None,
+			None,
+			authority_discovery_enabled,
+			6000,
+			grandpa_pause,
+		).map(|(s, _)| s),
+	)
 }
 
 // We can't simply use `service::TLightClient` due to a
diff --git a/cli/src/lib.rs b/cli/src/lib.rs
index 0303c0ad8e9e..d8bc59ad1952 100644
--- a/cli/src/lib.rs
+++ b/cli/src/lib.rs
@@ -19,7 +19,6 @@
 #![warn(missing_docs)]
 #![warn(unused_extern_crates)]
 
-mod chain_spec;
 #[cfg(feature = "browser")]
 mod browser;
 #[cfg(feature = "cli")]
@@ -38,7 +37,5 @@ pub use cli::*;
 #[cfg(feature = "cli")]
 pub use command::*;
 
-pub use chain_spec::*;
-
 #[cfg(feature = "cli")]
-pub use sc_cli::{VersionInfo, Error, Result};
+pub use sc_cli::{Error, Result};
diff --git a/collator/src/lib.rs b/collator/src/lib.rs
index 9a5908f5cbb7..dca24e79481c 100644
--- a/collator/src/lib.rs
+++ b/collator/src/lib.rs
@@ -66,11 +66,13 @@ use polkadot_cli::{
 	ProvideRuntimeApi, AbstractService, ParachainHost, IsKusama,
 	service::{self, Role}
 };
-pub use polkadot_cli::{VersionInfo, load_spec, service::Configuration};
+pub use polkadot_cli::service::Configuration;
+pub use polkadot_cli::Cli;
 pub use polkadot_validation::SignedStatement;
 pub use polkadot_primitives::parachain::CollatorId;
 pub use sc_network::PeerId;
 pub use service::RuntimeApiCollection;
+pub use sc_cli::SubstrateCli;
 
 const COLLATION_TIMEOUT: Duration = Duration::from_secs(30);
 
@@ -348,7 +350,7 @@ where
 	P::ParachainContext: Send + 'static,
 	<P::ParachainContext as ParachainContext>::ProduceCandidate: Send,
 {
-	let is_kusama = config.expect_chain_spec().is_kusama();
+	let is_kusama = config.chain_spec.is_kusama();
 	match (is_kusama, &config.role) {
 		(_, Role::Light) => return Err(
 			polkadot_service::Error::Other("light nodes are unsupported as collator".into())
@@ -380,45 +382,6 @@ fn compute_targets(para_id: ParaId, session_keys: &[ValidatorId], roster: DutyRo
 		.collect()
 }
 
-/// Run a collator node with the given `RelayChainContext` and `ParachainContext`
-/// built by the given `BuildParachainContext` and arguments to the underlying polkadot node.
-///
-/// This function blocks until done.
-pub fn run_collator<P>(
-	build_parachain_context: P,
-	para_id: ParaId,
-	key: Arc<CollatorPair>,
-	config: Configuration,
-) -> polkadot_cli::Result<()> where
-	P: BuildParachainContext,
-	P::ParachainContext: Send + 'static,
-	<P::ParachainContext as ParachainContext>::ProduceCandidate: Send,
-{
-	match (config.expect_chain_spec().is_kusama(), &config.role) {
-		(_, Role::Light) => return Err(
-			polkadot_cli::Error::Input("light nodes are unsupported as collator".into())
-		).into(),
-		(true, _) =>
-			sc_cli::run_service_until_exit(config, |config| {
-				build_collator_service(
-					service::kusama_new_full(config, Some((key.public(), para_id)), None, false, 6000, None)?,
-					para_id,
-					key,
-					build_parachain_context,
-				)
-			}),
-		(false, _) =>
-			sc_cli::run_service_until_exit(config, |config| {
-				build_collator_service(
-					service::polkadot_new_full(config, Some((key.public(), para_id)), None, false, 6000, None)?,
-					para_id,
-					key,
-					build_parachain_context,
-				)
-			}),
-	}
-}
-
 #[cfg(test)]
 mod tests {
 	use super::*;
@@ -463,11 +426,15 @@ mod tests {
 	fn start_collator_is_send() {
 		fn check_send<T: Send>(_: T) {}
 
+		let cli = Cli::from_iter(&["-dev"]);
+		let task_executor = Arc::new(|_| unimplemented!());
+		let config = cli.create_configuration(&cli.run.base, task_executor).unwrap();
+
 		check_send(start_collator(
 			BuildDummyParachainContext,
 			0.into(),
 			Arc::new(CollatorPair::generate().0),
-			Default::default(),
+			config,
 		));
 	}
 }
diff --git a/network/test/src/lib.rs b/network/test/src/lib.rs
index 358d59cf5297..13ccbb659bfb 100644
--- a/network/test/src/lib.rs
+++ b/network/test/src/lib.rs
@@ -570,14 +570,18 @@ pub trait TestNetFactory: Sized {
 
 		let listen_addr = build_multiaddr![Memory(rand::random::<u64>())];
 
+		let mut network_config = NetworkConfiguration::new(
+			"test-node",
+			"test-client",
+			Default::default(),
+			&std::env::current_dir().expect("current directory must exist"),
+		);
+		network_config.listen_addresses = vec![listen_addr.clone()];
+		network_config.transport = TransportConfig::MemoryOnly;
 		let network = NetworkWorker::new(sc_network::config::Params {
 			role: Role::Full,
 			executor: None,
-			network_config: NetworkConfiguration {
-				listen_addresses: vec![listen_addr.clone()],
-				transport: TransportConfig::MemoryOnly,
-				..NetworkConfiguration::default()
-			},
+			network_config,
 			chain: client.clone(),
 			finality_proof_provider: self.make_finality_proof_provider(
 				PeersClient::Full(client.clone(), backend.clone()),
@@ -641,14 +645,18 @@ pub trait TestNetFactory: Sized {
 
 		let listen_addr = build_multiaddr![Memory(rand::random::<u64>())];
 
+		let mut network_config = NetworkConfiguration::new(
+			"test-node",
+			"test-client",
+			Default::default(),
+			&std::env::current_dir().expect("current directory must exist"),
+		);
+		network_config.listen_addresses = vec![listen_addr.clone()];
+		network_config.transport = TransportConfig::MemoryOnly;
 		let network = NetworkWorker::new(sc_network::config::Params {
 			role: Role::Full,
 			executor: None,
-			network_config: NetworkConfiguration {
-				listen_addresses: vec![listen_addr.clone()],
-				transport: TransportConfig::MemoryOnly,
-				..NetworkConfiguration::default()
-			},
+			network_config,
 			chain: client.clone(),
 			finality_proof_provider: self.make_finality_proof_provider(
 				PeersClient::Light(client.clone(), backend.clone())
diff --git a/parachain/test-parachains/adder/collator/src/main.rs b/parachain/test-parachains/adder/collator/src/main.rs
index a0ea9c247cc0..cc61dc2695e2 100644
--- a/parachain/test-parachains/adder/collator/src/main.rs
+++ b/parachain/test-parachains/adder/collator/src/main.rs
@@ -27,10 +27,10 @@ use primitives::{
 	parachain::{HeadData, BlockData, Id as ParaId, LocalValidationData, GlobalValidationSchedule},
 };
 use collator::{
-	InvalidHead, ParachainContext, Network, BuildParachainContext, load_spec, Configuration,
+	InvalidHead, ParachainContext, Network, BuildParachainContext, Cli, SubstrateCli,
 };
 use parking_lot::Mutex;
-use futures::future::{Ready, ok, err};
+use futures::future::{Ready, ok, err, TryFutureExt};
 
 const GENESIS: AdderHead = AdderHead {
 	number: 0,
@@ -111,7 +111,7 @@ impl BuildParachainContext for AdderContext {
 	}
 }
 
-fn main() {
+fn main() -> Result<(), Box<dyn std::error::Error>> {
 	let key = Arc::new(Pair::from_seed(&[1; 32]));
 	let id: ParaId = 100.into();
 
@@ -133,17 +133,16 @@ fn main() {
 		_network: None,
 	};
 
-	let mut config = Configuration::default();
-	config.chain_spec = Some(load_spec("dev", false).unwrap());
-
-	let res = collator::run_collator(
-		context,
-		id,
-		key,
-		config,
-	);
-
-	if let Err(e) = res {
-		println!("{}", e);
-	}
+	let cli = Cli::from_iter(&["-dev"]);
+	let runner = cli.create_runner(&cli.run.base)?;
+	runner.async_run(|config| {
+		collator::start_collator(
+			context,
+			id,
+			key,
+			config,
+		).map_err(|e| e.into())
+	})?;
+
+	Ok(())
 }
diff --git a/service/src/lib.rs b/service/src/lib.rs
index 247cdbe1535f..c95613d91220 100644
--- a/service/src/lib.rs
+++ b/service/src/lib.rs
@@ -35,7 +35,7 @@ pub use service::{
 	TFullClient, TLightClient, TFullBackend, TLightBackend, TFullCallExecutor, TLightCallExecutor,
 	Configuration, ChainSpec,
 };
-pub use service::config::{DatabaseConfig, PrometheusConfig, full_version_from_strs};
+pub use service::config::{DatabaseConfig, PrometheusConfig};
 pub use sc_executor::NativeExecutionDispatch;
 pub use sc_client::{ExecutionStrategy, CallExecutor, Client};
 pub use sc_client_api::backend::Backend;
@@ -113,7 +113,7 @@ pub trait IsKusama {
 	fn is_kusama(&self) -> bool;
 }
 
-impl IsKusama for &dyn ChainSpec {
+impl IsKusama for Box<dyn ChainSpec> {
 	fn is_kusama(&self) -> bool {
 		self.id().starts_with("kusama") || self.id().starts_with("ksm")
 	}
@@ -153,7 +153,7 @@ macro_rules! new_full_start {
 				let select_chain = select_chain.take()
 					.ok_or_else(|| service::Error::SelectChainRequired)?;
 
-				let grandpa_hard_forks = if config.expect_chain_spec().is_kusama() {
+				let grandpa_hard_forks = if config.chain_spec.is_kusama() {
 					grandpa_support::kusama_hard_forks()
 				} else {
 					Vec::new()
@@ -318,13 +318,13 @@ pub fn new_full<Runtime, Dispatch, Extrinsic>(
 	let is_authority = role.is_authority() && !is_collator;
 	let force_authoring = config.force_authoring;
 	let max_block_data_size = max_block_data_size;
-	let db_path = if let DatabaseConfig::Path { ref path, .. } = config.expect_database() {
+	let db_path = if let DatabaseConfig::Path { ref path, .. } = config.database {
 		path.clone()
 	} else {
 		return Err("Starting a Polkadot service with a custom database isn't supported".to_string().into());
 	};
 	let disable_grandpa = config.disable_grandpa;
-	let name = config.name.clone();
+	let name = config.network.node_name.clone();
 	let authority_discovery_enabled = authority_discovery_enabled;
 	let slot_duration = slot_duration;
 
diff --git a/src/main.rs b/src/main.rs
index db7cf33cb2cf..58f475471e5a 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -18,19 +18,6 @@
 
 #![warn(missing_docs)]
 
-use cli::VersionInfo;
-
-fn main() -> Result<(), cli::Error> {
-	let version = VersionInfo {
-		name: "Parity Polkadot",
-		commit: env!("VERGEN_SHA_SHORT"),
-		version: env!("CARGO_PKG_VERSION"),
-		executable_name: "polkadot",
-		author: "Parity Team <admin@parity.io>",
-		description: "Polkadot Relay-chain Client Node",
-		support_url: "https://github.com/paritytech/polkadot/issues/new",
-		copyright_start_year: 2017,
-	};
-
-	cli::run(version)
+fn main() -> cli::Result<()> {
+	cli::run()
 }