From 594cb06cc148a6da1e45efef2ffe9992e089484f Mon Sep 17 00:00:00 2001
From: haerdib <bhaerdi@devsgx02.scs-ad.scs.ch>
Date: Thu, 3 Feb 2022 10:17:32 +0100
Subject: [PATCH 1/6] update rust toolchain

---
 rust-toolchain.toml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index daf97ece6..5b509c77f 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,4 +1,4 @@
 [toolchain]
-channel = "nightly-2021-12-22"
+channel = "nightly-2022-02-02"
 targets = ["wasm32-unknown-unknown"]
-profile = "default" # include rustfmt, clippy
\ No newline at end of file
+profile = "default" # include rustfmt, clippy

From eb5a3eacd0c8084413c98c143d3bdee0457e08c9 Mon Sep 17 00:00:00 2001
From: haerdib <bhaerdi@devsgx02.scs-ad.scs.ch>
Date: Thu, 3 Feb 2022 10:17:47 +0100
Subject: [PATCH 2/6] update to substrate b0..

---
 Cargo.lock                               | 253 +++++++++++++----------
 Cargo.toml                               |   4 +-
 client-keystore/Cargo.toml               |   2 +-
 compose-macros/Cargo.toml                |   4 +-
 node-api/Cargo.toml                      |   2 +-
 primitives/Cargo.toml                    |   4 +-
 tutorials/api-client-tutorial/Cargo.toml |   2 +-
 7 files changed, 148 insertions(+), 123 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index b5b8a7f8a..4c7ddce6f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -253,6 +253,15 @@ dependencies = [
  "generic-array 0.14.4",
 ]
 
+[[package]]
+name = "block-buffer"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1d36a02058e76b040de25a4464ba1c80935655595b661505c8b39b664828b95"
+dependencies = [
+ "generic-array 0.14.4",
+]
+
 [[package]]
 name = "block-padding"
 version = "0.1.5"
@@ -391,12 +400,6 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc"
 
-[[package]]
-name = "convert_case"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e"
-
 [[package]]
 name = "cpufeatures"
 version = "0.2.1"
@@ -412,6 +415,15 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
 
+[[package]]
+name = "crypto-common"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "683d6b536309245c849479fba3da410962a43ed8e51c26b729208ec0ac2798d0"
+dependencies = [
+ "generic-array 0.14.4",
+]
+
 [[package]]
 name = "crypto-mac"
 version = "0.8.0"
@@ -464,10 +476,8 @@ version = "0.99.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321"
 dependencies = [
- "convert_case",
  "proc-macro2",
  "quote",
- "rustc_version 0.4.0",
  "syn",
 ]
 
@@ -489,6 +499,17 @@ dependencies = [
  "generic-array 0.14.4",
 ]
 
+[[package]]
+name = "digest"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b697d66081d42af4fba142d56918a3cb21dc8eb63372c6b85d14f44fb9c5979b"
+dependencies = [
+ "block-buffer 0.10.0",
+ "crypto-common",
+ "generic-array 0.14.4",
+]
+
 [[package]]
 name = "downcast-rs"
 version = "1.2.0"
