diff --git a/polkadot/Cargo.lock b/polkadot/Cargo.lock
index 39b6f6757b..77c18e918d 100644
--- a/polkadot/Cargo.lock
+++ b/polkadot/Cargo.lock
@@ -2317,6 +2317,7 @@ dependencies = [
  "srml-council 0.1.0 (git+https://github.com/paritytech/substrate)",
  "srml-democracy 0.1.0 (git+https://github.com/paritytech/substrate)",
  "srml-executive 0.1.0 (git+https://github.com/paritytech/substrate)",
+ "srml-fees 0.1.0 (git+https://github.com/paritytech/substrate)",
  "srml-grandpa 0.1.0 (git+https://github.com/paritytech/substrate)",
  "srml-indices 0.1.0 (git+https://github.com/paritytech/substrate)",
  "srml-session 0.1.0 (git+https://github.com/paritytech/substrate)",
@@ -3019,7 +3020,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "sr-api-macros"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb"
+source = "git+https://github.com/paritytech/substrate#edf2a8fcdfec15f24bdbc0e73f65af8efcdc9c48"
 dependencies = [
  "blake2-rfc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)",
  "proc-macro-crate 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3031,7 +3032,7 @@ dependencies = [
 [[package]]
 name = "sr-io"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb"
+source = "git+https://github.com/paritytech/substrate#edf2a8fcdfec15f24bdbc0e73f65af8efcdc9c48"
 dependencies = [
  "environmental 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "hash-db 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3048,7 +3049,7 @@ dependencies = [
 [[package]]
 name = "sr-primitives"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb"
+source = "git+https://github.com/paritytech/substrate#edf2a8fcdfec15f24bdbc0e73f65af8efcdc9c48"
 dependencies = [
  "integer-sqrt 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3065,7 +3066,7 @@ dependencies = [
 [[package]]
 name = "sr-std"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb"
+source = "git+https://github.com/paritytech/substrate#edf2a8fcdfec15f24bdbc0e73f65af8efcdc9c48"
 dependencies = [
  "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -3073,7 +3074,7 @@ dependencies = [
 [[package]]
 name = "sr-version"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb"
+source = "git+https://github.com/paritytech/substrate#edf2a8fcdfec15f24bdbc0e73f65af8efcdc9c48"
 dependencies = [
  "impl-serde 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-codec 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3087,7 +3088,7 @@ dependencies = [
 [[package]]
 name = "srml-aura"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb"
+source = "git+https://github.com/paritytech/substrate#edf2a8fcdfec15f24bdbc0e73f65af8efcdc9c48"
 dependencies = [
  "hex-literal 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-codec 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3105,7 +3106,7 @@ dependencies = [
 [[package]]
 name = "srml-balances"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb"
+source = "git+https://github.com/paritytech/substrate#edf2a8fcdfec15f24bdbc0e73f65af8efcdc9c48"
 dependencies = [
  "hex-literal 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-codec 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3122,7 +3123,7 @@ dependencies = [
 [[package]]
 name = "srml-consensus"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb"
+source = "git+https://github.com/paritytech/substrate#edf2a8fcdfec15f24bdbc0e73f65af8efcdc9c48"
 dependencies = [
  "hex-literal 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-codec 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3140,7 +3141,7 @@ dependencies = [
 [[package]]
 name = "srml-council"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb"
+source = "git+https://github.com/paritytech/substrate#edf2a8fcdfec15f24bdbc0e73f65af8efcdc9c48"
 dependencies = [
  "parity-codec 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-codec-derive 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3158,7 +3159,7 @@ dependencies = [
 [[package]]
 name = "srml-democracy"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb"
+source = "git+https://github.com/paritytech/substrate#edf2a8fcdfec15f24bdbc0e73f65af8efcdc9c48"
 dependencies = [
  "hex-literal 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-codec 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3176,7 +3177,7 @@ dependencies = [
 [[package]]
 name = "srml-executive"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb"
+source = "git+https://github.com/paritytech/substrate#edf2a8fcdfec15f24bdbc0e73f65af8efcdc9c48"
 dependencies = [
  "parity-codec 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3187,10 +3188,27 @@ dependencies = [
  "srml-system 0.1.0 (git+https://github.com/paritytech/substrate)",
 ]
 
+[[package]]
+name = "srml-fees"
+version = "0.1.0"
+source = "git+https://github.com/paritytech/substrate#edf2a8fcdfec15f24bdbc0e73f65af8efcdc9c48"
+dependencies = [
+ "hex-literal 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "parity-codec 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "parity-codec-derive 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sr-io 0.1.0 (git+https://github.com/paritytech/substrate)",
+ "sr-primitives 0.1.0 (git+https://github.com/paritytech/substrate)",
+ "sr-std 0.1.0 (git+https://github.com/paritytech/substrate)",
+ "srml-support 0.1.0 (git+https://github.com/paritytech/substrate)",
+ "srml-system 0.1.0 (git+https://github.com/paritytech/substrate)",
+ "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate)",
+]
+
 [[package]]
 name = "srml-grandpa"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb"
+source = "git+https://github.com/paritytech/substrate#edf2a8fcdfec15f24bdbc0e73f65af8efcdc9c48"
 dependencies = [
  "parity-codec 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-codec-derive 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3208,7 +3226,7 @@ dependencies = [
 [[package]]
 name = "srml-indices"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb"
+source = "git+https://github.com/paritytech/substrate#edf2a8fcdfec15f24bdbc0e73f65af8efcdc9c48"
 dependencies = [
  "hex-literal 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-codec 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3227,7 +3245,7 @@ dependencies = [
 [[package]]
 name = "srml-metadata"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb"
+source = "git+https://github.com/paritytech/substrate#edf2a8fcdfec15f24bdbc0e73f65af8efcdc9c48"
 dependencies = [
  "parity-codec 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-codec-derive 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3240,7 +3258,7 @@ dependencies = [
 [[package]]
 name = "srml-session"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb"
+source = "git+https://github.com/paritytech/substrate#edf2a8fcdfec15f24bdbc0e73f65af8efcdc9c48"
 dependencies = [
  "hex-literal 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-codec 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3258,7 +3276,7 @@ dependencies = [
 [[package]]
 name = "srml-staking"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb"
+source = "git+https://github.com/paritytech/substrate#edf2a8fcdfec15f24bdbc0e73f65af8efcdc9c48"
 dependencies = [
  "hex-literal 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-codec 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3277,7 +3295,7 @@ dependencies = [
 [[package]]
 name = "srml-sudo"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb"
+source = "git+https://github.com/paritytech/substrate#edf2a8fcdfec15f24bdbc0e73f65af8efcdc9c48"
 dependencies = [
  "hex-literal 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-codec 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3293,7 +3311,7 @@ dependencies = [
 [[package]]
 name = "srml-support"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb"
+source = "git+https://github.com/paritytech/substrate#edf2a8fcdfec15f24bdbc0e73f65af8efcdc9c48"
 dependencies = [
  "hex-literal 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "once_cell 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3313,7 +3331,7 @@ dependencies = [
 [[package]]
 name = "srml-support-procedural"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb"
+source = "git+https://github.com/paritytech/substrate#edf2a8fcdfec15f24bdbc0e73f65af8efcdc9c48"
 dependencies = [
  "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
  "quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3325,7 +3343,7 @@ dependencies = [
 [[package]]
 name = "srml-support-procedural-tools"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb"
+source = "git+https://github.com/paritytech/substrate#edf2a8fcdfec15f24bdbc0e73f65af8efcdc9c48"
 dependencies = [
  "proc-macro-crate 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3337,7 +3355,7 @@ dependencies = [
 [[package]]
 name = "srml-support-procedural-tools-derive"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb"
+source = "git+https://github.com/paritytech/substrate#edf2a8fcdfec15f24bdbc0e73f65af8efcdc9c48"
 dependencies = [
  "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
  "quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3347,7 +3365,7 @@ dependencies = [
 [[package]]
 name = "srml-system"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb"
+source = "git+https://github.com/paritytech/substrate#edf2a8fcdfec15f24bdbc0e73f65af8efcdc9c48"
 dependencies = [
  "hex-literal 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-codec 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3365,7 +3383,7 @@ dependencies = [
 [[package]]
 name = "srml-timestamp"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb"
+source = "git+https://github.com/paritytech/substrate#edf2a8fcdfec15f24bdbc0e73f65af8efcdc9c48"
 dependencies = [
  "hex-literal 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-codec 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3382,7 +3400,7 @@ dependencies = [
 [[package]]
 name = "srml-treasury"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb"
+source = "git+https://github.com/paritytech/substrate#edf2a8fcdfec15f24bdbc0e73f65af8efcdc9c48"
 dependencies = [
  "hex-literal 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-codec 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3399,7 +3417,7 @@ dependencies = [
 [[package]]
 name = "srml-upgrade-key"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb"
+source = "git+https://github.com/paritytech/substrate#edf2a8fcdfec15f24bdbc0e73f65af8efcdc9c48"
 dependencies = [
  "parity-codec 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3510,7 +3528,7 @@ dependencies = [
 [[package]]
 name = "substrate-cli"
 version = "0.3.0"
-source = "git+https://github.com/paritytech/substrate#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb"
+source = "git+https://github.com/paritytech/substrate#edf2a8fcdfec15f24bdbc0e73f65af8efcdc9c48"
 dependencies = [
  "ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "app_dirs 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3542,7 +3560,7 @@ dependencies = [
 [[package]]
 name = "substrate-client"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb"
+source = "git+https://github.com/paritytech/substrate#edf2a8fcdfec15f24bdbc0e73f65af8efcdc9c48"
 dependencies = [
  "error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3572,7 +3590,7 @@ dependencies = [
 [[package]]
 name = "substrate-client-db"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb"
+source = "git+https://github.com/paritytech/substrate#edf2a8fcdfec15f24bdbc0e73f65af8efcdc9c48"
 dependencies = [
  "hash-db 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "kvdb 0.1.0 (git+https://github.com/paritytech/parity-common?rev=b0317f649ab2c665b7987b8475878fc4d2e1f81d)",
@@ -3594,7 +3612,7 @@ dependencies = [
 [[package]]
 name = "substrate-consensus-aura"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb"
+source = "git+https://github.com/paritytech/substrate#edf2a8fcdfec15f24bdbc0e73f65af8efcdc9c48"
 dependencies = [
  "error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3619,7 +3637,7 @@ dependencies = [
 [[package]]
 name = "substrate-consensus-aura-primitives"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb"
+source = "git+https://github.com/paritytech/substrate#edf2a8fcdfec15f24bdbc0e73f65af8efcdc9c48"
 dependencies = [
  "substrate-client 0.1.0 (git+https://github.com/paritytech/substrate)",
 ]
@@ -3627,7 +3645,7 @@ dependencies = [
 [[package]]
 name = "substrate-consensus-aura-slots"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb"
+source = "git+https://github.com/paritytech/substrate#edf2a8fcdfec15f24bdbc0e73f65af8efcdc9c48"
 dependencies = [
  "error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3646,14 +3664,14 @@ dependencies = [
 [[package]]
 name = "substrate-consensus-common"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb"
+source = "git+https://github.com/paritytech/substrate#edf2a8fcdfec15f24bdbc0e73f65af8efcdc9c48"
 dependencies = [
+ "crossbeam-channel 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-codec 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-codec-derive 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "sr-primitives 0.1.0 (git+https://github.com/paritytech/substrate)",
  "sr-version 0.1.0 (git+https://github.com/paritytech/substrate)",
  "substrate-inherents 0.1.0 (git+https://github.com/paritytech/substrate)",
@@ -3664,7 +3682,7 @@ dependencies = [
 [[package]]
 name = "substrate-executor"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb"
+source = "git+https://github.com/paritytech/substrate#edf2a8fcdfec15f24bdbc0e73f65af8efcdc9c48"
 dependencies = [
  "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3689,7 +3707,7 @@ dependencies = [
 [[package]]
 name = "substrate-finality-grandpa"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb"
+source = "git+https://github.com/paritytech/substrate#edf2a8fcdfec15f24bdbc0e73f65af8efcdc9c48"
 dependencies = [
  "finality-grandpa 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3711,7 +3729,7 @@ dependencies = [
 [[package]]
 name = "substrate-finality-grandpa-primitives"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb"
+source = "git+https://github.com/paritytech/substrate#edf2a8fcdfec15f24bdbc0e73f65af8efcdc9c48"
 dependencies = [
  "parity-codec 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-codec-derive 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3724,7 +3742,7 @@ dependencies = [
 [[package]]
 name = "substrate-inherents"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb"
+source = "git+https://github.com/paritytech/substrate#edf2a8fcdfec15f24bdbc0e73f65af8efcdc9c48"
 dependencies = [
  "parity-codec 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-codec-derive 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3736,7 +3754,7 @@ dependencies = [
 [[package]]
 name = "substrate-keyring"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb"
+source = "git+https://github.com/paritytech/substrate#edf2a8fcdfec15f24bdbc0e73f65af8efcdc9c48"
 dependencies = [
  "hex-literal 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3746,7 +3764,7 @@ dependencies = [
 [[package]]
 name = "substrate-keystore"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb"
+source = "git+https://github.com/paritytech/substrate#edf2a8fcdfec15f24bdbc0e73f65af8efcdc9c48"
 dependencies = [
  "error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3762,7 +3780,7 @@ dependencies = [
 [[package]]
 name = "substrate-network"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb"
+source = "git+https://github.com/paritytech/substrate#edf2a8fcdfec15f24bdbc0e73f65af8efcdc9c48"
 dependencies = [
  "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "crossbeam-channel 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3787,7 +3805,7 @@ dependencies = [
 [[package]]
 name = "substrate-network-libp2p"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb"
+source = "git+https://github.com/paritytech/substrate#edf2a8fcdfec15f24bdbc0e73f65af8efcdc9c48"
 dependencies = [
  "bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3812,7 +3830,7 @@ dependencies = [
 [[package]]
 name = "substrate-panic-handler"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb"
+source = "git+https://github.com/paritytech/substrate#edf2a8fcdfec15f24bdbc0e73f65af8efcdc9c48"
 dependencies = [
  "backtrace 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3821,7 +3839,7 @@ dependencies = [
 [[package]]
 name = "substrate-primitives"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb"
+source = "git+https://github.com/paritytech/substrate#edf2a8fcdfec15f24bdbc0e73f65af8efcdc9c48"
 dependencies = [
  "base58 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "blake2-rfc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3849,7 +3867,7 @@ dependencies = [
 [[package]]
 name = "substrate-rpc"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb"
+source = "git+https://github.com/paritytech/substrate#edf2a8fcdfec15f24bdbc0e73f65af8efcdc9c48"
 dependencies = [
  "error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "jsonrpc-core 10.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3875,7 +3893,7 @@ dependencies = [
 [[package]]
 name = "substrate-rpc-servers"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb"
+source = "git+https://github.com/paritytech/substrate#edf2a8fcdfec15f24bdbc0e73f65af8efcdc9c48"
 dependencies = [
  "jsonrpc-http-server 10.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "jsonrpc-pubsub 10.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3889,7 +3907,7 @@ dependencies = [
 [[package]]
 name = "substrate-serializer"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb"
+source = "git+https://github.com/paritytech/substrate#edf2a8fcdfec15f24bdbc0e73f65af8efcdc9c48"
 dependencies = [
  "serde 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_json 1.0.38 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3898,7 +3916,7 @@ dependencies = [
 [[package]]
 name = "substrate-service"
 version = "0.3.0"
-source = "git+https://github.com/paritytech/substrate#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb"
+source = "git+https://github.com/paritytech/substrate#edf2a8fcdfec15f24bdbc0e73f65af8efcdc9c48"
 dependencies = [
  "error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "exit-future 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3930,7 +3948,7 @@ dependencies = [
 [[package]]
 name = "substrate-state-db"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb"
+source = "git+https://github.com/paritytech/substrate#edf2a8fcdfec15f24bdbc0e73f65af8efcdc9c48"
 dependencies = [
  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-codec 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3942,7 +3960,7 @@ dependencies = [
 [[package]]
 name = "substrate-state-machine"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb"
+source = "git+https://github.com/paritytech/substrate#edf2a8fcdfec15f24bdbc0e73f65af8efcdc9c48"
 dependencies = [
  "hash-db 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "heapsize 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3960,7 +3978,7 @@ dependencies = [
 [[package]]
 name = "substrate-telemetry"
 version = "0.3.0"
-source = "git+https://github.com/paritytech/substrate#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb"
+source = "git+https://github.com/paritytech/substrate#edf2a8fcdfec15f24bdbc0e73f65af8efcdc9c48"
 dependencies = [
  "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3975,7 +3993,7 @@ dependencies = [
 [[package]]
 name = "substrate-transaction-graph"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb"
+source = "git+https://github.com/paritytech/substrate#edf2a8fcdfec15f24bdbc0e73f65af8efcdc9c48"
 dependencies = [
  "error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3989,7 +4007,7 @@ dependencies = [
 [[package]]
 name = "substrate-transaction-pool"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb"
+source = "git+https://github.com/paritytech/substrate#edf2a8fcdfec15f24bdbc0e73f65af8efcdc9c48"
 dependencies = [
  "error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4005,7 +4023,7 @@ dependencies = [
 [[package]]
 name = "substrate-trie"
 version = "0.4.0"
-source = "git+https://github.com/paritytech/substrate#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb"
+source = "git+https://github.com/paritytech/substrate#edf2a8fcdfec15f24bdbc0e73f65af8efcdc9c48"
 dependencies = [
  "hash-db 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "memory-db 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4995,6 +5013,7 @@ dependencies = [
 "checksum srml-council 0.1.0 (git+https://github.com/paritytech/substrate)" = "<none>"
 "checksum srml-democracy 0.1.0 (git+https://github.com/paritytech/substrate)" = "<none>"
 "checksum srml-executive 0.1.0 (git+https://github.com/paritytech/substrate)" = "<none>"
+"checksum srml-fees 0.1.0 (git+https://github.com/paritytech/substrate)" = "<none>"
 "checksum srml-grandpa 0.1.0 (git+https://github.com/paritytech/substrate)" = "<none>"
 "checksum srml-indices 0.1.0 (git+https://github.com/paritytech/substrate)" = "<none>"
 "checksum srml-metadata 0.1.0 (git+https://github.com/paritytech/substrate)" = "<none>"
diff --git a/polkadot/runtime/Cargo.toml b/polkadot/runtime/Cargo.toml
index c6b560cfc8..df4f87d9aa 100644
--- a/polkadot/runtime/Cargo.toml
+++ b/polkadot/runtime/Cargo.toml
@@ -37,6 +37,7 @@ srml-system = { git = "https://github.com/paritytech/substrate", default-feature
 srml-timestamp = { git = "https://github.com/paritytech/substrate", default-features = false }
 srml-treasury = { git = "https://github.com/paritytech/substrate", default-features = false }
 srml-upgrade-key = { git = "https://github.com/paritytech/substrate", default-features = false }
+srml-fees = { git = "https://github.com/paritytech/substrate", default-features = false }
 sr-version = { git = "https://github.com/paritytech/substrate", default-features = false }
 
 [dev-dependencies]
@@ -74,6 +75,7 @@ std = [
 	"srml-timestamp/std",
 	"srml-treasury/std",
 	"srml-upgrade-key/std",
+	"srml-fees/std",
 	"sr-version/std",
 	"serde_derive",
 	"serde/std",
diff --git a/polkadot/runtime/src/lib.rs b/polkadot/runtime/src/lib.rs
index 09dc841c2a..8de8ccd90c 100644
--- a/polkadot/runtime/src/lib.rs
+++ b/polkadot/runtime/src/lib.rs
@@ -65,6 +65,7 @@ extern crate srml_system as system;
 extern crate srml_timestamp as timestamp;
 extern crate srml_treasury as treasury;
 extern crate srml_upgrade_key as upgrade_key;
+extern crate srml_fees as fees;
 
 extern crate polkadot_primitives as primitives;
 
@@ -112,8 +113,8 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	spec_name: create_runtime_str!("polkadot"),
 	impl_name: create_runtime_str!("parity-polkadot"),
 	authoring_version: 1,
-	spec_version: 106,
-	impl_version: 0,
+	spec_version: 107,
+	impl_version: 1,
 	apis: RUNTIME_API_VERSIONS,
 };
 
@@ -241,6 +242,12 @@ impl claims::Trait for Runtime {
 	type Event = Event;
 }
 
+impl fees::Trait for Runtime {
+	type Event = Event;
+	type Amount = Balance;
+	type TransferAsset = Balances;
+}
+
 construct_runtime!(
 	pub enum Runtime with Log(InternalLog: DigestItem<Hash, SessionKey>) where
 		Block = Block,
@@ -267,6 +274,7 @@ construct_runtime!(
 		Sudo: sudo,
 		UpgradeKey: upgrade_key,
 		Claims: claims,
+		Fees: fees::{Module, Storage, Config<T>, Event<T>},
 	}
 );
 
@@ -285,7 +293,7 @@ pub type UncheckedExtrinsic = generic::UncheckedMortalCompactExtrinsic<Address,
 /// Extrinsic type that has already been checked.
 pub type CheckedExtrinsic = generic::CheckedExtrinsic<AccountId, Nonce, Call>;
 /// Executive: handles dispatch to the various modules.
-pub type Executive = executive::Executive<Runtime, Block, system::ChainContext<Runtime>, Balances, AllModules>;
+pub type Executive = executive::Executive<Runtime, Block, system::ChainContext<Runtime>, Fees, AllModules>;
 
 impl_runtime_apis! {
 	impl client_api::Core<Block> for Runtime {
diff --git a/polkadot/runtime/wasm/Cargo.lock b/polkadot/runtime/wasm/Cargo.lock
index 84eab327b1..1c6622bde5 100644
--- a/polkadot/runtime/wasm/Cargo.lock
+++ b/polkadot/runtime/wasm/Cargo.lock
@@ -844,6 +844,7 @@ dependencies = [
  "srml-council 0.1.0 (git+https://github.com/paritytech/substrate)",
  "srml-democracy 0.1.0 (git+https://github.com/paritytech/substrate)",
  "srml-executive 0.1.0 (git+https://github.com/paritytech/substrate)",
+ "srml-fees 0.1.0 (git+https://github.com/paritytech/substrate)",
  "srml-grandpa 0.1.0 (git+https://github.com/paritytech/substrate)",
  "srml-indices 0.1.0 (git+https://github.com/paritytech/substrate)",
  "srml-session 0.1.0 (git+https://github.com/paritytech/substrate)",
@@ -1259,7 +1260,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "sr-api-macros"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb"
+source = "git+https://github.com/paritytech/substrate#edf2a8fcdfec15f24bdbc0e73f65af8efcdc9c48"
 dependencies = [
  "blake2-rfc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)",
  "proc-macro-crate 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1271,7 +1272,7 @@ dependencies = [
 [[package]]
 name = "sr-io"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb"
+source = "git+https://github.com/paritytech/substrate#edf2a8fcdfec15f24bdbc0e73f65af8efcdc9c48"
 dependencies = [
  "environmental 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "hash-db 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1288,7 +1289,7 @@ dependencies = [
 [[package]]
 name = "sr-primitives"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb"
+source = "git+https://github.com/paritytech/substrate#edf2a8fcdfec15f24bdbc0e73f65af8efcdc9c48"
 dependencies = [
  "integer-sqrt 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1305,7 +1306,7 @@ dependencies = [
 [[package]]
 name = "sr-std"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb"
+source = "git+https://github.com/paritytech/substrate#edf2a8fcdfec15f24bdbc0e73f65af8efcdc9c48"
 dependencies = [
  "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -1313,7 +1314,7 @@ dependencies = [
 [[package]]
 name = "sr-version"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb"
+source = "git+https://github.com/paritytech/substrate#edf2a8fcdfec15f24bdbc0e73f65af8efcdc9c48"
 dependencies = [
  "impl-serde 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-codec 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1327,7 +1328,7 @@ dependencies = [
 [[package]]
 name = "srml-aura"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb"
+source = "git+https://github.com/paritytech/substrate#edf2a8fcdfec15f24bdbc0e73f65af8efcdc9c48"
 dependencies = [
  "hex-literal 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-codec 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1345,7 +1346,7 @@ dependencies = [
 [[package]]
 name = "srml-balances"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb"
+source = "git+https://github.com/paritytech/substrate#edf2a8fcdfec15f24bdbc0e73f65af8efcdc9c48"
 dependencies = [
  "hex-literal 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-codec 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1362,7 +1363,7 @@ dependencies = [
 [[package]]
 name = "srml-consensus"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb"
+source = "git+https://github.com/paritytech/substrate#edf2a8fcdfec15f24bdbc0e73f65af8efcdc9c48"
 dependencies = [
  "hex-literal 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-codec 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1380,7 +1381,7 @@ dependencies = [
 [[package]]
 name = "srml-council"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb"
+source = "git+https://github.com/paritytech/substrate#edf2a8fcdfec15f24bdbc0e73f65af8efcdc9c48"
 dependencies = [
  "parity-codec 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-codec-derive 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1398,7 +1399,7 @@ dependencies = [
 [[package]]
 name = "srml-democracy"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb"
+source = "git+https://github.com/paritytech/substrate#edf2a8fcdfec15f24bdbc0e73f65af8efcdc9c48"
 dependencies = [
  "hex-literal 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-codec 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1416,7 +1417,7 @@ dependencies = [
 [[package]]
 name = "srml-executive"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb"
+source = "git+https://github.com/paritytech/substrate#edf2a8fcdfec15f24bdbc0e73f65af8efcdc9c48"
 dependencies = [
  "parity-codec 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1427,10 +1428,27 @@ dependencies = [
  "srml-system 0.1.0 (git+https://github.com/paritytech/substrate)",
 ]
 
+[[package]]
+name = "srml-fees"
+version = "0.1.0"
+source = "git+https://github.com/paritytech/substrate#edf2a8fcdfec15f24bdbc0e73f65af8efcdc9c48"
+dependencies = [
+ "hex-literal 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "parity-codec 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "parity-codec-derive 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sr-io 0.1.0 (git+https://github.com/paritytech/substrate)",
+ "sr-primitives 0.1.0 (git+https://github.com/paritytech/substrate)",
+ "sr-std 0.1.0 (git+https://github.com/paritytech/substrate)",
+ "srml-support 0.1.0 (git+https://github.com/paritytech/substrate)",
+ "srml-system 0.1.0 (git+https://github.com/paritytech/substrate)",
+ "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate)",
+]
+
 [[package]]
 name = "srml-grandpa"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb"
+source = "git+https://github.com/paritytech/substrate#edf2a8fcdfec15f24bdbc0e73f65af8efcdc9c48"
 dependencies = [
  "parity-codec 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-codec-derive 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1448,7 +1466,7 @@ dependencies = [
 [[package]]
 name = "srml-indices"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb"
+source = "git+https://github.com/paritytech/substrate#edf2a8fcdfec15f24bdbc0e73f65af8efcdc9c48"
 dependencies = [
  "hex-literal 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-codec 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1467,7 +1485,7 @@ dependencies = [
 [[package]]
 name = "srml-metadata"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb"
+source = "git+https://github.com/paritytech/substrate#edf2a8fcdfec15f24bdbc0e73f65af8efcdc9c48"
 dependencies = [
  "parity-codec 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-codec-derive 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1480,7 +1498,7 @@ dependencies = [
 [[package]]
 name = "srml-session"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb"
+source = "git+https://github.com/paritytech/substrate#edf2a8fcdfec15f24bdbc0e73f65af8efcdc9c48"
 dependencies = [
  "hex-literal 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-codec 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1498,7 +1516,7 @@ dependencies = [
 [[package]]
 name = "srml-staking"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb"
+source = "git+https://github.com/paritytech/substrate#edf2a8fcdfec15f24bdbc0e73f65af8efcdc9c48"
 dependencies = [
  "hex-literal 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-codec 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1517,7 +1535,7 @@ dependencies = [
 [[package]]
 name = "srml-sudo"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb"
+source = "git+https://github.com/paritytech/substrate#edf2a8fcdfec15f24bdbc0e73f65af8efcdc9c48"
 dependencies = [
  "hex-literal 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-codec 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1533,7 +1551,7 @@ dependencies = [
 [[package]]
 name = "srml-support"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb"
+source = "git+https://github.com/paritytech/substrate#edf2a8fcdfec15f24bdbc0e73f65af8efcdc9c48"
 dependencies = [
  "hex-literal 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "once_cell 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1553,7 +1571,7 @@ dependencies = [
 [[package]]
 name = "srml-support-procedural"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb"
+source = "git+https://github.com/paritytech/substrate#edf2a8fcdfec15f24bdbc0e73f65af8efcdc9c48"
 dependencies = [
  "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
  "quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1565,7 +1583,7 @@ dependencies = [
 [[package]]
 name = "srml-support-procedural-tools"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb"
+source = "git+https://github.com/paritytech/substrate#edf2a8fcdfec15f24bdbc0e73f65af8efcdc9c48"
 dependencies = [
  "proc-macro-crate 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1577,7 +1595,7 @@ dependencies = [
 [[package]]
 name = "srml-support-procedural-tools-derive"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb"
+source = "git+https://github.com/paritytech/substrate#edf2a8fcdfec15f24bdbc0e73f65af8efcdc9c48"
 dependencies = [
  "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
  "quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1587,7 +1605,7 @@ dependencies = [
 [[package]]
 name = "srml-system"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb"
+source = "git+https://github.com/paritytech/substrate#edf2a8fcdfec15f24bdbc0e73f65af8efcdc9c48"
 dependencies = [
  "hex-literal 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-codec 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1605,7 +1623,7 @@ dependencies = [
 [[package]]
 name = "srml-timestamp"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb"
+source = "git+https://github.com/paritytech/substrate#edf2a8fcdfec15f24bdbc0e73f65af8efcdc9c48"
 dependencies = [
  "hex-literal 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-codec 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1622,7 +1640,7 @@ dependencies = [
 [[package]]
 name = "srml-treasury"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb"
+source = "git+https://github.com/paritytech/substrate#edf2a8fcdfec15f24bdbc0e73f65af8efcdc9c48"
 dependencies = [
  "hex-literal 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-codec 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1639,7 +1657,7 @@ dependencies = [
 [[package]]
 name = "srml-upgrade-key"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb"
+source = "git+https://github.com/paritytech/substrate#edf2a8fcdfec15f24bdbc0e73f65af8efcdc9c48"
 dependencies = [
  "parity-codec 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1663,7 +1681,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "substrate-client"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb"
+source = "git+https://github.com/paritytech/substrate#edf2a8fcdfec15f24bdbc0e73f65af8efcdc9c48"
 dependencies = [
  "error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1693,7 +1711,7 @@ dependencies = [
 [[package]]
 name = "substrate-consensus-aura-primitives"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb"
+source = "git+https://github.com/paritytech/substrate#edf2a8fcdfec15f24bdbc0e73f65af8efcdc9c48"
 dependencies = [
  "substrate-client 0.1.0 (git+https://github.com/paritytech/substrate)",
 ]
@@ -1701,14 +1719,14 @@ dependencies = [
 [[package]]
 name = "substrate-consensus-common"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb"
+source = "git+https://github.com/paritytech/substrate#edf2a8fcdfec15f24bdbc0e73f65af8efcdc9c48"
 dependencies = [
+ "crossbeam-channel 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-codec 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-codec-derive 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "sr-primitives 0.1.0 (git+https://github.com/paritytech/substrate)",
  "sr-version 0.1.0 (git+https://github.com/paritytech/substrate)",
  "substrate-inherents 0.1.0 (git+https://github.com/paritytech/substrate)",
@@ -1719,7 +1737,7 @@ dependencies = [
 [[package]]
 name = "substrate-executor"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb"
+source = "git+https://github.com/paritytech/substrate#edf2a8fcdfec15f24bdbc0e73f65af8efcdc9c48"
 dependencies = [
  "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1744,7 +1762,7 @@ dependencies = [
 [[package]]
 name = "substrate-finality-grandpa-primitives"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb"
+source = "git+https://github.com/paritytech/substrate#edf2a8fcdfec15f24bdbc0e73f65af8efcdc9c48"
 dependencies = [
  "parity-codec 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-codec-derive 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1757,7 +1775,7 @@ dependencies = [
 [[package]]
 name = "substrate-inherents"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb"
+source = "git+https://github.com/paritytech/substrate#edf2a8fcdfec15f24bdbc0e73f65af8efcdc9c48"
 dependencies = [
  "parity-codec 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-codec-derive 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1769,7 +1787,7 @@ dependencies = [
 [[package]]
 name = "substrate-keyring"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb"
+source = "git+https://github.com/paritytech/substrate#edf2a8fcdfec15f24bdbc0e73f65af8efcdc9c48"
 dependencies = [
  "hex-literal 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1779,7 +1797,7 @@ dependencies = [
 [[package]]
 name = "substrate-panic-handler"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb"
+source = "git+https://github.com/paritytech/substrate#edf2a8fcdfec15f24bdbc0e73f65af8efcdc9c48"
 dependencies = [
  "backtrace 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1788,7 +1806,7 @@ dependencies = [
 [[package]]
 name = "substrate-primitives"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb"
+source = "git+https://github.com/paritytech/substrate#edf2a8fcdfec15f24bdbc0e73f65af8efcdc9c48"
 dependencies = [
  "base58 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "blake2-rfc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1816,7 +1834,7 @@ dependencies = [
 [[package]]
 name = "substrate-serializer"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb"
+source = "git+https://github.com/paritytech/substrate#edf2a8fcdfec15f24bdbc0e73f65af8efcdc9c48"
 dependencies = [
  "serde 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_json 1.0.38 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1825,7 +1843,7 @@ dependencies = [
 [[package]]
 name = "substrate-state-machine"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb"
+source = "git+https://github.com/paritytech/substrate#edf2a8fcdfec15f24bdbc0e73f65af8efcdc9c48"
 dependencies = [
  "hash-db 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "heapsize 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1843,7 +1861,7 @@ dependencies = [
 [[package]]
 name = "substrate-telemetry"
 version = "0.3.0"
-source = "git+https://github.com/paritytech/substrate#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb"
+source = "git+https://github.com/paritytech/substrate#edf2a8fcdfec15f24bdbc0e73f65af8efcdc9c48"
 dependencies = [
  "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1858,7 +1876,7 @@ dependencies = [
 [[package]]
 name = "substrate-trie"
 version = "0.4.0"
-source = "git+https://github.com/paritytech/substrate#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb"
+source = "git+https://github.com/paritytech/substrate#edf2a8fcdfec15f24bdbc0e73f65af8efcdc9c48"
 dependencies = [
  "hash-db 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "memory-db 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2411,6 +2429,7 @@ dependencies = [
 "checksum srml-council 0.1.0 (git+https://github.com/paritytech/substrate)" = "<none>"
 "checksum srml-democracy 0.1.0 (git+https://github.com/paritytech/substrate)" = "<none>"
 "checksum srml-executive 0.1.0 (git+https://github.com/paritytech/substrate)" = "<none>"
+"checksum srml-fees 0.1.0 (git+https://github.com/paritytech/substrate)" = "<none>"
 "checksum srml-grandpa 0.1.0 (git+https://github.com/paritytech/substrate)" = "<none>"
 "checksum srml-indices 0.1.0 (git+https://github.com/paritytech/substrate)" = "<none>"
 "checksum srml-metadata 0.1.0 (git+https://github.com/paritytech/substrate)" = "<none>"
diff --git a/polkadot/runtime/wasm/target/wasm32-unknown-unknown/release/polkadot_runtime.compact.wasm b/polkadot/runtime/wasm/target/wasm32-unknown-unknown/release/polkadot_runtime.compact.wasm
index 0b559249fd..c32a6f7bff 100644
Binary files a/polkadot/runtime/wasm/target/wasm32-unknown-unknown/release/polkadot_runtime.compact.wasm and b/polkadot/runtime/wasm/target/wasm32-unknown-unknown/release/polkadot_runtime.compact.wasm differ
diff --git a/polkadot/runtime/wasm/target/wasm32-unknown-unknown/release/polkadot_runtime.wasm b/polkadot/runtime/wasm/target/wasm32-unknown-unknown/release/polkadot_runtime.wasm
index f273794cbe..dfad2c4181 100755
Binary files a/polkadot/runtime/wasm/target/wasm32-unknown-unknown/release/polkadot_runtime.wasm and b/polkadot/runtime/wasm/target/wasm32-unknown-unknown/release/polkadot_runtime.wasm differ
diff --git a/polkadot/service/src/chain_spec.rs b/polkadot/service/src/chain_spec.rs
index 99879389fb..3d1e63c6dd 100644
--- a/polkadot/service/src/chain_spec.rs
+++ b/polkadot/service/src/chain_spec.rs
@@ -21,7 +21,7 @@ use polkadot_runtime::{
 	GenesisConfig, ConsensusConfig, CouncilSeatsConfig, DemocracyConfig, TreasuryConfig,
 	SessionConfig, StakingConfig, TimestampConfig, BalancesConfig, Perbill,
 	CouncilVotingConfig, GrandpaConfig, UpgradeKeyConfig, SudoConfig, IndicesConfig,
-	ClaimsConfig, Permill
+	ClaimsConfig, FeesConfig, Permill
 };
 
 const STAGING_TELEMETRY_URL: &str = "wss://telemetry.polkadot.io/submit/";
@@ -63,8 +63,6 @@ fn staging_testnet_config_genesis() -> GenesisConfig {
 		}),
 		balances: Some(BalancesConfig {
 			balances: endowed_accounts.iter().map(|&k| (k, 10_000_000 * DOLLARS)).collect(),
-			transaction_base_fee: 1 * CENTS,
-			transaction_byte_fee: 10 * MILLICENTS,
 			existential_deposit: 1 * DOLLARS,
 			transfer_fee: 1 * CENTS,
 			creation_fee: 1 * CENTS,
@@ -134,6 +132,10 @@ fn staging_testnet_config_genesis() -> GenesisConfig {
 		claims: Some(ClaimsConfig {
 			claims: vec![],
 		}),
+		fees: Some(FeesConfig {
+			transaction_base_fee: 1 * CENTS,
+			transaction_byte_fee: 10 * MILLICENTS,
+		}),
 	}
 }
 
@@ -171,8 +173,6 @@ fn testnet_genesis(initial_authorities: Vec<AuthorityId>, upgrade_key: H256) ->
 			ids: endowed_accounts.clone(),
 		}),
 		balances: Some(BalancesConfig {
-			transaction_base_fee: 1,
-			transaction_byte_fee: 0,
 			existential_deposit: 500,
 			transfer_fee: 0,
 			creation_fee: 0,
@@ -238,6 +238,10 @@ fn testnet_genesis(initial_authorities: Vec<AuthorityId>, upgrade_key: H256) ->
 		claims: Some(ClaimsConfig {
 			claims: vec![],
 		}),
+		fees: Some(FeesConfig {
+			transaction_base_fee: 1,
+			transaction_byte_fee: 0,
+		})
 	}
 }
 
diff --git a/polkadot/service/src/lib.rs b/polkadot/service/src/lib.rs
index 93814e2e27..539e21f3f8 100644
--- a/polkadot/service/src/lib.rs
+++ b/polkadot/service/src/lib.rs
@@ -247,8 +247,6 @@ construct_service_factory! {
 			{ |config, executor| <LightComponents<Factory>>::new(config, executor) },
 		FullImportQueue = AuraImportQueue<
 			Self::Block,
-			FullClient<Self>,
-			NothingExtra,
 		>
 			{ |config: &mut FactoryFullConfiguration<Self>, client: Arc<FullClient<Self>>| {
 				let slot_duration = SlotDuration::get_or_compute(&*client)?;
@@ -272,8 +270,6 @@ construct_service_factory! {
 			}},
 		LightImportQueue = AuraImportQueue<
 			Self::Block,
-			LightClient<Self>,
-			NothingExtra,
 		>
 			{ |config: &mut FactoryFullConfiguration<Self>, client: Arc<LightClient<Self>>| {
 				let slot_duration = SlotDuration::get_or_compute(&*client)?;