From 8a305ac96374f8348cb8ed79a2b81f382f7b2b33 Mon Sep 17 00:00:00 2001
From: Bernhard Schuster <bernhard@ahoi.io>
Date: Wed, 28 Oct 2020 17:42:23 +0100
Subject: [PATCH] remove error wrapper type (#1871)

* get rid of glue wrapper error type

* cargo update -p sp-io

* cargo update -p sp-io

* "Update Substrate"

Co-authored-by: Andronik Ordian <write@reusable.software>
Co-authored-by: parity-processbot <>
---
 polkadot/Cargo.lock                         | 284 ++++++++++----------
 polkadot/Cargo.toml                         |   1 +
 polkadot/cli/Cargo.toml                     |   1 +
 polkadot/parachain/Cargo.toml               |   2 +
 polkadot/parachain/src/wasm_executor/mod.rs |  62 +++--
 polkadot/src/main.rs                        |  34 +--
 6 files changed, 180 insertions(+), 204 deletions(-)

diff --git a/polkadot/Cargo.lock b/polkadot/Cargo.lock
index 67a77c834e..44547b368f 100644
--- a/polkadot/Cargo.lock
+++ b/polkadot/Cargo.lock
@@ -1466,7 +1466,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 [[package]]
 name = "fork-tree"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "parity-scale-codec",
 ]