@@ -632,7 +653,7 @@ dependencies = [
 [[package]]
 name = "frame-benchmarking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b9cafba3d0e7a5950ac78d81e4ab7f2074938666"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -653,7 +674,7 @@ dependencies = [
 [[package]]
 name = "frame-election-provider-support"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b9cafba3d0e7a5950ac78d81e4ab7f2074938666"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -667,7 +688,7 @@ dependencies = [
 [[package]]
 name = "frame-executive"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b9cafba3d0e7a5950ac78d81e4ab7f2074938666"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -706,7 +727,7 @@ dependencies = [
 [[package]]
 name = "frame-support"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b9cafba3d0e7a5950ac78d81e4ab7f2074938666"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
 dependencies = [
  "bitflags",
  "frame-metadata 14.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -735,7 +756,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b9cafba3d0e7a5950ac78d81e4ab7f2074938666"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
 dependencies = [
  "Inflector",
  "frame-support-procedural-tools",
@@ -747,7 +768,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural-tools"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b9cafba3d0e7a5950ac78d81e4ab7f2074938666"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
 dependencies = [
  "frame-support-procedural-tools-derive",
  "proc-macro-crate",
@@ -759,7 +780,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural-tools-derive"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b9cafba3d0e7a5950ac78d81e4ab7f2074938666"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -769,7 +790,7 @@ dependencies = [
 [[package]]
 name = "frame-system"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b9cafba3d0e7a5950ac78d81e4ab7f2074938666"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
 dependencies = [
  "frame-support",
  "log",
@@ -786,7 +807,7 @@ dependencies = [
 [[package]]
 name = "frame-system-rpc-runtime-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b9cafba3d0e7a5950ac78d81e4ab7f2074938666"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -1289,9 +1310,9 @@ checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a"
 
 [[package]]
 name = "memory-db"
-version = "0.27.0"
+version = "0.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de006e09d04fc301a5f7e817b75aa49801c4479a8af753764416b085337ddcc5"
+checksum = "d505169b746dacf02f7d14d8c80b34edfd8212159c63d23c977739a0d960c626"
 dependencies = [
  "hash-db",
  "hashbrown",
@@ -1411,8 +1432,8 @@ dependencies = [
 
 [[package]]
 name = "node-template-runtime"
-version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b9cafba3d0e7a5950ac78d81e4ab7f2074938666"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
 dependencies = [
  "frame-executive",
  "frame-support",
@@ -1579,7 +1600,7 @@ dependencies = [
 [[package]]
 name = "pallet-aura"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b9cafba3d0e7a5950ac78d81e4ab7f2074938666"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -1595,7 +1616,7 @@ dependencies = [
 [[package]]
 name = "pallet-authorship"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b9cafba3d0e7a5950ac78d81e4ab7f2074938666"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -1610,7 +1631,7 @@ dependencies = [
 [[package]]
 name = "pallet-balances"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b9cafba3d0e7a5950ac78d81e4ab7f2074938666"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -1625,7 +1646,7 @@ dependencies = [
 [[package]]
 name = "pallet-grandpa"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b9cafba3d0e7a5950ac78d81e4ab7f2074938666"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -1648,7 +1669,7 @@ dependencies = [
 [[package]]
 name = "pallet-randomness-collective-flip"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b9cafba3d0e7a5950ac78d81e4ab7f2074938666"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -1662,7 +1683,7 @@ dependencies = [
 [[package]]
 name = "pallet-session"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b9cafba3d0e7a5950ac78d81e4ab7f2074938666"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -1683,7 +1704,7 @@ dependencies = [
 [[package]]
 name = "pallet-staking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b9cafba3d0e7a5950ac78d81e4ab7f2074938666"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
 dependencies = [
  "frame-election-provider-support",
  "frame-support",
@@ -1704,7 +1725,7 @@ dependencies = [
 [[package]]
 name = "pallet-sudo"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b9cafba3d0e7a5950ac78d81e4ab7f2074938666"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -1717,8 +1738,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-template"
-version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b9cafba3d0e7a5950ac78d81e4ab7f2074938666"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -1730,7 +1751,7 @@ dependencies = [
 [[package]]
 name = "pallet-timestamp"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b9cafba3d0e7a5950ac78d81e4ab7f2074938666"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -1747,7 +1768,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b9cafba3d0e7a5950ac78d81e4ab7f2074938666"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -1764,7 +1785,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment-rpc-runtime-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b9cafba3d0e7a5950ac78d81e4ab7f2074938666"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
 dependencies = [
  "pallet-transaction-payment",
  "parity-scale-codec",
@@ -1943,9 +1964,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.34"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f84e92c0f7c9d58328b85a78557813e4bd845130db68d7184635344399423b1"
+checksum = "c7342d5883fbccae1cc37a2353b09c87c9b0f3afd73f5fb9bba687a1f733b029"
 dependencies = [
  "unicode-xid",
 ]
@@ -2163,15 +2184,6 @@ dependencies = [
  "semver 0.9.0",
 ]
 
-[[package]]
-name = "rustc_version"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
-dependencies = [
- "semver 1.0.4",
-]
-
 [[package]]
 name = "ryu"
 version = "1.0.9"
@@ -2184,7 +2196,7 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6d3d055a2582e6b00ed7a31c1524040aa391092bf636328350813f3a0605215c"
 dependencies = [
- "rustc_version 0.2.3",
+ "rustc_version",
 ]
 
 [[package]]
@@ -2199,16 +2211,16 @@ dependencies = [
 [[package]]
 name = "sc-keystore"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b9cafba3d0e7a5950ac78d81e4ab7f2074938666"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
 dependencies = [
  "async-trait",
- "derive_more",
  "hex",
  "parking_lot",
  "serde_json",
  "sp-application-crypto",
  "sp-core",
  "sp-keystore",
+ "thiserror",
 ]
 
 [[package]]
@@ -2325,9 +2337,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.73"
+version = "1.0.78"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bcbd0344bc6533bc7ec56df11d42fb70f1b912351c0825ccb7211b59d8af7cf5"
+checksum = "d23c1ba4cf0efd44be32017709280b32d1cea5c3f1275c3b6d9e8bc54f758085"
 dependencies = [
  "itoa",
  "ryu",
@@ -2371,6 +2383,17 @@ dependencies = [
  "opaque-debug 0.3.0",
 ]
 
+[[package]]
+name = "sha2"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "99c3bd8169c58782adad9290a9af5939994036b76187f7b4f0e6de91dbbfc0ec"
+dependencies = [
+ "cfg-if 1.0.0",
+ "cpufeatures",
+ "digest 0.10.1",
+]
+
 [[package]]
 name = "sharded-slab"
 version = "0.1.4"
@@ -2413,7 +2436,7 @@ checksum = "1ecab6c735a6bb4139c0caafd0cc3635748bbb3acf4550e8138122099251f309"
 [[package]]
 name = "sp-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b9cafba3d0e7a5950ac78d81e4ab7f2074938666"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
 dependencies = [
  "hash-db",
  "log",
@@ -2430,7 +2453,7 @@ dependencies = [
 [[package]]
 name = "sp-api-proc-macro"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b9cafba3d0e7a5950ac78d81e4ab7f2074938666"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
 dependencies = [
  "blake2-rfc",
  "proc-macro-crate",
@@ -2441,8 +2464,8 @@ dependencies = [
 
 [[package]]
 name = "sp-application-crypto"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b9cafba3d0e7a5950ac78d81e4ab7f2074938666"
+version = "4.0.0"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -2454,8 +2477,8 @@ dependencies = [
 
 [[package]]
 name = "sp-arithmetic"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b9cafba3d0e7a5950ac78d81e4ab7f2074938666"
+version = "4.0.0"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
 dependencies = [
  "integer-sqrt",
  "num-traits",
@@ -2470,7 +2493,7 @@ dependencies = [
 [[package]]
 name = "sp-authorship"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b9cafba3d0e7a5950ac78d81e4ab7f2074938666"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
 dependencies = [
  "async-trait",
  "parity-scale-codec",
@@ -2482,7 +2505,7 @@ dependencies = [
 [[package]]
 name = "sp-block-builder"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b9cafba3d0e7a5950ac78d81e4ab7f2074938666"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -2494,7 +2517,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b9cafba3d0e7a5950ac78d81e4ab7f2074938666"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
 dependencies = [
  "async-trait",
  "futures",
@@ -2513,7 +2536,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-aura"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b9cafba3d0e7a5950ac78d81e4ab7f2074938666"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
 dependencies = [
  "async-trait",
  "parity-scale-codec",
@@ -2531,7 +2554,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-slots"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b9cafba3d0e7a5950ac78d81e4ab7f2074938666"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -2543,7 +2566,7 @@ dependencies = [
 [[package]]
 name = "sp-core"
 version = "4.1.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b9cafba3d0e7a5950ac78d81e4ab7f2074938666"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
 dependencies = [
  "base58",
  "bitflags",
@@ -2571,7 +2594,7 @@ dependencies = [
  "schnorrkel",
  "secrecy",
  "serde",
- "sha2 0.9.8",
+ "sha2 0.10.1",
  "sp-core-hashing",
  "sp-debug-derive",
  "sp-externalities",
@@ -2591,11 +2614,11 @@ dependencies = [
 [[package]]
 name = "sp-core-hashing"
 version = "4.0.0"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b9cafba3d0e7a5950ac78d81e4ab7f2074938666"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
 dependencies = [
  "blake2-rfc",
  "byteorder",
- "sha2 0.9.8",
+ "sha2 0.10.1",
  "sp-std",
  "tiny-keccak",
  "twox-hash",
@@ -2604,7 +2627,7 @@ dependencies = [
 [[package]]
 name = "sp-core-hashing-proc-macro"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b9cafba3d0e7a5950ac78d81e4ab7f2074938666"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2615,7 +2638,7 @@ dependencies = [
 [[package]]
 name = "sp-debug-derive"
 version = "4.0.0"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b9cafba3d0e7a5950ac78d81e4ab7f2074938666"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2625,7 +2648,7 @@ dependencies = [
 [[package]]
 name = "sp-externalities"
 version = "0.10.0"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b9cafba3d0e7a5950ac78d81e4ab7f2074938666"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
 dependencies = [
  "environmental",
  "parity-scale-codec",
@@ -2636,7 +2659,7 @@ dependencies = [
 [[package]]
 name = "sp-finality-grandpa"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b9cafba3d0e7a5950ac78d81e4ab7f2074938666"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
 dependencies = [
  "finality-grandpa",
  "log",
@@ -2654,7 +2677,7 @@ dependencies = [
 [[package]]
 name = "sp-inherents"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b9cafba3d0e7a5950ac78d81e4ab7f2074938666"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
 dependencies = [
  "async-trait",
  "impl-trait-for-tuples",
@@ -2667,8 +2690,8 @@ dependencies = [
 
 [[package]]
 name = "sp-io"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b9cafba3d0e7a5950ac78d81e4ab7f2074938666"
+version = "4.0.0"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
 dependencies = [
  "futures",
  "hash-db",
@@ -2691,8 +2714,8 @@ dependencies = [
 
 [[package]]
 name = "sp-keyring"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b9cafba3d0e7a5950ac78d81e4ab7f2074938666"
+version = "4.1.0-dev"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
 dependencies = [
  "lazy_static",
  "sp-core",
@@ -2702,11 +2725,10 @@ dependencies = [
 
 [[package]]
 name = "sp-keystore"
-version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b9cafba3d0e7a5950ac78d81e4ab7f2074938666"
+version = "0.10.0"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
 dependencies = [
  "async-trait",
- "derive_more",
  "futures",
  "merlin",
  "parity-scale-codec",
@@ -2715,12 +2737,13 @@ dependencies = [
  "serde",
  "sp-core",
  "sp-externalities",
+ "thiserror",
 ]
 
 [[package]]
 name = "sp-maybe-compressed-blob"
 version = "4.1.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b9cafba3d0e7a5950ac78d81e4ab7f2074938666"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
 dependencies = [
  "zstd",
 ]
@@ -2728,7 +2751,7 @@ dependencies = [
 [[package]]
 name = "sp-npos-elections"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b9cafba3d0e7a5950ac78d81e4ab7f2074938666"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -2743,7 +2766,7 @@ dependencies = [
 [[package]]
 name = "sp-npos-elections-solution-type"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b9cafba3d0e7a5950ac78d81e4ab7f2074938666"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
@@ -2754,7 +2777,7 @@ dependencies = [
 [[package]]
 name = "sp-offchain"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b9cafba3d0e7a5950ac78d81e4ab7f2074938666"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
 dependencies = [
  "sp-api",
  "sp-core",
@@ -2763,8 +2786,8 @@ dependencies = [
 
 [[package]]
 name = "sp-panic-handler"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b9cafba3d0e7a5950ac78d81e4ab7f2074938666"
+version = "4.0.0"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
 dependencies = [
  "backtrace",
  "lazy_static",
@@ -2774,7 +2797,7 @@ dependencies = [
 [[package]]
 name = "sp-rpc"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b9cafba3d0e7a5950ac78d81e4ab7f2074938666"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
 dependencies = [
  "rustc-hash",
  "serde",
@@ -2783,8 +2806,8 @@ dependencies = [
 
 [[package]]
 name = "sp-runtime"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b9cafba3d0e7a5950ac78d81e4ab7f2074938666"
+version = "4.1.0-dev"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
 dependencies = [
  "either",
  "hash256-std-hasher",
@@ -2805,8 +2828,8 @@ dependencies = [
 
 [[package]]
 name = "sp-runtime-interface"
-version = "4.0.0"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b9cafba3d0e7a5950ac78d81e4ab7f2074938666"
+version = "4.1.0-dev"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
 dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec",
@@ -2823,7 +2846,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime-interface-proc-macro"
 version = "4.0.0"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b9cafba3d0e7a5950ac78d81e4ab7f2074938666"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
 dependencies = [
  "Inflector",
  "proc-macro-crate",
@@ -2835,7 +2858,7 @@ dependencies = [
 [[package]]
 name = "sp-session"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b9cafba3d0e7a5950ac78d81e4ab7f2074938666"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -2849,7 +2872,7 @@ dependencies = [
 [[package]]
 name = "sp-staking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b9cafba3d0e7a5950ac78d81e4ab7f2074938666"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -2859,8 +2882,8 @@ dependencies = [
 
 [[package]]
 name = "sp-state-machine"
-version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b9cafba3d0e7a5950ac78d81e4ab7f2074938666"
+version = "0.10.0"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
 dependencies = [
  "hash-db",
  "log",
@@ -2883,12 +2906,12 @@ dependencies = [
 [[package]]
 name = "sp-std"
 version = "4.0.0"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b9cafba3d0e7a5950ac78d81e4ab7f2074938666"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
 
 [[package]]
 name = "sp-storage"
 version = "4.0.0"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b9cafba3d0e7a5950ac78d81e4ab7f2074938666"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
 dependencies = [
  "impl-serde",
  "parity-scale-codec",
@@ -2901,7 +2924,7 @@ dependencies = [
 [[package]]
 name = "sp-timestamp"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b9cafba3d0e7a5950ac78d81e4ab7f2074938666"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
 dependencies = [
  "async-trait",
  "futures-timer",
@@ -2917,7 +2940,7 @@ dependencies = [
 [[package]]
 name = "sp-tracing"
 version = "4.0.0"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b9cafba3d0e7a5950ac78d81e4ab7f2074938666"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
 dependencies = [
  "parity-scale-codec",
  "sp-std",
@@ -2929,7 +2952,7 @@ dependencies = [
 [[package]]
 name = "sp-transaction-pool"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b9cafba3d0e7a5950ac78d81e4ab7f2074938666"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
 dependencies = [
  "sp-api",
  "sp-runtime",
@@ -2937,8 +2960,8 @@ dependencies = [
 
 [[package]]
 name = "sp-trie"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b9cafba3d0e7a5950ac78d81e4ab7f2074938666"
+version = "4.0.0"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
 dependencies = [
  "hash-db",
  "memory-db",
@@ -2953,13 +2976,14 @@ dependencies = [
 [[package]]
 name = "sp-version"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b9cafba3d0e7a5950ac78d81e4ab7f2074938666"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
 dependencies = [
  "impl-serde",
  "parity-scale-codec",
  "parity-wasm 0.42.2",
  "scale-info",
  "serde",
+ "sp-core-hashing-proc-macro",
  "sp-runtime",
  "sp-std",
  "sp-version-proc-macro",
@@ -2969,7 +2993,7 @@ dependencies = [
 [[package]]
 name = "sp-version-proc-macro"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b9cafba3d0e7a5950ac78d81e4ab7f2074938666"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
 dependencies = [
  "parity-scale-codec",
  "proc-macro2",
@@ -2979,10 +3003,11 @@ dependencies = [
 
 [[package]]
 name = "sp-wasm-interface"
-version = "4.0.0"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b9cafba3d0e7a5950ac78d81e4ab7f2074938666"
+version = "4.1.0-dev"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
 dependencies = [
  "impl-trait-for-tuples",
+ "log",
  "parity-scale-codec",
  "sp-std",
  "wasmi",
@@ -2990,9 +3015,9 @@ dependencies = [
 
 [[package]]
 name = "ss58-registry"
-version = "1.10.0"
+version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c83f0afe7e571565ef9aae7b0e4fb30fcaec4ebb9aea2f00489b772782aa03a4"
+checksum = "8319f44e20b42e5c11b88b1ad4130c35fe2974665a007b08b02322070177136a"
 dependencies = [
  "Inflector",
  "proc-macro2",
@@ -3113,7 +3138,7 @@ dependencies = [
 [[package]]
 name = "substrate-wasm-builder"
 version = "5.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b9cafba3d0e7a5950ac78d81e4ab7f2074938666"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
 dependencies = [
  "ansi_term",
  "build-helper",
@@ -3359,9 +3384,9 @@ dependencies = [
 
 [[package]]
 name = "trie-db"
-version = "0.22.6"
+version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9eac131e334e81b6b3be07399482042838adcd7957aa0010231d0813e39e02fa"
+checksum = "e3ddae50680c12ef75bfbf58416ca6622fa43d879553f6cb2ed1a817346e1ffe"
 dependencies = [
  "hash-db",
  "hashbrown",
@@ -3372,9 +3397,9 @@ dependencies = [
 
 [[package]]
 name = "trie-root"
-version = "0.16.0"
+version = "0.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "652931506d2c1244d7217a70b99f56718a7b4161b37f04e7cd868072a99f68cd"
+checksum = "9a36c5ca3911ed3c9a5416ee6c679042064b93fc637ded67e25f92e68d783891"
 dependencies = [
  "hash-db",
 ]
@@ -3387,11 +3412,11 @@ checksum = "5e66dcbec4290c69dd03c57e76c2469ea5c7ce109c6dd4351c13055cf71ea055"
 
 [[package]]
 name = "twox-hash"
-version = "1.6.1"
+version = "1.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f559b464de2e2bdabcac6a210d12e9b5a5973c251e102c44c585c71d51bd78e"
+checksum = "4ee73e6e4924fe940354b8d4d98cad5231175d615cd855b758adc658c0aac6a0"
 dependencies = [
- "cfg-if 0.1.10",
+ "cfg-if 1.0.0",
  "rand 0.8.4",
  "static_assertions",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index 41915ab59..9d227162c 100755
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -32,7 +32,7 @@ staking = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrat
 system = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate.git", branch = "master", package = "frame-system", optional = true }
 transaction-payment = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "master", package = "pallet-transaction-payment", optional = true }
 sp-rpc = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "master", optional = true }
-sp-runtime = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "master" }
+sp-runtime = { version = "4.1.0-dev", default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "master" }
 support = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate.git", package = "frame-support", branch = "master" }
 sp-std = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "master" }
 # new parity repository
@@ -48,7 +48,7 @@ ac-primitives = { path = "primitives", default-features = false }
 [dev-dependencies]
 env_logger = "0.9"
 node-template-runtime = { git = "https://github.com/paritytech/substrate.git", branch = "master" }
-keyring = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate.git", branch = "master", package = "sp-keyring" }
+keyring = { version = "4.1.0-dev", git = "https://github.com/paritytech/substrate.git", branch = "master", package = "sp-keyring" }
 clap = { version = "2.33", features = ["yaml"] }
 
 
diff --git a/client-keystore/Cargo.toml b/client-keystore/Cargo.toml
index 863f4b5fe..801e5f175 100644
--- a/client-keystore/Cargo.toml
+++ b/client-keystore/Cargo.toml
@@ -14,7 +14,7 @@ serde_json = "1.0"
 sp-core = { version = "4.1.0-dev", default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "master" }
 sp-keystore = { version = "0.10.0-dev", git = "https://github.com/paritytech/substrate.git", branch = "master" }
 sc-keystore = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate.git", branch = "master" }
-sp-keyring = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate.git", branch = "master" }
+sp-keyring = { version = "4.1.0-dev", git = "https://github.com/paritytech/substrate.git", branch = "master" }
 sp-application-crypto = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate.git", branch = "master" }
 
 [dev-dependencies]
diff --git a/compose-macros/Cargo.toml b/compose-macros/Cargo.toml
index 749ead242..67c38faf1 100644
--- a/compose-macros/Cargo.toml
+++ b/compose-macros/Cargo.toml
@@ -8,7 +8,7 @@ codec = { package = 'parity-scale-codec', version = "2.0.0", default-features =
 log = { version = "0.4", default-features = false }
 
 # substrate dependencies
-sp-runtime = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "master" }
+sp-runtime = { version = "4.1.0-dev", default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "master" }
 sp-std = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "master" }
 
 # local deps
@@ -23,4 +23,4 @@ std = [
     "sp-std/std",
     # local crates
     "ac-primitives/std",
-]
\ No newline at end of file
+]
diff --git a/node-api/Cargo.toml b/node-api/Cargo.toml
index 5ac7fd5ea..292609c06 100644
--- a/node-api/Cargo.toml
+++ b/node-api/Cargo.toml
@@ -21,7 +21,7 @@ ac-primitives = { path = "../primitives" }
 frame-support = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate.git", branch = "master" }
 frame-system = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate.git", branch = "master" }
 sp-core = { version = "4.1.0-dev", git = "https://github.com/paritytech/substrate.git", branch = "master" }
-sp-runtime = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate.git", branch = "master" }
+sp-runtime = { version = "4.1.0-dev", git = "https://github.com/paritytech/substrate.git", branch = "master" }
 
 # new parity repo
 frame-metadata = { version = "14.0.0", git = "https://github.com/paritytech/frame-metadata.git", branch = "main", features = ["v14"] }
diff --git a/primitives/Cargo.toml b/primitives/Cargo.toml
index 57fdedb1d..e88f2f1ac 100644
--- a/primitives/Cargo.toml
+++ b/primitives/Cargo.toml
@@ -8,7 +8,7 @@ codec = { package = 'parity-scale-codec', version = "2.0.0", default-features =
 hex = { version = "0.4.3", default-features = false, features = ["alloc"] }
 
 sp-core = { version = "4.1.0-dev", default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "master" }
-sp-runtime = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "master" }
+sp-runtime = { version = "4.1.0-dev", default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "master" }
 sp-std = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "master" }
 
 [features]
@@ -19,4 +19,4 @@ std = [
     "sp-core/std",
     "sp-runtime/std",
     "sp-std/std",
-]
\ No newline at end of file
+]
diff --git a/tutorials/api-client-tutorial/Cargo.toml b/tutorials/api-client-tutorial/Cargo.toml
index d41a54aee..c7c70b7d8 100644
--- a/tutorials/api-client-tutorial/Cargo.toml
+++ b/tutorials/api-client-tutorial/Cargo.toml
@@ -9,4 +9,4 @@ substrate-api-client = { path = "../.." }
 codec = { package = "parity-scale-codec", features = ["derive"], version = "2.0.0" }
 
 sp-core = { version = "4.1.0-dev", git = "https://github.com/paritytech/substrate.git", branch = "master" }
-sp-keyring = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate.git", branch = "master" }
+sp-keyring = { version = "4.1.0-dev", git = "https://github.com/paritytech/substrate.git", branch = "master" }

From cb586588ba3f76eb242e84364a19b557d623236c Mon Sep 17 00:00:00 2001
From: haerdib <bhaerdi@devsgx02.scs-ad.scs.ch>
Date: Thu, 3 Feb 2022 10:50:33 +0100
Subject: [PATCH 3/6] cargo update

---
 Cargo.lock                               | 348 ++++++++++++-----------
 Cargo.toml                               |   8 +-
 client-keystore/Cargo.toml               |   6 +-
 compose-macros/Cargo.toml                |   2 +-
 node-api/Cargo.toml                      |   4 +-
 primitives/Cargo.toml                    |   4 +-
 test-no-std/Cargo.toml                   |   2 +-
 tutorials/api-client-tutorial/Cargo.toml |   2 +-
 8 files changed, 197 insertions(+), 179 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 4c7ddce6f..f56533dd7 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -74,7 +74,7 @@ version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47"
 dependencies = [
- "getrandom 0.2.3",
+ "getrandom 0.2.4",
  "once_cell",
  "version_check",
 ]
@@ -99,9 +99,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.51"
+version = "1.0.53"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b26702f315f53b6071259e15dd9d64528213b44d61de1ec926eca7715d62203"
+checksum = "94a45b455c14666b85fc40a019e8ab9eb75e3a124e05494f5397122bc9eb06e0"
 
 [[package]]
 name = "api-client-tutorial"
@@ -115,9 +115,9 @@ dependencies = [
 
 [[package]]
 name = "approx"
-version = "0.5.0"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "072df7202e63b127ab55acfe16ce97013d5b97bf160489336d3f1840fd78e99e"
+checksum = "cab112f0a86d568ea0e627cc1d6be74a1e9cd55214684db5561995f6dad897c6"
 dependencies = [
  "num-traits",
 ]
@@ -179,9 +179,9 @@ checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
 
 [[package]]
 name = "backtrace"
-version = "0.3.63"
+version = "0.3.64"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "321629d8ba6513061f26707241fa9bc89524ff1cd7a915a97ef0c62c666ce1b6"
+checksum = "5e121dee8023ce33ab248d9ce1493df03c3b38a659b240096fcbd7048ff9c31f"
 dependencies = [
  "addr2line",
  "cc",
@@ -250,7 +250,7 @@ version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4"
 dependencies = [
- "generic-array 0.14.4",
+ "generic-array 0.14.5",
 ]
 
 [[package]]
@@ -259,7 +259,7 @@ version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f1d36a02058e76b040de25a4464ba1c80935655595b661505c8b39b664828b95"
 dependencies = [
- "generic-array 0.14.4",
+ "generic-array 0.14.5",
 ]
 
 [[package]]
@@ -282,9 +282,9 @@ dependencies = [
 
 [[package]]
 name = "bumpalo"
-version = "3.8.0"
+version = "3.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f1e260c3a9040a7c19a12468758f4c16f31a81a1fe087482be9570ec864bb6c"
+checksum = "a4a45a46ab1f2412e53d3a0ade76ffad2025804294569aae387231a0cd6e0899"
 
 [[package]]
 name = "byte-slice-cast"
@@ -316,9 +316,9 @@ dependencies = [
 
 [[package]]
 name = "camino"
-version = "1.0.5"
+version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52d74260d9bf6944e2208aa46841b4b8f0d7ffc0849a06837b2f510337f86b2b"
+checksum = "6f3132262930b0522068049f5870a856ab8affc80c70d08b6ecb785771a6fc23"
 dependencies = [
  "serde",
 ]
@@ -421,7 +421,7 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "683d6b536309245c849479fba3da410962a43ed8e51c26b729208ec0ac2798d0"
 dependencies = [
- "generic-array 0.14.4",
+ "generic-array 0.14.5",
 ]
 
 [[package]]
@@ -430,7 +430,7 @@ version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b584a330336237c1eecd3e94266efb216c56ed91225d634cb2991c5f3fd1aeab"
 dependencies = [
- "generic-array 0.14.4",
+ "generic-array 0.14.5",
  "subtle",
 ]
 
@@ -440,7 +440,7 @@ version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b1d1a86f49236c215f271d40892d5fc950490551400b02ef360692c29815c714"
 dependencies = [
- "generic-array 0.14.4",
+ "generic-array 0.14.5",
  "subtle",
 ]
 
@@ -496,7 +496,7 @@ version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066"
 dependencies = [
- "generic-array 0.14.4",
+ "generic-array 0.14.5",
 ]
 
 [[package]]
@@ -507,7 +507,7 @@ checksum = "b697d66081d42af4fba142d56918a3cb21dc8eb63372c6b85d14f44fb9c5979b"
 dependencies = [
  "block-buffer 0.10.0",
  "crypto-common",
- "generic-array 0.14.4",
+ "generic-array 0.14.5",
 ]
 
 [[package]]
@@ -562,7 +562,7 @@ dependencies = [
  "ed25519",
  "rand 0.7.3",
  "serde",
- "sha2 0.9.8",
+ "sha2 0.9.9",
  "zeroize",
 ]
 
@@ -597,6 +597,15 @@ version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed"
 
+[[package]]
+name = "fastrand"
+version = "1.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3fcf0cee53519c866c09b5de1f6c56ff9d647101f81c1964fa632e148896cdf"
+dependencies = [
+ "instant",
+]
+
 [[package]]
 name = "finality-grandpa"
 version = "0.14.4"
@@ -653,7 +662,7 @@ dependencies = [
 [[package]]
 name = "frame-benchmarking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#7c6342047c992b6f3fa917d0d0448eb7e89afa6c"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -662,6 +671,7 @@ dependencies = [
  "parity-scale-codec",
  "paste",
  "scale-info",
+ "serde",
  "sp-api",
  "sp-application-crypto",
  "sp-io",
@@ -674,7 +684,7 @@ dependencies = [
 [[package]]
 name = "frame-election-provider-support"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#7c6342047c992b6f3fa917d0d0448eb7e89afa6c"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -688,7 +698,7 @@ dependencies = [
 [[package]]
 name = "frame-executive"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#7c6342047c992b6f3fa917d0d0448eb7e89afa6c"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -727,7 +737,7 @@ dependencies = [
 [[package]]
 name = "frame-support"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#7c6342047c992b6f3fa917d0d0448eb7e89afa6c"
 dependencies = [
  "bitflags",
  "frame-metadata 14.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -756,7 +766,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#7c6342047c992b6f3fa917d0d0448eb7e89afa6c"
 dependencies = [
  "Inflector",
  "frame-support-procedural-tools",
@@ -768,7 +778,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural-tools"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#7c6342047c992b6f3fa917d0d0448eb7e89afa6c"
 dependencies = [
  "frame-support-procedural-tools-derive",
  "proc-macro-crate",
@@ -780,7 +790,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural-tools-derive"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#7c6342047c992b6f3fa917d0d0448eb7e89afa6c"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -790,7 +800,7 @@ dependencies = [
 [[package]]
 name = "frame-system"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#7c6342047c992b6f3fa917d0d0448eb7e89afa6c"
 dependencies = [
  "frame-support",
  "log",
@@ -807,7 +817,7 @@ dependencies = [
 [[package]]
 name = "frame-system-rpc-runtime-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#7c6342047c992b6f3fa917d0d0448eb7e89afa6c"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -942,9 +952,9 @@ dependencies = [
 
 [[package]]
 name = "generic-array"
-version = "0.14.4"
+version = "0.14.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "501466ecc8a30d1d3b7fc9229b122b2ce8ed6e9d9223f1138d4babb253e51817"
+checksum = "fd48d33ec7f05fbfa152300fdad764757cbded343c1aa1cff2fbaf4134851803"
 dependencies = [
  "typenum",
  "version_check",
@@ -965,9 +975,9 @@ dependencies = [
 
 [[package]]
 name = "getrandom"
-version = "0.2.3"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753"
+checksum = "418d37c8b1d42553c93648be529cb70f920d3baf8ef469b74b9638df426e0b4c"
 dependencies = [
  "cfg-if 1.0.0",
  "libc",
@@ -1055,7 +1065,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "17ea0a1394df5b6574da6e0c1ade9e78868c9fb0a4e5ef4428e32da4676b85b1"
 dependencies = [
  "digest 0.9.0",
- "generic-array 0.14.4",
+ "generic-array 0.14.5",
  "hmac 0.8.1",
 ]
 
@@ -1155,9 +1165,9 @@ dependencies = [
 
 [[package]]
 name = "js-sys"
-version = "0.3.55"
+version = "0.3.56"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7cc9ffccd38c451a86bf13657df244e9c3f37493cce8e5e21e940963777acc84"
+checksum = "a38fc24e30fd564ce974c02bf1d337caddff65be6cc4735a1f7eab22a7440f04"
 dependencies = [
  "wasm-bindgen",
 ]
@@ -1192,9 +1202,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
 
 [[package]]
 name = "libc"
-version = "0.2.112"
+version = "0.2.117"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b03d17f364a3a042d5e5d46b053bbbf82c92c9430c592dd4c064dc6ee997125"
+checksum = "e74d72e0f9b65b5b4ca49a346af3976df0f9c61d550727f349ecd559f251a26c"
 
 [[package]]
 name = "libm"
@@ -1217,7 +1227,7 @@ dependencies = [
  "libsecp256k1-gen-genmult",
  "rand 0.8.4",
  "serde",
- "sha2 0.9.8",
+ "sha2 0.9.9",
  "typenum",
 ]
 
@@ -1262,9 +1272,9 @@ dependencies = [
 
 [[package]]
 name = "lock_api"
-version = "0.4.5"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "712a4d093c9976e24e7dbca41db895dabcbac38eb5f4045393d17a95bdfb1109"
+checksum = "88943dd7ef4a2e5a4bfa2753aaab3013e34ce2533d1996fb18ef591e315e2b3b"
 dependencies = [
  "scopeguard",
 ]
@@ -1433,7 +1443,7 @@ dependencies = [
 [[package]]
 name = "node-template-runtime"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#7c6342047c992b6f3fa917d0d0448eb7e89afa6c"
 dependencies = [
  "frame-executive",
  "frame-support",
@@ -1600,7 +1610,7 @@ dependencies = [
 [[package]]
 name = "pallet-aura"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#7c6342047c992b6f3fa917d0d0448eb7e89afa6c"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -1616,7 +1626,7 @@ dependencies = [
 [[package]]
 name = "pallet-authorship"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#7c6342047c992b6f3fa917d0d0448eb7e89afa6c"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -1631,7 +1641,7 @@ dependencies = [
 [[package]]
 name = "pallet-balances"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#7c6342047c992b6f3fa917d0d0448eb7e89afa6c"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -1646,7 +1656,7 @@ dependencies = [
 [[package]]
 name = "pallet-grandpa"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#7c6342047c992b6f3fa917d0d0448eb7e89afa6c"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -1669,7 +1679,7 @@ dependencies = [
 [[package]]
 name = "pallet-randomness-collective-flip"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#7c6342047c992b6f3fa917d0d0448eb7e89afa6c"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -1683,7 +1693,7 @@ dependencies = [
 [[package]]
 name = "pallet-session"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#7c6342047c992b6f3fa917d0d0448eb7e89afa6c"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -1704,7 +1714,7 @@ dependencies = [
 [[package]]
 name = "pallet-staking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#7c6342047c992b6f3fa917d0d0448eb7e89afa6c"
 dependencies = [
  "frame-election-provider-support",
  "frame-support",
@@ -1725,7 +1735,7 @@ dependencies = [
 [[package]]
 name = "pallet-sudo"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#7c6342047c992b6f3fa917d0d0448eb7e89afa6c"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -1739,7 +1749,7 @@ dependencies = [
 [[package]]
 name = "pallet-template"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#7c6342047c992b6f3fa917d0d0448eb7e89afa6c"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -1751,7 +1761,7 @@ dependencies = [
 [[package]]
 name = "pallet-timestamp"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#7c6342047c992b6f3fa917d0d0448eb7e89afa6c"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -1768,7 +1778,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#7c6342047c992b6f3fa917d0d0448eb7e89afa6c"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -1785,7 +1795,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment-rpc-runtime-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#7c6342047c992b6f3fa917d0d0448eb7e89afa6c"
 dependencies = [
  "pallet-transaction-payment",
  "parity-scale-codec",
@@ -1917,9 +1927,9 @@ checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
 
 [[package]]
 name = "pin-project-lite"
-version = "0.2.7"
+version = "0.2.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d31d11c69a6b52a174b42bdc0c30e5e11670f90788b2c471c31c1d17d449443"
+checksum = "e280fbe77cc62c91527259e9442153f4688736748d24660126286329742b4c6c"
 
 [[package]]
 name = "pin-utils"
@@ -1935,9 +1945,9 @@ checksum = "58893f751c9b0412871a09abd62ecd2a00298c6c83befa223ef98c52aef40cbe"
 
 [[package]]
 name = "ppv-lite86"
-version = "0.2.15"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed0cfbc8191465bed66e1718596ee0b0b35d5ee1f41c5df2189d0fe8bde535ba"
+checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872"
 
 [[package]]
 name = "primitive-types"
@@ -1973,9 +1983,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.10"
+version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38bc8cc6a5f2e3655e0899c1b848643b2562f853f114bfec7be120678e3ace05"
+checksum = "864d3e96a899863136fc6e99f3d7cae289dafe43bf2c5ac19b70df7210c0a145"
 dependencies = [
  "proc-macro2",
 ]
@@ -2047,14 +2057,14 @@ version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7"
 dependencies = [
- "getrandom 0.2.3",
+ "getrandom 0.2.4",
 ]
 
 [[package]]
 name = "rand_distr"
-version = "0.4.2"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "964d548f8e7d12e102ef183a0de7e98180c9f8729f555897a857b96e48122d2f"
+checksum = "32cb0b9bc82b0a0876c2dd994a7e7a2683d3e7390ca40e6886785ef0c7e3ee31"
 dependencies = [
  "num-traits",
  "rand 0.8.4",
@@ -2184,6 +2194,12 @@ dependencies = [
  "semver 0.9.0",
 ]
 
+[[package]]
+name = "rustversion"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f2cc38e8fa666e2de3c4aba7edeb5ffc5246c1c2ed0e3d17e560aeeba736b23f"
+
 [[package]]
 name = "ryu"
 version = "1.0.9"
@@ -2211,7 +2227,7 @@ dependencies = [
 [[package]]
 name = "sc-keystore"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#7c6342047c992b6f3fa917d0d0448eb7e89afa6c"
 dependencies = [
  "async-trait",
  "hex",
@@ -2317,18 +2333,18 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
 
 [[package]]
 name = "serde"
-version = "1.0.132"
+version = "1.0.136"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b9875c23cf305cd1fd7eb77234cbb705f21ea6a72c637a5c6db5fe4b8e7f008"
+checksum = "ce31e24b01e1e524df96f1c2fdd054405f8d7376249a5110886fb4b658484789"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.132"
+version = "1.0.136"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ecc0db5cb2556c0e558887d9bbdcf6ac4471e83ff66cf696e5419024d1606276"
+checksum = "08597e7152fcd306f41838ed3e37be9eaeed2b61c42e2117266a554fab4662f9"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2372,9 +2388,9 @@ dependencies = [
 
 [[package]]
 name = "sha2"
-version = "0.9.8"
+version = "0.9.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b69f9a4c9740d74c5baa3fd2e547f9525fa8088a8a958e0ca2409a514e33f5fa"
+checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800"
 dependencies = [
  "block-buffer 0.9.0",
  "cfg-if 1.0.0",
@@ -2405,9 +2421,9 @@ dependencies = [
 
 [[package]]
 name = "signature"
-version = "1.4.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02658e48d89f2bec991f9a78e69cfa4c316f8d6a6c4ec12fae1aeb263d486788"
+checksum = "f054c6c1a6e95179d6f23ed974060dcefb2d9388bb7256900badad682c499de4"
 
 [[package]]
 name = "simba"
@@ -2429,14 +2445,14 @@ checksum = "9def91fd1e018fe007022791f865d0ccc9b3a0d5001e01aabb8b40e46000afb5"
 
 [[package]]
 name = "smallvec"
-version = "1.7.0"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ecab6c735a6bb4139c0caafd0cc3635748bbb3acf4550e8138122099251f309"
+checksum = "f2dd574626839106c320a323308629dcb1acfc96e32a8cba364ddc61ac23ee83"
 
 [[package]]
 name = "sp-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#7c6342047c992b6f3fa917d0d0448eb7e89afa6c"
 dependencies = [
  "hash-db",
  "log",
@@ -2453,7 +2469,7 @@ dependencies = [
 [[package]]
 name = "sp-api-proc-macro"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#7c6342047c992b6f3fa917d0d0448eb7e89afa6c"
 dependencies = [
  "blake2-rfc",
  "proc-macro-crate",
@@ -2464,8 +2480,8 @@ dependencies = [
 
 [[package]]
 name = "sp-application-crypto"
-version = "4.0.0"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
+version = "5.0.0"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#7c6342047c992b6f3fa917d0d0448eb7e89afa6c"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -2478,7 +2494,7 @@ dependencies = [
 [[package]]
 name = "sp-arithmetic"
 version = "4.0.0"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#7c6342047c992b6f3fa917d0d0448eb7e89afa6c"
 dependencies = [
  "integer-sqrt",
  "num-traits",
@@ -2493,7 +2509,7 @@ dependencies = [
 [[package]]
 name = "sp-authorship"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#7c6342047c992b6f3fa917d0d0448eb7e89afa6c"
 dependencies = [
  "async-trait",
  "parity-scale-codec",
@@ -2505,7 +2521,7 @@ dependencies = [
 [[package]]
 name = "sp-block-builder"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#7c6342047c992b6f3fa917d0d0448eb7e89afa6c"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -2517,7 +2533,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#7c6342047c992b6f3fa917d0d0448eb7e89afa6c"
 dependencies = [
  "async-trait",
  "futures",
@@ -2536,7 +2552,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-aura"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#7c6342047c992b6f3fa917d0d0448eb7e89afa6c"
 dependencies = [
  "async-trait",
  "parity-scale-codec",
@@ -2554,7 +2570,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-slots"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#7c6342047c992b6f3fa917d0d0448eb7e89afa6c"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -2565,8 +2581,8 @@ dependencies = [
 
 [[package]]
 name = "sp-core"
-version = "4.1.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
+version = "5.0.0"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#7c6342047c992b6f3fa917d0d0448eb7e89afa6c"
 dependencies = [
  "base58",
  "bitflags",
@@ -2614,7 +2630,7 @@ dependencies = [
 [[package]]
 name = "sp-core-hashing"
 version = "4.0.0"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#7c6342047c992b6f3fa917d0d0448eb7e89afa6c"
 dependencies = [
  "blake2-rfc",
  "byteorder",
@@ -2627,7 +2643,7 @@ dependencies = [
 [[package]]
 name = "sp-core-hashing-proc-macro"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#7c6342047c992b6f3fa917d0d0448eb7e89afa6c"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2638,7 +2654,7 @@ dependencies = [
 [[package]]
 name = "sp-debug-derive"
 version = "4.0.0"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#7c6342047c992b6f3fa917d0d0448eb7e89afa6c"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2647,8 +2663,8 @@ dependencies = [
 
 [[package]]
 name = "sp-externalities"
-version = "0.10.0"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
+version = "0.11.0"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#7c6342047c992b6f3fa917d0d0448eb7e89afa6c"
 dependencies = [
  "environmental",
  "parity-scale-codec",
@@ -2659,7 +2675,7 @@ dependencies = [
 [[package]]
 name = "sp-finality-grandpa"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#7c6342047c992b6f3fa917d0d0448eb7e89afa6c"
 dependencies = [
  "finality-grandpa",
  "log",
@@ -2677,7 +2693,7 @@ dependencies = [
 [[package]]
 name = "sp-inherents"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#7c6342047c992b6f3fa917d0d0448eb7e89afa6c"
 dependencies = [
  "async-trait",
  "impl-trait-for-tuples",
@@ -2690,8 +2706,8 @@ dependencies = [
 
 [[package]]
 name = "sp-io"
-version = "4.0.0"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
+version = "5.0.0"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#7c6342047c992b6f3fa917d0d0448eb7e89afa6c"
 dependencies = [
  "futures",
  "hash-db",
@@ -2715,7 +2731,7 @@ dependencies = [
 [[package]]
 name = "sp-keyring"
 version = "4.1.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#7c6342047c992b6f3fa917d0d0448eb7e89afa6c"
 dependencies = [
  "lazy_static",
  "sp-core",
@@ -2725,8 +2741,8 @@ dependencies = [
 
 [[package]]
 name = "sp-keystore"
-version = "0.10.0"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
+version = "0.11.0"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#7c6342047c992b6f3fa917d0d0448eb7e89afa6c"
 dependencies = [
  "async-trait",
  "futures",
@@ -2743,7 +2759,7 @@ dependencies = [
 [[package]]
 name = "sp-maybe-compressed-blob"
 version = "4.1.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#7c6342047c992b6f3fa917d0d0448eb7e89afa6c"
 dependencies = [
  "zstd",
 ]
@@ -2751,7 +2767,7 @@ dependencies = [
 [[package]]
 name = "sp-npos-elections"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#7c6342047c992b6f3fa917d0d0448eb7e89afa6c"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -2766,7 +2782,7 @@ dependencies = [
 [[package]]
 name = "sp-npos-elections-solution-type"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#7c6342047c992b6f3fa917d0d0448eb7e89afa6c"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
@@ -2777,7 +2793,7 @@ dependencies = [
 [[package]]
 name = "sp-offchain"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#7c6342047c992b6f3fa917d0d0448eb7e89afa6c"
 dependencies = [
  "sp-api",
  "sp-core",
@@ -2787,7 +2803,7 @@ dependencies = [
 [[package]]
 name = "sp-panic-handler"
 version = "4.0.0"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#7c6342047c992b6f3fa917d0d0448eb7e89afa6c"
 dependencies = [
  "backtrace",
  "lazy_static",
@@ -2796,8 +2812,8 @@ dependencies = [
 
 [[package]]
 name = "sp-rpc"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
+version = "5.0.0"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#7c6342047c992b6f3fa917d0d0448eb7e89afa6c"
 dependencies = [
  "rustc-hash",
  "serde",
@@ -2806,8 +2822,8 @@ dependencies = [
 
 [[package]]
 name = "sp-runtime"
-version = "4.1.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
+version = "5.0.0"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#7c6342047c992b6f3fa917d0d0448eb7e89afa6c"
 dependencies = [
  "either",
  "hash256-std-hasher",
@@ -2828,8 +2844,8 @@ dependencies = [
 
 [[package]]
 name = "sp-runtime-interface"
-version = "4.1.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
+version = "5.0.0"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#7c6342047c992b6f3fa917d0d0448eb7e89afa6c"
 dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec",
@@ -2846,7 +2862,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime-interface-proc-macro"
 version = "4.0.0"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#7c6342047c992b6f3fa917d0d0448eb7e89afa6c"
 dependencies = [
  "Inflector",
  "proc-macro-crate",
@@ -2858,7 +2874,7 @@ dependencies = [
 [[package]]
 name = "sp-session"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#7c6342047c992b6f3fa917d0d0448eb7e89afa6c"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -2872,7 +2888,7 @@ dependencies = [
 [[package]]
 name = "sp-staking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#7c6342047c992b6f3fa917d0d0448eb7e89afa6c"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -2882,8 +2898,8 @@ dependencies = [
 
 [[package]]
 name = "sp-state-machine"
-version = "0.10.0"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
+version = "0.11.0"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#7c6342047c992b6f3fa917d0d0448eb7e89afa6c"
 dependencies = [
  "hash-db",
  "log",
@@ -2906,12 +2922,12 @@ dependencies = [
 [[package]]
 name = "sp-std"
 version = "4.0.0"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#7c6342047c992b6f3fa917d0d0448eb7e89afa6c"
 
 [[package]]
 name = "sp-storage"
-version = "4.0.0"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
+version = "5.0.0"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#7c6342047c992b6f3fa917d0d0448eb7e89afa6c"
 dependencies = [
  "impl-serde",
  "parity-scale-codec",
@@ -2924,7 +2940,7 @@ dependencies = [
 [[package]]
 name = "sp-timestamp"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#7c6342047c992b6f3fa917d0d0448eb7e89afa6c"
 dependencies = [
  "async-trait",
  "futures-timer",
@@ -2940,7 +2956,7 @@ dependencies = [
 [[package]]
 name = "sp-tracing"
 version = "4.0.0"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#7c6342047c992b6f3fa917d0d0448eb7e89afa6c"
 dependencies = [
  "parity-scale-codec",
  "sp-std",
@@ -2952,7 +2968,7 @@ dependencies = [
 [[package]]
 name = "sp-transaction-pool"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#7c6342047c992b6f3fa917d0d0448eb7e89afa6c"
 dependencies = [
  "sp-api",
  "sp-runtime",
@@ -2960,8 +2976,8 @@ dependencies = [
 
 [[package]]
 name = "sp-trie"
-version = "4.0.0"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
+version = "5.0.0"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#7c6342047c992b6f3fa917d0d0448eb7e89afa6c"
 dependencies = [
  "hash-db",
  "memory-db",
@@ -2976,7 +2992,7 @@ dependencies = [
 [[package]]
 name = "sp-version"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#7c6342047c992b6f3fa917d0d0448eb7e89afa6c"
 dependencies = [
  "impl-serde",
  "parity-scale-codec",
@@ -2993,7 +3009,7 @@ dependencies = [
 [[package]]
 name = "sp-version-proc-macro"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#7c6342047c992b6f3fa917d0d0448eb7e89afa6c"
 dependencies = [
  "parity-scale-codec",
  "proc-macro2",
@@ -3003,8 +3019,8 @@ dependencies = [
 
 [[package]]
 name = "sp-wasm-interface"
-version = "4.1.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
+version = "5.0.0"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#7c6342047c992b6f3fa917d0d0448eb7e89afa6c"
 dependencies = [
  "impl-trait-for-tuples",
  "log",
@@ -3054,22 +3070,23 @@ checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
 
 [[package]]
 name = "strum"
-version = "0.22.0"
+version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7ac893c7d471c8a21f31cfe213ec4f6d9afeed25537c772e08ef3f005f8729e"
+checksum = "cae14b91c7d11c9a851d3fbc80a963198998c2a64eec840477fa92d8ce9b70bb"
 dependencies = [
  "strum_macros",
 ]
 
 [[package]]
 name = "strum_macros"
-version = "0.22.0"
+version = "0.23.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "339f799d8b549e3744c7ac7feb216383e4005d94bdb22561b3ab8f3b808ae9fb"
+checksum = "5bb0dc7ee9c15cea6199cde9a127fa16a4c5819af85395457ad72d68edc85a38"
 dependencies = [
  "heck",
  "proc-macro2",
  "quote",
+ "rustversion",
  "syn",
 ]
 
@@ -3115,7 +3132,7 @@ dependencies = [
  "hmac 0.11.0",
  "pbkdf2 0.8.0",
  "schnorrkel",
- "sha2 0.9.8",
+ "sha2 0.9.9",
  "zeroize",
 ]
 
@@ -3138,12 +3155,13 @@ dependencies = [
 [[package]]
 name = "substrate-wasm-builder"
 version = "5.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=master#b07765f9ecc4c508fb4d0fba930b476c8509f5c2"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#7c6342047c992b6f3fa917d0d0448eb7e89afa6c"
 dependencies = [
  "ansi_term",
  "build-helper",
  "cargo_metadata",
  "sp-maybe-compressed-blob",
+ "strum",
  "tempfile",
  "toml",
  "walkdir",
@@ -3158,9 +3176,9 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601"
 
 [[package]]
 name = "syn"
-version = "1.0.82"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8daf5dd0bb60cbd4137b1b587d2fc0ae729bc07cf01cd70b36a1ed5ade3b9d59"
+checksum = "8a65b3f4ffa0092e9887669db0eae07941f023991ab58ea44da8fe8e2d511c6b"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3187,13 +3205,13 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
 
 [[package]]
 name = "tempfile"
-version = "3.2.0"
+version = "3.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dac1c663cfc93810f88aed9b8941d48cabf856a1b111c29a40439018d870eb22"
+checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4"
 dependencies = [
  "cfg-if 1.0.0",
+ "fastrand",
  "libc",
- "rand 0.8.4",
  "redox_syscall",
  "remove_dir_all",
  "winapi 0.3.9",
@@ -3248,9 +3266,9 @@ dependencies = [
 
 [[package]]
 name = "thread_local"
-version = "1.1.3"
+version = "1.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8018d24e04c95ac8790716a5987d0fec4f8b27249ffa0f7d33f1369bdfb88cbd"
+checksum = "5516c27b78311c50bf42c071425c560ac799b11c30b31f87e3081965fe5e0180"
 dependencies = [
  "once_cell",
 ]
@@ -3267,7 +3285,7 @@ dependencies = [
  "pbkdf2 0.4.0",
  "rand 0.7.3",
  "rustc-hash",
- "sha2 0.9.8",
+ "sha2 0.9.9",
  "thiserror",
  "unicode-normalization",
  "wasm-bindgen",
@@ -3423,15 +3441,15 @@ dependencies = [
 
 [[package]]
 name = "typenum"
-version = "1.14.0"
+version = "1.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b63708a265f51345575b27fe43f9500ad611579e764c79edbc2037b1121959ec"
+checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987"
 
 [[package]]
 name = "uint"
-version = "0.9.1"
+version = "0.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6470ab50f482bde894a037a57064480a246dbfdd5960bd65a44824693f08da5f"
+checksum = "1b1b413ebfe8c2c74a69ff124699dd156a7fa41cb1d09ba6df94aa2f2b0a4a3a"
 dependencies = [
  "byteorder",
  "crunchy",
@@ -3498,9 +3516,9 @@ checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
 
 [[package]]
 name = "version_check"
-version = "0.9.3"
+version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe"
+checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "walkdir"
@@ -3527,9 +3545,9 @@ checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.78"
+version = "0.2.79"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "632f73e236b219150ea279196e54e610f5dbafa5d61786303d4da54f84e47fce"
+checksum = "25f1af7423d8588a3d840681122e72e6a24ddbcb3f0ec385cac0d12d24256c06"
 dependencies = [
  "cfg-if 1.0.0",
  "wasm-bindgen-macro",
@@ -3537,9 +3555,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.78"
+version = "0.2.79"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a317bf8f9fba2476b4b2c85ef4c4af8ff39c3c7f0cdfeed4f82c34a880aa837b"
+checksum = "8b21c0df030f5a177f3cba22e9bc4322695ec43e7257d865302900290bcdedca"
 dependencies = [
  "bumpalo",
  "lazy_static",
@@ -3552,9 +3570,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.78"
+version = "0.2.79"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d56146e7c495528bf6587663bea13a8eb588d39b36b679d83972e1a2dbbdacf9"
+checksum = "2f4203d69e40a52ee523b2529a773d5ffc1dc0071801c87b3d270b471b80ed01"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -3562,9 +3580,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.78"
+version = "0.2.79"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7803e0eea25835f8abdc585cd3021b3deb11543c6fe226dcd30b228857c5c5ab"
+checksum = "bfa8a30d46208db204854cadbb5d4baf5fcf8071ba5bf48190c3e59937962ebc"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3575,9 +3593,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.78"
+version = "0.2.79"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0237232789cf037d5480773fe568aac745bfe2afbc11a863e97901780a6b47cc"
+checksum = "3d958d035c4438e28c70e4321a2911302f10135ce78a9c7834c0cab4123d06a2"
 
 [[package]]
 name = "wasm-gc-api"
@@ -3700,18 +3718,18 @@ checksum = "e66366e18dc58b46801afbf2ca7661a9f59cc8c5962c29892b6039b4f86fa992"
 
 [[package]]
 name = "zeroize"
-version = "1.4.3"
+version = "1.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d68d9dcec5f9b43a30d38c49f91dfedfaac384cb8f085faca366c26207dd1619"
+checksum = "7c88870063c39ee00ec285a2f8d6a966e5b6fb2becc4e8dac77ed0d370ed6006"
 dependencies = [
  "zeroize_derive",
 ]
 
 [[package]]
 name = "zeroize_derive"
-version = "1.2.2"
+version = "1.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "65f1a51723ec88c66d5d1fe80c841f17f63587d6691901d66be9bec6c3b51f73"
+checksum = "81e8f13fef10b63c06356d65d416b070798ddabcadc10d3ece0c5be9b3c7eddb"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3721,18 +3739,18 @@ dependencies = [
 
 [[package]]
 name = "zstd"
-version = "0.9.0+zstd.1.5.0"
+version = "0.9.2+zstd.1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07749a5dc2cb6b36661290245e350f15ec3bbb304e493db54a1d354480522ccd"
+checksum = "2390ea1bf6c038c39674f22d95f0564725fc06034a47129179810b2fc58caa54"
 dependencies = [
  "zstd-safe",
 ]
 
 [[package]]
 name = "zstd-safe"
-version = "4.1.1+zstd.1.5.0"
+version = "4.1.3+zstd.1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c91c90f2c593b003603e5e0493c837088df4469da25aafff8bce42ba48caf079"
+checksum = "e99d81b99fb3c2c2c794e3fe56c305c63d5173a16a46b5850b07c935ffc7db79"
 dependencies = [
  "libc",
  "zstd-sys",
@@ -3740,9 +3758,9 @@ dependencies = [
 
 [[package]]
 name = "zstd-sys"
-version = "1.6.1+zstd.1.5.0"
+version = "1.6.2+zstd.1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "615120c7a2431d16cf1cf979e7fc31ba7a5b5e5707b29c8a99e5dbf8a8392a33"
+checksum = "2daf2f248d9ea44454bfcb2516534e8b8ad2fc91bf818a1885495fc42bc8ac9f"
 dependencies = [
  "cc",
  "libc",
diff --git a/Cargo.toml b/Cargo.toml
index 9d227162c..aa3547869 100755
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -25,20 +25,20 @@ ws = { version = "0.9.1", optional = true, features = ["ssl"] }
 codec = { package = 'parity-scale-codec', version = "2.0.0", default-features = false,  features = ['derive']}
 
 # Substrate dependencies
-sp-core = { version = "4.1.0-dev", default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "master", features = ["full_crypto"] }
+sp-core = { version = "5.0.0", default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "master", features = ["full_crypto"] }
 sp-version = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate.git", branch = "master", package = "sp-version", optional = true }
 balances = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate.git", branch = "master", package = "pallet-balances", optional = true }
 staking = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate.git", branch = "master", package = "pallet-staking", optional = true }
 system = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate.git", branch = "master", package = "frame-system", optional = true }
 transaction-payment = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "master", package = "pallet-transaction-payment", optional = true }
-sp-rpc = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "master", optional = true }
-sp-runtime = { version = "4.1.0-dev", default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "master" }
+sp-rpc = { version = "5.0.0", default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "master", optional = true }
+sp-runtime = { version = "5.0.0", default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "master" }
 support = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate.git", package = "frame-support", branch = "master" }
 sp-std = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "master" }
 # new parity repository
 metadata = { version = "14.0.0", default-features = false, git = "https://github.com/paritytech/frame-metadata.git", branch = "main", package = "frame-metadata", features = ["v13"] }
 # need to add this for the app_crypto macro
-sp-application-crypto = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "master", features = ["full_crypto"] }
+sp-application-crypto = { version = "5.0.0", default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "master", features = ["full_crypto"] }
 
 # local deps
 ac-compose-macros = { path = "compose-macros", default-features = false }
diff --git a/client-keystore/Cargo.toml b/client-keystore/Cargo.toml
index 801e5f175..d698bf990 100644
--- a/client-keystore/Cargo.toml
+++ b/client-keystore/Cargo.toml
@@ -11,11 +11,11 @@ hex = "0.4"
 serde_json = "1.0"
 
 # Substrate dependencies
-sp-core = { version = "4.1.0-dev", default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "master" }
-sp-keystore = { version = "0.10.0-dev", git = "https://github.com/paritytech/substrate.git", branch = "master" }
+sp-core = { version = "5.0.0", default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "master" }
+sp-keystore = { version = "0.11.0", git = "https://github.com/paritytech/substrate.git", branch = "master" }
 sc-keystore = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate.git", branch = "master" }
 sp-keyring = { version = "4.1.0-dev", git = "https://github.com/paritytech/substrate.git", branch = "master" }
-sp-application-crypto = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate.git", branch = "master" }
+sp-application-crypto = { version = "5.0.0", git = "https://github.com/paritytech/substrate.git", branch = "master" }
 
 [dev-dependencies]
 tempfile = "3.2.0"
diff --git a/compose-macros/Cargo.toml b/compose-macros/Cargo.toml
index 67c38faf1..2d46bb276 100644
--- a/compose-macros/Cargo.toml
+++ b/compose-macros/Cargo.toml
@@ -8,7 +8,7 @@ codec = { package = 'parity-scale-codec', version = "2.0.0", default-features =
 log = { version = "0.4", default-features = false }
 
 # substrate dependencies
-sp-runtime = { version = "4.1.0-dev", default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "master" }
+sp-runtime = { version = "5.0.0", default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "master" }
 sp-std = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "master" }
 
 # local deps
diff --git a/node-api/Cargo.toml b/node-api/Cargo.toml
index 292609c06..42cb5ef16 100644
--- a/node-api/Cargo.toml
+++ b/node-api/Cargo.toml
@@ -20,8 +20,8 @@ ac-primitives = { path = "../primitives" }
 # substrate deps
 frame-support = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate.git", branch = "master" }
 frame-system = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate.git", branch = "master" }
-sp-core = { version = "4.1.0-dev", git = "https://github.com/paritytech/substrate.git", branch = "master" }
-sp-runtime = { version = "4.1.0-dev", git = "https://github.com/paritytech/substrate.git", branch = "master" }
+sp-core = { version = "5.0.0", git = "https://github.com/paritytech/substrate.git", branch = "master" }
+sp-runtime = { version = "5.0.0", git = "https://github.com/paritytech/substrate.git", branch = "master" }
 
 # new parity repo
 frame-metadata = { version = "14.0.0", git = "https://github.com/paritytech/frame-metadata.git", branch = "main", features = ["v14"] }
diff --git a/primitives/Cargo.toml b/primitives/Cargo.toml
index e88f2f1ac..3bfd131f0 100644
--- a/primitives/Cargo.toml
+++ b/primitives/Cargo.toml
@@ -7,8 +7,8 @@ edition = "2021"
 codec = { package = 'parity-scale-codec', version = "2.0.0", default-features = false,  features = ['derive']}
 hex = { version = "0.4.3", default-features = false, features = ["alloc"] }
 
-sp-core = { version = "4.1.0-dev", default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "master" }
-sp-runtime = { version = "4.1.0-dev", default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "master" }
+sp-core = { version = "5.0.0", default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "master" }
+sp-runtime = { version = "5.0.0", default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "master" }
 sp-std = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "master" }
 
 [features]
diff --git a/test-no-std/Cargo.toml b/test-no-std/Cargo.toml
index ca57fd17e..8a465344f 100644
--- a/test-no-std/Cargo.toml
+++ b/test-no-std/Cargo.toml
@@ -11,4 +11,4 @@ libc = { version = "0.2", default-features = false }
 substrate-api-client = { path = "..", default-features = false }
 
 # substrate dependencies
-sp-io = { version = "4.0.0-dev", default-features = false, features = ["disable_oom", "disable_panic_handler"], git = "https://github.com/paritytech/substrate.git", branch = "master" }
+sp-io = { version = "5.0.0", default-features = false, features = ["disable_oom", "disable_panic_handler"], git = "https://github.com/paritytech/substrate.git", branch = "master" }
diff --git a/tutorials/api-client-tutorial/Cargo.toml b/tutorials/api-client-tutorial/Cargo.toml
index c7c70b7d8..3de0d9bad 100644
--- a/tutorials/api-client-tutorial/Cargo.toml
+++ b/tutorials/api-client-tutorial/Cargo.toml
@@ -8,5 +8,5 @@ edition = "2021"
 substrate-api-client = { path = "../.." }
 codec = { package = "parity-scale-codec", features = ["derive"], version = "2.0.0" }
 
-sp-core = { version = "4.1.0-dev", git = "https://github.com/paritytech/substrate.git", branch = "master" }
+sp-core = { version = "5.0.0", git = "https://github.com/paritytech/substrate.git", branch = "master" }
 sp-keyring = { version = "4.1.0-dev", git = "https://github.com/paritytech/substrate.git", branch = "master" }

From 6bdc375d8e03dcabcee06bb2b70de8ca2d4b0d28 Mon Sep 17 00:00:00 2001
From: haerdib <bhaerdi@devsgx02.scs-ad.scs.ch>
Date: Thu, 3 Feb 2022 11:03:08 +0100
Subject: [PATCH 4/6] update client-keystore

---
 client-keystore/src/lib.rs | 96 ++++++++++++++++++++++++++------------
 1 file changed, 67 insertions(+), 29 deletions(-)

diff --git a/client-keystore/src/lib.rs b/client-keystore/src/lib.rs
index 9209b3f63..6c63a5273 100644
--- a/client-keystore/src/lib.rs
+++ b/client-keystore/src/lib.rs
@@ -22,7 +22,9 @@ use async_trait::async_trait;
 use parking_lot::RwLock;
 use sp_application_crypto::{ecdsa, ed25519, sr25519, AppKey, AppPair, AppPublic, IsWrappedBy};
 use sp_core::{
-    crypto::{CryptoTypePublicPair, ExposeSecret, KeyTypeId, Pair as PairT, Public, SecretString},
+    crypto::{
+        ByteArray, CryptoTypePublicPair, ExposeSecret, KeyTypeId, Pair as PairT, SecretString,
+    },
     sr25519::{Pair as Sr25519Pair, Public as Sr25519Public},
     Encode,
 };
@@ -86,7 +88,7 @@ impl KeystoreExt for LocalKeystore {
     fn public_keys<Public: AppPublic>(&self) -> Result<Vec<Public>> {
         self.0.read().raw_public_keys(Public::ID).map(|v| {
             v.into_iter()
-                .map(|k| Public::from_slice(k.as_slice()))
+                .filter_map(|k| Public::from_slice(k.as_slice()).ok())
                 .collect()
         })
     }
@@ -219,30 +221,36 @@ impl SyncCryptoStore for LocalKeystore {
     ) -> std::result::Result<Option<Vec<u8>>, TraitError> {
         match key.0 {
             ed25519::CRYPTO_ID => {
-                let pub_key = ed25519::Public::from_slice(key.1.as_slice());
+                let pub_key = ed25519::Public::from_slice(key.1.as_slice()).map_err(|()| {
+                    TraitError::Other("Corrupted public key - Invalid size".into())
+                })?;
                 let key_pair = self
                     .0
                     .read()
                     .key_pair_by_type::<ed25519::Pair>(&pub_key, id)
-                    .map_err(TraitError::from)?;
+                    .map_err(|e| TraitError::from(e))?;
                 key_pair.map(|k| k.sign(msg).encode()).map(Ok).transpose()
             }
             sr25519::CRYPTO_ID => {
-                let pub_key = sr25519::Public::from_slice(key.1.as_slice());
+                let pub_key = sr25519::Public::from_slice(key.1.as_slice()).map_err(|()| {
+                    TraitError::Other("Corrupted public key - Invalid size".into())
+                })?;
                 let key_pair = self
                     .0
                     .read()
                     .key_pair_by_type::<sr25519::Pair>(&pub_key, id)
-                    .map_err(TraitError::from)?;
+                    .map_err(|e| TraitError::from(e))?;
                 key_pair.map(|k| k.sign(msg).encode()).map(Ok).transpose()
             }
             ecdsa::CRYPTO_ID => {
-                let pub_key = ecdsa::Public::from_slice(key.1.as_slice());
+                let pub_key = ecdsa::Public::from_slice(key.1.as_slice()).map_err(|()| {
+                    TraitError::Other("Corrupted public key - Invalid size".into())
+                })?;
                 let key_pair = self
                     .0
                     .read()
                     .key_pair_by_type::<ecdsa::Pair>(&pub_key, id)
-                    .map_err(TraitError::from)?;
+                    .map_err(|e| TraitError::from(e))?;
                 key_pair.map(|k| k.sign(msg).encode()).map(Ok).transpose()
             }
             _ => Err(TraitError::KeyNotSupported(id)),
@@ -255,7 +263,7 @@ impl SyncCryptoStore for LocalKeystore {
             .raw_public_keys(key_type)
             .map(|v| {
                 v.into_iter()
-                    .map(|k| sr25519::Public::from_slice(k.as_slice()))
+                    .filter_map(|k| sr25519::Public::from_slice(k.as_slice()).ok())
                     .collect()
             })
             .unwrap_or_default()
@@ -284,7 +292,7 @@ impl SyncCryptoStore for LocalKeystore {
             .raw_public_keys(key_type)
             .map(|v| {
                 v.into_iter()
-                    .map(|k| ed25519::Public::from_slice(k.as_slice()))
+                    .filter_map(|k| ed25519::Public::from_slice(k.as_slice()).ok())
                     .collect()
             })
             .unwrap_or_default()
@@ -313,7 +321,7 @@ impl SyncCryptoStore for LocalKeystore {
             .raw_public_keys(key_type)
             .map(|v| {
                 v.into_iter()
-                    .map(|k| ecdsa::Public::from_slice(k.as_slice()))
+                    .filter_map(|k| ecdsa::Public::from_slice(k.as_slice()).ok())
                     .collect()
             })
             .unwrap_or_default()
@@ -352,7 +360,7 @@ impl SyncCryptoStore for LocalKeystore {
         public_keys.iter().all(|(p, t)| {
             self.0
                 .read()
-                .key_phrase_by_type(p, *t)
+                .key_phrase_by_type(&p, *t)
                 .ok()
                 .flatten()
                 .is_some()
@@ -394,14 +402,12 @@ impl SyncCryptoStore for LocalKeystore {
     }
 }
 
-#[allow(clippy::from_over_into)]
 impl Into<SyncCryptoStorePtr> for LocalKeystore {
     fn into(self) -> SyncCryptoStorePtr {
         Arc::new(self)
     }
 }
 
-#[allow(clippy::from_over_into)]
 impl Into<Arc<dyn CryptoStore>> for LocalKeystore {
     fn into(self) -> Arc<dyn CryptoStore> {
         Arc::new(self)
@@ -428,12 +434,11 @@ impl KeystoreInner {
         let path = path.into();
         fs::create_dir_all(&path)?;
 
-        let instance = Self {
+        Ok(Self {
             path: Some(path),
             additional: HashMap::new(),
             password,
-        };
-        Ok(instance)
+        })
     }
 
     /// Get the password for this store.
@@ -472,10 +477,9 @@ impl KeystoreInner {
     /// Places it into the file system store, if a path is configured.
     fn insert_unknown(&self, key_type: KeyTypeId, suri: &str, public: &[u8]) -> Result<()> {
         if let Some(path) = self.key_file_path(public, key_type) {
-            let mut file = File::create(path).map_err(Error::Io)?;
-            serde_json::to_writer(&file, &suri).map_err(Error::Json)?;
-            file.flush().map_err(Error::Io)?;
+            Self::write_to_file(path, suri)?;
         }
+
         Ok(())
     }
 
@@ -486,15 +490,29 @@ impl KeystoreInner {
     fn generate_by_type<Pair: PairT>(&mut self, key_type: KeyTypeId) -> Result<Pair> {
         let (pair, phrase, _) = Pair::generate_with_phrase(self.password());
         if let Some(path) = self.key_file_path(pair.public().as_slice(), key_type) {
-            let mut file = File::create(path)?;
-            serde_json::to_writer(&file, &phrase)?;
-            file.flush()?;
+            Self::write_to_file(path, &phrase)?;
         } else {
             self.insert_ephemeral_pair(&pair, &phrase, key_type);
         }
+
         Ok(pair)
     }
 
+    /// Write the given `data` to `file`.
+    fn write_to_file(file: PathBuf, data: &str) -> Result<()> {
+        let mut file = File::create(file)?;
+
+        #[cfg(target_family = "unix")]
+        {
+            use std::os::unix::fs::PermissionsExt;
+            file.set_permissions(fs::Permissions::from_mode(0o600))?;
+        }
+
+        serde_json::to_writer(&file, data)?;
+        file.flush()?;
+        Ok(())
+    }
+
     /// Create a new key from seed.
     ///
     /// Does not place it into the file system store.
@@ -546,7 +564,7 @@ impl KeystoreInner {
         if &pair.public() == public {
             Ok(Some(pair))
         } else {
-            Err(Error::InvalidPassword)
+            Err(Error::PublicKeyMismatch)
         }
     }
 
@@ -579,7 +597,7 @@ impl KeystoreInner {
                 if let Some(name) = path.file_name().and_then(|n| n.to_str()) {
                     match hex::decode(name) {
                         Ok(ref hex) if hex.len() > 4 => {
-                            if hex[0..4] != id.0 {
+                            if &hex[0..4] != &id.0 {
                                 continue;
                             }
                             let public = hex[4..].to_vec();
@@ -596,8 +614,8 @@ impl KeystoreInner {
 
     /// Get a key pair for the given public key.
     ///
-    /// Returns `Ok(None)` if the key doesn't exist, `Ok(Some(_))` if the key exists or `Err(_)` when
-    /// something failed.
+    /// Returns `Ok(None)` if the key doesn't exist, `Ok(Some(_))` if the key exists or `Err(_)`
+    /// when something failed.
     pub fn key_pair<Pair: AppPair>(
         &self,
         public: &<Pair as AppKey>::Public,
@@ -626,7 +644,7 @@ mod tests {
         fn public_keys<Public: AppPublic>(&self) -> Result<Vec<Public>> {
             self.raw_public_keys(Public::ID).map(|v| {
                 v.into_iter()
-                    .map(|k| Public::from_slice(k.as_slice()))
+                    .filter_map(|k| Public::from_slice(k.as_slice()).ok())
                     .collect()
             })
         }
@@ -805,7 +823,7 @@ mod tests {
         let file_name = temp_dir.path().join(hex::encode(&SR25519.0[..2]));
         fs::write(file_name, "test").expect("Invalid file is written");
 
-        assert!(SyncCryptoStore::sr25519_public_keys(&store, SR25519).is_empty(),);
+        assert!(SyncCryptoStore::sr25519_public_keys(&store, SR25519).is_empty());
     }
 
     #[test]
@@ -843,4 +861,24 @@ mod tests {
             2
         );
     }
+
+    #[test]
+    #[cfg(target_family = "unix")]
+    fn uses_correct_file_permissions_on_unix() {
+        use std::os::unix::fs::PermissionsExt;
+
+        let temp_dir = TempDir::new().unwrap();
+        let store = LocalKeystore::open(temp_dir.path(), None).unwrap();
+
+        let public = SyncCryptoStore::sr25519_generate_new(&store, TEST_KEY_TYPE, None).unwrap();
+
+        let path = store
+            .0
+            .read()
+            .key_file_path(public.as_ref(), TEST_KEY_TYPE)
+            .unwrap();
+        let permissions = File::open(path).unwrap().metadata().unwrap().permissions();
+
+        assert_eq!(0o100600, permissions.mode());
+    }
 }

From 3491eabd1c69e6188d2e8e5399669f6f36989ceb Mon Sep 17 00:00:00 2001
From: haerdib <bhaerdi@devsgx02.scs-ad.scs.ch>
Date: Thu, 3 Feb 2022 11:19:15 +0100
Subject: [PATCH 5/6] make clippy happy

---
 client-keystore/src/lib.rs | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/client-keystore/src/lib.rs b/client-keystore/src/lib.rs
index 6c63a5273..2465b7e6c 100644
--- a/client-keystore/src/lib.rs
+++ b/client-keystore/src/lib.rs
@@ -228,7 +228,7 @@ impl SyncCryptoStore for LocalKeystore {
                     .0
                     .read()
                     .key_pair_by_type::<ed25519::Pair>(&pub_key, id)
-                    .map_err(|e| TraitError::from(e))?;
+                    .map_err(TraitError::from)?;
                 key_pair.map(|k| k.sign(msg).encode()).map(Ok).transpose()
             }
             sr25519::CRYPTO_ID => {
@@ -239,7 +239,7 @@ impl SyncCryptoStore for LocalKeystore {
                     .0
                     .read()
                     .key_pair_by_type::<sr25519::Pair>(&pub_key, id)
-                    .map_err(|e| TraitError::from(e))?;
+                    .map_err(TraitError::from)?;
                 key_pair.map(|k| k.sign(msg).encode()).map(Ok).transpose()
             }
             ecdsa::CRYPTO_ID => {
@@ -250,7 +250,7 @@ impl SyncCryptoStore for LocalKeystore {
                     .0
                     .read()
                     .key_pair_by_type::<ecdsa::Pair>(&pub_key, id)
-                    .map_err(|e| TraitError::from(e))?;
+                    .map_err(TraitError::from)?;
                 key_pair.map(|k| k.sign(msg).encode()).map(Ok).transpose()
             }
             _ => Err(TraitError::KeyNotSupported(id)),
@@ -360,7 +360,7 @@ impl SyncCryptoStore for LocalKeystore {
         public_keys.iter().all(|(p, t)| {
             self.0
                 .read()
-                .key_phrase_by_type(&p, *t)
+                .key_phrase_by_type(p, *t)
                 .ok()
                 .flatten()
                 .is_some()
@@ -402,12 +402,14 @@ impl SyncCryptoStore for LocalKeystore {
     }
 }
 
+#[allow(clippy::from_over_into)]
 impl Into<SyncCryptoStorePtr> for LocalKeystore {
     fn into(self) -> SyncCryptoStorePtr {
         Arc::new(self)
     }
 }
 
+#[allow(clippy::from_over_into)]
 impl Into<Arc<dyn CryptoStore>> for LocalKeystore {
     fn into(self) -> Arc<dyn CryptoStore> {
         Arc::new(self)
@@ -597,7 +599,7 @@ impl KeystoreInner {
                 if let Some(name) = path.file_name().and_then(|n| n.to_str()) {
                     match hex::decode(name) {
                         Ok(ref hex) if hex.len() > 4 => {
-                            if &hex[0..4] != &id.0 {
+                            if hex[0..4] != id.0 {
                                 continue;
                             }
                             let public = hex[4..].to_vec();

From dcd02f3da4d04096f955792c7c3281e1b9fa0358 Mon Sep 17 00:00:00 2001
From: haerdib <bhaerdi@devsgx02.scs-ad.scs.ch>
Date: Thu, 3 Feb 2022 11:34:14 +0100
Subject: [PATCH 6/6] fix unit tests

---
 primitives/src/extrinsics.rs | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/primitives/src/extrinsics.rs b/primitives/src/extrinsics.rs
index 2cc2ae6b6..63a6c4f08 100644
--- a/primitives/src/extrinsics.rs
+++ b/primitives/src/extrinsics.rs
@@ -206,14 +206,22 @@ fn encode_with_vec_prefix<T: Encode, F: Fn(&mut Vec<u8>)>(encoder: F) -> Vec<u8>
 #[cfg(test)]
 mod tests {
     use super::*;
+    use sp_core::Pair;
+    use sp_runtime::testing::sr25519;
     use sp_runtime::MultiSignature;
 
     #[test]
     fn encode_decode_roundtrip_works() {
+        let msg = &b"test-message"[..];
+        let (pair, _) = sr25519::Pair::generate();
+        let signature = pair.sign(&msg);
+        let multi_sig = MultiSignature::from(signature);
+        let account: AccountId = pair.public().into();
+
         let xt = UncheckedExtrinsicV4::new_signed(
             vec![1, 1, 1],
-            GenericAddress::default(),
-            MultiSignature::default(),
+            account.into(),
+            multi_sig,
             GenericExtra::default(),
         );