diff --git a/.gitmodules b/.gitmodules
index 977b739db9..8a7c8a4ae3 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,9 +1,3 @@
 [submodule "vendor/ethereum"]
 	path = vendor/ethereum
 	url = https://github.com/rust-blockchain/ethereum
-[submodule "vendor/substrate"]
-	path = vendor/substrate
-	url = https://github.com/paritytech/substrate
-[submodule "vendor/evm"]
-	path = vendor/evm
-	url = https://github.com/rust-blockchain/evm
diff --git a/Cargo.lock b/Cargo.lock
index 8c9a6ddcba..fb1df931ce 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -348,9 +348,9 @@ checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff"
 
 [[package]]
 name = "bindgen"
-version = "0.53.3"
+version = "0.54.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c72a978d268b1d70b0e963217e60fdabd9523a941457a6c42a7315d15c7e89e5"
+checksum = "66c0bb6167449588ff70803f4127f0684f9063097eca5016f37eb52b92c2cf36"
 dependencies = [
  "bitflags",
  "cexpr",
@@ -680,6 +680,15 @@ dependencies = [
  "bitflags",
 ]
 
+[[package]]
+name = "cloudabi"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4344512281c643ae7638bbabc3af17a11307803ec8f0fcad9fae512a8bf36467"
+dependencies = [
+ "bitflags",
+]
+
 [[package]]
 name = "concurrent-queue"
 version = "1.1.1"
@@ -1143,9 +1152,9 @@ checksum = "36a9cb09840f81cd211e435d00a4e487edd263dc3c8ff815c32dd76ad668ebed"
 
 [[package]]
 name = "fdlimit"
-version = "0.1.4"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0da54a593b34c71b889ee45f5b5bb900c74148c5f7f8c6a9479ee7899f69603c"
+checksum = "47bc6e222b8349b2bd0acb85a1d16d22852376b3ceed2a7f09c2692c3d8a78d0"
 dependencies = [
  "libc",
 ]
@@ -1205,6 +1214,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 [[package]]
 name = "fork-tree"
 version = "2.0.0-rc6"
+source = "git+https://github.com/paritytech/substrate.git?branch=frontier#50c1820b856ae6d934b281da5f1eda3c6bdaba40"
 dependencies = [
  "parity-scale-codec",
 ]
@@ -1212,6 +1222,7 @@ dependencies = [
 [[package]]
 name = "frame-benchmarking"
 version = "2.0.0-rc6"
+source = "git+https://github.com/paritytech/substrate.git?branch=frontier#50c1820b856ae6d934b281da5f1eda3c6bdaba40"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -1229,6 +1240,7 @@ dependencies = [
 [[package]]
 name = "frame-executive"
 version = "2.0.0-rc6"
+source = "git+https://github.com/paritytech/substrate.git?branch=frontier#50c1820b856ae6d934b281da5f1eda3c6bdaba40"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -1243,6 +1255,7 @@ dependencies = [
 [[package]]
 name = "frame-metadata"
 version = "11.0.0-rc6"
+source = "git+https://github.com/paritytech/substrate.git?branch=frontier#50c1820b856ae6d934b281da5f1eda3c6bdaba40"
 dependencies = [
  "parity-scale-codec",
  "serde",
@@ -1253,6 +1266,7 @@ dependencies = [
 [[package]]
 name = "frame-support"
 version = "2.0.0-rc6"
+source = "git+https://github.com/paritytech/substrate.git?branch=frontier#50c1820b856ae6d934b281da5f1eda3c6bdaba40"
 dependencies = [
  "bitmask",
  "frame-metadata",
@@ -1277,6 +1291,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural"
 version = "2.0.0-rc6"
+source = "git+https://github.com/paritytech/substrate.git?branch=frontier#50c1820b856ae6d934b281da5f1eda3c6bdaba40"
 dependencies = [
  "frame-support-procedural-tools",
  "proc-macro2",
@@ -1287,6 +1302,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural-tools"
 version = "2.0.0-rc6"
+source = "git+https://github.com/paritytech/substrate.git?branch=frontier#50c1820b856ae6d934b281da5f1eda3c6bdaba40"
 dependencies = [
  "frame-support-procedural-tools-derive",
  "proc-macro-crate",
@@ -1298,6 +1314,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural-tools-derive"
 version = "2.0.0-rc6"
+source = "git+https://github.com/paritytech/substrate.git?branch=frontier#50c1820b856ae6d934b281da5f1eda3c6bdaba40"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1307,6 +1324,7 @@ dependencies = [
 [[package]]
 name = "frame-system"
 version = "2.0.0-rc6"
+source = "git+https://github.com/paritytech/substrate.git?branch=frontier#50c1820b856ae6d934b281da5f1eda3c6bdaba40"
 dependencies = [
  "frame-support",
  "impl-trait-for-tuples",
@@ -1322,6 +1340,7 @@ dependencies = [
 [[package]]
 name = "frame-system-rpc-runtime-api"
 version = "2.0.0-rc6"
+source = "git+https://github.com/paritytech/substrate.git?branch=frontier#50c1820b856ae6d934b281da5f1eda3c6bdaba40"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -2169,6 +2188,12 @@ dependencies = [
  "autocfg 1.0.0",
 ]
 
+[[package]]
+name = "instant"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b141fdc7836c525d4d594027d318c84161ca17aaf8113ab1f81ab93ae897485"
+
 [[package]]
 name = "integer-sqrt"
 version = "0.1.3"
@@ -2418,9 +2443,9 @@ dependencies = [
 
 [[package]]
 name = "kvdb-rocksdb"
-version = "0.9.0"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c341ef15cfb1f923fa3b5138bfbd2d4813a2c1640b473727a53351c7f0b0fa2"
+checksum = "44947dd392f09475af614d740fe0320b66d01cb5b977f664bbbb5e45a70ea4c1"
 dependencies = [
  "fs-swap",
  "kvdb",
@@ -2906,9 +2931,9 @@ dependencies = [
 
 [[package]]
 name = "librocksdb-sys"
-version = "6.7.4"
+version = "6.11.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "883213ae3d09bfc3d104aefe94b25ebb183b6f4d3a515b23b14817e1f4854005"
+checksum = "eb5b56f651c204634b936be2f92dbb42c36867e00ff7fe2405591f3b9fa66f09"
 dependencies = [
  "bindgen",
  "cc",
@@ -2988,6 +3013,15 @@ dependencies = [
  "scopeguard 1.1.0",
 ]
 
+[[package]]
+name = "lock_api"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "28247cc5a5be2f05fbcd76dd0cf2c7d3b5400cb978a28042abcd4fa0b3f8261c"
+dependencies = [
+ "scopeguard 1.1.0",
+]
+
 [[package]]
 name = "log"
 version = "0.4.11"
@@ -3414,6 +3448,7 @@ dependencies = [
 [[package]]
 name = "pallet-aura"
 version = "2.0.0-rc6"
+source = "git+https://github.com/paritytech/substrate.git?branch=frontier#50c1820b856ae6d934b281da5f1eda3c6bdaba40"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3432,6 +3467,7 @@ dependencies = [
 [[package]]
 name = "pallet-authorship"
 version = "2.0.0-rc6"
+source = "git+https://github.com/paritytech/substrate.git?branch=frontier#50c1820b856ae6d934b281da5f1eda3c6bdaba40"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3446,6 +3482,7 @@ dependencies = [
 [[package]]
 name = "pallet-balances"
 version = "2.0.0-rc6"
+source = "git+https://github.com/paritytech/substrate.git?branch=frontier#50c1820b856ae6d934b281da5f1eda3c6bdaba40"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -3490,6 +3527,7 @@ checksum = "bd4556fb64842e71bb6e2f98b7541c0d310069eb607d432c6ac9bdaecbfd3118"
 [[package]]
 name = "pallet-evm"
 version = "2.0.0-rc6"
+source = "git+https://github.com/paritytech/substrate.git?branch=frontier#50c1820b856ae6d934b281da5f1eda3c6bdaba40"
 dependencies = [
  "evm",
  "frame-support",
@@ -3512,6 +3550,7 @@ dependencies = [
 [[package]]
 name = "pallet-finality-tracker"
 version = "2.0.0-rc6"
+source = "git+https://github.com/paritytech/substrate.git?branch=frontier#50c1820b856ae6d934b281da5f1eda3c6bdaba40"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3527,6 +3566,7 @@ dependencies = [
 [[package]]
 name = "pallet-grandpa"
 version = "2.0.0-rc6"
+source = "git+https://github.com/paritytech/substrate.git?branch=frontier#50c1820b856ae6d934b281da5f1eda3c6bdaba40"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -3548,6 +3588,7 @@ dependencies = [
 [[package]]
 name = "pallet-randomness-collective-flip"
 version = "2.0.0-rc6"
+source = "git+https://github.com/paritytech/substrate.git?branch=frontier#50c1820b856ae6d934b281da5f1eda3c6bdaba40"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3560,6 +3601,7 @@ dependencies = [
 [[package]]
 name = "pallet-session"
 version = "2.0.0-rc6"
+source = "git+https://github.com/paritytech/substrate.git?branch=frontier#50c1820b856ae6d934b281da5f1eda3c6bdaba40"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3579,6 +3621,7 @@ dependencies = [
 [[package]]
 name = "pallet-sudo"
 version = "2.0.0-rc6"
+source = "git+https://github.com/paritytech/substrate.git?branch=frontier#50c1820b856ae6d934b281da5f1eda3c6bdaba40"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3592,6 +3635,7 @@ dependencies = [
 [[package]]
 name = "pallet-timestamp"
 version = "2.0.0-rc6"
+source = "git+https://github.com/paritytech/substrate.git?branch=frontier#50c1820b856ae6d934b281da5f1eda3c6bdaba40"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -3608,6 +3652,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment"
 version = "2.0.0-rc6"
+source = "git+https://github.com/paritytech/substrate.git?branch=frontier#50c1820b856ae6d934b281da5f1eda3c6bdaba40"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3624,6 +3669,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment-rpc"
 version = "2.0.0-rc6"
+source = "git+https://github.com/paritytech/substrate.git?branch=frontier#50c1820b856ae6d934b281da5f1eda3c6bdaba40"
 dependencies = [
  "jsonrpc-core",
  "jsonrpc-core-client",
@@ -3641,6 +3687,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment-rpc-runtime-api"
 version = "2.0.0-rc6"
+source = "git+https://github.com/paritytech/substrate.git?branch=frontier#50c1820b856ae6d934b281da5f1eda3c6bdaba40"
 dependencies = [
  "frame-support",
  "parity-scale-codec",
@@ -3802,6 +3849,17 @@ dependencies = [
  "parking_lot_core 0.7.2",
 ]
 
+[[package]]
+name = "parking_lot"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4893845fa2ca272e647da5d0e46660a314ead9c2fdd9a883aabc32e481a8733"
+dependencies = [
+ "instant",
+ "lock_api 0.4.1",
+ "parking_lot_core 0.8.0",
+]
+
 [[package]]
 name = "parking_lot_core"
 version = "0.4.0"
@@ -3822,7 +3880,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b876b1b9e7ac6e1a74a6da34d25c42e17e8862aa409cbbbdcfc8d86c6f3bc62b"
 dependencies = [
  "cfg-if",
- "cloudabi",
+ "cloudabi 0.0.3",
  "libc",
  "redox_syscall",
  "rustc_version",
@@ -3837,7 +3895,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d58c7c768d4ba344e3e8d72518ac13e259d7c7ade24167003b8488e10b6740a3"
 dependencies = [
  "cfg-if",
- "cloudabi",
+ "cloudabi 0.0.3",
+ "libc",
+ "redox_syscall",
+ "smallvec 1.4.1",
+ "winapi 0.3.8",
+]
+
+[[package]]
+name = "parking_lot_core"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c361aa727dd08437f2f1447be8b59a33b0edd15e0fcee698f935613d9efbca9b"
+dependencies = [
+ "cfg-if",
+ "cloudabi 0.1.0",
+ "instant",
  "libc",
  "redox_syscall",
  "smallvec 1.4.1",
@@ -3877,6 +3950,12 @@ dependencies = [
  "rayon",
 ]
 
+[[package]]
+name = "pdqselect"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ec91767ecc0a0bbe558ce8c9da33c068066c57ecc8bb8477ef8c1ad3ef77c27"
+
 [[package]]
 name = "peeking_take_while"
 version = "0.1.2"
@@ -4045,14 +4124,15 @@ dependencies = [
 
 [[package]]
 name = "prometheus"
-version = "0.9.0"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd0ced56dee39a6e960c15c74dc48849d614586db2eaada6497477af7c7811cd"
+checksum = "30d70cf4412832bcac9cffe27906f4a66e450d323525e977168c70d1b36120ae"
 dependencies = [
  "cfg-if",
  "fnv",
  "lazy_static",
- "spin",
+ "parking_lot 0.11.0",
+ "regex",
  "thiserror",
 ]
 
@@ -4168,7 +4248,7 @@ version = "0.5.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c618c47cd3ebd209790115ab837de41425723956ad3ce2e6a7f09890947cacb9"
 dependencies = [
- "cloudabi",
+ "cloudabi 0.0.3",
  "fuchsia-cprng",
  "libc",
  "rand_core 0.3.1",
@@ -4296,7 +4376,7 @@ version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071"
 dependencies = [
- "cloudabi",
+ "cloudabi 0.0.3",
  "fuchsia-cprng",
  "libc",
  "rand_core 0.4.2",
@@ -4521,9 +4601,9 @@ dependencies = [
 
 [[package]]
 name = "rocksdb"
-version = "0.14.0"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61aa17a99a2413cd71c1106691bf59dad7de0cd5099127f90e9d99c429c40d4a"
+checksum = "23d83c02c429044d58474eaf5ae31e062d0de894e21125b47437ec0edc1397e6"
 dependencies = [
  "libc",
  "librocksdb-sys",
@@ -4652,6 +4732,7 @@ dependencies = [
 [[package]]
 name = "sc-basic-authorship"
 version = "0.8.0-rc6"
+source = "git+https://github.com/paritytech/substrate.git?branch=frontier#50c1820b856ae6d934b281da5f1eda3c6bdaba40"
 dependencies = [
  "futures 0.3.5",
  "futures-timer 3.0.2",
@@ -4675,6 +4756,7 @@ dependencies = [
 [[package]]
 name = "sc-block-builder"
 version = "0.8.0-rc6"
+source = "git+https://github.com/paritytech/substrate.git?branch=frontier#50c1820b856ae6d934b281da5f1eda3c6bdaba40"
 dependencies = [
  "parity-scale-codec",
  "sc-client-api",
@@ -4691,6 +4773,7 @@ dependencies = [
 [[package]]
 name = "sc-chain-spec"
 version = "2.0.0-rc6"
+source = "git+https://github.com/paritytech/substrate.git?branch=frontier#50c1820b856ae6d934b281da5f1eda3c6bdaba40"
 dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec",
@@ -4707,6 +4790,7 @@ dependencies = [
 [[package]]
 name = "sc-chain-spec-derive"
 version = "2.0.0-rc6"
+source = "git+https://github.com/paritytech/substrate.git?branch=frontier#50c1820b856ae6d934b281da5f1eda3c6bdaba40"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
@@ -4717,6 +4801,7 @@ dependencies = [
 [[package]]
 name = "sc-cli"
 version = "0.8.0-rc6"
+source = "git+https://github.com/paritytech/substrate.git?branch=frontier#50c1820b856ae6d934b281da5f1eda3c6bdaba40"
 dependencies = [
  "ansi_term 0.12.1",
  "atty",
@@ -4763,6 +4848,7 @@ dependencies = [
 [[package]]
 name = "sc-client-api"
 version = "2.0.0-rc6"
+source = "git+https://github.com/paritytech/substrate.git?branch=frontier#50c1820b856ae6d934b281da5f1eda3c6bdaba40"
 dependencies = [
  "derive_more",
  "fnv",
@@ -4798,6 +4884,7 @@ dependencies = [
 [[package]]
 name = "sc-client-db"
 version = "0.8.0-rc6"
+source = "git+https://github.com/paritytech/substrate.git?branch=frontier#50c1820b856ae6d934b281da5f1eda3c6bdaba40"
 dependencies = [
  "blake2-rfc",
  "hash-db",
@@ -4827,6 +4914,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus"
 version = "0.8.0-rc6"
+source = "git+https://github.com/paritytech/substrate.git?branch=frontier#50c1820b856ae6d934b281da5f1eda3c6bdaba40"
 dependencies = [
  "sc-client-api",
  "sp-blockchain",
@@ -4837,6 +4925,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-aura"
 version = "0.8.0-rc6"
+source = "git+https://github.com/paritytech/substrate.git?branch=frontier#50c1820b856ae6d934b281da5f1eda3c6bdaba40"
 dependencies = [
  "derive_more",
  "futures 0.3.5",
@@ -4864,9 +4953,67 @@ dependencies = [
  "substrate-prometheus-endpoint",
 ]
 
+[[package]]
+name = "sc-consensus-babe"
+version = "0.8.0-rc6"
+source = "git+https://github.com/paritytech/substrate.git?branch=frontier#50c1820b856ae6d934b281da5f1eda3c6bdaba40"
+dependencies = [
+ "derive_more",
+ "fork-tree",
+ "futures 0.3.5",
+ "futures-timer 3.0.2",
+ "log",
+ "merlin",
+ "num-bigint",
+ "num-rational",
+ "num-traits",
+ "parity-scale-codec",
+ "parking_lot 0.10.2",
+ "pdqselect",
+ "rand 0.7.3",
+ "retain_mut",
+ "sc-client-api",
+ "sc-consensus-epochs",
+ "sc-consensus-slots",
+ "sc-consensus-uncles",
+ "sc-keystore",
+ "sc-telemetry",
+ "schnorrkel",
+ "serde",
+ "sp-api",
+ "sp-application-crypto",
+ "sp-block-builder",
+ "sp-blockchain",
+ "sp-consensus",
+ "sp-consensus-babe",
+ "sp-consensus-vrf",
+ "sp-core",
+ "sp-inherents",
+ "sp-io",
+ "sp-runtime",
+ "sp-timestamp",
+ "sp-utils",
+ "sp-version",
+ "substrate-prometheus-endpoint",
+]
+
+[[package]]
+name = "sc-consensus-epochs"
+version = "0.8.0-rc6"
+source = "git+https://github.com/paritytech/substrate.git?branch=frontier#50c1820b856ae6d934b281da5f1eda3c6bdaba40"
+dependencies = [
+ "fork-tree",
+ "parity-scale-codec",
+ "parking_lot 0.10.2",
+ "sc-client-api",
+ "sp-blockchain",
+ "sp-runtime",
+]
+
 [[package]]
 name = "sc-consensus-manual-seal"
 version = "0.8.0-rc6"
+source = "git+https://github.com/paritytech/substrate.git?branch=frontier#50c1820b856ae6d934b281da5f1eda3c6bdaba40"
 dependencies = [
  "assert_matches",
  "derive_more",
@@ -4877,13 +5024,19 @@ dependencies = [
  "log",
  "parking_lot 0.10.2",
  "sc-client-api",
+ "sc-consensus-babe",
+ "sc-consensus-epochs",
+ "sc-keystore",
  "sc-transaction-pool",
  "serde",
+ "sp-api",
  "sp-blockchain",
  "sp-consensus",
+ "sp-consensus-babe",
  "sp-core",
  "sp-inherents",
  "sp-runtime",
+ "sp-timestamp",
  "sp-transaction-pool",
  "substrate-prometheus-endpoint",
 ]
@@ -4891,6 +5044,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-slots"
 version = "0.8.0-rc6"
+source = "git+https://github.com/paritytech/substrate.git?branch=frontier#50c1820b856ae6d934b281da5f1eda3c6bdaba40"
 dependencies = [
  "futures 0.3.5",
  "futures-timer 3.0.2",
@@ -4910,9 +5064,24 @@ dependencies = [
  "sp-state-machine",
 ]
 
+[[package]]
+name = "sc-consensus-uncles"
+version = "0.8.0-rc6"
+source = "git+https://github.com/paritytech/substrate.git?branch=frontier#50c1820b856ae6d934b281da5f1eda3c6bdaba40"
+dependencies = [
+ "log",
+ "sc-client-api",
+ "sp-authorship",
+ "sp-consensus",
+ "sp-core",
+ "sp-inherents",
+ "sp-runtime",
+]
+
 [[package]]
 name = "sc-executor"
 version = "0.8.0-rc6"
+source = "git+https://github.com/paritytech/substrate.git?branch=frontier#50c1820b856ae6d934b281da5f1eda3c6bdaba40"
 dependencies = [
  "derive_more",
  "lazy_static",
@@ -4939,6 +5108,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-common"
 version = "0.8.0-rc6"
+source = "git+https://github.com/paritytech/substrate.git?branch=frontier#50c1820b856ae6d934b281da5f1eda3c6bdaba40"
 dependencies = [
  "derive_more",
  "log",
@@ -4955,6 +5125,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-wasmi"
 version = "0.8.0-rc6"
+source = "git+https://github.com/paritytech/substrate.git?branch=frontier#50c1820b856ae6d934b281da5f1eda3c6bdaba40"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -4969,6 +5140,7 @@ dependencies = [
 [[package]]
 name = "sc-finality-grandpa"
 version = "0.8.0-rc6"
+source = "git+https://github.com/paritytech/substrate.git?branch=frontier#50c1820b856ae6d934b281da5f1eda3c6bdaba40"
 dependencies = [
  "derive_more",
  "finality-grandpa",
@@ -5005,6 +5177,7 @@ dependencies = [
 [[package]]
 name = "sc-informant"
 version = "0.8.0-rc6"
+source = "git+https://github.com/paritytech/substrate.git?branch=frontier#50c1820b856ae6d934b281da5f1eda3c6bdaba40"
 dependencies = [
  "ansi_term 0.12.1",
  "futures 0.3.5",
@@ -5022,6 +5195,7 @@ dependencies = [
 [[package]]
 name = "sc-keystore"
 version = "2.0.0-rc6"
+source = "git+https://github.com/paritytech/substrate.git?branch=frontier#50c1820b856ae6d934b281da5f1eda3c6bdaba40"
 dependencies = [
  "derive_more",
  "hex",
@@ -5037,6 +5211,7 @@ dependencies = [
 [[package]]
 name = "sc-light"
 version = "2.0.0-rc6"
+source = "git+https://github.com/paritytech/substrate.git?branch=frontier#50c1820b856ae6d934b281da5f1eda3c6bdaba40"
 dependencies = [
  "hash-db",
  "lazy_static",
@@ -5055,8 +5230,10 @@ dependencies = [
 [[package]]
 name = "sc-network"
 version = "0.8.0-rc6"
+source = "git+https://github.com/paritytech/substrate.git?branch=frontier#50c1820b856ae6d934b281da5f1eda3c6bdaba40"
 dependencies = [
  "async-std",
+ "async-trait",
  "bitflags",
  "bs58",
  "bytes 0.5.4",
@@ -5107,6 +5284,7 @@ dependencies = [
 [[package]]
 name = "sc-network-gossip"
 version = "0.8.0-rc6"
+source = "git+https://github.com/paritytech/substrate.git?branch=frontier#50c1820b856ae6d934b281da5f1eda3c6bdaba40"
 dependencies = [
  "futures 0.3.5",
  "futures-timer 3.0.2",
@@ -5121,6 +5299,7 @@ dependencies = [
 [[package]]
 name = "sc-offchain"
 version = "2.0.0-rc6"
+source = "git+https://github.com/paritytech/substrate.git?branch=frontier#50c1820b856ae6d934b281da5f1eda3c6bdaba40"
 dependencies = [
  "bytes 0.5.4",
  "fnv",
@@ -5147,6 +5326,7 @@ dependencies = [
 [[package]]
 name = "sc-peerset"
 version = "2.0.0-rc6"
+source = "git+https://github.com/paritytech/substrate.git?branch=frontier#50c1820b856ae6d934b281da5f1eda3c6bdaba40"
 dependencies = [
  "futures 0.3.5",
  "libp2p",
@@ -5159,6 +5339,7 @@ dependencies = [
 [[package]]
 name = "sc-proposer-metrics"
 version = "0.8.0-rc6"
+source = "git+https://github.com/paritytech/substrate.git?branch=frontier#50c1820b856ae6d934b281da5f1eda3c6bdaba40"
 dependencies = [
  "log",
  "substrate-prometheus-endpoint",
@@ -5167,6 +5348,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc"
 version = "2.0.0-rc6"
+source = "git+https://github.com/paritytech/substrate.git?branch=frontier#50c1820b856ae6d934b281da5f1eda3c6bdaba40"
 dependencies = [
  "futures 0.3.5",
  "hash-db",
@@ -5198,6 +5380,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc-api"
 version = "0.8.0-rc6"
+source = "git+https://github.com/paritytech/substrate.git?branch=frontier#50c1820b856ae6d934b281da5f1eda3c6bdaba40"
 dependencies = [
  "derive_more",
  "futures 0.3.5",
@@ -5221,6 +5404,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc-server"
 version = "2.0.0-rc6"
+source = "git+https://github.com/paritytech/substrate.git?branch=frontier#50c1820b856ae6d934b281da5f1eda3c6bdaba40"
 dependencies = [
  "jsonrpc-core",
  "jsonrpc-http-server",
@@ -5236,6 +5420,7 @@ dependencies = [
 [[package]]
 name = "sc-service"
 version = "0.8.0-rc6"
+source = "git+https://github.com/paritytech/substrate.git?branch=frontier#50c1820b856ae6d934b281da5f1eda3c6bdaba40"
 dependencies = [
  "derive_more",
  "directories",
@@ -5296,6 +5481,7 @@ dependencies = [
 [[package]]
 name = "sc-state-db"
 version = "0.8.0-rc6"
+source = "git+https://github.com/paritytech/substrate.git?branch=frontier#50c1820b856ae6d934b281da5f1eda3c6bdaba40"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -5309,6 +5495,7 @@ dependencies = [
 [[package]]
 name = "sc-telemetry"
 version = "2.0.0-rc6"
+source = "git+https://github.com/paritytech/substrate.git?branch=frontier#50c1820b856ae6d934b281da5f1eda3c6bdaba40"
 dependencies = [
  "futures 0.3.5",
  "futures-timer 3.0.2",
@@ -5329,6 +5516,7 @@ dependencies = [
 [[package]]
 name = "sc-tracing"
 version = "2.0.0-rc6"
+source = "git+https://github.com/paritytech/substrate.git?branch=frontier#50c1820b856ae6d934b281da5f1eda3c6bdaba40"
 dependencies = [
  "erased-serde",
  "log",
@@ -5346,6 +5534,7 @@ dependencies = [
 [[package]]
 name = "sc-transaction-graph"
 version = "2.0.0-rc6"
+source = "git+https://github.com/paritytech/substrate.git?branch=frontier#50c1820b856ae6d934b281da5f1eda3c6bdaba40"
 dependencies = [
  "derive_more",
  "futures 0.3.5",
@@ -5366,6 +5555,7 @@ dependencies = [
 [[package]]
 name = "sc-transaction-pool"
 version = "2.0.0-rc6"
+source = "git+https://github.com/paritytech/substrate.git?branch=frontier#50c1820b856ae6d934b281da5f1eda3c6bdaba40"
 dependencies = [
  "derive_more",
  "futures 0.3.5",
@@ -5750,6 +5940,7 @@ dependencies = [
 [[package]]
 name = "sp-allocator"
 version = "2.0.0-rc6"
+source = "git+https://github.com/paritytech/substrate.git?branch=frontier#50c1820b856ae6d934b281da5f1eda3c6bdaba40"
 dependencies = [
  "derive_more",
  "log",
@@ -5761,6 +5952,7 @@ dependencies = [
 [[package]]
 name = "sp-api"
 version = "2.0.0-rc6"
+source = "git+https://github.com/paritytech/substrate.git?branch=frontier#50c1820b856ae6d934b281da5f1eda3c6bdaba40"
 dependencies = [
  "hash-db",
  "parity-scale-codec",
@@ -5775,6 +5967,7 @@ dependencies = [
 [[package]]
 name = "sp-api-proc-macro"
 version = "2.0.0-rc6"
+source = "git+https://github.com/paritytech/substrate.git?branch=frontier#50c1820b856ae6d934b281da5f1eda3c6bdaba40"
 dependencies = [
  "blake2-rfc",
  "proc-macro-crate",
@@ -5786,6 +5979,7 @@ dependencies = [
 [[package]]
 name = "sp-application-crypto"
 version = "2.0.0-rc6"
+source = "git+https://github.com/paritytech/substrate.git?branch=frontier#50c1820b856ae6d934b281da5f1eda3c6bdaba40"
 dependencies = [
  "parity-scale-codec",
  "serde",
@@ -5797,6 +5991,7 @@ dependencies = [
 [[package]]
 name = "sp-arithmetic"
 version = "2.0.0-rc6"
+source = "git+https://github.com/paritytech/substrate.git?branch=frontier#50c1820b856ae6d934b281da5f1eda3c6bdaba40"
 dependencies = [
  "integer-sqrt",
  "num-traits",
@@ -5809,6 +6004,7 @@ dependencies = [
 [[package]]
 name = "sp-authorship"
 version = "2.0.0-rc6"
+source = "git+https://github.com/paritytech/substrate.git?branch=frontier#50c1820b856ae6d934b281da5f1eda3c6bdaba40"
 dependencies = [
  "parity-scale-codec",
  "sp-inherents",
@@ -5819,6 +6015,7 @@ dependencies = [
 [[package]]
 name = "sp-block-builder"
 version = "2.0.0-rc6"
+source = "git+https://github.com/paritytech/substrate.git?branch=frontier#50c1820b856ae6d934b281da5f1eda3c6bdaba40"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -5830,6 +6027,7 @@ dependencies = [
 [[package]]
 name = "sp-blockchain"
 version = "2.0.0-rc6"
+source = "git+https://github.com/paritytech/substrate.git?branch=frontier#50c1820b856ae6d934b281da5f1eda3c6bdaba40"
 dependencies = [
  "derive_more",
  "log",
@@ -5846,6 +6044,7 @@ dependencies = [
 [[package]]
 name = "sp-chain-spec"
 version = "2.0.0-rc6"
+source = "git+https://github.com/paritytech/substrate.git?branch=frontier#50c1820b856ae6d934b281da5f1eda3c6bdaba40"
 dependencies = [
  "serde",
  "serde_json",
@@ -5854,6 +6053,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus"
 version = "0.8.0-rc6"
+source = "git+https://github.com/paritytech/substrate.git?branch=frontier#50c1820b856ae6d934b281da5f1eda3c6bdaba40"
 dependencies = [
  "derive_more",
  "futures 0.3.5",
@@ -5879,10 +6079,30 @@ dependencies = [
 [[package]]
 name = "sp-consensus-aura"
 version = "0.8.0-rc6"
+source = "git+https://github.com/paritytech/substrate.git?branch=frontier#50c1820b856ae6d934b281da5f1eda3c6bdaba40"
+dependencies = [
+ "parity-scale-codec",
+ "sp-api",
+ "sp-application-crypto",
+ "sp-inherents",
+ "sp-runtime",
+ "sp-std",
+ "sp-timestamp",
+]
+
+[[package]]
+name = "sp-consensus-babe"
+version = "0.8.0-rc6"
+source = "git+https://github.com/paritytech/substrate.git?branch=frontier#50c1820b856ae6d934b281da5f1eda3c6bdaba40"
 dependencies = [
+ "merlin",
  "parity-scale-codec",
  "sp-api",
  "sp-application-crypto",
+ "sp-consensus",
+ "sp-consensus-slots",
+ "sp-consensus-vrf",
+ "sp-core",
  "sp-inherents",
  "sp-runtime",
  "sp-std",
@@ -5892,14 +6112,28 @@ dependencies = [
 [[package]]
 name = "sp-consensus-slots"
 version = "0.8.0-rc6"
+source = "git+https://github.com/paritytech/substrate.git?branch=frontier#50c1820b856ae6d934b281da5f1eda3c6bdaba40"
+dependencies = [
+ "parity-scale-codec",
+ "sp-runtime",
+]
+
+[[package]]
+name = "sp-consensus-vrf"
+version = "0.8.0-rc6"
+source = "git+https://github.com/paritytech/substrate.git?branch=frontier#50c1820b856ae6d934b281da5f1eda3c6bdaba40"
 dependencies = [
  "parity-scale-codec",
+ "schnorrkel",
+ "sp-core",
  "sp-runtime",
+ "sp-std",
 ]
 
 [[package]]
 name = "sp-core"
 version = "2.0.0-rc6"
+source = "git+https://github.com/paritytech/substrate.git?branch=frontier#50c1820b856ae6d934b281da5f1eda3c6bdaba40"
 dependencies = [
  "base58",
  "blake2-rfc",
@@ -5943,6 +6177,7 @@ dependencies = [
 [[package]]
 name = "sp-database"
 version = "2.0.0-rc6"
+source = "git+https://github.com/paritytech/substrate.git?branch=frontier#50c1820b856ae6d934b281da5f1eda3c6bdaba40"
 dependencies = [
  "kvdb",
  "parking_lot 0.10.2",
@@ -5951,6 +6186,7 @@ dependencies = [
 [[package]]
 name = "sp-debug-derive"
 version = "2.0.0-rc6"
+source = "git+https://github.com/paritytech/substrate.git?branch=frontier#50c1820b856ae6d934b281da5f1eda3c6bdaba40"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5960,6 +6196,7 @@ dependencies = [
 [[package]]
 name = "sp-externalities"
 version = "0.8.0-rc6"
+source = "git+https://github.com/paritytech/substrate.git?branch=frontier#50c1820b856ae6d934b281da5f1eda3c6bdaba40"
 dependencies = [
  "environmental",
  "parity-scale-codec",
@@ -5970,6 +6207,7 @@ dependencies = [
 [[package]]
 name = "sp-finality-grandpa"
 version = "2.0.0-rc6"
+source = "git+https://github.com/paritytech/substrate.git?branch=frontier#50c1820b856ae6d934b281da5f1eda3c6bdaba40"
 dependencies = [
  "finality-grandpa",
  "log",
@@ -5985,6 +6223,7 @@ dependencies = [
 [[package]]
 name = "sp-finality-tracker"
 version = "2.0.0-rc6"
+source = "git+https://github.com/paritytech/substrate.git?branch=frontier#50c1820b856ae6d934b281da5f1eda3c6bdaba40"
 dependencies = [
  "parity-scale-codec",
  "sp-inherents",
@@ -5994,6 +6233,7 @@ dependencies = [
 [[package]]
 name = "sp-inherents"
 version = "2.0.0-rc6"
+source = "git+https://github.com/paritytech/substrate.git?branch=frontier#50c1820b856ae6d934b281da5f1eda3c6bdaba40"
 dependencies = [
  "derive_more",
  "parity-scale-codec",
@@ -6005,6 +6245,7 @@ dependencies = [
 [[package]]
 name = "sp-io"
 version = "2.0.0-rc6"
+source = "git+https://github.com/paritytech/substrate.git?branch=frontier#50c1820b856ae6d934b281da5f1eda3c6bdaba40"
 dependencies = [
  "futures 0.3.5",
  "hash-db",
@@ -6025,6 +6266,7 @@ dependencies = [
 [[package]]
 name = "sp-keyring"
 version = "2.0.0-rc6"
+source = "git+https://github.com/paritytech/substrate.git?branch=frontier#50c1820b856ae6d934b281da5f1eda3c6bdaba40"
 dependencies = [
  "lazy_static",
  "sp-core",
@@ -6035,6 +6277,7 @@ dependencies = [
 [[package]]
 name = "sp-offchain"
 version = "2.0.0-rc6"
+source = "git+https://github.com/paritytech/substrate.git?branch=frontier#50c1820b856ae6d934b281da5f1eda3c6bdaba40"
 dependencies = [
  "sp-api",
  "sp-core",
@@ -6044,6 +6287,7 @@ dependencies = [
 [[package]]
 name = "sp-panic-handler"
 version = "2.0.0-rc6"
+source = "git+https://github.com/paritytech/substrate.git?branch=frontier#50c1820b856ae6d934b281da5f1eda3c6bdaba40"
 dependencies = [
  "backtrace",
  "log",
@@ -6052,6 +6296,7 @@ dependencies = [
 [[package]]
 name = "sp-rpc"
 version = "2.0.0-rc6"
+source = "git+https://github.com/paritytech/substrate.git?branch=frontier#50c1820b856ae6d934b281da5f1eda3c6bdaba40"
 dependencies = [
  "serde",
  "sp-core",
@@ -6060,6 +6305,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime"
 version = "2.0.0-rc6"
+source = "git+https://github.com/paritytech/substrate.git?branch=frontier#50c1820b856ae6d934b281da5f1eda3c6bdaba40"
 dependencies = [
  "either",
  "hash256-std-hasher",
@@ -6081,6 +6327,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime-interface"
 version = "2.0.0-rc6"
+source = "git+https://github.com/paritytech/substrate.git?branch=frontier#50c1820b856ae6d934b281da5f1eda3c6bdaba40"
 dependencies = [
  "parity-scale-codec",
  "primitive-types",
@@ -6096,6 +6343,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime-interface-proc-macro"
 version = "2.0.0-rc6"
+source = "git+https://github.com/paritytech/substrate.git?branch=frontier#50c1820b856ae6d934b281da5f1eda3c6bdaba40"
 dependencies = [
  "Inflector",
  "proc-macro-crate",
@@ -6107,6 +6355,7 @@ dependencies = [
 [[package]]
 name = "sp-serializer"
 version = "2.0.0-rc6"
+source = "git+https://github.com/paritytech/substrate.git?branch=frontier#50c1820b856ae6d934b281da5f1eda3c6bdaba40"
 dependencies = [
  "serde",
  "serde_json",
@@ -6115,6 +6364,7 @@ dependencies = [
 [[package]]
 name = "sp-session"
 version = "2.0.0-rc6"
+source = "git+https://github.com/paritytech/substrate.git?branch=frontier#50c1820b856ae6d934b281da5f1eda3c6bdaba40"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -6127,6 +6377,7 @@ dependencies = [
 [[package]]
 name = "sp-staking"
 version = "2.0.0-rc6"
+source = "git+https://github.com/paritytech/substrate.git?branch=frontier#50c1820b856ae6d934b281da5f1eda3c6bdaba40"
 dependencies = [
  "parity-scale-codec",
  "sp-runtime",
@@ -6136,6 +6387,7 @@ dependencies = [
 [[package]]
 name = "sp-state-machine"
 version = "0.8.0-rc6"
+source = "git+https://github.com/paritytech/substrate.git?branch=frontier#50c1820b856ae6d934b281da5f1eda3c6bdaba40"
 dependencies = [
  "hash-db",
  "itertools 0.9.0",
@@ -6156,10 +6408,12 @@ dependencies = [
 [[package]]
 name = "sp-std"
 version = "2.0.0-rc6"
+source = "git+https://github.com/paritytech/substrate.git?branch=frontier#50c1820b856ae6d934b281da5f1eda3c6bdaba40"
 
 [[package]]
 name = "sp-storage"
 version = "2.0.0-rc6"
+source = "git+https://github.com/paritytech/substrate.git?branch=frontier#50c1820b856ae6d934b281da5f1eda3c6bdaba40"
 dependencies = [
  "impl-serde",
  "parity-scale-codec",
@@ -6172,6 +6426,7 @@ dependencies = [
 [[package]]
 name = "sp-timestamp"
 version = "2.0.0-rc6"
+source = "git+https://github.com/paritytech/substrate.git?branch=frontier#50c1820b856ae6d934b281da5f1eda3c6bdaba40"
 dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec",
@@ -6185,6 +6440,7 @@ dependencies = [
 [[package]]
 name = "sp-tracing"
 version = "2.0.0-rc6"
+source = "git+https://github.com/paritytech/substrate.git?branch=frontier#50c1820b856ae6d934b281da5f1eda3c6bdaba40"
 dependencies = [
  "log",
  "rental",
@@ -6194,6 +6450,7 @@ dependencies = [
 [[package]]
 name = "sp-transaction-pool"
 version = "2.0.0-rc6"
+source = "git+https://github.com/paritytech/substrate.git?branch=frontier#50c1820b856ae6d934b281da5f1eda3c6bdaba40"
 dependencies = [
  "derive_more",
  "futures 0.3.5",
@@ -6208,6 +6465,7 @@ dependencies = [
 [[package]]
 name = "sp-trie"
 version = "2.0.0-rc6"
+source = "git+https://github.com/paritytech/substrate.git?branch=frontier#50c1820b856ae6d934b281da5f1eda3c6bdaba40"
 dependencies = [
  "hash-db",
  "memory-db",
@@ -6221,6 +6479,7 @@ dependencies = [
 [[package]]
 name = "sp-utils"
 version = "2.0.0-rc6"
+source = "git+https://github.com/paritytech/substrate.git?branch=frontier#50c1820b856ae6d934b281da5f1eda3c6bdaba40"
 dependencies = [
  "futures 0.3.5",
  "futures-core",
@@ -6232,6 +6491,7 @@ dependencies = [
 [[package]]
 name = "sp-version"
 version = "2.0.0-rc6"
+source = "git+https://github.com/paritytech/substrate.git?branch=frontier#50c1820b856ae6d934b281da5f1eda3c6bdaba40"
 dependencies = [
  "impl-serde",
  "parity-scale-codec",
@@ -6243,6 +6503,7 @@ dependencies = [
 [[package]]
 name = "sp-wasm-interface"
 version = "2.0.0-rc6"
+source = "git+https://github.com/paritytech/substrate.git?branch=frontier#50c1820b856ae6d934b281da5f1eda3c6bdaba40"
 dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec",
@@ -6357,19 +6618,21 @@ dependencies = [
 
 [[package]]
 name = "substrate-bip39"
-version = "0.4.1"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c004e8166d6e0aa3a9d5fa673e5b7098ff25f930de1013a21341988151e681bb"
+checksum = "bed6646a0159b9935b5d045611560eeef842b78d7adc3ba36f5ca325a13a0236"
 dependencies = [
  "hmac",
  "pbkdf2",
  "schnorrkel",
  "sha2 0.8.2",
+ "zeroize",
 ]
 
 [[package]]
 name = "substrate-build-script-utils"
 version = "2.0.0-rc6"
+source = "git+https://github.com/paritytech/substrate.git?branch=frontier#50c1820b856ae6d934b281da5f1eda3c6bdaba40"
 dependencies = [
  "platforms",
 ]
@@ -6377,6 +6640,7 @@ dependencies = [
 [[package]]
 name = "substrate-frame-rpc-system"
 version = "2.0.0-rc6"
+source = "git+https://github.com/paritytech/substrate.git?branch=frontier#50c1820b856ae6d934b281da5f1eda3c6bdaba40"
 dependencies = [
  "frame-system-rpc-runtime-api",
  "futures 0.3.5",
@@ -6399,6 +6663,7 @@ dependencies = [
 [[package]]
 name = "substrate-prometheus-endpoint"
 version = "0.8.0-rc6"
+source = "git+https://github.com/paritytech/substrate.git?branch=frontier#50c1820b856ae6d934b281da5f1eda3c6bdaba40"
 dependencies = [
  "async-std",
  "derive_more",
@@ -6412,6 +6677,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-client"
 version = "2.0.0-rc6"
+source = "git+https://github.com/paritytech/substrate.git?branch=frontier#50c1820b856ae6d934b281da5f1eda3c6bdaba40"
 dependencies = [
  "futures 0.1.29",
  "futures 0.3.5",
@@ -6437,6 +6703,7 @@ dependencies = [
 [[package]]
 name = "substrate-wasm-builder-runner"
 version = "1.0.6"
+source = "git+https://github.com/paritytech/substrate.git?branch=frontier#50c1820b856ae6d934b281da5f1eda3c6bdaba40"
 
 [[package]]
 name = "subtle"
diff --git a/README.md b/README.md
index 1a9c738f8b..e0c569963b 100644
--- a/README.md
+++ b/README.md
@@ -45,13 +45,16 @@ The vendor folder contains dependencies that contains changes that has not yet
 been upstreamed. Once the upstreaming process is finished, the corresponding
 submodule should be removed from vendor folder, and directly use upstream.
 
-The `substrate` submodule contains a large quantity of dependencies, so they
-should directly use `path` directive in dependency declarations. For other
-dependencies, they should use Cargo's patch feature in workspace declaration.
-
 To install those submodules, from the frontier root folder:
 
 ```sh
 git submodule init
 git submodule update
 ```
+
+### Use local version of Substrate
+
+1. Override your local cargo config to point to your local substrate (pointing to your WIP branch): place `paths = ["path/to/substrate"]` in `~/.cargo/config`.
+2. You are good to go.
+
+Remember to comment out the override after it is done to avoid mysterious build issues on other repo.
\ No newline at end of file
diff --git a/consensus/Cargo.toml b/consensus/Cargo.toml
index e4396b22e1..0adb7af789 100644
--- a/consensus/Cargo.toml
+++ b/consensus/Cargo.toml
@@ -9,18 +9,18 @@ repository = "https://github.com/paritytech/frontier/"
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "1.3.4", features = ["derive"] }
-sp-core = { version = "2.0.0-rc6", path = "../vendor/substrate/primitives/core" }
-sp-blockchain = { version = "2.0.0-rc6", path = "../vendor/substrate/primitives/blockchain" }
-sp-runtime = { version = "2.0.0-rc6", path = "../vendor/substrate/primitives/runtime" }
-sp-api = { version = "2.0.0-rc6", path = "../vendor/substrate/primitives/api" }
-sc-client-api = { version = "2.0.0-rc6", path = "../vendor/substrate/client/api" }
-sp-block-builder = { version = "2.0.0-rc6", path = "../vendor/substrate/primitives/block-builder" }
-sp-inherents = { version = "2.0.0-rc6", path = "../vendor/substrate/primitives/inherents" }
+sp-core = { version = "2.0.0-rc6", git = "https://github.com/paritytech/substrate.git", branch = "frontier" }
+sp-blockchain = { version = "2.0.0-rc6", git = "https://github.com/paritytech/substrate.git", branch = "frontier" }
+sp-runtime = { version = "2.0.0-rc6", git = "https://github.com/paritytech/substrate.git", branch = "frontier" }
+sp-api = { version = "2.0.0-rc6", git = "https://github.com/paritytech/substrate.git", branch = "frontier" }
+sc-client-api = { version = "2.0.0-rc6", git = "https://github.com/paritytech/substrate.git", branch = "frontier" }
+sp-block-builder = { version = "2.0.0-rc6", git = "https://github.com/paritytech/substrate.git", branch = "frontier" }
+sp-inherents = { version = "2.0.0-rc6", git = "https://github.com/paritytech/substrate.git", branch = "frontier" }
 frontier-consensus-primitives = { version = "0.1.0", path = "primitives" }
-sp-consensus = { version = "0.8.0-rc6", path = "../vendor/substrate/primitives/consensus/common" }
+sp-consensus = { version = "0.8.0-rc6", git = "https://github.com/paritytech/substrate.git", branch = "frontier" }
 log = "0.4.8"
 futures = { version = "0.3.1", features = ["compat"] }
-sp-timestamp = { version = "2.0.0-rc6", path = "../vendor/substrate/primitives/timestamp" }
+sp-timestamp = { version = "2.0.0-rc6", git = "https://github.com/paritytech/substrate.git", branch = "frontier" }
 derive_more = "0.99.2"
-prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../vendor/substrate/utils/prometheus", version = "0.8.0-rc6"}
+prometheus-endpoint = { package = "substrate-prometheus-endpoint", git = "https://github.com/paritytech/substrate.git", branch = "frontier"}
 ethereum = { version = "0.2", features = ["codec"], path = "../vendor/ethereum/" }
\ No newline at end of file
diff --git a/consensus/primitives/Cargo.toml b/consensus/primitives/Cargo.toml
index df05c40158..83f658bdcc 100644
--- a/consensus/primitives/Cargo.toml
+++ b/consensus/primitives/Cargo.toml
@@ -9,9 +9,9 @@ homepage = "https://substrate.dev"
 repository = "https://github.com/paritytech/substrate/"
 
 [dependencies]
-sp-std = { version = "2.0.0-rc6", default-features = false, path = "../../vendor/substrate/primitives/std" }
-sp-runtime = { version = "2.0.0-rc6", default-features = false, path = "../../vendor/substrate/primitives/runtime" }
-sp-core = { version = "2.0.0-rc6", default-features = false, path = "../../vendor/substrate/primitives/core" }
+sp-std = { version = "2.0.0-rc6", default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "frontier" }
+sp-runtime = { version = "2.0.0-rc6", default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "frontier" }
+sp-core = { version = "2.0.0-rc6", default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "frontier" }
 codec = { package = "parity-scale-codec", version = "1.3.1", default-features = false, features = ["derive"] }
 
 [features]
diff --git a/frame/ethereum/Cargo.toml b/frame/ethereum/Cargo.toml
index bd30dea795..397dde1fbb 100644
--- a/frame/ethereum/Cargo.toml
+++ b/frame/ethereum/Cargo.toml
@@ -10,14 +10,14 @@ license = "GPL-3.0"
 rustc-hex = { version = "2.1.0", default-features = false }
 serde = { version = "1.0.101", optional = true }
 codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false }
-frame-support = { version = "2.0.0-dev", default-features = false, path = "../../vendor/substrate/frame/support" }
-frame-system = { version = "2.0.0-dev", default-features = false, path = "../../vendor/substrate/frame/system" }
-pallet-balances = { version = "2.0.0-dev", default-features = false, path = "../../vendor/substrate/frame/balances" }
-pallet-timestamp = { version = "2.0.0-dev", default-features = false, path = "../../vendor/substrate/frame/timestamp" }
-pallet-evm = { version = "2.0.0-dev", default-features = false, path = "../../vendor/substrate/frame/evm" }
-sp-runtime = { version = "2.0.0-dev", default-features = false, path = "../../vendor/substrate/primitives/runtime" }
-sp-std = { version = "2.0.0-dev", default-features = false, path = "../../vendor/substrate/primitives/std" }
-sp-io = { version = "2.0.0-dev", default-features = false, path = "../../vendor/substrate/primitives/io" }
+frame-support = { version = "2.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "frontier" }
+frame-system = { version = "2.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "frontier" }
+pallet-balances = { version = "2.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "frontier" }
+pallet-timestamp = { version = "2.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "frontier" }
+pallet-evm = { version = "2.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "frontier" }
+sp-runtime = { version = "2.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "frontier" }
+sp-std = { version = "2.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "frontier" }
+sp-io = { version = "2.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "frontier" }
 ethereum = { version = "0.2", default-features = false, features = ["codec"], path = "../../vendor/ethereum/" }
 ethereum-types = { version = "0.9", default-features = false }
 rlp = { version = "0.4", default-features = false }
@@ -27,7 +27,7 @@ frontier-consensus-primitives = { path = "../../consensus/primitives", default-f
 frontier-rpc-primitives = { path = "../../rpc/primitives", default-features = false }
 
 [dev-dependencies]
-sp-core = { version = "2.0.0-dev", path = "../../vendor/substrate/primitives/core" }
+sp-core = { version = "2.0.0-dev", git = "https://github.com/paritytech/substrate.git", branch = "frontier" }
 
 [features]
 default = ["std"]
diff --git a/frame/ethereum/src/lib.rs b/frame/ethereum/src/lib.rs
index 1dc8bf23f2..c074ac4ac5 100644
--- a/frame/ethereum/src/lib.rs
+++ b/frame/ethereum/src/lib.rs
@@ -249,7 +249,7 @@ impl<T: Trait> Module<T> {
 					transaction.input.clone(),
 					transaction.value,
 					transaction.gas_limit.low_u32(),
-					Some(transaction.gas_price),
+					transaction.gas_price,
 					Some(transaction.nonce),
 					true,
 				).unwrap(); // TODO: handle error
@@ -270,7 +270,7 @@ impl<T: Trait> Module<T> {
 					transaction.input.clone(),
 					transaction.value,
 					transaction.gas_limit.low_u32(),
-					Some(transaction.gas_price),
+					transaction.gas_price,
 					Some(transaction.nonce),
 					true,
 				).unwrap().1; // TODO: handle error
diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml
index 50365dcc7e..2162e7ab9a 100644
--- a/rpc/Cargo.toml
+++ b/rpc/Cargo.toml
@@ -14,13 +14,13 @@ ethereum-types = "0.9.0"
 frontier-consensus = { path = "../consensus" }
 frontier-rpc-core = { path = "core" }
 frontier-rpc-primitives = { path = "primitives" }
-sp-runtime = { path = "../vendor/substrate/primitives/runtime" }
-sp-api = { path = "../vendor/substrate/primitives/api" }
-sp-consensus = { path = "../vendor/substrate/primitives/consensus/common" }
-sp-transaction-pool = { path = "../vendor/substrate/primitives/transaction-pool" }
-sp-storage = { path = "../vendor/substrate/primitives/storage" } 
-sc-service = { path = "../vendor/substrate/client/service" }
-sc-client-api = { path = "../vendor/substrate/client/api" }
+sp-runtime = { git = "https://github.com/paritytech/substrate.git", branch = "frontier" }
+sp-api = { git = "https://github.com/paritytech/substrate.git", branch = "frontier" }
+sp-consensus = { git = "https://github.com/paritytech/substrate.git", branch = "frontier" }
+sp-transaction-pool = { git = "https://github.com/paritytech/substrate.git", branch = "frontier" }
+sp-storage = { git = "https://github.com/paritytech/substrate.git", branch = "frontier" } 
+sc-service = { git = "https://github.com/paritytech/substrate.git", branch = "frontier" }
+sc-client-api = { git = "https://github.com/paritytech/substrate.git", branch = "frontier" }
 ethereum = { version = "0.2", features = ["codec"], path = "../vendor/ethereum/" }
 codec = { package = "parity-scale-codec", version = "1.0.0" }
 rlp = "0.4"
diff --git a/rpc/primitives/Cargo.toml b/rpc/primitives/Cargo.toml
index b0563c91e2..f6c34e7d7d 100644
--- a/rpc/primitives/Cargo.toml
+++ b/rpc/primitives/Cargo.toml
@@ -7,14 +7,14 @@ description = "Runtime primitives for Ethereum RPC (web3) compatibility layer fo
 license = "GPL-3.0"
 
 [dependencies]
-sp-core = { version = "2.0.0-dev", default-features = false, path = "../../vendor/substrate/primitives/core" }
-sp-api = { version = "2.0.0-dev", default-features = false, path = "../../vendor/substrate/primitives/api" }
-pallet-evm = { version = "2.0.0-dev", default-features = false, path = "../../vendor/substrate/frame/evm" }
+sp-core = { version = "2.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "frontier" }
+sp-api = { version = "2.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "frontier" }
+pallet-evm = { version = "2.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "frontier" }
 ethereum = { version = "0.2", default-features = false, features = ["codec"], path = "../../vendor/ethereum/" }
 ethereum-types = { version = "0.9", default-features = false }
 codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false }
-sp-runtime = { version = "2.0.0-dev", default-features = false, path = "../../vendor/substrate/primitives/runtime" }
-sp-std = { version = "2.0.0-dev", default-features = false, path = "../../vendor/substrate/primitives/std" }
+sp-runtime = { version = "2.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "frontier" }
+sp-std = { version = "2.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "frontier" }
 
 [features]
 default = ["std"]
diff --git a/template/node/Cargo.toml b/template/node/Cargo.toml
index be262aea0d..8a48025ac8 100644
--- a/template/node/Cargo.toml
+++ b/template/node/Cargo.toml
@@ -18,34 +18,34 @@ log = "0.4.8"
 structopt = "0.3.8"
 jsonrpc-core = "14.0.3"
 
-sp-api = { version = "2.0.0-dev", path = "../../vendor/substrate/primitives/api" }
-sp-blockchain = { version = "2.0.0-dev", path = "../../vendor/substrate/primitives/blockchain" }
-sc-rpc-api = { version = "0.8.0-dev", path = "../../vendor/substrate/client/rpc-api" }
-sc-rpc = { version = "2.0.0-dev", path = "../../vendor/substrate/client/rpc" }
-substrate-frame-rpc-system = { version = "2.0.0-dev", path = "../../vendor/substrate/utils/frame/rpc/system" }
-pallet-transaction-payment-rpc = { version = "2.0.0-dev", path = "../../vendor/substrate/frame/transaction-payment/rpc/" }
-sc-cli = { version = "0.8.0-dev", path = "../../vendor/substrate/client/cli" }
-sp-core = { version = "2.0.0-dev", path = "../../vendor/substrate/primitives/core" }
-sc-executor = { version = "0.8.0-dev", path = "../../vendor/substrate/client/executor" }
-sc-service = { version = "0.8.0-dev", path = "../../vendor/substrate/client/service" }
-sp-inherents = { version = "2.0.0-dev", path = "../../vendor/substrate/primitives/inherents" }
-sc-transaction-pool = { version = "2.0.0-dev", path = "../../vendor/substrate/client/transaction-pool" }
-sp-transaction-pool = { version = "2.0.0-dev", path = "../../vendor/substrate/primitives/transaction-pool" }
-sc-network = { version = "0.8.0-dev", path = "../../vendor/substrate/client/network" }
-sc-consensus-aura = { version = "0.8.0-dev", path = "../../vendor/substrate/client/consensus/aura" }
-sp-consensus-aura = { version = "0.8.0-dev", path = "../../vendor/substrate/primitives/consensus/aura" }
-sc-consensus-manual-seal = { path = "../../vendor/substrate/client/consensus/manual-seal" }
-sp-consensus = { version = "0.8.0-dev", path = "../../vendor/substrate/primitives/consensus/common" }
-sc-consensus = { version = "0.8.0-dev", path = "../../vendor/substrate/client/consensus/common" }
-sp-timestamp = { version = "2.0.0-dev", default-features = false, path = "../../vendor/substrate/primitives/timestamp" }
-evm = { version = "2.0.0-dev", package = "pallet-evm", path = "../../vendor/substrate/frame/evm" }
+sp-api = { version = "2.0.0-dev", git = "https://github.com/paritytech/substrate.git", branch = "frontier" }
+sp-blockchain = { version = "2.0.0-dev", git = "https://github.com/paritytech/substrate.git", branch = "frontier" }
+sc-rpc-api = { version = "0.8.0-dev", git = "https://github.com/paritytech/substrate.git", branch = "frontier" }
+sc-rpc = { version = "2.0.0-dev", git = "https://github.com/paritytech/substrate.git", branch = "frontier" }
+substrate-frame-rpc-system = { version = "2.0.0-dev", git = "https://github.com/paritytech/substrate.git", branch = "frontier" }
+pallet-transaction-payment-rpc = { version = "2.0.0-dev", git = "https://github.com/paritytech/substrate.git", branch = "frontier" }
+sc-cli = { version = "0.8.0-dev", git = "https://github.com/paritytech/substrate.git", branch = "frontier" }
+sp-core = { version = "2.0.0-dev", git = "https://github.com/paritytech/substrate.git", branch = "frontier" }
+sc-executor = { version = "0.8.0-dev", git = "https://github.com/paritytech/substrate.git", branch = "frontier" }
+sc-service = { version = "0.8.0-dev", git = "https://github.com/paritytech/substrate.git", branch = "frontier" }
+sp-inherents = { version = "2.0.0-dev", git = "https://github.com/paritytech/substrate.git", branch = "frontier" }
+sc-transaction-pool = { version = "2.0.0-dev", git = "https://github.com/paritytech/substrate.git", branch = "frontier" }
+sp-transaction-pool = { version = "2.0.0-dev", git = "https://github.com/paritytech/substrate.git", branch = "frontier" }
+sc-network = { version = "0.8.0-dev", git = "https://github.com/paritytech/substrate.git", branch = "frontier" }
+sc-consensus-aura = { version = "0.8.0-dev", git = "https://github.com/paritytech/substrate.git", branch = "frontier" }
+sp-consensus-aura = { version = "0.8.0-dev", git = "https://github.com/paritytech/substrate.git", branch = "frontier" }
+sc-consensus-manual-seal = { git = "https://github.com/paritytech/substrate.git", branch = "frontier" }
+sp-consensus = { version = "0.8.0-dev", git = "https://github.com/paritytech/substrate.git", branch = "frontier" }
+sc-consensus = { version = "0.8.0-dev", git = "https://github.com/paritytech/substrate.git", branch = "frontier" }
+sp-timestamp = { version = "2.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "frontier" }
+evm = { version = "2.0.0-dev", package = "pallet-evm", git = "https://github.com/paritytech/substrate.git", branch = "frontier" }
 ethereum = { version = "0.1.0", package = "pallet-ethereum", path = "../../frame/ethereum" }
-sc-finality-grandpa = { version = "0.8.0-dev", path = "../../vendor/substrate/client/finality-grandpa" }
-sp-finality-grandpa = { version = "2.0.0-dev", path = "../../vendor/substrate/primitives/finality-grandpa" }
-sc-client-api = { version = "2.0.0-dev", path = "../../vendor/substrate/client/api" }
-sp-runtime = { version = "2.0.0-dev", path = "../../vendor/substrate/primitives/runtime" }
-sc-basic-authorship = { path = "../../vendor/substrate/client/basic-authorship" }
-sp-block-builder = { path = "../../vendor/substrate/primitives/block-builder" }
+sc-finality-grandpa = { version = "0.8.0-dev", git = "https://github.com/paritytech/substrate.git", branch = "frontier" }
+sp-finality-grandpa = { version = "2.0.0-dev", git = "https://github.com/paritytech/substrate.git", branch = "frontier" }
+sc-client-api = { version = "2.0.0-dev", git = "https://github.com/paritytech/substrate.git", branch = "frontier" }
+sp-runtime = { version = "2.0.0-dev", git = "https://github.com/paritytech/substrate.git", branch = "frontier" }
+sc-basic-authorship = { git = "https://github.com/paritytech/substrate.git", branch = "frontier" }
+sp-block-builder = { git = "https://github.com/paritytech/substrate.git", branch = "frontier" }
 
 frontier-consensus = { version = "0.1.0", path = "../../consensus" }
 frontier-template-runtime = { version = "2.0.0-dev", path = "../runtime" }
@@ -53,4 +53,4 @@ frontier-rpc = { version = "0.1.0", path = "../../rpc" }
 frontier-rpc-primitives = { version = "0.1.0", path = "../../rpc/primitives" }
 
 [build-dependencies]
-substrate-build-script-utils = { version = "2.0.0-dev", path = "../../vendor/substrate/utils/build-script-utils" }
+substrate-build-script-utils = { version = "2.0.0-dev", git = "https://github.com/paritytech/substrate.git", branch = "frontier" }
diff --git a/template/node/src/cli.rs b/template/node/src/cli.rs
index bb7357afb6..1fb494063a 100644
--- a/template/node/src/cli.rs
+++ b/template/node/src/cli.rs
@@ -15,10 +15,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use sc_cli::{Subcommand};
 use structopt::StructOpt;
 
-
 #[allow(missing_docs)]
 #[derive(Debug, StructOpt)]
 pub struct RunCmd {
@@ -39,3 +37,27 @@ pub struct Cli {
 	#[structopt(flatten)]
 	pub run: RunCmd,
 }
+
+#[derive(Debug, StructOpt)]
+pub enum Subcommand {
+	/// Build a chain specification.
+	BuildSpec(sc_cli::BuildSpecCmd),
+
+	/// Validate blocks.
+	CheckBlock(sc_cli::CheckBlockCmd),
+
+	/// Export blocks.
+	ExportBlocks(sc_cli::ExportBlocksCmd),
+
+	/// Export the state of a given block into a chain spec.
+	ExportState(sc_cli::ExportStateCmd),
+
+	/// Import blocks.
+	ImportBlocks(sc_cli::ImportBlocksCmd),
+
+	/// Remove the whole chain.
+	PurgeChain(sc_cli::PurgeChainCmd),
+
+	/// Revert the chain to a previous state.
+	Revert(sc_cli::RevertCmd),
+}
diff --git a/template/node/src/command.rs b/template/node/src/command.rs
index c8ab3bb2f7..2cfdcc1582 100644
--- a/template/node/src/command.rs
+++ b/template/node/src/command.rs
@@ -16,7 +16,7 @@
 // limitations under the License.
 
 use crate::chain_spec;
-use crate::cli::Cli;
+use crate::cli::{Cli, Subcommand};
 use crate::service;
 use sc_cli::{SubstrateCli, RuntimeVersion, Role, ChainSpec};
 use sc_service::PartialComponents;
@@ -67,14 +67,54 @@ pub fn run() -> sc_cli::Result<()> {
 	let cli = Cli::from_args();
 
 	match &cli.subcommand {
-		Some(subcommand) => {
-			let runner = cli.create_runner(subcommand)?;
-			runner.run_subcommand(subcommand, |config| {
-				let PartialComponents { client, backend, task_manager, import_queue, .. }
+		Some(Subcommand::BuildSpec(cmd)) => {
+			let runner = cli.create_runner(cmd)?;
+			runner.sync_run(|config| cmd.run(config.chain_spec, config.network))
+		},
+		Some(Subcommand::CheckBlock(cmd)) => {
+			let runner = cli.create_runner(cmd)?;
+			runner.async_run(|config| {
+				let PartialComponents { client, task_manager, import_queue, ..}
 					= new_partial(&config, cli.run.manual_seal)?;
-				Ok((client, backend, import_queue, task_manager))
+				Ok((cmd.run(client, import_queue), task_manager))
 			})
-		}
+		},
+		Some(Subcommand::ExportBlocks(cmd)) => {
+			let runner = cli.create_runner(cmd)?;
+			runner.async_run(|config| {
+				let PartialComponents { client, task_manager, ..}
+					= new_partial(&config, cli.run.manual_seal)?;
+				Ok((cmd.run(client, config.database), task_manager))
+			})
+		},
+		Some(Subcommand::ExportState(cmd)) => {
+			let runner = cli.create_runner(cmd)?;
+			runner.async_run(|config| {
+				let PartialComponents { client, task_manager, ..}
+					= new_partial(&config, cli.run.manual_seal)?;
+				Ok((cmd.run(client, config.chain_spec), task_manager))
+			})
+		},
+		Some(Subcommand::ImportBlocks(cmd)) => {
+			let runner = cli.create_runner(cmd)?;
+			runner.async_run(|config| {
+				let PartialComponents { client, task_manager, import_queue, ..}
+					= new_partial(&config, cli.run.manual_seal)?;
+				Ok((cmd.run(client, import_queue), task_manager))
+			})
+		},
+		Some(Subcommand::PurgeChain(cmd)) => {
+			let runner = cli.create_runner(cmd)?;
+			runner.sync_run(|config| cmd.run(config.database))
+		},
+		Some(Subcommand::Revert(cmd)) => {
+			let runner = cli.create_runner(cmd)?;
+			runner.async_run(|config| {
+				let PartialComponents { client, task_manager, backend, ..}
+					= new_partial(&config, cli.run.manual_seal)?;
+				Ok((cmd.run(client, backend), task_manager))
+			})
+		},
 		None => {
 			let runner = cli.create_runner(&cli.run.base)?;
 			runner.run_node_until_exit(|config| match config.role {
diff --git a/template/node/src/service.rs b/template/node/src/service.rs
index 388ecac53a..a45a84c582 100644
--- a/template/node/src/service.rs
+++ b/template/node/src/service.rs
@@ -204,7 +204,7 @@ pub fn new_full(config: Configuration, manual_seal: bool) -> Result<TaskManager,
 	match consensus_result {
 		ConsensusResult::ManualSeal => {
 			if role.is_authority() {
-				let proposer = sc_basic_authorship::ProposerFactory::new(
+				let env = sc_basic_authorship::ProposerFactory::new(
 					client.clone(),
 					transaction_pool.clone(),
 					prometheus_registry.as_ref(),
@@ -212,13 +212,16 @@ pub fn new_full(config: Configuration, manual_seal: bool) -> Result<TaskManager,
 
 				// Background authorship future
 				let authorship_future = manual_seal::run_manual_seal(
-					Box::new(client.clone()),
-					proposer,
-					client.clone(),
-					transaction_pool.pool().clone(),
-					commands_stream,
-					select_chain.clone(),
-					inherent_data_providers,
+					manual_seal::ManualSealParams {
+						block_import: client.clone(),
+						env,
+						client: client.clone(),
+						pool: transaction_pool.pool().clone(),
+						commands_stream,
+						select_chain,
+						consensus_data_provider: None,
+						inherent_data_providers,
+					}
 				);
 
 				// we spawn the future on a background thread managed by service.
diff --git a/template/runtime/Cargo.toml b/template/runtime/Cargo.toml
index af01427344..36d5c1137d 100644
--- a/template/runtime/Cargo.toml
+++ b/template/runtime/Cargo.toml
@@ -12,50 +12,65 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "1.3.0", default-features = false, features = ["derive"] }
+serde = { version = "1.0.101", optional = true, features = ["derive"] }
 
-pallet-aura = { version = "2.0.0-dev", default-features = false, package = "pallet-aura", path = "../../vendor/substrate/frame/aura" }
-pallet-balances = { version = "2.0.0-dev", default-features = false, package = "pallet-balances", path = "../../vendor/substrate/frame/balances" }
-frame-support = { version = "2.0.0-dev", default-features = false, path = "../../vendor/substrate/frame/support" }
-pallet-grandpa = { version = "2.0.0-dev", default-features = false, package = "pallet-grandpa", path = "../../vendor/substrate/frame/grandpa" }
-pallet-randomness-collective-flip = { version = "2.0.0-dev", default-features = false, package = "pallet-randomness-collective-flip", path = "../../vendor/substrate/frame/randomness-collective-flip" }
-pallet-sudo = { version = "2.0.0-dev", default-features = false, package = "pallet-sudo", path = "../../vendor/substrate/frame/sudo" }
-frame-system = { version = "2.0.0-dev", default-features = false, package = "frame-system", path = "../../vendor/substrate/frame/system" }
-pallet-timestamp = { version = "2.0.0-dev", default-features = false, package = "pallet-timestamp", path = "../../vendor/substrate/frame/timestamp" }
-pallet-transaction-payment = { version = "2.0.0-dev", default-features = false, package = "pallet-transaction-payment", path = "../../vendor/substrate/frame/transaction-payment" }
 frame-ethereum = { version = "0.1.0", default-features = false, package = "pallet-ethereum", path = "../../frame/ethereum" }
-frame-evm = { version = "2.0.0-dev", default-features = false, package = "pallet-evm", path = "../../vendor/substrate/frame/evm" }
-frame-executive = { version = "2.0.0-dev", default-features = false, path = "../../vendor/substrate/frame/executive" }
-serde = { version = "1.0.101", optional = true, features = ["derive"] }
-sp-api = { version = "2.0.0-dev", default-features = false, path = "../../vendor/substrate/primitives/api" }
-sp-block-builder = { path = "../../vendor/substrate/primitives/block-builder", default-features = false, version = "2.0.0-dev"}
-sp-consensus-aura = { version = "0.8.0-dev", default-features = false, path = "../../vendor/substrate/primitives/consensus/aura" }
-sp-core = { version = "2.0.0-dev", default-features = false, path = "../../vendor/substrate/primitives/core" }
-sp-inherents = { path = "../../vendor/substrate/primitives/inherents", default-features = false, version = "2.0.0-dev"}
-sp-io = { version = "2.0.0-dev", default-features = false, path = "../../vendor/substrate/primitives/io" }
-sp-offchain = { version = "2.0.0-dev", default-features = false, path = "../../vendor/substrate/primitives/offchain" }
-sp-runtime = { version = "2.0.0-dev", default-features = false, path = "../../vendor/substrate/primitives/runtime" }
-sp-session = { version = "2.0.0-dev", default-features = false, path = "../../vendor/substrate/primitives/session" }
-sp-std = { version = "2.0.0-dev", default-features = false, path = "../../vendor/substrate/primitives/std" }
-sp-transaction-pool = { version = "2.0.0-dev", default-features = false, path = "../../vendor/substrate/primitives/transaction-pool" }
-sp-version = { version = "2.0.0-dev", default-features = false, path = "../../vendor/substrate/primitives/version" }
-frame-system-rpc-runtime-api = { version = "2.0.0-dev", default-features = false, path = "../../vendor/substrate/frame/system/rpc/runtime-api/" }
-pallet-transaction-payment-rpc-runtime-api = { version = "2.0.0-dev", default-features = false, path = "../../vendor/substrate/frame/transaction-payment/rpc/runtime-api/" }
+frame-evm = { version = "2.0.0-dev", default-features = false, package = "pallet-evm", git = "https://github.com/paritytech/substrate.git", branch = "frontier" }
+frame-executive = { version = "2.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "frontier" }
+frame-support = { version = "2.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "frontier" }
+frame-system = { version = "2.0.0-dev", default-features = false, package = "frame-system", git = "https://github.com/paritytech/substrate.git", branch = "frontier" }
+frame-system-rpc-runtime-api = { version = "2.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "frontier" }
+
+pallet-aura = { version = "2.0.0-dev", default-features = false, package = "pallet-aura", git = "https://github.com/paritytech/substrate.git", branch = "frontier" }
+pallet-balances = { version = "2.0.0-dev", default-features = false, package = "pallet-balances", git = "https://github.com/paritytech/substrate.git", branch = "frontier" }
+pallet-grandpa = { version = "2.0.0-dev", default-features = false, package = "pallet-grandpa", git = "https://github.com/paritytech/substrate.git", branch = "frontier" }
+pallet-randomness-collective-flip = { version = "2.0.0-dev", default-features = false, package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate.git", branch = "frontier" }
+pallet-sudo = { version = "2.0.0-dev", default-features = false, package = "pallet-sudo", git = "https://github.com/paritytech/substrate.git", branch = "frontier" }
+pallet-timestamp = { version = "2.0.0-dev", default-features = false, package = "pallet-timestamp", git = "https://github.com/paritytech/substrate.git", branch = "frontier" }
+pallet-transaction-payment = { version = "2.0.0-dev", default-features = false, package = "pallet-transaction-payment", git = "https://github.com/paritytech/substrate.git", branch = "frontier" }
+pallet-transaction-payment-rpc-runtime-api = { version = "2.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "frontier" }
+
+sp-api = { version = "2.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "frontier" }
+sp-block-builder = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "frontier"}
+sp-consensus-aura = { version = "0.8.0-dev", default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "frontier" }
+sp-core = { version = "2.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "frontier" }
+sp-inherents = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "frontier"}
+sp-io = { version = "2.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "frontier" }
+sp-offchain = { version = "2.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "frontier" }
+sp-runtime = { version = "2.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "frontier" }
+sp-session = { version = "2.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "frontier" }
+sp-std = { version = "2.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "frontier" }
+sp-transaction-pool = { version = "2.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "frontier" }
+sp-version = { version = "2.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "frontier" }
+
 frontier-rpc-primitives = { default-features = false, path = "../../rpc/primitives" }
 
 [build-dependencies]
-wasm-builder-runner = { version = "1.0.5", package = "substrate-wasm-builder-runner", path = "../../vendor/substrate/utils/wasm-builder-runner" }
+wasm-builder-runner = { version = "1.0.5", package = "substrate-wasm-builder-runner", git = "https://github.com/paritytech/substrate.git", branch = "frontier" }
 
 [features]
 default = ["std"]
 std = [
-	"pallet-aura/std",
-	"pallet-balances/std",
 	"codec/std",
+	"serde",
+
+	"frame-ethereum/std",
+	"frame-evm/std",
 	"frame-executive/std",
 	"frame-support/std",
+	"frame-system-rpc-runtime-api/std",
+	"frame-system/std",
+	"frontier-rpc-primitives/std",
+
+	"pallet-aura/std",
+	"pallet-balances/std",
 	"pallet-grandpa/std",
 	"pallet-randomness-collective-flip/std",
-	"serde",
+	"pallet-sudo/std",
+	"pallet-timestamp/std",
+	"pallet-transaction-payment-rpc-runtime-api/std",
+	"pallet-transaction-payment/std",
+	
 	"sp-api/std",
 	"sp-block-builder/std",
 	"sp-consensus-aura/std",
@@ -68,13 +83,4 @@ std = [
 	"sp-std/std",
 	"sp-transaction-pool/std",
 	"sp-version/std",
-	"pallet-sudo/std",
-	"frame-system/std",
-	"pallet-timestamp/std",
-	"pallet-transaction-payment/std",
-	"frame-ethereum/std",
-	"frame-evm/std",
-	"frame-system-rpc-runtime-api/std",
-	"pallet-transaction-payment-rpc-runtime-api/std",
-	"frontier-rpc-primitives/std",
 ]
diff --git a/template/runtime/src/lib.rs b/template/runtime/src/lib.rs
index 2f40b40647..37cb4973f2 100644
--- a/template/runtime/src/lib.rs
+++ b/template/runtime/src/lib.rs
@@ -511,7 +511,7 @@ impl_runtime_apis! {
 						data,
 						value,
 						gas_limit.low_u32(),
-						gas_price,
+						gas_price.unwrap_or_default(),
 						nonce,
 						false,
 					).ok().map(|(_, ret, gas)| (ret, gas)),
@@ -521,7 +521,7 @@ impl_runtime_apis! {
 						data,
 						value,
 						gas_limit.low_u32(),
-						gas_price,
+						gas_price.unwrap_or_default(),
 						nonce,
 						false,
 					).ok().map(|(_, _, gas)| (vec![], gas)),
diff --git a/template/test-utils/client/Cargo.toml b/template/test-utils/client/Cargo.toml
index 9f9c7c9cdc..7379db3a27 100644
--- a/template/test-utils/client/Cargo.toml
+++ b/template/test-utils/client/Cargo.toml
@@ -8,11 +8,11 @@ license = "GPL-3.0"
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "1.3.1" }
-sp-runtime = { path = "../../../vendor/substrate/primitives/runtime" }
-sp-api = { path = "../../../vendor/substrate/primitives/api" }
-sc-executor = { path = "../../../vendor/substrate/client/executor" }
-sc-light = { path = "../../../vendor/substrate/client/light" }
-sc-consensus = { path = "../../../vendor/substrate/client/consensus/common" }
-sc-client-api = { path = "../../../vendor/substrate/client/api" }
-substrate-test-client = { path = "../../../vendor/substrate/test-utils/client" }
+sp-runtime = { git = "https://github.com/paritytech/substrate.git", branch = "frontier" }
+sp-api = { git = "https://github.com/paritytech/substrate.git", branch = "frontier" }
+sc-executor = { git = "https://github.com/paritytech/substrate.git", branch = "frontier" }
+sc-light = { git = "https://github.com/paritytech/substrate.git", branch = "frontier" }
+sc-consensus = { git = "https://github.com/paritytech/substrate.git", branch = "frontier" }
+sc-client-api = { git = "https://github.com/paritytech/substrate.git", branch = "frontier" }
+substrate-test-client = { git = "https://github.com/paritytech/substrate.git", branch = "frontier" }
 frontier-template-runtime = { path = "../../runtime" }
\ No newline at end of file
diff --git a/vendor/evm b/vendor/evm
deleted file mode 160000
index 84013f3ea2..0000000000
--- a/vendor/evm
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 84013f3ea23e436541f409c717134dd1536143de
diff --git a/vendor/substrate b/vendor/substrate
deleted file mode 160000
index 8a35a14c2d..0000000000
--- a/vendor/substrate
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 8a35a14c2dd91bc5de77366f45a06fe45bdfd1d6