diff --git a/polkadot/Cargo.lock b/polkadot/Cargo.lock
index a84a806222..a8fe172ac7 100644
--- a/polkadot/Cargo.lock
+++ b/polkadot/Cargo.lock
@@ -1252,16 +1252,16 @@ checksum = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3"
 
 [[package]]
 name = "fork-tree"
-version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#0132d522dbbdaef4e11a772fe5987801b59964aa"
+version = "2.0.0-dev"
+source = "git+https://github.com/paritytech/substrate#88248c040fd0a0ff004f448fc8c47fdf000b653e"
 dependencies = [
  "parity-scale-codec",
 ]
 
 [[package]]
 name = "frame-benchmarking"
-version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#0132d522dbbdaef4e11a772fe5987801b59964aa"
+version = "2.0.0-dev"
+source = "git+https://github.com/paritytech/substrate#88248c040fd0a0ff004f448fc8c47fdf000b653e"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -1277,8 +1277,8 @@ dependencies = [
 
 [[package]]
 name = "frame-benchmarking-cli"
-version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#0132d522dbbdaef4e11a772fe5987801b59964aa"
+version = "2.0.0-dev"
+source = "git+https://github.com/paritytech/substrate#88248c040fd0a0ff004f448fc8c47fdf000b653e"
 dependencies = [
  "frame-benchmarking",
  "parity-scale-codec",
@@ -1296,8 +1296,8 @@ dependencies = [
 
 [[package]]
 name = "frame-executive"
-version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#0132d522dbbdaef4e11a772fe5987801b59964aa"
+version = "2.0.0-dev"
+source = "git+https://github.com/paritytech/substrate#88248c040fd0a0ff004f448fc8c47fdf000b653e"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -1309,8 +1309,8 @@ dependencies = [
 
 [[package]]
 name = "frame-metadata"
-version = "11.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#0132d522dbbdaef4e11a772fe5987801b59964aa"
+version = "11.0.0-dev"
+source = "git+https://github.com/paritytech/substrate#88248c040fd0a0ff004f448fc8c47fdf000b653e"
 dependencies = [
  "parity-scale-codec",
  "serde",
@@ -1320,8 +1320,8 @@ dependencies = [
 
 [[package]]
 name = "frame-support"
-version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#0132d522dbbdaef4e11a772fe5987801b59964aa"
+version = "2.0.0-dev"
+source = "git+https://github.com/paritytech/substrate#88248c040fd0a0ff004f448fc8c47fdf000b653e"
 dependencies = [
  "bitmask",
  "frame-metadata",
@@ -1344,8 +1344,8 @@ dependencies = [
 
 [[package]]
 name = "frame-support-procedural"
-version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#0132d522dbbdaef4e11a772fe5987801b59964aa"
+version = "2.0.0-dev"
+source = "git+https://github.com/paritytech/substrate#88248c040fd0a0ff004f448fc8c47fdf000b653e"
 dependencies = [
  "frame-support-procedural-tools",
  "proc-macro2 1.0.9",
@@ -1355,8 +1355,8 @@ dependencies = [
 
 [[package]]
 name = "frame-support-procedural-tools"
-version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#0132d522dbbdaef4e11a772fe5987801b59964aa"
+version = "2.0.0-dev"
+source = "git+https://github.com/paritytech/substrate#88248c040fd0a0ff004f448fc8c47fdf000b653e"
 dependencies = [
  "frame-support-procedural-tools-derive",
  "proc-macro-crate",
@@ -1367,8 +1367,8 @@ dependencies = [
 
 [[package]]
 name = "frame-support-procedural-tools-derive"
-version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#0132d522dbbdaef4e11a772fe5987801b59964aa"
+version = "2.0.0-dev"
+source = "git+https://github.com/paritytech/substrate#88248c040fd0a0ff004f448fc8c47fdf000b653e"
 dependencies = [
  "proc-macro2 1.0.9",
  "quote 1.0.3",
@@ -1377,8 +1377,8 @@ dependencies = [
 
 [[package]]
 name = "frame-system"
-version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#0132d522dbbdaef4e11a772fe5987801b59964aa"
+version = "2.0.0-dev"
+source = "git+https://github.com/paritytech/substrate#88248c040fd0a0ff004f448fc8c47fdf000b653e"
 dependencies = [
  "frame-support",
  "impl-trait-for-tuples",
@@ -1393,8 +1393,8 @@ dependencies = [
 
 [[package]]
 name = "frame-system-rpc-runtime-api"
-version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#0132d522dbbdaef4e11a772fe5987801b59964aa"
+version = "2.0.0-dev"
+source = "git+https://github.com/paritytech/substrate#88248c040fd0a0ff004f448fc8c47fdf000b653e"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -2885,6 +2885,16 @@ version = "2.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400"
 
+[[package]]
+name = "memmap"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6585fd95e7bb50d6cc31e20d4cf9afb4e2ba16c5846fc76793f11218da9c475b"
+dependencies = [
+ "libc",
+ "winapi 0.3.8",
+]
+
 [[package]]
 name = "memoffset"
 version = "0.5.4"
@@ -3274,8 +3284,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-authority-discovery"
-version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#0132d522dbbdaef4e11a772fe5987801b59964aa"
+version = "2.0.0-dev"
+source = "git+https://github.com/paritytech/substrate#88248c040fd0a0ff004f448fc8c47fdf000b653e"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3292,8 +3302,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-authorship"
-version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#0132d522dbbdaef4e11a772fe5987801b59964aa"
+version = "2.0.0-dev"
+source = "git+https://github.com/paritytech/substrate#88248c040fd0a0ff004f448fc8c47fdf000b653e"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3309,8 +3319,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-babe"
-version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#0132d522dbbdaef4e11a772fe5987801b59964aa"
+version = "2.0.0-dev"
+source = "git+https://github.com/paritytech/substrate#88248c040fd0a0ff004f448fc8c47fdf000b653e"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3330,8 +3340,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-balances"
-version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#0132d522dbbdaef4e11a772fe5987801b59964aa"
+version = "2.0.0-dev"
+source = "git+https://github.com/paritytech/substrate#88248c040fd0a0ff004f448fc8c47fdf000b653e"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -3345,8 +3355,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-collective"
-version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#0132d522dbbdaef4e11a772fe5987801b59964aa"
+version = "2.0.0-dev"
+source = "git+https://github.com/paritytech/substrate#88248c040fd0a0ff004f448fc8c47fdf000b653e"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -3361,8 +3371,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-democracy"
-version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#0132d522dbbdaef4e11a772fe5987801b59964aa"
+version = "2.0.0-dev"
+source = "git+https://github.com/paritytech/substrate#88248c040fd0a0ff004f448fc8c47fdf000b653e"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -3376,8 +3386,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-elections-phragmen"
-version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#0132d522dbbdaef4e11a772fe5987801b59964aa"
+version = "2.0.0-dev"
+source = "git+https://github.com/paritytech/substrate#88248c040fd0a0ff004f448fc8c47fdf000b653e"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3390,8 +3400,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-finality-tracker"
-version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#0132d522dbbdaef4e11a772fe5987801b59964aa"
+version = "2.0.0-dev"
+source = "git+https://github.com/paritytech/substrate#88248c040fd0a0ff004f448fc8c47fdf000b653e"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3406,8 +3416,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-grandpa"
-version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#0132d522dbbdaef4e11a772fe5987801b59964aa"
+version = "2.0.0-dev"
+source = "git+https://github.com/paritytech/substrate#88248c040fd0a0ff004f448fc8c47fdf000b653e"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3424,8 +3434,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-identity"
-version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#0132d522dbbdaef4e11a772fe5987801b59964aa"
+version = "2.0.0-dev"
+source = "git+https://github.com/paritytech/substrate#88248c040fd0a0ff004f448fc8c47fdf000b653e"
 dependencies = [
  "enumflags2",
  "frame-benchmarking",
@@ -3440,8 +3450,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-im-online"
-version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#0132d522dbbdaef4e11a772fe5987801b59964aa"
+version = "2.0.0-dev"
+source = "git+https://github.com/paritytech/substrate#88248c040fd0a0ff004f448fc8c47fdf000b653e"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3459,8 +3469,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-indices"
-version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#0132d522dbbdaef4e11a772fe5987801b59964aa"
+version = "2.0.0-dev"
+source = "git+https://github.com/paritytech/substrate#88248c040fd0a0ff004f448fc8c47fdf000b653e"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3475,8 +3485,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-membership"
-version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#0132d522dbbdaef4e11a772fe5987801b59964aa"
+version = "2.0.0-dev"
+source = "git+https://github.com/paritytech/substrate#88248c040fd0a0ff004f448fc8c47fdf000b653e"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3489,8 +3499,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-nicks"
-version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#0132d522dbbdaef4e11a772fe5987801b59964aa"
+version = "2.0.0-dev"
+source = "git+https://github.com/paritytech/substrate#88248c040fd0a0ff004f448fc8c47fdf000b653e"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3503,8 +3513,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-offences"
-version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#0132d522dbbdaef4e11a772fe5987801b59964aa"
+version = "2.0.0-dev"
+source = "git+https://github.com/paritytech/substrate#88248c040fd0a0ff004f448fc8c47fdf000b653e"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3518,8 +3528,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-randomness-collective-flip"
-version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#0132d522dbbdaef4e11a772fe5987801b59964aa"
+version = "2.0.0-dev"
+source = "git+https://github.com/paritytech/substrate#88248c040fd0a0ff004f448fc8c47fdf000b653e"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3531,8 +3541,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-recovery"
-version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#0132d522dbbdaef4e11a772fe5987801b59964aa"
+version = "2.0.0-dev"
+source = "git+https://github.com/paritytech/substrate#88248c040fd0a0ff004f448fc8c47fdf000b653e"
 dependencies = [
  "enumflags2",
  "frame-support",
@@ -3546,8 +3556,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-scheduler"
-version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#0132d522dbbdaef4e11a772fe5987801b59964aa"
+version = "2.0.0-dev"
+source = "git+https://github.com/paritytech/substrate#88248c040fd0a0ff004f448fc8c47fdf000b653e"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -3561,8 +3571,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-session"
-version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#0132d522dbbdaef4e11a772fe5987801b59964aa"
+version = "2.0.0-dev"
+source = "git+https://github.com/paritytech/substrate#88248c040fd0a0ff004f448fc8c47fdf000b653e"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3579,8 +3589,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-society"
-version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#0132d522dbbdaef4e11a772fe5987801b59964aa"
+version = "2.0.0-dev"
+source = "git+https://github.com/paritytech/substrate#88248c040fd0a0ff004f448fc8c47fdf000b653e"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3594,8 +3604,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-staking"
-version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#0132d522dbbdaef4e11a772fe5987801b59964aa"
+version = "2.0.0-dev"
+source = "git+https://github.com/paritytech/substrate#88248c040fd0a0ff004f448fc8c47fdf000b653e"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3615,8 +3625,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-staking-reward-curve"
-version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#0132d522dbbdaef4e11a772fe5987801b59964aa"
+version = "2.0.0-dev"
+source = "git+https://github.com/paritytech/substrate#88248c040fd0a0ff004f448fc8c47fdf000b653e"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2 1.0.9",
@@ -3626,8 +3636,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-sudo"
-version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#0132d522dbbdaef4e11a772fe5987801b59964aa"
+version = "2.0.0-dev"
+source = "git+https://github.com/paritytech/substrate#88248c040fd0a0ff004f448fc8c47fdf000b653e"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3640,8 +3650,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-timestamp"
-version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#0132d522dbbdaef4e11a772fe5987801b59964aa"
+version = "2.0.0-dev"
+source = "git+https://github.com/paritytech/substrate#88248c040fd0a0ff004f448fc8c47fdf000b653e"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -3657,8 +3667,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-transaction-payment"
-version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#0132d522dbbdaef4e11a772fe5987801b59964aa"
+version = "2.0.0-dev"
+source = "git+https://github.com/paritytech/substrate#88248c040fd0a0ff004f448fc8c47fdf000b653e"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3670,8 +3680,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-transaction-payment-rpc"
-version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#0132d522dbbdaef4e11a772fe5987801b59964aa"
+version = "2.0.0-dev"
+source = "git+https://github.com/paritytech/substrate#88248c040fd0a0ff004f448fc8c47fdf000b653e"
 dependencies = [
  "jsonrpc-core",
  "jsonrpc-core-client",
@@ -3688,8 +3698,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-transaction-payment-rpc-runtime-api"
-version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#0132d522dbbdaef4e11a772fe5987801b59964aa"
+version = "2.0.0-dev"
+source = "git+https://github.com/paritytech/substrate#88248c040fd0a0ff004f448fc8c47fdf000b653e"
 dependencies = [
  "frame-support",
  "parity-scale-codec",
@@ -3701,8 +3711,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-treasury"
-version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#0132d522dbbdaef4e11a772fe5987801b59964aa"
+version = "2.0.0-dev"
+source = "git+https://github.com/paritytech/substrate#88248c040fd0a0ff004f448fc8c47fdf000b653e"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3715,8 +3725,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-utility"
-version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#0132d522dbbdaef4e11a772fe5987801b59964aa"
+version = "2.0.0-dev"
+source = "git+https://github.com/paritytech/substrate#88248c040fd0a0ff004f448fc8c47fdf000b653e"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3730,8 +3740,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-vesting"
-version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#0132d522dbbdaef4e11a772fe5987801b59964aa"
+version = "2.0.0-dev"
+source = "git+https://github.com/paritytech/substrate#88248c040fd0a0ff004f448fc8c47fdf000b653e"
 dependencies = [
  "enumflags2",
  "frame-support",
@@ -3743,6 +3753,19 @@ dependencies = [
  "sp-std",
 ]
 
+[[package]]
+name = "parity-db"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f4174d70be686b0d7cdee964b2d723e1461e28390c8804f01efc907d81043be9"
+dependencies = [
+ "blake2-rfc",
+ "libc",
+ "log 0.4.8",
+ "memmap",
+ "parking_lot 0.10.0",
+]
+
 [[package]]
 name = "parity-multiaddr"
 version = "0.7.3"
@@ -5218,8 +5241,8 @@ dependencies = [
 
 [[package]]
 name = "sc-authority-discovery"
-version = "0.8.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#0132d522dbbdaef4e11a772fe5987801b59964aa"
+version = "0.8.0-dev"
+source = "git+https://github.com/paritytech/substrate#88248c040fd0a0ff004f448fc8c47fdf000b653e"
 dependencies = [
  "bytes 0.5.4",
  "derive_more 0.99.3",
@@ -5245,8 +5268,8 @@ dependencies = [
 
 [[package]]
 name = "sc-block-builder"
-version = "0.8.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#0132d522dbbdaef4e11a772fe5987801b59964aa"
+version = "0.8.0-dev"
+source = "git+https://github.com/paritytech/substrate#88248c040fd0a0ff004f448fc8c47fdf000b653e"
 dependencies = [
  "parity-scale-codec",
  "sc-client-api",
@@ -5261,8 +5284,8 @@ dependencies = [
 
 [[package]]
 name = "sc-chain-spec"
-version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#0132d522dbbdaef4e11a772fe5987801b59964aa"
+version = "2.0.0-dev"
+source = "git+https://github.com/paritytech/substrate#88248c040fd0a0ff004f448fc8c47fdf000b653e"
 dependencies = [
  "impl-trait-for-tuples",
  "sc-chain-spec-derive",
@@ -5277,8 +5300,8 @@ dependencies = [
 
 [[package]]
 name = "sc-chain-spec-derive"
-version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#0132d522dbbdaef4e11a772fe5987801b59964aa"
+version = "2.0.0-dev"
+source = "git+https://github.com/paritytech/substrate#88248c040fd0a0ff004f448fc8c47fdf000b653e"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2 1.0.9",
@@ -5288,8 +5311,8 @@ dependencies = [
 
 [[package]]
 name = "sc-cli"
-version = "0.8.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#0132d522dbbdaef4e11a772fe5987801b59964aa"
+version = "0.8.0-dev"
+source = "git+https://github.com/paritytech/substrate#88248c040fd0a0ff004f448fc8c47fdf000b653e"
 dependencies = [
  "ansi_term 0.12.1",
  "app_dirs",
@@ -5330,8 +5353,8 @@ dependencies = [
 
 [[package]]
 name = "sc-client"
-version = "0.8.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#0132d522dbbdaef4e11a772fe5987801b59964aa"
+version = "0.8.0-dev"
+source = "git+https://github.com/paritytech/substrate#88248c040fd0a0ff004f448fc8c47fdf000b653e"
 dependencies = [
  "derive_more 0.99.3",
  "fnv",
@@ -5350,6 +5373,7 @@ dependencies = [
  "sp-blockchain",
  "sp-consensus",
  "sp-core",
+ "sp-database",
  "sp-externalities",
  "sp-inherents",
  "sp-keyring",
@@ -5365,8 +5389,8 @@ dependencies = [
 
 [[package]]
 name = "sc-client-api"
-version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#0132d522dbbdaef4e11a772fe5987801b59964aa"
+version = "2.0.0-dev"
+source = "git+https://github.com/paritytech/substrate#88248c040fd0a0ff004f448fc8c47fdf000b653e"
 dependencies = [
  "derive_more 0.99.3",
  "fnv",
@@ -5399,15 +5423,17 @@ dependencies = [
 
 [[package]]
 name = "sc-client-db"
-version = "0.8.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#0132d522dbbdaef4e11a772fe5987801b59964aa"
+version = "0.8.0-dev"
+source = "git+https://github.com/paritytech/substrate#88248c040fd0a0ff004f448fc8c47fdf000b653e"
 dependencies = [
+ "blake2-rfc",
  "hash-db",
  "kvdb",
  "kvdb-memorydb",
  "kvdb-rocksdb",
  "linked-hash-map",
  "log 0.4.8",
+ "parity-db",
  "parity-scale-codec",
  "parity-util-mem",
  "parking_lot 0.10.0",
@@ -5418,6 +5444,7 @@ dependencies = [
  "sp-blockchain",
  "sp-consensus",
  "sp-core",
+ "sp-database",
  "sp-runtime",
  "sp-state-machine",
  "sp-trie",
@@ -5426,8 +5453,8 @@ dependencies = [
 
 [[package]]
 name = "sc-consensus-babe"
-version = "0.8.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#0132d522dbbdaef4e11a772fe5987801b59964aa"
+version = "0.8.0-dev"
+source = "git+https://github.com/paritytech/substrate#88248c040fd0a0ff004f448fc8c47fdf000b653e"
 dependencies = [
  "derive_more 0.99.3",
  "fork-tree",
@@ -5468,8 +5495,8 @@ dependencies = [
 
 [[package]]
 name = "sc-consensus-epochs"
-version = "0.8.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#0132d522dbbdaef4e11a772fe5987801b59964aa"
+version = "0.8.0-dev"
+source = "git+https://github.com/paritytech/substrate#88248c040fd0a0ff004f448fc8c47fdf000b653e"
 dependencies = [
  "fork-tree",
  "parity-scale-codec",
@@ -5481,8 +5508,8 @@ dependencies = [
 
 [[package]]
 name = "sc-consensus-slots"
-version = "0.8.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#0132d522dbbdaef4e11a772fe5987801b59964aa"
+version = "0.8.0-dev"
+source = "git+https://github.com/paritytech/substrate#88248c040fd0a0ff004f448fc8c47fdf000b653e"
 dependencies = [
  "futures 0.3.4",
  "futures-timer 3.0.2",
@@ -5502,8 +5529,8 @@ dependencies = [
 
 [[package]]
 name = "sc-consensus-uncles"
-version = "0.8.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#0132d522dbbdaef4e11a772fe5987801b59964aa"
+version = "0.8.0-dev"
+source = "git+https://github.com/paritytech/substrate#88248c040fd0a0ff004f448fc8c47fdf000b653e"
 dependencies = [
  "log 0.4.8",
  "sc-client-api",
@@ -5516,8 +5543,8 @@ dependencies = [
 
 [[package]]
 name = "sc-executor"
-version = "0.8.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#0132d522dbbdaef4e11a772fe5987801b59964aa"
+version = "0.8.0-dev"
+source = "git+https://github.com/paritytech/substrate#88248c040fd0a0ff004f448fc8c47fdf000b653e"
 dependencies = [
  "derive_more 0.99.3",
  "lazy_static",
@@ -5543,8 +5570,8 @@ dependencies = [
 
 [[package]]
 name = "sc-executor-common"
-version = "0.8.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#0132d522dbbdaef4e11a772fe5987801b59964aa"
+version = "0.8.0-dev"
+source = "git+https://github.com/paritytech/substrate#88248c040fd0a0ff004f448fc8c47fdf000b653e"
 dependencies = [
  "derive_more 0.99.3",
  "log 0.4.8",
@@ -5560,8 +5587,8 @@ dependencies = [
 
 [[package]]
 name = "sc-executor-wasmi"
-version = "0.8.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#0132d522dbbdaef4e11a772fe5987801b59964aa"
+version = "0.8.0-dev"
+source = "git+https://github.com/paritytech/substrate#88248c040fd0a0ff004f448fc8c47fdf000b653e"
 dependencies = [
  "log 0.4.8",
  "parity-scale-codec",
@@ -5575,8 +5602,8 @@ dependencies = [
 
 [[package]]
 name = "sc-executor-wasmtime"
-version = "0.8.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#0132d522dbbdaef4e11a772fe5987801b59964aa"
+version = "0.8.0-dev"
+source = "git+https://github.com/paritytech/substrate#88248c040fd0a0ff004f448fc8c47fdf000b653e"
 dependencies = [
  "cranelift-codegen",
  "cranelift-wasm",
@@ -5596,8 +5623,8 @@ dependencies = [
 
 [[package]]
 name = "sc-finality-grandpa"
-version = "0.8.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#0132d522dbbdaef4e11a772fe5987801b59964aa"
+version = "0.8.0-dev"
+source = "git+https://github.com/paritytech/substrate#88248c040fd0a0ff004f448fc8c47fdf000b653e"
 dependencies = [
  "assert_matches",
  "finality-grandpa",
@@ -5632,8 +5659,8 @@ dependencies = [
 
 [[package]]
 name = "sc-informant"
-version = "0.8.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#0132d522dbbdaef4e11a772fe5987801b59964aa"
+version = "0.8.0-dev"
+source = "git+https://github.com/paritytech/substrate#88248c040fd0a0ff004f448fc8c47fdf000b653e"
 dependencies = [
  "ansi_term 0.12.1",
  "futures 0.3.4",
@@ -5649,8 +5676,8 @@ dependencies = [
 
 [[package]]
 name = "sc-keystore"
-version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#0132d522dbbdaef4e11a772fe5987801b59964aa"
+version = "2.0.0-dev"
+source = "git+https://github.com/paritytech/substrate#88248c040fd0a0ff004f448fc8c47fdf000b653e"
 dependencies = [
  "derive_more 0.99.3",
  "hex",
@@ -5664,8 +5691,8 @@ dependencies = [
 
 [[package]]
 name = "sc-network"
-version = "0.8.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#0132d522dbbdaef4e11a772fe5987801b59964aa"
+version = "0.8.0-dev"
+source = "git+https://github.com/paritytech/substrate#88248c040fd0a0ff004f448fc8c47fdf000b653e"
 dependencies = [
  "bitflags",
  "bytes 0.5.4",
@@ -5716,8 +5743,8 @@ dependencies = [
 
 [[package]]
 name = "sc-network-gossip"
-version = "0.8.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#0132d522dbbdaef4e11a772fe5987801b59964aa"
+version = "0.8.0-dev"
+source = "git+https://github.com/paritytech/substrate#88248c040fd0a0ff004f448fc8c47fdf000b653e"
 dependencies = [
  "futures 0.3.4",
  "futures-timer 3.0.2",
@@ -5733,7 +5760,7 @@ dependencies = [
 [[package]]
 name = "sc-network-test"
 version = "0.8.0-dev"
-source = "git+https://github.com/paritytech/substrate#0132d522dbbdaef4e11a772fe5987801b59964aa"
+source = "git+https://github.com/paritytech/substrate#88248c040fd0a0ff004f448fc8c47fdf000b653e"
 dependencies = [
  "env_logger 0.7.1",
  "futures 0.3.4",
@@ -5758,8 +5785,8 @@ dependencies = [
 
 [[package]]
 name = "sc-offchain"
-version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#0132d522dbbdaef4e11a772fe5987801b59964aa"
+version = "2.0.0-dev"
+source = "git+https://github.com/paritytech/substrate#88248c040fd0a0ff004f448fc8c47fdf000b653e"
 dependencies = [
  "bytes 0.5.4",
  "fnv",
@@ -5785,8 +5812,8 @@ dependencies = [
 
 [[package]]
 name = "sc-peerset"
-version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#0132d522dbbdaef4e11a772fe5987801b59964aa"
+version = "2.0.0-dev"
+source = "git+https://github.com/paritytech/substrate#88248c040fd0a0ff004f448fc8c47fdf000b653e"
 dependencies = [
  "futures 0.3.4",
  "libp2p",
@@ -5798,8 +5825,8 @@ dependencies = [
 
 [[package]]
 name = "sc-rpc"
-version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#0132d522dbbdaef4e11a772fe5987801b59964aa"
+version = "2.0.0-dev"
+source = "git+https://github.com/paritytech/substrate#88248c040fd0a0ff004f448fc8c47fdf000b653e"
 dependencies = [
  "futures 0.3.4",
  "hash-db",
@@ -5831,8 +5858,8 @@ dependencies = [
 
 [[package]]
 name = "sc-rpc-api"
-version = "0.8.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#0132d522dbbdaef4e11a772fe5987801b59964aa"
+version = "0.8.0-dev"
+source = "git+https://github.com/paritytech/substrate#88248c040fd0a0ff004f448fc8c47fdf000b653e"
 dependencies = [
  "derive_more 0.99.3",
  "futures 0.3.4",
@@ -5855,8 +5882,8 @@ dependencies = [
 
 [[package]]
 name = "sc-rpc-server"
-version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#0132d522dbbdaef4e11a772fe5987801b59964aa"
+version = "2.0.0-dev"
+source = "git+https://github.com/paritytech/substrate#88248c040fd0a0ff004f448fc8c47fdf000b653e"
 dependencies = [
  "jsonrpc-core",
  "jsonrpc-http-server",
@@ -5870,14 +5897,13 @@ dependencies = [
 
 [[package]]
 name = "sc-service"
-version = "0.8.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#0132d522dbbdaef4e11a772fe5987801b59964aa"
+version = "0.8.0-dev"
+source = "git+https://github.com/paritytech/substrate#88248c040fd0a0ff004f448fc8c47fdf000b653e"
 dependencies = [
  "derive_more 0.99.3",
  "exit-future",
  "futures 0.1.29",
  "futures 0.3.4",
- "futures-diagnose",
  "futures-timer 3.0.2",
  "lazy_static",
  "log 0.4.8",
@@ -5886,6 +5912,7 @@ dependencies = [
  "parity-scale-codec",
  "parity-util-mem",
  "parking_lot 0.10.0",
+ "pin-project",
  "procfs",
  "sc-chain-spec",
  "sc-client",
@@ -5921,8 +5948,8 @@ dependencies = [
 
 [[package]]
 name = "sc-state-db"
-version = "0.8.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#0132d522dbbdaef4e11a772fe5987801b59964aa"
+version = "0.8.0-dev"
+source = "git+https://github.com/paritytech/substrate#88248c040fd0a0ff004f448fc8c47fdf000b653e"
 dependencies = [
  "log 0.4.8",
  "parity-scale-codec",
@@ -5935,8 +5962,8 @@ dependencies = [
 
 [[package]]
 name = "sc-telemetry"
-version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#0132d522dbbdaef4e11a772fe5987801b59964aa"
+version = "2.0.0-dev"
+source = "git+https://github.com/paritytech/substrate#88248c040fd0a0ff004f448fc8c47fdf000b653e"
 dependencies = [
  "bytes 0.5.4",
  "futures 0.3.4",
@@ -5957,8 +5984,8 @@ dependencies = [
 
 [[package]]
 name = "sc-tracing"
-version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#0132d522dbbdaef4e11a772fe5987801b59964aa"
+version = "2.0.0-dev"
+source = "git+https://github.com/paritytech/substrate#88248c040fd0a0ff004f448fc8c47fdf000b653e"
 dependencies = [
  "erased-serde",
  "log 0.4.8",
@@ -5972,8 +5999,8 @@ dependencies = [
 
 [[package]]
 name = "sc-transaction-graph"
-version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#0132d522dbbdaef4e11a772fe5987801b59964aa"
+version = "2.0.0-dev"
+source = "git+https://github.com/paritytech/substrate#88248c040fd0a0ff004f448fc8c47fdf000b653e"
 dependencies = [
  "derive_more 0.99.3",
  "futures 0.3.4",
@@ -5992,8 +6019,8 @@ dependencies = [
 
 [[package]]
 name = "sc-transaction-pool"
-version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#0132d522dbbdaef4e11a772fe5987801b59964aa"
+version = "2.0.0-dev"
+source = "git+https://github.com/paritytech/substrate#88248c040fd0a0ff004f448fc8c47fdf000b653e"
 dependencies = [
  "derive_more 0.99.3",
  "futures 0.3.4",
@@ -6374,8 +6401,8 @@ dependencies = [
 
 [[package]]
 name = "sp-allocator"
-version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#0132d522dbbdaef4e11a772fe5987801b59964aa"
+version = "2.0.0-dev"
+source = "git+https://github.com/paritytech/substrate#88248c040fd0a0ff004f448fc8c47fdf000b653e"
 dependencies = [
  "derive_more 0.99.3",
  "log 0.4.8",
@@ -6386,8 +6413,8 @@ dependencies = [
 
 [[package]]
 name = "sp-api"
-version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#0132d522dbbdaef4e11a772fe5987801b59964aa"
+version = "2.0.0-dev"
+source = "git+https://github.com/paritytech/substrate#88248c040fd0a0ff004f448fc8c47fdf000b653e"
 dependencies = [
  "hash-db",
  "parity-scale-codec",
@@ -6401,8 +6428,8 @@ dependencies = [
 
 [[package]]
 name = "sp-api-proc-macro"
-version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#0132d522dbbdaef4e11a772fe5987801b59964aa"
+version = "2.0.0-dev"
+source = "git+https://github.com/paritytech/substrate#88248c040fd0a0ff004f448fc8c47fdf000b653e"
 dependencies = [
  "blake2-rfc",
  "proc-macro-crate",
@@ -6413,8 +6440,8 @@ dependencies = [
 
 [[package]]
 name = "sp-application-crypto"
-version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#0132d522dbbdaef4e11a772fe5987801b59964aa"
+version = "2.0.0-dev"
+source = "git+https://github.com/paritytech/substrate#88248c040fd0a0ff004f448fc8c47fdf000b653e"
 dependencies = [
  "parity-scale-codec",
  "serde",
@@ -6425,8 +6452,8 @@ dependencies = [
 
 [[package]]
 name = "sp-arithmetic"
-version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#0132d522dbbdaef4e11a772fe5987801b59964aa"
+version = "2.0.0-dev"
+source = "git+https://github.com/paritytech/substrate#88248c040fd0a0ff004f448fc8c47fdf000b653e"
 dependencies = [
  "integer-sqrt",
  "num-traits 0.2.11",
@@ -6439,8 +6466,8 @@ dependencies = [
 
 [[package]]
 name = "sp-authority-discovery"
-version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#0132d522dbbdaef4e11a772fe5987801b59964aa"
+version = "2.0.0-dev"
+source = "git+https://github.com/paritytech/substrate#88248c040fd0a0ff004f448fc8c47fdf000b653e"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -6451,8 +6478,8 @@ dependencies = [
 
 [[package]]
 name = "sp-authorship"
-version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#0132d522dbbdaef4e11a772fe5987801b59964aa"
+version = "2.0.0-dev"
+source = "git+https://github.com/paritytech/substrate#88248c040fd0a0ff004f448fc8c47fdf000b653e"
 dependencies = [
  "parity-scale-codec",
  "sp-inherents",
@@ -6462,8 +6489,8 @@ dependencies = [
 
 [[package]]
 name = "sp-block-builder"
-version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#0132d522dbbdaef4e11a772fe5987801b59964aa"
+version = "2.0.0-dev"
+source = "git+https://github.com/paritytech/substrate#88248c040fd0a0ff004f448fc8c47fdf000b653e"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -6474,8 +6501,8 @@ dependencies = [
 
 [[package]]
 name = "sp-blockchain"
-version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#0132d522dbbdaef4e11a772fe5987801b59964aa"
+version = "2.0.0-dev"
+source = "git+https://github.com/paritytech/substrate#88248c040fd0a0ff004f448fc8c47fdf000b653e"
 dependencies = [
  "derive_more 0.99.3",
  "log 0.4.8",
@@ -6490,8 +6517,8 @@ dependencies = [
 
 [[package]]
 name = "sp-chain-spec"
-version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#0132d522dbbdaef4e11a772fe5987801b59964aa"
+version = "2.0.0-dev"
+source = "git+https://github.com/paritytech/substrate#88248c040fd0a0ff004f448fc8c47fdf000b653e"
 dependencies = [
  "serde",
  "serde_json",
@@ -6499,8 +6526,8 @@ dependencies = [
 
 [[package]]
 name = "sp-consensus"
-version = "0.8.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#0132d522dbbdaef4e11a772fe5987801b59964aa"
+version = "0.8.0-dev"
+source = "git+https://github.com/paritytech/substrate#88248c040fd0a0ff004f448fc8c47fdf000b653e"
 dependencies = [
  "derive_more 0.99.3",
  "futures 0.3.4",
@@ -6522,8 +6549,8 @@ dependencies = [
 
 [[package]]
 name = "sp-consensus-aura"
-version = "0.8.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#0132d522dbbdaef4e11a772fe5987801b59964aa"
+version = "0.8.0-dev"
+source = "git+https://github.com/paritytech/substrate#88248c040fd0a0ff004f448fc8c47fdf000b653e"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -6536,8 +6563,8 @@ dependencies = [
 
 [[package]]
 name = "sp-consensus-babe"
-version = "0.8.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#0132d522dbbdaef4e11a772fe5987801b59964aa"
+version = "0.8.0-dev"
+source = "git+https://github.com/paritytech/substrate#88248c040fd0a0ff004f448fc8c47fdf000b653e"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -6552,8 +6579,8 @@ dependencies = [
 
 [[package]]
 name = "sp-consensus-vrf"
-version = "0.8.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#0132d522dbbdaef4e11a772fe5987801b59964aa"
+version = "0.8.0-dev"
+source = "git+https://github.com/paritytech/substrate#88248c040fd0a0ff004f448fc8c47fdf000b653e"
 dependencies = [
  "parity-scale-codec",
  "schnorrkel",
@@ -6564,8 +6591,8 @@ dependencies = [
 
 [[package]]
 name = "sp-core"
-version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#0132d522dbbdaef4e11a772fe5987801b59964aa"
+version = "2.0.0-dev"
+source = "git+https://github.com/paritytech/substrate#88248c040fd0a0ff004f448fc8c47fdf000b653e"
 dependencies = [
  "base58",
  "blake2-rfc",
@@ -6602,10 +6629,19 @@ dependencies = [
  "zeroize",
 ]
 
+[[package]]
+name = "sp-database"
+version = "2.0.0-dev"
+source = "git+https://github.com/paritytech/substrate#88248c040fd0a0ff004f448fc8c47fdf000b653e"
+dependencies = [
+ "kvdb",
+ "parking_lot 0.10.0",
+]
+
 [[package]]
 name = "sp-debug-derive"
-version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#0132d522dbbdaef4e11a772fe5987801b59964aa"
+version = "2.0.0-dev"
+source = "git+https://github.com/paritytech/substrate#88248c040fd0a0ff004f448fc8c47fdf000b653e"
 dependencies = [
  "proc-macro2 1.0.9",
  "quote 1.0.3",
@@ -6614,8 +6650,8 @@ dependencies = [
 
 [[package]]
 name = "sp-externalities"
-version = "0.8.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#0132d522dbbdaef4e11a772fe5987801b59964aa"
+version = "0.8.0-dev"
+source = "git+https://github.com/paritytech/substrate#88248c040fd0a0ff004f448fc8c47fdf000b653e"
 dependencies = [
  "environmental",
  "sp-std",
@@ -6624,8 +6660,8 @@ dependencies = [
 
 [[package]]
 name = "sp-finality-grandpa"
-version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#0132d522dbbdaef4e11a772fe5987801b59964aa"
+version = "2.0.0-dev"
+source = "git+https://github.com/paritytech/substrate#88248c040fd0a0ff004f448fc8c47fdf000b653e"
 dependencies = [
  "parity-scale-codec",
  "serde",
@@ -6637,8 +6673,8 @@ dependencies = [
 
 [[package]]
 name = "sp-finality-tracker"
-version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#0132d522dbbdaef4e11a772fe5987801b59964aa"
+version = "2.0.0-dev"
+source = "git+https://github.com/paritytech/substrate#88248c040fd0a0ff004f448fc8c47fdf000b653e"
 dependencies = [
  "parity-scale-codec",
  "sp-inherents",
@@ -6647,8 +6683,8 @@ dependencies = [
 
 [[package]]
 name = "sp-inherents"
-version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#0132d522dbbdaef4e11a772fe5987801b59964aa"
+version = "2.0.0-dev"
+source = "git+https://github.com/paritytech/substrate#88248c040fd0a0ff004f448fc8c47fdf000b653e"
 dependencies = [
  "derive_more 0.99.3",
  "parity-scale-codec",
@@ -6659,8 +6695,8 @@ dependencies = [
 
 [[package]]
 name = "sp-io"
-version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#0132d522dbbdaef4e11a772fe5987801b59964aa"
+version = "2.0.0-dev"
+source = "git+https://github.com/paritytech/substrate#88248c040fd0a0ff004f448fc8c47fdf000b653e"
 dependencies = [
  "hash-db",
  "libsecp256k1",
@@ -6677,8 +6713,8 @@ dependencies = [
 
 [[package]]
 name = "sp-keyring"
-version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#0132d522dbbdaef4e11a772fe5987801b59964aa"
+version = "2.0.0-dev"
+source = "git+https://github.com/paritytech/substrate#88248c040fd0a0ff004f448fc8c47fdf000b653e"
 dependencies = [
  "lazy_static",
  "sp-core",
@@ -6688,8 +6724,8 @@ dependencies = [
 
 [[package]]
 name = "sp-offchain"
-version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#0132d522dbbdaef4e11a772fe5987801b59964aa"
+version = "2.0.0-dev"
+source = "git+https://github.com/paritytech/substrate#88248c040fd0a0ff004f448fc8c47fdf000b653e"
 dependencies = [
  "sp-api",
  "sp-runtime",
@@ -6697,8 +6733,8 @@ dependencies = [
 
 [[package]]
 name = "sp-panic-handler"
-version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#0132d522dbbdaef4e11a772fe5987801b59964aa"
+version = "2.0.0-dev"
+source = "git+https://github.com/paritytech/substrate#88248c040fd0a0ff004f448fc8c47fdf000b653e"
 dependencies = [
  "backtrace",
  "log 0.4.8",
@@ -6706,8 +6742,8 @@ dependencies = [
 
 [[package]]
 name = "sp-phragmen"
-version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#0132d522dbbdaef4e11a772fe5987801b59964aa"
+version = "2.0.0-dev"
+source = "git+https://github.com/paritytech/substrate#88248c040fd0a0ff004f448fc8c47fdf000b653e"
 dependencies = [
  "parity-scale-codec",
  "serde",
@@ -6719,7 +6755,7 @@ dependencies = [
 [[package]]
 name = "sp-phragmen-compact"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#0132d522dbbdaef4e11a772fe5987801b59964aa"
+source = "git+https://github.com/paritytech/substrate#88248c040fd0a0ff004f448fc8c47fdf000b653e"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2 1.0.9",
@@ -6729,8 +6765,8 @@ dependencies = [
 
 [[package]]
 name = "sp-rpc"
-version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#0132d522dbbdaef4e11a772fe5987801b59964aa"
+version = "2.0.0-dev"
+source = "git+https://github.com/paritytech/substrate#88248c040fd0a0ff004f448fc8c47fdf000b653e"
 dependencies = [
  "serde",
  "sp-core",
@@ -6738,8 +6774,8 @@ dependencies = [
 
 [[package]]
 name = "sp-runtime"
-version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#0132d522dbbdaef4e11a772fe5987801b59964aa"
+version = "2.0.0-dev"
+source = "git+https://github.com/paritytech/substrate#88248c040fd0a0ff004f448fc8c47fdf000b653e"
 dependencies = [
  "hash256-std-hasher",
  "impl-trait-for-tuples",
@@ -6759,8 +6795,8 @@ dependencies = [
 
 [[package]]
 name = "sp-runtime-interface"
-version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#0132d522dbbdaef4e11a772fe5987801b59964aa"
+version = "2.0.0-dev"
+source = "git+https://github.com/paritytech/substrate#88248c040fd0a0ff004f448fc8c47fdf000b653e"
 dependencies = [
  "parity-scale-codec",
  "primitive-types",
@@ -6773,8 +6809,8 @@ dependencies = [
 
 [[package]]
 name = "sp-runtime-interface-proc-macro"
-version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#0132d522dbbdaef4e11a772fe5987801b59964aa"
+version = "2.0.0-dev"
+source = "git+https://github.com/paritytech/substrate#88248c040fd0a0ff004f448fc8c47fdf000b653e"
 dependencies = [
  "Inflector",
  "proc-macro-crate",
@@ -6785,8 +6821,8 @@ dependencies = [
 
 [[package]]
 name = "sp-serializer"
-version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#0132d522dbbdaef4e11a772fe5987801b59964aa"
+version = "2.0.0-dev"
+source = "git+https://github.com/paritytech/substrate#88248c040fd0a0ff004f448fc8c47fdf000b653e"
 dependencies = [
  "serde",
  "serde_json",
@@ -6794,8 +6830,8 @@ dependencies = [
 
 [[package]]
 name = "sp-session"
-version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#0132d522dbbdaef4e11a772fe5987801b59964aa"
+version = "2.0.0-dev"
+source = "git+https://github.com/paritytech/substrate#88248c040fd0a0ff004f448fc8c47fdf000b653e"
 dependencies = [
  "sp-api",
  "sp-core",
@@ -6805,8 +6841,8 @@ dependencies = [
 
 [[package]]
 name = "sp-staking"
-version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#0132d522dbbdaef4e11a772fe5987801b59964aa"
+version = "2.0.0-dev"
+source = "git+https://github.com/paritytech/substrate#88248c040fd0a0ff004f448fc8c47fdf000b653e"
 dependencies = [
  "parity-scale-codec",
  "sp-runtime",
@@ -6815,8 +6851,8 @@ dependencies = [
 
 [[package]]
 name = "sp-state-machine"
-version = "0.8.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#0132d522dbbdaef4e11a772fe5987801b59964aa"
+version = "0.8.0-dev"
+source = "git+https://github.com/paritytech/substrate#88248c040fd0a0ff004f448fc8c47fdf000b653e"
 dependencies = [
  "hash-db",
  "log 0.4.8",
@@ -6834,13 +6870,13 @@ dependencies = [
 
 [[package]]
 name = "sp-std"
-version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#0132d522dbbdaef4e11a772fe5987801b59964aa"
+version = "2.0.0-dev"
+source = "git+https://github.com/paritytech/substrate#88248c040fd0a0ff004f448fc8c47fdf000b653e"
 
 [[package]]
 name = "sp-storage"
-version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#0132d522dbbdaef4e11a772fe5987801b59964aa"
+version = "2.0.0-dev"
+source = "git+https://github.com/paritytech/substrate#88248c040fd0a0ff004f448fc8c47fdf000b653e"
 dependencies = [
  "impl-serde 0.2.3",
  "serde",
@@ -6850,8 +6886,8 @@ dependencies = [
 
 [[package]]
 name = "sp-timestamp"
-version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#0132d522dbbdaef4e11a772fe5987801b59964aa"
+version = "2.0.0-dev"
+source = "git+https://github.com/paritytech/substrate#88248c040fd0a0ff004f448fc8c47fdf000b653e"
 dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec",
@@ -6864,8 +6900,8 @@ dependencies = [
 
 [[package]]
 name = "sp-transaction-pool"
-version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#0132d522dbbdaef4e11a772fe5987801b59964aa"
+version = "2.0.0-dev"
+source = "git+https://github.com/paritytech/substrate#88248c040fd0a0ff004f448fc8c47fdf000b653e"
 dependencies = [
  "derive_more 0.99.3",
  "futures 0.3.4",
@@ -6879,8 +6915,8 @@ dependencies = [
 
 [[package]]
 name = "sp-trie"
-version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#0132d522dbbdaef4e11a772fe5987801b59964aa"
+version = "2.0.0-dev"
+source = "git+https://github.com/paritytech/substrate#88248c040fd0a0ff004f448fc8c47fdf000b653e"
 dependencies = [
  "hash-db",
  "memory-db",
@@ -6893,8 +6929,8 @@ dependencies = [
 
 [[package]]
 name = "sp-utils"
-version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#0132d522dbbdaef4e11a772fe5987801b59964aa"
+version = "2.0.0-dev"
+source = "git+https://github.com/paritytech/substrate#88248c040fd0a0ff004f448fc8c47fdf000b653e"
 dependencies = [
  "futures 0.3.4",
  "futures-core",
@@ -6904,8 +6940,8 @@ dependencies = [
 
 [[package]]
 name = "sp-version"
-version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#0132d522dbbdaef4e11a772fe5987801b59964aa"
+version = "2.0.0-dev"
+source = "git+https://github.com/paritytech/substrate#88248c040fd0a0ff004f448fc8c47fdf000b653e"
 dependencies = [
  "impl-serde 0.2.3",
  "parity-scale-codec",
@@ -6916,8 +6952,8 @@ dependencies = [
 
 [[package]]
 name = "sp-wasm-interface"
-version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#0132d522dbbdaef4e11a772fe5987801b59964aa"
+version = "2.0.0-dev"
+source = "git+https://github.com/paritytech/substrate#88248c040fd0a0ff004f448fc8c47fdf000b653e"
 dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec",
@@ -7044,8 +7080,8 @@ dependencies = [
 
 [[package]]
 name = "substrate-browser-utils"
-version = "0.8.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#0132d522dbbdaef4e11a772fe5987801b59964aa"
+version = "0.8.0-dev"
+source = "git+https://github.com/paritytech/substrate#88248c040fd0a0ff004f448fc8c47fdf000b653e"
 dependencies = [
  "chrono",
  "clear_on_drop",
@@ -7064,22 +7100,23 @@ dependencies = [
  "sc-informant",
  "sc-network",
  "sc-service",
+ "sp-database",
  "wasm-bindgen",
  "wasm-bindgen-futures",
 ]
 
 [[package]]
 name = "substrate-build-script-utils"
-version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#0132d522dbbdaef4e11a772fe5987801b59964aa"
+version = "2.0.0-dev"
+source = "git+https://github.com/paritytech/substrate#88248c040fd0a0ff004f448fc8c47fdf000b653e"
 dependencies = [
  "platforms",
 ]
 
 [[package]]
 name = "substrate-frame-rpc-system"
-version = "2.0.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#0132d522dbbdaef4e11a772fe5987801b59964aa"
+version = "2.0.0-dev"
+source = "git+https://github.com/paritytech/substrate#88248c040fd0a0ff004f448fc8c47fdf000b653e"
 dependencies = [
  "frame-system-rpc-runtime-api",
  "futures 0.3.4",
@@ -7099,8 +7136,8 @@ dependencies = [
 
 [[package]]
 name = "substrate-prometheus-endpoint"
-version = "0.8.0-alpha.5"
-source = "git+https://github.com/paritytech/substrate#0132d522dbbdaef4e11a772fe5987801b59964aa"
+version = "0.8.0-dev"
+source = "git+https://github.com/paritytech/substrate#88248c040fd0a0ff004f448fc8c47fdf000b653e"
 dependencies = [
  "async-std",
  "derive_more 0.99.3",
@@ -7114,7 +7151,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-client"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#0132d522dbbdaef4e11a772fe5987801b59964aa"
+source = "git+https://github.com/paritytech/substrate#88248c040fd0a0ff004f448fc8c47fdf000b653e"
 dependencies = [
  "futures 0.3.4",
  "hash-db",
@@ -7134,7 +7171,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-runtime"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#0132d522dbbdaef4e11a772fe5987801b59964aa"
+source = "git+https://github.com/paritytech/substrate#88248c040fd0a0ff004f448fc8c47fdf000b653e"
 dependencies = [
  "cfg-if",
  "frame-executive",
@@ -7173,7 +7210,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-runtime-client"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#0132d522dbbdaef4e11a772fe5987801b59964aa"
+source = "git+https://github.com/paritytech/substrate#88248c040fd0a0ff004f448fc8c47fdf000b653e"
 dependencies = [
  "futures 0.3.4",
  "parity-scale-codec",
@@ -7191,7 +7228,7 @@ dependencies = [
 [[package]]
 name = "substrate-wasm-builder-runner"
 version = "1.0.5"
-source = "git+https://github.com/paritytech/substrate#0132d522dbbdaef4e11a772fe5987801b59964aa"
+source = "git+https://github.com/paritytech/substrate#88248c040fd0a0ff004f448fc8c47fdf000b653e"
 
 [[package]]
 name = "substrate-wasm-builder-runner"
diff --git a/polkadot/cli/Cargo.toml b/polkadot/cli/Cargo.toml
index 1af1dd4a69..f4929721cf 100644
--- a/polkadot/cli/Cargo.toml
+++ b/polkadot/cli/Cargo.toml
@@ -39,9 +39,9 @@ browser-utils = { package = "substrate-browser-utils", git = "https://github.com
 substrate-build-script-utils = { git = "https://github.com/paritytech/substrate", branch = "master" }
 
 [features]
-default = [ "wasmtime", "rocksdb", "cli" ]
+default = [ "wasmtime", "db", "cli" ]
 wasmtime = [ "sc-cli/wasmtime" ]
-rocksdb = [ "service/rocksdb" ]
+db = [ "service/db" ]
 cli = [
 	"tokio",
 	"sc-cli",
diff --git a/polkadot/network/test/src/lib.rs b/polkadot/network/test/src/lib.rs
index bddb20d4fc..2c3637cb08 100644
--- a/polkadot/network/test/src/lib.rs
+++ b/polkadot/network/test/src/lib.rs
@@ -25,6 +25,7 @@ use log::trace;
 use sc_network::config::{build_multiaddr, FinalityProofProvider, Role};
 use sp_blockchain::{
 	Result as ClientResult, well_known_cache_keys::{self, Id as CacheKeyId}, Info as BlockchainInfo,
+	HeaderBackend,
 };
 use sc_client_api::{
 	BlockchainEvents, BlockImportNotification,
@@ -310,8 +311,7 @@ impl<D> Peer<D> {
 	/// by using .info(), you should probably use it instead of this.
 	pub fn blockchain_canon_equals(&self, other: &Self) -> bool {
 		if let (Some(mine), Some(others)) = (self.backend.clone(), other.backend.clone()) {
-			mine.as_in_memory().blockchain()
-				.canon_equals_to(others.as_in_memory().blockchain())
+			mine.blockchain().info().best_hash == others.blockchain().info().best_hash
 		} else {
 			false
 		}
@@ -320,7 +320,7 @@ impl<D> Peer<D> {
 	/// Count the total number of imported blocks.
 	pub fn blocks_count(&self) -> u64 {
 		self.backend.as_ref().map(
-			|backend| backend.blocks_count()
+			|backend| backend.blockchain().info().best_number as u64
 		).unwrap_or(0)
 	}
 
diff --git a/polkadot/service/Cargo.toml b/polkadot/service/Cargo.toml
index e1110c1a1b..885bf104f3 100644
--- a/polkadot/service/Cargo.toml
+++ b/polkadot/service/Cargo.toml
@@ -61,7 +61,7 @@ polkadot-test-runtime-client = { path = "../runtime/test-runtime/client" }
 sc-block-builder = { git = "https://github.com/paritytech/substrate", branch = "master" }
 
 [features]
-default = ["rocksdb", "full-node"]
-rocksdb = ["service/rocksdb"]
+default = ["db", "full-node"]
+db = ["service/db"]
 runtime-benchmarks = ["polkadot-runtime/runtime-benchmarks", "kusama-runtime/runtime-benchmarks", "westend-runtime/runtime-benchmarks"]
 full-node = ["av_store", "consensus", "polkadot-network"]
diff --git a/polkadot/service/src/lib.rs b/polkadot/service/src/lib.rs
index 0714802d43..338997bb3a 100644
--- a/polkadot/service/src/lib.rs
+++ b/polkadot/service/src/lib.rs
@@ -363,10 +363,9 @@ 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.database {
-		path.clone()
-	} else {
-		return Err("Starting a Polkadot service with a custom database isn't supported".to_string().into());
+	let db_path = match config.database.path() {
+		Some(path) => std::path::PathBuf::from(path),
+		None => 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.network.node_name.clone();