@@ -1474,7 +1474,7 @@ dependencies = [
 [[package]]
 name = "frame-benchmarking"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -1492,7 +1492,7 @@ dependencies = [
 [[package]]
 name = "frame-benchmarking-cli"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "chrono",
  "frame-benchmarking",
@@ -1514,7 +1514,7 @@ dependencies = [
 [[package]]
 name = "frame-executive"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -1530,7 +1530,7 @@ dependencies = [
 [[package]]
 name = "frame-metadata"
 version = "12.0.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "parity-scale-codec",
  "serde",
@@ -1541,7 +1541,7 @@ dependencies = [
 [[package]]
 name = "frame-support"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "bitmask",
  "frame-metadata",
@@ -1566,7 +1566,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "frame-support-procedural-tools",
  "proc-macro2 1.0.18",
@@ -1577,7 +1577,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural-tools"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "frame-support-procedural-tools-derive",
  "proc-macro-crate",
@@ -1589,7 +1589,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural-tools-derive"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "proc-macro2 1.0.18",
  "quote 1.0.7",
@@ -1599,7 +1599,7 @@ dependencies = [
 [[package]]
 name = "frame-system"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "frame-support",
  "impl-trait-for-tuples",
@@ -1615,7 +1615,7 @@ dependencies = [
 [[package]]
 name = "frame-system-benchmarking"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -1629,7 +1629,7 @@ dependencies = [
 [[package]]
 name = "frame-system-rpc-runtime-api"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -3818,7 +3818,7 @@ checksum = "7a1250cdd103eef6bd542b5ae82989f931fc00a41a27f60377338241594410f3"
 [[package]]
 name = "pallet-authority-discovery"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3834,7 +3834,7 @@ dependencies = [
 [[package]]
 name = "pallet-authorship"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3849,7 +3849,7 @@ dependencies = [
 [[package]]
 name = "pallet-babe"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -3874,7 +3874,7 @@ dependencies = [
 [[package]]
 name = "pallet-balances"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -3888,7 +3888,7 @@ dependencies = [
 [[package]]
 name = "pallet-collective"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -3904,7 +3904,7 @@ dependencies = [
 [[package]]
 name = "pallet-democracy"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -3919,7 +3919,7 @@ dependencies = [
 [[package]]
 name = "pallet-elections-phragmen"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -3934,7 +3934,7 @@ dependencies = [
 [[package]]
 name = "pallet-grandpa"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -3955,7 +3955,7 @@ dependencies = [
 [[package]]
 name = "pallet-identity"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "enumflags2",
  "frame-benchmarking",
@@ -3971,7 +3971,7 @@ dependencies = [
 [[package]]
 name = "pallet-im-online"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -3991,7 +3991,7 @@ dependencies = [
 [[package]]
 name = "pallet-indices"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4008,7 +4008,7 @@ dependencies = [
 [[package]]
 name = "pallet-membership"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4022,7 +4022,7 @@ dependencies = [
 [[package]]
 name = "pallet-multisig"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4038,7 +4038,7 @@ dependencies = [
 [[package]]
 name = "pallet-nicks"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4052,7 +4052,7 @@ dependencies = [
 [[package]]
 name = "pallet-offences"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4067,7 +4067,7 @@ dependencies = [
 [[package]]
 name = "pallet-offences-benchmarking"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4088,7 +4088,7 @@ dependencies = [
 [[package]]
 name = "pallet-proxy"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4104,7 +4104,7 @@ dependencies = [
 [[package]]
 name = "pallet-randomness-collective-flip"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4117,7 +4117,7 @@ dependencies = [
 [[package]]
 name = "pallet-recovery"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "enumflags2",
  "frame-support",
@@ -4132,7 +4132,7 @@ dependencies = [
 [[package]]
 name = "pallet-scheduler"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4147,7 +4147,7 @@ dependencies = [
 [[package]]
 name = "pallet-session"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4167,7 +4167,7 @@ dependencies = [
 [[package]]
 name = "pallet-session-benchmarking"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4183,7 +4183,7 @@ dependencies = [
 [[package]]
 name = "pallet-society"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4197,7 +4197,7 @@ dependencies = [
 [[package]]
 name = "pallet-staking"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4219,7 +4219,7 @@ dependencies = [
 [[package]]
 name = "pallet-staking-reward-curve"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2 1.0.18",
@@ -4230,7 +4230,7 @@ dependencies = [
 [[package]]
 name = "pallet-sudo"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4244,7 +4244,7 @@ dependencies = [
 [[package]]
 name = "pallet-timestamp"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4262,7 +4262,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4279,7 +4279,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment-rpc"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "jsonrpc-core",
  "jsonrpc-core-client",
@@ -4297,7 +4297,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment-rpc-runtime-api"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "frame-support",
  "parity-scale-codec",
@@ -4310,7 +4310,7 @@ dependencies = [
 [[package]]
 name = "pallet-treasury"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4325,7 +4325,7 @@ dependencies = [
 [[package]]
 name = "pallet-utility"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4341,7 +4341,7 @@ dependencies = [
 [[package]]
 name = "pallet-vesting"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "enumflags2",
  "frame-benchmarking",
@@ -4755,6 +4755,7 @@ dependencies = [
  "polkadot-cli",
  "polkadot-service",
  "tempfile",
+ "thiserror",
 ]
 
 [[package]]
@@ -4820,6 +4821,7 @@ dependencies = [
  "structopt",
  "substrate-browser-utils",
  "substrate-build-script-utils",
+ "thiserror",
  "wasm-bindgen",
  "wasm-bindgen-futures",
 ]
@@ -5200,6 +5202,7 @@ dependencies = [
  "sp-runtime",
  "sp-std",
  "sp-wasm-interface",
+ "thiserror",
 ]
 
 [[package]]
@@ -6541,7 +6544,7 @@ dependencies = [
 [[package]]
 name = "sc-authority-discovery"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "async-trait",
  "bytes 0.5.6",
@@ -6571,7 +6574,7 @@ dependencies = [
 [[package]]
 name = "sc-basic-authorship"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "futures 0.3.5",
  "futures-timer 3.0.2",
@@ -6595,7 +6598,7 @@ dependencies = [
 [[package]]
 name = "sc-block-builder"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "parity-scale-codec",
  "sc-client-api",
@@ -6612,7 +6615,7 @@ dependencies = [
 [[package]]
 name = "sc-chain-spec"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec",
@@ -6633,7 +6636,7 @@ dependencies = [
 [[package]]
 name = "sc-chain-spec-derive"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2 1.0.18",
@@ -6644,7 +6647,7 @@ dependencies = [
 [[package]]
 name = "sc-cli"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "ansi_term 0.12.1",
  "atty",
@@ -6688,7 +6691,7 @@ dependencies = [
 [[package]]
 name = "sc-cli-proc-macro"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2 1.0.18",
@@ -6699,7 +6702,7 @@ dependencies = [
 [[package]]
 name = "sc-client-api"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "derive_more",
  "fnv",
@@ -6736,7 +6739,7 @@ dependencies = [
 [[package]]
 name = "sc-client-db"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "blake2-rfc",
  "hash-db",
@@ -6766,7 +6769,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "sc-client-api",
  "sp-blockchain",
@@ -6777,7 +6780,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-babe"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "derive_more",
  "fork-tree",
@@ -6822,7 +6825,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-babe-rpc"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "derive_more",
  "futures 0.3.5",
@@ -6846,7 +6849,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-epochs"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "fork-tree",
  "parity-scale-codec",
@@ -6859,7 +6862,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-slots"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "futures 0.3.5",
  "futures-timer 3.0.2",
@@ -6877,12 +6880,13 @@ dependencies = [
  "sp-inherents",
  "sp-runtime",
  "sp-state-machine",
+ "sp-trie",
 ]
 
 [[package]]
 name = "sc-consensus-uncles"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "log 0.4.11",
  "sc-client-api",
@@ -6896,7 +6900,7 @@ dependencies = [
 [[package]]
 name = "sc-executor"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "derive_more",
  "lazy_static",
@@ -6925,7 +6929,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-common"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "derive_more",
  "log 0.4.11",
@@ -6942,7 +6946,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-wasmi"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "log 0.4.11",
  "parity-scale-codec",
@@ -6957,7 +6961,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-wasmtime"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "log 0.4.11",
  "parity-scale-codec",
@@ -6975,7 +6979,7 @@ dependencies = [
 [[package]]
 name = "sc-finality-grandpa"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "derive_more",
  "finality-grandpa",
@@ -7012,7 +7016,7 @@ dependencies = [
 [[package]]
 name = "sc-finality-grandpa-rpc"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "derive_more",
  "finality-grandpa",
@@ -7036,7 +7040,7 @@ dependencies = [
 [[package]]
 name = "sc-informant"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "ansi_term 0.12.1",
  "futures 0.3.5",
@@ -7054,7 +7058,7 @@ dependencies = [
 [[package]]
 name = "sc-keystore"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "async-trait",
  "derive_more",
@@ -7074,7 +7078,7 @@ dependencies = [
 [[package]]
 name = "sc-light"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "hash-db",
  "lazy_static",
@@ -7093,7 +7097,7 @@ dependencies = [
 [[package]]
 name = "sc-network"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "async-std",
  "async-trait",
@@ -7147,7 +7151,7 @@ dependencies = [
 [[package]]
 name = "sc-network-gossip"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "futures 0.3.5",
  "futures-timer 3.0.2",
@@ -7162,7 +7166,7 @@ dependencies = [
 [[package]]
 name = "sc-offchain"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "bytes 0.5.6",
  "fnv",
@@ -7189,7 +7193,7 @@ dependencies = [
 [[package]]
 name = "sc-peerset"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "futures 0.3.5",
  "libp2p",
@@ -7202,7 +7206,7 @@ dependencies = [
 [[package]]
 name = "sc-proposer-metrics"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "log 0.4.11",
  "substrate-prometheus-endpoint",
@@ -7211,7 +7215,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "futures 0.3.5",
  "hash-db",
@@ -7244,7 +7248,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc-api"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "derive_more",
  "futures 0.3.5",
@@ -7268,7 +7272,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc-server"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "futures 0.1.29",
  "jsonrpc-core",
@@ -7286,7 +7290,7 @@ dependencies = [
 [[package]]
 name = "sc-service"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "derive_more",
  "directories",
@@ -7350,7 +7354,7 @@ dependencies = [
 [[package]]
 name = "sc-state-db"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "log 0.4.11",
  "parity-scale-codec",
@@ -7364,7 +7368,7 @@ dependencies = [
 [[package]]
 name = "sc-sync-state-rpc"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "jsonrpc-core",
  "jsonrpc-core-client",
@@ -7383,7 +7387,7 @@ dependencies = [
 [[package]]
 name = "sc-telemetry"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "futures 0.3.5",
  "futures-timer 3.0.2",
@@ -7404,7 +7408,7 @@ dependencies = [
 [[package]]
 name = "sc-tracing"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "erased-serde",
  "log 0.4.11",
@@ -7423,7 +7427,7 @@ dependencies = [
 [[package]]
 name = "sc-transaction-graph"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "derive_more",
  "futures 0.3.5",
@@ -7444,7 +7448,7 @@ dependencies = [
 [[package]]
 name = "sc-transaction-pool"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "derive_more",
  "futures 0.3.5",
@@ -7870,7 +7874,7 @@ dependencies = [
 [[package]]
 name = "sp-allocator"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "derive_more",
  "log 0.4.11",
@@ -7882,7 +7886,7 @@ dependencies = [
 [[package]]
 name = "sp-api"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "hash-db",
  "parity-scale-codec",
@@ -7897,7 +7901,7 @@ dependencies = [
 [[package]]
 name = "sp-api-proc-macro"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "blake2-rfc",
  "proc-macro-crate",
@@ -7909,7 +7913,7 @@ dependencies = [
 [[package]]
 name = "sp-application-crypto"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "parity-scale-codec",
  "serde",
@@ -7921,7 +7925,7 @@ dependencies = [
 [[package]]
 name = "sp-arithmetic"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "integer-sqrt",
  "num-traits 0.2.12",
@@ -7934,7 +7938,7 @@ dependencies = [
 [[package]]
 name = "sp-authority-discovery"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -7946,7 +7950,7 @@ dependencies = [
 [[package]]
 name = "sp-authorship"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "parity-scale-codec",
  "sp-inherents",
@@ -7957,7 +7961,7 @@ dependencies = [
 [[package]]
 name = "sp-block-builder"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -7969,9 +7973,8 @@ dependencies = [
 [[package]]
 name = "sp-blockchain"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
- "derive_more",
  "log 0.4.11",
  "lru 0.4.3",
  "parity-scale-codec",
@@ -7981,12 +7984,13 @@ dependencies = [
  "sp-database",
  "sp-runtime",
  "sp-state-machine",
+ "thiserror",
 ]
 
 [[package]]
 name = "sp-chain-spec"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "serde",
  "serde_json",
@@ -7995,9 +7999,8 @@ dependencies = [
 [[package]]
 name = "sp-consensus"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
- "derive_more",
  "futures 0.3.5",
  "futures-timer 3.0.2",
  "libp2p",
@@ -8015,13 +8018,14 @@ dependencies = [
  "sp-utils",
  "sp-version",
  "substrate-prometheus-endpoint",
+ "thiserror",
  "wasm-timer",
 ]
 
 [[package]]
 name = "sp-consensus-babe"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "merlin",
  "parity-scale-codec",
@@ -8041,7 +8045,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-slots"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "parity-scale-codec",
  "sp-runtime",
@@ -8050,7 +8054,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-vrf"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "parity-scale-codec",
  "schnorrkel",
@@ -8062,7 +8066,7 @@ dependencies = [
 [[package]]
 name = "sp-core"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "base58",
  "blake2-rfc",
@@ -8095,6 +8099,7 @@ dependencies = [
  "sp-std",
  "sp-storage",
  "substrate-bip39",
+ "thiserror",
  "tiny-bip39",
  "tiny-keccak 2.0.2",
  "twox-hash",
@@ -8105,7 +8110,7 @@ dependencies = [
 [[package]]
 name = "sp-database"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "kvdb",
  "parking_lot 0.10.2",
@@ -8114,7 +8119,7 @@ dependencies = [
 [[package]]
 name = "sp-debug-derive"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "proc-macro2 1.0.18",
  "quote 1.0.7",
@@ -8124,7 +8129,7 @@ dependencies = [
 [[package]]
 name = "sp-externalities"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "environmental",
  "parity-scale-codec",
@@ -8135,7 +8140,7 @@ dependencies = [
 [[package]]
 name = "sp-finality-grandpa"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "finality-grandpa",
  "log 0.4.11",
@@ -8152,19 +8157,19 @@ dependencies = [
 [[package]]
 name = "sp-inherents"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
- "derive_more",
  "parity-scale-codec",
  "parking_lot 0.10.2",
  "sp-core",
  "sp-std",
+ "thiserror",
 ]
 
 [[package]]
 name = "sp-io"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "futures 0.3.5",
  "hash-db",
@@ -8188,7 +8193,7 @@ dependencies = [
 [[package]]
 name = "sp-keyring"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "lazy_static",
  "sp-core",
@@ -8199,7 +8204,7 @@ dependencies = [
 [[package]]
 name = "sp-keystore"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "async-trait",
  "derive_more",
@@ -8215,7 +8220,7 @@ dependencies = [
 [[package]]
 name = "sp-npos-elections"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "parity-scale-codec",
  "serde",
@@ -8227,7 +8232,7 @@ dependencies = [
 [[package]]
 name = "sp-npos-elections-compact"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2 1.0.18",
@@ -8238,7 +8243,7 @@ dependencies = [
 [[package]]
 name = "sp-offchain"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "sp-api",
  "sp-core",
@@ -8248,7 +8253,7 @@ dependencies = [
 [[package]]
 name = "sp-panic-handler"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "backtrace",
  "log 0.4.11",
@@ -8257,7 +8262,7 @@ dependencies = [
 [[package]]
 name = "sp-rpc"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "serde",
  "sp-core",
@@ -8266,7 +8271,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "either",
  "hash256-std-hasher",
@@ -8288,7 +8293,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime-interface"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "parity-scale-codec",
  "primitive-types",
@@ -8304,7 +8309,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime-interface-proc-macro"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "Inflector",
  "proc-macro-crate",
@@ -8316,7 +8321,7 @@ dependencies = [
 [[package]]
 name = "sp-serializer"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "serde",
  "serde_json",
@@ -8325,7 +8330,7 @@ dependencies = [
 [[package]]
 name = "sp-session"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -8338,7 +8343,7 @@ dependencies = [
 [[package]]
 name = "sp-staking"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "parity-scale-codec",
  "sp-runtime",
@@ -8348,7 +8353,7 @@ dependencies = [
 [[package]]
 name = "sp-state-machine"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "hash-db",
  "log 0.4.11",
@@ -8362,6 +8367,7 @@ dependencies = [
  "sp-panic-handler",
  "sp-std",
  "sp-trie",
+ "thiserror",
  "trie-db",
  "trie-root",
 ]
@@ -8369,12 +8375,12 @@ dependencies = [
 [[package]]
 name = "sp-std"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 
 [[package]]
 name = "sp-storage"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "impl-serde",
  "parity-scale-codec",
@@ -8387,7 +8393,7 @@ dependencies = [
 [[package]]
 name = "sp-tasks"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "log 0.4.11",
  "sp-core",
@@ -8400,7 +8406,7 @@ dependencies = [
 [[package]]
 name = "sp-timestamp"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec",
@@ -8414,7 +8420,7 @@ dependencies = [
 [[package]]
 name = "sp-tracing"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "log 0.4.11",
  "parity-scale-codec",
@@ -8427,7 +8433,7 @@ dependencies = [
 [[package]]
 name = "sp-transaction-pool"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "derive_more",
  "futures 0.3.5",
@@ -8442,7 +8448,7 @@ dependencies = [
 [[package]]
 name = "sp-trie"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "hash-db",
  "memory-db",
@@ -8456,7 +8462,7 @@ dependencies = [
 [[package]]
 name = "sp-utils"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "futures 0.3.5",
  "futures-core",
@@ -8468,7 +8474,7 @@ dependencies = [
 [[package]]
 name = "sp-version"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "impl-serde",
  "parity-scale-codec",
@@ -8480,7 +8486,7 @@ dependencies = [
 [[package]]
 name = "sp-wasm-interface"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec",
@@ -8621,7 +8627,7 @@ dependencies = [
 [[package]]
 name = "substrate-browser-utils"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "chrono",
  "console_error_panic_hook",
@@ -8647,7 +8653,7 @@ dependencies = [
 [[package]]
 name = "substrate-build-script-utils"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "platforms",
 ]
@@ -8655,7 +8661,7 @@ dependencies = [
 [[package]]
 name = "substrate-frame-rpc-system"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "frame-system-rpc-runtime-api",
  "futures 0.3.5",
@@ -8678,7 +8684,7 @@ dependencies = [
 [[package]]
 name = "substrate-prometheus-endpoint"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "async-std",
  "derive_more",
@@ -8692,7 +8698,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-client"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "futures 0.1.29",
  "futures 0.3.5",
@@ -8719,7 +8725,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-utils"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "futures 0.3.5",
  "substrate-test-utils-derive",
@@ -8729,7 +8735,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-utils-derive"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate#668ecade60abe5a644868aefd3d231c9839fe652"
+source = "git+https://github.com/paritytech/substrate#d7c2b12181496ef13faa4393fc13139f8f7e0403"
 dependencies = [
  "proc-macro-crate",
  "quote 1.0.7",
diff --git a/polkadot/Cargo.toml b/polkadot/Cargo.toml
index ad0406e000..c168f06b2e 100644
--- a/polkadot/Cargo.toml
+++ b/polkadot/Cargo.toml
@@ -14,6 +14,7 @@ readme = "README.md"
 [dependencies]
 cli = { package = "polkadot-cli", path = "cli" }
 color-eyre = "0.5.6"
+thiserror = "1"
 futures = "0.3.4"
 service = { package = "polkadot-service", path = "node/service" }
 parity-util-mem = { version = "*", default-features = false, features = ["jemalloc-global"] }
diff --git a/polkadot/cli/Cargo.toml b/polkadot/cli/Cargo.toml
index d3f2447856..05567acd63 100644
--- a/polkadot/cli/Cargo.toml
+++ b/polkadot/cli/Cargo.toml
@@ -15,6 +15,7 @@ crate-type = ["cdylib", "rlib"]
 
 [dependencies]
 log = "0.4.11"
+thiserror = "1.0.21"
 structopt = { version = "0.3.8", optional = true }
 sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
 sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "master" }
diff --git a/polkadot/parachain/Cargo.toml b/polkadot/parachain/Cargo.toml
index ed9c3c74c9..15bbdf3229 100644
--- a/polkadot/parachain/Cargo.toml
+++ b/polkadot/parachain/Cargo.toml
@@ -17,6 +17,7 @@ sp-wasm-interface = { git = "https://github.com/paritytech/substrate", branch =
 polkadot-core-primitives = { path = "../core-primitives", default-features = false }
 
 # all optional crates.
+thiserror = { version = "1.0.21", optional = true }
 derive_more = { version = "0.99.11", optional = true }
 serde = { version = "1.0.102", default-features = false, features = [ "derive" ], optional = true }
 sp-externalities = { git = "https://github.com/paritytech/substrate", branch = "master", optional = true }
@@ -34,6 +35,7 @@ default = ["std"]
 wasm-api = []
 std = [
 	"codec/std",
+	"thiserror",
 	"derive_more",
 	"serde/std",
 	"sp-std/std",
diff --git a/polkadot/parachain/src/wasm_executor/mod.rs b/polkadot/parachain/src/wasm_executor/mod.rs
index f578039362..4608de4310 100644
--- a/polkadot/parachain/src/wasm_executor/mod.rs
+++ b/polkadot/parachain/src/wasm_executor/mod.rs
@@ -81,63 +81,61 @@ pub enum ExecutionMode {
 }
 
 
-#[derive(Debug, derive_more::Display, derive_more::From)]
+#[derive(Debug, thiserror::Error)]
 /// Candidate validation error.
 pub enum ValidationError {
 	/// Validation failed due to internal reasons. The candidate might still be valid.
-	Internal(InternalError),
+	#[error(transparent)]
+	Internal(#[from] InternalError),
 	/// Candidate is invalid.
-	InvalidCandidate(InvalidCandidate),
+	#[error(transparent)]
+	InvalidCandidate(#[from] InvalidCandidate),
 }
 
 /// Error type that indicates invalid candidate.
-#[derive(Debug, derive_more::Display, derive_more::From)]
+#[derive(Debug, thiserror::Error)]
 pub enum InvalidCandidate {
 	/// Wasm executor error.
-	#[display(fmt = "WASM executor error: {:?}", _0)]
-	WasmExecutor(sc_executor::error::Error),
+	#[error("WASM executor error")]
+	WasmExecutor(#[from] sc_executor::error::Error),
 	/// Call data is too large.
-	#[display(fmt = "Validation parameters are {} bytes, max allowed is {}", _0, MAX_RUNTIME_MEM)]
-	#[from(ignore)]
+	#[error("Validation parameters are {0} bytes, max allowed is {}", MAX_RUNTIME_MEM)]
 	ParamsTooLarge(usize),
 	/// Code size it too large.
-	#[display(fmt = "WASM code is {} bytes, max allowed is {}", _0, MAX_CODE_MEM)]
+	#[error("WASM code is {0} bytes, max allowed is {}", MAX_CODE_MEM)]
 	CodeTooLarge(usize),
 	/// Error decoding returned data.
-	#[display(fmt = "Validation function returned invalid data.")]
+	#[error("Validation function returned invalid data.")]
 	BadReturn,
-	#[display(fmt = "Validation function timeout.")]
+	#[error("Validation function timeout.")]
 	Timeout,
-	#[display(fmt = "External WASM execution error: {}", _0)]
+	#[error("External WASM execution error: {0}")]
 	ExternalWasmExecutor(String),
 }
 
+impl core::convert::From<String> for InvalidCandidate {
+	fn from(s: String) -> Self {
+		Self::ExternalWasmExecutor(s)
+	}
+}
+
 /// Host error during candidate validation. This does not indicate an invalid candidate.
-#[derive(Debug, derive_more::Display, derive_more::From)]
+#[derive(Debug, thiserror::Error)]
 pub enum InternalError {
-	#[display(fmt = "IO error: {}", _0)]
-	Io(std::io::Error),
-	#[display(fmt = "System error: {}", _0)]
-	System(Box<dyn std::error::Error + Send>),
-	#[display(fmt = "Shared memory error: {}", _0)]
+	#[error("IO error: {0}")]
+	Io(#[from] std::io::Error),
+
+	#[error("System error: {0}")]
+	System(#[from] Box<dyn std::error::Error + Send + Sync + 'static>),
+
 	#[cfg(not(any(target_os = "android", target_os = "unknown")))]
-	SharedMem(shared_memory::SharedMemError),
-	#[display(fmt = "WASM worker error: {}", _0)]
+	#[error("Shared memory error: {0}")]
+	SharedMem(#[from] shared_memory::SharedMemError),
+
+	#[error("WASM worker error: {0}")]
 	WasmWorker(String),
 }
 
-impl std::error::Error for ValidationError {
-	fn source(&self) -> Option<&(dyn std::error::Error + 'static)> {
-		match self {
-			ValidationError::Internal(InternalError::Io(ref err)) => Some(err),
-			ValidationError::Internal(InternalError::System(ref err)) => Some(&**err),
-			#[cfg(not(any(target_os = "android", target_os = "unknown")))]
-			ValidationError::Internal(InternalError::SharedMem(ref err)) => Some(err),
-			ValidationError::InvalidCandidate(InvalidCandidate::WasmExecutor(ref err)) => Some(err),
-			_ => None,
-		}
-	}
-}
 
 /// Validate a candidate under the given validation code.
 ///
diff --git a/polkadot/src/main.rs b/polkadot/src/main.rs
index d26fa4e3be..d7baf30397 100644
--- a/polkadot/src/main.rs
+++ b/polkadot/src/main.rs
@@ -20,40 +20,8 @@
 
 use color_eyre::eyre;
 
-use cli::Error as PolkaError;
-
-use std::{error, fmt};
-
-/// A helper to satisfy the requirements of `eyre`
-/// compatible errors, which require `Send + Sync`
-/// which are not satisfied by the `sp_*` crates.
-#[derive(Debug)]
-struct ErrorWrapper(std::sync::Arc<PolkaError>);
-
-// nothing is going to be sent to another thread
-// it merely exists to glue two distinct error
-// types together where the requirements differ
-// with `Sync + Send` and without them for `wasm`.
-unsafe impl Sync for ErrorWrapper {}
-unsafe impl Send for ErrorWrapper {}
-
-impl error::Error for ErrorWrapper {
-	fn source(&self) -> Option<&(dyn error::Error + 'static)> {
-		(&*self.0).source().and_then(|e| e.source())
-	}
-	fn description(&self) -> &str {
-		"Error Wrapper"
-	}
-}
-
-impl fmt::Display for ErrorWrapper {
-	fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-		write!(f, "{}", &*self.0)
-	}
-}
-
 fn main() -> eyre::Result<()> {
 	color_eyre::install()?;
-	cli::run().map_err(|e| ErrorWrapper(std::sync::Arc::new(e)))?;
+	cli::run()?;
 	Ok(())
 }