From 501f115ca6850639476deef8aa33181d0d7125b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Fri, 24 Sep 2021 16:46:45 +0300
Subject: [PATCH] Substrate Companion for rust 1.54 (#3807)

* Substrate Companion for rust 1.54

* CI: run with a staging CI image

* Revert "CI: run with a staging CI image"

This reverts commit f3b51da0a4c0ffa43b576af5482a2be256948870.

* CI: debug, again

* compilation fixes

* tabify

* update Substrate

* Update .gitlab-ci.yml

* CI: add ubuntu-based image with npm

Co-authored-by: Denis P <denis.pisarev@parity.io>
Co-authored-by: Andronik Ordian <write@reusable.software>
Co-authored-by: thiolliere <gui.thiolliere@gmail.com>
Co-authored-by: parity-processbot <>
---
 .gitlab-ci.yml                                |   3 +-
 Cargo.lock                                    | 308 +++++++++---------
 .../tests/ui/err-01-generic-used-twice.stderr |   2 +-
 .../tests/ui/err-01-duplicate-consumer.stderr |   4 +-
 .../tests/ui/err-04-missing-error.stderr      |   2 +-
 parachain/test-parachains/halt/src/lib.rs     |   8 +-
 6 files changed, 163 insertions(+), 164 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index aec817450708..3713d94f950b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -270,7 +270,8 @@ build-adder-collator:
 #### stage:                        build
 
 check-transaction-versions:
-  image:                           node:15
+  # image must be ubuntu:20.04 based to match the linkers, this image has npm installed
+  image:                           paritytech/contracts-ci-linux:production
   stage:                           build
   <<:                              *rules-test
   <<:                              *docker-env
diff --git a/Cargo.lock b/Cargo.lock
index 8f872b57f778..6bf44d1971da 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1928,7 +1928,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 [[package]]
 name = "fork-tree"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "parity-scale-codec",
 ]
