From 1251a7187cac479e02c7abc7b780d540d4a089aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Sat, 6 Mar 2021 15:08:22 +0100
Subject: [PATCH] Substrate companion #8275 (#2575)

* Substrate companion #8275

https://github.com/paritytech/substrate/pull/8275

* "Update Substrate"

Co-authored-by: parity-processbot <>
---
 polkadot/Cargo.lock                          | 288 ++++++++---------
 polkadot/node/service/src/chain_spec.rs      | 320 +++++++++----------
 polkadot/node/test/service/src/chain_spec.rs |  36 +--
 3 files changed, 322 insertions(+), 322 deletions(-)

diff --git a/polkadot/Cargo.lock b/polkadot/Cargo.lock
index 3f44da84ade..c62e454cb98 100644
--- a/polkadot/Cargo.lock
+++ b/polkadot/Cargo.lock
@@ -1646,7 +1646,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 [[package]]
 name = "fork-tree"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "parity-scale-codec",
 ]
@@ -1664,7 +1664,7 @@ dependencies = [
 [[package]]
 name = "frame-benchmarking"
 version = "3.1.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -1683,7 +1683,7 @@ dependencies = [
 [[package]]
 name = "frame-benchmarking-cli"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "Inflector",
  "chrono",
@@ -1706,7 +1706,7 @@ dependencies = [
 [[package]]
 name = "frame-executive"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -1722,7 +1722,7 @@ dependencies = [
 [[package]]
 name = "frame-metadata"
 version = "13.0.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "parity-scale-codec",
  "serde",
@@ -1733,7 +1733,7 @@ dependencies = [
 [[package]]
 name = "frame-support"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "bitflags",
  "frame-metadata",
@@ -1759,7 +1759,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "Inflector",
  "frame-support-procedural-tools",
@@ -1771,7 +1771,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural-tools"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "frame-support-procedural-tools-derive",
  "proc-macro-crate",
@@ -1783,7 +1783,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural-tools-derive"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1793,7 +1793,7 @@ dependencies = [
 [[package]]
 name = "frame-system"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "frame-support",
  "impl-trait-for-tuples",
@@ -1810,7 +1810,7 @@ dependencies = [
 [[package]]
 name = "frame-system-benchmarking"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -1824,7 +1824,7 @@ dependencies = [
 [[package]]
 name = "frame-system-rpc-runtime-api"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -1833,7 +1833,7 @@ dependencies = [
 [[package]]
 name = "frame-try-runtime"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "frame-support",
  "parity-scale-codec",
@@ -4075,7 +4075,7 @@ checksum = "13370dae44474229701bb69b90b4f4dca6404cb0357a2d50d635f1171dc3aa7b"
 [[package]]
 name = "pallet-authority-discovery"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4091,7 +4091,7 @@ dependencies = [
 [[package]]
 name = "pallet-authorship"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4106,7 +4106,7 @@ dependencies = [
 [[package]]
 name = "pallet-babe"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4131,7 +4131,7 @@ dependencies = [
 [[package]]
 name = "pallet-balances"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4146,7 +4146,7 @@ dependencies = [
 [[package]]
 name = "pallet-bounties"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4161,7 +4161,7 @@ dependencies = [
 [[package]]
 name = "pallet-collective"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4178,7 +4178,7 @@ dependencies = [
 [[package]]
 name = "pallet-democracy"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4193,7 +4193,7 @@ dependencies = [
 [[package]]
 name = "pallet-election-provider-multi-phase"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4214,7 +4214,7 @@ dependencies = [
 [[package]]
 name = "pallet-elections-phragmen"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4230,7 +4230,7 @@ dependencies = [
 [[package]]
 name = "pallet-grandpa"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4252,7 +4252,7 @@ dependencies = [
 [[package]]
 name = "pallet-identity"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "enumflags2",
  "frame-benchmarking",
@@ -4268,7 +4268,7 @@ dependencies = [
 [[package]]
 name = "pallet-im-online"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4288,7 +4288,7 @@ dependencies = [
 [[package]]
 name = "pallet-indices"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4305,7 +4305,7 @@ dependencies = [
 [[package]]
 name = "pallet-membership"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4319,7 +4319,7 @@ dependencies = [
 [[package]]
 name = "pallet-multisig"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4335,7 +4335,7 @@ dependencies = [
 [[package]]
 name = "pallet-nicks"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4349,7 +4349,7 @@ dependencies = [
 [[package]]
 name = "pallet-offences"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4365,7 +4365,7 @@ dependencies = [
 [[package]]
 name = "pallet-offences-benchmarking"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4387,7 +4387,7 @@ dependencies = [
 [[package]]
 name = "pallet-proxy"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4403,7 +4403,7 @@ dependencies = [
 [[package]]
 name = "pallet-randomness-collective-flip"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4416,7 +4416,7 @@ dependencies = [
 [[package]]
 name = "pallet-recovery"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "enumflags2",
  "frame-support",
@@ -4431,7 +4431,7 @@ dependencies = [
 [[package]]
 name = "pallet-scheduler"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4447,7 +4447,7 @@ dependencies = [
 [[package]]
 name = "pallet-session"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4467,7 +4467,7 @@ dependencies = [
 [[package]]
 name = "pallet-session-benchmarking"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4483,7 +4483,7 @@ dependencies = [
 [[package]]
 name = "pallet-society"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4497,7 +4497,7 @@ dependencies = [
 [[package]]
 name = "pallet-staking"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4521,7 +4521,7 @@ dependencies = [
 [[package]]
 name = "pallet-staking-reward-curve"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
@@ -4532,7 +4532,7 @@ dependencies = [
 [[package]]
 name = "pallet-sudo"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4546,7 +4546,7 @@ dependencies = [
 [[package]]
 name = "pallet-timestamp"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4565,7 +4565,7 @@ dependencies = [
 [[package]]
 name = "pallet-tips"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4580,7 +4580,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4596,7 +4596,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment-rpc"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "jsonrpc-core",
  "jsonrpc-core-client",
@@ -4613,7 +4613,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment-rpc-runtime-api"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "pallet-transaction-payment",
  "parity-scale-codec",
@@ -4624,7 +4624,7 @@ dependencies = [
 [[package]]
 name = "pallet-treasury"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4640,7 +4640,7 @@ dependencies = [
 [[package]]
 name = "pallet-utility"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4656,7 +4656,7 @@ dependencies = [
 [[package]]
 name = "pallet-vesting"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "enumflags2",
  "frame-benchmarking",
@@ -6835,7 +6835,7 @@ dependencies = [
 [[package]]
 name = "remote-externalities"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "env_logger 0.8.2",
  "futures 0.3.12",
@@ -7087,7 +7087,7 @@ dependencies = [
 [[package]]
 name = "sc-authority-discovery"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "async-trait",
  "derive_more",
@@ -7115,7 +7115,7 @@ dependencies = [
 [[package]]
 name = "sc-basic-authorship"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "futures 0.3.12",
  "futures-timer 3.0.2",
@@ -7138,7 +7138,7 @@ dependencies = [
 [[package]]
 name = "sc-block-builder"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "parity-scale-codec",
  "sc-client-api",
@@ -7154,7 +7154,7 @@ dependencies = [
 [[package]]
 name = "sc-chain-spec"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec",
@@ -7175,7 +7175,7 @@ dependencies = [
 [[package]]
 name = "sc-chain-spec-derive"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
@@ -7186,7 +7186,7 @@ dependencies = [
 [[package]]
 name = "sc-cli"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "chrono",
  "fdlimit",
@@ -7224,7 +7224,7 @@ dependencies = [
 [[package]]
 name = "sc-client-api"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "derive_more",
  "fnv",
@@ -7258,7 +7258,7 @@ dependencies = [
 [[package]]
 name = "sc-client-db"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "blake2-rfc",
  "hash-db",
@@ -7288,7 +7288,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "sc-client-api",
  "sp-blockchain",
@@ -7299,7 +7299,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-babe"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "derive_more",
  "fork-tree",
@@ -7345,7 +7345,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-babe-rpc"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "derive_more",
  "futures 0.3.12",
@@ -7369,7 +7369,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-epochs"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "fork-tree",
  "parity-scale-codec",
@@ -7382,7 +7382,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-slots"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "futures 0.3.12",
  "futures-timer 3.0.2",
@@ -7408,7 +7408,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-uncles"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "log",
  "sc-client-api",
@@ -7422,7 +7422,7 @@ dependencies = [
 [[package]]
 name = "sc-executor"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "derive_more",
  "lazy_static",
@@ -7451,7 +7451,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-common"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "derive_more",
  "parity-scale-codec",
@@ -7467,7 +7467,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-wasmi"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -7482,7 +7482,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-wasmtime"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -7500,7 +7500,7 @@ dependencies = [
 [[package]]
 name = "sc-finality-grandpa"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "derive_more",
  "dyn-clone",
@@ -7539,7 +7539,7 @@ dependencies = [
 [[package]]
 name = "sc-finality-grandpa-rpc"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "derive_more",
  "finality-grandpa",
@@ -7563,7 +7563,7 @@ dependencies = [
 [[package]]
 name = "sc-finality-grandpa-warp-sync"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "derive_more",
  "futures 0.3.12",
@@ -7584,7 +7584,7 @@ dependencies = [
 [[package]]
 name = "sc-informant"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "ansi_term 0.12.1",
  "futures 0.3.12",
@@ -7602,7 +7602,7 @@ dependencies = [
 [[package]]
 name = "sc-keystore"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "async-trait",
  "derive_more",
@@ -7622,7 +7622,7 @@ dependencies = [
 [[package]]
 name = "sc-light"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "hash-db",
  "lazy_static",
@@ -7641,7 +7641,7 @@ dependencies = [
 [[package]]
 name = "sc-network"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "async-std",
  "async-trait",
@@ -7694,7 +7694,7 @@ dependencies = [
 [[package]]
 name = "sc-network-gossip"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "futures 0.3.12",
  "futures-timer 3.0.2",
@@ -7710,7 +7710,7 @@ dependencies = [
 [[package]]
 name = "sc-offchain"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "bytes 0.5.6",
  "fnv",
@@ -7737,7 +7737,7 @@ dependencies = [
 [[package]]
 name = "sc-peerset"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "futures 0.3.12",
  "libp2p",
@@ -7750,7 +7750,7 @@ dependencies = [
 [[package]]
 name = "sc-proposer-metrics"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "log",
  "substrate-prometheus-endpoint",
@@ -7759,7 +7759,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "futures 0.3.12",
  "hash-db",
@@ -7793,7 +7793,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc-api"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "derive_more",
  "futures 0.3.12",
@@ -7817,7 +7817,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc-server"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "futures 0.1.29",
  "jsonrpc-core",
@@ -7835,7 +7835,7 @@ dependencies = [
 [[package]]
 name = "sc-service"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "directories",
  "exit-future",
@@ -7898,7 +7898,7 @@ dependencies = [
 [[package]]
 name = "sc-state-db"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -7913,7 +7913,7 @@ dependencies = [
 [[package]]
 name = "sc-sync-state-rpc"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "jsonrpc-core",
  "jsonrpc-core-client",
@@ -7933,7 +7933,7 @@ dependencies = [
 [[package]]
 name = "sc-telemetry"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "chrono",
  "futures 0.3.12",
@@ -7955,7 +7955,7 @@ dependencies = [
 [[package]]
 name = "sc-tracing"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "ansi_term 0.12.1",
  "atty",
@@ -7983,7 +7983,7 @@ dependencies = [
 [[package]]
 name = "sc-tracing-proc-macro"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
@@ -7994,7 +7994,7 @@ dependencies = [
 [[package]]
 name = "sc-transaction-graph"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "derive_more",
  "futures 0.3.12",
@@ -8016,7 +8016,7 @@ dependencies = [
 [[package]]
 name = "sc-transaction-pool"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "futures 0.3.12",
  "futures-diagnose",
@@ -8422,7 +8422,7 @@ dependencies = [
 [[package]]
 name = "sp-allocator"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "log",
  "sp-core",
@@ -8434,7 +8434,7 @@ dependencies = [
 [[package]]
 name = "sp-api"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "hash-db",
  "log",
@@ -8451,7 +8451,7 @@ dependencies = [
 [[package]]
 name = "sp-api-proc-macro"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "blake2-rfc",
  "proc-macro-crate",
@@ -8463,7 +8463,7 @@ dependencies = [
 [[package]]
 name = "sp-application-crypto"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "parity-scale-codec",
  "serde",
@@ -8475,7 +8475,7 @@ dependencies = [
 [[package]]
 name = "sp-arithmetic"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "integer-sqrt",
  "num-traits",
@@ -8488,7 +8488,7 @@ dependencies = [
 [[package]]
 name = "sp-authority-discovery"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -8500,7 +8500,7 @@ dependencies = [
 [[package]]
 name = "sp-authorship"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "parity-scale-codec",
  "sp-inherents",
@@ -8511,7 +8511,7 @@ dependencies = [
 [[package]]
 name = "sp-block-builder"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -8523,7 +8523,7 @@ dependencies = [
 [[package]]
 name = "sp-blockchain"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "futures 0.3.12",
  "log",
@@ -8541,7 +8541,7 @@ dependencies = [
 [[package]]
 name = "sp-chain-spec"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "serde",
  "serde_json",
@@ -8550,7 +8550,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "futures 0.3.12",
  "futures-timer 3.0.2",
@@ -8576,7 +8576,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-babe"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "merlin",
  "parity-scale-codec",
@@ -8596,7 +8596,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-slots"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "parity-scale-codec",
  "sp-arithmetic",
@@ -8606,7 +8606,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-vrf"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "parity-scale-codec",
  "schnorrkel",
@@ -8618,7 +8618,7 @@ dependencies = [
 [[package]]
 name = "sp-core"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "base58",
  "blake2-rfc",
@@ -8662,7 +8662,7 @@ dependencies = [
 [[package]]
 name = "sp-database"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "kvdb",
  "parking_lot 0.11.1",
@@ -8671,7 +8671,7 @@ dependencies = [
 [[package]]
 name = "sp-debug-derive"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -8681,7 +8681,7 @@ dependencies = [
 [[package]]
 name = "sp-election-providers"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "parity-scale-codec",
  "sp-arithmetic",
@@ -8692,7 +8692,7 @@ dependencies = [
 [[package]]
 name = "sp-externalities"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "environmental",
  "parity-scale-codec",
@@ -8703,7 +8703,7 @@ dependencies = [
 [[package]]
 name = "sp-finality-grandpa"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "finality-grandpa",
  "log",
@@ -8720,7 +8720,7 @@ dependencies = [
 [[package]]
 name = "sp-inherents"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "parity-scale-codec",
  "parking_lot 0.11.1",
@@ -8732,7 +8732,7 @@ dependencies = [
 [[package]]
 name = "sp-io"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "futures 0.3.12",
  "hash-db",
@@ -8756,7 +8756,7 @@ dependencies = [
 [[package]]
 name = "sp-keyring"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "lazy_static",
  "sp-core",
@@ -8767,7 +8767,7 @@ dependencies = [
 [[package]]
 name = "sp-keystore"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "async-trait",
  "derive_more",
@@ -8784,7 +8784,7 @@ dependencies = [
 [[package]]
 name = "sp-npos-elections"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "parity-scale-codec",
  "serde",
@@ -8797,7 +8797,7 @@ dependencies = [
 [[package]]
 name = "sp-npos-elections-compact"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
@@ -8808,7 +8808,7 @@ dependencies = [
 [[package]]
 name = "sp-offchain"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "sp-api",
  "sp-core",
@@ -8818,7 +8818,7 @@ dependencies = [
 [[package]]
 name = "sp-panic-handler"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "backtrace",
 ]
@@ -8826,7 +8826,7 @@ dependencies = [
 [[package]]
 name = "sp-rpc"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "serde",
  "sp-core",
@@ -8835,7 +8835,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "either",
  "hash256-std-hasher",
@@ -8856,7 +8856,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime-interface"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec",
@@ -8873,7 +8873,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime-interface-proc-macro"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "Inflector",
  "proc-macro-crate",
@@ -8885,7 +8885,7 @@ dependencies = [
 [[package]]
 name = "sp-serializer"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "serde",
  "serde_json",
@@ -8894,7 +8894,7 @@ dependencies = [
 [[package]]
 name = "sp-session"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -8907,7 +8907,7 @@ dependencies = [
 [[package]]
 name = "sp-staking"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "parity-scale-codec",
  "sp-runtime",
@@ -8917,7 +8917,7 @@ dependencies = [
 [[package]]
 name = "sp-state-machine"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "hash-db",
  "log",
@@ -8939,12 +8939,12 @@ dependencies = [
 [[package]]
 name = "sp-std"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 
 [[package]]
 name = "sp-storage"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "impl-serde",
  "parity-scale-codec",
@@ -8957,7 +8957,7 @@ dependencies = [
 [[package]]
 name = "sp-tasks"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "log",
  "sp-core",
@@ -8970,7 +8970,7 @@ dependencies = [
 [[package]]
 name = "sp-timestamp"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec",
@@ -8984,7 +8984,7 @@ dependencies = [
 [[package]]
 name = "sp-tracing"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -8997,7 +8997,7 @@ dependencies = [
 [[package]]
 name = "sp-transaction-pool"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "derive_more",
  "futures 0.3.12",
@@ -9013,7 +9013,7 @@ dependencies = [
 [[package]]
 name = "sp-trie"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "hash-db",
  "memory-db",
@@ -9027,7 +9027,7 @@ dependencies = [
 [[package]]
 name = "sp-utils"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "futures 0.3.12",
  "futures-core",
@@ -9039,7 +9039,7 @@ dependencies = [
 [[package]]
 name = "sp-version"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "impl-serde",
  "parity-scale-codec",
@@ -9051,7 +9051,7 @@ dependencies = [
 [[package]]
 name = "sp-wasm-interface"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec",
@@ -9183,7 +9183,7 @@ dependencies = [
 [[package]]
 name = "substrate-browser-utils"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "chrono",
  "console_error_panic_hook",
@@ -9210,7 +9210,7 @@ dependencies = [
 [[package]]
 name = "substrate-build-script-utils"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "platforms",
 ]
@@ -9218,7 +9218,7 @@ dependencies = [
 [[package]]
 name = "substrate-frame-rpc-system"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "frame-system-rpc-runtime-api",
  "futures 0.3.12",
@@ -9241,7 +9241,7 @@ dependencies = [
 [[package]]
 name = "substrate-prometheus-endpoint"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "async-std",
  "derive_more",
@@ -9255,7 +9255,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-client"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "futures 0.1.29",
  "futures 0.3.12",
@@ -9282,7 +9282,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-utils"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "futures 0.3.12",
  "substrate-test-utils-derive",
@@ -9292,7 +9292,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-utils-derive"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "proc-macro-crate",
  "quote",
@@ -9975,7 +9975,7 @@ checksum = "e604eb7b43c06650e854be16a2a03155743d3752dd1c943f6829e26b7a36e382"
 [[package]]
 name = "try-runtime-cli"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#5f056830a85f33c5628e6a3fac5c8e3270514bfe"
+source = "git+https://github.com/paritytech/substrate#af998b20151cf08d0757a0c4d040be9438197cdd"
 dependencies = [
  "frame-try-runtime",
  "log",
diff --git a/polkadot/node/service/src/chain_spec.rs b/polkadot/node/service/src/chain_spec.rs
index 58edd063515..6d53426fc3a 100644
--- a/polkadot/node/service/src/chain_spec.rs
+++ b/polkadot/node/service/src/chain_spec.rs
@@ -200,19 +200,19 @@ fn polkadot_staging_testnet_config_genesis(wasm_binary: &[u8]) -> polkadot::Gene
 	const STASH: u128 = 100 * DOTS;
 
 	polkadot::GenesisConfig {
-		frame_system: Some(polkadot::SystemConfig {
+		frame_system: polkadot::SystemConfig {
 			code: wasm_binary.to_vec(),
 			changes_trie_config: Default::default(),
-		}),
-		pallet_balances: Some(polkadot::BalancesConfig {
+		},
+		pallet_balances: polkadot::BalancesConfig {
 			balances: endowed_accounts
 				.iter()
 				.map(|k: &AccountId| (k.clone(), ENDOWMENT))
 				.chain(initial_authorities.iter().map(|x| (x.0.clone(), STASH)))
 				.collect(),
-		}),
-		pallet_indices: Some(polkadot::IndicesConfig { indices: vec![] }),
-		pallet_session: Some(polkadot::SessionConfig {
+		},
+		pallet_indices: polkadot::IndicesConfig { indices: vec![] },
+		pallet_session: polkadot::SessionConfig {
 			keys: initial_authorities
 				.iter()
 				.map(|x| {
@@ -230,8 +230,8 @@ fn polkadot_staging_testnet_config_genesis(wasm_binary: &[u8]) -> polkadot::Gene
 					)
 				})
 				.collect::<Vec<_>>(),
-		}),
-		pallet_staking: Some(polkadot::StakingConfig {
+		},
+		pallet_staking: polkadot::StakingConfig {
 			validator_count: 50,
 			minimum_validator_count: 4,
 			stakers: initial_authorities
@@ -249,28 +249,28 @@ fn polkadot_staging_testnet_config_genesis(wasm_binary: &[u8]) -> polkadot::Gene
 			force_era: Forcing::ForceNone,
 			slash_reward_fraction: Perbill::from_percent(10),
 			..Default::default()
-		}),
-		pallet_elections_phragmen: Some(Default::default()),
-		pallet_democracy: Some(Default::default()),
-		pallet_collective_Instance1: Some(polkadot::CouncilConfig {
+		},
+		pallet_elections_phragmen: Default::default(),
+		pallet_democracy: Default::default(),
+		pallet_collective_Instance1: polkadot::CouncilConfig {
 			members: vec![],
 			phantom: Default::default(),
-		}),
-		pallet_collective_Instance2: Some(polkadot::TechnicalCommitteeConfig {
+		},
+		pallet_collective_Instance2: polkadot::TechnicalCommitteeConfig {
 			members: vec![],
 			phantom: Default::default(),
-		}),
-		pallet_membership_Instance1: Some(Default::default()),
-		pallet_babe: Some(Default::default()),
-		pallet_grandpa: Some(Default::default()),
-		pallet_im_online: Some(Default::default()),
-		pallet_authority_discovery: Some(polkadot::AuthorityDiscoveryConfig { keys: vec![] }),
-		claims: Some(polkadot::ClaimsConfig {
+		},
+		pallet_membership_Instance1: Default::default(),
+		pallet_babe: Default::default(),
+		pallet_grandpa: Default::default(),
+		pallet_im_online: Default::default(),
+		pallet_authority_discovery: polkadot::AuthorityDiscoveryConfig { keys: vec![] },
+		claims: polkadot::ClaimsConfig {
 			claims: vec![],
 			vesting: vec![],
-		}),
-		pallet_vesting: Some(polkadot::VestingConfig { vesting: vec![] }),
-		pallet_treasury: Some(Default::default()),
+		},
+		pallet_vesting: polkadot::VestingConfig { vesting: vec![] },
+		pallet_treasury: Default::default(),
 	}
 }
 
@@ -398,19 +398,19 @@ fn westend_staging_testnet_config_genesis(wasm_binary: &[u8]) -> westend::Genesi
 	const STASH: u128 = 100 * WND;
 
 	westend::GenesisConfig {
-		frame_system: Some(westend::SystemConfig {
+		frame_system: westend::SystemConfig {
 			code: wasm_binary.to_vec(),
 			changes_trie_config: Default::default(),
-		}),
-		pallet_balances: Some(westend::BalancesConfig {
+		},
+		pallet_balances: westend::BalancesConfig {
 			balances: endowed_accounts
 				.iter()
 				.map(|k: &AccountId| (k.clone(), ENDOWMENT))
 				.chain(initial_authorities.iter().map(|x| (x.0.clone(), STASH)))
 				.collect(),
-		}),
-		pallet_indices: Some(westend::IndicesConfig { indices: vec![] }),
-		pallet_session: Some(westend::SessionConfig {
+		},
+		pallet_indices: westend::IndicesConfig { indices: vec![] },
+		pallet_session: westend::SessionConfig {
 			keys: initial_authorities
 				.iter()
 				.map(|x| {
@@ -428,8 +428,8 @@ fn westend_staging_testnet_config_genesis(wasm_binary: &[u8]) -> westend::Genesi
 					)
 				})
 				.collect::<Vec<_>>(),
-		}),
-		pallet_staking: Some(westend::StakingConfig {
+		},
+		pallet_staking: westend::StakingConfig {
 			validator_count: 50,
 			minimum_validator_count: 4,
 			stakers: initial_authorities
@@ -447,15 +447,15 @@ fn westend_staging_testnet_config_genesis(wasm_binary: &[u8]) -> westend::Genesi
 			force_era: Forcing::ForceNone,
 			slash_reward_fraction: Perbill::from_percent(10),
 			..Default::default()
-		}),
-		pallet_babe: Some(Default::default()),
-		pallet_grandpa: Some(Default::default()),
-		pallet_im_online: Some(Default::default()),
-		pallet_authority_discovery: Some(westend::AuthorityDiscoveryConfig { keys: vec![] }),
-		pallet_vesting: Some(westend::VestingConfig { vesting: vec![] }),
-		pallet_sudo: Some(westend::SudoConfig {
+		},
+		pallet_babe: Default::default(),
+		pallet_grandpa: Default::default(),
+		pallet_im_online: Default::default(),
+		pallet_authority_discovery: westend::AuthorityDiscoveryConfig { keys: vec![] },
+		pallet_vesting: westend::VestingConfig { vesting: vec![] },
+		pallet_sudo: westend::SudoConfig {
 			key: endowed_accounts[0].clone(),
-		}),
+		},
 	}
 }
 
@@ -583,19 +583,19 @@ fn kusama_staging_testnet_config_genesis(wasm_binary: &[u8]) -> kusama::GenesisC
 	const STASH: u128 = 100 * KSM;
 
 	kusama::GenesisConfig {
-		frame_system: Some(kusama::SystemConfig {
+		frame_system: kusama::SystemConfig {
 			code: wasm_binary.to_vec(),
 			changes_trie_config: Default::default(),
-		}),
-		pallet_balances: Some(kusama::BalancesConfig {
+		},
+		pallet_balances: kusama::BalancesConfig {
 			balances: endowed_accounts
 				.iter()
 				.map(|k: &AccountId| (k.clone(), ENDOWMENT))
 				.chain(initial_authorities.iter().map(|x| (x.0.clone(), STASH)))
 				.collect(),
-		}),
-		pallet_indices: Some(kusama::IndicesConfig { indices: vec![] }),
-		pallet_session: Some(kusama::SessionConfig {
+		},
+		pallet_indices: kusama::IndicesConfig { indices: vec![] },
+		pallet_session: kusama::SessionConfig {
 			keys: initial_authorities
 				.iter()
 				.map(|x| {
@@ -613,8 +613,8 @@ fn kusama_staging_testnet_config_genesis(wasm_binary: &[u8]) -> kusama::GenesisC
 					)
 				})
 				.collect::<Vec<_>>(),
-		}),
-		pallet_staking: Some(kusama::StakingConfig {
+		},
+		pallet_staking: kusama::StakingConfig {
 			validator_count: 50,
 			minimum_validator_count: 4,
 			stakers: initial_authorities
@@ -632,28 +632,28 @@ fn kusama_staging_testnet_config_genesis(wasm_binary: &[u8]) -> kusama::GenesisC
 			force_era: Forcing::ForceNone,
 			slash_reward_fraction: Perbill::from_percent(10),
 			..Default::default()
-		}),
-		pallet_elections_phragmen: Some(Default::default()),
-		pallet_democracy: Some(Default::default()),
-		pallet_collective_Instance1: Some(kusama::CouncilConfig {
+		},
+		pallet_elections_phragmen: Default::default(),
+		pallet_democracy: Default::default(),
+		pallet_collective_Instance1: kusama::CouncilConfig {
 			members: vec![],
 			phantom: Default::default(),
-		}),
-		pallet_collective_Instance2: Some(kusama::TechnicalCommitteeConfig {
+		},
+		pallet_collective_Instance2: kusama::TechnicalCommitteeConfig {
 			members: vec![],
 			phantom: Default::default(),
-		}),
-		pallet_membership_Instance1: Some(Default::default()),
-		pallet_babe: Some(Default::default()),
-		pallet_grandpa: Some(Default::default()),
-		pallet_im_online: Some(Default::default()),
-		pallet_authority_discovery: Some(kusama::AuthorityDiscoveryConfig { keys: vec![] }),
-		claims: Some(kusama::ClaimsConfig {
+		},
+		pallet_membership_Instance1: Default::default(),
+		pallet_babe: Default::default(),
+		pallet_grandpa: Default::default(),
+		pallet_im_online: Default::default(),
+		pallet_authority_discovery: kusama::AuthorityDiscoveryConfig { keys: vec![] },
+		claims: kusama::ClaimsConfig {
 			claims: vec![],
 			vesting: vec![],
-		}),
-		pallet_vesting: Some(kusama::VestingConfig { vesting: vec![] }),
-		pallet_treasury: Some(Default::default()),
+		},
+		pallet_vesting: kusama::VestingConfig { vesting: vec![] },
+		pallet_treasury: Default::default(),
 	}
 }
 
@@ -823,20 +823,20 @@ fn rococo_staging_testnet_config_genesis(wasm_binary: &[u8]) -> rococo_runtime::
 	const STASH: u128 = 100 * ROC;
 
 	rococo_runtime::GenesisConfig {
-		frame_system: Some(rococo_runtime::SystemConfig {
+		frame_system: rococo_runtime::SystemConfig {
 			code: wasm_binary.to_vec(),
 			changes_trie_config: Default::default(),
-		}),
-		pallet_balances: Some(rococo_runtime::BalancesConfig {
+		},
+		pallet_balances: rococo_runtime::BalancesConfig {
 			balances: endowed_accounts.iter()
 				.map(|k: &AccountId| (k.clone(), ENDOWMENT))
 				.chain(initial_authorities.iter().map(|x| (x.0.clone(), STASH)))
 				.collect(),
-		}),
-		pallet_indices: Some(rococo_runtime::IndicesConfig {
+		},
+		pallet_indices: rococo_runtime::IndicesConfig {
 			indices: vec![],
-		}),
-		pallet_session: Some(rococo_runtime::SessionConfig {
+		},
+		pallet_session: rococo_runtime::SessionConfig {
 			keys: initial_authorities.iter().map(|x| (
 				x.0.clone(),
 				x.0.clone(),
@@ -849,17 +849,17 @@ fn rococo_staging_testnet_config_genesis(wasm_binary: &[u8]) -> rococo_runtime::
 					x.7.clone(),
 				),
 			)).collect::<Vec<_>>(),
-		}),
-		pallet_babe: Some(Default::default()),
-		pallet_grandpa: Some(Default::default()),
-		pallet_im_online: Some(Default::default()),
-		pallet_authority_discovery: Some(rococo_runtime::AuthorityDiscoveryConfig {
+		},
+		pallet_babe: Default::default(),
+		pallet_grandpa: Default::default(),
+		pallet_im_online: Default::default(),
+		pallet_authority_discovery: rococo_runtime::AuthorityDiscoveryConfig {
 			keys: vec![],
-		}),
-		pallet_sudo: Some(rococo_runtime::SudoConfig {
+		},
+		pallet_sudo: rococo_runtime::SudoConfig {
 			key: endowed_accounts[0].clone(),
-		}),
-		parachains_configuration: Some(rococo_runtime::ParachainsConfigurationConfig {
+		},
+		parachains_configuration: rococo_runtime::ParachainsConfigurationConfig {
 			config: polkadot_runtime_parachains::configuration::HostConfiguration {
 				validation_upgrade_frequency: 600u32,
 				validation_upgrade_delay: 300,
@@ -900,7 +900,7 @@ fn rococo_staging_testnet_config_genesis(wasm_binary: &[u8]) -> rococo_runtime::
 				zeroth_delay_tranche_width: 0,
 				..Default::default()
 			},
-		}),
+		},
 	}
 }
 
@@ -1070,18 +1070,18 @@ pub fn polkadot_testnet_genesis(
 	const STASH: u128 = 100 * DOTS;
 
 	polkadot::GenesisConfig {
-		frame_system: Some(polkadot::SystemConfig {
+		frame_system: polkadot::SystemConfig {
 			code: wasm_binary.to_vec(),
 			changes_trie_config: Default::default(),
-		}),
-		pallet_indices: Some(polkadot::IndicesConfig { indices: vec![] }),
-		pallet_balances: Some(polkadot::BalancesConfig {
+		},
+		pallet_indices: polkadot::IndicesConfig { indices: vec![] },
+		pallet_balances: polkadot::BalancesConfig {
 			balances: endowed_accounts
 				.iter()
 				.map(|k| (k.clone(), ENDOWMENT))
 				.collect(),
-		}),
-		pallet_session: Some(polkadot::SessionConfig {
+		},
+		pallet_session: polkadot::SessionConfig {
 			keys: initial_authorities
 				.iter()
 				.map(|x| {
@@ -1099,8 +1099,8 @@ pub fn polkadot_testnet_genesis(
 					)
 				})
 				.collect::<Vec<_>>(),
-		}),
-		pallet_staking: Some(polkadot::StakingConfig {
+		},
+		pallet_staking: polkadot::StakingConfig {
 			minimum_validator_count: 1,
 			validator_count: 2,
 			stakers: initial_authorities
@@ -1118,28 +1118,28 @@ pub fn polkadot_testnet_genesis(
 			force_era: Forcing::NotForcing,
 			slash_reward_fraction: Perbill::from_percent(10),
 			..Default::default()
-		}),
-		pallet_elections_phragmen: Some(Default::default()),
-		pallet_democracy: Some(polkadot::DemocracyConfig::default()),
-		pallet_collective_Instance1: Some(polkadot::CouncilConfig {
+		},
+		pallet_elections_phragmen: Default::default(),
+		pallet_democracy: polkadot::DemocracyConfig::default(),
+		pallet_collective_Instance1: polkadot::CouncilConfig {
 			members: vec![],
 			phantom: Default::default(),
-		}),
-		pallet_collective_Instance2: Some(polkadot::TechnicalCommitteeConfig {
+		},
+		pallet_collective_Instance2: polkadot::TechnicalCommitteeConfig {
 			members: vec![],
 			phantom: Default::default(),
-		}),
-		pallet_membership_Instance1: Some(Default::default()),
-		pallet_babe: Some(Default::default()),
-		pallet_grandpa: Some(Default::default()),
-		pallet_im_online: Some(Default::default()),
-		pallet_authority_discovery: Some(polkadot::AuthorityDiscoveryConfig { keys: vec![] }),
-		claims: Some(polkadot::ClaimsConfig {
+		},
+		pallet_membership_Instance1: Default::default(),
+		pallet_babe: Default::default(),
+		pallet_grandpa: Default::default(),
+		pallet_im_online: Default::default(),
+		pallet_authority_discovery: polkadot::AuthorityDiscoveryConfig { keys: vec![] },
+		claims: polkadot::ClaimsConfig {
 			claims: vec![],
 			vesting: vec![],
-		}),
-		pallet_vesting: Some(polkadot::VestingConfig { vesting: vec![] }),
-		pallet_treasury: Some(Default::default()),
+		},
+		pallet_vesting: polkadot::VestingConfig { vesting: vec![] },
+		pallet_treasury: Default::default(),
 	}
 }
 
@@ -1165,18 +1165,18 @@ pub fn kusama_testnet_genesis(
 	const STASH: u128 = 100 * KSM;
 
 	kusama::GenesisConfig {
-		frame_system: Some(kusama::SystemConfig {
+		frame_system: kusama::SystemConfig {
 			code: wasm_binary.to_vec(),
 			changes_trie_config: Default::default(),
-		}),
-		pallet_indices: Some(kusama::IndicesConfig { indices: vec![] }),
-		pallet_balances: Some(kusama::BalancesConfig {
+		},
+		pallet_indices: kusama::IndicesConfig { indices: vec![] },
+		pallet_balances: kusama::BalancesConfig {
 			balances: endowed_accounts
 				.iter()
 				.map(|k| (k.clone(), ENDOWMENT))
 				.collect(),
-		}),
-		pallet_session: Some(kusama::SessionConfig {
+		},
+		pallet_session: kusama::SessionConfig {
 			keys: initial_authorities
 				.iter()
 				.map(|x| {
@@ -1194,8 +1194,8 @@ pub fn kusama_testnet_genesis(
 					)
 				})
 				.collect::<Vec<_>>(),
-		}),
-		pallet_staking: Some(kusama::StakingConfig {
+		},
+		pallet_staking: kusama::StakingConfig {
 			minimum_validator_count: 1,
 			validator_count: 2,
 			stakers: initial_authorities
@@ -1213,28 +1213,28 @@ pub fn kusama_testnet_genesis(
 			force_era: Forcing::NotForcing,
 			slash_reward_fraction: Perbill::from_percent(10),
 			..Default::default()
-		}),
-		pallet_elections_phragmen: Some(Default::default()),
-		pallet_democracy: Some(kusama::DemocracyConfig::default()),
-		pallet_collective_Instance1: Some(kusama::CouncilConfig {
+		},
+		pallet_elections_phragmen: Default::default(),
+		pallet_democracy: kusama::DemocracyConfig::default(),
+		pallet_collective_Instance1: kusama::CouncilConfig {
 			members: vec![],
 			phantom: Default::default(),
-		}),
-		pallet_collective_Instance2: Some(kusama::TechnicalCommitteeConfig {
+		},
+		pallet_collective_Instance2: kusama::TechnicalCommitteeConfig {
 			members: vec![],
 			phantom: Default::default(),
-		}),
-		pallet_membership_Instance1: Some(Default::default()),
-		pallet_babe: Some(Default::default()),
-		pallet_grandpa: Some(Default::default()),
-		pallet_im_online: Some(Default::default()),
-		pallet_authority_discovery: Some(kusama::AuthorityDiscoveryConfig { keys: vec![] }),
-		claims: Some(kusama::ClaimsConfig {
+		},
+		pallet_membership_Instance1: Default::default(),
+		pallet_babe: Default::default(),
+		pallet_grandpa: Default::default(),
+		pallet_im_online: Default::default(),
+		pallet_authority_discovery: kusama::AuthorityDiscoveryConfig { keys: vec![] },
+		claims: kusama::ClaimsConfig {
 			claims: vec![],
 			vesting: vec![],
-		}),
-		pallet_vesting: Some(kusama::VestingConfig { vesting: vec![] }),
-		pallet_treasury: Some(Default::default()),
+		},
+		pallet_vesting: kusama::VestingConfig { vesting: vec![] },
+		pallet_treasury: Default::default(),
 	}
 }
 
@@ -1260,18 +1260,18 @@ pub fn westend_testnet_genesis(
 	const STASH: u128 = 100 * DOTS;
 
 	westend::GenesisConfig {
-		frame_system: Some(westend::SystemConfig {
+		frame_system: westend::SystemConfig {
 			code: wasm_binary.to_vec(),
 			changes_trie_config: Default::default(),
-		}),
-		pallet_indices: Some(westend::IndicesConfig { indices: vec![] }),
-		pallet_balances: Some(westend::BalancesConfig {
+		},
+		pallet_indices: westend::IndicesConfig { indices: vec![] },
+		pallet_balances: westend::BalancesConfig {
 			balances: endowed_accounts
 				.iter()
 				.map(|k| (k.clone(), ENDOWMENT))
 				.collect(),
-		}),
-		pallet_session: Some(westend::SessionConfig {
+		},
+		pallet_session: westend::SessionConfig {
 			keys: initial_authorities
 				.iter()
 				.map(|x| {
@@ -1289,8 +1289,8 @@ pub fn westend_testnet_genesis(
 					)
 				})
 				.collect::<Vec<_>>(),
-		}),
-		pallet_staking: Some(westend::StakingConfig {
+		},
+		pallet_staking: westend::StakingConfig {
 			minimum_validator_count: 1,
 			validator_count: 2,
 			stakers: initial_authorities
@@ -1308,13 +1308,13 @@ pub fn westend_testnet_genesis(
 			force_era: Forcing::NotForcing,
 			slash_reward_fraction: Perbill::from_percent(10),
 			..Default::default()
-		}),
-		pallet_babe: Some(Default::default()),
-		pallet_grandpa: Some(Default::default()),
-		pallet_im_online: Some(Default::default()),
-		pallet_authority_discovery: Some(westend::AuthorityDiscoveryConfig { keys: vec![] }),
-		pallet_vesting: Some(westend::VestingConfig { vesting: vec![] }),
-		pallet_sudo: Some(westend::SudoConfig { key: root_key }),
+		},
+		pallet_babe: Default::default(),
+		pallet_grandpa: Default::default(),
+		pallet_im_online: Default::default(),
+		pallet_authority_discovery: westend::AuthorityDiscoveryConfig { keys: vec![] },
+		pallet_vesting: westend::VestingConfig { vesting: vec![] },
+		pallet_sudo: westend::SudoConfig { key: root_key },
 	}
 }
 
@@ -1339,17 +1339,17 @@ pub fn rococo_testnet_genesis(
 	const ENDOWMENT: u128 = 1_000_000 * DOTS;
 
 	rococo_runtime::GenesisConfig {
-		frame_system: Some(rococo_runtime::SystemConfig {
+		frame_system: rococo_runtime::SystemConfig {
 			code: wasm_binary.to_vec(),
 			changes_trie_config: Default::default(),
-		}),
-		pallet_indices: Some(rococo_runtime::IndicesConfig {
+		},
+		pallet_indices: rococo_runtime::IndicesConfig {
 			indices: vec![],
-		}),
-		pallet_balances: Some(rococo_runtime::BalancesConfig {
+		},
+		pallet_balances: rococo_runtime::BalancesConfig {
 			balances: endowed_accounts.iter().map(|k| (k.clone(), ENDOWMENT)).collect(),
-		}),
-		pallet_session: Some(rococo_runtime::SessionConfig {
+		},
+		pallet_session: rococo_runtime::SessionConfig {
 			keys: initial_authorities.iter().map(|x| (
 				x.0.clone(),
 				x.0.clone(),
@@ -1362,15 +1362,15 @@ pub fn rococo_testnet_genesis(
 					x.7.clone(),
 				),
 			)).collect::<Vec<_>>(),
-		}),
-		pallet_babe: Some(Default::default()),
-		pallet_grandpa: Some(Default::default()),
-		pallet_im_online: Some(Default::default()),
-		pallet_authority_discovery: Some(rococo_runtime::AuthorityDiscoveryConfig {
+		},
+		pallet_babe: Default::default(),
+		pallet_grandpa: Default::default(),
+		pallet_im_online: Default::default(),
+		pallet_authority_discovery: rococo_runtime::AuthorityDiscoveryConfig {
 			keys: vec![],
-		}),
-		pallet_sudo: Some(rococo_runtime::SudoConfig { key: root_key }),
-		parachains_configuration: Some(rococo_runtime::ParachainsConfigurationConfig {
+		},
+		pallet_sudo: rococo_runtime::SudoConfig { key: root_key },
+		parachains_configuration: rococo_runtime::ParachainsConfigurationConfig {
 			config: polkadot_runtime_parachains::configuration::HostConfiguration {
 				validation_upgrade_frequency: 600u32,
 				validation_upgrade_delay: 300,
@@ -1411,7 +1411,7 @@ pub fn rococo_testnet_genesis(
 				zeroth_delay_tranche_width: 0,
 				..Default::default()
 			},
-		}),
+		},
 	}
 }
 
diff --git a/polkadot/node/test/service/src/chain_spec.rs b/polkadot/node/test/service/src/chain_spec.rs
index 173ee70dfb0..e4505f1618d 100644
--- a/polkadot/node/test/service/src/chain_spec.rs
+++ b/polkadot/node/test/service/src/chain_spec.rs
@@ -114,18 +114,18 @@ fn polkadot_testnet_genesis(
 	const STASH: u128 = 100 * DOTS;
 
 	runtime::GenesisConfig {
-		frame_system: Some(runtime::SystemConfig {
+		frame_system: runtime::SystemConfig {
 			code: runtime::WASM_BINARY.expect("Wasm binary must be built for testing").to_vec(),
 			..Default::default()
-		}),
-		pallet_indices: Some(runtime::IndicesConfig { indices: vec![] }),
-		pallet_balances: Some(runtime::BalancesConfig {
+		},
+		pallet_indices: runtime::IndicesConfig { indices: vec![] },
+		pallet_balances: runtime::BalancesConfig {
 			balances: endowed_accounts
 				.iter()
 				.map(|k| (k.clone(), ENDOWMENT))
 				.collect(),
-		}),
-		pallet_session: Some(runtime::SessionConfig {
+		},
+		pallet_session: runtime::SessionConfig {
 			keys: initial_authorities
 				.iter()
 				.map(|x| {
@@ -142,8 +142,8 @@ fn polkadot_testnet_genesis(
 					)
 				})
 				.collect::<Vec<_>>(),
-		}),
-		pallet_staking: Some(runtime::StakingConfig {
+		},
+		pallet_staking: runtime::StakingConfig {
 			minimum_validator_count: 1,
 			validator_count: 2,
 			stakers: initial_authorities
@@ -161,17 +161,17 @@ fn polkadot_testnet_genesis(
 			force_era: Forcing::NotForcing,
 			slash_reward_fraction: Perbill::from_percent(10),
 			..Default::default()
-		}),
-		pallet_babe: Some(Default::default()),
-		pallet_grandpa: Some(Default::default()),
-		pallet_authority_discovery: Some(runtime::AuthorityDiscoveryConfig { keys: vec![] }),
-		claims: Some(runtime::ClaimsConfig {
+		},
+		pallet_babe: Default::default(),
+		pallet_grandpa: Default::default(),
+		pallet_authority_discovery: runtime::AuthorityDiscoveryConfig { keys: vec![] },
+		claims: runtime::ClaimsConfig {
 			claims: vec![],
 			vesting: vec![],
-		}),
-		pallet_vesting: Some(runtime::VestingConfig { vesting: vec![] }),
-		pallet_sudo: Some(runtime::SudoConfig { key: root_key }),
-		parachains_configuration: Some(runtime::ParachainsConfigurationConfig {
+		},
+		pallet_vesting: runtime::VestingConfig { vesting: vec![] },
+		pallet_sudo: runtime::SudoConfig { key: root_key },
+		parachains_configuration: runtime::ParachainsConfigurationConfig {
 			config: polkadot_runtime_parachains::configuration::HostConfiguration {
 				validation_upgrade_frequency: 10u32,
 				validation_upgrade_delay: 5,
@@ -185,7 +185,7 @@ fn polkadot_testnet_genesis(
 				no_show_slots: 10,
 				..Default::default()
 			},
-		}),
+		},
 	}
 }
 
-- 
GitLab