diff --git a/polkadot/.github/ISSUE_TEMPLATE/bug_report.md b/polkadot/.github/ISSUE_TEMPLATE/bug_report.md
index 184c71ccf0..c2214ab7d9 100644
--- a/polkadot/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/polkadot/.github/ISSUE_TEMPLATE/bug_report.md
@@ -9,5 +9,5 @@ assignees: ''
 
 - It would help if you submit info about the system you are running, e.g.: operating system, kernel version, amount of available memory and swap, etc.
 - Logs could be very helpful. If possible, submit the whole log. Please format it as ```code blocks```.
-- Describe the role your node plays, e.g. validator, sentry, full node or light client.
+- Describe the role your node plays, e.g. validator, full node or light client.
 - Any command-line options were passed?
diff --git a/polkadot/Cargo.lock b/polkadot/Cargo.lock
index b97ac729ba..774abf1f29 100644
--- a/polkadot/Cargo.lock
+++ b/polkadot/Cargo.lock
@@ -1589,8 +1589,8 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 
 [[package]]
 name = "fork-tree"
-version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "parity-scale-codec",
 ]
@@ -1607,8 +1607,8 @@ dependencies = [
 
 [[package]]
 name = "frame-benchmarking"
-version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -1625,8 +1625,8 @@ dependencies = [
 
 [[package]]
 name = "frame-benchmarking-cli"
-version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "Inflector",
  "chrono",
@@ -1648,8 +1648,8 @@ dependencies = [
 
 [[package]]
 name = "frame-executive"
-version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -1664,8 +1664,8 @@ dependencies = [
 
 [[package]]
 name = "frame-metadata"
-version = "12.0.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "13.0.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "parity-scale-codec",
  "serde",
@@ -1675,8 +1675,8 @@ dependencies = [
 
 [[package]]
 name = "frame-support"
-version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "bitflags",
  "frame-metadata",
@@ -1701,8 +1701,8 @@ dependencies = [
 
 [[package]]
 name = "frame-support-procedural"
-version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "Inflector",
  "frame-support-procedural-tools",
@@ -1713,8 +1713,8 @@ dependencies = [
 
 [[package]]
 name = "frame-support-procedural-tools"
-version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "frame-support-procedural-tools-derive",
  "proc-macro-crate",
@@ -1725,8 +1725,8 @@ dependencies = [
 
 [[package]]
 name = "frame-support-procedural-tools-derive"
-version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "proc-macro2 1.0.24",
  "quote 1.0.7",
@@ -1735,8 +1735,8 @@ dependencies = [
 
 [[package]]
 name = "frame-system"
-version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "frame-support",
  "impl-trait-for-tuples",
@@ -1751,8 +1751,8 @@ dependencies = [
 
 [[package]]
 name = "frame-system-benchmarking"
-version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -1765,8 +1765,8 @@ dependencies = [
 
 [[package]]
 name = "frame-system-rpc-runtime-api"
-version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -4032,8 +4032,8 @@ checksum = "13370dae44474229701bb69b90b4f4dca6404cb0357a2d50d635f1171dc3aa7b"
 
 [[package]]
 name = "pallet-authority-discovery"
-version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4048,8 +4048,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-authorship"
-version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4063,8 +4063,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-babe"
-version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4088,8 +4088,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-balances"
-version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4102,8 +4102,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-bounties"
-version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4117,8 +4117,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-collective"
-version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4133,8 +4133,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-democracy"
-version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4149,7 +4149,7 @@ dependencies = [
 [[package]]
 name = "pallet-elections-phragmen"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4163,8 +4163,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-grandpa"
-version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4184,8 +4184,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-identity"
-version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "enumflags2",
  "frame-benchmarking",
@@ -4200,8 +4200,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-im-online"
-version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4219,8 +4219,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-indices"
-version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4236,8 +4236,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-membership"
-version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4250,8 +4250,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-multisig"
-version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4266,8 +4266,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-nicks"
-version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4280,8 +4280,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-offences"
-version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4295,8 +4295,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-offences-benchmarking"
-version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4316,8 +4316,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-proxy"
-version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4332,8 +4332,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-randomness-collective-flip"
-version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4345,8 +4345,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-recovery"
-version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "enumflags2",
  "frame-support",
@@ -4360,8 +4360,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-scheduler"
-version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4375,8 +4375,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-session"
-version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4395,8 +4395,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-session-benchmarking"
-version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4411,8 +4411,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-society"
-version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4425,8 +4425,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-staking"
-version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4447,8 +4447,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-staking-reward-curve"
-version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2 1.0.24",
@@ -4458,8 +4458,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-sudo"
-version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4472,8 +4472,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-timestamp"
-version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4490,8 +4490,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-tips"
-version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4505,8 +4505,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-transaction-payment"
-version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4521,8 +4521,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-transaction-payment-rpc"
-version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "jsonrpc-core",
  "jsonrpc-core-client",
@@ -4538,8 +4538,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-transaction-payment-rpc-runtime-api"
-version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "pallet-transaction-payment",
  "parity-scale-codec",
@@ -4549,8 +4549,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-treasury"
-version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4565,8 +4565,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-utility"
-version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4581,8 +4581,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-vesting"
-version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "enumflags2",
  "frame-benchmarking",
@@ -6952,8 +6952,8 @@ dependencies = [
 
 [[package]]
 name = "sc-authority-discovery"
-version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "0.9.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "async-trait",
  "derive_more",
@@ -6980,8 +6980,8 @@ dependencies = [
 
 [[package]]
 name = "sc-basic-authorship"
-version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "0.9.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "futures 0.3.12",
  "futures-timer 3.0.2",
@@ -7003,8 +7003,8 @@ dependencies = [
 
 [[package]]
 name = "sc-block-builder"
-version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "0.9.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "parity-scale-codec",
  "sc-client-api",
@@ -7020,8 +7020,8 @@ dependencies = [
 
 [[package]]
 name = "sc-chain-spec"
-version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec",
@@ -7041,8 +7041,8 @@ dependencies = [
 
 [[package]]
 name = "sc-chain-spec-derive"
-version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2 1.0.24",
@@ -7052,8 +7052,8 @@ dependencies = [
 
 [[package]]
 name = "sc-cli"
-version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "0.9.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "chrono",
  "fdlimit",
@@ -7090,8 +7090,8 @@ dependencies = [
 
 [[package]]
 name = "sc-client-api"
-version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "derive_more",
  "fnv",
@@ -7124,8 +7124,8 @@ dependencies = [
 
 [[package]]
 name = "sc-client-db"
-version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "0.9.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "blake2-rfc",
  "hash-db",
@@ -7154,8 +7154,8 @@ dependencies = [
 
 [[package]]
 name = "sc-consensus"
-version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "0.9.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "sc-client-api",
  "sp-blockchain",
@@ -7165,8 +7165,8 @@ dependencies = [
 
 [[package]]
 name = "sc-consensus-babe"
-version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "0.9.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "derive_more",
  "fork-tree",
@@ -7211,8 +7211,8 @@ dependencies = [
 
 [[package]]
 name = "sc-consensus-babe-rpc"
-version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "0.9.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "derive_more",
  "futures 0.3.12",
@@ -7235,8 +7235,8 @@ dependencies = [
 
 [[package]]
 name = "sc-consensus-epochs"
-version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "0.9.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "fork-tree",
  "parity-scale-codec",
@@ -7248,8 +7248,8 @@ dependencies = [
 
 [[package]]
 name = "sc-consensus-slots"
-version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "0.9.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "futures 0.3.12",
  "futures-timer 3.0.2",
@@ -7274,8 +7274,8 @@ dependencies = [
 
 [[package]]
 name = "sc-consensus-uncles"
-version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "0.9.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "log",
  "sc-client-api",
@@ -7288,8 +7288,8 @@ dependencies = [
 
 [[package]]
 name = "sc-executor"
-version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "0.9.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "derive_more",
  "lazy_static",
@@ -7317,8 +7317,8 @@ dependencies = [
 
 [[package]]
 name = "sc-executor-common"
-version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "0.9.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "derive_more",
  "parity-scale-codec",
@@ -7333,8 +7333,8 @@ dependencies = [
 
 [[package]]
 name = "sc-executor-wasmi"
-version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "0.9.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -7348,8 +7348,8 @@ dependencies = [
 
 [[package]]
 name = "sc-executor-wasmtime"
-version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "0.9.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -7366,8 +7366,8 @@ dependencies = [
 
 [[package]]
 name = "sc-finality-grandpa"
-version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "0.9.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "derive_more",
  "finality-grandpa",
@@ -7404,8 +7404,8 @@ dependencies = [
 
 [[package]]
 name = "sc-finality-grandpa-rpc"
-version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "0.9.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "derive_more",
  "finality-grandpa",
@@ -7428,8 +7428,8 @@ dependencies = [
 
 [[package]]
 name = "sc-finality-grandpa-warp-sync"
-version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "0.9.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "derive_more",
  "futures 0.3.12",
@@ -7448,8 +7448,8 @@ dependencies = [
 
 [[package]]
 name = "sc-informant"
-version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "0.9.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "ansi_term 0.12.1",
  "futures 0.3.12",
@@ -7466,8 +7466,8 @@ dependencies = [
 
 [[package]]
 name = "sc-keystore"
-version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "async-trait",
  "derive_more",
@@ -7486,8 +7486,8 @@ dependencies = [
 
 [[package]]
 name = "sc-light"
-version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "hash-db",
  "lazy_static",
@@ -7505,8 +7505,8 @@ dependencies = [
 
 [[package]]
 name = "sc-network"
-version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "0.9.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "async-std",
  "async-trait",
@@ -7558,8 +7558,8 @@ dependencies = [
 
 [[package]]
 name = "sc-network-gossip"
-version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "0.9.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "futures 0.3.12",
  "futures-timer 3.0.2",
@@ -7574,8 +7574,8 @@ dependencies = [
 
 [[package]]
 name = "sc-offchain"
-version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "bytes 0.5.6",
  "fnv",
@@ -7601,8 +7601,8 @@ dependencies = [
 
 [[package]]
 name = "sc-peerset"
-version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "futures 0.3.12",
  "libp2p",
@@ -7614,8 +7614,8 @@ dependencies = [
 
 [[package]]
 name = "sc-proposer-metrics"
-version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "0.9.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "log",
  "substrate-prometheus-endpoint",
@@ -7623,8 +7623,8 @@ dependencies = [
 
 [[package]]
 name = "sc-rpc"
-version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "futures 0.3.12",
  "hash-db",
@@ -7657,8 +7657,8 @@ dependencies = [
 
 [[package]]
 name = "sc-rpc-api"
-version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "0.9.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "derive_more",
  "futures 0.3.12",
@@ -7681,8 +7681,8 @@ dependencies = [
 
 [[package]]
 name = "sc-rpc-server"
-version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "futures 0.1.29",
  "jsonrpc-core",
@@ -7699,8 +7699,8 @@ dependencies = [
 
 [[package]]
 name = "sc-service"
-version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "0.9.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "directories",
  "exit-future",
@@ -7762,8 +7762,8 @@ dependencies = [
 
 [[package]]
 name = "sc-state-db"
-version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "0.9.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -7777,8 +7777,8 @@ dependencies = [
 
 [[package]]
 name = "sc-sync-state-rpc"
-version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "0.9.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "jsonrpc-core",
  "jsonrpc-core-client",
@@ -7797,8 +7797,8 @@ dependencies = [
 
 [[package]]
 name = "sc-telemetry"
-version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "chrono",
  "futures 0.3.12",
@@ -7819,8 +7819,8 @@ dependencies = [
 
 [[package]]
 name = "sc-tracing"
-version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "ansi_term 0.12.1",
  "atty",
@@ -7847,8 +7847,8 @@ dependencies = [
 
 [[package]]
 name = "sc-tracing-proc-macro"
-version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2 1.0.24",
@@ -7858,8 +7858,8 @@ dependencies = [
 
 [[package]]
 name = "sc-transaction-graph"
-version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "derive_more",
  "futures 0.3.12",
@@ -7880,8 +7880,8 @@ dependencies = [
 
 [[package]]
 name = "sc-transaction-pool"
-version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "futures 0.3.12",
  "futures-diagnose",
@@ -8302,8 +8302,8 @@ dependencies = [
 
 [[package]]
 name = "sp-allocator"
-version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "log",
  "sp-core",
@@ -8314,8 +8314,8 @@ dependencies = [
 
 [[package]]
 name = "sp-api"
-version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "hash-db",
  "parity-scale-codec",
@@ -8330,8 +8330,8 @@ dependencies = [
 
 [[package]]
 name = "sp-api-proc-macro"
-version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "blake2-rfc",
  "proc-macro-crate",
@@ -8342,8 +8342,8 @@ dependencies = [
 
 [[package]]
 name = "sp-application-crypto"
-version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "parity-scale-codec",
  "serde",
@@ -8354,8 +8354,8 @@ dependencies = [
 
 [[package]]
 name = "sp-arithmetic"
-version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "integer-sqrt",
  "num-traits 0.2.14",
@@ -8367,8 +8367,8 @@ dependencies = [
 
 [[package]]
 name = "sp-authority-discovery"
-version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -8379,8 +8379,8 @@ dependencies = [
 
 [[package]]
 name = "sp-authorship"
-version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "parity-scale-codec",
  "sp-inherents",
@@ -8390,8 +8390,8 @@ dependencies = [
 
 [[package]]
 name = "sp-block-builder"
-version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -8402,8 +8402,8 @@ dependencies = [
 
 [[package]]
 name = "sp-blockchain"
-version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "futures 0.3.12",
  "log",
@@ -8420,8 +8420,8 @@ dependencies = [
 
 [[package]]
 name = "sp-chain-spec"
-version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "serde",
  "serde_json",
@@ -8429,8 +8429,8 @@ dependencies = [
 
 [[package]]
 name = "sp-consensus"
-version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "0.9.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "futures 0.3.12",
  "futures-timer 3.0.2",
@@ -8455,8 +8455,8 @@ dependencies = [
 
 [[package]]
 name = "sp-consensus-babe"
-version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "0.9.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "merlin",
  "parity-scale-codec",
@@ -8475,8 +8475,8 @@ dependencies = [
 
 [[package]]
 name = "sp-consensus-slots"
-version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "0.9.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "parity-scale-codec",
  "sp-arithmetic",
@@ -8485,8 +8485,8 @@ dependencies = [
 
 [[package]]
 name = "sp-consensus-vrf"
-version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "0.9.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "parity-scale-codec",
  "schnorrkel",
@@ -8497,8 +8497,8 @@ dependencies = [
 
 [[package]]
 name = "sp-core"
-version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "base58",
  "blake2-rfc",
@@ -8541,8 +8541,8 @@ dependencies = [
 
 [[package]]
 name = "sp-database"
-version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "kvdb",
  "parking_lot 0.11.1",
@@ -8550,8 +8550,8 @@ dependencies = [
 
 [[package]]
 name = "sp-debug-derive"
-version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "proc-macro2 1.0.24",
  "quote 1.0.7",
@@ -8560,8 +8560,8 @@ dependencies = [
 
 [[package]]
 name = "sp-externalities"
-version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "0.9.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "environmental",
  "parity-scale-codec",
@@ -8571,8 +8571,8 @@ dependencies = [
 
 [[package]]
 name = "sp-finality-grandpa"
-version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "finality-grandpa",
  "log",
@@ -8588,8 +8588,8 @@ dependencies = [
 
 [[package]]
 name = "sp-inherents"
-version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "parity-scale-codec",
  "parking_lot 0.11.1",
@@ -8600,8 +8600,8 @@ dependencies = [
 
 [[package]]
 name = "sp-io"
-version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "futures 0.3.12",
  "hash-db",
@@ -8624,8 +8624,8 @@ dependencies = [
 
 [[package]]
 name = "sp-keyring"
-version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "lazy_static",
  "sp-core",
@@ -8635,8 +8635,8 @@ dependencies = [
 
 [[package]]
 name = "sp-keystore"
-version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "0.9.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "async-trait",
  "derive_more",
@@ -8652,8 +8652,8 @@ dependencies = [
 
 [[package]]
 name = "sp-npos-elections"
-version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "parity-scale-codec",
  "serde",
@@ -8665,8 +8665,8 @@ dependencies = [
 
 [[package]]
 name = "sp-npos-elections-compact"
-version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2 1.0.24",
@@ -8676,8 +8676,8 @@ dependencies = [
 
 [[package]]
 name = "sp-offchain"
-version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "sp-api",
  "sp-core",
@@ -8686,16 +8686,16 @@ dependencies = [
 
 [[package]]
 name = "sp-panic-handler"
-version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "backtrace",
 ]
 
 [[package]]
 name = "sp-rpc"
-version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "serde",
  "sp-core",
@@ -8703,8 +8703,8 @@ dependencies = [
 
 [[package]]
 name = "sp-runtime"
-version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "either",
  "hash256-std-hasher",
@@ -8724,8 +8724,8 @@ dependencies = [
 
 [[package]]
 name = "sp-runtime-interface"
-version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec",
@@ -8741,8 +8741,8 @@ dependencies = [
 
 [[package]]
 name = "sp-runtime-interface-proc-macro"
-version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "Inflector",
  "proc-macro-crate",
@@ -8753,8 +8753,8 @@ dependencies = [
 
 [[package]]
 name = "sp-serializer"
-version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "serde",
  "serde_json",
@@ -8762,8 +8762,8 @@ dependencies = [
 
 [[package]]
 name = "sp-session"
-version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -8775,8 +8775,8 @@ dependencies = [
 
 [[package]]
 name = "sp-staking"
-version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "parity-scale-codec",
  "sp-runtime",
@@ -8785,8 +8785,8 @@ dependencies = [
 
 [[package]]
 name = "sp-state-machine"
-version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "0.9.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "hash-db",
  "log",
@@ -8807,13 +8807,13 @@ dependencies = [
 
 [[package]]
 name = "sp-std"
-version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 
 [[package]]
 name = "sp-storage"
-version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "impl-serde",
  "parity-scale-codec",
@@ -8825,8 +8825,8 @@ dependencies = [
 
 [[package]]
 name = "sp-tasks"
-version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "log",
  "sp-core",
@@ -8838,8 +8838,8 @@ dependencies = [
 
 [[package]]
 name = "sp-timestamp"
-version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec",
@@ -8852,8 +8852,8 @@ dependencies = [
 
 [[package]]
 name = "sp-tracing"
-version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -8865,8 +8865,8 @@ dependencies = [
 
 [[package]]
 name = "sp-transaction-pool"
-version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "derive_more",
  "futures 0.3.12",
@@ -8881,8 +8881,8 @@ dependencies = [
 
 [[package]]
 name = "sp-trie"
-version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "hash-db",
  "memory-db",
@@ -8895,8 +8895,8 @@ dependencies = [
 
 [[package]]
 name = "sp-utils"
-version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "futures 0.3.12",
  "futures-core",
@@ -8907,8 +8907,8 @@ dependencies = [
 
 [[package]]
 name = "sp-version"
-version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "impl-serde",
  "parity-scale-codec",
@@ -8919,8 +8919,8 @@ dependencies = [
 
 [[package]]
 name = "sp-wasm-interface"
-version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec",
@@ -9051,8 +9051,8 @@ dependencies = [
 
 [[package]]
 name = "substrate-browser-utils"
-version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "0.9.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "chrono",
  "console_error_panic_hook",
@@ -9078,16 +9078,16 @@ dependencies = [
 
 [[package]]
 name = "substrate-build-script-utils"
-version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "platforms",
 ]
 
 [[package]]
 name = "substrate-frame-rpc-system"
-version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "frame-system-rpc-runtime-api",
  "futures 0.3.12",
@@ -9109,8 +9109,8 @@ dependencies = [
 
 [[package]]
 name = "substrate-prometheus-endpoint"
-version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "0.9.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "async-std",
  "derive_more",
@@ -9124,7 +9124,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-client"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "futures 0.1.29",
  "futures 0.3.12",
@@ -9150,8 +9150,8 @@ dependencies = [
 
 [[package]]
 name = "substrate-test-utils"
-version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "futures 0.3.12",
  "substrate-test-utils-derive",
@@ -9160,8 +9160,8 @@ dependencies = [
 
 [[package]]
 name = "substrate-test-utils-derive"
-version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate#ce018b80002a228e23b7da7b86432ecefd0f8f67"
+version = "0.9.0"
+source = "git+https://github.com/paritytech/substrate#4e502384b70a0156c1f15f15626e1d9936d557d6"
 dependencies = [
  "proc-macro-crate",
  "quote 1.0.7",
diff --git a/polkadot/docker/sentry-docker-compose.yml b/polkadot/docker/sentry-docker-compose.yml
deleted file mode 100644
index af0510592d..0000000000
--- a/polkadot/docker/sentry-docker-compose.yml
+++ /dev/null
@@ -1,103 +0,0 @@
-# Docker compose file to simulate a sentry node setup.
-#
-#
-# Setup:
-#
-# Validator A is not supposed to be connected to the public internet. Instead it
-# connects to a sentry node (sentry-a) which connects to the public internet.
-#
-#
-# Usage:
-#
-# 1. Build `target/release/substrate` binary: `cargo build --release`
-#
-# 2. Start networks and containers: `sudo docker-compose -f scripts/sentry-node/docker-compose.yml up`
-#
-# 3. Reach:
-#   - validator-a: localhost:9944
-#   - sentry-a: localhost:9946
-
-version: "3.7"
-services:
-  validator:
-    ports:
-      - "9944:9944"
-#    volumes:
-#      - ../../target/release/substrate:/usr/local/bin/substrate
-    image: parity/polkadot
-    networks:
-      - network-a
-    environment:
-        - VALIDATOR_NODE_KEY
-        - VALIDATOR_BASE_PATH
-        - VALIDATOR_CHAIN
-        - VALIDATOR_PORT
-        - VALIDATOR_NAME
-        - VALIDATOR_RESERVED_NODES
-    command:
-      # Local node id: QmRpheLN4JWdAnY7HGJfWFNbfkQCb6tFf4vvA6hgjMZKrR
-      - "--node-key"
-      - "${VALIDATOR_NODE_KEY:-0000000000000000000000000000000000000000000000000000000000000001}"
-      - "--base-path"
-      - "${VALIDATOR_BASE_PATH:-/tmp/alice}"
-      - "--chain=${VALIDATOR_CHAIN:-local}"
-      - "--port"
-      - "${VALIDATOR_PORT:-30333}"
-      - "--validator"
-      - "--name"
-      - "${VALIDATOR_NANE:-AlicesNode}"
-      - "--reserved-nodes"
-      - "${VALIDATOR_RESERVED_NODES:-/dns/sentry/tcp/30333/p2p/QmV7EhW6J6KgmNdr558RH1mPx2xGGznW7At4BhXzntRFsi}"
-      # Not only bind to localhost.
-      - "--ws-external"
-      - "--rpc-external"
-      # - "--log"
-      # - "sub-libp2p=trace"
-      # - "--log"
-      # - "afg=trace"
-      - "--no-telemetry"
-      - "--rpc-cors"
-      - "all"
-
-  sentry:
-    image: parity/polkadot
-    ports:
-      - "9946:9944"
-#    volumes:
-#      - ../../target/release/substrate:/usr/local/bin/substrate
-    networks:
-      - network-a
-      - internet
-    environment:
-        - SENTRY_NODE_KEY
-        - SENTRY_BASE_PATH
-        - SENTRY_CHAIN
-        - SENTRY_PORT
-        - SENTRY_NAME
-        - SENTRY_BOOTNODES
-    command:
-      # Local node id: QmV7EhW6J6KgmNdr558RH1mPx2xGGznW7At4BhXzntRFsi
-      - "--node-key"
-      - "${SENTRY_NODE_KEY:-0000000000000000000000000000000000000000000000000000000000000003}"
-      - "--base-path"
-      - "${SENTRY_BASE_PATH:-/tmp/charlies}"
-      - "--chain=${SENTRY_CHAIN:-local}"
-      # Don't configure a key, as sentry is not a validator.
-      - "--port"
-      - "${SENTRY_PORT:-30333}"
-      # sentry-a is not a validator.
-      # - "--validator"
-      - "--name"
-      - "${SENTRY_NAME:-CharliesNode}"
-      - "--bootnodes"
-      - "${SENTRY_BOOTNODES:-/dns/validator-a/tcp/30333/p2p/QmRpheLN4JWdAnY7HGJfWFNbfkQCb6tFf4vvA6hgjMZKrR}"
-      - "--no-telemetry"
-      - "--rpc-cors"
-      - "all"
-      # Not only bind to localhost.
-      - "--ws-external"
-      - "--rpc-external"
-
-networks:
-  network-a:
-  internet:
diff --git a/polkadot/node/network/protocol/src/lib.rs b/polkadot/node/network/protocol/src/lib.rs
index 997d630636..84b55943cd 100644
--- a/polkadot/node/network/protocol/src/lib.rs
+++ b/polkadot/node/network/protocol/src/lib.rs
@@ -70,10 +70,7 @@ impl From<sc_network::ObservedRole> for ObservedRole {
 		match role {
 			sc_network::ObservedRole::Light => ObservedRole::Light,
 			sc_network::ObservedRole::Authority => ObservedRole::Authority,
-			sc_network::ObservedRole::Full
-				| sc_network::ObservedRole::OurSentry
-				| sc_network::ObservedRole::OurGuardedAuthority
-				=> ObservedRole::Full,
+			sc_network::ObservedRole::Full => ObservedRole::Full,
 		}
 	}
 }
diff --git a/polkadot/node/service/src/lib.rs b/polkadot/node/service/src/lib.rs
index c1b686d988..2f720f1f11 100644
--- a/polkadot/node/service/src/lib.rs
+++ b/polkadot/node/service/src/lib.rs
@@ -788,7 +788,7 @@ pub fn new_full<RuntimeApi, Executor>(
 		name: Some(name),
 		observer_enabled: false,
 		keystore: keystore_opt,
-		is_authority: role.is_network_authority(),
+		is_authority: role.is_authority(),
 	};
 
 	let enable_grandpa = !disable_grandpa;
diff --git a/polkadot/node/test/service/src/lib.rs b/polkadot/node/test/service/src/lib.rs
index 6fd0d16790..56803a2f2e 100644
--- a/polkadot/node/test/service/src/lib.rs
+++ b/polkadot/node/test/service/src/lib.rs
@@ -112,7 +112,7 @@ pub fn node_config(
 	let base_path = BasePath::new_temp_dir().expect("could not create temporary directory");
 	let root = base_path.path();
 	let role = if is_validator {
-		Role::Authority { sentry_nodes: Vec::new() }
+		Role::Authority
 	} else {
 		Role::Full
 	};