@@ -1946,7 +1946,7 @@ dependencies = [
 [[package]]
 name = "frame-benchmarking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -1966,7 +1966,7 @@ dependencies = [
 [[package]]
 name = "frame-benchmarking-cli"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "Inflector",
  "chrono",
@@ -1992,7 +1992,7 @@ dependencies = [
 [[package]]
 name = "frame-election-provider-support"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -2006,7 +2006,7 @@ dependencies = [
 [[package]]
 name = "frame-executive"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -2034,7 +2034,7 @@ dependencies = [
 [[package]]
 name = "frame-support"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "bitflags",
  "frame-metadata",
@@ -2061,7 +2061,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "Inflector",
  "frame-support-procedural-tools",
@@ -2073,7 +2073,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural-tools"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "frame-support-procedural-tools-derive",
  "proc-macro-crate 1.1.0",
@@ -2085,7 +2085,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural-tools-derive"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2095,7 +2095,7 @@ dependencies = [
 [[package]]
 name = "frame-support-test"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "frame-support",
  "frame-support-test-pallet",
@@ -2118,7 +2118,7 @@ dependencies = [
 [[package]]
 name = "frame-support-test-pallet"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -2129,7 +2129,7 @@ dependencies = [
 [[package]]
 name = "frame-system"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "frame-support",
  "log",
@@ -2146,7 +2146,7 @@ dependencies = [
 [[package]]
 name = "frame-system-benchmarking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -2161,7 +2161,7 @@ dependencies = [
 [[package]]
 name = "frame-system-rpc-runtime-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -2170,7 +2170,7 @@ dependencies = [
 [[package]]
 name = "frame-try-runtime"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "frame-support",
  "sp-api",
@@ -2383,7 +2383,7 @@ checksum = "8f5f3913fa0bfe7ee1fd8248b6b9f42a5af4b9d65ec2dd2c3c26132b950ecfc2"
 [[package]]
 name = "generate-bags"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "chrono",
  "frame-election-provider-support",
@@ -4563,7 +4563,7 @@ checksum = "13370dae44474229701bb69b90b4f4dca6404cb0357a2d50d635f1171dc3aa7b"
 [[package]]
 name = "pallet-authority-discovery"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4579,7 +4579,7 @@ dependencies = [
 [[package]]
 name = "pallet-authorship"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4594,7 +4594,7 @@ dependencies = [
 [[package]]
 name = "pallet-babe"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4618,7 +4618,7 @@ dependencies = [
 [[package]]
 name = "pallet-bags-list"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -4638,7 +4638,7 @@ dependencies = [
 [[package]]
 name = "pallet-balances"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4694,7 +4694,7 @@ dependencies = [
 [[package]]
 name = "pallet-bounties"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4779,7 +4779,7 @@ dependencies = [
 [[package]]
 name = "pallet-collective"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4796,7 +4796,7 @@ dependencies = [
 [[package]]
 name = "pallet-democracy"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4812,7 +4812,7 @@ dependencies = [
 [[package]]
 name = "pallet-election-provider-multi-phase"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -4836,7 +4836,7 @@ dependencies = [
 [[package]]
 name = "pallet-elections-phragmen"
 version = "5.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4854,7 +4854,7 @@ dependencies = [
 [[package]]
 name = "pallet-gilt"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4869,7 +4869,7 @@ dependencies = [
 [[package]]
 name = "pallet-grandpa"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4892,7 +4892,7 @@ dependencies = [
 [[package]]
 name = "pallet-identity"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "enumflags2",
  "frame-benchmarking",
@@ -4908,7 +4908,7 @@ dependencies = [
 [[package]]
 name = "pallet-im-online"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4928,7 +4928,7 @@ dependencies = [
 [[package]]
 name = "pallet-indices"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4945,7 +4945,7 @@ dependencies = [
 [[package]]
 name = "pallet-membership"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4962,7 +4962,7 @@ dependencies = [
 [[package]]
 name = "pallet-mmr"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "ckb-merkle-mountain-range",
  "frame-benchmarking",
@@ -4980,7 +4980,7 @@ dependencies = [
 [[package]]
 name = "pallet-mmr-primitives"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4996,7 +4996,7 @@ dependencies = [
 [[package]]
 name = "pallet-mmr-rpc"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "jsonrpc-core",
  "jsonrpc-core-client",
@@ -5013,7 +5013,7 @@ dependencies = [
 [[package]]
 name = "pallet-multisig"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5028,7 +5028,7 @@ dependencies = [
 [[package]]
 name = "pallet-nicks"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5042,7 +5042,7 @@ dependencies = [
 [[package]]
 name = "pallet-offences"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5059,7 +5059,7 @@ dependencies = [
 [[package]]
 name = "pallet-offences-benchmarking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -5082,7 +5082,7 @@ dependencies = [
 [[package]]
 name = "pallet-proxy"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5097,7 +5097,7 @@ dependencies = [
 [[package]]
 name = "pallet-recovery"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5111,7 +5111,7 @@ dependencies = [
 [[package]]
 name = "pallet-scheduler"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5127,7 +5127,7 @@ dependencies = [
 [[package]]
 name = "pallet-session"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5148,7 +5148,7 @@ dependencies = [
 [[package]]
 name = "pallet-session-benchmarking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5164,7 +5164,7 @@ dependencies = [
 [[package]]
 name = "pallet-society"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5178,7 +5178,7 @@ dependencies = [
 [[package]]
 name = "pallet-staking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -5201,7 +5201,7 @@ dependencies = [
 [[package]]
 name = "pallet-staking-reward-curve"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "proc-macro-crate 1.1.0",
  "proc-macro2",
@@ -5212,7 +5212,7 @@ dependencies = [
 [[package]]
 name = "pallet-staking-reward-fn"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "log",
  "sp-arithmetic",
@@ -5221,7 +5221,7 @@ dependencies = [
 [[package]]
 name = "pallet-sudo"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5235,7 +5235,7 @@ dependencies = [
 [[package]]
 name = "pallet-timestamp"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5253,7 +5253,7 @@ dependencies = [
 [[package]]
 name = "pallet-tips"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5272,7 +5272,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5289,7 +5289,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment-rpc"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "jsonrpc-core",
  "jsonrpc-core-client",
@@ -5306,7 +5306,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment-rpc-runtime-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "pallet-transaction-payment",
  "parity-scale-codec",
@@ -5317,7 +5317,7 @@ dependencies = [
 [[package]]
 name = "pallet-treasury"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5334,7 +5334,7 @@ dependencies = [
 [[package]]
 name = "pallet-utility"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5350,7 +5350,7 @@ dependencies = [
 [[package]]
 name = "pallet-vesting"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -7727,7 +7727,7 @@ dependencies = [
 [[package]]
 name = "remote-externalities"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "env_logger 0.9.0",
  "jsonrpsee-proc-macros",
@@ -7989,7 +7989,7 @@ dependencies = [
 [[package]]
 name = "sc-allocator"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "log",
  "sp-core",
@@ -8000,7 +8000,7 @@ dependencies = [
 [[package]]
 name = "sc-authority-discovery"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "async-trait",
  "derive_more",
@@ -8027,7 +8027,7 @@ dependencies = [
 [[package]]
 name = "sc-basic-authorship"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "futures 0.3.17",
  "futures-timer 3.0.2",
@@ -8050,7 +8050,7 @@ dependencies = [
 [[package]]
 name = "sc-block-builder"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "parity-scale-codec",
  "sc-client-api",
@@ -8066,7 +8066,7 @@ dependencies = [
 [[package]]
 name = "sc-chain-spec"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec",
@@ -8082,7 +8082,7 @@ dependencies = [
 [[package]]
 name = "sc-chain-spec-derive"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "proc-macro-crate 1.1.0",
  "proc-macro2",
@@ -8093,7 +8093,7 @@ dependencies = [
 [[package]]
 name = "sc-cli"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "chrono",
  "fdlimit",
@@ -8131,7 +8131,7 @@ dependencies = [
 [[package]]
 name = "sc-client-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "fnv",
  "futures 0.3.17",
@@ -8159,7 +8159,7 @@ dependencies = [
 [[package]]
 name = "sc-client-db"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "hash-db",
  "kvdb",
@@ -8184,7 +8184,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "async-trait",
  "futures 0.3.17",
@@ -8208,7 +8208,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-babe"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "async-trait",
  "derive_more",
@@ -8251,7 +8251,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-babe-rpc"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "derive_more",
  "futures 0.3.17",
@@ -8275,7 +8275,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-epochs"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "fork-tree",
  "parity-scale-codec",
@@ -8288,7 +8288,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-manual-seal"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "assert_matches",
  "async-trait",
@@ -8322,7 +8322,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-slots"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "async-trait",
  "futures 0.3.17",
@@ -8348,7 +8348,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-uncles"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "sc-client-api",
  "sp-authorship",
@@ -8359,7 +8359,7 @@ dependencies = [
 [[package]]
 name = "sc-executor"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "lazy_static",
  "libsecp256k1 0.6.0",
@@ -8385,7 +8385,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-common"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "derive_more",
  "environmental",
@@ -8403,7 +8403,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-wasmi"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -8419,7 +8419,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-wasmtime"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "cfg-if 1.0.0",
  "libc",
@@ -8438,7 +8438,7 @@ dependencies = [
 [[package]]
 name = "sc-finality-grandpa"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "async-trait",
  "derive_more",
@@ -8475,7 +8475,7 @@ dependencies = [
 [[package]]
 name = "sc-finality-grandpa-rpc"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "derive_more",
  "finality-grandpa",
@@ -8499,7 +8499,7 @@ dependencies = [
 [[package]]
 name = "sc-informant"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "ansi_term 0.12.1",
  "futures 0.3.17",
@@ -8516,7 +8516,7 @@ dependencies = [
 [[package]]
 name = "sc-keystore"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "async-trait",
  "derive_more",
@@ -8531,7 +8531,7 @@ dependencies = [
 [[package]]
 name = "sc-light"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "hash-db",
  "parity-scale-codec",
@@ -8549,7 +8549,7 @@ dependencies = [
 [[package]]
 name = "sc-network"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "async-std",
  "async-trait",
@@ -8600,7 +8600,7 @@ dependencies = [
 [[package]]
 name = "sc-network-gossip"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "futures 0.3.17",
  "futures-timer 3.0.2",
@@ -8616,7 +8616,7 @@ dependencies = [
 [[package]]
 name = "sc-offchain"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "bytes 1.0.1",
  "fnv",
@@ -8643,7 +8643,7 @@ dependencies = [
 [[package]]
 name = "sc-peerset"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "futures 0.3.17",
  "libp2p",
@@ -8656,7 +8656,7 @@ dependencies = [
 [[package]]
 name = "sc-proposer-metrics"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "log",
  "substrate-prometheus-endpoint",
@@ -8665,7 +8665,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "futures 0.3.17",
  "hash-db",
@@ -8696,7 +8696,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc-api"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "futures 0.3.17",
  "jsonrpc-core",
@@ -8721,7 +8721,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc-server"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "futures 0.3.17",
  "jsonrpc-core",
@@ -8738,7 +8738,7 @@ dependencies = [
 [[package]]
 name = "sc-service"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "async-trait",
  "directories",
@@ -8803,7 +8803,7 @@ dependencies = [
 [[package]]
 name = "sc-state-db"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -8817,7 +8817,7 @@ dependencies = [
 [[package]]
 name = "sc-sync-state-rpc"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "jsonrpc-core",
  "jsonrpc-core-client",
@@ -8839,7 +8839,7 @@ dependencies = [
 [[package]]
 name = "sc-telemetry"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "chrono",
  "futures 0.3.17",
@@ -8857,7 +8857,7 @@ dependencies = [
 [[package]]
 name = "sc-tracing"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "ansi_term 0.12.1",
  "atty",
@@ -8886,7 +8886,7 @@ dependencies = [
 [[package]]
 name = "sc-tracing-proc-macro"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "proc-macro-crate 1.1.0",
  "proc-macro2",
@@ -8897,7 +8897,7 @@ dependencies = [
 [[package]]
 name = "sc-transaction-pool"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "futures 0.3.17",
  "intervalier",
@@ -8924,7 +8924,7 @@ dependencies = [
 [[package]]
 name = "sc-transaction-pool-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "derive_more",
  "futures 0.3.17",
@@ -8938,7 +8938,7 @@ dependencies = [
 [[package]]
 name = "sc-utils"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "futures 0.3.17",
  "futures-timer 3.0.2",
@@ -9370,7 +9370,7 @@ dependencies = [
 [[package]]
 name = "sp-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "hash-db",
  "log",
@@ -9387,7 +9387,7 @@ dependencies = [
 [[package]]
 name = "sp-api-proc-macro"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "blake2-rfc",
  "proc-macro-crate 1.1.0",
@@ -9399,7 +9399,7 @@ dependencies = [
 [[package]]
 name = "sp-application-crypto"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -9412,7 +9412,7 @@ dependencies = [
 [[package]]
 name = "sp-arithmetic"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "integer-sqrt",
  "num-traits",
@@ -9427,7 +9427,7 @@ dependencies = [
 [[package]]
 name = "sp-authority-discovery"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -9440,7 +9440,7 @@ dependencies = [
 [[package]]
 name = "sp-authorship"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "async-trait",
  "parity-scale-codec",
@@ -9452,7 +9452,7 @@ dependencies = [
 [[package]]
 name = "sp-block-builder"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -9464,7 +9464,7 @@ dependencies = [
 [[package]]
 name = "sp-blockchain"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "futures 0.3.17",
  "log",
@@ -9482,7 +9482,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "async-trait",
  "futures 0.3.17",
@@ -9501,7 +9501,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-babe"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "async-trait",
  "merlin",
@@ -9524,7 +9524,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-slots"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -9535,7 +9535,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-vrf"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "parity-scale-codec",
  "schnorrkel",
@@ -9547,7 +9547,7 @@ dependencies = [
 [[package]]
 name = "sp-core"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "base58",
  "blake2-rfc",
@@ -9592,7 +9592,7 @@ dependencies = [
 [[package]]
 name = "sp-database"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "kvdb",
  "parking_lot 0.11.1",
@@ -9601,7 +9601,7 @@ dependencies = [
 [[package]]
 name = "sp-debug-derive"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -9611,7 +9611,7 @@ dependencies = [
 [[package]]
 name = "sp-externalities"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "environmental",
  "parity-scale-codec",
@@ -9622,7 +9622,7 @@ dependencies = [
 [[package]]
 name = "sp-finality-grandpa"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "finality-grandpa",
  "log",
@@ -9640,7 +9640,7 @@ dependencies = [
 [[package]]
 name = "sp-inherents"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "async-trait",
  "impl-trait-for-tuples",
@@ -9654,7 +9654,7 @@ dependencies = [
 [[package]]
 name = "sp-io"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "futures 0.3.17",
  "hash-db",
@@ -9679,7 +9679,7 @@ dependencies = [
 [[package]]
 name = "sp-keyring"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "lazy_static",
  "sp-core",
@@ -9690,7 +9690,7 @@ dependencies = [
 [[package]]
 name = "sp-keystore"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "async-trait",
  "derive_more",
@@ -9707,7 +9707,7 @@ dependencies = [
 [[package]]
 name = "sp-maybe-compressed-blob"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "zstd",
 ]
@@ -9715,7 +9715,7 @@ dependencies = [
 [[package]]
 name = "sp-npos-elections"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -9730,7 +9730,7 @@ dependencies = [
 [[package]]
 name = "sp-npos-elections-solution-type"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "proc-macro-crate 1.1.0",
  "proc-macro2",
@@ -9741,7 +9741,7 @@ dependencies = [
 [[package]]
 name = "sp-offchain"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "sp-api",
  "sp-core",
@@ -9751,7 +9751,7 @@ dependencies = [
 [[package]]
 name = "sp-panic-handler"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "backtrace",
 ]
@@ -9759,7 +9759,7 @@ dependencies = [
 [[package]]
 name = "sp-rpc"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "rustc-hash",
  "serde",
@@ -9769,7 +9769,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "either",
  "hash256-std-hasher",
@@ -9791,7 +9791,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime-interface"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec",
@@ -9808,7 +9808,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime-interface-proc-macro"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "Inflector",
  "proc-macro-crate 1.1.0",
@@ -9820,7 +9820,7 @@ dependencies = [
 [[package]]
 name = "sp-serializer"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "serde",
  "serde_json",
@@ -9829,7 +9829,7 @@ dependencies = [
 [[package]]
 name = "sp-session"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -9843,7 +9843,7 @@ dependencies = [
 [[package]]
 name = "sp-staking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -9854,7 +9854,7 @@ dependencies = [
 [[package]]
 name = "sp-state-machine"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "hash-db",
  "log",
@@ -9877,12 +9877,12 @@ dependencies = [
 [[package]]
 name = "sp-std"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 
 [[package]]
 name = "sp-storage"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "impl-serde",
  "parity-scale-codec",
@@ -9895,7 +9895,7 @@ dependencies = [
 [[package]]
 name = "sp-tasks"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "log",
  "sp-core",
@@ -9908,7 +9908,7 @@ dependencies = [
 [[package]]
 name = "sp-timestamp"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "async-trait",
  "futures-timer 3.0.2",
@@ -9924,7 +9924,7 @@ dependencies = [
 [[package]]
 name = "sp-tracing"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "erased-serde",
  "log",
@@ -9942,7 +9942,7 @@ dependencies = [
 [[package]]
 name = "sp-transaction-pool"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "sp-api",
  "sp-runtime",
@@ -9951,7 +9951,7 @@ dependencies = [
 [[package]]
 name = "sp-transaction-storage-proof"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "async-trait",
  "log",
@@ -9967,7 +9967,7 @@ dependencies = [
 [[package]]
 name = "sp-trie"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "hash-db",
  "memory-db",
@@ -9982,7 +9982,7 @@ dependencies = [
 [[package]]
 name = "sp-version"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "impl-serde",
  "parity-scale-codec",
@@ -9998,7 +9998,7 @@ dependencies = [
 [[package]]
 name = "sp-version-proc-macro"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "parity-scale-codec",
  "proc-macro2",
@@ -10009,7 +10009,7 @@ dependencies = [
 [[package]]
 name = "sp-wasm-interface"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec",
@@ -10205,7 +10205,7 @@ dependencies = [
 [[package]]
 name = "substrate-build-script-utils"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "platforms",
 ]
@@ -10213,7 +10213,7 @@ dependencies = [
 [[package]]
 name = "substrate-frame-rpc-system"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "frame-system-rpc-runtime-api",
  "futures 0.3.17",
@@ -10235,7 +10235,7 @@ dependencies = [
 [[package]]
 name = "substrate-prometheus-endpoint"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "async-std",
  "derive_more",
@@ -10249,7 +10249,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-client"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "async-trait",
  "futures 0.3.17",
@@ -10276,7 +10276,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-utils"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "futures 0.3.17",
  "substrate-test-utils-derive",
@@ -10286,7 +10286,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-utils-derive"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "proc-macro-crate 1.1.0",
  "proc-macro2",
@@ -10297,7 +10297,7 @@ dependencies = [
 [[package]]
 name = "substrate-wasm-builder"
 version = "5.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "ansi_term 0.12.1",
  "build-helper",
@@ -10450,7 +10450,7 @@ dependencies = [
 [[package]]
 name = "test-runner"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "frame-system",
  "futures 0.3.17",
@@ -10889,7 +10889,7 @@ checksum = "e604eb7b43c06650e854be16a2a03155743d3752dd1c943f6829e26b7a36e382"
 [[package]]
 name = "try-runtime-cli"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#eded99055e32c1b096993b94b38d3f6e04237c18"
+source = "git+https://github.com/paritytech/substrate?branch=master#2ab5cd2880b1ec798a7c2a72c29f995f54b45f13"
 dependencies = [
  "jsonrpsee-ws-client",
  "log",
diff --git a/node/overseer/all-subsystems-gen/tests/ui/err-01-generic-used-twice.stderr b/node/overseer/all-subsystems-gen/tests/ui/err-01-generic-used-twice.stderr
index b089e8efdb42..d92ef3ebcb61 100644
--- a/node/overseer/all-subsystems-gen/tests/ui/err-01-generic-used-twice.stderr
+++ b/node/overseer/all-subsystems-gen/tests/ui/err-01-generic-used-twice.stderr
@@ -4,7 +4,7 @@ error: Generic type parameters may only be used for exactly one field, but is us
 6 |     a: X,
   |        ^
 
-error[E0599]: no method named `replace_a` found for struct `AllSubsystems<u16>` in the current scope
+error[E0599]: no method named `replace_a` found for struct `AllSubsystems` in the current scope
   --> $DIR/err-01-generic-used-twice.rs:15:17
    |
 5  | struct AllSubsystems<X> {
diff --git a/node/overseer/overseer-gen/tests/ui/err-01-duplicate-consumer.stderr b/node/overseer/overseer-gen/tests/ui/err-01-duplicate-consumer.stderr
index edb0ef436951..a66f2fa3e77b 100644
--- a/node/overseer/overseer-gen/tests/ui/err-01-duplicate-consumer.stderr
+++ b/node/overseer/overseer-gen/tests/ui/err-01-duplicate-consumer.stderr
@@ -7,7 +7,7 @@ error[E0119]: conflicting implementations of trait `std::convert::From<MsgStrukt
    | first implementation here
    | conflicting implementation for `AllMessages`
    |
-   = note: this error originates in an attribute macro (in Nightly builds, run with -Z macro-backtrace for more info)
+   = note: this error originates in the attribute macro `overlord` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0119]: conflicting implementations of trait `polkadot_overseer_gen::SubsystemSender<MsgStrukt>` for type `OverseerSubsystemSender`
   --> $DIR/err-01-duplicate-consumer.rs:19:1
@@ -18,4 +18,4 @@ error[E0119]: conflicting implementations of trait `polkadot_overseer_gen::Subsy
    | first implementation here
    | conflicting implementation for `OverseerSubsystemSender`
    |
-   = note: this error originates in an attribute macro (in Nightly builds, run with -Z macro-backtrace for more info)
+   = note: this error originates in the attribute macro `overlord` (in Nightly builds, run with -Z macro-backtrace for more info)
diff --git a/node/overseer/overseer-gen/tests/ui/err-04-missing-error.stderr b/node/overseer/overseer-gen/tests/ui/err-04-missing-error.stderr
index 39e6a4a8fdc0..7fa4d832253e 100644
--- a/node/overseer/overseer-gen/tests/ui/err-04-missing-error.stderr
+++ b/node/overseer/overseer-gen/tests/ui/err-04-missing-error.stderr
@@ -4,7 +4,7 @@ error: Must declare the overseer error type via `error=..`.
 16 | #[overlord(signal=SigSigSig, event=Event, gen=AllMessages)]
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: this error originates in an attribute macro (in Nightly builds, run with -Z macro-backtrace for more info)
+   = note: this error originates in the attribute macro `overlord` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0433]: failed to resolve: use of undeclared type `Overseer`
   --> $DIR/err-04-missing-error.rs:30:10
diff --git a/parachain/test-parachains/halt/src/lib.rs b/parachain/test-parachains/halt/src/lib.rs
index 0c56cfe6393e..3c1416f3c6e9 100644
--- a/parachain/test-parachains/halt/src/lib.rs
+++ b/parachain/test-parachains/halt/src/lib.rs
@@ -39,20 +39,18 @@ pub fn wasm_binary_unwrap() -> &'static [u8] {
 #[panic_handler]
 #[no_mangle]
 pub fn panic(_info: &core::panic::PanicInfo) -> ! {
-	unsafe { core::intrinsics::abort() }
+	core::intrinsics::abort()
 }
 
 #[cfg(not(feature = "std"))]
 #[alloc_error_handler]
 #[no_mangle]
 pub fn oom(_: core::alloc::Layout) -> ! {
-	unsafe {
-		core::intrinsics::abort();
-	}
+	core::intrinsics::abort();
 }
 
 #[cfg(not(feature = "std"))]
 #[no_mangle]
-pub extern "C" fn validate_block(params: *const u8, len: usize) -> u64 {
+pub extern "C" fn validate_block(_params: *const u8, _len: usize) -> u64 {
 	loop {}
 }