diff --git a/Cargo.lock b/Cargo.lock
index 938424561d..a6761ca375 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -81,6 +81,12 @@ dependencies = [
  "opaque-debug 0.3.0",
 ]
 
+[[package]]
+name = "ahash"
+version = "0.4.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "739f4a8db6605981345c5654f3a85b056ce52f37a39d34da03f25bf2151ea16e"
+
 [[package]]
 name = "ahash"
 version = "0.7.4"
@@ -120,7 +126,7 @@ dependencies = [
 
 [[package]]
 name = "aleph-node"
-version = "0.3.0"
+version = "0.4.0"
 dependencies = [
  "aleph-runtime",
  "finality-aleph",
@@ -145,7 +151,6 @@ dependencies = [
  "sc-service",
  "sc-telemetry",
  "sc-transaction-pool",
- "sc-transaction-pool-api",
  "serde",
  "serde_json",
  "sp-api",
@@ -167,7 +172,7 @@ dependencies = [
 
 [[package]]
 name = "aleph-runtime"
-version = "0.3.0"
+version = "0.4.0"
 dependencies = [
  "frame-executive",
  "frame-support",
@@ -176,7 +181,6 @@ dependencies = [
  "pallet-aleph",
  "pallet-aura",
  "pallet-balances",
- "pallet-randomness-collective-flip",
  "pallet-scheduler",
  "pallet-session",
  "pallet-sudo",
@@ -198,7 +202,7 @@ dependencies = [
  "sp-std",
  "sp-transaction-pool",
  "sp-version",
- "substrate-wasm-builder 4.0.0",
+ "substrate-wasm-builder 4.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -263,9 +267,22 @@ checksum = "be4dc07131ffa69b8072d35f5007352af944213cde02545e2103680baed38fcd"
 
 [[package]]
 name = "asn1_der"
-version = "0.7.4"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6fce6b6a0ffdafebd82c87e79e3f40e8d2c523e5fea5566ff6b90509bf98d638"
+dependencies = [
+ "asn1_der_derive",
+]
+
+[[package]]
+name = "asn1_der_derive"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d6e24d2cce90c53b948c46271bfb053e4bdc2db9b5d3f65e20f8cf28a1b7fc3"
+checksum = "0d0864d84b8e07b145449be9a8537db86bf9de5ce03b913214694643b4743502"
+dependencies = [
+ "quote",
+ "syn",
+]
 
 [[package]]
 name = "async-channel"
@@ -390,20 +407,6 @@ dependencies = [
  "wasm-bindgen-futures",
 ]
 
-[[package]]
-name = "async-std-resolver"
-version = "0.20.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed4e2c3da14d8ad45acb1e3191db7a918e9505b6f155b218e70a7c9a1a48c638"
-dependencies = [
- "async-std",
- "async-trait",
- "futures-io",
- "futures-util",
- "pin-utils",
- "trust-dns-resolver",
-]
-
 [[package]]
 name = "async-task"
 version = "4.0.3"
@@ -768,15 +771,6 @@ version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "631ae5198c9be5e753e5cc215e1bd73c2b466a3565173db433f52bb9d3e66dba"
 
-[[package]]
-name = "camino"
-version = "1.0.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52d74260d9bf6944e2208aa46841b4b8f0d7ffc0849a06837b2f510337f86b2b"
-dependencies = [
- "serde",
-]
-
 [[package]]
 name = "cargo-platform"
 version = "0.1.2"
@@ -799,20 +793,6 @@ dependencies = [
  "serde_json",
 ]
 
-[[package]]
-name = "cargo_metadata"
-version = "0.13.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "081e3f0755c1f380c2d010481b6fa2e02973586d5f2b24eebb7a2a1d98b143d8"
-dependencies = [
- "camino",
- "cargo-platform",
- "semver 0.11.0",
- "semver-parser 0.10.2",
- "serde",
- "serde_json",
-]
-
 [[package]]
 name = "cc"
 version = "1.0.69"
@@ -1233,12 +1213,6 @@ dependencies = [
  "quick-error",
 ]
 
-[[package]]
-name = "downcast-rs"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650"
-
 [[package]]
 name = "dyn-clonable"
 version = "0.9.0"
@@ -1295,18 +1269,6 @@ version = "1.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457"
 
-[[package]]
-name = "enum-as-inner"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c5f0096a91d210159eceb2ff5e1c4da18388a170e1e3ce948aac9c8fdbbf595"
-dependencies = [
- "heck",
- "proc-macro2",
- "quote",
- "syn",
-]
-
 [[package]]
 name = "enumflags2"
 version = "0.6.4"
@@ -1370,9 +1332,9 @@ dependencies = [
 
 [[package]]
 name = "ethereum-types"
-version = "0.12.0"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0dd6bde671199089e601e8d47e153368b893ef885f11f365a3261ec58153c211"
+checksum = "f64b5df66a228d85e4b17e5d6c6aa43b0310898ffe8a85988c4c032357aaabfd"
 dependencies = [
  "ethbloom",
  "fixed-hash",
@@ -1445,7 +1407,7 @@ dependencies = [
 
 [[package]]
 name = "finality-aleph"
-version = "0.3.0"
+version = "0.4.0"
 dependencies = [
  "aleph-bft",
  "async-trait",
@@ -1486,9 +1448,9 @@ dependencies = [
 
 [[package]]
 name = "finality-grandpa"
-version = "0.14.3"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c832d0ed507622c7cb98e9b7f10426850fc9d38527ab8071778dcc3a81d45875"
+checksum = "2cd795898c348a8ec9edc66ec9e014031c764d4c88cc26d09b492cd93eb41339"
 dependencies = [
  "either",
  "futures 0.3.16",
@@ -1497,7 +1459,6 @@ dependencies = [
  "num-traits",
  "parity-scale-codec",
  "parking_lot 0.11.1",
- "scale-info",
 ]
 
 [[package]]
@@ -1540,7 +1501,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 [[package]]
 name = "fork-tree"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate.git?rev=8bbad73f5#8bbad73f5462028f82b5d72311a5743781230ce3"
+source = "git+https://github.com/paritytech/substrate.git?tag=v3.0.0#49a4103f4bfef55be20a5c6d26e18ff3003c3353"
 dependencies = [
  "parity-scale-codec",
 ]
@@ -1557,13 +1518,12 @@ dependencies = [
 
 [[package]]
 name = "frame-benchmarking"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?rev=8bbad73f5#8bbad73f5462028f82b5d72311a5743781230ce3"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate.git?tag=v3.0.0#49a4103f4bfef55be20a5c6d26e18ff3003c3353"
 dependencies = [
  "frame-support",
  "frame-system",
  "linregress",
- "log",
  "parity-scale-codec",
  "paste",
  "sp-api",
@@ -1574,27 +1534,15 @@ dependencies = [
  "sp-storage",
 ]
 
-[[package]]
-name = "frame-election-provider-support"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?rev=8bbad73f5#8bbad73f5462028f82b5d72311a5743781230ce3"
-dependencies = [
- "frame-support",
- "frame-system",
- "parity-scale-codec",
- "sp-arithmetic",
- "sp-npos-elections",
- "sp-std",
-]
-
 [[package]]
 name = "frame-executive"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?rev=8bbad73f5#8bbad73f5462028f82b5d72311a5743781230ce3"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate.git?tag=v3.0.0#49a4103f4bfef55be20a5c6d26e18ff3003c3353"
 dependencies = [
  "frame-support",
  "frame-system",
  "parity-scale-codec",
+ "serde",
  "sp-core",
  "sp-io",
  "sp-runtime",
@@ -1604,8 +1552,8 @@ dependencies = [
 
 [[package]]
 name = "frame-metadata"
-version = "14.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?rev=8bbad73f5#8bbad73f5462028f82b5d72311a5743781230ce3"
+version = "13.0.0"
+source = "git+https://github.com/paritytech/substrate.git?tag=v3.0.0#49a4103f4bfef55be20a5c6d26e18ff3003c3353"
 dependencies = [
  "parity-scale-codec",
  "serde",
@@ -1615,8 +1563,8 @@ dependencies = [
 
 [[package]]
 name = "frame-support"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?rev=8bbad73f5#8bbad73f5462028f82b5d72311a5743781230ce3"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate.git?tag=v3.0.0#49a4103f4bfef55be20a5c6d26e18ff3003c3353"
 dependencies = [
  "bitflags",
  "frame-metadata",
@@ -1641,8 +1589,8 @@ dependencies = [
 
 [[package]]
 name = "frame-support-procedural"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?rev=8bbad73f5#8bbad73f5462028f82b5d72311a5743781230ce3"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate.git?tag=v3.0.0#49a4103f4bfef55be20a5c6d26e18ff3003c3353"
 dependencies = [
  "Inflector",
  "frame-support-procedural-tools",
@@ -1653,11 +1601,11 @@ dependencies = [
 
 [[package]]
 name = "frame-support-procedural-tools"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?rev=8bbad73f5#8bbad73f5462028f82b5d72311a5743781230ce3"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate.git?tag=v3.0.0#49a4103f4bfef55be20a5c6d26e18ff3003c3353"
 dependencies = [
  "frame-support-procedural-tools-derive",
- "proc-macro-crate 1.0.0",
+ "proc-macro-crate 0.1.5",
  "proc-macro2",
  "quote",
  "syn",
@@ -1666,7 +1614,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural-tools-derive"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate.git?rev=8bbad73f5#8bbad73f5462028f82b5d72311a5743781230ce3"
+source = "git+https://github.com/paritytech/substrate.git?tag=v3.0.0#49a4103f4bfef55be20a5c6d26e18ff3003c3353"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1675,12 +1623,11 @@ dependencies = [
 
 [[package]]
 name = "frame-system"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?rev=8bbad73f5#8bbad73f5462028f82b5d72311a5743781230ce3"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate.git?tag=v3.0.0#49a4103f4bfef55be20a5c6d26e18ff3003c3353"
 dependencies = [
  "frame-support",
  "impl-trait-for-tuples",
- "log",
  "parity-scale-codec",
  "serde",
  "sp-core",
@@ -1692,8 +1639,8 @@ dependencies = [
 
 [[package]]
 name = "frame-system-rpc-runtime-api"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?rev=8bbad73f5#8bbad73f5462028f82b5d72311a5743781230ce3"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate.git?tag=v3.0.0#49a4103f4bfef55be20a5c6d26e18ff3003c3353"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -1796,6 +1743,22 @@ dependencies = [
  "num_cpus",
 ]
 
+[[package]]
+name = "futures-diagnose"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fdcef58a173af8148b182684c9f2d5250875adbcaff7b5794073894f9d8634a9"
+dependencies = [
+ "futures 0.1.31",
+ "futures 0.3.16",
+ "lazy_static",
+ "log",
+ "parking_lot 0.9.0",
+ "pin-project 0.4.28",
+ "serde",
+ "serde_json",
+]
+
 [[package]]
 name = "futures-executor"
 version = "0.3.16"
@@ -2041,13 +2004,22 @@ dependencies = [
  "crunchy",
 ]
 
+[[package]]
+name = "hashbrown"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04"
+dependencies = [
+ "ahash 0.4.7",
+]
+
 [[package]]
 name = "hashbrown"
 version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e"
 dependencies = [
- "ahash",
+ "ahash 0.7.4",
 ]
 
 [[package]]
@@ -2117,17 +2089,6 @@ dependencies = [
  "hmac 0.7.1",
 ]
 
-[[package]]
-name = "hostname"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c731c3e10504cc8ed35cfe2f1db4c9274c3d35fa486e3b31df46f068ef3e867"
-dependencies = [
- "libc",
- "match_cfg",
- "winapi 0.3.9",
-]
-
 [[package]]
 name = "http"
 version = "0.1.21"
@@ -2307,9 +2268,9 @@ dependencies = [
 
 [[package]]
 name = "if-watch"
-version = "0.2.2"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae8ab7f67bad3240049cb24fb9cb0b4c2c6af4c245840917fbbdededeee91179"
+checksum = "97b8538953a3f0d0d3868f0a706eb4273535e10d72acb5c82c1c23ae48835c85"
 dependencies = [
  "async-io",
  "futures 0.3.16",
@@ -2366,7 +2327,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bc633605454125dec4b66843673f01c7df2b89479b32e0ed634e43a91cff62a5"
 dependencies = [
  "autocfg",
- "hashbrown",
+ "hashbrown 0.11.2",
 ]
 
 [[package]]
@@ -2412,18 +2373,6 @@ version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2ee15951c035f79eddbef745611ec962f63f4558f1dadf98ab723cc603487c6f"
 
-[[package]]
-name = "ipconfig"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7e2f18aece9709094573a9f24f483c4f65caa4298e2f7ae1b71cc65d853fad7"
-dependencies = [
- "socket2 0.3.19",
- "widestring",
- "winapi 0.3.9",
- "winreg",
-]
-
 [[package]]
 name = "ipnet"
 version = "2.3.1"
@@ -2612,9 +2561,9 @@ dependencies = [
 
 [[package]]
 name = "kvdb"
-version = "0.10.0"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "45a3f58dc069ec0e205a27f5b45920722a46faed802a0541538241af6228f512"
+checksum = "8891bd853eff90e33024195d79d578dc984c82f9e0715fcd2b525a0c19d52811"
 dependencies = [
  "parity-util-mem",
  "smallvec 1.6.1",
@@ -2622,9 +2571,9 @@ dependencies = [
 
 [[package]]
 name = "kvdb-memorydb"
-version = "0.10.0"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3b6b85fc643f5acd0bffb2cc8a6d150209379267af0d41db72170021841f9f5"
+checksum = "30a0da8e08caf08d384a620ec19bb6c9b85c84137248e202617fb91881f25912"
 dependencies = [
  "kvdb",
  "parity-util-mem",
@@ -2633,9 +2582,9 @@ dependencies = [
 
 [[package]]
 name = "kvdb-rocksdb"
-version = "0.12.1"
+version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d169dbb316aa0fa185d02d847c047f1aa20e292cf1563d790c13536a2a732c8"
+checksum = "94b27cdb788bf1c8ade782289f9dbee626940be2961fd75c7cde993fa2f1ded1"
 dependencies = [
  "fs-swap",
  "kvdb",
@@ -2695,15 +2644,16 @@ checksum = "c7d73b3f436185384286bd8098d17ec07c9a7d2388a6599f824d8502b529702a"
 
 [[package]]
 name = "libp2p"
-version = "0.37.1"
+version = "0.34.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08053fbef67cd777049ef7a95ebaca2ece370b4ed7712c3fa404d69a88cb741b"
+checksum = "d5133112ce42be9482f6a87be92a605dd6bbc9e93c297aee77d172ff06908f3a"
 dependencies = [
  "atomic",
  "bytes 1.0.1",
  "futures 0.3.16",
  "lazy_static",
  "libp2p-core",
+ "libp2p-core-derive",
  "libp2p-deflate",
  "libp2p-dns",
  "libp2p-floodsub",
@@ -2716,10 +2666,8 @@ dependencies = [
  "libp2p-ping",
  "libp2p-plaintext",
  "libp2p-pnet",
- "libp2p-relay",
  "libp2p-request-response",
  "libp2p-swarm",
- "libp2p-swarm-derive",
  "libp2p-tcp",
  "libp2p-uds",
  "libp2p-wasm-ext",
@@ -2734,9 +2682,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-core"
-version = "0.28.3"
+version = "0.27.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "554d3e7e9e65f939d66b75fd6a4c67f258fe250da61b91f46c545fc4a89b51d9"
+checksum = "8a2d56aadc2c2bf22cd7797f86e56a65b5b3994a0136b65be3106938acae7a26"
 dependencies = [
  "asn1_der",
  "bs58",
@@ -2766,11 +2714,21 @@ dependencies = [
  "zeroize",
 ]
 
+[[package]]
+name = "libp2p-core-derive"
+version = "0.21.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f4bc40943156e42138d22ed3c57ff0e1a147237742715937622a99b10fbe0156"
+dependencies = [
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "libp2p-deflate"
-version = "0.28.0"
+version = "0.27.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2181a641cd15f9b6ba71b1335800f309012a0a97a29ffaabbbf40e9d3d58f08"
+checksum = "6d42eed63305f0420736fa487f9acef720c4528bd7852a6a760f5ccde4813345"
 dependencies = [
  "flate2",
  "futures 0.3.16",
@@ -2779,23 +2737,20 @@ dependencies = [
 
 [[package]]
 name = "libp2p-dns"
-version = "0.28.1"
+version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62e63dab8b5ff35e0c101a3e51e843ba782c07bbb1682f5fd827622e0d02b98b"
+checksum = "5153b6db68fd4baa3b304e377db744dd8fea8ff4e4504509ee636abcde88d3e3"
 dependencies = [
- "async-std-resolver",
  "futures 0.3.16",
  "libp2p-core",
  "log",
- "smallvec 1.6.1",
- "trust-dns-resolver",
 ]
 
 [[package]]
 name = "libp2p-floodsub"
-version = "0.29.0"
+version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48a9b570f6766301d9c4aa00fce3554cad1598e2f466debbc4dde909028417cf"
+checksum = "b3c63dfa06581b24b1d12bf9815b43689a784424be217d6545c800c7c75a207f"
 dependencies = [
  "cuckoofilter",
  "fnv",
@@ -2811,11 +2766,11 @@ dependencies = [
 
 [[package]]
 name = "libp2p-gossipsub"
-version = "0.30.1"
+version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7b0c8506a6ec3344b9e706d7c7a6dba826f8ede735cfe13dde12a8c263c4af9"
+checksum = "12451ba9493e87c91baf2a6dffce9ddf1fbc807a0861532d7cf477954f8ebbee"
 dependencies = [
- "asynchronous-codec 0.6.0",
+ "asynchronous-codec 0.5.0",
  "base64 0.13.0",
  "byteorder",
  "bytes 1.0.1",
@@ -2831,15 +2786,15 @@ dependencies = [
  "regex",
  "sha2 0.9.5",
  "smallvec 1.6.1",
- "unsigned-varint 0.7.0",
+ "unsigned-varint 0.6.0",
  "wasm-timer",
 ]
 
 [[package]]
 name = "libp2p-identify"
-version = "0.29.0"
+version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f668f00efd9883e8b7bcc582eaf0164615792608f886f6577da18bcbeea0a46"
+checksum = "b40fb36a059b7a8cce1514bd8b546fa612e006c9937caa7f5950cb20021fe91e"
 dependencies = [
  "futures 0.3.16",
  "libp2p-core",
@@ -2853,9 +2808,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-kad"
-version = "0.30.0"
+version = "0.28.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b07312ebe5ee4fd2404447a0609814574df55c65d4e20838b957bbd34907d820"
+checksum = "cf3da6c9acbcc05f93235d201d7d45ef4e8b88a45d8836f98becd8b4d443f066"
 dependencies = [
  "arrayvec 0.5.2",
  "asynchronous-codec 0.6.0",
@@ -2879,9 +2834,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-mdns"
-version = "0.30.2"
+version = "0.28.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4efa70c1c3d2d91237f8546e27aeb85e287d62c066a7b4f3ea6a696d43ced714"
+checksum = "0e9e6374814d1b118d97ccabdfc975c8910bd16dc38a8bc058eeb08bf2080fe1"
 dependencies = [
  "async-io",
  "data-encoding",
@@ -2892,17 +2847,17 @@ dependencies = [
  "libp2p-core",
  "libp2p-swarm",
  "log",
- "rand 0.8.4",
+ "rand 0.7.3",
  "smallvec 1.6.1",
- "socket2 0.4.1",
+ "socket2 0.3.19",
  "void",
 ]
 
 [[package]]
 name = "libp2p-mplex"
-version = "0.28.0"
+version = "0.27.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85e9b544335d1ed30af71daa96edbefadef6f19c7a55f078b9fc92c87163105d"
+checksum = "350ce8b3923594aedabd5d6e3f875d058435052a29c3f32df378bc70d10be464"
 dependencies = [
  "asynchronous-codec 0.6.0",
  "bytes 1.0.1",
@@ -2918,9 +2873,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-noise"
-version = "0.30.0"
+version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36db0f0db3b0433f5b9463f1c0cd9eadc0a3734a9170439ce501ff99733a88bd"
+checksum = "4aca322b52a0c5136142a7c3971446fb1e9964923a526c9cc6ef3b7c94e57778"
 dependencies = [
  "bytes 1.0.1",
  "curve25519-dalek 3.2.0",
@@ -2940,9 +2895,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-ping"
-version = "0.29.0"
+version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf4bfaffac63bf3c7ec11ed9d8879d455966ddea7e78ee14737f0b6dce0d1cd1"
+checksum = "6f3813276d0708c8db0f500d8beda1bda9ad955723b9cb272c41f4727256f73c"
 dependencies = [
  "futures 0.3.16",
  "libp2p-core",
@@ -2955,9 +2910,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-plaintext"
-version = "0.28.0"
+version = "0.27.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c8c37b4d2a075b4be8442760a5f8c037180f0c8dd5b5734b9978ab868b3aa11"
+checksum = "9d58defcadb646ae4b033e130b48d87410bf76394dc3335496cae99dac803e61"
 dependencies = [
  "asynchronous-codec 0.6.0",
  "bytes 1.0.1",
@@ -2984,34 +2939,11 @@ dependencies = [
  "sha3",
 ]
 
-[[package]]
-name = "libp2p-relay"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b8786aca3f18671d8776289706a5521f6c9124a820f69e358de214b9939440d"
-dependencies = [
- "asynchronous-codec 0.6.0",
- "bytes 1.0.1",
- "futures 0.3.16",
- "futures-timer 3.0.2",
- "libp2p-core",
- "libp2p-swarm",
- "log",
- "pin-project 1.0.8",
- "prost",
- "prost-build",
- "rand 0.7.3",
- "smallvec 1.6.1",
- "unsigned-varint 0.7.0",
- "void",
- "wasm-timer",
-]
-
 [[package]]
 name = "libp2p-request-response"
-version = "0.11.0"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cdbe172f08e6d0f95fa8634e273d4c4268c4063de2e33e7435194b0130c62e3"
+checksum = "10e5552827c33d8326502682da73a0ba4bfa40c1b55b216af3c303f32169dd89"
 dependencies = [
  "async-trait",
  "bytes 1.0.1",
@@ -3029,9 +2961,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-swarm"
-version = "0.29.0"
+version = "0.27.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e04d8e1eef675029ec728ba14e8d0da7975d84b6679b699b4ae91a1de9c3a92"
+checksum = "7955b973e1fd2bd61ffd43ce261c1223f61f4aacd5bae362a924993f9a25fd98"
 dependencies = [
  "either",
  "futures 0.3.16",
@@ -3043,21 +2975,11 @@ dependencies = [
  "wasm-timer",
 ]
 
-[[package]]
-name = "libp2p-swarm-derive"
-version = "0.23.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "365b0a699fea5168676840567582a012ea297b1ca02eee467e58301b9c9c5eed"
-dependencies = [
- "quote",
- "syn",
-]
-
 [[package]]
 name = "libp2p-tcp"
-version = "0.28.0"
+version = "0.27.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b1a27d21c477951799e99d5c105d78868258502ce092988040a808d5a19bbd9"
+checksum = "88a5aef80e519a6cb8e2663605142f97baaaea1a252eecbf8756184765f7471b"
 dependencies = [
  "async-io",
  "futures 0.3.16",
@@ -3067,14 +2989,14 @@ dependencies = [
  "libc",
  "libp2p-core",
  "log",
- "socket2 0.4.1",
+ "socket2 0.3.19",
 ]
 
 [[package]]
 name = "libp2p-uds"
-version = "0.28.0"
+version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffd6564bb3b7ff203661ccbb69003c2b551e34cef974f2d6c6a28306a12170b5"
+checksum = "80ac51ce419f60be966e02103c17f67ff5dc4422ba83ba54d251d6c62a4ed487"
 dependencies = [
  "async-std",
  "futures 0.3.16",
@@ -3084,9 +3006,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-wasm-ext"
-version = "0.28.2"
+version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2d413e4cf9b8e5dfbcd2a60d3dc5a3391308bdb463684093d4f67137b7113de"
+checksum = "6149c46cb76935c80bc8be6ec6e3ebd5f5e1679765a255fb34331d54610f15dd"
 dependencies = [
  "futures 0.3.16",
  "js-sys",
@@ -3098,9 +3020,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-websocket"
-version = "0.29.0"
+version = "0.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cace60995ef6f637e4752cccbb2590f6bc358e8741a0d066307636c69a4b3a74"
+checksum = "d3b1c6a3431045da8b925ed83384e4c5163e14b990572307fca9c507435d4d22"
 dependencies = [
  "either",
  "futures 0.3.16",
@@ -3116,9 +3038,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-yamux"
-version = "0.32.0"
+version = "0.30.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f35da42cfc6d5cb0dcf3ad6881bc68d146cdf38f98655e09e33fbba4d13eabc4"
+checksum = "4819358c542a86ff95f6ae691efb4b94ddaf477079b01a686f5705b79bfc232a"
 dependencies = [
  "futures 0.3.16",
  "libp2p-core",
@@ -3225,24 +3147,9 @@ version = "0.6.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7ea2d928b485416e8908cff2d97d621db22b27f7b3b6729e438bcf42c671ba91"
 dependencies = [
- "hashbrown",
-]
-
-[[package]]
-name = "lru-cache"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31e24f1ad8321ca0e8a1e0ac13f23cb668e6f5466c2c57319f6a5cf1cc8e3b1c"
-dependencies = [
- "linked-hash-map",
+ "hashbrown 0.11.2",
 ]
 
-[[package]]
-name = "match_cfg"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4"
-
 [[package]]
 name = "matchers"
 version = "0.0.1"
@@ -3299,12 +3206,12 @@ dependencies = [
 
 [[package]]
 name = "memory-db"
-version = "0.27.0"
+version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de006e09d04fc301a5f7e817b75aa49801c4479a8af753764416b085337ddcc5"
+checksum = "814bbecfc0451fc314eeea34f05bbcd5b98a7ad7af37faee088b86a1e633f1d4"
 dependencies = [
  "hash-db",
- "hashbrown",
+ "hashbrown 0.9.1",
  "parity-util-mem",
 ]
 
@@ -3328,9 +3235,9 @@ dependencies = [
 
 [[package]]
 name = "minicbor"
-version = "0.8.1"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51aa5bb0ca22415daca596a227b507f880ad1b2318a87fa9325312a5d285ca0d"
+checksum = "1c2b2c73f9640fccab53947e2b3474d5071fcbc8f82cac51ddf6c8041a30a9ea"
 dependencies = [
  "minicbor-derive",
 ]
@@ -3686,7 +3593,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-aleph"
-version = "0.1.0"
+version = "0.4.0"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3703,93 +3610,86 @@ dependencies = [
 
 [[package]]
 name = "pallet-aura"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?rev=8bbad73f5#8bbad73f5462028f82b5d72311a5743781230ce3"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate.git?tag=v3.0.0#49a4103f4bfef55be20a5c6d26e18ff3003c3353"
 dependencies = [
  "frame-support",
  "frame-system",
  "pallet-session",
  "pallet-timestamp",
  "parity-scale-codec",
+ "serde",
  "sp-application-crypto",
  "sp-consensus-aura",
  "sp-runtime",
  "sp-std",
+ "sp-timestamp",
 ]
 
 [[package]]
 name = "pallet-authorship"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?rev=8bbad73f5#8bbad73f5462028f82b5d72311a5743781230ce3"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate.git?tag=v3.0.0#49a4103f4bfef55be20a5c6d26e18ff3003c3353"
 dependencies = [
  "frame-support",
  "frame-system",
  "impl-trait-for-tuples",
  "parity-scale-codec",
  "sp-authorship",
+ "sp-inherents",
  "sp-runtime",
  "sp-std",
 ]
 
 [[package]]
 name = "pallet-babe"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?rev=8bbad73f5#8bbad73f5462028f82b5d72311a5743781230ce3"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate.git?tag=v3.0.0#49a4103f4bfef55be20a5c6d26e18ff3003c3353"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
  "frame-system",
- "log",
  "pallet-authorship",
  "pallet-session",
  "pallet-timestamp",
  "parity-scale-codec",
+ "serde",
  "sp-application-crypto",
  "sp-consensus-babe",
  "sp-consensus-vrf",
+ "sp-inherents",
  "sp-io",
  "sp-runtime",
  "sp-session",
  "sp-staking",
  "sp-std",
+ "sp-timestamp",
 ]
 
 [[package]]
 name = "pallet-balances"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?rev=8bbad73f5#8bbad73f5462028f82b5d72311a5743781230ce3"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate.git?tag=v3.0.0#49a4103f4bfef55be20a5c6d26e18ff3003c3353"
 dependencies = [
  "frame-benchmarking",
- "frame-support",
- "frame-system",
- "log",
- "parity-scale-codec",
- "sp-runtime",
- "sp-std",
-]
-
-[[package]]
-name = "pallet-randomness-collective-flip"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?rev=8bbad73f5#8bbad73f5462028f82b5d72311a5743781230ce3"
-dependencies = [
  "frame-support",
  "frame-system",
  "parity-scale-codec",
- "safe-mix",
+ "serde",
  "sp-runtime",
  "sp-std",
 ]
 
 [[package]]
 name = "pallet-scheduler"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?rev=8bbad73f5#8bbad73f5462028f82b5d72311a5743781230ce3"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate.git?tag=v3.0.0#49a4103f4bfef55be20a5c6d26e18ff3003c3353"
 dependencies = [
+ "frame-benchmarking",
  "frame-support",
  "frame-system",
- "log",
  "parity-scale-codec",
+ "serde",
  "sp-io",
  "sp-runtime",
  "sp-std",
@@ -3797,15 +3697,15 @@ dependencies = [
 
 [[package]]
 name = "pallet-session"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?rev=8bbad73f5#8bbad73f5462028f82b5d72311a5743781230ce3"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate.git?tag=v3.0.0#49a4103f4bfef55be20a5c6d26e18ff3003c3353"
 dependencies = [
  "frame-support",
  "frame-system",
  "impl-trait-for-tuples",
- "log",
  "pallet-timestamp",
  "parity-scale-codec",
+ "serde",
  "sp-core",
  "sp-io",
  "sp-runtime",
@@ -3817,20 +3717,18 @@ dependencies = [
 
 [[package]]
 name = "pallet-staking"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?rev=8bbad73f5#8bbad73f5462028f82b5d72311a5743781230ce3"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate.git?tag=v3.0.0#49a4103f4bfef55be20a5c6d26e18ff3003c3353"
 dependencies = [
- "frame-election-provider-support",
  "frame-support",
  "frame-system",
- "log",
  "pallet-authorship",
  "pallet-session",
  "parity-scale-codec",
- "paste",
  "serde",
  "sp-application-crypto",
  "sp-io",
+ "sp-npos-elections",
  "sp-runtime",
  "sp-staking",
  "sp-std",
@@ -3839,12 +3737,13 @@ dependencies = [
 
 [[package]]
 name = "pallet-sudo"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?rev=8bbad73f5#8bbad73f5462028f82b5d72311a5743781230ce3"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate.git?tag=v3.0.0#49a4103f4bfef55be20a5c6d26e18ff3003c3353"
 dependencies = [
  "frame-support",
  "frame-system",
  "parity-scale-codec",
+ "serde",
  "sp-io",
  "sp-runtime",
  "sp-std",
@@ -3852,15 +3751,15 @@ dependencies = [
 
 [[package]]
 name = "pallet-timestamp"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?rev=8bbad73f5#8bbad73f5462028f82b5d72311a5743781230ce3"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate.git?tag=v3.0.0#49a4103f4bfef55be20a5c6d26e18ff3003c3353"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
  "frame-system",
  "impl-trait-for-tuples",
- "log",
  "parity-scale-codec",
+ "serde",
  "sp-inherents",
  "sp-runtime",
  "sp-std",
@@ -3869,8 +3768,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-transaction-payment"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?rev=8bbad73f5#8bbad73f5462028f82b5d72311a5743781230ce3"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate.git?tag=v3.0.0#49a4103f4bfef55be20a5c6d26e18ff3003c3353"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3885,8 +3784,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-transaction-payment-rpc"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?rev=8bbad73f5#8bbad73f5462028f82b5d72311a5743781230ce3"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate.git?tag=v3.0.0#49a4103f4bfef55be20a5c6d26e18ff3003c3353"
 dependencies = [
  "jsonrpc-core",
  "jsonrpc-core-client",
@@ -3902,8 +3801,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-transaction-payment-rpc-runtime-api"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?rev=8bbad73f5#8bbad73f5462028f82b5d72311a5743781230ce3"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate.git?tag=v3.0.0#49a4103f4bfef55be20a5c6d26e18ff3003c3353"
 dependencies = [
  "pallet-transaction-payment",
  "parity-scale-codec",
@@ -3913,13 +3812,14 @@ dependencies = [
 
 [[package]]
 name = "pallet-vesting"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?rev=8bbad73f5#8bbad73f5462028f82b5d72311a5743781230ce3"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate.git?tag=v3.0.0#49a4103f4bfef55be20a5c6d26e18ff3003c3353"
 dependencies = [
  "enumflags2",
  "frame-support",
  "frame-system",
  "parity-scale-codec",
+ "serde",
  "sp-runtime",
  "sp-std",
 ]
@@ -4012,13 +3912,13 @@ dependencies = [
 
 [[package]]
 name = "parity-util-mem"
-version = "0.10.0"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ad6f1acec69b95caf435bbd158d486e5a0a44fcf51531e84922c59ff09e8457"
+checksum = "664a8c6b8e62d8f9f2f937e391982eb433ab285b4cd9545b342441e04a906e42"
 dependencies = [
  "cfg-if 1.0.0",
  "ethereum-types",
- "hashbrown",
+ "hashbrown 0.9.1",
  "impl-trait-for-tuples",
  "lru",
  "parity-util-mem-derive",
@@ -4050,9 +3950,9 @@ dependencies = [
 
 [[package]]
 name = "parity-wasm"
-version = "0.42.2"
+version = "0.41.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be5e13c266502aadf83426d87d81a0f5d1ef45b8027f5a471c360abfe4bfae92"
+checksum = "ddfc878dac00da22f8f61e7af3157988424567ab01d9920b962ef7dcbd7cd865"
 
 [[package]]
 name = "parity-ws"
@@ -4333,9 +4233,9 @@ checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857"
 
 [[package]]
 name = "primitive-types"
-version = "0.10.1"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05e4722c697a58a99d5d06a08c30821d7c082a4632198de1eaa5a6c22ef42373"
+checksum = "06345ee39fbccfb06ab45f3a1a5798d9dafa04cb8921a76d227040003a234b0e"
 dependencies = [
  "fixed-hash",
  "impl-codec",
@@ -4346,7 +4246,7 @@ dependencies = [
 
 [[package]]
 name = "primitives"
-version = "0.3.0"
+version = "0.4.0"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -4486,17 +4386,6 @@ dependencies = [
  "prost",
 ]
 
-[[package]]
-name = "pwasm-utils"
-version = "0.18.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0c1a2f10b47d446372a4f397c58b329aaea72b2daf9395a623a411cb8ccb54f"
-dependencies = [
- "byteorder",
- "log",
- "parity-wasm 0.42.2",
-]
-
 [[package]]
 name = "quick-error"
 version = "1.2.3"
@@ -4769,16 +4658,6 @@ dependencies = [
  "winapi 0.3.9",
 ]
 
-[[package]]
-name = "resolv-conf"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52e44394d2086d010551b14b53b1f24e31647570cd1deb0379e2c21b329aba00"
-dependencies = [
- "hostname",
- "quick-error",
-]
-
 [[package]]
 name = "retain_mut"
 version = "0.1.3"
@@ -4812,9 +4691,9 @@ dependencies = [
 
 [[package]]
 name = "rocksdb"
-version = "0.17.0"
+version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a62eca5cacf2c8261128631bed9f045598d40bfbe4b29f5163f0f802f8f44a7"
+checksum = "c749134fda8bfc90d0de643d59bfc841dcb3ac8a1062e12b6754bd60235c48b3"
 dependencies = [
  "libc",
  "librocksdb-sys",
@@ -4904,16 +4783,6 @@ dependencies = [
  "security-framework",
 ]
 
-[[package]]
-name = "ruzstd"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8cada0ef59efa6a5f4dc5e491f93d9f31e3fc7758df421ff1de8a706338e1100"
-dependencies = [
- "byteorder",
- "twox-hash",
-]
-
 [[package]]
 name = "rw-stream-sink"
 version = "0.2.1"
@@ -4931,15 +4800,6 @@ version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e"
 
-[[package]]
-name = "safe-mix"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d3d055a2582e6b00ed7a31c1524040aa391092bf636328350813f3a0605215c"
-dependencies = [
- "rustc_version 0.2.3",
-]
-
 [[package]]
 name = "salsa20"
 version = "0.7.2"
@@ -4958,21 +4818,10 @@ dependencies = [
  "winapi-util",
 ]
 
-[[package]]
-name = "sc-allocator"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?rev=8bbad73f5#8bbad73f5462028f82b5d72311a5743781230ce3"
-dependencies = [
- "log",
- "sp-core",
- "sp-wasm-interface",
- "thiserror",
-]
-
 [[package]]
 name = "sc-basic-authorship"
-version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?rev=8bbad73f5#8bbad73f5462028f82b5d72311a5743781230ce3"
+version = "0.9.0"
+source = "git+https://github.com/paritytech/substrate.git?tag=v3.0.0#49a4103f4bfef55be20a5c6d26e18ff3003c3353"
 dependencies = [
  "futures 0.3.16",
  "futures-timer 3.0.2",
@@ -4982,26 +4831,27 @@ dependencies = [
  "sc-client-api",
  "sc-proposer-metrics",
  "sc-telemetry",
- "sc-transaction-pool-api",
  "sp-api",
  "sp-blockchain",
  "sp-consensus",
  "sp-core",
  "sp-inherents",
  "sp-runtime",
+ "sp-transaction-pool",
  "substrate-prometheus-endpoint",
 ]
 
 [[package]]
 name = "sc-block-builder"
-version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?rev=8bbad73f5#8bbad73f5462028f82b5d72311a5743781230ce3"
+version = "0.9.0"
+source = "git+https://github.com/paritytech/substrate.git?tag=v3.0.0#49a4103f4bfef55be20a5c6d26e18ff3003c3353"
 dependencies = [
  "parity-scale-codec",
  "sc-client-api",
  "sp-api",
  "sp-block-builder",
  "sp-blockchain",
+ "sp-consensus",
  "sp-core",
  "sp-inherents",
  "sp-runtime",
@@ -5010,8 +4860,8 @@ dependencies = [
 
 [[package]]
 name = "sc-chain-spec"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?rev=8bbad73f5#8bbad73f5462028f82b5d72311a5743781230ce3"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate.git?tag=v3.0.0#49a4103f4bfef55be20a5c6d26e18ff3003c3353"
 dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec",
@@ -5023,6 +4873,7 @@ dependencies = [
  "sc-telemetry",
  "serde",
  "serde_json",
+ "sp-chain-spec",
  "sp-consensus-babe",
  "sp-core",
  "sp-runtime",
@@ -5030,10 +4881,10 @@ dependencies = [
 
 [[package]]
 name = "sc-chain-spec-derive"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?rev=8bbad73f5#8bbad73f5462028f82b5d72311a5743781230ce3"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate.git?tag=v3.0.0#49a4103f4bfef55be20a5c6d26e18ff3003c3353"
 dependencies = [
- "proc-macro-crate 1.0.0",
+ "proc-macro-crate 0.1.5",
  "proc-macro2",
  "quote",
  "syn",
@@ -5041,8 +4892,8 @@ dependencies = [
 
 [[package]]
 name = "sc-cli"
-version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?rev=8bbad73f5#8bbad73f5462028f82b5d72311a5743781230ce3"
+version = "0.9.0"
+source = "git+https://github.com/paritytech/substrate.git?tag=v3.0.0#49a4103f4bfef55be20a5c6d26e18ff3003c3353"
 dependencies = [
  "chrono",
  "fdlimit",
@@ -5079,8 +4930,8 @@ dependencies = [
 
 [[package]]
 name = "sc-client-api"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?rev=8bbad73f5#8bbad73f5462028f82b5d72311a5743781230ce3"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate.git?tag=v3.0.0#49a4103f4bfef55be20a5c6d26e18ff3003c3353"
 dependencies = [
  "derive_more",
  "fnv",
@@ -5092,7 +4943,6 @@ dependencies = [
  "parity-scale-codec",
  "parking_lot 0.11.1",
  "sc-executor",
- "sc-transaction-pool-api",
  "sp-api",
  "sp-blockchain",
  "sp-consensus",
@@ -5105,6 +4955,7 @@ dependencies = [
  "sp-state-machine",
  "sp-std",
  "sp-storage",
+ "sp-transaction-pool",
  "sp-trie",
  "sp-utils",
  "sp-version",
@@ -5113,8 +4964,8 @@ dependencies = [
 
 [[package]]
 name = "sc-client-db"
-version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?rev=8bbad73f5#8bbad73f5462028f82b5d72311a5743781230ce3"
+version = "0.9.0"
+source = "git+https://github.com/paritytech/substrate.git?tag=v3.0.0#49a4103f4bfef55be20a5c6d26e18ff3003c3353"
 dependencies = [
  "blake2-rfc",
  "hash-db",
@@ -5143,11 +4994,9 @@ dependencies = [
 
 [[package]]
 name = "sc-consensus"
-version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?rev=8bbad73f5#8bbad73f5462028f82b5d72311a5743781230ce3"
+version = "0.9.0"
+source = "git+https://github.com/paritytech/substrate.git?tag=v3.0.0#49a4103f4bfef55be20a5c6d26e18ff3003c3353"
 dependencies = [
- "async-trait",
- "parking_lot 0.11.1",
  "sc-client-api",
  "sp-blockchain",
  "sp-consensus",
@@ -5156,15 +5005,15 @@ dependencies = [
 
 [[package]]
 name = "sc-consensus-aura"
-version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?rev=8bbad73f5#8bbad73f5462028f82b5d72311a5743781230ce3"
+version = "0.9.0"
+source = "git+https://github.com/paritytech/substrate.git?tag=v3.0.0#49a4103f4bfef55be20a5c6d26e18ff3003c3353"
 dependencies = [
- "async-trait",
  "derive_more",
  "futures 0.3.16",
  "futures-timer 3.0.2",
  "log",
  "parity-scale-codec",
+ "parking_lot 0.11.1",
  "sc-block-builder",
  "sc-client-api",
  "sc-consensus-slots",
@@ -5181,16 +5030,16 @@ dependencies = [
  "sp-io",
  "sp-keystore",
  "sp-runtime",
+ "sp-timestamp",
  "sp-version",
  "substrate-prometheus-endpoint",
 ]
 
 [[package]]
 name = "sc-consensus-babe"
-version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?rev=8bbad73f5#8bbad73f5462028f82b5d72311a5743781230ce3"
+version = "0.9.0"
+source = "git+https://github.com/paritytech/substrate.git?tag=v3.0.0#49a4103f4bfef55be20a5c6d26e18ff3003c3353"
 dependencies = [
- "async-trait",
  "derive_more",
  "fork-tree",
  "futures 0.3.16",
@@ -5226,6 +5075,7 @@ dependencies = [
  "sp-io",
  "sp-keystore",
  "sp-runtime",
+ "sp-timestamp",
  "sp-utils",
  "sp-version",
  "substrate-prometheus-endpoint",
@@ -5233,28 +5083,27 @@ dependencies = [
 
 [[package]]
 name = "sc-consensus-epochs"
-version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?rev=8bbad73f5#8bbad73f5462028f82b5d72311a5743781230ce3"
+version = "0.9.0"
+source = "git+https://github.com/paritytech/substrate.git?tag=v3.0.0#49a4103f4bfef55be20a5c6d26e18ff3003c3353"
 dependencies = [
  "fork-tree",
  "parity-scale-codec",
+ "parking_lot 0.11.1",
  "sc-client-api",
- "sc-consensus",
  "sp-blockchain",
  "sp-runtime",
 ]
 
 [[package]]
 name = "sc-consensus-slots"
-version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?rev=8bbad73f5#8bbad73f5462028f82b5d72311a5743781230ce3"
+version = "0.9.0"
+source = "git+https://github.com/paritytech/substrate.git?tag=v3.0.0#49a4103f4bfef55be20a5c6d26e18ff3003c3353"
 dependencies = [
- "async-trait",
  "futures 0.3.16",
  "futures-timer 3.0.2",
- "impl-trait-for-tuples",
  "log",
  "parity-scale-codec",
+ "parking_lot 0.11.1",
  "sc-client-api",
  "sc-telemetry",
  "sp-api",
@@ -5267,33 +5116,35 @@ dependencies = [
  "sp-inherents",
  "sp-runtime",
  "sp-state-machine",
- "sp-timestamp",
  "sp-trie",
  "thiserror",
 ]
 
 [[package]]
 name = "sc-consensus-uncles"
-version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?rev=8bbad73f5#8bbad73f5462028f82b5d72311a5743781230ce3"
+version = "0.9.0"
+source = "git+https://github.com/paritytech/substrate.git?tag=v3.0.0#49a4103f4bfef55be20a5c6d26e18ff3003c3353"
 dependencies = [
+ "log",
  "sc-client-api",
  "sp-authorship",
+ "sp-consensus",
+ "sp-core",
+ "sp-inherents",
  "sp-runtime",
- "thiserror",
 ]
 
 [[package]]
 name = "sc-executor"
-version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?rev=8bbad73f5#8bbad73f5462028f82b5d72311a5743781230ce3"
+version = "0.9.0"
+source = "git+https://github.com/paritytech/substrate.git?tag=v3.0.0#49a4103f4bfef55be20a5c6d26e18ff3003c3353"
 dependencies = [
  "derive_more",
  "lazy_static",
  "libsecp256k1",
  "log",
  "parity-scale-codec",
- "parity-wasm 0.42.2",
+ "parity-wasm 0.41.0",
  "parking_lot 0.11.1",
  "sc-executor-common",
  "sc-executor-wasmi",
@@ -5313,15 +5164,14 @@ dependencies = [
 
 [[package]]
 name = "sc-executor-common"
-version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?rev=8bbad73f5#8bbad73f5462028f82b5d72311a5743781230ce3"
+version = "0.9.0"
+source = "git+https://github.com/paritytech/substrate.git?tag=v3.0.0#49a4103f4bfef55be20a5c6d26e18ff3003c3353"
 dependencies = [
  "derive_more",
  "parity-scale-codec",
- "pwasm-utils",
- "sc-allocator",
+ "parity-wasm 0.41.0",
+ "sp-allocator",
  "sp-core",
- "sp-maybe-compressed-blob",
  "sp-serializer",
  "sp-wasm-interface",
  "thiserror",
@@ -5330,13 +5180,13 @@ dependencies = [
 
 [[package]]
 name = "sc-executor-wasmi"
-version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?rev=8bbad73f5#8bbad73f5462028f82b5d72311a5743781230ce3"
+version = "0.9.0"
+source = "git+https://github.com/paritytech/substrate.git?tag=v3.0.0#49a4103f4bfef55be20a5c6d26e18ff3003c3353"
 dependencies = [
  "log",
  "parity-scale-codec",
- "sc-allocator",
  "sc-executor-common",
+ "sp-allocator",
  "sp-core",
  "sp-runtime-interface",
  "sp-wasm-interface",
@@ -5345,12 +5195,10 @@ dependencies = [
 
 [[package]]
 name = "sc-finality-grandpa"
-version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?rev=8bbad73f5#8bbad73f5462028f82b5d72311a5743781230ce3"
+version = "0.9.0"
+source = "git+https://github.com/paritytech/substrate.git?tag=v3.0.0#49a4103f4bfef55be20a5c6d26e18ff3003c3353"
 dependencies = [
- "async-trait",
  "derive_more",
- "dyn-clone",
  "finality-grandpa",
  "fork-tree",
  "futures 0.3.16",
@@ -5381,31 +5229,30 @@ dependencies = [
  "sp-runtime",
  "sp-utils",
  "substrate-prometheus-endpoint",
- "wasm-timer",
 ]
 
 [[package]]
 name = "sc-informant"
-version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?rev=8bbad73f5#8bbad73f5462028f82b5d72311a5743781230ce3"
+version = "0.9.0"
+source = "git+https://github.com/paritytech/substrate.git?tag=v3.0.0#49a4103f4bfef55be20a5c6d26e18ff3003c3353"
 dependencies = [
  "ansi_term 0.12.1",
  "futures 0.3.16",
- "futures-timer 3.0.2",
  "log",
  "parity-util-mem",
  "sc-client-api",
  "sc-network",
- "sc-transaction-pool-api",
  "sp-blockchain",
  "sp-runtime",
+ "sp-transaction-pool",
+ "sp-utils",
  "wasm-timer",
 ]
 
 [[package]]
 name = "sc-keystore"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?rev=8bbad73f5#8bbad73f5462028f82b5d72311a5743781230ce3"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate.git?tag=v3.0.0#49a4103f4bfef55be20a5c6d26e18ff3003c3353"
 dependencies = [
  "async-trait",
  "derive_more",
@@ -5424,8 +5271,8 @@ dependencies = [
 
 [[package]]
 name = "sc-light"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?rev=8bbad73f5#8bbad73f5462028f82b5d72311a5743781230ce3"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate.git?tag=v3.0.0#49a4103f4bfef55be20a5c6d26e18ff3003c3353"
 dependencies = [
  "hash-db",
  "lazy_static",
@@ -5443,8 +5290,8 @@ dependencies = [
 
 [[package]]
 name = "sc-network"
-version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?rev=8bbad73f5#8bbad73f5462028f82b5d72311a5743781230ce3"
+version = "0.9.0"
+source = "git+https://github.com/paritytech/substrate.git?tag=v3.0.0#49a4103f4bfef55be20a5c6d26e18ff3003c3353"
 dependencies = [
  "async-std",
  "async-trait",
@@ -5496,8 +5343,8 @@ dependencies = [
 
 [[package]]
 name = "sc-network-gossip"
-version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?rev=8bbad73f5#8bbad73f5462028f82b5d72311a5743781230ce3"
+version = "0.9.0"
+source = "git+https://github.com/paritytech/substrate.git?tag=v3.0.0#49a4103f4bfef55be20a5c6d26e18ff3003c3353"
 dependencies = [
  "futures 0.3.16",
  "futures-timer 3.0.2",
@@ -5507,20 +5354,18 @@ dependencies = [
  "sc-network",
  "sp-runtime",
  "substrate-prometheus-endpoint",
- "tracing",
  "wasm-timer",
 ]
 
 [[package]]
 name = "sc-offchain"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?rev=8bbad73f5#8bbad73f5462028f82b5d72311a5743781230ce3"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate.git?tag=v3.0.0#49a4103f4bfef55be20a5c6d26e18ff3003c3353"
 dependencies = [
  "bytes 0.5.6",
  "fnv",
  "futures 0.3.16",
  "futures-timer 3.0.2",
- "hex",
  "hyper 0.13.10",
  "hyper-rustls",
  "log",
@@ -5541,8 +5386,8 @@ dependencies = [
 
 [[package]]
 name = "sc-peerset"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?rev=8bbad73f5#8bbad73f5462028f82b5d72311a5743781230ce3"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate.git?tag=v3.0.0#49a4103f4bfef55be20a5c6d26e18ff3003c3353"
 dependencies = [
  "futures 0.3.16",
  "libp2p",
@@ -5555,7 +5400,7 @@ dependencies = [
 [[package]]
 name = "sc-proposer-metrics"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate.git?rev=8bbad73f5#8bbad73f5462028f82b5d72311a5743781230ce3"
+source = "git+https://github.com/paritytech/substrate.git?tag=v3.0.0#49a4103f4bfef55be20a5c6d26e18ff3003c3353"
 dependencies = [
  "log",
  "substrate-prometheus-endpoint",
@@ -5563,8 +5408,8 @@ dependencies = [
 
 [[package]]
 name = "sc-rpc"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?rev=8bbad73f5#8bbad73f5462028f82b5d72311a5743781230ce3"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate.git?tag=v3.0.0#49a4103f4bfef55be20a5c6d26e18ff3003c3353"
 dependencies = [
  "futures 0.3.16",
  "hash-db",
@@ -5574,16 +5419,15 @@ dependencies = [
  "parity-scale-codec",
  "parking_lot 0.11.1",
  "sc-block-builder",
- "sc-chain-spec",
  "sc-client-api",
  "sc-executor",
  "sc-keystore",
  "sc-rpc-api",
  "sc-tracing",
- "sc-transaction-pool-api",
  "serde_json",
  "sp-api",
  "sp-blockchain",
+ "sp-chain-spec",
  "sp-core",
  "sp-keystore",
  "sp-offchain",
@@ -5591,15 +5435,15 @@ dependencies = [
  "sp-runtime",
  "sp-session",
  "sp-state-machine",
- "sp-tracing",
+ "sp-transaction-pool",
  "sp-utils",
  "sp-version",
 ]
 
 [[package]]
 name = "sc-rpc-api"
-version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?rev=8bbad73f5#8bbad73f5462028f82b5d72311a5743781230ce3"
+version = "0.9.0"
+source = "git+https://github.com/paritytech/substrate.git?tag=v3.0.0#49a4103f4bfef55be20a5c6d26e18ff3003c3353"
 dependencies = [
  "derive_more",
  "futures 0.3.16",
@@ -5610,21 +5454,20 @@ dependencies = [
  "log",
  "parity-scale-codec",
  "parking_lot 0.11.1",
- "sc-chain-spec",
- "sc-transaction-pool-api",
  "serde",
  "serde_json",
+ "sp-chain-spec",
  "sp-core",
  "sp-rpc",
  "sp-runtime",
- "sp-tracing",
+ "sp-transaction-pool",
  "sp-version",
 ]
 
 [[package]]
 name = "sc-rpc-server"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?rev=8bbad73f5#8bbad73f5462028f82b5d72311a5743781230ce3"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate.git?tag=v3.0.0#49a4103f4bfef55be20a5c6d26e18ff3003c3353"
 dependencies = [
  "futures 0.1.31",
  "jsonrpc-core",
@@ -5641,10 +5484,9 @@ dependencies = [
 
 [[package]]
 name = "sc-service"
-version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?rev=8bbad73f5#8bbad73f5462028f82b5d72311a5743781230ce3"
+version = "0.9.0"
+source = "git+https://github.com/paritytech/substrate.git?tag=v3.0.0#49a4103f4bfef55be20a5c6d26e18ff3003c3353"
 dependencies = [
- "async-trait",
  "directories",
  "exit-future",
  "futures 0.1.31",
@@ -5675,7 +5517,6 @@ dependencies = [
  "sc-telemetry",
  "sc-tracing",
  "sc-transaction-pool",
- "sc-transaction-pool-api",
  "serde",
  "serde_json",
  "sp-api",
@@ -5691,10 +5532,8 @@ dependencies = [
  "sp-runtime",
  "sp-session",
  "sp-state-machine",
- "sp-storage",
  "sp-tracing",
  "sp-transaction-pool",
- "sp-transaction-storage-proof",
  "sp-trie",
  "sp-utils",
  "sp-version",
@@ -5708,8 +5547,8 @@ dependencies = [
 
 [[package]]
 name = "sc-state-db"
-version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?rev=8bbad73f5#8bbad73f5462028f82b5d72311a5743781230ce3"
+version = "0.9.0"
+source = "git+https://github.com/paritytech/substrate.git?tag=v3.0.0#49a4103f4bfef55be20a5c6d26e18ff3003c3353"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -5723,8 +5562,8 @@ dependencies = [
 
 [[package]]
 name = "sc-telemetry"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?rev=8bbad73f5#8bbad73f5462028f82b5d72311a5743781230ce3"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate.git?tag=v3.0.0#49a4103f4bfef55be20a5c6d26e18ff3003c3353"
 dependencies = [
  "chrono",
  "futures 0.3.16",
@@ -5735,16 +5574,18 @@ dependencies = [
  "rand 0.7.3",
  "serde",
  "serde_json",
+ "sp-utils",
  "take_mut",
- "thiserror",
+ "tracing",
+ "tracing-subscriber",
  "void",
  "wasm-timer",
 ]
 
 [[package]]
 name = "sc-tracing"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?rev=8bbad73f5#8bbad73f5462028f82b5d72311a5743781230ce3"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate.git?tag=v3.0.0#49a4103f4bfef55be20a5c6d26e18ff3003c3353"
 dependencies = [
  "ansi_term 0.12.1",
  "atty",
@@ -5755,107 +5596,77 @@ dependencies = [
  "parking_lot 0.11.1",
  "regex",
  "rustc-hash",
- "sc-client-api",
- "sc-rpc-server",
  "sc-telemetry",
  "sc-tracing-proc-macro",
  "serde",
  "serde_json",
- "sp-api",
- "sp-block-builder",
- "sp-blockchain",
- "sp-core",
- "sp-rpc",
- "sp-runtime",
- "sp-storage",
  "sp-tracing",
  "thiserror",
  "tracing",
+ "tracing-core",
  "tracing-log",
  "tracing-subscriber",
  "wasm-bindgen",
- "wasm-timer",
  "web-sys",
 ]
 
 [[package]]
 name = "sc-tracing-proc-macro"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?rev=8bbad73f5#8bbad73f5462028f82b5d72311a5743781230ce3"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate.git?tag=v3.0.0#49a4103f4bfef55be20a5c6d26e18ff3003c3353"
 dependencies = [
- "proc-macro-crate 1.0.0",
+ "proc-macro-crate 0.1.5",
  "proc-macro2",
  "quote",
  "syn",
 ]
 
 [[package]]
-name = "sc-transaction-pool"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?rev=8bbad73f5#8bbad73f5462028f82b5d72311a5743781230ce3"
+name = "sc-transaction-graph"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate.git?tag=v3.0.0#49a4103f4bfef55be20a5c6d26e18ff3003c3353"
 dependencies = [
  "derive_more",
  "futures 0.3.16",
- "intervalier",
  "linked-hash-map",
  "log",
- "parity-scale-codec",
  "parity-util-mem",
  "parking_lot 0.11.1",
  "retain_mut",
- "sc-client-api",
- "sc-transaction-pool-api",
  "serde",
- "sp-api",
  "sp-blockchain",
  "sp-core",
  "sp-runtime",
- "sp-tracing",
  "sp-transaction-pool",
  "sp-utils",
- "substrate-prometheus-endpoint",
  "thiserror",
  "wasm-timer",
 ]
 
 [[package]]
-name = "sc-transaction-pool-api"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?rev=8bbad73f5#8bbad73f5462028f82b5d72311a5743781230ce3"
+name = "sc-transaction-pool"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate.git?tag=v3.0.0#49a4103f4bfef55be20a5c6d26e18ff3003c3353"
 dependencies = [
- "derive_more",
  "futures 0.3.16",
+ "futures-diagnose",
+ "intervalier",
  "log",
  "parity-scale-codec",
- "serde",
+ "parity-util-mem",
+ "parking_lot 0.11.1",
+ "sc-client-api",
+ "sc-transaction-graph",
+ "sp-api",
  "sp-blockchain",
+ "sp-core",
  "sp-runtime",
+ "sp-tracing",
+ "sp-transaction-pool",
+ "sp-utils",
+ "substrate-prometheus-endpoint",
  "thiserror",
-]
-
-[[package]]
-name = "scale-info"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2e62ff266e136db561a007c84569985805f84a1d5a08278e52c36aacb6e061b"
-dependencies = [
- "bitvec 0.20.4",
- "cfg-if 1.0.0",
- "derive_more",
- "parity-scale-codec",
- "scale-info-derive",
-]
-
-[[package]]
-name = "scale-info-derive"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b648fa291891a4c80187a25532f6a7d96b82c70353e30b868b14632b8fe043d6"
-dependencies = [
- "proc-macro-crate 1.0.0",
- "proc-macro2",
- "quote",
- "syn",
+ "wasm-timer",
 ]
 
 [[package]]
@@ -5881,6 +5692,7 @@ dependencies = [
  "merlin",
  "rand 0.7.3",
  "rand_core 0.5.1",
+ "serde",
  "sha2 0.8.2",
  "subtle 2.4.1",
  "zeroize",
@@ -6128,15 +5940,6 @@ version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c307a32c1c5c437f38c7fd45d753050587732ba8628319fbdf12a7e289ccc590"
 
-[[package]]
-name = "slog"
-version = "2.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8347046d4ebd943127157b94d63abb990fcf729dc4e9978927fdf4ac3c998d06"
-dependencies = [
- "erased-serde",
-]
-
 [[package]]
 name = "smallvec"
 version = "0.6.14"
@@ -6207,13 +6010,24 @@ dependencies = [
  "sha-1 0.9.7",
 ]
 
+[[package]]
+name = "sp-allocator"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate.git?tag=v3.0.0#49a4103f4bfef55be20a5c6d26e18ff3003c3353"
+dependencies = [
+ "log",
+ "sp-core",
+ "sp-std",
+ "sp-wasm-interface",
+ "thiserror",
+]
+
 [[package]]
 name = "sp-api"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?rev=8bbad73f5#8bbad73f5462028f82b5d72311a5743781230ce3"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate.git?tag=v3.0.0#49a4103f4bfef55be20a5c6d26e18ff3003c3353"
 dependencies = [
  "hash-db",
- "log",
  "parity-scale-codec",
  "sp-api-proc-macro",
  "sp-core",
@@ -6226,11 +6040,11 @@ dependencies = [
 
 [[package]]
 name = "sp-api-proc-macro"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?rev=8bbad73f5#8bbad73f5462028f82b5d72311a5743781230ce3"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate.git?tag=v3.0.0#49a4103f4bfef55be20a5c6d26e18ff3003c3353"
 dependencies = [
  "blake2-rfc",
- "proc-macro-crate 1.0.0",
+ "proc-macro-crate 0.1.5",
  "proc-macro2",
  "quote",
  "syn",
@@ -6238,8 +6052,8 @@ dependencies = [
 
 [[package]]
 name = "sp-application-crypto"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?rev=8bbad73f5#8bbad73f5462028f82b5d72311a5743781230ce3"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate.git?tag=v3.0.0#49a4103f4bfef55be20a5c6d26e18ff3003c3353"
 dependencies = [
  "parity-scale-codec",
  "serde",
@@ -6250,8 +6064,8 @@ dependencies = [
 
 [[package]]
 name = "sp-arithmetic"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?rev=8bbad73f5#8bbad73f5462028f82b5d72311a5743781230ce3"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate.git?tag=v3.0.0#49a4103f4bfef55be20a5c6d26e18ff3003c3353"
 dependencies = [
  "integer-sqrt",
  "num-traits",
@@ -6259,15 +6073,13 @@ dependencies = [
  "serde",
  "sp-debug-derive",
  "sp-std",
- "static_assertions",
 ]
 
 [[package]]
 name = "sp-authorship"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?rev=8bbad73f5#8bbad73f5462028f82b5d72311a5743781230ce3"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate.git?tag=v3.0.0#49a4103f4bfef55be20a5c6d26e18ff3003c3353"
 dependencies = [
- "async-trait",
  "parity-scale-codec",
  "sp-inherents",
  "sp-runtime",
@@ -6276,8 +6088,8 @@ dependencies = [
 
 [[package]]
 name = "sp-block-builder"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?rev=8bbad73f5#8bbad73f5462028f82b5d72311a5743781230ce3"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate.git?tag=v3.0.0#49a4103f4bfef55be20a5c6d26e18ff3003c3353"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -6288,8 +6100,8 @@ dependencies = [
 
 [[package]]
 name = "sp-blockchain"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?rev=8bbad73f5#8bbad73f5462028f82b5d72311a5743781230ce3"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate.git?tag=v3.0.0#49a4103f4bfef55be20a5c6d26e18ff3003c3353"
 dependencies = [
  "futures 0.3.16",
  "log",
@@ -6304,12 +6116,20 @@ dependencies = [
  "thiserror",
 ]
 
+[[package]]
+name = "sp-chain-spec"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate.git?tag=v3.0.0#49a4103f4bfef55be20a5c6d26e18ff3003c3353"
+dependencies = [
+ "serde",
+ "serde_json",
+]
+
 [[package]]
 name = "sp-consensus"
-version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?rev=8bbad73f5#8bbad73f5462028f82b5d72311a5743781230ce3"
+version = "0.9.0"
+source = "git+https://github.com/paritytech/substrate.git?tag=v3.0.0#49a4103f4bfef55be20a5c6d26e18ff3003c3353"
 dependencies = [
- "async-trait",
  "futures 0.3.16",
  "futures-timer 3.0.2",
  "libp2p",
@@ -6333,14 +6153,12 @@ dependencies = [
 
 [[package]]
 name = "sp-consensus-aura"
-version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?rev=8bbad73f5#8bbad73f5462028f82b5d72311a5743781230ce3"
+version = "0.9.0"
+source = "git+https://github.com/paritytech/substrate.git?tag=v3.0.0#49a4103f4bfef55be20a5c6d26e18ff3003c3353"
 dependencies = [
- "async-trait",
  "parity-scale-codec",
  "sp-api",
  "sp-application-crypto",
- "sp-consensus",
  "sp-consensus-slots",
  "sp-inherents",
  "sp-runtime",
@@ -6350,13 +6168,11 @@ dependencies = [
 
 [[package]]
 name = "sp-consensus-babe"
-version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?rev=8bbad73f5#8bbad73f5462028f82b5d72311a5743781230ce3"
+version = "0.9.0"
+source = "git+https://github.com/paritytech/substrate.git?tag=v3.0.0#49a4103f4bfef55be20a5c6d26e18ff3003c3353"
 dependencies = [
- "async-trait",
  "merlin",
  "parity-scale-codec",
- "serde",
  "sp-api",
  "sp-application-crypto",
  "sp-consensus",
@@ -6372,8 +6188,8 @@ dependencies = [
 
 [[package]]
 name = "sp-consensus-slots"
-version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?rev=8bbad73f5#8bbad73f5462028f82b5d72311a5743781230ce3"
+version = "0.9.0"
+source = "git+https://github.com/paritytech/substrate.git?tag=v3.0.0#49a4103f4bfef55be20a5c6d26e18ff3003c3353"
 dependencies = [
  "parity-scale-codec",
  "sp-arithmetic",
@@ -6382,8 +6198,8 @@ dependencies = [
 
 [[package]]
 name = "sp-consensus-vrf"
-version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?rev=8bbad73f5#8bbad73f5462028f82b5d72311a5743781230ce3"
+version = "0.9.0"
+source = "git+https://github.com/paritytech/substrate.git?tag=v3.0.0#49a4103f4bfef55be20a5c6d26e18ff3003c3353"
 dependencies = [
  "parity-scale-codec",
  "schnorrkel",
@@ -6394,8 +6210,8 @@ dependencies = [
 
 [[package]]
 name = "sp-core"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?rev=8bbad73f5#8bbad73f5462028f82b5d72311a5743781230ce3"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate.git?tag=v3.0.0#49a4103f4bfef55be20a5c6d26e18ff3003c3353"
 dependencies = [
  "base58",
  "blake2-rfc",
@@ -6438,8 +6254,8 @@ dependencies = [
 
 [[package]]
 name = "sp-database"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?rev=8bbad73f5#8bbad73f5462028f82b5d72311a5743781230ce3"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate.git?tag=v3.0.0#49a4103f4bfef55be20a5c6d26e18ff3003c3353"
 dependencies = [
  "kvdb",
  "parking_lot 0.11.1",
@@ -6448,7 +6264,7 @@ dependencies = [
 [[package]]
 name = "sp-debug-derive"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate.git?rev=8bbad73f5#8bbad73f5462028f82b5d72311a5743781230ce3"
+source = "git+https://github.com/paritytech/substrate.git?tag=v3.0.0#49a4103f4bfef55be20a5c6d26e18ff3003c3353"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -6457,8 +6273,8 @@ dependencies = [
 
 [[package]]
 name = "sp-externalities"
-version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?rev=8bbad73f5#8bbad73f5462028f82b5d72311a5743781230ce3"
+version = "0.9.0"
+source = "git+https://github.com/paritytech/substrate.git?tag=v3.0.0#49a4103f4bfef55be20a5c6d26e18ff3003c3353"
 dependencies = [
  "environmental",
  "parity-scale-codec",
@@ -6468,8 +6284,8 @@ dependencies = [
 
 [[package]]
 name = "sp-finality-grandpa"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?rev=8bbad73f5#8bbad73f5462028f82b5d72311a5743781230ce3"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate.git?tag=v3.0.0#49a4103f4bfef55be20a5c6d26e18ff3003c3353"
 dependencies = [
  "finality-grandpa",
  "log",
@@ -6485,22 +6301,20 @@ dependencies = [
 
 [[package]]
 name = "sp-inherents"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?rev=8bbad73f5#8bbad73f5462028f82b5d72311a5743781230ce3"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate.git?tag=v3.0.0#49a4103f4bfef55be20a5c6d26e18ff3003c3353"
 dependencies = [
- "async-trait",
- "impl-trait-for-tuples",
  "parity-scale-codec",
+ "parking_lot 0.11.1",
  "sp-core",
- "sp-runtime",
  "sp-std",
  "thiserror",
 ]
 
 [[package]]
 name = "sp-io"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?rev=8bbad73f5#8bbad73f5462028f82b5d72311a5743781230ce3"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate.git?tag=v3.0.0#49a4103f4bfef55be20a5c6d26e18ff3003c3353"
 dependencies = [
  "futures 0.3.16",
  "hash-db",
@@ -6511,7 +6325,6 @@ dependencies = [
  "sp-core",
  "sp-externalities",
  "sp-keystore",
- "sp-maybe-compressed-blob",
  "sp-runtime-interface",
  "sp-state-machine",
  "sp-std",
@@ -6524,8 +6337,8 @@ dependencies = [
 
 [[package]]
 name = "sp-keyring"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?rev=8bbad73f5#8bbad73f5462028f82b5d72311a5743781230ce3"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate.git?tag=v3.0.0#49a4103f4bfef55be20a5c6d26e18ff3003c3353"
 dependencies = [
  "lazy_static",
  "sp-core",
@@ -6535,8 +6348,8 @@ dependencies = [
 
 [[package]]
 name = "sp-keystore"
-version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?rev=8bbad73f5#8bbad73f5462028f82b5d72311a5743781230ce3"
+version = "0.9.0"
+source = "git+https://github.com/paritytech/substrate.git?tag=v3.0.0#49a4103f4bfef55be20a5c6d26e18ff3003c3353"
 dependencies = [
  "async-trait",
  "derive_more",
@@ -6550,19 +6363,10 @@ dependencies = [
  "sp-externalities",
 ]
 
-[[package]]
-name = "sp-maybe-compressed-blob"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?rev=8bbad73f5#8bbad73f5462028f82b5d72311a5743781230ce3"
-dependencies = [
- "ruzstd",
- "zstd",
-]
-
 [[package]]
 name = "sp-npos-elections"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?rev=8bbad73f5#8bbad73f5462028f82b5d72311a5743781230ce3"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate.git?tag=v3.0.0#49a4103f4bfef55be20a5c6d26e18ff3003c3353"
 dependencies = [
  "parity-scale-codec",
  "serde",
@@ -6574,10 +6378,10 @@ dependencies = [
 
 [[package]]
 name = "sp-npos-elections-compact"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?rev=8bbad73f5#8bbad73f5462028f82b5d72311a5743781230ce3"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate.git?tag=v3.0.0#49a4103f4bfef55be20a5c6d26e18ff3003c3353"
 dependencies = [
- "proc-macro-crate 1.0.0",
+ "proc-macro-crate 0.1.5",
  "proc-macro2",
  "quote",
  "syn",
@@ -6585,8 +6389,8 @@ dependencies = [
 
 [[package]]
 name = "sp-offchain"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?rev=8bbad73f5#8bbad73f5462028f82b5d72311a5743781230ce3"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate.git?tag=v3.0.0#49a4103f4bfef55be20a5c6d26e18ff3003c3353"
 dependencies = [
  "sp-api",
  "sp-core",
@@ -6596,26 +6400,24 @@ dependencies = [
 [[package]]
 name = "sp-panic-handler"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate.git?rev=8bbad73f5#8bbad73f5462028f82b5d72311a5743781230ce3"
+source = "git+https://github.com/paritytech/substrate.git?tag=v3.0.0#49a4103f4bfef55be20a5c6d26e18ff3003c3353"
 dependencies = [
  "backtrace",
 ]
 
 [[package]]
 name = "sp-rpc"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?rev=8bbad73f5#8bbad73f5462028f82b5d72311a5743781230ce3"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate.git?tag=v3.0.0#49a4103f4bfef55be20a5c6d26e18ff3003c3353"
 dependencies = [
- "rustc-hash",
  "serde",
  "sp-core",
- "tracing-core",
 ]
 
 [[package]]
 name = "sp-runtime"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?rev=8bbad73f5#8bbad73f5462028f82b5d72311a5743781230ce3"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate.git?tag=v3.0.0#49a4103f4bfef55be20a5c6d26e18ff3003c3353"
 dependencies = [
  "either",
  "hash256-std-hasher",
@@ -6635,8 +6437,8 @@ dependencies = [
 
 [[package]]
 name = "sp-runtime-interface"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?rev=8bbad73f5#8bbad73f5462028f82b5d72311a5743781230ce3"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate.git?tag=v3.0.0#49a4103f4bfef55be20a5c6d26e18ff3003c3353"
 dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec",
@@ -6652,11 +6454,11 @@ dependencies = [
 
 [[package]]
 name = "sp-runtime-interface-proc-macro"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?rev=8bbad73f5#8bbad73f5462028f82b5d72311a5743781230ce3"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate.git?tag=v3.0.0#49a4103f4bfef55be20a5c6d26e18ff3003c3353"
 dependencies = [
  "Inflector",
- "proc-macro-crate 1.0.0",
+ "proc-macro-crate 0.1.5",
  "proc-macro2",
  "quote",
  "syn",
@@ -6665,7 +6467,7 @@ dependencies = [
 [[package]]
 name = "sp-serializer"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate.git?rev=8bbad73f5#8bbad73f5462028f82b5d72311a5743781230ce3"
+source = "git+https://github.com/paritytech/substrate.git?tag=v3.0.0#49a4103f4bfef55be20a5c6d26e18ff3003c3353"
 dependencies = [
  "serde",
  "serde_json",
@@ -6673,8 +6475,8 @@ dependencies = [
 
 [[package]]
 name = "sp-session"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?rev=8bbad73f5#8bbad73f5462028f82b5d72311a5743781230ce3"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate.git?tag=v3.0.0#49a4103f4bfef55be20a5c6d26e18ff3003c3353"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -6686,8 +6488,8 @@ dependencies = [
 
 [[package]]
 name = "sp-staking"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?rev=8bbad73f5#8bbad73f5462028f82b5d72311a5743781230ce3"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate.git?tag=v3.0.0#49a4103f4bfef55be20a5c6d26e18ff3003c3353"
 dependencies = [
  "parity-scale-codec",
  "sp-runtime",
@@ -6696,8 +6498,8 @@ dependencies = [
 
 [[package]]
 name = "sp-state-machine"
-version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?rev=8bbad73f5#8bbad73f5462028f82b5d72311a5743781230ce3"
+version = "0.9.0"
+source = "git+https://github.com/paritytech/substrate.git?tag=v3.0.0#49a4103f4bfef55be20a5c6d26e18ff3003c3353"
 dependencies = [
  "hash-db",
  "log",
@@ -6712,20 +6514,19 @@ dependencies = [
  "sp-std",
  "sp-trie",
  "thiserror",
- "tracing",
  "trie-db",
  "trie-root",
 ]
 
 [[package]]
 name = "sp-std"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?rev=8bbad73f5#8bbad73f5462028f82b5d72311a5743781230ce3"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate.git?tag=v3.0.0#49a4103f4bfef55be20a5c6d26e18ff3003c3353"
 
 [[package]]
 name = "sp-storage"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?rev=8bbad73f5#8bbad73f5462028f82b5d72311a5743781230ce3"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate.git?tag=v3.0.0#49a4103f4bfef55be20a5c6d26e18ff3003c3353"
 dependencies = [
  "impl-serde",
  "parity-scale-codec",
@@ -6737,8 +6538,8 @@ dependencies = [
 
 [[package]]
 name = "sp-tasks"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?rev=8bbad73f5#8bbad73f5462028f82b5d72311a5743781230ce3"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate.git?tag=v3.0.0#49a4103f4bfef55be20a5c6d26e18ff3003c3353"
 dependencies = [
  "log",
  "sp-core",
@@ -6750,33 +6551,25 @@ dependencies = [
 
 [[package]]
 name = "sp-timestamp"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?rev=8bbad73f5#8bbad73f5462028f82b5d72311a5743781230ce3"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate.git?tag=v3.0.0#49a4103f4bfef55be20a5c6d26e18ff3003c3353"
 dependencies = [
- "async-trait",
- "futures-timer 3.0.2",
- "log",
+ "impl-trait-for-tuples",
  "parity-scale-codec",
  "sp-api",
  "sp-inherents",
  "sp-runtime",
  "sp-std",
- "thiserror",
  "wasm-timer",
 ]
 
 [[package]]
 name = "sp-tracing"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?rev=8bbad73f5#8bbad73f5462028f82b5d72311a5743781230ce3"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate.git?tag=v3.0.0#49a4103f4bfef55be20a5c6d26e18ff3003c3353"
 dependencies = [
- "erased-serde",
  "log",
  "parity-scale-codec",
- "parking_lot 0.10.2",
- "serde",
- "serde_json",
- "slog",
  "sp-std",
  "tracing",
  "tracing-core",
@@ -6785,32 +6578,24 @@ dependencies = [
 
 [[package]]
 name = "sp-transaction-pool"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?rev=8bbad73f5#8bbad73f5462028f82b5d72311a5743781230ce3"
-dependencies = [
- "sp-api",
- "sp-runtime",
-]
-
-[[package]]
-name = "sp-transaction-storage-proof"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?rev=8bbad73f5#8bbad73f5462028f82b5d72311a5743781230ce3"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate.git?tag=v3.0.0#49a4103f4bfef55be20a5c6d26e18ff3003c3353"
 dependencies = [
- "async-trait",
+ "derive_more",
+ "futures 0.3.16",
  "log",
  "parity-scale-codec",
- "sp-core",
- "sp-inherents",
+ "serde",
+ "sp-api",
+ "sp-blockchain",
  "sp-runtime",
- "sp-std",
- "sp-trie",
+ "thiserror",
 ]
 
 [[package]]
 name = "sp-trie"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?rev=8bbad73f5#8bbad73f5462028f82b5d72311a5743781230ce3"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate.git?tag=v3.0.0#49a4103f4bfef55be20a5c6d26e18ff3003c3353"
 dependencies = [
  "hash-db",
  "memory-db",
@@ -6823,8 +6608,8 @@ dependencies = [
 
 [[package]]
 name = "sp-utils"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?rev=8bbad73f5#8bbad73f5462028f82b5d72311a5743781230ce3"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate.git?tag=v3.0.0#49a4103f4bfef55be20a5c6d26e18ff3003c3353"
 dependencies = [
  "futures 0.3.16",
  "futures-core",
@@ -6835,35 +6620,20 @@ dependencies = [
 
 [[package]]
 name = "sp-version"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?rev=8bbad73f5#8bbad73f5462028f82b5d72311a5743781230ce3"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate.git?tag=v3.0.0#49a4103f4bfef55be20a5c6d26e18ff3003c3353"
 dependencies = [
  "impl-serde",
  "parity-scale-codec",
- "parity-wasm 0.42.2",
  "serde",
  "sp-runtime",
  "sp-std",
- "sp-version-proc-macro",
- "thiserror",
-]
-
-[[package]]
-name = "sp-version-proc-macro"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?rev=8bbad73f5#8bbad73f5462028f82b5d72311a5743781230ce3"
-dependencies = [
- "parity-scale-codec",
- "proc-macro-crate 1.0.0",
- "proc-macro2",
- "quote",
- "syn",
 ]
 
 [[package]]
 name = "sp-wasm-interface"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?rev=8bbad73f5#8bbad73f5462028f82b5d72311a5743781230ce3"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate.git?tag=v3.0.0#49a4103f4bfef55be20a5c6d26e18ff3003c3353"
 dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec",
@@ -6988,15 +6758,15 @@ dependencies = [
 [[package]]
 name = "substrate-build-script-utils"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate.git?rev=8bbad73f5#8bbad73f5462028f82b5d72311a5743781230ce3"
+source = "git+https://github.com/paritytech/substrate.git?tag=v3.0.0#49a4103f4bfef55be20a5c6d26e18ff3003c3353"
 dependencies = [
  "platforms",
 ]
 
 [[package]]
 name = "substrate-frame-rpc-system"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?rev=8bbad73f5#8bbad73f5462028f82b5d72311a5743781230ce3"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate.git?tag=v3.0.0#49a4103f4bfef55be20a5c6d26e18ff3003c3353"
 dependencies = [
  "frame-system-rpc-runtime-api",
  "futures 0.3.16",
@@ -7007,19 +6777,19 @@ dependencies = [
  "parity-scale-codec",
  "sc-client-api",
  "sc-rpc-api",
- "sc-transaction-pool-api",
  "serde",
  "sp-api",
  "sp-block-builder",
  "sp-blockchain",
  "sp-core",
  "sp-runtime",
+ "sp-transaction-pool",
 ]
 
 [[package]]
 name = "substrate-prometheus-endpoint"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate.git?rev=8bbad73f5#8bbad73f5462028f82b5d72311a5743781230ce3"
+source = "git+https://github.com/paritytech/substrate.git?tag=v3.0.0#49a4103f4bfef55be20a5c6d26e18ff3003c3353"
 dependencies = [
  "async-std",
  "derive_more",
@@ -7033,9 +6803,8 @@ dependencies = [
 [[package]]
 name = "substrate-test-client"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate.git?rev=8bbad73f5#8bbad73f5462028f82b5d72311a5743781230ce3"
+source = "git+https://github.com/paritytech/substrate.git?tag=v3.0.0#49a4103f4bfef55be20a5c6d26e18ff3003c3353"
 dependencies = [
- "async-trait",
  "futures 0.1.31",
  "futures 0.3.16",
  "hash-db",
@@ -7046,7 +6815,6 @@ dependencies = [
  "sc-consensus",
  "sc-executor",
  "sc-light",
- "sc-offchain",
  "sc-service",
  "serde",
  "serde_json",
@@ -7062,9 +6830,10 @@ dependencies = [
 [[package]]
 name = "substrate-test-runtime"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate.git?rev=8bbad73f5#8bbad73f5462028f82b5d72311a5743781230ce3"
+source = "git+https://github.com/paritytech/substrate.git?tag=v3.0.0#49a4103f4bfef55be20a5c6d26e18ff3003c3353"
 dependencies = [
  "cfg-if 1.0.0",
+ "frame-executive",
  "frame-support",
  "frame-system",
  "frame-system-rpc-runtime-api",
@@ -7096,14 +6865,14 @@ dependencies = [
  "sp-transaction-pool",
  "sp-trie",
  "sp-version",
- "substrate-wasm-builder 5.0.0-dev",
+ "substrate-wasm-builder 4.0.0 (git+https://github.com/paritytech/substrate.git?tag=v3.0.0)",
  "trie-db",
 ]
 
 [[package]]
 name = "substrate-test-runtime-client"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate.git?rev=8bbad73f5#8bbad73f5462028f82b5d72311a5743781230ce3"
+source = "git+https://github.com/paritytech/substrate.git?tag=v3.0.0#49a4103f4bfef55be20a5c6d26e18ff3003c3353"
 dependencies = [
  "futures 0.3.16",
  "parity-scale-codec",
@@ -7130,7 +6899,7 @@ dependencies = [
  "ansi_term 0.12.1",
  "atty",
  "build-helper",
- "cargo_metadata 0.12.3",
+ "cargo_metadata",
  "tempfile",
  "toml",
  "walkdir",
@@ -7139,14 +6908,13 @@ dependencies = [
 
 [[package]]
 name = "substrate-wasm-builder"
-version = "5.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?rev=8bbad73f5#8bbad73f5462028f82b5d72311a5743781230ce3"
+version = "4.0.0"
+source = "git+https://github.com/paritytech/substrate.git?tag=v3.0.0#49a4103f4bfef55be20a5c6d26e18ff3003c3353"
 dependencies = [
  "ansi_term 0.12.1",
  "atty",
  "build-helper",
- "cargo_metadata 0.13.1",
- "sp-maybe-compressed-blob",
+ "cargo_metadata",
  "tempfile",
  "toml",
  "walkdir",
@@ -7706,7 +7474,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9eac131e334e81b6b3be07399482042838adcd7957aa0010231d0813e39e02fa"
 dependencies = [
  "hash-db",
- "hashbrown",
+ "hashbrown 0.11.2",
  "log",
  "rustc-hex",
  "smallvec 1.6.1",
@@ -7721,49 +7489,6 @@ dependencies = [
  "hash-db",
 ]
 
-[[package]]
-name = "trust-dns-proto"
-version = "0.20.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad0d7f5db438199a6e2609debe3f69f808d074e0a2888ee0bccb45fe234d03f4"
-dependencies = [
- "async-trait",
- "cfg-if 1.0.0",
- "data-encoding",
- "enum-as-inner",
- "futures-channel",
- "futures-io",
- "futures-util",
- "idna 0.2.3",
- "ipnet",
- "lazy_static",
- "log",
- "rand 0.8.4",
- "smallvec 1.6.1",
- "thiserror",
- "tinyvec",
- "url 2.2.2",
-]
-
-[[package]]
-name = "trust-dns-resolver"
-version = "0.20.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6ad17b608a64bd0735e67bde16b0636f8aa8591f831a25d18443ed00a699770"
-dependencies = [
- "cfg-if 1.0.0",
- "futures-util",
- "ipconfig",
- "lazy_static",
- "log",
- "lru-cache",
- "parking_lot 0.11.1",
- "resolv-conf",
- "smallvec 1.6.1",
- "thiserror",
- "trust-dns-proto",
-]
-
 [[package]]
 name = "try-lock"
 version = "0.2.3"
@@ -8094,26 +7819,25 @@ dependencies = [
 
 [[package]]
 name = "wasmi"
-version = "0.9.0"
+version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2ee05bba3d1d994652079893941a2ef9324d2b58a63c31b40678fb7eddd7a5a"
+checksum = "bf617d864d25af3587aa745529f7aaa541066c876d57e050c0d0c85c61c92aff"
 dependencies = [
- "downcast-rs",
  "libc",
  "memory_units",
  "num-rational 0.2.4",
  "num-traits",
- "parity-wasm 0.42.2",
+ "parity-wasm 0.41.0",
  "wasmi-validation",
 ]
 
 [[package]]
 name = "wasmi-validation"
-version = "0.4.0"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2eb8e860796d8be48efef530b60eebf84e74a88bce107374fffb0da97d504b8"
+checksum = "ea78c597064ba73596099281e2f4cfc019075122a65cdda3205af94f0b264d93"
 dependencies = [
- "parity-wasm 0.42.2",
+ "parity-wasm 0.41.0",
 ]
 
 [[package]]
@@ -8165,12 +7889,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "widestring"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c168940144dd21fd8046987c16a46a33d5fc84eec29ef9dcddc2ac9e31526b7c"
-
 [[package]]
 name = "winapi"
 version = "0.2.8"
@@ -8214,15 +7932,6 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
-[[package]]
-name = "winreg"
-version = "0.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2986deb581c4fe11b621998a5e53361efe6b48a151178d0cd9eeffa4dc6acc9"
-dependencies = [
- "winapi 0.3.9",
-]
-
 [[package]]
 name = "ws2_32-sys"
 version = "0.2.1"
@@ -8252,15 +7961,15 @@ dependencies = [
 
 [[package]]
 name = "yamux"
-version = "0.9.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7d9028f208dd5e63c614be69f115c1b53cacc1111437d4c765185856666c107"
+checksum = "1cc7bd8c983209ed5d527f44b01c41b7dc146fd960c61cf9e1d25399841dc271"
 dependencies = [
  "futures 0.3.16",
  "log",
  "nohash-hasher",
  "parking_lot 0.11.1",
- "rand 0.8.4",
+ "rand 0.7.3",
  "static_assertions",
 ]
 
@@ -8284,32 +7993,3 @@ dependencies = [
  "syn",
  "synstructure",
 ]
-
-[[package]]
-name = "zstd"
-version = "0.6.1+zstd.1.4.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5de55e77f798f205d8561b8fe2ef57abfb6e0ff2abe7fd3c089e119cdb5631a3"
-dependencies = [
- "zstd-safe",
-]
-
-[[package]]
-name = "zstd-safe"
-version = "3.0.1+zstd.1.4.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1387cabcd938127b30ce78c4bf00b30387dddf704e3f0881dbc4ff62b5566f8c"
-dependencies = [
- "libc",
- "zstd-sys",
-]
-
-[[package]]
-name = "zstd-sys"
-version = "1.4.20+zstd.1.4.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ebd5b733d7cf2d9447e2c3e76a5589b4f5e5ae065c22a2bc0b023cbc331b6c8e"
-dependencies = [
- "cc",
- "libc",
-]
diff --git a/bin/node/Cargo.toml b/bin/node/Cargo.toml
index 3fd6002523..e0f04d6b7a 100644
--- a/bin/node/Cargo.toml
+++ b/bin/node/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "aleph-node"
-version = "0.3.0"
+version = "0.4.0"
 authors = ["Cardinal Cryptography"]
 description = "Aleph node binary"
 edition = "2018"
@@ -24,45 +24,44 @@ futures = "0.3"
 hex-literal = "0.3.1"
 
 codec = { package = "parity-scale-codec", version = "2", default-features = false, features = ["derive"] }
-sp-application-crypto = { git = "https://github.com/paritytech/substrate.git", rev = "8bbad73f5"}
-sc-block-builder = { git = "https://github.com/paritytech/substrate.git", rev = "8bbad73f5"}
-sc-cli = { git = "https://github.com/paritytech/substrate.git", rev = "8bbad73f5"}
-sp-core = { git = "https://github.com/paritytech/substrate.git", rev = "8bbad73f5"}
-sc-executor = { git = "https://github.com/paritytech/substrate.git", rev = "8bbad73f5"}
-sc-service = { git = "https://github.com/paritytech/substrate.git", rev = "8bbad73f5"}
-sc-telemetry = { git = "https://github.com/paritytech/substrate.git", rev = "8bbad73f5"}
-sc-keystore = { git = "https://github.com/paritytech/substrate.git", rev = "8bbad73f5"}
-sp-keystore = { git = "https://github.com/paritytech/substrate.git", rev = "8bbad73f5"}
-sp-inherents = { git = "https://github.com/paritytech/substrate.git", rev = "8bbad73f5"}
-sc-basic-authorship = { git = "https://github.com/paritytech/substrate.git", rev = "8bbad73f5"}
-sc-transaction-pool = { git = "https://github.com/paritytech/substrate.git", rev = "8bbad73f5"}
-sp-transaction-pool = { git = "https://github.com/paritytech/substrate.git", rev = "8bbad73f5"}
-sc-transaction-pool-api = { git = "https://github.com/paritytech/substrate.git", rev = "8bbad73f5"}
-sc-consensus-aura = { git = "https://github.com/paritytech/substrate.git", rev = "8bbad73f5"}
-sp-consensus-aura = { git = "https://github.com/paritytech/substrate.git", rev = "8bbad73f5"}
-sp-consensus = { git = "https://github.com/paritytech/substrate.git", rev = "8bbad73f5"}
-sc-consensus = { git = "https://github.com/paritytech/substrate.git", rev = "8bbad73f5"}
-sc-client-api = { git = "https://github.com/paritytech/substrate.git", rev = "8bbad73f5"}
-sp-runtime = { git = "https://github.com/paritytech/substrate.git", rev = "8bbad73f5"}
-sp-timestamp = { git = "https://github.com/paritytech/substrate.git", rev = "8bbad73f5" }
+sp-application-crypto = { git = "https://github.com/paritytech/substrate.git", tag = "v3.0.0"}
+sc-block-builder = { git = "https://github.com/paritytech/substrate.git", tag = "v3.0.0"}
+sc-cli = { git = "https://github.com/paritytech/substrate.git", tag = "v3.0.0"}
+sp-core = { git = "https://github.com/paritytech/substrate.git", tag = "v3.0.0"}
+sc-executor = { git = "https://github.com/paritytech/substrate.git", tag = "v3.0.0"}
+sc-service = { git = "https://github.com/paritytech/substrate.git", tag = "v3.0.0"}
+sc-telemetry = { git = "https://github.com/paritytech/substrate.git", tag = "v3.0.0"}
+sc-keystore = { git = "https://github.com/paritytech/substrate.git", tag = "v3.0.0"}
+sp-keystore = { git = "https://github.com/paritytech/substrate.git", tag = "v3.0.0"}
+sp-inherents = { git = "https://github.com/paritytech/substrate.git", tag = "v3.0.0"}
+sc-basic-authorship = { git = "https://github.com/paritytech/substrate.git", tag = "v3.0.0"}
+sc-transaction-pool = { git = "https://github.com/paritytech/substrate.git", tag = "v3.0.0"}
+sp-transaction-pool = { git = "https://github.com/paritytech/substrate.git", tag = "v3.0.0"}
+sc-consensus-aura = { git = "https://github.com/paritytech/substrate.git", tag = "v3.0.0"}
+sp-consensus-aura = { git = "https://github.com/paritytech/substrate.git", tag = "v3.0.0"}
+sc-consensus = { git = "https://github.com/paritytech/substrate.git", tag = "v3.0.0"}
+sp-consensus = { git = "https://github.com/paritytech/substrate.git", tag = "v3.0.0"}
+sc-client-api = { git = "https://github.com/paritytech/substrate.git", tag = "v3.0.0"}
+sp-runtime = { git = "https://github.com/paritytech/substrate.git", tag = "v3.0.0"}
+sp-timestamp = { git = "https://github.com/paritytech/substrate.git", tag = "v3.0.0"}
 
-aleph-runtime = { path = "../runtime"}
-finality-aleph = { path = "../../finality-aleph"}
+aleph-runtime = {path = "../runtime"}
+finality-aleph = {path = "../../finality-aleph"}
 aleph-primitives = { package = "primitives", path = "../../primitives"}
 
 # These dependencies are used for the node template's RPCs
 jsonrpc-core = "15.1.0"
-sc-rpc = { git = "https://github.com/paritytech/substrate.git", rev = "8bbad73f5"}
-sp-api = { git = "https://github.com/paritytech/substrate.git", rev = "8bbad73f5"}
-sc-rpc-api = { git = "https://github.com/paritytech/substrate.git", rev = "8bbad73f5"}
-sp-blockchain = { git = "https://github.com/paritytech/substrate.git", rev = "8bbad73f5"}
-sp-block-builder = { git = "https://github.com/paritytech/substrate.git", rev = "8bbad73f5"}
-substrate-frame-rpc-system = { git = "https://github.com/paritytech/substrate.git", rev = "8bbad73f5"}
-pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate.git", rev = "8bbad73f5"}
-pallet-staking = { git = "https://github.com/paritytech/substrate.git", rev = "8bbad73f5"}
+sc-rpc = { git = "https://github.com/paritytech/substrate.git", tag = "v3.0.0"}
+sp-api = { git = "https://github.com/paritytech/substrate.git", tag = "v3.0.0"}
+sc-rpc-api = { git = "https://github.com/paritytech/substrate.git", tag = "v3.0.0"}
+sp-blockchain = { git = "https://github.com/paritytech/substrate.git", tag = "v3.0.0"}
+sp-block-builder = { git = "https://github.com/paritytech/substrate.git", tag = "v3.0.0"}
+substrate-frame-rpc-system = { git = "https://github.com/paritytech/substrate.git", tag = "v3.0.0"}
+pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate.git", tag = "v3.0.0"}
+pallet-staking = { git = "https://github.com/paritytech/substrate.git", tag = "v3.0.0"}
 
 [build-dependencies]
-substrate-build-script-utils = { git = "https://github.com/paritytech/substrate.git", rev = "8bbad73f5"}
+substrate-build-script-utils = { git = "https://github.com/paritytech/substrate.git", tag = "v3.0.0"}
 
 [features]
 default = []
diff --git a/bin/node/src/chain_spec.rs b/bin/node/src/chain_spec.rs
index 04fd6520c9..8d704a796d 100644
--- a/bin/node/src/chain_spec.rs
+++ b/bin/node/src/chain_spec.rs
@@ -299,12 +299,12 @@ fn testnet_genesis(
         millisecs_per_block
     );
     GenesisConfig {
-        system: SystemConfig {
+        frame_system: Some(SystemConfig {
             // Add Wasm runtime to storage.
             code: wasm_binary.to_vec(),
             changes_trie_config: Default::default(),
-        },
-        balances: BalancesConfig {
+        }),
+        pallet_balances: Some(BalancesConfig {
             // Configure endowed accounts with initial balance of 1 << 60.
             balances: authorities
                 .iter()
@@ -313,20 +313,20 @@ fn testnet_genesis(
                 .chain(rich_accounts.into_iter())
                 .map(|k| (k, 1 << 60))
                 .collect(),
-        },
-        aura: AuraConfig {
+        }),
+        pallet_aura: Some(AuraConfig {
             authorities: vec![],
-        },
-        sudo: SudoConfig {
+        }),
+        pallet_sudo: Some(SudoConfig {
             // Assign network admin rights.
             key: root_key,
-        },
-        aleph: AlephConfig {
+        }),
+        pallet_aleph: Some(AlephConfig {
             authorities: vec![],
             session_period,
             millisecs_per_block,
-        },
-        session: SessionConfig {
+        }),
+        pallet_session: Some(SessionConfig {
             keys: authorities
                 .into_iter()
                 .map(|auth| {
@@ -340,7 +340,7 @@ fn testnet_genesis(
                     )
                 })
                 .collect(),
-        },
-        vesting: VestingConfig { vesting: vec![] },
+        }),
+        pallet_vesting: Some(VestingConfig { vesting: vec![] }),
     }
 }
diff --git a/bin/node/src/rpc.rs b/bin/node/src/rpc.rs
index 11d18c64d1..2dbf8b72f2 100644
--- a/bin/node/src/rpc.rs
+++ b/bin/node/src/rpc.rs
@@ -9,10 +9,10 @@ use std::sync::Arc;
 
 use aleph_runtime::{opaque::Block, AccountId, Balance, Index};
 pub use sc_rpc_api::DenyUnsafe;
-use sc_transaction_pool_api::TransactionPool;
 use sp_api::ProvideRuntimeApi;
 use sp_block_builder::BlockBuilder;
 use sp_blockchain::{Error as BlockChainError, HeaderBackend, HeaderMetadata};
+use sp_transaction_pool::TransactionPool;
 
 /// Full client dependencies.
 pub struct FullDeps<C, P> {
diff --git a/bin/node/src/service.rs b/bin/node/src/service.rs
index 7193666b36..be21e1cec7 100644
--- a/bin/node/src/service.rs
+++ b/bin/node/src/service.rs
@@ -9,13 +9,10 @@ use finality_aleph::{
 use futures::channel::mpsc;
 use log::warn;
 use sc_client_api::ExecutorProvider;
-use sc_consensus_aura::{ImportQueueParams, SlotProportion, StartAuraParams};
 use sc_executor::native_executor_instance;
 pub use sc_executor::NativeExecutor;
 use sc_service::{error::Error as ServiceError, Configuration, TFullClient, TaskManager};
-use sc_telemetry::{Telemetry, TelemetryWorker};
 use sp_api::ProvideRuntimeApi;
-use sp_consensus::SlotData;
 use sp_consensus_aura::sr25519::AuthorityPair as AuraPair;
 use sp_keystore::{SyncCryptoStore, SyncCryptoStorePtr};
 use sp_runtime::{
@@ -48,33 +45,13 @@ pub fn new_partial(
         (
             AlephBlockImport<Block, FullBackend, FullClient>,
             mpsc::UnboundedReceiver<JustificationNotification<Block>>,
-            Option<Telemetry>,
             Option<Metrics<<Block as BlockT>::Header>>,
         ),
     >,
     ServiceError,
 > {
-    let telemetry = config
-        .telemetry_endpoints
-        .clone()
-        .filter(|x| !x.is_empty())
-        .map(|endpoints| -> Result<_, sc_telemetry::Error> {
-            let worker = TelemetryWorker::new(16)?;
-            let telemetry = worker.handle().new_telemetry(endpoints);
-            Ok((worker, telemetry))
-        })
-        .transpose()?;
-
     let (client, backend, keystore_container, task_manager) =
-        sc_service::new_full_parts::<Block, RuntimeApi, Executor>(
-            config,
-            telemetry.as_ref().map(|(_, telemetry)| telemetry.handle()),
-        )?;
-
-    let telemetry = telemetry.map(|(worker, telemetry)| {
-        task_manager.spawn_handle().spawn("telemetry", worker.run());
-        telemetry
-    });
+        sc_service::new_full_parts::<Block, RuntimeApi, Executor>(config)?;
 
     let client: Arc<TFullClient<_, _, _>> = Arc::new(client);
 
@@ -84,7 +61,7 @@ pub fn new_partial(
         config.transaction_pool.clone(),
         config.role.is_authority().into(),
         config.prometheus_registry(),
-        task_manager.spawn_essential_handle(),
+        task_manager.spawn_handle(),
         client.clone(),
     );
 
@@ -100,32 +77,23 @@ pub fn new_partial(
     let aleph_block_import =
         AlephBlockImport::new(client.clone() as Arc<_>, justification_tx, metrics.clone());
 
-    let slot_duration = sc_consensus_aura::slot_duration(&*client)?.slot_duration();
+    let inherent_data_providers = sp_inherents::InherentDataProviders::new();
 
-    let import_queue =
-        sc_consensus_aura::import_queue::<AuraPair, _, _, _, _, _, _>(ImportQueueParams {
-            block_import: aleph_block_import.clone(),
-            justification_import: Some(Box::new(aleph_block_import.clone())),
-            client: client.clone(),
-            create_inherent_data_providers: move |_, ()| async move {
-                let timestamp = sp_timestamp::InherentDataProvider::from_system_time();
-
-                let slot =
-                    sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_duration(
-                        *timestamp,
-                        slot_duration,
-                    );
+    let aura_block_import = sc_consensus_aura::AuraBlockImport::<_, _, _, AuraPair>::new(
+        aleph_block_import.clone(),
+        client.clone(),
+    );
 
-                Ok((timestamp, slot))
-            },
-            spawner: &task_manager.spawn_essential_handle(),
-            registry: config.prometheus_registry(),
-            can_author_with: sp_consensus::CanAuthorWithNativeVersion::new(
-                client.executor().clone(),
-            ),
-            check_for_equivocation: Default::default(),
-            telemetry: telemetry.as_ref().map(|x| x.handle()),
-        })?;
+    let import_queue = sc_consensus_aura::import_queue::<_, _, _, AuraPair, _, _>(
+        sc_consensus_aura::slot_duration(&*client)?,
+        aura_block_import,
+        Some(Box::new(aleph_block_import.clone())),
+        client.clone(),
+        inherent_data_providers.clone(),
+        &task_manager.spawn_handle(),
+        config.prometheus_registry(),
+        sp_consensus::CanAuthorWithNativeVersion::new(client.executor().clone()),
+    )?;
 
     Ok(sc_service::PartialComponents {
         client,
@@ -135,7 +103,8 @@ pub fn new_partial(
         keystore_container,
         select_chain,
         transaction_pool,
-        other: (aleph_block_import, justification_rx, telemetry, metrics),
+        inherent_data_providers,
+        other: (aleph_block_import, justification_rx, metrics),
     })
 }
 
@@ -153,7 +122,9 @@ pub fn new_full(mut config: Configuration) -> Result<TaskManager, ServiceError>
         keystore_container,
         select_chain,
         transaction_pool,
-        other: (block_import, justification_rx, mut telemetry, metrics),
+        inherent_data_providers,
+        other: (block_import, justification_rx, metrics),
+        ..
     } = new_partial(&config)?;
 
     config
@@ -161,7 +132,7 @@ pub fn new_full(mut config: Configuration) -> Result<TaskManager, ServiceError>
         .extra_sets
         .push(finality_aleph::peers_set_config());
 
-    let (network, system_rpc_tx, network_starter) =
+    let (network, network_status_sinks, system_rpc_tx, network_starter) =
         sc_service::build_network(sc_service::BuildNetworkParams {
             config: &config,
             client: client.clone(),
@@ -207,64 +178,44 @@ pub fn new_full(mut config: Configuration) -> Result<TaskManager, ServiceError>
         })
     };
 
-    let _rpc_handlers = sc_service::spawn_tasks(sc_service::SpawnTasksParams {
-        network: network.clone(),
-        client: client.clone(),
-        keystore: keystore_container.sync_keystore(),
-        task_manager: &mut task_manager,
-        transaction_pool: transaction_pool.clone(),
-        rpc_extensions_builder,
-        on_demand: None,
-        remote_blockchain: None,
-        backend,
-        system_rpc_tx,
-        config,
-        telemetry: telemetry.as_mut(),
-    })?;
-
+    let (_rpc_handlers, _telemetry_connection_notifier) =
+        sc_service::spawn_tasks(sc_service::SpawnTasksParams {
+            network: network.clone(),
+            client: client.clone(),
+            keystore: keystore_container.sync_keystore(),
+            task_manager: &mut task_manager,
+            transaction_pool: transaction_pool.clone(),
+            rpc_extensions_builder,
+            on_demand: None,
+            remote_blockchain: None,
+            backend,
+            network_status_sinks,
+            system_rpc_tx,
+            config,
+        })?;
     if role.is_authority() {
-        let proposer_factory = sc_basic_authorship::ProposerFactory::new(
+        let proposer = sc_basic_authorship::ProposerFactory::new(
             task_manager.spawn_handle(),
             client.clone(),
             transaction_pool,
             prometheus_registry.as_ref(),
-            None,
         );
 
         let can_author_with =
             sp_consensus::CanAuthorWithNativeVersion::new(client.executor().clone());
 
-        let slot_duration = sc_consensus_aura::slot_duration(&*client)?;
-        let raw_slot_duration = slot_duration.slot_duration();
-
-        let aura = sc_consensus_aura::start_aura::<AuraPair, _, _, _, _, _, _, _, _, _, _, _>(
-            StartAuraParams {
-                slot_duration,
-                client: client.clone(),
-                select_chain: select_chain.clone(),
-                block_import,
-                proposer_factory,
-                create_inherent_data_providers: move |_, ()| async move {
-                    let timestamp = sp_timestamp::InherentDataProvider::from_system_time();
-
-                    let slot =
-                        sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_duration(
-                            *timestamp,
-                            raw_slot_duration,
-                        );
-
-                    Ok((timestamp, slot))
-                },
-                force_authoring,
-                backoff_authoring_blocks,
-                keystore: keystore_container.sync_keystore(),
-                can_author_with,
-                sync_oracle: network.clone(),
-                justification_sync_link: network.clone(),
-                block_proposal_slot_portion: SlotProportion::new(2f32 / 3f32),
-                max_block_proposal_slot_portion: None,
-                telemetry: telemetry.as_ref().map(|x| x.handle()),
-            },
+        let aura = sc_consensus_aura::start_aura::<_, _, _, _, _, AuraPair, _, _, _, _>(
+            sc_consensus_aura::slot_duration(&*client)?,
+            client.clone(),
+            select_chain.clone(),
+            block_import,
+            proposer,
+            network.clone(),
+            inherent_data_providers,
+            force_authoring,
+            backoff_authoring_blocks,
+            keystore_container.sync_keystore(),
+            can_author_with,
         )?;
 
         task_manager
diff --git a/bin/runtime/Cargo.toml b/bin/runtime/Cargo.toml
index ab14bf6e55..91609be105 100644
--- a/bin/runtime/Cargo.toml
+++ b/bin/runtime/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "aleph-runtime"
-version = "0.3.0"
+version = "0.4.0"
 authors = ["Cardinal Cryptography"]
 edition = "2018"
 license = "Apache 2.0"
@@ -17,34 +17,33 @@ serde = { version = "1.0.101", optional = true, features = ["derive"] }
 primitives = { path = "../../primitives", default-features = false }
 pallet-aleph = { path = "../../pallet", default-features = false}
 
-frame-executive = { default-features = false, git = "https://github.com/paritytech/substrate.git", rev = "8bbad73f5"}
-frame-support = { default-features = false, git = "https://github.com/paritytech/substrate.git", rev = "8bbad73f5"}
-frame-system = { default-features = false, git = "https://github.com/paritytech/substrate.git", rev = "8bbad73f5"}
-frame-system-rpc-runtime-api = { default-features = false, git = "https://github.com/paritytech/substrate.git", rev = "8bbad73f5"}
+frame-executive = { default-features = false, git = "https://github.com/paritytech/substrate.git", tag = "v3.0.0"}
+frame-support = { default-features = false, git = "https://github.com/paritytech/substrate.git", tag = "v3.0.0"}
+frame-system = { default-features = false, git = "https://github.com/paritytech/substrate.git", tag = "v3.0.0"}
+frame-system-rpc-runtime-api = { default-features = false, git = "https://github.com/paritytech/substrate.git", tag = "v3.0.0"}
 
-pallet-aura = { default-features = false, git = "https://github.com/paritytech/substrate.git", rev = "8bbad73f5"}
-pallet-balances = { default-features = false, git = "https://github.com/paritytech/substrate.git", rev = "8bbad73f5"}
-pallet-randomness-collective-flip = { default-features = false, git = "https://github.com/paritytech/substrate.git", rev = "8bbad73f5"}
-pallet-session = { default-features = false, git = "https://github.com/paritytech/substrate.git", rev = "8bbad73f5"}
-pallet-scheduler = { default-features = false, git = "https://github.com/paritytech/substrate.git", rev = "8bbad73f5"}
-pallet-sudo = { default-features = false, git = "https://github.com/paritytech/substrate.git", rev = "8bbad73f5"}
-pallet-timestamp = { default-features = false, git = "https://github.com/paritytech/substrate.git", rev = "8bbad73f5"}
-pallet-transaction-payment = { default-features = false, git = "https://github.com/paritytech/substrate.git", rev = "8bbad73f5"}
-pallet-vesting = { default-features = false, git = "https://github.com/paritytech/substrate.git", rev = "8bbad73f5"}
+pallet-aura = { default-features = false, git = "https://github.com/paritytech/substrate.git", tag = "v3.0.0"}
+pallet-balances = { default-features = false, git = "https://github.com/paritytech/substrate.git", tag = "v3.0.0"}
+pallet-session = { default-features = false, git = "https://github.com/paritytech/substrate.git", tag = "v3.0.0"}
+pallet-scheduler = { default-features = false, git = "https://github.com/paritytech/substrate.git", tag = "v3.0.0"}
+pallet-sudo = { default-features = false, git = "https://github.com/paritytech/substrate.git", tag = "v3.0.0"}
+pallet-timestamp = { default-features = false, git = "https://github.com/paritytech/substrate.git", tag = "v3.0.0"}
+pallet-transaction-payment = { default-features = false, git = "https://github.com/paritytech/substrate.git", tag = "v3.0.0"}
+pallet-vesting = { default-features = false, git = "https://github.com/paritytech/substrate.git", tag = "v3.0.0"}
 
-sp-api = { default-features = false, git = "https://github.com/paritytech/substrate.git", rev = "8bbad73f5"}
-sp-block-builder = { default-features = false, git = "https://github.com/paritytech/substrate.git", rev = "8bbad73f5"}
-sp-consensus-aura = { default-features = false, git = "https://github.com/paritytech/substrate.git", rev = "8bbad73f5"}
-sp-core = { default-features = false, git = "https://github.com/paritytech/substrate.git", rev = "8bbad73f5"}
-sp-inherents = { default-features = false, git = "https://github.com/paritytech/substrate.git", rev = "8bbad73f5"}
-sp-offchain = { default-features = false, git = "https://github.com/paritytech/substrate.git", rev = "8bbad73f5"}
-sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", rev = "8bbad73f5"}
-sp-session = { default-features = false, git = "https://github.com/paritytech/substrate.git", rev = "8bbad73f5"}
-sp-std = { default-features = false, git = "https://github.com/paritytech/substrate.git", rev = "8bbad73f5"}
-sp-transaction-pool = { default-features = false, git = "https://github.com/paritytech/substrate.git", rev = "8bbad73f5"}
-sp-version = { default-features = false, git = "https://github.com/paritytech/substrate.git", rev = "8bbad73f5"}
+sp-api = { default-features = false, git = "https://github.com/paritytech/substrate.git", tag = "v3.0.0"}
+sp-block-builder = { default-features = false, git = "https://github.com/paritytech/substrate.git", tag = "v3.0.0"}
+sp-consensus-aura = { default-features = false, git = "https://github.com/paritytech/substrate.git", tag = "v3.0.0"}
+sp-core = { default-features = false, git = "https://github.com/paritytech/substrate.git", tag = "v3.0.0"}
+sp-inherents = { default-features = false, git = "https://github.com/paritytech/substrate.git", tag = "v3.0.0"}
+sp-offchain = { default-features = false, git = "https://github.com/paritytech/substrate.git", tag = "v3.0.0"}
+sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", tag = "v3.0.0"}
+sp-session = { default-features = false, git = "https://github.com/paritytech/substrate.git", tag = "v3.0.0"}
+sp-std = { default-features = false, git = "https://github.com/paritytech/substrate.git", tag = "v3.0.0"}
+sp-transaction-pool = { default-features = false, git = "https://github.com/paritytech/substrate.git", tag = "v3.0.0"}
+sp-version = { default-features = false, git = "https://github.com/paritytech/substrate.git", tag = "v3.0.0"}
 
-pallet-transaction-payment-rpc-runtime-api = { default-features = false, git = "https://github.com/paritytech/substrate.git", rev = "8bbad73f5"}
+pallet-transaction-payment-rpc-runtime-api = { default-features = false, git = "https://github.com/paritytech/substrate.git", tag = "v3.0.0"}
 
 
 [build-dependencies]
@@ -59,12 +58,10 @@ std = [
         "pallet-aleph/std",
         "pallet-aura/std",
         "pallet-balances/std",
-        "pallet-randomness-collective-flip/std",
         "pallet-session/std",
         "pallet-sudo/std",
         "pallet-timestamp/std",
         "pallet-transaction-payment/std",
-        "pallet-vesting/std",
         "serde",
         "sp-api/std",
         "sp-block-builder/std",
@@ -81,4 +78,6 @@ std = [
         "pallet-transaction-payment-rpc-runtime-api/std",
         "frame-system-rpc-runtime-api/std",
         "primitives/std",
+        "pallet-vesting/std",
+        "pallet-scheduler/std",
 ]
diff --git a/bin/runtime/src/lib.rs b/bin/runtime/src/lib.rs
index 85d59e664e..c1325d9657 100644
--- a/bin/runtime/src/lib.rs
+++ b/bin/runtime/src/lib.rs
@@ -43,7 +43,6 @@ use primitives::{ApiError as AlephApiError, AuthorityId as AlephId};
 pub use pallet_balances::Call as BalancesCall;
 pub use pallet_timestamp::Call as TimestampCall;
 use pallet_transaction_payment::CurrencyAdapter;
-use sp_consensus_aura::SlotDuration;
 #[cfg(any(feature = "std", test))]
 pub use sp_runtime::BuildStorage;
 pub use sp_runtime::{Perbill, Permill};
@@ -149,7 +148,7 @@ parameter_types! {
 
 impl frame_system::Config for Runtime {
     /// The basic call filter to use in dispatchable.
-    type BaseCallFilter = frame_support::traits::AllowAll;
+    type BaseCallFilter = ();
     /// Block & extrinsics weights: base values and limits.
     type BlockWeights = BlockWeights;
     /// The maximum length of a block (in bytes).
@@ -194,11 +193,8 @@ impl frame_system::Config for Runtime {
     type SystemWeightInfo = ();
     /// This is used as an identifier of the chain. 42 is the generic substrate prefix.
     type SS58Prefix = SS58Prefix;
-    type OnSetCode = ();
 }
 
-impl pallet_randomness_collective_flip::Config for Runtime {}
-
 impl pallet_aura::Config for Runtime {
     type AuthorityId = AuraId;
 }
@@ -230,8 +226,6 @@ parameter_types! {
 
 impl pallet_balances::Config for Runtime {
     type MaxLocks = MaxLocks;
-    type MaxReserves = ();
-    type ReserveIdentifier = [u8; 8];
     /// The type for recording an account's balance.
     type Balance = Balance;
     /// The ubiquitous event type.
@@ -356,23 +350,23 @@ impl pallet_vesting::Config for Runtime {
 }
 
 // Create the runtime by composing the FRAME pallets that were previously configured.
+#[deny(clippy::from_over_into)]
 construct_runtime!(
     pub enum Runtime where
         Block = Block,
         NodeBlock = opaque::Block,
         UncheckedExtrinsic = UncheckedExtrinsic
     {
-        System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
-        RandomnessCollectiveFlip: pallet_randomness_collective_flip::{Pallet, Storage},
-        Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent},
-        Aura: pallet_aura::{Pallet, Config<T>},
-        Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
-        TransactionPayment: pallet_transaction_payment::{Pallet, Storage},
-        Sudo: pallet_sudo::{Pallet, Call, Config<T>, Storage, Event<T>},
-        Aleph: pallet_aleph::{Pallet, Call, Config<T>, Storage},
-        Session: pallet_session::{Pallet, Call, Storage, Event, Config<T>},
-        Scheduler: pallet_scheduler::{Pallet, Call, Storage, Event<T>},
-        Vesting: pallet_vesting::{Pallet, Call, Storage, Event<T>, Config<T>},
+        System: frame_system::{Module, Call, Config, Storage, Event<T>},
+        Timestamp: pallet_timestamp::{Module, Call, Storage, Inherent},
+        Aura: pallet_aura::{Module, Config<T>},
+        Balances: pallet_balances::{Module, Call, Storage, Config<T>, Event<T>},
+        TransactionPayment: pallet_transaction_payment::{Module, Storage},
+        Sudo: pallet_sudo::{Module, Call, Config<T>, Storage, Event<T>},
+        Aleph: pallet_aleph::{Module, Call, Config<T>, Storage},
+        Session: pallet_session::{Module, Call, Storage, Event, Config<T>},
+        Scheduler: pallet_scheduler::{Module, Call, Storage, Event<T>},
+        Vesting: pallet_vesting::{Module, Call, Storage, Event<T>, Config<T>},
     }
 );
 
@@ -406,7 +400,7 @@ pub type Executive = frame_executive::Executive<
     Block,
     frame_system::ChainContext<Runtime>,
     Runtime,
-    AllPallets,
+    AllModules,
 >;
 
 impl_runtime_apis! {
@@ -449,21 +443,24 @@ impl_runtime_apis! {
         ) -> sp_inherents::CheckInherentsResult {
             data.check_extrinsics(&block)
         }
+
+        fn random_seed() -> <Block as BlockT>::Hash {
+            Default::default()
+        }
     }
 
     impl sp_transaction_pool::runtime_api::TaggedTransactionQueue<Block> for Runtime {
         fn validate_transaction(
             source: TransactionSource,
             tx: <Block as BlockT>::Extrinsic,
-            block_hash: <Block as BlockT>::Hash,
         ) -> TransactionValidity {
-            Executive::validate_transaction(source, tx, block_hash)
+            Executive::validate_transaction(source, tx)
         }
     }
 
     impl sp_consensus_aura::AuraApi<Block, AuraId> for Runtime {
-        fn slot_duration() -> SlotDuration {
-            SlotDuration::from_millis(Aura::slot_duration())
+        fn slot_duration() -> u64 {
+            Aura::slot_duration()
         }
 
         fn authorities() -> Vec<AuraId> {
diff --git a/finality-aleph/Cargo.toml b/finality-aleph/Cargo.toml
index a22e72ac12..55dc37ae72 100644
--- a/finality-aleph/Cargo.toml
+++ b/finality-aleph/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "finality-aleph"
-version = "0.3.0"
+version = "0.4.0"
 authors = ["Cardinal Cryptography"]
 edition = "2018"
 
@@ -17,30 +17,30 @@ rand = "0.8"
 futures = "0.3"
 futures-timer = "3.0"
 parking_lot = "0.11"
-parity-util-mem = "0.10"
-prometheus-endpoint = { package = "substrate-prometheus-endpoint", git = "https://github.com/paritytech/substrate.git", rev = "8bbad73f5"}
-sp-keystore = { git = "https://github.com/paritytech/substrate.git", rev = "8bbad73f5"}
-sc-network = { git = "https://github.com/paritytech/substrate.git", rev = "8bbad73f5"}
-sc-telemetry = { git = "https://github.com/paritytech/substrate.git", rev = "8bbad73f5"}
+parity-util-mem = "0.9"
+prometheus-endpoint = { package = "substrate-prometheus-endpoint", git = "https://github.com/paritytech/substrate.git", tag = "v3.0.0"}
+sp-keystore = { git = "https://github.com/paritytech/substrate.git", tag = "v3.0.0"}
+sc-network = { git = "https://github.com/paritytech/substrate.git", tag = "v3.0.0"}
+sc-telemetry = { git = "https://github.com/paritytech/substrate.git", tag = "v3.0.0"}
 aleph-bft = { git = "https://github.com/Cardinal-Cryptography/AlephBFT/", rev = "ffff285"}
 serde = "1.0"
-sc-service = { git = "https://github.com/paritytech/substrate.git", rev = "8bbad73f5"}
-sp-application-crypto = { git = "https://github.com/paritytech/substrate.git", rev = "8bbad73f5"}
-sp-core = { git = "https://github.com/paritytech/substrate.git", rev = "8bbad73f5"}
-sp-runtime = { git = "https://github.com/paritytech/substrate.git", rev = "8bbad73f5"}
-sp-state-machine = { git = "https://github.com/paritytech/substrate.git", rev = "8bbad73f5"}
-sp-trie = { git = "https://github.com/paritytech/substrate.git", rev = "8bbad73f5"}
-sp-utils = {  git = "https://github.com/paritytech/substrate.git", rev = "8bbad73f5"}
-sp-api = { git = "https://github.com/paritytech/substrate.git", rev = "8bbad73f5"}
-sp-blockchain = { git = "https://github.com/paritytech/substrate.git", rev = "8bbad73f5"}
-sp-consensus= { git = "https://github.com/paritytech/substrate.git", rev = "8bbad73f5"}
-sc-client-api = { git = "https://github.com/paritytech/substrate.git", rev = "8bbad73f5"}
-sp-io= { git = "https://github.com/paritytech/substrate.git", rev = "8bbad73f5"}
+sc-service = { git = "https://github.com/paritytech/substrate.git", tag = "v3.0.0"}
+sp-application-crypto = { git = "https://github.com/paritytech/substrate.git", tag = "v3.0.0"}
+sp-core = { git = "https://github.com/paritytech/substrate.git", tag = "v3.0.0"}
+sp-runtime = { git = "https://github.com/paritytech/substrate.git", tag = "v3.0.0"}
+sp-state-machine = { git = "https://github.com/paritytech/substrate.git", tag = "v3.0.0"}
+sp-trie = { git = "https://github.com/paritytech/substrate.git", tag = "v3.0.0"}
+sp-utils = { git = "https://github.com/paritytech/substrate.git", tag = "v3.0.0"}
+sp-api = { git = "https://github.com/paritytech/substrate.git", tag = "v3.0.0"}
+sp-blockchain = { git = "https://github.com/paritytech/substrate.git", tag = "v3.0.0"}
+sp-consensus= { git = "https://github.com/paritytech/substrate.git", tag = "v3.0.0"}
+sc-client-api = { git = "https://github.com/paritytech/substrate.git", tag = "v3.0.0"}
+sp-io= { git = "https://github.com/paritytech/substrate.git", tag = "v3.0.0"}
 derive_more = "0.99.7"
 env_logger = "0.8.3"
 async-trait = "0.1.42"
 
 [dev-dependencies]
-substrate-test-runtime-client = { git = "https://github.com/paritytech/substrate.git", rev = "8bbad73f5"}
-substrate-test-runtime = { git = "https://github.com/paritytech/substrate.git", rev = "8bbad73f5"}
-sc-block-builder = { git = "https://github.com/paritytech/substrate.git", rev = "8bbad73f5"}
+sc-block-builder = { git = "https://github.com/paritytech/substrate.git", tag = "v3.0.0"}
+substrate-test-runtime = { git = "https://github.com/paritytech/substrate.git", tag = "v3.0.0"}
+substrate-test-runtime-client = { git = "https://github.com/paritytech/substrate.git", tag = "v3.0.0"}
diff --git a/finality-aleph/src/data_io.rs b/finality-aleph/src/data_io.rs
index 571e183148..21c7f89b8c 100644
--- a/finality-aleph/src/data_io.rs
+++ b/finality-aleph/src/data_io.rs
@@ -3,7 +3,6 @@ use aleph_bft::OrderedBatch;
 use codec::{Decode, Encode};
 use futures::channel::{mpsc, oneshot};
 use lru::LruCache;
-use parking_lot::Mutex;
 use sp_consensus::SelectChain;
 use sp_runtime::traits::{Block as BlockT, Header as HeaderT, NumberFor};
 use std::{
@@ -14,7 +13,6 @@ use std::{
     time::Duration,
 };
 
-const REFRESH_INTERVAL: u64 = 100;
 use futures::channel::mpsc::{UnboundedReceiver, UnboundedSender};
 use futures_timer::Delay;
 use log::{debug, trace};
@@ -233,46 +231,23 @@ where
 }
 
 #[derive(Clone)]
-pub(crate) struct DataIO<B: BlockT> {
-    pub(crate) best_chain: Arc<Mutex<AlephDataFor<B>>>,
+pub(crate) struct DataIO<B: BlockT, SC: SelectChain<B>> {
+    pub(crate) select_chain: SC,
     pub(crate) ordered_batch_tx: mpsc::UnboundedSender<OrderedBatch<AlephDataFor<B>>>,
     pub(crate) metrics: Option<Metrics<B::Header>>,
 }
 
-pub(crate) async fn refresh_best_chain<B: BlockT, SC: SelectChain<B>>(
-    select_chain: SC,
-    best_chain: Arc<Mutex<AlephDataFor<B>>>,
-    mut exit: oneshot::Receiver<()>,
-) {
-    loop {
-        let delay = futures_timer::Delay::new(Duration::from_millis(REFRESH_INTERVAL));
-        tokio::select! {
-            _ = delay => {
-                let new_best_header = select_chain
-                    .best_chain()
-                    .await
-                    .expect("No best chain");
-                *best_chain.lock() = AlephData::new(new_best_header.hash(), *new_best_header.number());
-            }
-            _ = &mut exit => {
-                debug!(target: "afa", "Task for refreshing best chain received exit signal. Terminating.");
-                return;
-            }
-        }
-    }
-}
-
-impl<B: BlockT> aleph_bft::DataIO<AlephDataFor<B>> for DataIO<B> {
+impl<B: BlockT, SC: SelectChain<B>> aleph_bft::DataIO<AlephDataFor<B>> for DataIO<B, SC> {
     type Error = Error;
 
     fn get_data(&self) -> AlephDataFor<B> {
-        let best = *self.best_chain.lock();
+        let new_best_header = self.select_chain.best_chain().expect("No best chain");
+        let data = AlephData::new(new_best_header.hash(), *new_best_header.number());
 
         if let Some(m) = &self.metrics {
-            m.report_block(best.hash, std::time::Instant::now(), "get_data");
+            m.report_block(data.hash, std::time::Instant::now(), "get_data");
         }
-        debug!(target: "afa", "Outputting {:?} in get_data", best);
-        best
+        data
     }
 
     fn send_ordered_batch(
diff --git a/finality-aleph/src/finalization.rs b/finality-aleph/src/finalization.rs
index f44d102e42..d051be5d58 100644
--- a/finality-aleph/src/finalization.rs
+++ b/finality-aleph/src/finalization.rs
@@ -124,7 +124,7 @@ mod tests {
                 .block;
 
             blocks.push(block.header.hash());
-            futures::executor::block_on(client.import(BlockOrigin::Own, block)).unwrap();
+            client.import(BlockOrigin::Own, block).unwrap();
         }
 
         blocks
@@ -181,7 +181,7 @@ mod tests {
                     .unwrap();
                 let block = builder.build().unwrap().block;
                 let hash = block.header.hash();
-                futures::executor::block_on(client.import(BlockOrigin::Own, block)).unwrap();
+                client.import(BlockOrigin::Own, block).unwrap();
                 hash
             })
             .collect();
diff --git a/finality-aleph/src/import.rs b/finality-aleph/src/import.rs
index 781540aaee..067a63d523 100644
--- a/finality-aleph/src/import.rs
+++ b/finality-aleph/src/import.rs
@@ -2,7 +2,6 @@ use crate::{
     justification::{AlephJustification, JustificationNotification},
     metrics::Metrics,
 };
-use aleph_primitives::ALEPH_ENGINE_ID;
 use codec::Decode;
 use futures::channel::mpsc::{TrySendError, UnboundedSender};
 use log::debug;
@@ -35,7 +34,6 @@ where
     Block: BlockT,
 {
     Send(TrySendError<JustificationNotification<Block>>),
-    Consensus(Box<ConsensusError>),
     Decode,
 }
 
@@ -65,14 +63,8 @@ where
         justification: Justification,
     ) -> Result<(), SendJustificationError<Block>> {
         debug!(target: "afa", "Importing justification for block #{:?}", number);
-        if justification.0 != ALEPH_ENGINE_ID {
-            return Err(SendJustificationError::Consensus(Box::new(
-                ConsensusError::ClientImport("Aleph can import only Aleph justifications.".into()),
-            )));
-        }
-        let justification_raw = justification.1;
 
-        let aleph_justification = AlephJustification::decode(&mut &*justification_raw)
+        let aleph_justification = AlephJustification::decode(&mut &*justification)
             .map_err(|_| SendJustificationError::Decode)?;
 
         self.justification_tx
@@ -101,7 +93,6 @@ where
     }
 }
 
-#[async_trait::async_trait]
 impl<Block, Be, I> BlockImport<Block> for AlephBlockImport<Block, Be, I>
 where
     Block: BlockT,
@@ -114,14 +105,11 @@ where
     type Error = <I as BlockImport<Block>>::Error;
     type Transaction = TransactionFor<I, Block>;
 
-    async fn check_block(
-        &mut self,
-        block: BlockCheckParams<Block>,
-    ) -> Result<ImportResult, Self::Error> {
-        self.inner.check_block(block).await
+    fn check_block(&mut self, block: BlockCheckParams<Block>) -> Result<ImportResult, Self::Error> {
+        self.inner.check_block(block)
     }
 
-    async fn import_block(
+    fn import_block(
         &mut self,
         mut block: BlockImportParams<Block, Self::Transaction>,
         cache: HashMap<[u8; 4], Vec<u8>>,
@@ -132,10 +120,10 @@ where
             m.report_block(post_hash, Instant::now(), "importing");
         };
 
-        let justifications = block.justifications.take();
+        let justification = block.justification.take();
 
         debug!(target: "afa", "Importing block {:?} {:?} {:?}", number, block.header.hash(), block.post_hash());
-        let import_result = self.inner.import_block(block, cache).await;
+        let import_result = self.inner.import_block(block, cache);
 
         let imported_aux = match import_result {
             Ok(ImportResult::Imported(aux)) => aux,
@@ -143,13 +131,9 @@ where
             Err(e) => return Err(e),
         };
 
-        if let Some(justification) =
-            justifications.and_then(|just| just.into_justification(ALEPH_ENGINE_ID))
-        {
-            debug!(target: "afa", "Got justification along imported block #{:?}", number);
-
+        if let Some(justification) = justification {
             if self
-                .send_justification(post_hash, number, (ALEPH_ENGINE_ID, justification))
+                .send_justification(post_hash, number, justification)
                 .is_err()
             {
                 debug!(target: "afa", "Some issue with justification");
@@ -164,7 +148,6 @@ where
     }
 }
 
-#[async_trait::async_trait]
 impl<Block, Be, I> JustificationImport<Block> for AlephBlockImport<Block, Be, I>
 where
     Block: BlockT,
@@ -173,12 +156,12 @@ where
 {
     type Error = ConsensusError;
 
-    async fn on_start(&mut self) -> Vec<(Block::Hash, NumberFor<Block>)> {
+    fn on_start(&mut self) -> Vec<(Block::Hash, NumberFor<Block>)> {
         debug!(target: "afa", "On start called");
         Vec::new()
     }
 
-    async fn import_justification(
+    fn import_justification(
         &mut self,
         hash: Block::Hash,
         number: NumberFor<Block>,
@@ -190,7 +173,6 @@ where
                 SendJustificationError::Send(_) => ConsensusError::ClientImport(String::from(
                     "Could not send justification to ConsensusParty",
                 )),
-                SendJustificationError::Consensus(e) => *e,
                 SendJustificationError::Decode => {
                     ConsensusError::ClientImport(String::from("Could not decode justification"))
                 }
diff --git a/finality-aleph/src/justification.rs b/finality-aleph/src/justification.rs
index bc4a9ce2b7..56d2199d65 100644
--- a/finality-aleph/src/justification.rs
+++ b/finality-aleph/src/justification.rs
@@ -3,7 +3,6 @@ use crate::{
     AuthorityKeystore, KeyBox, SessionId, SessionMap, SessionPeriod, Signature,
 };
 use aleph_bft::{MultiKeychain, NodeIndex, SignatureSet};
-use aleph_primitives::ALEPH_ENGINE_ID;
 use codec::{Decode, Encode};
 use futures::{channel::mpsc, StreamExt};
 use futures_timer::Delay;
@@ -122,7 +121,7 @@ where
                     self.client.clone(),
                     block_hash,
                     num,
-                    Some((ALEPH_ENGINE_ID, notification.justification.encode())),
+                    Some(notification.justification.encode()),
                 );
                 match finalization_res {
                     Ok(()) => {
diff --git a/finality-aleph/src/lib.rs b/finality-aleph/src/lib.rs
index f406cb7ab5..382897b391 100644
--- a/finality-aleph/src/lib.rs
+++ b/finality-aleph/src/lib.rs
@@ -52,7 +52,6 @@ pub fn peers_set_config() -> sc_network::config::NonDefaultSetConfig {
             reserved_nodes: vec![],
             non_reserved_mode: sc_network::config::NonReservedPeerMode::Accept,
         },
-        fallback_names: Vec::new(),
     }
 }
 
@@ -109,7 +108,6 @@ impl AuthorityKeystore {
             msg,
         )
         .unwrap()
-        .unwrap()
         .try_into()
         .unwrap()
     }
diff --git a/finality-aleph/src/network.rs b/finality-aleph/src/network.rs
index cecacd5cfa..7d9bcc8c1a 100644
--- a/finality-aleph/src/network.rs
+++ b/finality-aleph/src/network.rs
@@ -553,7 +553,6 @@ where
                                     remote,
                                     protocol,
                                     role: _,
-                                    negotiated_fallback: _,
                                 } => {
                                     if protocol != self.protocol {
                                         continue;
diff --git a/finality-aleph/src/party.rs b/finality-aleph/src/party.rs
index 9e02a05e1b..e0622cd4a1 100644
--- a/finality-aleph/src/party.rs
+++ b/finality-aleph/src/party.rs
@@ -1,6 +1,6 @@
 use crate::{
     aggregator::BlockSignatureAggregator,
-    data_io::{refresh_best_chain, AlephData, AlephDataFor, DataIO, DataStore},
+    data_io::{AlephDataFor, DataIO, DataStore},
     default_aleph_config,
     finalization::chain_extension_step,
     justification::{
@@ -285,25 +285,15 @@ where
 
         let consensus_config = create_aleph_config(authorities.len(), node_id, session_id);
 
-        let best_chain_header = self
-            .select_chain
-            .best_chain()
-            .await
-            .expect("No best chain.");
-        let best_chain = Arc::new(Mutex::new(AlephData::new(
-            best_chain_header.hash(),
-            *best_chain_header.number(),
-        )));
-        let data_io = DataIO::<B> {
+        let data_io = DataIO {
+            select_chain: self.select_chain.clone(),
             ordered_batch_tx,
-            best_chain: best_chain.clone(),
             metrics: self.metrics.clone(),
         };
 
         let (exit_member_tx, exit_member_rx) = oneshot::channel();
         let (exit_data_store_tx, exit_data_store_rx) = oneshot::channel();
         let (exit_aggregator_tx, exit_aggregator_rx) = oneshot::channel();
-        let (exit_refresher_tx, exit_refresher_rx) = oneshot::channel();
         let (exit_forwarder_tx, exit_forwarder_rx) = oneshot::channel();
 
         let member_task = {
@@ -353,9 +343,6 @@ where
             debug!(target: "afa", "Forwarder task stopped for {:?}", session_id.0);
         };
 
-        let refresher_task =
-            refresh_best_chain(self.select_chain.clone(), best_chain, exit_refresher_rx);
-
         let member_handle = self
             .spawn_handle
             .spawn_essential("aleph/consensus_session_member", member_task);
@@ -368,9 +355,6 @@ where
         let forwarder_handle = self
             .spawn_handle
             .spawn_essential("aleph/consensus_session_forwarder", forwarder_task);
-        let refresher_handle = self
-            .spawn_handle
-            .spawn_essential("aleph/consensus_session_refresher", refresher_task);
 
         async move {
             let _ = exit_rx.await;
@@ -391,11 +375,6 @@ where
             }
             let _ = forwarder_handle.await;
 
-            if let Err(e) = exit_refresher_tx.send(()) {
-                debug!(target: "afa", "refresh was closed before terminating it manually: {:?}", e)
-            }
-            let _ = refresher_handle.await;
-
             if let Err(e) = exit_data_store_tx.send(()) {
                 debug!(target: "afa", "data store was closed before terminating it manually: {:?}", e)
             }
diff --git a/finality-aleph/src/testing/data_io.rs b/finality-aleph/src/testing/data_io.rs
index c9e6a84f9b..969389216a 100644
--- a/finality-aleph/src/testing/data_io.rs
+++ b/finality-aleph/src/testing/data_io.rs
@@ -73,13 +73,9 @@ async fn import_blocks(
         if finalize {
             client
                 .import_as_final(BlockOrigin::Own, block.clone())
-                .await
                 .unwrap();
         } else {
-            client
-                .import(BlockOrigin::Own, block.clone())
-                .await
-                .unwrap();
+            client.import(BlockOrigin::Own, block.clone()).unwrap();
         }
         blocks.push(AlephData::new(block.header.hash(), block.header.number));
     }
@@ -127,10 +123,7 @@ async fn sends_messages_after_import() {
     store_tx
         .unbounded_send(TestNetworkData { data: vec![data] })
         .unwrap();
-    client
-        .import(BlockOrigin::Own, block.clone())
-        .await
-        .unwrap();
+    client.import(BlockOrigin::Own, block.clone()).unwrap();
 
     let message = store_rx.next().await.expect("We own the tx");
     assert_eq!(message.included_blocks(), vec![data]);
@@ -189,7 +182,6 @@ async fn does_not_send_messages_without_import() {
 
     client
         .import(BlockOrigin::Own, imported_block.clone())
-        .await
         .unwrap();
 
     let not_imported_block = client
diff --git a/finality-aleph/src/testing/network.rs b/finality-aleph/src/testing/network.rs
index 8831b3f64f..b07d6e3ea0 100644
--- a/finality-aleph/src/testing/network.rs
+++ b/finality-aleph/src/testing/network.rs
@@ -292,7 +292,6 @@ async fn authenticates_to_connected() {
         remote: bob_peer_id.into(),
         protocol: Cow::Borrowed(PROTOCOL_NAME),
         role: ObservedRole::Authority,
-        negotiated_fallback: None,
     });
     let (peer_id, protocol, message) = data
         .network
@@ -440,7 +439,6 @@ async fn test_send() {
         remote: bob_peer_id.into(),
         protocol: Cow::Borrowed(PROTOCOL_NAME),
         role: ObservedRole::Authority,
-        negotiated_fallback: None,
     });
     // Wait for acknowledgement that Alice noted Bob's presence.
     data.network
@@ -497,7 +495,6 @@ async fn test_broadcast() {
             remote: peer_id.0,
             protocol: Cow::Borrowed(PROTOCOL_NAME),
             role: ObservedRole::Authority,
-            negotiated_fallback: None,
         });
         // Wait for acknowledgement that Alice noted the nodes presence.
         data.network
diff --git a/pallet/Cargo.toml b/pallet/Cargo.toml
index 1d1a47766b..520b36a6ed 100644
--- a/pallet/Cargo.toml
+++ b/pallet/Cargo.toml
@@ -1,26 +1,27 @@
 [package]
 name = "pallet-aleph"
-version = "0.1.0"
+version = "0.4.0"
 authors = ["Cardinal Cryptography"]
 edition = "2018"
 
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
-frame-support = { default-features = false, git = "https://github.com/paritytech/substrate.git", rev = "8bbad73f5" }
-frame-system = { default-features = false, git = "https://github.com/paritytech/substrate.git", rev = "8bbad73f5" }
-sp-std = { default-features = false, git = "https://github.com/paritytech/substrate.git", rev = "8bbad73f5" }
+frame-support = { default-features = false, git = "https://github.com/paritytech/substrate.git", tag = "v3.0.0"}
+frame-system = { default-features = false, git = "https://github.com/paritytech/substrate.git", tag = "v3.0.0"}
+sp-std = { default-features = false, git = "https://github.com/paritytech/substrate.git", tag = "v3.0.0"}
 serde = "1.0"
-primitives = { path = "../primitives", default-features = false}
-pallet-session = { default-features = false, git = "https://github.com/paritytech/substrate.git", rev = "8bbad73f5" }
+primitives = { package = "primitives", path = "../primitives", default-features = false}
+pallet-session = { default-features = false, git = "https://github.com/paritytech/substrate.git", tag = "v3.0.0"}
+pallet-balances = { default-features = false, git = "https://github.com/paritytech/substrate.git", tag = "v3.0.0"}
 
 [dev-dependencies]
-
-pallet-balances = { default-features = false, git = "https://github.com/paritytech/substrate.git", rev = "8bbad73f5" }
-pallet-timestamp = { default-features = false, git = "https://github.com/paritytech/substrate.git", rev = "8bbad73f5" }
-sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", rev = "8bbad73f5" }
-sp-core = { default-features = false, git = "https://github.com/paritytech/substrate.git", rev = "8bbad73f5" }
+pallet-timestamp = { default-features = false, git = "https://github.com/paritytech/substrate.git", tag = "v3.0.0"}
+sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", tag = "v3.0.0"}
+sp-core = { default-features = false, git = "https://github.com/paritytech/substrate.git", tag = "v3.0.0"}
 
 [features]
 default = ["std"]
@@ -30,5 +31,6 @@ std = [
     "frame-system/std",
     "sp-std/std",
     "primitives/std",
-    "pallet-session/std"
+    "pallet-session/std",
+    "pallet-balances/std"
 ]
diff --git a/pallet/src/lib.rs b/pallet/src/lib.rs
index aff684c478..3f12b1a1cc 100644
--- a/pallet/src/lib.rs
+++ b/pallet/src/lib.rs
@@ -20,7 +20,7 @@ pub mod pallet {
         sp_std,
     };
     use frame_system::pallet_prelude::*;
-    use pallet_session::Pallet as Session;
+    use pallet_session::Module as Session;
     use primitives::{
         ApiError as AlephApiError, DEFAULT_MILLISECS_PER_BLOCK, DEFAULT_SESSION_PERIOD,
     };
diff --git a/pallet/src/mock.rs b/pallet/src/mock.rs
index 5338d30c81..6c7520a4a3 100644
--- a/pallet/src/mock.rs
+++ b/pallet/src/mock.rs
@@ -28,11 +28,11 @@ construct_runtime!(
         NodeBlock = Block,
         UncheckedExtrinsic = UncheckedExtrinsic,
     {
-        System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
-        Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
-        Session: pallet_session::{Pallet, Call, Storage, Event, Config<T>},
-        Aleph: pallet_aleph::{Pallet, Call, Config<T>, Storage},
-        Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent},
+        System: frame_system::{Module, Call, Config, Storage, Event<T>},
+        Balances: pallet_balances::{Module, Call, Storage, Config<T>, Event<T>},
+        Session: pallet_session::{Module, Call, Storage, Event, Config<T>},
+        Aleph: pallet_aleph::{Module, Call, Config<T>, Storage},
+        Timestamp: pallet_timestamp::{Module, Call, Storage, Inherent},
     }
 );
 
@@ -49,7 +49,7 @@ parameter_types! {
 }
 
 impl frame_system::Config for Test {
-    type BaseCallFilter = frame_support::traits::AllowAll;
+    type BaseCallFilter = ();
     type BlockWeights = ();
     type BlockLength = ();
     type Origin = Origin;
@@ -71,7 +71,6 @@ impl frame_system::Config for Test {
     type OnKilledAccount = ();
     type SystemWeightInfo = ();
     type SS58Prefix = ();
-    type OnSetCode = ();
 }
 
 parameter_types! {
@@ -86,8 +85,6 @@ parameter_types! {
 
 impl pallet_balances::Config for Test {
     type Balance = u128;
-    type MaxReserves = ();
-    type ReserveIdentifier = [u8; 8];
     type DustRemoval = ();
     type Event = Event;
     type ExistentialDeposit = ExistentialDeposit;
diff --git a/primitives/Cargo.toml b/primitives/Cargo.toml
index 402d82f599..ab6ad1cfde 100644
--- a/primitives/Cargo.toml
+++ b/primitives/Cargo.toml
@@ -1,18 +1,18 @@
 [package]
 name = "primitives"
-version = "0.3.0"
+version = "0.4.0"
 authors = ["Cardinal Cryptography"]
 edition = "2018"
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
-sp-api = { default-features = false, git = "https://github.com/paritytech/substrate.git", rev = "8bbad73f5" }
-sp-application-crypto = {default-features = false, git = "https://github.com/paritytech/substrate.git", rev = "8bbad73f5" }
-sp-core = {default-features = false, git = "https://github.com/paritytech/substrate.git", rev = "8bbad73f5" }
-sp-runtime = {default-features = false, git = "https://github.com/paritytech/substrate.git", rev = "8bbad73f5" }
-sp-std = { default-features = false, git = "https://github.com/paritytech/substrate.git", rev = "8bbad73f5" }
+sp-api = { git = "https://github.com/paritytech/substrate.git", tag = "v3.0.0", default-features = false }
+sp-application-crypto = { git = "https://github.com/paritytech/substrate.git", tag = "v3.0.0", default-features = false }
+sp-core = { git = "https://github.com/paritytech/substrate.git", tag = "v3.0.0", default-features = false }
+sp-runtime = { git = "https://github.com/paritytech/substrate.git", tag = "v3.0.0", default-features = false }
+sp-std = { git = "https://github.com/paritytech/substrate.git", tag = "v3.0.0", default-features = false }
 # we need aura authorites till we have our own pallet
-sp-consensus-aura = {default-features = false, git = "https://github.com/paritytech/substrate.git", rev = "8bbad73f5"}
+sp-consensus-aura = { git = "https://github.com/paritytech/substrate.git", tag = "v3.0.0", default-features = false }
 
 [features]
 default = ["std"]
diff --git a/primitives/src/lib.rs b/primitives/src/lib.rs
index fb27123826..a21d597530 100644
--- a/primitives/src/lib.rs
+++ b/primitives/src/lib.rs
@@ -1,16 +1,10 @@
 #![allow(clippy::too_many_arguments, clippy::unnecessary_mut_passed)]
 #![cfg_attr(not(feature = "std"), no_std)]
 use sp_core::crypto::KeyTypeId;
-use sp_runtime::ConsensusEngineId;
 use sp_std::vec::Vec;
 
 pub const KEY_TYPE: KeyTypeId = KeyTypeId(*b"alp0");
 
-// Same as GRANDPA_ENGINE_ID because as of right now substrate sends only
-// grandpa justifications over the network.
-// TODO: change this once https://github.com/paritytech/substrate/issues/8172 will be resolved.
-pub const ALEPH_ENGINE_ID: ConsensusEngineId = *b"FRNK";
-
 mod app {
     use sp_application_crypto::{app_crypto, ed25519};
     app_crypto!(ed25519, crate::KEY_TYPE);