diff --git a/substrate/Cargo.lock b/substrate/Cargo.lock
index e7ddb66e29188df44f5ee487a9cbbdd5442442d1..612cbdc8b0def14cf665925a8a0b8395439443f8 100644
--- a/substrate/Cargo.lock
+++ b/substrate/Cargo.lock
@@ -9392,7 +9392,7 @@ dependencies = [
[[package]]
name = "sp-core"
-version = "4.0.0"
+version = "4.1.0-dev"
dependencies = [
"base58",
"bitflags",
diff --git a/substrate/bin/node-template/node/Cargo.toml b/substrate/bin/node-template/node/Cargo.toml
index 2680b91b3a25479b5cd3b0d1306bb0b8a48cc7e3..731e6fcda4083417592f21f0a36173222890de0f 100644
--- a/substrate/bin/node-template/node/Cargo.toml
+++ b/substrate/bin/node-template/node/Cargo.toml
@@ -20,7 +20,7 @@ name = "node-template"
structopt = "0.3.25"
sc-cli = { version = "0.10.0-dev", path = "../../../client/cli", features = ["wasmtime"] }
-sp-core = { version = "4.0.0", path = "../../../primitives/core" }
+sp-core = { version = "4.1.0-dev", path = "../../../primitives/core" }
sc-executor = { version = "0.10.0-dev", path = "../../../client/executor", features = ["wasmtime"] }
sc-service = { version = "0.10.0-dev", path = "../../../client/service", features = ["wasmtime"] }
sc-telemetry = { version = "4.0.0-dev", path = "../../../client/telemetry" }
diff --git a/substrate/bin/node-template/pallets/template/Cargo.toml b/substrate/bin/node-template/pallets/template/Cargo.toml
index 646038ca6ced87770ed8653c84cbe6b90c18ac98..d473119702f879ccb176aece40c1d3fc5db11858 100644
--- a/substrate/bin/node-template/pallets/template/Cargo.toml
+++ b/substrate/bin/node-template/pallets/template/Cargo.toml
@@ -22,7 +22,7 @@ frame-system = { default-features = false, version = "4.0.0-dev", path = "../../
frame-benchmarking = { default-features = false, version = "4.0.0-dev", path = "../../../../frame/benchmarking", optional = true }
[dev-dependencies]
-sp-core = { default-features = false, version = "4.0.0", path = "../../../../primitives/core" }
+sp-core = { default-features = false, version = "4.1.0-dev", path = "../../../../primitives/core" }
sp-io = { default-features = false, version = "4.0.0-dev", path = "../../../../primitives/io" }
sp-runtime = { default-features = false, version = "4.0.0-dev", path = "../../../../primitives/runtime" }
diff --git a/substrate/bin/node-template/runtime/Cargo.toml b/substrate/bin/node-template/runtime/Cargo.toml
index a25c45c692de89f8bc461f1143938b0dbaee63b5..4818535e196c43a78fbf9a364afb5759b8095f75 100644
--- a/substrate/bin/node-template/runtime/Cargo.toml
+++ b/substrate/bin/node-template/runtime/Cargo.toml
@@ -29,7 +29,7 @@ frame-executive = { version = "4.0.0-dev", default-features = false, path = "../
sp-api = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/api" }
sp-block-builder = { path = "../../../primitives/block-builder", default-features = false, version = "4.0.0-dev"}
sp-consensus-aura = { version = "0.10.0-dev", default-features = false, path = "../../../primitives/consensus/aura" }
-sp-core = { version = "4.0.0", default-features = false, path = "../../../primitives/core" }
+sp-core = { version = "4.1.0-dev", default-features = false, path = "../../../primitives/core" }
sp-inherents = { path = "../../../primitives/inherents", default-features = false, version = "4.0.0-dev"}
sp-offchain = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/offchain" }
sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/runtime" }
diff --git a/substrate/bin/node/bench/Cargo.toml b/substrate/bin/node/bench/Cargo.toml
index 27c26d21dfe0657ac587df837dd1146a9a065310..65d12378c4cf52e8ed1eb4240f63d58a454744ed 100644
--- a/substrate/bin/node/bench/Cargo.toml
+++ b/substrate/bin/node/bench/Cargo.toml
@@ -23,7 +23,7 @@ derive_more = "0.99.16"
kvdb = "0.10.0"
kvdb-rocksdb = "0.14.0"
sp-trie = { version = "4.0.0-dev", path = "../../../primitives/trie" }
-sp-core = { version = "4.0.0", path = "../../../primitives/core" }
+sp-core = { version = "4.1.0-dev", path = "../../../primitives/core" }
sp-consensus = { version = "0.10.0-dev", path = "../../../primitives/consensus/common" }
sc-basic-authorship = { version = "0.10.0-dev", path = "../../../client/basic-authorship" }
sp-inherents = { version = "4.0.0-dev", path = "../../../primitives/inherents" }
diff --git a/substrate/bin/node/cli/Cargo.toml b/substrate/bin/node/cli/Cargo.toml
index cb632d936a2dcd3c382a6931d31538c62fb238db..6da2fddd331ea868e9a498037d8bfdcc4398978e 100644
--- a/substrate/bin/node/cli/Cargo.toml
+++ b/substrate/bin/node/cli/Cargo.toml
@@ -47,7 +47,7 @@ sp-authority-discovery = { version = "4.0.0-dev", path = "../../../primitives/au
sp-consensus-babe = { version = "0.10.0-dev", path = "../../../primitives/consensus/babe" }
grandpa-primitives = { version = "4.0.0-dev", package = "sp-finality-grandpa", path = "../../../primitives/finality-grandpa" }
sp-api = { version = "4.0.0-dev", path = "../../../primitives/api" }
-sp-core = { version = "4.0.0", path = "../../../primitives/core" }
+sp-core = { version = "4.1.0-dev", path = "../../../primitives/core" }
sp-runtime = { version = "4.0.0-dev", path = "../../../primitives/runtime" }
sp-timestamp = { version = "4.0.0-dev", path = "../../../primitives/timestamp" }
sp-authorship = { version = "4.0.0-dev", path = "../../../primitives/authorship" }
diff --git a/substrate/bin/node/executor/Cargo.toml b/substrate/bin/node/executor/Cargo.toml
index 13ed4d313994c0826bdc84e9170a7e85232cdbd2..2144b92986167cd744e820cd78d3991efc5c4b85 100644
--- a/substrate/bin/node/executor/Cargo.toml
+++ b/substrate/bin/node/executor/Cargo.toml
@@ -17,7 +17,7 @@ scale-info = { version = "1.0", features = ["derive"] }
node-primitives = { version = "2.0.0", path = "../primitives" }
node-runtime = { version = "3.0.0-dev", path = "../runtime" }
sc-executor = { version = "0.10.0-dev", path = "../../../client/executor" }
-sp-core = { version = "4.0.0", path = "../../../primitives/core" }
+sp-core = { version = "4.1.0-dev", path = "../../../primitives/core" }
sp-keystore = { version = "0.10.0-dev", path = "../../../primitives/keystore" }
sp-state-machine = { version = "0.10.0-dev", path = "../../../primitives/state-machine" }
sp-tracing = { version = "4.0.0", path = "../../../primitives/tracing" }
diff --git a/substrate/bin/node/inspect/Cargo.toml b/substrate/bin/node/inspect/Cargo.toml
index 18f24651ed35d4ad336e6bfc0bc28c0ff3b55958..b0db8f6304761bb2f83474e4365b0a3d5de73074 100644
--- a/substrate/bin/node/inspect/Cargo.toml
+++ b/substrate/bin/node/inspect/Cargo.toml
@@ -18,6 +18,6 @@ sc-client-api = { version = "4.0.0-dev", path = "../../../client/api" }
sc-executor = { version = "0.10.0-dev", path = "../../../client/executor" }
sc-service = { version = "0.10.0-dev", default-features = false, path = "../../../client/service" }
sp-blockchain = { version = "4.0.0-dev", path = "../../../primitives/blockchain" }
-sp-core = { version = "4.0.0", path = "../../../primitives/core" }
+sp-core = { version = "4.1.0-dev", path = "../../../primitives/core" }
sp-runtime = { version = "4.0.0-dev", path = "../../../primitives/runtime" }
structopt = "0.3.8"
diff --git a/substrate/bin/node/primitives/Cargo.toml b/substrate/bin/node/primitives/Cargo.toml
index 03d587acecd2da37d20bbc8665c115333f9f732c..d2c315bd9b6e13c4082d314ef4c634795faac3d6 100644
--- a/substrate/bin/node/primitives/Cargo.toml
+++ b/substrate/bin/node/primitives/Cargo.toml
@@ -17,7 +17,7 @@ codec = { package = "parity-scale-codec", version = "2.0.0", default-features =
scale-info = { version = "1.0", default-features = false, features = ["derive"] }
frame-system = { version = "4.0.0-dev", default-features = false, path = "../../../frame/system" }
sp-application-crypto = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/application-crypto" }
-sp-core = { version = "4.0.0", default-features = false, path = "../../../primitives/core" }
+sp-core = { version = "4.1.0-dev", default-features = false, path = "../../../primitives/core" }
sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/runtime" }
[features]
diff --git a/substrate/bin/node/runtime/Cargo.toml b/substrate/bin/node/runtime/Cargo.toml
index b36fd622dfa3a7c35e9047127c125ec4d6350af0..32dcc003e879a8dba243aa60198c5d8a6f76d1c1 100644
--- a/substrate/bin/node/runtime/Cargo.toml
+++ b/substrate/bin/node/runtime/Cargo.toml
@@ -30,7 +30,7 @@ sp-block-builder = { path = "../../../primitives/block-builder", default-feature
sp-inherents = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/inherents" }
node-primitives = { version = "2.0.0", default-features = false, path = "../primitives" }
sp-offchain = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/offchain" }
-sp-core = { version = "4.0.0", default-features = false, path = "../../../primitives/core" }
+sp-core = { version = "4.1.0-dev", default-features = false, path = "../../../primitives/core" }
sp-std = { version = "4.0.0", default-features = false, path = "../../../primitives/std" }
sp-api = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/api" }
sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/runtime" }
diff --git a/substrate/bin/node/testing/Cargo.toml b/substrate/bin/node/testing/Cargo.toml
index 0fb0d40a7c2d29b16bc6677ebe7fdf39d06cd584..7f3a9119624882cc8f693ae98946b62d0239c690 100644
--- a/substrate/bin/node/testing/Cargo.toml
+++ b/substrate/bin/node/testing/Cargo.toml
@@ -28,7 +28,7 @@ sp-keyring = { version = "4.0.0-dev", path = "../../../primitives/keyring" }
node-executor = { version = "3.0.0-dev", path = "../executor" }
node-primitives = { version = "2.0.0", path = "../primitives" }
node-runtime = { version = "3.0.0-dev", path = "../runtime" }
-sp-core = { version = "4.0.0", path = "../../../primitives/core" }
+sp-core = { version = "4.1.0-dev", path = "../../../primitives/core" }
sp-io = { version = "4.0.0-dev", path = "../../../primitives/io" }
sp-runtime = { version = "4.0.0-dev", path = "../../../primitives/runtime" }
sc-executor = { version = "0.10.0-dev", path = "../../../client/executor", features = [
diff --git a/substrate/bin/utils/chain-spec-builder/Cargo.toml b/substrate/bin/utils/chain-spec-builder/Cargo.toml
index 79eb5becfeb84824d10130172a0830865add2a77..c5872ca29700d82535feab20769ebb7f537c7a1f 100644
--- a/substrate/bin/utils/chain-spec-builder/Cargo.toml
+++ b/substrate/bin/utils/chain-spec-builder/Cargo.toml
@@ -18,7 +18,7 @@ ansi_term = "0.12.1"
sc-keystore = { version = "4.0.0-dev", path = "../../../client/keystore" }
sc-chain-spec = { version = "4.0.0-dev", path = "../../../client/chain-spec" }
node-cli = { version = "3.0.0-dev", path = "../../node/cli" }
-sp-core = { version = "4.0.0", path = "../../../primitives/core" }
+sp-core = { version = "4.1.0-dev", path = "../../../primitives/core" }
sp-keystore = { version = "0.10.0-dev", path = "../../../primitives/keystore" }
rand = "0.7.2"
structopt = "0.3.25"
diff --git a/substrate/client/allocator/Cargo.toml b/substrate/client/allocator/Cargo.toml
index 48191273ff36ae49e0d0dc2bad6d29fa0387d304..ea0ce3c0bbea5b765b3b363baf4054b5fbacc779 100644
--- a/substrate/client/allocator/Cargo.toml
+++ b/substrate/client/allocator/Cargo.toml
@@ -14,7 +14,7 @@ readme = "README.md"
targets = ["x86_64-unknown-linux-gnu"]
[dependencies]
-sp-core = { version = "4.0.0", path = "../../primitives/core" }
+sp-core = { version = "4.1.0-dev", path = "../../primitives/core" }
sp-wasm-interface = { version = "4.0.0", path = "../../primitives/wasm-interface" }
log = "0.4.11"
thiserror = "1.0.30"
diff --git a/substrate/client/api/Cargo.toml b/substrate/client/api/Cargo.toml
index 5e0fe88b3ca7c2a66802509ef35585b2c2386abc..13ec13538e65e94d6f3b1c52e1228b60a02a3c8c 100644
--- a/substrate/client/api/Cargo.toml
+++ b/substrate/client/api/Cargo.toml
@@ -27,7 +27,7 @@ sp-blockchain = { version = "4.0.0-dev", path = "../../primitives/blockchain" }
log = "0.4.8"
parking_lot = "0.11.1"
sp-database = { version = "4.0.0-dev", path = "../../primitives/database" }
-sp-core = { version = "4.0.0", default-features = false, path = "../../primitives/core" }
+sp-core = { version = "4.1.0-dev", default-features = false, path = "../../primitives/core" }
sp-keystore = { version = "0.10.0-dev", default-features = false, path = "../../primitives/keystore" }
sp-api = { version = "4.0.0-dev", path = "../../primitives/api" }
sc-utils = { version = "4.0.0-dev", path = "../utils" }
diff --git a/substrate/client/authority-discovery/Cargo.toml b/substrate/client/authority-discovery/Cargo.toml
index 8dcf8ab4c81408d579173827d20f8bd59664ac5c..207f22753e452a092ec89eb69d4a2a19d773c2db 100644
--- a/substrate/client/authority-discovery/Cargo.toml
+++ b/substrate/client/authority-discovery/Cargo.toml
@@ -32,7 +32,7 @@ sc-client-api = { version = "4.0.0-dev", path = "../api" }
sc-network = { version = "0.10.0-dev", path = "../network" }
sp-authority-discovery = { version = "4.0.0-dev", path = "../../primitives/authority-discovery" }
sp-blockchain = { version = "4.0.0-dev", path = "../../primitives/blockchain" }
-sp-core = { version = "4.0.0", path = "../../primitives/core" }
+sp-core = { version = "4.1.0-dev", path = "../../primitives/core" }
sp-keystore = { version = "0.10.0-dev", path = "../../primitives/keystore" }
sp-runtime = { version = "4.0.0-dev", path = "../../primitives/runtime" }
sp-api = { version = "4.0.0-dev", path = "../../primitives/api" }
diff --git a/substrate/client/basic-authorship/Cargo.toml b/substrate/client/basic-authorship/Cargo.toml
index 049876f4787901e94a701b34f700251a43bac6a0..c1a8e9210a4169c3043711fbf559b134d7e1fc44 100644
--- a/substrate/client/basic-authorship/Cargo.toml
+++ b/substrate/client/basic-authorship/Cargo.toml
@@ -20,7 +20,7 @@ log = "0.4.8"
prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../utils/prometheus", version = "0.10.0-dev"}
sp-api = { version = "4.0.0-dev", path = "../../primitives/api" }
sp-runtime = { version = "4.0.0-dev", path = "../../primitives/runtime" }
-sp-core = { version = "4.0.0", path = "../../primitives/core" }
+sp-core = { version = "4.1.0-dev", path = "../../primitives/core" }
sp-blockchain = { version = "4.0.0-dev", path = "../../primitives/blockchain" }
sc-client-api = { version = "4.0.0-dev", path = "../api" }
sp-consensus = { version = "0.10.0-dev", path = "../../primitives/consensus/common" }
diff --git a/substrate/client/beefy/Cargo.toml b/substrate/client/beefy/Cargo.toml
index b0f05888712d1960b1f496f70125f86bab9ad398..cb561c0dc77a6550bb6ea9ea7bc52dadfe00034e 100644
--- a/substrate/client/beefy/Cargo.toml
+++ b/substrate/client/beefy/Cargo.toml
@@ -22,7 +22,7 @@ sp-api = { version = "4.0.0-dev", path = "../../primitives/api" }
sp-application-crypto = { version = "4.0.0-dev", path = "../../primitives/application-crypto" }
sp-arithmetic = { version = "4.0.0-dev", path = "../../primitives/arithmetic" }
sp-blockchain = { version = "4.0.0-dev", path = "../../primitives/blockchain" }
-sp-core = { version = "4.0.0", path = "../../primitives/core" }
+sp-core = { version = "4.1.0-dev", path = "../../primitives/core" }
sp-keystore = { version = "0.10.0-dev", path = "../../primitives/keystore" }
sp-runtime = { version = "4.0.0-dev", path = "../../primitives/runtime" }
diff --git a/substrate/client/beefy/rpc/Cargo.toml b/substrate/client/beefy/rpc/Cargo.toml
index 4d7bd6cef6c88c6ad659c2aaac7638be4070861e..83f6b392f55c79330a04cce08c48c91fcbf86ed7 100644
--- a/substrate/client/beefy/rpc/Cargo.toml
+++ b/substrate/client/beefy/rpc/Cargo.toml
@@ -21,7 +21,7 @@ codec = { version = "2.2.0", package = "parity-scale-codec", features = ["derive
sc-rpc = { version = "4.0.0-dev", path = "../../rpc" }
-sp-core = { version = "4.0.0", path = "../../../primitives/core" }
+sp-core = { version = "4.1.0-dev", path = "../../../primitives/core" }
sp-runtime = { version = "4.0.0-dev", path = "../../../primitives/runtime" }
beefy-gadget = { version = "4.0.0-dev", path = "../." }
diff --git a/substrate/client/block-builder/Cargo.toml b/substrate/client/block-builder/Cargo.toml
index 789e3fffcfa17461153523602b623006a67bc9b0..69154699e3f1dce62354b3842861892c598979db 100644
--- a/substrate/client/block-builder/Cargo.toml
+++ b/substrate/client/block-builder/Cargo.toml
@@ -18,7 +18,7 @@ sp-state-machine = { version = "0.10.0-dev", path = "../../primitives/state-mach
sp-runtime = { version = "4.0.0-dev", path = "../../primitives/runtime" }
sp-api = { version = "4.0.0-dev", path = "../../primitives/api" }
sp-blockchain = { version = "4.0.0-dev", path = "../../primitives/blockchain" }
-sp-core = { version = "4.0.0", path = "../../primitives/core" }
+sp-core = { version = "4.1.0-dev", path = "../../primitives/core" }
sp-block-builder = { version = "4.0.0-dev", path = "../../primitives/block-builder" }
sp-inherents = { version = "4.0.0-dev", path = "../../primitives/inherents" }
sc-client-api = { version = "4.0.0-dev", path = "../api" }
diff --git a/substrate/client/chain-spec/Cargo.toml b/substrate/client/chain-spec/Cargo.toml
index 1b4e3ed72d5666b26b5227975ba3b432d0061bf1..fdc72307af2a1df7dc15fe55e279581d8a1384ab 100644
--- a/substrate/client/chain-spec/Cargo.toml
+++ b/substrate/client/chain-spec/Cargo.toml
@@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
sc-chain-spec-derive = { version = "4.0.0-dev", path = "./derive" }
impl-trait-for-tuples = "0.2.1"
sc-network = { version = "0.10.0-dev", path = "../network" }
-sp-core = { version = "4.0.0", path = "../../primitives/core" }
+sp-core = { version = "4.1.0-dev", path = "../../primitives/core" }
serde = { version = "1.0.126", features = ["derive"] }
serde_json = "1.0.71"
sp-runtime = { version = "4.0.0-dev", path = "../../primitives/runtime" }
diff --git a/substrate/client/cli/Cargo.toml b/substrate/client/cli/Cargo.toml
index a9bc4e9f87a5db96d94dd355f350bcb614898b93..566ce21cfe9030c6c126fcaaaddc595870ca3d7d 100644
--- a/substrate/client/cli/Cargo.toml
+++ b/substrate/client/cli/Cargo.toml
@@ -32,7 +32,7 @@ sc-network = { version = "0.10.0-dev", path = "../network" }
sp-runtime = { version = "4.0.0-dev", path = "../../primitives/runtime" }
sc-utils = { version = "4.0.0-dev", path = "../utils" }
sp-version = { version = "4.0.0-dev", path = "../../primitives/version" }
-sp-core = { version = "4.0.0", path = "../../primitives/core" }
+sp-core = { version = "4.1.0-dev", path = "../../primitives/core" }
sp-keystore = { version = "0.10.0-dev", path = "../../primitives/keystore" }
sc-service = { version = "0.10.0-dev", default-features = false, path = "../service" }
sc-telemetry = { version = "4.0.0-dev", path = "../telemetry" }
diff --git a/substrate/client/cli/src/commands/inspect_key.rs b/substrate/client/cli/src/commands/inspect_key.rs
index 277c9015f4daf0ddd0479b0216bdd6da0fd07207..48b045f4cbaf30f5fcdbbfd3115656b623a846e9 100644
--- a/substrate/client/cli/src/commands/inspect_key.rs
+++ b/substrate/client/cli/src/commands/inspect_key.rs
@@ -21,7 +21,10 @@ use crate::{
utils::{self, print_from_public, print_from_uri},
with_crypto_scheme, CryptoSchemeFlag, Error, KeystoreParams, NetworkSchemeFlag, OutputTypeFlag,
};
+use sp_core::crypto::{ExposeSecret, SecretString, SecretUri, Ss58Codec};
+use std::str::FromStr;
use structopt::StructOpt;
+
/// The `inspect` command
#[derive(Debug, StructOpt)]
#[structopt(
@@ -59,6 +62,18 @@ pub struct InspectKeyCmd {
#[allow(missing_docs)]
#[structopt(flatten)]
pub crypto_scheme: CryptoSchemeFlag,
+
+ /// Expect that `--uri` has the given public key/account-id.
+ ///
+ /// If `--uri` has any derivations, the public key is checked against the base `uri`, i.e. the
+ /// `uri` without any derivation applied. However, if `uri` has a password or there is one
+ /// given by `--password`, it will be used to decrypt `uri` before comparing the public
+ /// key/account-id.
+ ///
+ /// If there is no derivation in `--uri`, the public key will be checked against the public key
+ /// of `--uri` directly.
+ #[structopt(long, conflicts_with = "public")]
+ pub expect_public: Option<String>,
}
impl InspectKeyCmd {
@@ -77,6 +92,13 @@ impl InspectKeyCmd {
)
)?;
} else {
+ if let Some(ref expect_public) = self.expect_public {
+ with_crypto_scheme!(
+ self.crypto_scheme.scheme,
+ expect_public_from_phrase(&&expect_public, &uri, password.as_ref(),)
+ )?;
+ }
+
with_crypto_scheme!(
self.crypto_scheme.scheme,
print_from_uri(
@@ -92,9 +114,50 @@ impl InspectKeyCmd {
}
}
+/// Checks that `expect_public` is the public key of `suri`.
+///
+/// If `suri` has any derivations, `expect_public` is checked against the public key of the "bare"
+/// `suri`, i.e. without any derivations.
+///
+/// Returns an error if the public key does not match.
+fn expect_public_from_phrase<Pair: sp_core::Pair>(
+ expect_public: &str,
+ suri: &str,
+ password: Option<&SecretString>,
+) -> Result<(), Error> {
+ let secret_uri = SecretUri::from_str(suri).map_err(|e| format!("{:?}", e))?;
+ let expected_public = if let Some(public) = expect_public.strip_prefix("0x") {
+ let hex_public = hex::decode(&public)
+ .map_err(|_| format!("Invalid expected public key hex: `{}`", expect_public))?;
+ Pair::Public::try_from(&hex_public)
+ .map_err(|_| format!("Invalid expected public key: `{}`", expect_public))?
+ } else {
+ Pair::Public::from_string_with_version(expect_public)
+ .map_err(|_| format!("Invalid expected account id: `{}`", expect_public))?
+ .0
+ };
+
+ let pair = Pair::from_string_with_seed(
+ secret_uri.phrase.expose_secret().as_str(),
+ password
+ .or_else(|| secret_uri.password.as_ref())
+ .map(|p| p.expose_secret().as_str()),
+ )
+ .map_err(|_| format!("Invalid secret uri: {}", suri))?
+ .0;
+
+ if pair.public() == expected_public {
+ Ok(())
+ } else {
+ Err(format!("Expected public ({}) key does not match.", expect_public).into())
+ }
+}
+
#[cfg(test)]
mod tests {
use super::*;
+ use sp_core::crypto::{Pair, Public};
+ use sp_runtime::traits::IdentifyAccount;
use structopt::StructOpt;
#[test]
@@ -117,4 +180,90 @@ mod tests {
let inspect = InspectKeyCmd::from_iter(&["inspect-key", "--public", public]);
assert!(inspect.run().is_ok());
}
+
+ #[test]
+ fn inspect_with_expected_public_key() {
+ let check_cmd = |seed, expected_public, success| {
+ let inspect = InspectKeyCmd::from_iter(&[
+ "inspect-key",
+ "--expect-public",
+ expected_public,
+ seed,
+ ]);
+ let res = inspect.run();
+
+ if success {
+ assert!(res.is_ok());
+ } else {
+ assert!(res.unwrap_err().to_string().contains(&format!(
+ "Expected public ({}) key does not match.",
+ expected_public
+ )));
+ }
+ };
+
+ let seed =
+ "remember fiber forum demise paper uniform squirrel feel access exclude casual effort";
+ let invalid_public = "0x12e76e0ae8ce41b6516cce52b3f23a08dcb4cfeed53c6ee8f5eb9f7367341069";
+ let valid_public = sp_core::sr25519::Pair::from_string_with_seed(seed, None)
+ .expect("Valid")
+ .0
+ .public();
+ let valid_public_hex = format!("0x{}", hex::encode(valid_public.as_slice()));
+ let valid_accountid = format!("{}", valid_public.into_account());
+
+ // It should fail with the invalid public key
+ check_cmd(seed, invalid_public, false);
+
+ // It should work with the valid public key & account id
+ check_cmd(seed, &valid_public_hex, true);
+ check_cmd(seed, &valid_accountid, true);
+
+ let password = "test12245";
+ let seed_with_password = format!("{}///{}", seed, password);
+ let valid_public_with_password =
+ sp_core::sr25519::Pair::from_string_with_seed(&seed_with_password, Some(password))
+ .expect("Valid")
+ .0
+ .public();
+ let valid_public_hex_with_password =
+ format!("0x{}", hex::encode(&valid_public_with_password.as_slice()));
+ let valid_accountid_with_password =
+ format!("{}", &valid_public_with_password.into_account());
+
+ // Only the public key that corresponds to the seed with password should be accepted.
+ check_cmd(&seed_with_password, &valid_public_hex, false);
+ check_cmd(&seed_with_password, &valid_accountid, false);
+
+ check_cmd(&seed_with_password, &valid_public_hex_with_password, true);
+ check_cmd(&seed_with_password, &valid_accountid_with_password, true);
+
+ let seed_with_password_and_derivation = format!("{}//test//account///{}", seed, password);
+
+ let valid_public_with_password_and_derivation =
+ sp_core::sr25519::Pair::from_string_with_seed(
+ &seed_with_password_and_derivation,
+ Some(password),
+ )
+ .expect("Valid")
+ .0
+ .public();
+ let valid_public_hex_with_password_and_derivation =
+ format!("0x{}", hex::encode(&valid_public_with_password_and_derivation.as_slice()));
+
+ // They should still be valid, because we check the base secret key.
+ check_cmd(&seed_with_password_and_derivation, &valid_public_hex_with_password, true);
+ check_cmd(&seed_with_password_and_derivation, &valid_accountid_with_password, true);
+
+ // And these should be invalid.
+ check_cmd(&seed_with_password_and_derivation, &valid_public_hex, false);
+ check_cmd(&seed_with_password_and_derivation, &valid_accountid, false);
+
+ // The public of the derived account should fail.
+ check_cmd(
+ &seed_with_password_and_derivation,
+ &valid_public_hex_with_password_and_derivation,
+ false,
+ );
+ }
}
diff --git a/substrate/client/consensus/aura/Cargo.toml b/substrate/client/consensus/aura/Cargo.toml
index 967f59999c7ec1c474e5d28cc9d25090b3465a9b..f12578b8a6780e5a59f3a53d643e9f9d06eb9144 100644
--- a/substrate/client/consensus/aura/Cargo.toml
+++ b/substrate/client/consensus/aura/Cargo.toml
@@ -26,7 +26,7 @@ derive_more = "0.99.16"
futures = "0.3.9"
sp-inherents = { version = "4.0.0-dev", path = "../../../primitives/inherents" }
log = "0.4.8"
-sp-core = { version = "4.0.0", path = "../../../primitives/core" }
+sp-core = { version = "4.1.0-dev", path = "../../../primitives/core" }
sp-blockchain = { version = "4.0.0-dev", path = "../../../primitives/blockchain" }
sc-consensus-slots = { version = "0.10.0-dev", path = "../slots" }
sp-api = { version = "4.0.0-dev", path = "../../../primitives/api" }
diff --git a/substrate/client/consensus/babe/Cargo.toml b/substrate/client/consensus/babe/Cargo.toml
index 5f1a8a088916861366139dd4a0f50b96d1482721..7daab5557b57ca729a1e6961361f659bc7b8a262 100644
--- a/substrate/client/consensus/babe/Cargo.toml
+++ b/substrate/client/consensus/babe/Cargo.toml
@@ -19,7 +19,7 @@ codec = { package = "parity-scale-codec", version = "2.0.0", features = [
] }
sp-consensus-babe = { version = "0.10.0-dev", path = "../../../primitives/consensus/babe" }
sc-consensus = { version = "0.10.0-dev", path = "../../../client/consensus/common" }
-sp-core = { version = "4.0.0", path = "../../../primitives/core" }
+sp-core = { version = "4.1.0-dev", path = "../../../primitives/core" }
sp-application-crypto = { version = "4.0.0-dev", path = "../../../primitives/application-crypto" }
sp-keystore = { version = "0.10.0-dev", path = "../../../primitives/keystore" }
num-bigint = "0.2.3"
diff --git a/substrate/client/consensus/babe/rpc/Cargo.toml b/substrate/client/consensus/babe/rpc/Cargo.toml
index bba579ee111b0867680af10bfb9711c5a6b99777..3bd8bf6e76580a348d44653dc01caa8c60fbe2f4 100644
--- a/substrate/client/consensus/babe/rpc/Cargo.toml
+++ b/substrate/client/consensus/babe/rpc/Cargo.toml
@@ -27,7 +27,7 @@ futures = "0.3.16"
derive_more = "0.99.16"
sp-api = { version = "4.0.0-dev", path = "../../../../primitives/api" }
sp-consensus = { version = "0.10.0-dev", path = "../../../../primitives/consensus/common" }
-sp-core = { version = "4.0.0", path = "../../../../primitives/core" }
+sp-core = { version = "4.1.0-dev", path = "../../../../primitives/core" }
sp-application-crypto = { version = "4.0.0-dev", path = "../../../../primitives/application-crypto" }
sp-keystore = { version = "0.10.0-dev", path = "../../../../primitives/keystore" }
diff --git a/substrate/client/consensus/common/Cargo.toml b/substrate/client/consensus/common/Cargo.toml
index 13b720354018212702b812190ff84e9341fd5908..f20e12cc4aae8e3a7abe9235b1625a50ca8fcfa2 100644
--- a/substrate/client/consensus/common/Cargo.toml
+++ b/substrate/client/consensus/common/Cargo.toml
@@ -20,7 +20,7 @@ futures = { version = "0.3.1", features = ["thread-pool"] }
futures-timer = "3.0.1"
sc-client-api = { version = "4.0.0-dev", path = "../../api" }
sp-blockchain = { version = "4.0.0-dev", path = "../../../primitives/blockchain" }
-sp-core = { path = "../../../primitives/core", version = "4.0.0" }
+sp-core = { path = "../../../primitives/core", version = "4.1.0-dev" }
sp-consensus = { path = "../../../primitives/consensus/common", version = "0.10.0-dev" }
sp-state-machine = { version = "0.10.0-dev", path = "../../../primitives/state-machine" }
sp-runtime = { version = "4.0.0-dev", path = "../../../primitives/runtime" }
diff --git a/substrate/client/consensus/manual-seal/Cargo.toml b/substrate/client/consensus/manual-seal/Cargo.toml
index 24314fefd156ed0711726cf285887027ccfe04da..59d35819c7815ddd2832f75926a37a8cc3c14638 100644
--- a/substrate/client/consensus/manual-seal/Cargo.toml
+++ b/substrate/client/consensus/manual-seal/Cargo.toml
@@ -36,7 +36,7 @@ sp-consensus = { path = "../../../primitives/consensus/common", version = "0.10.
sp-consensus-slots = { path = "../../../primitives/consensus/slots", version = "0.10.0-dev" }
sp-inherents = { path = "../../../primitives/inherents", version = "4.0.0-dev" }
sp-runtime = { path = "../../../primitives/runtime", version = "4.0.0-dev" }
-sp-core = { path = "../../../primitives/core", version = "4.0.0" }
+sp-core = { path = "../../../primitives/core", version = "4.1.0-dev" }
sp-keystore = { path = "../../../primitives/keystore", version = "0.10.0-dev" }
sp-api = { path = "../../../primitives/api", version = "4.0.0-dev" }
sc-transaction-pool-api = { path = "../../../client/transaction-pool/api", version = "4.0.0-dev" }
diff --git a/substrate/client/consensus/pow/Cargo.toml b/substrate/client/consensus/pow/Cargo.toml
index 2b0926ce887e903b9bbec30fcec497365abaf945..d4b156f0b8faa0d36927e6ac88e9212dbc61a88c 100644
--- a/substrate/client/consensus/pow/Cargo.toml
+++ b/substrate/client/consensus/pow/Cargo.toml
@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
[dependencies]
codec = { package = "parity-scale-codec", version = "2.0.0", features = ["derive"] }
-sp-core = { version = "4.0.0", path = "../../../primitives/core" }
+sp-core = { version = "4.1.0-dev", path = "../../../primitives/core" }
sp-blockchain = { version = "4.0.0-dev", path = "../../../primitives/blockchain" }
sp-runtime = { version = "4.0.0-dev", path = "../../../primitives/runtime" }
sp-api = { version = "4.0.0-dev", path = "../../../primitives/api" }
diff --git a/substrate/client/consensus/slots/Cargo.toml b/substrate/client/consensus/slots/Cargo.toml
index 7b4aa26cdf540e36e1c9752d3727ad616cd0fba8..c97a3d1fe0356b71fe214391b8a71e2982759a1e 100644
--- a/substrate/client/consensus/slots/Cargo.toml
+++ b/substrate/client/consensus/slots/Cargo.toml
@@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
[dependencies]
codec = { package = "parity-scale-codec", version = "2.0.0" }
sc-client-api = { version = "4.0.0-dev", path = "../../api" }
-sp-core = { version = "4.0.0", path = "../../../primitives/core" }
+sp-core = { version = "4.1.0-dev", path = "../../../primitives/core" }
sp-arithmetic = { version = "4.0.0-dev", path = "../../../primitives/arithmetic" }
sp-blockchain = { version = "4.0.0-dev", path = "../../../primitives/blockchain" }
sc-consensus = { version = "0.10.0-dev", path = "../../../client/consensus/common" }
diff --git a/substrate/client/db/Cargo.toml b/substrate/client/db/Cargo.toml
index f0ce20354a8002149e798c2122f0f88cca02d573..a2ed46c48e1cf17195d6137147e05767560833c9 100644
--- a/substrate/client/db/Cargo.toml
+++ b/substrate/client/db/Cargo.toml
@@ -26,7 +26,7 @@ codec = { package = "parity-scale-codec", version = "2.0.0", features = [
sc-client-api = { version = "4.0.0-dev", path = "../api" }
sp-arithmetic = { version = "4.0.0-dev", path = "../../primitives/arithmetic" }
-sp-core = { version = "4.0.0", path = "../../primitives/core" }
+sp-core = { version = "4.1.0-dev", path = "../../primitives/core" }
sp-runtime = { version = "4.0.0-dev", path = "../../primitives/runtime" }
sp-state-machine = { version = "0.10.0-dev", path = "../../primitives/state-machine" }
sc-state-db = { version = "0.10.0-dev", path = "../state-db" }
diff --git a/substrate/client/executor/Cargo.toml b/substrate/client/executor/Cargo.toml
index dea8a26edde36a77a3ca372d48d63940b56edb09..58d7ec34b20ee7633c5c22c91fe6f5f9d2319228 100644
--- a/substrate/client/executor/Cargo.toml
+++ b/substrate/client/executor/Cargo.toml
@@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
[dependencies]
codec = { package = "parity-scale-codec", version = "2.0.0" }
sp-io = { version = "4.0.0-dev", path = "../../primitives/io" }
-sp-core = { version = "4.0.0", path = "../../primitives/core" }
+sp-core = { version = "4.1.0-dev", path = "../../primitives/core" }
sp-tasks = { version = "4.0.0-dev", path = "../../primitives/tasks" }
sp-trie = { version = "4.0.0-dev", path = "../../primitives/trie" }
sp-version = { version = "4.0.0-dev", path = "../../primitives/version" }
diff --git a/substrate/client/executor/common/Cargo.toml b/substrate/client/executor/common/Cargo.toml
index 198d5201e1f5df944b562c2f5647e900dfe97b7d..abaee760730321c2fb6e792956d30f3fd85bb8b1 100644
--- a/substrate/client/executor/common/Cargo.toml
+++ b/substrate/client/executor/common/Cargo.toml
@@ -18,7 +18,7 @@ derive_more = "0.99.16"
pwasm-utils = "0.18.2"
codec = { package = "parity-scale-codec", version = "2.0.0" }
wasmi = "0.9.1"
-sp-core = { version = "4.0.0", path = "../../../primitives/core" }
+sp-core = { version = "4.1.0-dev", path = "../../../primitives/core" }
sc-allocator = { version = "4.1.0-dev", path = "../../allocator" }
sp-wasm-interface = { version = "4.0.0", path = "../../../primitives/wasm-interface" }
sp-maybe-compressed-blob = { version = "4.1.0-dev", path = "../../../primitives/maybe-compressed-blob" }
diff --git a/substrate/client/executor/runtime-test/Cargo.toml b/substrate/client/executor/runtime-test/Cargo.toml
index 831ff786ca09016da3bf18cc871e60752a3f158b..4572a23c630ae65f2deced285b283f1136d3dc0c 100644
--- a/substrate/client/executor/runtime-test/Cargo.toml
+++ b/substrate/client/executor/runtime-test/Cargo.toml
@@ -13,7 +13,7 @@ repository = "https://github.com/paritytech/substrate/"
targets = ["x86_64-unknown-linux-gnu"]
[dependencies]
-sp-core = { version = "4.0.0", default-features = false, path = "../../../primitives/core" }
+sp-core = { version = "4.1.0-dev", default-features = false, path = "../../../primitives/core" }
sp-io = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/io" }
sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/runtime" }
sp-sandbox = { version = "0.10.0-dev", default-features = false, path = "../../../primitives/sandbox" }
diff --git a/substrate/client/executor/wasmi/Cargo.toml b/substrate/client/executor/wasmi/Cargo.toml
index f1e01d944a6ebc0ae8e0ee4ae91105880124dd07..d50237edfe4a01fad4c481a18e054113bdd1a08a 100644
--- a/substrate/client/executor/wasmi/Cargo.toml
+++ b/substrate/client/executor/wasmi/Cargo.toml
@@ -21,5 +21,5 @@ sc-executor-common = { version = "0.10.0-dev", path = "../common" }
sc-allocator = { version = "4.1.0-dev", path = "../../allocator" }
sp-wasm-interface = { version = "4.0.0", path = "../../../primitives/wasm-interface" }
sp-runtime-interface = { version = "4.0.0", path = "../../../primitives/runtime-interface" }
-sp-core = { version = "4.0.0", path = "../../../primitives/core" }
+sp-core = { version = "4.1.0-dev", path = "../../../primitives/core" }
scoped-tls = "1.0"
diff --git a/substrate/client/executor/wasmtime/Cargo.toml b/substrate/client/executor/wasmtime/Cargo.toml
index 77210b97f376198f0ee556e34ebfa24fa83bed7e..49e44766b9d4744e128f29702c6901051a59b078 100644
--- a/substrate/client/executor/wasmtime/Cargo.toml
+++ b/substrate/client/executor/wasmtime/Cargo.toml
@@ -21,7 +21,7 @@ codec = { package = "parity-scale-codec", version = "2.0.0" }
sc-executor-common = { version = "0.10.0-dev", path = "../common" }
sp-wasm-interface = { version = "4.0.0", path = "../../../primitives/wasm-interface" }
sp-runtime-interface = { version = "4.0.0", path = "../../../primitives/runtime-interface" }
-sp-core = { version = "4.0.0", path = "../../../primitives/core" }
+sp-core = { version = "4.1.0-dev", path = "../../../primitives/core" }
sc-allocator = { version = "4.1.0-dev", path = "../../allocator" }
wasmtime = { version = "0.31.0", default-features = false, features = [
"cache",
diff --git a/substrate/client/finality-grandpa/Cargo.toml b/substrate/client/finality-grandpa/Cargo.toml
index fa60751d48912bbefa89c12cfb9e3d92b2906db5..12aedbfe0143bd1fea6c908f5be2a7e89f227816 100644
--- a/substrate/client/finality-grandpa/Cargo.toml
+++ b/substrate/client/finality-grandpa/Cargo.toml
@@ -30,7 +30,7 @@ sp-runtime = { version = "4.0.0-dev", path = "../../primitives/runtime" }
sc-utils = { version = "4.0.0-dev", path = "../utils" }
sp-consensus = { version = "0.10.0-dev", path = "../../primitives/consensus/common" }
sc-consensus = { version = "0.10.0-dev", path = "../consensus/common" }
-sp-core = { version = "4.0.0", path = "../../primitives/core" }
+sp-core = { version = "4.1.0-dev", path = "../../primitives/core" }
sp-keystore = { version = "0.10.0-dev", path = "../../primitives/keystore" }
sp-api = { version = "4.0.0-dev", path = "../../primitives/api" }
sc-telemetry = { version = "4.0.0-dev", path = "../telemetry" }
diff --git a/substrate/client/finality-grandpa/rpc/Cargo.toml b/substrate/client/finality-grandpa/rpc/Cargo.toml
index a83a47af9ed485067f3ce9933a063d93ce2d5000..9d0affde3b17ad7ea29fd7cca40b609e8189634e 100644
--- a/substrate/client/finality-grandpa/rpc/Cargo.toml
+++ b/substrate/client/finality-grandpa/rpc/Cargo.toml
@@ -12,7 +12,7 @@ readme = "README.md"
sc-finality-grandpa = { version = "0.10.0-dev", path = "../" }
sc-rpc = { version = "4.0.0-dev", path = "../../rpc" }
sp-blockchain = { version = "4.0.0-dev", path = "../../../primitives/blockchain" }
-sp-core = { version = "4.0.0", path = "../../../primitives/core" }
+sp-core = { version = "4.1.0-dev", path = "../../../primitives/core" }
sp-runtime = { version = "4.0.0-dev", path = "../../../primitives/runtime" }
finality-grandpa = { version = "0.14.4", features = ["derive-codec"] }
jsonrpc-core = "18.0.0"
@@ -32,7 +32,7 @@ sc-block-builder = { version = "0.10.0-dev", path = "../../block-builder" }
sc-rpc = { version = "4.0.0-dev", path = "../../rpc", features = [
"test-helpers",
] }
-sp-core = { version = "4.0.0", path = "../../../primitives/core" }
+sp-core = { version = "4.1.0-dev", path = "../../../primitives/core" }
sp-finality-grandpa = { version = "4.0.0-dev", path = "../../../primitives/finality-grandpa" }
sp-keyring = { version = "4.0.0-dev", path = "../../../primitives/keyring" }
substrate-test-runtime-client = { version = "2.0.0", path = "../../../test-utils/runtime/client" }
diff --git a/substrate/client/keystore/Cargo.toml b/substrate/client/keystore/Cargo.toml
index ac2663902b67faf2cb24994598641d1c733c4b1b..912de249ad0b0f09087d1305d3bfa61c84fc26be 100644
--- a/substrate/client/keystore/Cargo.toml
+++ b/substrate/client/keystore/Cargo.toml
@@ -18,7 +18,7 @@ targets = ["x86_64-unknown-linux-gnu"]
async-trait = "0.1.50"
derive_more = "0.99.16"
sp-application-crypto = { version = "4.0.0-dev", path = "../../primitives/application-crypto" }
-sp-core = { version = "4.0.0", path = "../../primitives/core" }
+sp-core = { version = "4.1.0-dev", path = "../../primitives/core" }
sp-keystore = { version = "0.10.0-dev", path = "../../primitives/keystore" }
hex = "0.4.0"
parking_lot = "0.11.1"
diff --git a/substrate/client/network/Cargo.toml b/substrate/client/network/Cargo.toml
index 229a273eabdc68142577ae619ca11fe60c3ed4d0..5c8aedc84c19d7b3ad79cc9d5d567e9ad7caeaf9 100644
--- a/substrate/client/network/Cargo.toml
+++ b/substrate/client/network/Cargo.toml
@@ -53,7 +53,7 @@ sp-arithmetic = { version = "4.0.0-dev", path = "../../primitives/arithmetic" }
sp-blockchain = { version = "4.0.0-dev", path = "../../primitives/blockchain" }
sp-consensus = { version = "0.10.0-dev", path = "../../primitives/consensus/common" }
sc-consensus = { version = "0.10.0-dev", path = "../consensus/common" }
-sp-core = { version = "4.0.0", path = "../../primitives/core" }
+sp-core = { version = "4.1.0-dev", path = "../../primitives/core" }
sp-runtime = { version = "4.0.0-dev", path = "../../primitives/runtime" }
sc-utils = { version = "4.0.0-dev", path = "../utils" }
sp-finality-grandpa = { version = "4.0.0-dev", path = "../../primitives/finality-grandpa" }
diff --git a/substrate/client/network/test/Cargo.toml b/substrate/client/network/test/Cargo.toml
index afa4622d2f05a1693ab0517f18db35b13acfe52c..748037fef64484a4456e0144e1b6b6599730aa49 100644
--- a/substrate/client/network/test/Cargo.toml
+++ b/substrate/client/network/test/Cargo.toml
@@ -26,7 +26,7 @@ sc-consensus = { version = "0.10.0-dev", path = "../../consensus/common" }
sc-client-api = { version = "4.0.0-dev", path = "../../api" }
sp-blockchain = { version = "4.0.0-dev", path = "../../../primitives/blockchain" }
sp-runtime = { version = "4.0.0-dev", path = "../../../primitives/runtime" }
-sp-core = { version = "4.0.0", path = "../../../primitives/core" }
+sp-core = { version = "4.1.0-dev", path = "../../../primitives/core" }
sc-block-builder = { version = "0.10.0-dev", path = "../../block-builder" }
sp-consensus-babe = { version = "0.10.0-dev", path = "../../../primitives/consensus/babe" }
substrate-test-runtime-client = { version = "2.0.0", path = "../../../test-utils/runtime/client" }
diff --git a/substrate/client/offchain/Cargo.toml b/substrate/client/offchain/Cargo.toml
index 6f1fd3a035fecb64bccd95e945f5c948b211a40c..4494beb2e3f4196ae24f95ddff77fc4c94a3726e 100644
--- a/substrate/client/offchain/Cargo.toml
+++ b/substrate/client/offchain/Cargo.toml
@@ -25,7 +25,7 @@ rand = "0.7.2"
sc-client-api = { version = "4.0.0-dev", path = "../api" }
sc-network = { version = "0.10.0-dev", path = "../network" }
sp-api = { version = "4.0.0-dev", path = "../../primitives/api" }
-sp-core = { version = "4.0.0", path = "../../primitives/core" }
+sp-core = { version = "4.1.0-dev", path = "../../primitives/core" }
sp-offchain = { version = "4.0.0-dev", path = "../../primitives/offchain" }
sp-runtime = { version = "4.0.0-dev", path = "../../primitives/runtime" }
sc-utils = { version = "4.0.0-dev", path = "../utils" }
diff --git a/substrate/client/rpc-api/Cargo.toml b/substrate/client/rpc-api/Cargo.toml
index 5f7a2d2fb32bf34f80cd91162bb8389af4dcbdd6..3c97677c3feecd79660777a76c004e997c92938a 100644
--- a/substrate/client/rpc-api/Cargo.toml
+++ b/substrate/client/rpc-api/Cargo.toml
@@ -23,7 +23,7 @@ log = "0.4.8"
parking_lot = "0.11.1"
thiserror = "1.0"
-sp-core = { version = "4.0.0", path = "../../primitives/core" }
+sp-core = { version = "4.1.0-dev", path = "../../primitives/core" }
sp-version = { version = "4.0.0-dev", path = "../../primitives/version" }
sp-runtime = { path = "../../primitives/runtime", version = "4.0.0-dev" }
sc-chain-spec = { path = "../chain-spec", version = "4.0.0-dev" }
diff --git a/substrate/client/rpc/Cargo.toml b/substrate/client/rpc/Cargo.toml
index 9d8461238fc064eafba9f5590ef07014ebec64cc..1f1fe6b12aed12406110f3fa9cfb8ab9032d33fa 100644
--- a/substrate/client/rpc/Cargo.toml
+++ b/substrate/client/rpc/Cargo.toml
@@ -20,7 +20,7 @@ codec = { package = "parity-scale-codec", version = "2.0.0" }
futures = "0.3.16"
jsonrpc-pubsub = "18.0.0"
log = "0.4.8"
-sp-core = { version = "4.0.0", path = "../../primitives/core" }
+sp-core = { version = "4.1.0-dev", path = "../../primitives/core" }
rpc = { package = "jsonrpc-core", version = "18.0.0" }
sp-version = { version = "4.0.0-dev", path = "../../primitives/version" }
serde_json = "1.0.71"
diff --git a/substrate/client/service/Cargo.toml b/substrate/client/service/Cargo.toml
index 91143c45b4a230f53a20ad66de7af15522605c6b..25cd9026bc8b62e6b3c1bba2cab169d25ad48c43 100644
--- a/substrate/client/service/Cargo.toml
+++ b/substrate/client/service/Cargo.toml
@@ -42,7 +42,7 @@ sp-externalities = { version = "0.10.0", path = "../../primitives/externalities"
sc-utils = { version = "4.0.0-dev", path = "../utils" }
sp-version = { version = "4.0.0-dev", path = "../../primitives/version" }
sp-blockchain = { version = "4.0.0-dev", path = "../../primitives/blockchain" }
-sp-core = { version = "4.0.0", path = "../../primitives/core" }
+sp-core = { version = "4.1.0-dev", path = "../../primitives/core" }
sp-keystore = { version = "0.10.0-dev", path = "../../primitives/keystore" }
sp-session = { version = "4.0.0-dev", path = "../../primitives/session" }
sp-state-machine = { version = "0.10.0-dev", path = "../../primitives/state-machine" }
diff --git a/substrate/client/service/test/Cargo.toml b/substrate/client/service/test/Cargo.toml
index c89442f3aec718a290d0aad55fa5863f5fdb7ce3..52f0ff6ecce0efe8762f97b9b3802d5d0b2ef33c 100644
--- a/substrate/client/service/test/Cargo.toml
+++ b/substrate/client/service/test/Cargo.toml
@@ -32,7 +32,7 @@ sc-network = { version = "0.10.0-dev", path = "../../network" }
sp-consensus = { version = "0.10.0-dev", path = "../../../primitives/consensus/common" }
sc-consensus = { version = "0.10.0-dev", path = "../../../client/consensus/common" }
sp-runtime = { version = "4.0.0-dev", path = "../../../primitives/runtime" }
-sp-core = { version = "4.0.0", path = "../../../primitives/core" }
+sp-core = { version = "4.1.0-dev", path = "../../../primitives/core" }
sc-transaction-pool-api = { version = "4.0.0-dev", path = "../../../client/transaction-pool/api" }
substrate-test-runtime = { version = "2.0.0", path = "../../../test-utils/runtime" }
substrate-test-runtime-client = { version = "2.0.0", path = "../../../test-utils/runtime/client" }
diff --git a/substrate/client/state-db/Cargo.toml b/substrate/client/state-db/Cargo.toml
index 8c059e80cdb26a794fa3ee7baf29d22a238c3d62..6a5b8516237d9426726200eac12d4e4dbd115970 100644
--- a/substrate/client/state-db/Cargo.toml
+++ b/substrate/client/state-db/Cargo.toml
@@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
parking_lot = "0.11.1"
log = "0.4.11"
sc-client-api = { version = "4.0.0-dev", path = "../api" }
-sp-core = { version = "4.0.0", path = "../../primitives/core" }
+sp-core = { version = "4.1.0-dev", path = "../../primitives/core" }
codec = { package = "parity-scale-codec", version = "2.0.0", features = ["derive"] }
parity-util-mem = { version = "0.10.2", default-features = false, features = ["primitive-types"] }
parity-util-mem-derive = "0.1.0"
diff --git a/substrate/client/tracing/Cargo.toml b/substrate/client/tracing/Cargo.toml
index 81710887b816d2ad7cc0cf0d2f285fe665c46dd4..4d91e61127db8f6d29fd10eecace2bf3bfaf9970 100644
--- a/substrate/client/tracing/Cargo.toml
+++ b/substrate/client/tracing/Cargo.toml
@@ -33,7 +33,7 @@ sp-rpc = { version = "4.0.0-dev", path = "../../primitives/rpc" }
sp-runtime = { version = "4.0.0-dev", path = "../../primitives/runtime" }
sp-blockchain = { version = "4.0.0-dev", path = "../../primitives/blockchain" }
sp-api = { version = "4.0.0-dev", path = "../../primitives/api" }
-sp-core = { version = "4.0.0", path = "../../primitives/core" }
+sp-core = { version = "4.1.0-dev", path = "../../primitives/core" }
sc-client-api = { version = "4.0.0-dev", path = "../api" }
sc-tracing-proc-macro = { version = "4.0.0-dev", path = "./proc-macro" }
sc-rpc-server = { version = "4.0.0-dev", path = "../rpc-servers" }
diff --git a/substrate/client/transaction-pool/Cargo.toml b/substrate/client/transaction-pool/Cargo.toml
index b3a7095fcb75dc321ab5e20e9bd55e4f16ec2e4c..6ed97edbf476e24bf23aaf3eb70913d831a6462c 100644
--- a/substrate/client/transaction-pool/Cargo.toml
+++ b/substrate/client/transaction-pool/Cargo.toml
@@ -23,7 +23,7 @@ parking_lot = "0.11.1"
prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../utils/prometheus", version = "0.10.0-dev"}
sc-client-api = { version = "4.0.0-dev", path = "../api" }
sp-api = { version = "4.0.0-dev", path = "../../primitives/api" }
-sp-core = { version = "4.0.0", path = "../../primitives/core" }
+sp-core = { version = "4.1.0-dev", path = "../../primitives/core" }
sp-runtime = { version = "4.0.0-dev", path = "../../primitives/runtime" }
sp-tracing = { version = "4.0.0", path = "../../primitives/tracing" }
sp-transaction-pool = { version = "4.0.0-dev", path = "../../primitives/transaction-pool" }
diff --git a/substrate/frame/assets/Cargo.toml b/substrate/frame/assets/Cargo.toml
index 0f2e3cbf3d4e98944b21e44bda166504048670d5..37ff7582f5c61e0161f55c1e7fb7bde8a272c72c 100644
--- a/substrate/frame/assets/Cargo.toml
+++ b/substrate/frame/assets/Cargo.toml
@@ -25,7 +25,7 @@ frame-system = { version = "4.0.0-dev", default-features = false, path = "../sys
frame-benchmarking = { version = "4.0.0-dev", default-features = false, path = "../benchmarking", optional = true }
[dev-dependencies]
-sp-core = { version = "4.0.0", path = "../../primitives/core" }
+sp-core = { version = "4.1.0-dev", path = "../../primitives/core" }
sp-std = { version = "4.0.0", path = "../../primitives/std" }
sp-io = { version = "4.0.0-dev", path = "../../primitives/io" }
pallet-balances = { version = "4.0.0-dev", path = "../balances" }
diff --git a/substrate/frame/atomic-swap/Cargo.toml b/substrate/frame/atomic-swap/Cargo.toml
index 0c2d7616f57edaec7c68eb0b219ff495a074bd7e..54e579550443d5c02859e15107fe6f91a1a5078c 100644
--- a/substrate/frame/atomic-swap/Cargo.toml
+++ b/substrate/frame/atomic-swap/Cargo.toml
@@ -20,7 +20,7 @@ frame-system = { version = "4.0.0-dev", default-features = false, path = "../sys
sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
sp-std = { version = "4.0.0", default-features = false, path = "../../primitives/std" }
sp-io = { version = "4.0.0-dev", default-features = false, path = "../../primitives/io" }
-sp-core = { version = "4.0.0", default-features = false, path = "../../primitives/core" }
+sp-core = { version = "4.1.0-dev", default-features = false, path = "../../primitives/core" }
[dev-dependencies]
pallet-balances = { version = "4.0.0-dev", path = "../balances" }
diff --git a/substrate/frame/aura/Cargo.toml b/substrate/frame/aura/Cargo.toml
index 1252e7b51e00f9dde8c7a95e1b09cd490d43c0c4..9ed07e724b30f3c88ad49a57bfefb251c75f6f89 100644
--- a/substrate/frame/aura/Cargo.toml
+++ b/substrate/frame/aura/Cargo.toml
@@ -24,7 +24,7 @@ frame-system = { version = "4.0.0-dev", default-features = false, path = "../sys
pallet-timestamp = { version = "4.0.0-dev", default-features = false, path = "../timestamp" }
[dev-dependencies]
-sp-core = { version = "4.0.0", default-features = false, path = "../../primitives/core" }
+sp-core = { version = "4.1.0-dev", default-features = false, path = "../../primitives/core" }
sp-io = { version = "4.0.0-dev", path = "../../primitives/io" }
[features]
diff --git a/substrate/frame/authority-discovery/Cargo.toml b/substrate/frame/authority-discovery/Cargo.toml
index c7b5abe350b881579cf2a4fa2a3d349fb73cd130..1a0f5925732c8fb500a513d22e3ddbe751e9e90b 100644
--- a/substrate/frame/authority-discovery/Cargo.toml
+++ b/substrate/frame/authority-discovery/Cargo.toml
@@ -28,7 +28,7 @@ frame-support = { version = "4.0.0-dev", default-features = false, path = "../su
frame-system = { version = "4.0.0-dev", default-features = false, path = "../system" }
[dev-dependencies]
-sp-core = { version = "4.0.0", path = "../../primitives/core" }
+sp-core = { version = "4.1.0-dev", path = "../../primitives/core" }
sp-io = { version = "4.0.0-dev", path = "../../primitives/io" }
[features]
diff --git a/substrate/frame/authorship/Cargo.toml b/substrate/frame/authorship/Cargo.toml
index 48a6c473875c0386f94b25a24a68d8ee4615a2b3..2a0dc8bdd9a74b1f19fe68ff0611bcb45dbd6bbb 100644
--- a/substrate/frame/authorship/Cargo.toml
+++ b/substrate/frame/authorship/Cargo.toml
@@ -25,7 +25,7 @@ frame-system = { version = "4.0.0-dev", default-features = false, path = "../sys
impl-trait-for-tuples = "0.2.1"
[dev-dependencies]
-sp-core = { version = "4.0.0", path = "../../primitives/core" }
+sp-core = { version = "4.1.0-dev", path = "../../primitives/core" }
sp-io = { version = "4.0.0-dev", path = "../../primitives/io" }
[features]
diff --git a/substrate/frame/babe/Cargo.toml b/substrate/frame/babe/Cargo.toml
index 077a8cb89a929460dfb367da7c73f9d1ed46506a..414cfcb222d402b62342da00f0d3ed1364ad08b2 100644
--- a/substrate/frame/babe/Cargo.toml
+++ b/substrate/frame/babe/Cargo.toml
@@ -36,7 +36,7 @@ pallet-balances = { version = "4.0.0-dev", path = "../balances" }
pallet-offences = { version = "4.0.0-dev", path = "../offences" }
pallet-staking = { version = "4.0.0-dev", path = "../staking" }
pallet-staking-reward-curve = { version = "4.0.0-dev", path = "../staking/reward-curve" }
-sp-core = { version = "4.0.0", path = "../../primitives/core" }
+sp-core = { version = "4.1.0-dev", path = "../../primitives/core" }
frame-election-provider-support = { version = "4.0.0-dev", path = "../election-provider-support" }
[features]
diff --git a/substrate/frame/bags-list/Cargo.toml b/substrate/frame/bags-list/Cargo.toml
index fe8d08ed9766c7c8b8b5a71fd93f0382fa211b97..66bb1c48a929fbc2e40127c56d5ee9ec4d461fca 100644
--- a/substrate/frame/bags-list/Cargo.toml
+++ b/substrate/frame/bags-list/Cargo.toml
@@ -32,12 +32,12 @@ log = { version = "0.4.14", default-features = false }
# Optional imports for benchmarking
frame-benchmarking = { version = "4.0.0-dev", path = "../benchmarking", optional = true, default-features = false }
pallet-balances = { version = "4.0.0-dev", path = "../balances", optional = true, default-features = false }
-sp-core = { version = "4.0.0", path = "../../primitives/core", optional = true, default-features = false }
+sp-core = { version = "4.1.0-dev", path = "../../primitives/core", optional = true, default-features = false }
sp-io = { version = "4.0.0-dev", path = "../../primitives/io", optional = true, default-features = false }
sp-tracing = { version = "4.0.0", path = "../../primitives/tracing", optional = true, default-features = false }
[dev-dependencies]
-sp-core = { version = "4.0.0", path = "../../primitives/core"}
+sp-core = { version = "4.1.0-dev", path = "../../primitives/core"}
sp-io = { version = "4.0.0-dev", path = "../../primitives/io"}
sp-tracing = { version = "4.0.0", path = "../../primitives/tracing" }
pallet-balances = { version = "4.0.0-dev", path = "../balances" }
diff --git a/substrate/frame/bags-list/remote-tests/Cargo.toml b/substrate/frame/bags-list/remote-tests/Cargo.toml
index 5a5b028285d88d4ae41ae0a3d38cb1a548f75bdf..646b47275c18bfb56f27a144b6e6c6c9aa42021c 100644
--- a/substrate/frame/bags-list/remote-tests/Cargo.toml
+++ b/substrate/frame/bags-list/remote-tests/Cargo.toml
@@ -22,7 +22,7 @@ frame-support = { path = "../../support", version = "4.0.0-dev" }
# core
sp-storage = { path = "../../../primitives/storage", version = "4.0.0" }
-sp-core = { path = "../../../primitives/core", version = "4.0.0" }
+sp-core = { path = "../../../primitives/core", version = "4.1.0-dev" }
sp-tracing = { path = "../../../primitives/tracing", version = "4.0.0" }
sp-runtime = { path = "../../../primitives/runtime", version = "4.0.0-dev" }
sp-std = { path = "../../../primitives/std", version = "4.0.0" }
diff --git a/substrate/frame/balances/Cargo.toml b/substrate/frame/balances/Cargo.toml
index 825869c6b97250a1fafe84b59e5b221af1602f58..1ac7b71fb340570f6ba77284794a9fce24f321d6 100644
--- a/substrate/frame/balances/Cargo.toml
+++ b/substrate/frame/balances/Cargo.toml
@@ -24,7 +24,7 @@ log = { version = "0.4.14", default-features = false }
[dev-dependencies]
sp-io = { version = "4.0.0-dev", path = "../../primitives/io" }
-sp-core = { version = "4.0.0", path = "../../primitives/core" }
+sp-core = { version = "4.1.0-dev", path = "../../primitives/core" }
pallet-transaction-payment = { version = "4.0.0-dev", path = "../transaction-payment" }
[features]
diff --git a/substrate/frame/beefy-mmr/Cargo.toml b/substrate/frame/beefy-mmr/Cargo.toml
index cebd7a6d962b1d922c3de55ea9038206d7fb7cd5..64cdf805db9a2544e69dfc86ea45527897a50d48 100644
--- a/substrate/frame/beefy-mmr/Cargo.toml
+++ b/substrate/frame/beefy-mmr/Cargo.toml
@@ -21,7 +21,7 @@ pallet-mmr = { version = "4.0.0-dev", path = "../merkle-mountain-range", default
pallet-mmr-primitives = { version = "4.0.0-dev", path = "../merkle-mountain-range/primitives", default-features = false }
pallet-session = { version = "4.0.0-dev", path = "../session", default-features = false }
-sp-core = { version = "4.0.0", path = "../../primitives/core", default-features = false }
+sp-core = { version = "4.1.0-dev", path = "../../primitives/core", default-features = false }
sp-io = { version = "4.0.0-dev", path = "../../primitives/io", default-features = false }
sp-runtime = { version = "4.0.0-dev", path = "../../primitives/runtime", default-features = false }
sp-std = { version = "4.0.0", path = "../../primitives/std", default-features = false }
diff --git a/substrate/frame/beefy/Cargo.toml b/substrate/frame/beefy/Cargo.toml
index 4bfd9f19b280627547fc118813929e10f3fc623a..c90f0d7328be0fc430ec546d718d88345982e3c2 100644
--- a/substrate/frame/beefy/Cargo.toml
+++ b/substrate/frame/beefy/Cargo.toml
@@ -23,7 +23,7 @@ pallet-session = { version = "4.0.0-dev", path = "../session", default-features
beefy-primitives = { version = "4.0.0-dev", path = "../../primitives/beefy", default-features = false }
[dev-dependencies]
-sp-core = { version = "4.0.0", path = "../../primitives/core" }
+sp-core = { version = "4.1.0-dev", path = "../../primitives/core" }
sp-io = { version = "4.0.0-dev", path = "../../primitives/io" }
sp-staking = { version = "4.0.0-dev", path = "../../primitives/staking" }
diff --git a/substrate/frame/bounties/Cargo.toml b/substrate/frame/bounties/Cargo.toml
index 5dfa05bba0a07c4a4765c43ca34f39e3a3e1e4b8..97364ba41f63f36f8ef35be060ec944d980296df 100644
--- a/substrate/frame/bounties/Cargo.toml
+++ b/substrate/frame/bounties/Cargo.toml
@@ -23,7 +23,7 @@ frame-support = { version = "4.0.0-dev", default-features = false, path = "../su
frame-system = { version = "4.0.0-dev", default-features = false, path = "../system" }
pallet-treasury = { version = "4.0.0-dev", default-features = false, path = "../treasury" }
sp-io = { version = "4.0.0-dev", path = "../../primitives/io", default-features = false }
-sp-core = { version = "4.0.0", path = "../../primitives/core", default-features = false }
+sp-core = { version = "4.1.0-dev", path = "../../primitives/core", default-features = false }
frame-benchmarking = { version = "4.0.0-dev", default-features = false, path = "../benchmarking", optional = true }
log = { version = "0.4.14", default-features = false }
diff --git a/substrate/frame/child-bounties/Cargo.toml b/substrate/frame/child-bounties/Cargo.toml
index 37152e29d8f40ee4d42c8efc99d2967e110eeb29..17cfc482af065d02f7f8eb7eea98441edc29d711 100644
--- a/substrate/frame/child-bounties/Cargo.toml
+++ b/substrate/frame/child-bounties/Cargo.toml
@@ -24,7 +24,7 @@ frame-system = { version = "4.0.0-dev", default-features = false, path = "../sys
pallet-treasury = { version = "4.0.0-dev", default-features = false, path = "../treasury" }
pallet-bounties = { version = "4.0.0-dev", default-features = false, path = "../bounties" }
sp-io = { version = "4.0.0-dev", path = "../../primitives/io", default-features = false }
-sp-core = { version = "4.0.0", path = "../../primitives/core", default-features = false }
+sp-core = { version = "4.1.0-dev", path = "../../primitives/core", default-features = false }
frame-benchmarking = { version = "4.0.0-dev", default-features = false, path = "../benchmarking", optional = true }
log = { version = "0.4.14", default-features = false }
diff --git a/substrate/frame/collective/Cargo.toml b/substrate/frame/collective/Cargo.toml
index 76799ae981c7a9680f797ce1ad18ccfddb29e6a1..6d3b081c89c1e7b79d4c306974ebfda13664eae0 100644
--- a/substrate/frame/collective/Cargo.toml
+++ b/substrate/frame/collective/Cargo.toml
@@ -17,7 +17,7 @@ codec = { package = "parity-scale-codec", version = "2.0.0", default-features =
log = { version = "0.4.14", default-features = false }
scale-info = { version = "1.0", default-features = false, features = ["derive"] }
-sp-core = { version = "4.0.0", default-features = false, path = "../../primitives/core" }
+sp-core = { version = "4.1.0-dev", default-features = false, path = "../../primitives/core" }
sp-io = { version = "4.0.0-dev", default-features = false, path = "../../primitives/io" }
sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
sp-std = { version = "4.0.0", default-features = false, path = "../../primitives/std" }
diff --git a/substrate/frame/contracts/Cargo.toml b/substrate/frame/contracts/Cargo.toml
index bb7a0693147b2ae0a339e650cece71448a1a1161..963f1466a9ea166f3bd556cea2f49dd7d0a2d0da 100644
--- a/substrate/frame/contracts/Cargo.toml
+++ b/substrate/frame/contracts/Cargo.toml
@@ -38,7 +38,7 @@ frame-support = { version = "4.0.0-dev", default-features = false, path = "../su
frame-system = { version = "4.0.0-dev", default-features = false, path = "../system" }
pallet-contracts-primitives = { version = "4.0.0-dev", default-features = false, path = "common" }
pallet-contracts-proc-macro = { version = "4.0.0-dev", path = "proc-macro" }
-sp-core = { version = "4.0.0", default-features = false, path = "../../primitives/core" }
+sp-core = { version = "4.1.0-dev", default-features = false, path = "../../primitives/core" }
sp-io = { version = "4.0.0-dev", default-features = false, path = "../../primitives/io" }
sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
sp-sandbox = { version = "0.10.0-dev", default-features = false, path = "../../primitives/sandbox" }
diff --git a/substrate/frame/contracts/common/Cargo.toml b/substrate/frame/contracts/common/Cargo.toml
index ebfd5fab5af16711256f2c412c3f0f17d9d1a524..0e0cf1528b1a8d21a2e4306a48fe8d3c5aa44aaf 100644
--- a/substrate/frame/contracts/common/Cargo.toml
+++ b/substrate/frame/contracts/common/Cargo.toml
@@ -19,7 +19,7 @@ scale-info = { version = "1.0", default-features = false, features = ["derive"]
serde = { version = "1", features = ["derive"], optional = true }
# Substrate Dependencies (This crate should not rely on frame)
-sp-core = { version = "4.0.0", path = "../../../primitives/core", default-features = false }
+sp-core = { version = "4.1.0-dev", path = "../../../primitives/core", default-features = false }
sp-std = { version = "4.0.0", default-features = false, path = "../../../primitives/std" }
sp-rpc = { version = "4.0.0-dev", path = "../../../primitives/rpc", optional = true }
sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/runtime" }
diff --git a/substrate/frame/contracts/rpc/Cargo.toml b/substrate/frame/contracts/rpc/Cargo.toml
index aac5683a79e5246e9c67a19dd1d95e00ab3e8853..e380708a9dee40422ede7b8e3ec7cc73b2883164 100644
--- a/substrate/frame/contracts/rpc/Cargo.toml
+++ b/substrate/frame/contracts/rpc/Cargo.toml
@@ -24,7 +24,7 @@ pallet-contracts-primitives = { version = "4.0.0-dev", path = "../common" }
pallet-contracts-rpc-runtime-api = { version = "4.0.0-dev", path = "./runtime-api" }
sp-api = { version = "4.0.0-dev", path = "../../../primitives/api" }
sp-blockchain = { version = "4.0.0-dev", path = "../../../primitives/blockchain" }
-sp-core = { version = "4.0.0", path = "../../../primitives/core" }
+sp-core = { version = "4.1.0-dev", path = "../../../primitives/core" }
sp-rpc = { version = "4.0.0-dev", path = "../../../primitives/rpc" }
sp-runtime = { version = "4.0.0-dev", path = "../../../primitives/runtime" }
diff --git a/substrate/frame/democracy/Cargo.toml b/substrate/frame/democracy/Cargo.toml
index becec8a878d5daf03f1a71ed4b5e1fcf1d8036c1..32acdb964ed889e216966eeb87f4e25d26a08083 100644
--- a/substrate/frame/democracy/Cargo.toml
+++ b/substrate/frame/democracy/Cargo.toml
@@ -26,7 +26,7 @@ frame-support = { version = "4.0.0-dev", default-features = false, path = "../su
frame-system = { version = "4.0.0-dev", default-features = false, path = "../system" }
[dev-dependencies]
-sp-core = { version = "4.0.0", path = "../../primitives/core" }
+sp-core = { version = "4.1.0-dev", path = "../../primitives/core" }
pallet-balances = { version = "4.0.0-dev", path = "../balances" }
pallet-scheduler = { version = "4.0.0-dev", path = "../scheduler" }
diff --git a/substrate/frame/election-provider-multi-phase/Cargo.toml b/substrate/frame/election-provider-multi-phase/Cargo.toml
index 42d7c4064cb30efffd38a6e43080c874e7e64e97..a1df7edc13311e960a458f769e10f4c96d8183b6 100644
--- a/substrate/frame/election-provider-multi-phase/Cargo.toml
+++ b/substrate/frame/election-provider-multi-phase/Cargo.toml
@@ -25,7 +25,7 @@ frame-system = { version = "4.0.0-dev", default-features = false, path = "../sys
sp-io = { version = "4.0.0-dev", default-features = false, path = "../../primitives/io" }
sp-std = { version = "4.0.0", default-features = false, path = "../../primitives/std" }
-sp-core = { version = "4.0.0", default-features = false, path = "../../primitives/core" }
+sp-core = { version = "4.1.0-dev", default-features = false, path = "../../primitives/core" }
sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
sp-npos-elections = { version = "4.0.0-dev", default-features = false, path = "../../primitives/npos-elections" }
sp-arithmetic = { version = "4.0.0-dev", default-features = false, path = "../../primitives/arithmetic" }
@@ -43,7 +43,7 @@ strum_macros = { optional = true, version = "0.22.0" }
[dev-dependencies]
parking_lot = "0.11.0"
rand = { version = "0.7.3" }
-sp-core = { version = "4.0.0", default-features = false, path = "../../primitives/core" }
+sp-core = { version = "4.1.0-dev", default-features = false, path = "../../primitives/core" }
sp-io = { version = "4.0.0-dev", path = "../../primitives/io" }
sp-npos-elections = { version = "4.0.0-dev", default-features = false, path = "../../primitives/npos-elections" }
sp-tracing = { version = "4.0.0", path = "../../primitives/tracing" }
diff --git a/substrate/frame/election-provider-support/Cargo.toml b/substrate/frame/election-provider-support/Cargo.toml
index a69dca39b8e8fe2c1885cef4a3f27e77c4d5930c..80b7f9d7bfc053fe48401e6b8db5f1883c383b28 100644
--- a/substrate/frame/election-provider-support/Cargo.toml
+++ b/substrate/frame/election-provider-support/Cargo.toml
@@ -24,7 +24,7 @@ frame-system = { version = "4.0.0-dev", default-features = false, path = "../sys
[dev-dependencies]
sp-npos-elections = { version = "4.0.0-dev", path = "../../primitives/npos-elections" }
sp-runtime = { version = "4.0.0-dev", path = "../../primitives/runtime" }
-sp-core = { version = "4.0.0", path = "../../primitives/core" }
+sp-core = { version = "4.1.0-dev", path = "../../primitives/core" }
sp-io = { version = "4.0.0-dev", path = "../../primitives/io" }
[features]
diff --git a/substrate/frame/elections-phragmen/Cargo.toml b/substrate/frame/elections-phragmen/Cargo.toml
index a5e9ca777c3cec9b3369a6d5dfc7720938929bcd..7ab81a4f33008cd4368c8ba16eb1818cbecdd2fe 100644
--- a/substrate/frame/elections-phragmen/Cargo.toml
+++ b/substrate/frame/elections-phragmen/Cargo.toml
@@ -23,13 +23,13 @@ sp-io = { version = "4.0.0-dev", default-features = false, path = "../../primiti
frame-support = { version = "4.0.0-dev", default-features = false, path = "../support" }
frame-system = { version = "4.0.0-dev", default-features = false, path = "../system" }
sp-std = { version = "4.0.0", default-features = false, path = "../../primitives/std" }
-sp-core = { version = "4.0.0", default-features = false, path = "../../primitives/core" }
+sp-core = { version = "4.1.0-dev", default-features = false, path = "../../primitives/core" }
frame-benchmarking = { version = "4.0.0-dev", default-features = false, path = "../benchmarking", optional = true }
log = { version = "0.4.14", default-features = false }
[dev-dependencies]
pallet-balances = { version = "4.0.0-dev", path = "../balances" }
-sp-core = { version = "4.0.0", path = "../../primitives/core" }
+sp-core = { version = "4.1.0-dev", path = "../../primitives/core" }
substrate-test-utils = { version = "4.0.0-dev", path = "../../test-utils" }
[features]
diff --git a/substrate/frame/elections/Cargo.toml b/substrate/frame/elections/Cargo.toml
index e5f7d27d89113f18c4ac25d5612e52edb8f43faa..d1404f7626129a34aa58f9dda48f47f0a641dc94 100644
--- a/substrate/frame/elections/Cargo.toml
+++ b/substrate/frame/elections/Cargo.toml
@@ -17,7 +17,7 @@ codec = { package = "parity-scale-codec", version = "2.0.0", default-features =
"derive",
] }
scale-info = { version = "1.0", default-features = false, features = ["derive"] }
-sp-core = { version = "4.0.0", default-features = false, path = "../../primitives/core" }
+sp-core = { version = "4.1.0-dev", default-features = false, path = "../../primitives/core" }
sp-std = { version = "4.0.0", default-features = false, path = "../../primitives/std" }
sp-io = { version = "4.0.0-dev", default-features = false, path = "../../primitives/io" }
sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
diff --git a/substrate/frame/examples/basic/Cargo.toml b/substrate/frame/examples/basic/Cargo.toml
index 5edd3bfef8de529f3aea1079bf2f0d52ee45394d..db39d339f2c5c42ecbdbe87eb12ab9d6377761c0 100644
--- a/substrate/frame/examples/basic/Cargo.toml
+++ b/substrate/frame/examples/basic/Cargo.toml
@@ -26,7 +26,7 @@ sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../..
sp-std = { version = "4.0.0", default-features = false, path = "../../../primitives/std" }
[dev-dependencies]
-sp-core = { version = "4.0.0", path = "../../../primitives/core", default-features = false }
+sp-core = { version = "4.1.0-dev", path = "../../../primitives/core", default-features = false }
[features]
default = ["std"]
diff --git a/substrate/frame/examples/offchain-worker/Cargo.toml b/substrate/frame/examples/offchain-worker/Cargo.toml
index 44886afba5e13bb73181c42b8427d79bc4008f28..f53ea369278de43b662a4439dea183d01b9de98f 100644
--- a/substrate/frame/examples/offchain-worker/Cargo.toml
+++ b/substrate/frame/examples/offchain-worker/Cargo.toml
@@ -20,7 +20,7 @@ scale-info = { version = "1.0", default-features = false, features = ["derive"]
frame-support = { version = "4.0.0-dev", default-features = false, path = "../../support" }
frame-system = { version = "4.0.0-dev", default-features = false, path = "../../system" }
-sp-core = { version = "4.0.0", default-features = false, path = "../../../primitives/core" }
+sp-core = { version = "4.1.0-dev", default-features = false, path = "../../../primitives/core" }
sp-io = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/io" }
sp-keystore = { version = "0.10.0-dev", path = "../../../primitives/keystore", optional = true }
sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/runtime" }
diff --git a/substrate/frame/examples/parallel/Cargo.toml b/substrate/frame/examples/parallel/Cargo.toml
index 3d9104eb354510e722ac64a30e6cedeeb0c82c85..d28dd5b9ee0abc7e4133cd85930a61053e26b6d5 100644
--- a/substrate/frame/examples/parallel/Cargo.toml
+++ b/substrate/frame/examples/parallel/Cargo.toml
@@ -17,7 +17,7 @@ scale-info = { version = "1.0", default-features = false, features = ["derive"]
frame-support = { version = "4.0.0-dev", default-features = false, path = "../../support" }
frame-system = { version = "4.0.0-dev", default-features = false, path = "../../system" }
-sp-core = { version = "4.0.0", default-features = false, path = "../../../primitives/core" }
+sp-core = { version = "4.1.0-dev", default-features = false, path = "../../../primitives/core" }
sp-io = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/io" }
sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/runtime" }
sp-std = { version = "4.0.0", default-features = false, path = "../../../primitives/std" }
diff --git a/substrate/frame/executive/Cargo.toml b/substrate/frame/executive/Cargo.toml
index 9509fc5c977b588c30807306bf2d68fd08a356d6..d511bb858c7d6bae5bb8449e4b031f7db795eae0 100644
--- a/substrate/frame/executive/Cargo.toml
+++ b/substrate/frame/executive/Cargo.toml
@@ -23,11 +23,11 @@ sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../pr
sp-tracing = { version = "4.0.0", default-features = false, path = "../../primitives/tracing" }
sp-std = { version = "4.0.0", default-features = false, path = "../../primitives/std" }
sp-io = { version = "4.0.0-dev", default-features = false, path = "../../primitives/io" }
-sp-core = { version = "4.0.0", default-features = false, path = "../../primitives/core" }
+sp-core = { version = "4.1.0-dev", default-features = false, path = "../../primitives/core" }
[dev-dependencies]
hex-literal = "0.3.4"
-sp-core = { version = "4.0.0", path = "../../primitives/core" }
+sp-core = { version = "4.1.0-dev", path = "../../primitives/core" }
sp-io = { version = "4.0.0-dev", path = "../../primitives/io" }
pallet-balances = { version = "4.0.0-dev", path = "../balances" }
pallet-transaction-payment = { version = "4.0.0-dev", path = "../transaction-payment" }
diff --git a/substrate/frame/gilt/Cargo.toml b/substrate/frame/gilt/Cargo.toml
index 14948546a177145de4ea47e0f1f006492e4a4cd5..05e252627b2b7e0a3d032ebde77f0307e8511f34 100644
--- a/substrate/frame/gilt/Cargo.toml
+++ b/substrate/frame/gilt/Cargo.toml
@@ -24,7 +24,7 @@ frame-system = { version = "4.0.0-dev", default-features = false, path = "../sys
[dev-dependencies]
sp-io = { version = "4.0.0-dev", path = "../../primitives/io" }
-sp-core = { version = "4.0.0", path = "../../primitives/core" }
+sp-core = { version = "4.1.0-dev", path = "../../primitives/core" }
pallet-balances = { version = "4.0.0-dev", path = "../balances" }
[features]
diff --git a/substrate/frame/grandpa/Cargo.toml b/substrate/frame/grandpa/Cargo.toml
index d052b468f9272b83808a23eec63cdf5aef07e2b4..601ec9aee10eecd9fde13385bb6123b7220b60db 100644
--- a/substrate/frame/grandpa/Cargo.toml
+++ b/substrate/frame/grandpa/Cargo.toml
@@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
scale-info = { version = "1.0", default-features = false, features = ["derive"] }
sp-application-crypto = { version = "4.0.0-dev", default-features = false, path = "../../primitives/application-crypto" }
-sp-core = { version = "4.0.0", default-features = false, path = "../../primitives/core" }
+sp-core = { version = "4.1.0-dev", default-features = false, path = "../../primitives/core" }
sp-finality-grandpa = { version = "4.0.0-dev", default-features = false, path = "../../primitives/finality-grandpa" }
sp-io = { version = "4.0.0-dev", default-features = false, path = "../../primitives/io" }
sp-session = { version = "4.0.0-dev", default-features = false, path = "../../primitives/session" }
diff --git a/substrate/frame/identity/Cargo.toml b/substrate/frame/identity/Cargo.toml
index dc247727e09814356da5362a4f8c0123453b3e4e..76a187f90c5d281d096262fdeac2f715182eab46 100644
--- a/substrate/frame/identity/Cargo.toml
+++ b/substrate/frame/identity/Cargo.toml
@@ -24,7 +24,7 @@ frame-support = { version = "4.0.0-dev", default-features = false, path = "../su
frame-system = { version = "4.0.0-dev", default-features = false, path = "../system" }
[dev-dependencies]
-sp-core = { version = "4.0.0", path = "../../primitives/core" }
+sp-core = { version = "4.1.0-dev", path = "../../primitives/core" }
pallet-balances = { version = "4.0.0-dev", path = "../balances" }
[features]
diff --git a/substrate/frame/im-online/Cargo.toml b/substrate/frame/im-online/Cargo.toml
index fc0a6acf1798190a046ae3a064810c37674c80af..fdafc5376ad5a4b797505b48c7beda65e73a7a3e 100644
--- a/substrate/frame/im-online/Cargo.toml
+++ b/substrate/frame/im-online/Cargo.toml
@@ -17,7 +17,7 @@ sp-application-crypto = { version = "4.0.0-dev", default-features = false, path
pallet-authorship = { version = "4.0.0-dev", default-features = false, path = "../authorship" }
codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
scale-info = { version = "1.0", default-features = false, features = ["derive"] }
-sp-core = { version = "4.0.0", default-features = false, path = "../../primitives/core" }
+sp-core = { version = "4.1.0-dev", default-features = false, path = "../../primitives/core" }
sp-std = { version = "4.0.0", default-features = false, path = "../../primitives/std" }
sp-io = { version = "4.0.0-dev", default-features = false, path = "../../primitives/io" }
sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
diff --git a/substrate/frame/indices/Cargo.toml b/substrate/frame/indices/Cargo.toml
index f4f5146ae11859db094ae22617ebee5b7390b1c9..cd3957a45f8246b1dd8e0480c1db156442179cc6 100644
--- a/substrate/frame/indices/Cargo.toml
+++ b/substrate/frame/indices/Cargo.toml
@@ -19,7 +19,7 @@ sp-keyring = { version = "4.0.0-dev", optional = true, path = "../../primitives/
sp-std = { version = "4.0.0", default-features = false, path = "../../primitives/std" }
sp-io = { version = "4.0.0-dev", default-features = false, path = "../../primitives/io" }
sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
-sp-core = { version = "4.0.0", default-features = false, path = "../../primitives/core" }
+sp-core = { version = "4.1.0-dev", default-features = false, path = "../../primitives/core" }
frame-support = { version = "4.0.0-dev", default-features = false, path = "../support" }
frame-system = { version = "4.0.0-dev", default-features = false, path = "../system" }
diff --git a/substrate/frame/lottery/Cargo.toml b/substrate/frame/lottery/Cargo.toml
index db317d0d01ec345cdeb2f2cfa8ed99b9e0e6070c..259be8267fe7536a13336766dcc39eb496e49302 100644
--- a/substrate/frame/lottery/Cargo.toml
+++ b/substrate/frame/lottery/Cargo.toml
@@ -27,7 +27,7 @@ frame-benchmarking = { version = "4.0.0-dev", default-features = false, path = "
[dev-dependencies]
frame-support-test = { version = "3.0.0", path = "../support/test" }
pallet-balances = { version = "4.0.0-dev", path = "../balances" }
-sp-core = { version = "4.0.0", path = "../../primitives/core" }
+sp-core = { version = "4.1.0-dev", path = "../../primitives/core" }
sp-io = { version = "4.0.0-dev", path = "../../primitives/io" }
[features]
diff --git a/substrate/frame/membership/Cargo.toml b/substrate/frame/membership/Cargo.toml
index 105bdc55b5c01d7b528d1873558419d0a94935c7..d0567a3eeb15a76eebd91bf71a080612cd20b4b3 100644
--- a/substrate/frame/membership/Cargo.toml
+++ b/substrate/frame/membership/Cargo.toml
@@ -17,7 +17,7 @@ codec = { package = "parity-scale-codec", version = "2.0.0", default-features =
scale-info = { version = "1.0", default-features = false, features = ["derive"] }
log = { version = "0.4.0", default-features = false }
-sp-core = { version = "4.0.0", default-features = false, path = "../../primitives/core" }
+sp-core = { version = "4.1.0-dev", default-features = false, path = "../../primitives/core" }
sp-io = { version = "4.0.0-dev", default-features = false, path = "../../primitives/io" }
sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
sp-std = { version = "4.0.0", default-features = false, path = "../../primitives/std" }
diff --git a/substrate/frame/merkle-mountain-range/Cargo.toml b/substrate/frame/merkle-mountain-range/Cargo.toml
index 51b7e4a2a607173c0116a0c1840f49183d01f46e..fd6615a4b54203e066281eea6e48436947c9b68f 100644
--- a/substrate/frame/merkle-mountain-range/Cargo.toml
+++ b/substrate/frame/merkle-mountain-range/Cargo.toml
@@ -16,7 +16,7 @@ codec = { package = "parity-scale-codec", version = "2.0.0", default-features =
scale-info = { version = "1.0", default-features = false, features = ["derive"] }
mmr-lib = { package = "ckb-merkle-mountain-range", default-features = false, version = "0.3.2" }
-sp-core = { version = "4.0.0", default-features = false, path = "../../primitives/core" }
+sp-core = { version = "4.1.0-dev", default-features = false, path = "../../primitives/core" }
sp-io = { version = "4.0.0-dev", default-features = false, path = "../../primitives/io" }
sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
sp-std = { version = "4.0.0", default-features = false, path = "../../primitives/std" }
diff --git a/substrate/frame/merkle-mountain-range/primitives/Cargo.toml b/substrate/frame/merkle-mountain-range/primitives/Cargo.toml
index 11562c02bf325da593bf44e4d23b4e985c7fa2fd..0d11e50a8b682c4dba1af877571f72712cee16d9 100644
--- a/substrate/frame/merkle-mountain-range/primitives/Cargo.toml
+++ b/substrate/frame/merkle-mountain-range/primitives/Cargo.toml
@@ -17,7 +17,7 @@ log = { version = "0.4.14", default-features = false }
serde = { version = "1.0.126", optional = true, features = ["derive"] }
sp-api = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/api" }
-sp-core = { version = "4.0.0", default-features = false, path = "../../../primitives/core" }
+sp-core = { version = "4.1.0-dev", default-features = false, path = "../../../primitives/core" }
sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/runtime" }
sp-std = { version = "4.0.0", default-features = false, path = "../../../primitives/std" }
diff --git a/substrate/frame/merkle-mountain-range/rpc/Cargo.toml b/substrate/frame/merkle-mountain-range/rpc/Cargo.toml
index 1cad739e3ba0ecca94a93b952b248d2eb35290c1..7283a4fac8b2e069c18bc425d4a6415660351a3f 100644
--- a/substrate/frame/merkle-mountain-range/rpc/Cargo.toml
+++ b/substrate/frame/merkle-mountain-range/rpc/Cargo.toml
@@ -21,7 +21,7 @@ serde = { version = "1.0.126", features = ["derive"] }
sp-api = { version = "4.0.0-dev", path = "../../../primitives/api" }
sp-blockchain = { version = "4.0.0-dev", path = "../../../primitives/blockchain" }
-sp-core = { version = "4.0.0", path = "../../../primitives/core" }
+sp-core = { version = "4.1.0-dev", path = "../../../primitives/core" }
sp-runtime = { version = "4.0.0-dev", path = "../../../primitives/runtime" }
pallet-mmr-primitives = { version = "4.0.0-dev", path = "../primitives" }
diff --git a/substrate/frame/multisig/Cargo.toml b/substrate/frame/multisig/Cargo.toml
index bb6323bc5cb75bd99b59d03169f080b9c64e580b..d01dd58a2f3f43903e8050ef2683cb56e108bf1c 100644
--- a/substrate/frame/multisig/Cargo.toml
+++ b/substrate/frame/multisig/Cargo.toml
@@ -24,7 +24,7 @@ sp-io = { version = "4.0.0-dev", default-features = false, path = "../../primiti
frame-benchmarking = { version = "4.0.0-dev", default-features = false, path = "../benchmarking", optional = true }
[dev-dependencies]
-sp-core = { version = "4.0.0", path = "../../primitives/core" }
+sp-core = { version = "4.1.0-dev", path = "../../primitives/core" }
pallet-balances = { version = "4.0.0-dev", path = "../balances" }
[features]
diff --git a/substrate/frame/nicks/Cargo.toml b/substrate/frame/nicks/Cargo.toml
index 8d66bbb6b397384a7b3dcfbb4dd0e0fb36189111..28cabde09166d9232a6e488d4a32a4920bf641f2 100644
--- a/substrate/frame/nicks/Cargo.toml
+++ b/substrate/frame/nicks/Cargo.toml
@@ -22,7 +22,7 @@ frame-support = { version = "4.0.0-dev", default-features = false, path = "../su
frame-system = { version = "4.0.0-dev", default-features = false, path = "../system" }
[dev-dependencies]
-sp-core = { version = "4.0.0", path = "../../primitives/core" }
+sp-core = { version = "4.1.0-dev", path = "../../primitives/core" }
pallet-balances = { version = "4.0.0-dev", path = "../balances" }
[features]
diff --git a/substrate/frame/node-authorization/Cargo.toml b/substrate/frame/node-authorization/Cargo.toml
index ec62d972d3a0c7475197da5611cff930e2cfa7cf..efaaf6371f8c38aff6079356e9374987af6a7358 100644
--- a/substrate/frame/node-authorization/Cargo.toml
+++ b/substrate/frame/node-authorization/Cargo.toml
@@ -16,7 +16,7 @@ codec = { package = "parity-scale-codec", version = "2.0.0", default-features =
scale-info = { version = "1.0", default-features = false, features = ["derive"] }
frame-support = { version = "4.0.0-dev", default-features = false, path = "../support" }
frame-system = { version = "4.0.0-dev", default-features = false, path = "../system" }
-sp-core = { version = "4.0.0", default-features = false, path = "../../primitives/core" }
+sp-core = { version = "4.1.0-dev", default-features = false, path = "../../primitives/core" }
sp-io = { version = "4.0.0-dev", default-features = false, path = "../../primitives/io" }
sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
sp-std = { version = "4.0.0", default-features = false, path = "../../primitives/std" }
diff --git a/substrate/frame/offences/Cargo.toml b/substrate/frame/offences/Cargo.toml
index 8957f0c88cae34a90a530c2015b3a16f73410bfc..5058f17d38570e8eecb743d9c7866aba491170f6 100644
--- a/substrate/frame/offences/Cargo.toml
+++ b/substrate/frame/offences/Cargo.toml
@@ -26,7 +26,7 @@ log = { version = "0.4.14", default-features = false }
[dev-dependencies]
sp-io = { version = "4.0.0-dev", path = "../../primitives/io" }
-sp-core = { version = "4.0.0", path = "../../primitives/core" }
+sp-core = { version = "4.1.0-dev", path = "../../primitives/core" }
[features]
default = ["std"]
diff --git a/substrate/frame/offences/benchmarking/Cargo.toml b/substrate/frame/offences/benchmarking/Cargo.toml
index 96674989e0f71a4d1500b50669637f584dfb321f..625f275a70ce057b536fc57a276171d2355dd648 100644
--- a/substrate/frame/offences/benchmarking/Cargo.toml
+++ b/substrate/frame/offences/benchmarking/Cargo.toml
@@ -37,7 +37,7 @@ frame-election-provider-support = { version = "4.0.0-dev", default-features = fa
[dev-dependencies]
pallet-staking-reward-curve = { version = "4.0.0-dev", path = "../../staking/reward-curve" }
pallet-timestamp = { version = "4.0.0-dev", path = "../../timestamp" }
-sp-core = { version = "4.0.0", path = "../../../primitives/core" }
+sp-core = { version = "4.1.0-dev", path = "../../../primitives/core" }
sp-io = { version = "4.0.0-dev", path = "../../../primitives/io" }
[features]
diff --git a/substrate/frame/proxy/Cargo.toml b/substrate/frame/proxy/Cargo.toml
index 762ab482b985495f8105d6c5472d1f342dcc3492..7a1fc61da9d46031dc7fcd914d8b440ca58cefb6 100644
--- a/substrate/frame/proxy/Cargo.toml
+++ b/substrate/frame/proxy/Cargo.toml
@@ -24,7 +24,7 @@ sp-std = { version = "4.0.0", default-features = false, path = "../../primitives
frame-benchmarking = { version = "4.0.0-dev", default-features = false, path = "../benchmarking", optional = true }
[dev-dependencies]
-sp-core = { version = "4.0.0", path = "../../primitives/core" }
+sp-core = { version = "4.1.0-dev", path = "../../primitives/core" }
pallet-balances = { version = "4.0.0-dev", path = "../balances" }
pallet-utility = { version = "4.0.0-dev", path = "../utility" }
diff --git a/substrate/frame/randomness-collective-flip/Cargo.toml b/substrate/frame/randomness-collective-flip/Cargo.toml
index 3bf2a9c30213b53c6a2ca9cfb7fcaf4a80cae496..903e167ef95a3a91cc52033e23c132b9dcbe24b7 100644
--- a/substrate/frame/randomness-collective-flip/Cargo.toml
+++ b/substrate/frame/randomness-collective-flip/Cargo.toml
@@ -23,7 +23,7 @@ frame-support = { version = "4.0.0-dev", default-features = false, path = "../su
frame-system = { version = "4.0.0-dev", default-features = false, path = "../system" }
[dev-dependencies]
-sp-core = { version = "4.0.0", path = "../../primitives/core" }
+sp-core = { version = "4.1.0-dev", path = "../../primitives/core" }
sp-io = { version = "4.0.0-dev", path = "../../primitives/io" }
[features]
diff --git a/substrate/frame/recovery/Cargo.toml b/substrate/frame/recovery/Cargo.toml
index 18d4dfe7e47c96b0b758898bcffa855822e737d8..c1126ad1edd131f5b1d2820700ba4cc108055f67 100644
--- a/substrate/frame/recovery/Cargo.toml
+++ b/substrate/frame/recovery/Cargo.toml
@@ -22,7 +22,7 @@ frame-support = { version = "4.0.0-dev", default-features = false, path = "../su
frame-system = { version = "4.0.0-dev", default-features = false, path = "../system" }
[dev-dependencies]
-sp-core = { version = "4.0.0", path = "../../primitives/core" }
+sp-core = { version = "4.1.0-dev", path = "../../primitives/core" }
pallet-balances = { version = "4.0.0-dev", path = "../balances" }
[features]
diff --git a/substrate/frame/scheduler/Cargo.toml b/substrate/frame/scheduler/Cargo.toml
index 57eb5e16bd368bbbb49cf3d2f6babdf9dc431215..a1d43b359a8889fdf69118d49b76336628c98355 100644
--- a/substrate/frame/scheduler/Cargo.toml
+++ b/substrate/frame/scheduler/Cargo.toml
@@ -22,7 +22,7 @@ log = { version = "0.4.14", default-features = false }
frame-benchmarking = { version = "4.0.0-dev", default-features = false, path = "../benchmarking", optional = true }
[dev-dependencies]
-sp-core = { version = "4.0.0", path = "../../primitives/core", default-features = false }
+sp-core = { version = "4.1.0-dev", path = "../../primitives/core", default-features = false }
substrate-test-utils = { version = "4.0.0-dev", path = "../../test-utils" }
[features]
diff --git a/substrate/frame/scored-pool/Cargo.toml b/substrate/frame/scored-pool/Cargo.toml
index 8f91908dddb9ab30c56855999d19e130ceb7bf13..e77661204d733a687683a7ab5e1514c669b085ef 100644
--- a/substrate/frame/scored-pool/Cargo.toml
+++ b/substrate/frame/scored-pool/Cargo.toml
@@ -23,7 +23,7 @@ frame-system = { version = "4.0.0-dev", default-features = false, path = "../sys
[dev-dependencies]
pallet-balances = { version = "4.0.0-dev", path = "../balances" }
-sp-core = { version = "4.0.0", path = "../../primitives/core" }
+sp-core = { version = "4.1.0-dev", path = "../../primitives/core" }
[features]
default = ["std"]
diff --git a/substrate/frame/session/Cargo.toml b/substrate/frame/session/Cargo.toml
index 50aa623c90a828a5557f1c8d898262dbe3e26158..909dfe329c9c03676070149ccd1046d634e7a962 100644
--- a/substrate/frame/session/Cargo.toml
+++ b/substrate/frame/session/Cargo.toml
@@ -20,7 +20,7 @@ codec = { package = "parity-scale-codec", version = "2.0.0", default-features =
scale-info = { version = "1.0", default-features = false, features = ["derive"] }
sp-std = { version = "4.0.0", default-features = false, path = "../../primitives/std" }
-sp-core = { version = "4.0.0", default-features = false, path = "../../primitives/core" }
+sp-core = { version = "4.1.0-dev", default-features = false, path = "../../primitives/core" }
sp-io = { version = "4.0.0-dev", default-features = false, path = "../../primitives/io" }
sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
sp-session = { version = "4.0.0-dev", default-features = false, path = "../../primitives/session" }
diff --git a/substrate/frame/session/benchmarking/Cargo.toml b/substrate/frame/session/benchmarking/Cargo.toml
index 5dc0573b278fb59f7c253bd88f4ff2199536078c..37dc40e9b25cbd477f97be75891f3e1f9c7b9ae3 100644
--- a/substrate/frame/session/benchmarking/Cargo.toml
+++ b/substrate/frame/session/benchmarking/Cargo.toml
@@ -28,7 +28,7 @@ pallet-staking = { version = "4.0.0-dev", default-features = false, features = [
[dev-dependencies]
codec = { package = "parity-scale-codec", version = "2.0.0", features = ["derive"] }
scale-info = "1.0"
-sp-core = { version = "4.0.0", path = "../../../primitives/core" }
+sp-core = { version = "4.1.0-dev", path = "../../../primitives/core" }
sp-io = { version = "4.0.0-dev", path = "../../../primitives/io" }
pallet-balances = { version = "4.0.0-dev", path = "../../balances" }
pallet-timestamp = { version = "4.0.0-dev", path = "../../timestamp" }
diff --git a/substrate/frame/society/Cargo.toml b/substrate/frame/society/Cargo.toml
index 47ad0865b8f4fce66f2a8e9266954366ba05c8f2..cf14d7f9f51c588451158a82e7e6ca92ee9a90fa 100644
--- a/substrate/frame/society/Cargo.toml
+++ b/substrate/frame/society/Cargo.toml
@@ -22,7 +22,7 @@ frame-system = { version = "4.0.0-dev", default-features = false, path = "../sys
rand_chacha = { version = "0.2", default-features = false }
[dev-dependencies]
-sp-core = { version = "4.0.0", path = "../../primitives/core" }
+sp-core = { version = "4.1.0-dev", path = "../../primitives/core" }
sp-io ={ version = "4.0.0-dev", path = "../../primitives/io" }
frame-support-test = { version = "3.0.0", path = "../support/test" }
pallet-balances = { version = "4.0.0-dev", path = "../balances" }
diff --git a/substrate/frame/staking/Cargo.toml b/substrate/frame/staking/Cargo.toml
index 70beead038b21113ec2cdd43a20f7d732256faf6..42fe1075317dd7e757d68dd3604915d63afbfdbe 100644
--- a/substrate/frame/staking/Cargo.toml
+++ b/substrate/frame/staking/Cargo.toml
@@ -38,7 +38,7 @@ rand_chacha = { version = "0.2", default-features = false, optional = true }
[dev-dependencies]
sp-tracing = { version = "4.0.0", path = "../../primitives/tracing" }
-sp-core = { version = "4.0.0", path = "../../primitives/core" }
+sp-core = { version = "4.1.0-dev", path = "../../primitives/core" }
sp-npos-elections = { version = "4.0.0-dev", path = "../../primitives/npos-elections" }
pallet-balances = { version = "4.0.0-dev", path = "../balances" }
pallet-timestamp = { version = "4.0.0-dev", path = "../timestamp" }
diff --git a/substrate/frame/sudo/Cargo.toml b/substrate/frame/sudo/Cargo.toml
index d211d327b2d05713528e60be4e5a30980a88c1d1..33642ef7dc3eeb90fae57b670310f2254570b41b 100644
--- a/substrate/frame/sudo/Cargo.toml
+++ b/substrate/frame/sudo/Cargo.toml
@@ -22,7 +22,7 @@ frame-support = { version = "4.0.0-dev", default-features = false, path = "../su
frame-system = { version = "4.0.0-dev", default-features = false, path = "../system" }
[dev-dependencies]
-sp-core = { version = "4.0.0", path = "../../primitives/core" }
+sp-core = { version = "4.1.0-dev", path = "../../primitives/core" }
[features]
default = ["std"]
diff --git a/substrate/frame/support/Cargo.toml b/substrate/frame/support/Cargo.toml
index 411b02449e4e22dbb8069f5a4d71c3784a9eba3f..c3eab98f9e779238eede7206e657875d0a2c8b60 100644
--- a/substrate/frame/support/Cargo.toml
+++ b/substrate/frame/support/Cargo.toml
@@ -21,7 +21,7 @@ sp-std = { version = "4.0.0", default-features = false, path = "../../primitives
sp-io = { version = "4.0.0-dev", default-features = false, path = "../../primitives/io" }
sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
sp-tracing = { version = "4.0.0", default-features = false, path = "../../primitives/tracing" }
-sp-core = { version = "4.0.0", default-features = false, path = "../../primitives/core" }
+sp-core = { version = "4.1.0-dev", default-features = false, path = "../../primitives/core" }
sp-arithmetic = { version = "4.0.0-dev", default-features = false, path = "../../primitives/arithmetic" }
sp-inherents = { version = "4.0.0-dev", default-features = false, path = "../../primitives/inherents" }
sp-staking = { version = "4.0.0-dev", default-features = false, path = "../../primitives/staking" }
diff --git a/substrate/frame/support/test/Cargo.toml b/substrate/frame/support/test/Cargo.toml
index 13d66d147e57897e1b773124aa2cb2f70fc22b92..0cd3f9ac029133647755a4bdf0cef59b43665355 100644
--- a/substrate/frame/support/test/Cargo.toml
+++ b/substrate/frame/support/test/Cargo.toml
@@ -20,7 +20,7 @@ sp-io = { version = "4.0.0-dev", path = "../../../primitives/io", default-featur
sp-state-machine = { version = "0.10.0-dev", optional = true, path = "../../../primitives/state-machine" }
frame-support = { version = "4.0.0-dev", default-features = false, path = "../" }
sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/runtime" }
-sp-core = { version = "4.0.0", default-features = false, path = "../../../primitives/core" }
+sp-core = { version = "4.1.0-dev", default-features = false, path = "../../../primitives/core" }
sp-std = { version = "4.0.0", default-features = false, path = "../../../primitives/std" }
sp-version = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/version" }
trybuild = "1.0.52"
diff --git a/substrate/frame/support/test/compile_pass/Cargo.toml b/substrate/frame/support/test/compile_pass/Cargo.toml
index aa53f7ad358ddcb2c0cdfb83b36619e9a5f82d62..b72bbc2f01f5b4eaad53df2514b44ddee55ac4a8 100644
--- a/substrate/frame/support/test/compile_pass/Cargo.toml
+++ b/substrate/frame/support/test/compile_pass/Cargo.toml
@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
[dependencies]
codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
scale-info = { version = "1.0", default-features = false, features = ["derive"] }
-sp-core = { version = "4.0.0", default-features = false, path = "../../../../primitives/core" }
+sp-core = { version = "4.1.0-dev", default-features = false, path = "../../../../primitives/core" }
sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../../../primitives/runtime" }
sp-version = { version = "4.0.0-dev", default-features = false, path = "../../../../primitives/version" }
frame-support = { version = "4.0.0-dev", default-features = false, path = "../../" }
diff --git a/substrate/frame/system/Cargo.toml b/substrate/frame/system/Cargo.toml
index fc510d1d9d79297c12e2e893258aa9bccf1ede68..0d771cd1f80d2490ac3c6aaa0c169b37582d929f 100644
--- a/substrate/frame/system/Cargo.toml
+++ b/substrate/frame/system/Cargo.toml
@@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
serde = { version = "1.0.126", optional = true, features = ["derive"] }
codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
scale-info = { version = "1.0", default-features = false, features = ["derive"] }
-sp-core = { version = "4.0.0", default-features = false, path = "../../primitives/core" }
+sp-core = { version = "4.1.0-dev", default-features = false, path = "../../primitives/core" }
sp-std = { version = "4.0.0", default-features = false, path = "../../primitives/std" }
sp-io = { version = "4.0.0-dev", path = "../../primitives/io", default-features = false }
sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
diff --git a/substrate/frame/system/benchmarking/Cargo.toml b/substrate/frame/system/benchmarking/Cargo.toml
index 9468c8761435a980d5e96dd8286fdf40e32a4879..acf13c8f6b2a4536964cd6a6132e962f0fae1496 100644
--- a/substrate/frame/system/benchmarking/Cargo.toml
+++ b/substrate/frame/system/benchmarking/Cargo.toml
@@ -20,7 +20,7 @@ sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../..
frame-benchmarking = { version = "4.0.0-dev", default-features = false, path = "../../benchmarking" }
frame-system = { version = "4.0.0-dev", default-features = false, path = "../../system" }
frame-support = { version = "4.0.0-dev", default-features = false, path = "../../support" }
-sp-core = { version = "4.0.0", default-features = false, path = "../../../primitives/core" }
+sp-core = { version = "4.1.0-dev", default-features = false, path = "../../../primitives/core" }
[dev-dependencies]
sp-io = { version = "4.0.0-dev", path = "../../../primitives/io" }
diff --git a/substrate/frame/timestamp/Cargo.toml b/substrate/frame/timestamp/Cargo.toml
index 26554598be10343a539dba9b187d762cce9a0dc0..f8ff0a587b1a13e894c0bbe570a21fcb5c165d01 100644
--- a/substrate/frame/timestamp/Cargo.toml
+++ b/substrate/frame/timestamp/Cargo.toml
@@ -29,7 +29,7 @@ log = { version = "0.4.14", default-features = false }
[dev-dependencies]
sp-io ={ version = "4.0.0-dev", path = "../../primitives/io" }
-sp-core = { version = "4.0.0", path = "../../primitives/core" }
+sp-core = { version = "4.1.0-dev", path = "../../primitives/core" }
[features]
default = ["std"]
diff --git a/substrate/frame/tips/Cargo.toml b/substrate/frame/tips/Cargo.toml
index 565afcd3fbc66b9d1c3977218067492e4d613408..cb682769ec85826afb1cc73c9fc3c7b63cbc76b3 100644
--- a/substrate/frame/tips/Cargo.toml
+++ b/substrate/frame/tips/Cargo.toml
@@ -18,7 +18,7 @@ log = { version = "0.4.0", default-features = false }
scale-info = { version = "1.0", default-features = false, features = ["derive"] }
serde = { version = "1.0.126", features = ["derive"], optional = true }
-sp-core = { version = "4.0.0", default-features = false, path = "../../primitives/core" }
+sp-core = { version = "4.1.0-dev", default-features = false, path = "../../primitives/core" }
sp-io = { version = "4.0.0-dev", default-features = false, path = "../../primitives/io" }
sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
sp-std = { version = "4.0.0", default-features = false, path = "../../primitives/std" }
diff --git a/substrate/frame/transaction-payment/Cargo.toml b/substrate/frame/transaction-payment/Cargo.toml
index 64e1d5c762ca7453bcf4ee81f3330dc5a3f951a7..642c9bd399b925e5259eee200468cb7b69e35c25 100644
--- a/substrate/frame/transaction-payment/Cargo.toml
+++ b/substrate/frame/transaction-payment/Cargo.toml
@@ -20,7 +20,7 @@ scale-info = { version = "1.0", default-features = false, features = ["derive"]
serde = { version = "1.0.126", optional = true }
smallvec = "1.7.0"
-sp-core = { version = "4.0.0", path = "../../primitives/core", default-features = false }
+sp-core = { version = "4.1.0-dev", path = "../../primitives/core", default-features = false }
sp-io = { version = "4.0.0-dev", path = "../../primitives/io", default-features = false }
sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
sp-std = { version = "4.0.0", default-features = false, path = "../../primitives/std" }
diff --git a/substrate/frame/transaction-payment/asset-tx-payment/Cargo.toml b/substrate/frame/transaction-payment/asset-tx-payment/Cargo.toml
index cae6b7b914e17eca2471ae96d5fb03d0c2354892..21fae45282d03188d4679c9ffa635e83538daffd 100644
--- a/substrate/frame/transaction-payment/asset-tx-payment/Cargo.toml
+++ b/substrate/frame/transaction-payment/asset-tx-payment/Cargo.toml
@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
[dependencies]
# Substrate dependencies
-sp-core = { version = "4.0.0", default-features = false, path = "../../../primitives/core" }
+sp-core = { version = "4.1.0-dev", default-features = false, path = "../../../primitives/core" }
sp-io = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/io" }
sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/runtime" }
sp-std = { version = "4.0.0", default-features = false, path = "../../../primitives/std" }
diff --git a/substrate/frame/transaction-payment/rpc/Cargo.toml b/substrate/frame/transaction-payment/rpc/Cargo.toml
index dd18edf5daf0f48de67c6bbb6da510d835070247..36dad610f696a6f371444a9ade036a601766014f 100644
--- a/substrate/frame/transaction-payment/rpc/Cargo.toml
+++ b/substrate/frame/transaction-payment/rpc/Cargo.toml
@@ -20,7 +20,7 @@ jsonrpc-derive = "18.0.0"
sp-api = { version = "4.0.0-dev", path = "../../../primitives/api" }
sp-blockchain = { version = "4.0.0-dev", path = "../../../primitives/blockchain" }
-sp-core = { version = "4.0.0", path = "../../../primitives/core" }
+sp-core = { version = "4.1.0-dev", path = "../../../primitives/core" }
sp-rpc = { version = "4.0.0-dev", path = "../../../primitives/rpc" }
sp-runtime = { version = "4.0.0-dev", path = "../../../primitives/runtime" }
pallet-transaction-payment-rpc-runtime-api = { version = "4.0.0-dev", path = "./runtime-api" }
diff --git a/substrate/frame/transaction-storage/Cargo.toml b/substrate/frame/transaction-storage/Cargo.toml
index 141aeb496ddecd100a2f540d50f062fcc8091502..f5ce6f8441663f79cf361b1edc4ddb89b1a7c877 100644
--- a/substrate/frame/transaction-storage/Cargo.toml
+++ b/substrate/frame/transaction-storage/Cargo.toml
@@ -29,7 +29,7 @@ frame-benchmarking = { version = "4.0.0-dev", default-features = false, path = "
[dev-dependencies]
sp-transaction-storage-proof = { version = "4.0.0-dev", default-features = true, path = "../../primitives/transaction-storage-proof" }
-sp-core = { version = "4.0.0", path = "../../primitives/core", default-features = false }
+sp-core = { version = "4.1.0-dev", path = "../../primitives/core", default-features = false }
[features]
default = ["std"]
diff --git a/substrate/frame/treasury/Cargo.toml b/substrate/frame/treasury/Cargo.toml
index 4cbcb08c3ef689ce1704331bf57dbd0eb7bc4726..fed6b98f55eb256e31e22c807a14ca3d97ef29b7 100644
--- a/substrate/frame/treasury/Cargo.toml
+++ b/substrate/frame/treasury/Cargo.toml
@@ -32,7 +32,7 @@ pallet-balances = { version = "4.0.0-dev", default-features = false, path = "../
[dev-dependencies]
sp-io = { version = "4.0.0-dev", path = "../../primitives/io" }
-sp-core = { version = "4.0.0", path = "../../primitives/core" }
+sp-core = { version = "4.1.0-dev", path = "../../primitives/core" }
[features]
default = ["std"]
diff --git a/substrate/frame/uniques/Cargo.toml b/substrate/frame/uniques/Cargo.toml
index 7eddc85b67bbe93a8f10000f05a918c831407c37..2ce0c1b484eafc4fe6a610ac3cc7214db93e2eb8 100644
--- a/substrate/frame/uniques/Cargo.toml
+++ b/substrate/frame/uniques/Cargo.toml
@@ -23,7 +23,7 @@ frame-benchmarking = { version = "4.0.0-dev", default-features = false, path = "
[dev-dependencies]
sp-std = { version = "4.0.0", path = "../../primitives/std" }
-sp-core = { version = "4.0.0", path = "../../primitives/core" }
+sp-core = { version = "4.1.0-dev", path = "../../primitives/core" }
sp-io = { version = "4.0.0-dev", path = "../../primitives/io" }
pallet-balances = { version = "4.0.0-dev", path = "../balances" }
diff --git a/substrate/frame/utility/Cargo.toml b/substrate/frame/utility/Cargo.toml
index ac9254bd085460c0c1cbb14e46a9107958086462..9dfbd7b410ef4e978014624291f4be93be125fdc 100644
--- a/substrate/frame/utility/Cargo.toml
+++ b/substrate/frame/utility/Cargo.toml
@@ -17,7 +17,7 @@ codec = { package = "parity-scale-codec", version = "2.0.0", default-features =
scale-info = { version = "1.0", default-features = false, features = ["derive"] }
frame-support = { version = "4.0.0-dev", default-features = false, path = "../support" }
frame-system = { version = "4.0.0-dev", default-features = false, path = "../system" }
-sp-core = { version = "4.0.0", default-features = false, path = "../../primitives/core" }
+sp-core = { version = "4.1.0-dev", default-features = false, path = "../../primitives/core" }
sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
sp-std = { version = "4.0.0", default-features = false, path = "../../primitives/std" }
sp-io = { version = "4.0.0-dev", default-features = false, path = "../../primitives/io" }
@@ -25,7 +25,7 @@ sp-io = { version = "4.0.0-dev", default-features = false, path = "../../primiti
frame-benchmarking = { version = "4.0.0-dev", default-features = false, path = "../benchmarking", optional = true }
[dev-dependencies]
-sp-core = { version = "4.0.0", path = "../../primitives/core" }
+sp-core = { version = "4.1.0-dev", path = "../../primitives/core" }
pallet-balances = { version = "4.0.0-dev", path = "../balances" }
[features]
diff --git a/substrate/frame/vesting/Cargo.toml b/substrate/frame/vesting/Cargo.toml
index 5d66db1c981b9611cbaf85ff5d31cdb185c783ac..30cdc91d44f3895713817a469ba371807b17c02a 100644
--- a/substrate/frame/vesting/Cargo.toml
+++ b/substrate/frame/vesting/Cargo.toml
@@ -26,7 +26,7 @@ log = { version = "0.4.0", default-features = false }
[dev-dependencies]
sp-io = { version = "4.0.0-dev", default-features = false, path = "../../primitives/io" }
-sp-core = { version = "4.0.0", path = "../../primitives/core" }
+sp-core = { version = "4.1.0-dev", path = "../../primitives/core" }
pallet-balances = { version = "4.0.0-dev", path = "../balances" }
[features]
diff --git a/substrate/primitives/api/Cargo.toml b/substrate/primitives/api/Cargo.toml
index d64da8ff84d7f148f5761e847e43f55960393ca9..65e39571c7eb81015072cb65280bf9a7dbc2fe60 100644
--- a/substrate/primitives/api/Cargo.toml
+++ b/substrate/primitives/api/Cargo.toml
@@ -15,7 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"]
[dependencies]
codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
sp-api-proc-macro = { version = "4.0.0-dev", path = "proc-macro" }
-sp-core = { version = "4.0.0", default-features = false, path = "../core" }
+sp-core = { version = "4.1.0-dev", default-features = false, path = "../core" }
sp-std = { version = "4.0.0", default-features = false, path = "../std" }
sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../runtime" }
sp-version = { version = "4.0.0-dev", default-features = false, path = "../version" }
diff --git a/substrate/primitives/api/test/Cargo.toml b/substrate/primitives/api/test/Cargo.toml
index dc2ca67242ac646eb4f27d5a8b7e7a8f66b90bc7..91675e941c78f7ccc6f677c7b7a95890ea1651d3 100644
--- a/substrate/primitives/api/test/Cargo.toml
+++ b/substrate/primitives/api/test/Cargo.toml
@@ -28,7 +28,7 @@ rustversion = "1.0.5"
criterion = "0.3.0"
futures = "0.3.9"
log = "0.4.14"
-sp-core = { version = "4.0.0", path = "../../core" }
+sp-core = { version = "4.1.0-dev", path = "../../core" }
[[bench]]
name = "bench"
diff --git a/substrate/primitives/application-crypto/Cargo.toml b/substrate/primitives/application-crypto/Cargo.toml
index fd6dd87fa1b2028be0ce8679ea92c1826f8c324c..f3a9f9a938390baf31b6cba0332656e6b7f3a306 100644
--- a/substrate/primitives/application-crypto/Cargo.toml
+++ b/substrate/primitives/application-crypto/Cargo.toml
@@ -15,7 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"]
[dependencies]
-sp-core = { version = "4.0.0", default-features = false, path = "../core" }
+sp-core = { version = "4.1.0-dev", default-features = false, path = "../core" }
codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
scale-info = { version = "1.0", default-features = false, features = ["derive"] }
serde = { version = "1.0.126", optional = true, features = ["derive"] }
diff --git a/substrate/primitives/application-crypto/test/Cargo.toml b/substrate/primitives/application-crypto/test/Cargo.toml
index 6ab3cfed0815d143206dffe5e84e72f080461974..dc51dceeeb4d112019dce6243de0a6727eecde04 100644
--- a/substrate/primitives/application-crypto/test/Cargo.toml
+++ b/substrate/primitives/application-crypto/test/Cargo.toml
@@ -13,7 +13,7 @@ repository = "https://github.com/paritytech/substrate/"
targets = ["x86_64-unknown-linux-gnu"]
[dependencies]
-sp-core = { version = "4.0.0", default-features = false, path = "../../core" }
+sp-core = { version = "4.1.0-dev", default-features = false, path = "../../core" }
sp-keystore = { version = "0.10.0-dev", path = "../../keystore", default-features = false }
substrate-test-runtime-client = { version = "2.0.0", path = "../../../test-utils/runtime/client" }
sp-runtime = { version = "4.0.0-dev", path = "../../runtime" }
diff --git a/substrate/primitives/beefy/Cargo.toml b/substrate/primitives/beefy/Cargo.toml
index 4a1f844b920027ce88684a91b0adc2564334b264..4391b1939d10159bdadf1a0e2b0bdb99a3f74797 100644
--- a/substrate/primitives/beefy/Cargo.toml
+++ b/substrate/primitives/beefy/Cargo.toml
@@ -13,7 +13,7 @@ scale-info = { version = "1.0", default-features = false, features = ["derive"]
sp-api = { version = "4.0.0-dev", path = "../api", default-features = false }
sp-application-crypto = { version = "4.0.0-dev", path = "../application-crypto", default-features = false }
-sp-core = { version = "4.0.0", path = "../core", default-features = false }
+sp-core = { version = "4.1.0-dev", path = "../core", default-features = false }
sp-runtime = { version = "4.0.0-dev", path = "../runtime", default-features = false }
sp-std = { version = "4.0.0", path = "../std", default-features = false }
diff --git a/substrate/primitives/consensus/babe/Cargo.toml b/substrate/primitives/consensus/babe/Cargo.toml
index a07dc54e2979faf1244ca0aed7afba07548b0a94..997744dd52bb0bb9bf1ffb2fda6f0f562abf348a 100644
--- a/substrate/primitives/consensus/babe/Cargo.toml
+++ b/substrate/primitives/consensus/babe/Cargo.toml
@@ -22,7 +22,7 @@ sp-api = { version = "4.0.0-dev", default-features = false, path = "../../api" }
sp-consensus = { version = "0.10.0-dev", optional = true, path = "../common" }
sp-consensus-slots = { version = "0.10.0-dev", default-features = false, path = "../slots" }
sp-consensus-vrf = { version = "0.10.0-dev", path = "../vrf", default-features = false }
-sp-core = { version = "4.0.0", default-features = false, path = "../../core" }
+sp-core = { version = "4.1.0-dev", default-features = false, path = "../../core" }
sp-inherents = { version = "4.0.0-dev", default-features = false, path = "../../inherents" }
sp-keystore = { version = "0.10.0-dev", default-features = false, path = "../../keystore", optional = true }
sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../runtime" }
diff --git a/substrate/primitives/consensus/common/Cargo.toml b/substrate/primitives/consensus/common/Cargo.toml
index 4b5ef8796afa6d13631b81239c45b2e3832cd609..2ad4a0895935569369f165c67415300f69e3da02 100644
--- a/substrate/primitives/consensus/common/Cargo.toml
+++ b/substrate/primitives/consensus/common/Cargo.toml
@@ -20,7 +20,7 @@ codec = { package = "parity-scale-codec", version = "2.0.0", features = [
] }
futures = { version = "0.3.1", features = ["thread-pool"] }
log = "0.4.8"
-sp-core = { path = "../../core", version = "4.0.0" }
+sp-core = { path = "../../core", version = "4.1.0-dev" }
sp-inherents = { version = "4.0.0-dev", path = "../../inherents" }
sp-state-machine = { version = "0.10.0-dev", path = "../../state-machine" }
futures-timer = "3.0.1"
diff --git a/substrate/primitives/consensus/pow/Cargo.toml b/substrate/primitives/consensus/pow/Cargo.toml
index 1612868b3637ce81aaff59e7bc7e179b604af7bc..d7f2b18e3fdbef963051bb9d5d2e21a299d43db2 100644
--- a/substrate/primitives/consensus/pow/Cargo.toml
+++ b/substrate/primitives/consensus/pow/Cargo.toml
@@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
sp-api = { version = "4.0.0-dev", default-features = false, path = "../../api" }
sp-std = { version = "4.0.0", default-features = false, path = "../../std" }
sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../runtime" }
-sp-core = { version = "4.0.0", default-features = false, path = "../../core" }
+sp-core = { version = "4.1.0-dev", default-features = false, path = "../../core" }
codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
[features]
diff --git a/substrate/primitives/consensus/vrf/Cargo.toml b/substrate/primitives/consensus/vrf/Cargo.toml
index 97e426016d9a1b104ef7efbb4ab5d102f2a05916..4eb545b08a21cabde1a7ad5de84393125dd41b22 100644
--- a/substrate/primitives/consensus/vrf/Cargo.toml
+++ b/substrate/primitives/consensus/vrf/Cargo.toml
@@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
codec = { version = "2.0.0", package = "parity-scale-codec", default-features = false }
schnorrkel = { version = "0.9.1", features = ["preaudit_deprecated", "u64_backend"], default-features = false }
sp-std = { version = "4.0.0", path = "../../std", default-features = false }
-sp-core = { version = "4.0.0", path = "../../core", default-features = false }
+sp-core = { version = "4.1.0-dev", path = "../../core", default-features = false }
sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../runtime" }
[features]
diff --git a/substrate/primitives/core/Cargo.toml b/substrate/primitives/core/Cargo.toml
index 5c805ff1dab8852cc09afd3a7cf1bc3964f48e9f..a078cc09aafc30fa091adba5bec62fd3a8372caf 100644
--- a/substrate/primitives/core/Cargo.toml
+++ b/substrate/primitives/core/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "sp-core"
-version = "4.0.0"
+version = "4.1.0-dev"
authors = ["Parity Technologies <admin@parity.io>"]
edition = "2021"
license = "Apache-2.0"
diff --git a/substrate/primitives/core/src/crypto.rs b/substrate/primitives/core/src/crypto.rs
index 4f21d62f5850d3f2d1bdf286b36a0e0185dfecab..dc08d69bf4183537b2437d5a3f1bdc45aea9d166 100644
--- a/substrate/primitives/core/src/crypto.rs
+++ b/substrate/primitives/core/src/crypto.rs
@@ -460,6 +460,7 @@ pub trait Public:
fn as_slice(&self) -> &[u8] {
self.as_ref()
}
+
/// Return `CryptoTypePublicPair` from public key.
fn to_public_crypto_pair(&self) -> CryptoTypePublicPair;
}
@@ -709,6 +710,104 @@ mod dummy {
}
}
+/// A secret uri (`SURI`) that can be used to generate a key pair.
+///
+/// The `SURI` can be parsed from a string. The string is interpreted in the following way:
+///
+/// - If `string` is a possibly `0x` prefixed 64-digit hex string, then it will be interpreted
+/// directly as a `MiniSecretKey` (aka "seed" in `subkey`).
+/// - If `string` is a valid BIP-39 key phrase of 12, 15, 18, 21 or 24 words, then the key will
+/// be derived from it. In this case:
+/// - the phrase may be followed by one or more items delimited by `/` characters.
+/// - the path may be followed by `///`, in which case everything after the `///` is treated
+/// as a password.
+/// - If `string` begins with a `/` character it is prefixed with the Substrate public `DEV_PHRASE`
+/// and interpreted as above.
+///
+/// In this case they are interpreted as HDKD junctions; purely numeric items are interpreted as
+/// integers, non-numeric items as strings. Junctions prefixed with `/` are interpreted as soft
+/// junctions, and with `//` as hard junctions.
+///
+/// There is no correspondence mapping between `SURI` strings and the keys they represent.
+/// Two different non-identical strings can actually lead to the same secret being derived.
+/// Notably, integer junction indices may be legally prefixed with arbitrary number of zeros.
+/// Similarly an empty password (ending the `SURI` with `///`) is perfectly valid and will
+/// generally be equivalent to no password at all.
+///
+/// # Example
+///
+/// Parse [`DEV_PHRASE`] secret uri with junction:
+///
+/// ```
+/// # use sp_core::crypto::{SecretUri, DeriveJunction, DEV_PHRASE, ExposeSecret};
+/// # use std::str::FromStr;
+/// let suri = SecretUri::from_str("//Alice").expect("Parse SURI");
+///
+/// assert_eq!(vec![DeriveJunction::from("Alice").harden()], suri.junctions);
+/// assert_eq!(DEV_PHRASE, suri.phrase.expose_secret());
+/// assert!(suri.password.is_none());
+/// ```
+///
+/// Parse [`DEV_PHRASE`] secret ui with junction and password:
+///
+/// ```
+/// # use sp_core::crypto::{SecretUri, DeriveJunction, DEV_PHRASE, ExposeSecret};
+/// # use std::str::FromStr;
+/// let suri = SecretUri::from_str("//Alice///SECRET_PASSWORD").expect("Parse SURI");
+///
+/// assert_eq!(vec![DeriveJunction::from("Alice").harden()], suri.junctions);
+/// assert_eq!(DEV_PHRASE, suri.phrase.expose_secret());
+/// assert_eq!("SECRET_PASSWORD", suri.password.unwrap().expose_secret());
+/// ```
+///
+/// Parse [`DEV_PHRASE`] secret ui with hex phrase and junction:
+///
+/// ```
+/// # use sp_core::crypto::{SecretUri, DeriveJunction, DEV_PHRASE, ExposeSecret};
+/// # use std::str::FromStr;
+/// let suri = SecretUri::from_str("0xe5be9a5092b81bca64be81d212e7f2f9eba183bb7a90954f7b76361f6edb5c0a//Alice").expect("Parse SURI");
+///
+/// assert_eq!(vec![DeriveJunction::from("Alice").harden()], suri.junctions);
+/// assert_eq!("0xe5be9a5092b81bca64be81d212e7f2f9eba183bb7a90954f7b76361f6edb5c0a", suri.phrase.expose_secret());
+/// assert!(suri.password.is_none());
+/// ```
+#[cfg(feature = "std")]
+pub struct SecretUri {
+ /// The phrase to derive the private key.
+ ///
+ /// This can either be a 64-bit hex string or a BIP-39 key phrase.
+ pub phrase: SecretString,
+ /// Optional password as given as part of the uri.
+ pub password: Option<SecretString>,
+ /// The junctions as part of the uri.
+ pub junctions: Vec<DeriveJunction>,
+}
+
+#[cfg(feature = "std")]
+impl sp_std::str::FromStr for SecretUri {
+ type Err = SecretStringError;
+
+ fn from_str(s: &str) -> Result<Self, Self::Err> {
+ let cap = SECRET_PHRASE_REGEX.captures(s).ok_or(SecretStringError::InvalidFormat)?;
+
+ let junctions = JUNCTION_REGEX
+ .captures_iter(&cap["path"])
+ .map(|f| DeriveJunction::from(&f[1]))
+ .collect::<Vec<_>>();
+
+ let phrase = cap.name("phrase").map(|r| r.as_str()).unwrap_or(DEV_PHRASE);
+ let password = cap.name("password");
+
+ Ok(Self {
+ phrase: SecretString::from_str(phrase).expect("Returns infallible error; qed"),
+ password: password.map(|v| {
+ SecretString::from_str(v.as_str()).expect("Returns infallible error; qed")
+ }),
+ junctions,
+ })
+ }
+}
+
/// Trait suitable for typical cryptographic PKI key pair type.
///
/// For now it just specifies how to create a key from a phrase and derivation path.
@@ -821,14 +920,12 @@ pub trait Pair: CryptoType + Sized + Clone + Send + Sync + 'static {
s: &str,
password_override: Option<&str>,
) -> Result<(Self, Option<Self::Seed>), SecretStringError> {
- let cap = SECRET_PHRASE_REGEX.captures(s).ok_or(SecretStringError::InvalidFormat)?;
-
- let path = JUNCTION_REGEX.captures_iter(&cap["path"]).map(|f| DeriveJunction::from(&f[1]));
-
- let phrase = cap.name("phrase").map(|r| r.as_str()).unwrap_or(DEV_PHRASE);
- let password = password_override.or_else(|| cap.name("password").map(|m| m.as_str()));
+ use sp_std::str::FromStr;
+ let SecretUri { junctions, phrase, password } = SecretUri::from_str(s)?;
+ let password =
+ password_override.or_else(|| password.as_ref().map(|p| p.expose_secret().as_str()));
- let (root, seed) = if let Some(stripped) = phrase.strip_prefix("0x") {
+ let (root, seed) = if let Some(stripped) = phrase.expose_secret().strip_prefix("0x") {
hex::decode(stripped)
.ok()
.and_then(|seed_vec| {
@@ -842,9 +939,11 @@ pub trait Pair: CryptoType + Sized + Clone + Send + Sync + 'static {
})
.ok_or(SecretStringError::InvalidSeed)?
} else {
- Self::from_phrase(phrase, password).map_err(|_| SecretStringError::InvalidPhrase)?
+ Self::from_phrase(phrase.expose_secret().as_str(), password)
+ .map_err(|_| SecretStringError::InvalidPhrase)?
};
- root.derive(path, Some(seed)).map_err(|_| SecretStringError::InvalidPath)
+ root.derive(junctions.into_iter(), Some(seed))
+ .map_err(|_| SecretStringError::InvalidPath)
}
/// Interprets the string `s` in order to generate a key pair.
diff --git a/substrate/primitives/finality-grandpa/Cargo.toml b/substrate/primitives/finality-grandpa/Cargo.toml
index be4f3c6d1e3dc9faf3976ee141882e054b1cba2d..fed861553bf0dbf15b7623c7cd97b84cf0d56dd6 100644
--- a/substrate/primitives/finality-grandpa/Cargo.toml
+++ b/substrate/primitives/finality-grandpa/Cargo.toml
@@ -22,7 +22,7 @@ log = { version = "0.4.8", optional = true }
serde = { version = "1.0.126", optional = true, features = ["derive"] }
sp-api = { version = "4.0.0-dev", default-features = false, path = "../api" }
sp-application-crypto = { version = "4.0.0-dev", default-features = false, path = "../application-crypto" }
-sp-core = { version = "4.0.0", default-features = false, path = "../core" }
+sp-core = { version = "4.1.0-dev", default-features = false, path = "../core" }
sp-keystore = { version = "0.10.0-dev", default-features = false, path = "../keystore", optional = true }
sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../runtime" }
sp-std = { version = "4.0.0", default-features = false, path = "../std" }
diff --git a/substrate/primitives/inherents/Cargo.toml b/substrate/primitives/inherents/Cargo.toml
index c531ad4e5764fb4f42f19e6a3bb879f11b02efab..82c4f21b5c07f60367e99179963c97fdf74ffb28 100644
--- a/substrate/primitives/inherents/Cargo.toml
+++ b/substrate/primitives/inherents/Cargo.toml
@@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
[dependencies]
sp-std = { version = "4.0.0", default-features = false, path = "../std" }
-sp-core = { version = "4.0.0", default-features = false, path = "../core" }
+sp-core = { version = "4.1.0-dev", default-features = false, path = "../core" }
sp-runtime = { version = "4.0.0-dev", path = "../runtime", optional = true }
codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
thiserror = { version = "1.0.30", optional = true }
diff --git a/substrate/primitives/io/Cargo.toml b/substrate/primitives/io/Cargo.toml
index 520dc12a52603dc9ebff2f8a7edeea5bb5e025cb..4485a8a7f45a2ef57391ff17567f4150bb6c779f 100644
--- a/substrate/primitives/io/Cargo.toml
+++ b/substrate/primitives/io/Cargo.toml
@@ -17,7 +17,7 @@ targets = ["x86_64-unknown-linux-gnu"]
[dependencies]
codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
hash-db = { version = "0.15.2", default-features = false }
-sp-core = { version = "4.0.0", default-features = false, path = "../core" }
+sp-core = { version = "4.1.0-dev", default-features = false, path = "../core" }
sp-keystore = { version = "0.10.0-dev", default-features = false, optional = true, path = "../keystore" }
sp-std = { version = "4.0.0", default-features = false, path = "../std" }
libsecp256k1 = { version = "0.7", optional = true }
diff --git a/substrate/primitives/keyring/Cargo.toml b/substrate/primitives/keyring/Cargo.toml
index 66c1240a8a5673058d11ac82463b7e6d25d3ac74..be7d138979a1c089b156fe68dd2549d1a2036ab4 100644
--- a/substrate/primitives/keyring/Cargo.toml
+++ b/substrate/primitives/keyring/Cargo.toml
@@ -15,7 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"]
[dependencies]
-sp-core = { version = "4.0.0", path = "../core" }
+sp-core = { version = "4.1.0-dev", path = "../core" }
sp-runtime = { version = "4.0.0-dev", path = "../runtime" }
lazy_static = "1.4.0"
strum = { version = "0.22.0", features = ["derive"] }
diff --git a/substrate/primitives/keystore/Cargo.toml b/substrate/primitives/keystore/Cargo.toml
index b0061ac111e209a931401a1dfcffe892dd5bed00..7994c67b4c51c7889e186d596c6f463c6a88d318 100644
--- a/substrate/primitives/keystore/Cargo.toml
+++ b/substrate/primitives/keystore/Cargo.toml
@@ -21,7 +21,7 @@ schnorrkel = { version = "0.9.1", features = ["preaudit_deprecated", "u64_backen
merlin = { version = "2.0", default-features = false }
parking_lot = { version = "0.11.1", default-features = false }
serde = { version = "1.0", optional = true}
-sp-core = { version = "4.0.0", path = "../core" }
+sp-core = { version = "4.1.0-dev", path = "../core" }
sp-externalities = { version = "0.10.0", path = "../externalities", default-features = false }
[dev-dependencies]
diff --git a/substrate/primitives/npos-elections/Cargo.toml b/substrate/primitives/npos-elections/Cargo.toml
index 16aca8dc71d9cb5992310d2c668a61920982018b..a418cda2feef1802a116940d7124905954790880 100644
--- a/substrate/primitives/npos-elections/Cargo.toml
+++ b/substrate/primitives/npos-elections/Cargo.toml
@@ -19,7 +19,7 @@ serde = { version = "1.0.126", optional = true, features = ["derive"] }
sp-std = { version = "4.0.0", default-features = false, path = "../std" }
sp-npos-elections-solution-type = { version = "4.0.0-dev", path = "./solution-type" }
sp-arithmetic = { version = "4.0.0-dev", default-features = false, path = "../arithmetic" }
-sp-core = { version = "4.0.0", default-features = false, path = "../core" }
+sp-core = { version = "4.1.0-dev", default-features = false, path = "../core" }
sp-runtime = { version = "4.0.0-dev", path = "../runtime", default-features = false }
[dev-dependencies]
diff --git a/substrate/primitives/offchain/Cargo.toml b/substrate/primitives/offchain/Cargo.toml
index f079ccb7913fe9c9565c3f03c33715c810eb9a5e..55de9177e45dfc4da07a526635ebbd44c60eb4f5 100644
--- a/substrate/primitives/offchain/Cargo.toml
+++ b/substrate/primitives/offchain/Cargo.toml
@@ -13,7 +13,7 @@ readme = "README.md"
targets = ["x86_64-unknown-linux-gnu"]
[dependencies]
-sp-core = { version = "4.0.0", default-features = false, path = "../core" }
+sp-core = { version = "4.1.0-dev", default-features = false, path = "../core" }
sp-api = { version = "4.0.0-dev", default-features = false, path = "../api" }
sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../runtime" }
diff --git a/substrate/primitives/rpc/Cargo.toml b/substrate/primitives/rpc/Cargo.toml
index 59cbf53fee2a1398b497f664c2fdc7c4a36677f7..e16280f95d35d23026f07b1aab0052d82d532455 100644
--- a/substrate/primitives/rpc/Cargo.toml
+++ b/substrate/primitives/rpc/Cargo.toml
@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
[dependencies]
serde = { version = "1.0.126", features = ["derive"] }
-sp-core = { version = "4.0.0", path = "../core" }
+sp-core = { version = "4.1.0-dev", path = "../core" }
rustc-hash = "1.1.0"
[dev-dependencies]
diff --git a/substrate/primitives/runtime-interface/Cargo.toml b/substrate/primitives/runtime-interface/Cargo.toml
index 64781481fa12a8726a0448575af3b815d81c302e..6b120ab50c50296c65eb244021e1459a72390ecf 100644
--- a/substrate/primitives/runtime-interface/Cargo.toml
+++ b/substrate/primitives/runtime-interface/Cargo.toml
@@ -28,7 +28,7 @@ impl-trait-for-tuples = "0.2.1"
[dev-dependencies]
sp-runtime-interface-test-wasm = { version = "2.0.0", path = "test-wasm" }
sp-state-machine = { version = "0.10.0-dev", path = "../state-machine" }
-sp-core = { version = "4.0.0", path = "../core" }
+sp-core = { version = "4.1.0-dev", path = "../core" }
sp-io = { version = "4.0.0-dev", path = "../io" }
rustversion = "1.0.5"
trybuild = "1.0.52"
diff --git a/substrate/primitives/runtime-interface/test-wasm-deprecated/Cargo.toml b/substrate/primitives/runtime-interface/test-wasm-deprecated/Cargo.toml
index 68ed8a73282aaa6b491c2fa4dc54dfe141f8dda3..02fb75d108fd3f3cf051c3ae65697afe1df7363b 100644
--- a/substrate/primitives/runtime-interface/test-wasm-deprecated/Cargo.toml
+++ b/substrate/primitives/runtime-interface/test-wasm-deprecated/Cargo.toml
@@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
sp-runtime-interface = { version = "4.0.0", default-features = false, path = "../" }
sp-std = { version = "4.0.0", default-features = false, path = "../../std" }
sp-io = { version = "4.0.0-dev", default-features = false, path = "../../io" }
-sp-core = { version = "4.0.0", default-features = false, path = "../../core" }
+sp-core = { version = "4.1.0-dev", default-features = false, path = "../../core" }
[build-dependencies]
substrate-wasm-builder = { version = "5.0.0-dev", path = "../../../utils/wasm-builder" }
diff --git a/substrate/primitives/runtime-interface/test-wasm/Cargo.toml b/substrate/primitives/runtime-interface/test-wasm/Cargo.toml
index ab227ddeda2777c005475f1a3b192dffc966617e..24fdb88429634a33715f2d4c17ed96baaeac7325 100644
--- a/substrate/primitives/runtime-interface/test-wasm/Cargo.toml
+++ b/substrate/primitives/runtime-interface/test-wasm/Cargo.toml
@@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
sp-runtime-interface = { version = "4.0.0", default-features = false, path = "../" }
sp-std = { version = "4.0.0", default-features = false, path = "../../std" }
sp-io = { version = "4.0.0-dev", default-features = false, path = "../../io" }
-sp-core = { version = "4.0.0", default-features = false, path = "../../core" }
+sp-core = { version = "4.1.0-dev", default-features = false, path = "../../core" }
[build-dependencies]
substrate-wasm-builder = { version = "5.0.0-dev", path = "../../../utils/wasm-builder" }
diff --git a/substrate/primitives/runtime/Cargo.toml b/substrate/primitives/runtime/Cargo.toml
index 76c1d94a3b6dfadaec73037c9e6dd286a70ba5cc..1d7c79ba68c98cc13c96dc18f7011c7fd6e58caf 100644
--- a/substrate/primitives/runtime/Cargo.toml
+++ b/substrate/primitives/runtime/Cargo.toml
@@ -18,7 +18,7 @@ targets = ["x86_64-unknown-linux-gnu"]
serde = { version = "1.0.126", optional = true, features = ["derive"] }
codec = { package = "parity-scale-codec", version = "2.2.0", default-features = false, features = ["derive", "max-encoded-len"] }
scale-info = { version = "1.0", default-features = false, features = ["derive"] }
-sp-core = { version = "4.0.0", default-features = false, path = "../core" }
+sp-core = { version = "4.1.0-dev", default-features = false, path = "../core" }
sp-application-crypto = { version = "4.0.0-dev", default-features = false, path = "../application-crypto" }
sp-arithmetic = { version = "4.0.0-dev", default-features = false, path = "../arithmetic" }
sp-std = { version = "4.0.0", default-features = false, path = "../std" }
diff --git a/substrate/primitives/sandbox/Cargo.toml b/substrate/primitives/sandbox/Cargo.toml
index a51873dc1e998fe6f699bc2a421ab9ecf197dabf..a94ba0f375f8c6e7dc7392f8b6812b5514f2824d 100644
--- a/substrate/primitives/sandbox/Cargo.toml
+++ b/substrate/primitives/sandbox/Cargo.toml
@@ -20,7 +20,7 @@ wasmi = "0.9.0"
[dependencies]
wasmi = { version = "0.9.0", optional = true }
-sp-core = { version = "4.0.0", default-features = false, path = "../core" }
+sp-core = { version = "4.1.0-dev", default-features = false, path = "../core" }
sp-std = { version = "4.0.0", default-features = false, path = "../std" }
sp-io = { version = "4.0.0-dev", default-features = false, path = "../io" }
sp-wasm-interface = { version = "4.0.0", default-features = false, path = "../wasm-interface" }
diff --git a/substrate/primitives/session/Cargo.toml b/substrate/primitives/session/Cargo.toml
index eda98b2ab6a8e3f6289b036112a6e22e06ff713e..d402f36859ac471f1907955736ca08521cafdbd3 100644
--- a/substrate/primitives/session/Cargo.toml
+++ b/substrate/primitives/session/Cargo.toml
@@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
scale-info = { version = "1.0", default-features = false, features = ["derive"] }
sp-api = { version = "4.0.0-dev", default-features = false, path = "../api" }
-sp-core = { version = "4.0.0", default-features = false, path = "../core" }
+sp-core = { version = "4.1.0-dev", default-features = false, path = "../core" }
sp-std = { version = "4.0.0", default-features = false, path = "../std" }
sp-staking = { version = "4.0.0-dev", default-features = false, path = "../staking" }
sp-runtime = { version = "4.0.0-dev", optional = true, path = "../runtime" }
diff --git a/substrate/primitives/state-machine/Cargo.toml b/substrate/primitives/state-machine/Cargo.toml
index f5047c3c7c46435157a8dcb4d468c09153d9a42f..b6b3c90f5a7f583f478eb0a6b381f043f9e47348 100644
--- a/substrate/primitives/state-machine/Cargo.toml
+++ b/substrate/primitives/state-machine/Cargo.toml
@@ -21,7 +21,7 @@ hash-db = { version = "0.15.2", default-features = false }
trie-db = { version = "0.22.6", default-features = false }
trie-root = { version = "0.16.0", default-features = false }
sp-trie = { version = "4.0.0-dev", path = "../trie", default-features = false }
-sp-core = { version = "4.0.0", path = "../core", default-features = false }
+sp-core = { version = "4.1.0-dev", path = "../core", default-features = false }
sp-panic-handler = { version = "4.0.0-dev", path = "../panic-handler", optional = true }
codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
num-traits = { version = "0.2.8", default-features = false }
diff --git a/substrate/primitives/tasks/Cargo.toml b/substrate/primitives/tasks/Cargo.toml
index 9a80cc50cf2ffc7271a639d6eb5e76f0c499109b..c154d1c92dca8e0c6ef2f07abe6d2e992e6e7d47 100644
--- a/substrate/primitives/tasks/Cargo.toml
+++ b/substrate/primitives/tasks/Cargo.toml
@@ -15,7 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"]
[dependencies]
log = { version = "0.4.8", optional = true }
-sp-core = { version = "4.0.0", default-features = false, path = "../core" }
+sp-core = { version = "4.1.0-dev", default-features = false, path = "../core" }
sp-externalities = { version = "0.10.0", optional = true, path = "../externalities" }
sp-io = { version = "4.0.0-dev", default-features = false, path = "../io" }
sp-runtime-interface = { version = "4.0.0", default-features = false, path = "../runtime-interface" }
diff --git a/substrate/primitives/test-primitives/Cargo.toml b/substrate/primitives/test-primitives/Cargo.toml
index ea1e61c8da1125d66037648722799e76b1b02a5f..18a0b9501e1877dc4decb7f39d34fd7159dafb95 100644
--- a/substrate/primitives/test-primitives/Cargo.toml
+++ b/substrate/primitives/test-primitives/Cargo.toml
@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
[dependencies]
sp-application-crypto = { version = "4.0.0-dev", default-features = false, path = "../application-crypto" }
codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
-sp-core = { version = "4.0.0", default-features = false, path = "../core" }
+sp-core = { version = "4.1.0-dev", default-features = false, path = "../core" }
serde = { version = "1.0.126", optional = true, features = ["derive"] }
sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../runtime" }
parity-util-mem = { version = "0.10.2", default-features = false, features = ["primitive-types"] }
diff --git a/substrate/primitives/transaction-storage-proof/Cargo.toml b/substrate/primitives/transaction-storage-proof/Cargo.toml
index 05da54b24f787ced1a3b347b6dd53b72ee9f5c35..f2ea55cc18c516ae90f23d54e89cf2b1431f5d14 100644
--- a/substrate/primitives/transaction-storage-proof/Cargo.toml
+++ b/substrate/primitives/transaction-storage-proof/Cargo.toml
@@ -17,7 +17,7 @@ sp-inherents = { version = "4.0.0-dev", default-features = false, path = "../inh
sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../runtime" }
sp-std = { version = "4.0.0", default-features = false, path = "../std" }
sp-trie = { version = "4.0.0-dev", optional = true, path = "../trie" }
-sp-core = { version = "4.0.0", path = "../core", optional = true }
+sp-core = { version = "4.1.0-dev", path = "../core", optional = true }
codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
scale-info = { version = "1.0", default-features = false, features = ["derive"] }
log = { version = "0.4.8", optional = true }
diff --git a/substrate/primitives/trie/Cargo.toml b/substrate/primitives/trie/Cargo.toml
index af81164ed799d369e3c890f2d3b00580c9641df2..983d58c9bb8d2fb388c9c66d15e31bdbe639728a 100644
--- a/substrate/primitives/trie/Cargo.toml
+++ b/substrate/primitives/trie/Cargo.toml
@@ -25,7 +25,7 @@ hash-db = { version = "0.15.2", default-features = false }
trie-db = { version = "0.22.6", default-features = false }
trie-root = { version = "0.16.0", default-features = false }
memory-db = { version = "0.27.0", default-features = false }
-sp-core = { version = "4.0.0", default-features = false, path = "../core" }
+sp-core = { version = "4.1.0-dev", default-features = false, path = "../core" }
[dev-dependencies]
trie-bench = "0.28.0"
diff --git a/substrate/test-utils/client/Cargo.toml b/substrate/test-utils/client/Cargo.toml
index 3917f3fefcf9b9c6e045d7893f94207754390e26..9b77cde505af7ad6fdf39867129dd793197bd54c 100644
--- a/substrate/test-utils/client/Cargo.toml
+++ b/substrate/test-utils/client/Cargo.toml
@@ -29,7 +29,7 @@ sc-service = { version = "0.10.0-dev", default-features = false, features = [
], path = "../../client/service" }
sp-blockchain = { version = "4.0.0-dev", path = "../../primitives/blockchain" }
sp-consensus = { version = "0.10.0-dev", path = "../../primitives/consensus/common" }
-sp-core = { version = "4.0.0", path = "../../primitives/core" }
+sp-core = { version = "4.1.0-dev", path = "../../primitives/core" }
sp-keystore = { version = "0.10.0-dev", path = "../../primitives/keystore" }
sp-keyring = { version = "4.0.0-dev", path = "../../primitives/keyring" }
sp-runtime = { version = "4.0.0-dev", path = "../../primitives/runtime" }
diff --git a/substrate/test-utils/runtime/Cargo.toml b/substrate/test-utils/runtime/Cargo.toml
index 35c14a23f2a207bd2ebd3a754a2853567de0661f..3be0e40b0b6ba9d463eae94143495446c746507e 100644
--- a/substrate/test-utils/runtime/Cargo.toml
+++ b/substrate/test-utils/runtime/Cargo.toml
@@ -23,7 +23,7 @@ sp-inherents = { version = "4.0.0-dev", default-features = false, path = "../../
sp-keyring = { version = "4.0.0-dev", optional = true, path = "../../primitives/keyring" }
memory-db = { version = "0.27.0", default-features = false }
sp-offchain = { version = "4.0.0-dev", default-features = false, path = "../../primitives/offchain" }
-sp-core = { version = "4.0.0", default-features = false, path = "../../primitives/core" }
+sp-core = { version = "4.1.0-dev", default-features = false, path = "../../primitives/core" }
sp-std = { version = "4.0.0", default-features = false, path = "../../primitives/std" }
sp-runtime-interface = { version = "4.0.0", default-features = false, path = "../../primitives/runtime-interface" }
sp-io = { version = "4.0.0-dev", default-features = false, path = "../../primitives/io" }
diff --git a/substrate/test-utils/runtime/client/Cargo.toml b/substrate/test-utils/runtime/client/Cargo.toml
index 6dd22e4954c2d11eac7d81ed8a32618d6ffbc56c..b66fdc3422ae512c5ad02107332fee51da2f41d0 100644
--- a/substrate/test-utils/runtime/client/Cargo.toml
+++ b/substrate/test-utils/runtime/client/Cargo.toml
@@ -16,7 +16,7 @@ sp-consensus = { version = "0.10.0-dev", path = "../../../primitives/consensus/c
sc-consensus = { version = "0.10.0-dev", path = "../../../client/consensus/common" }
sc-block-builder = { version = "0.10.0-dev", path = "../../../client/block-builder" }
substrate-test-client = { version = "2.0.0", path = "../../client" }
-sp-core = { version = "4.0.0", path = "../../../primitives/core" }
+sp-core = { version = "4.1.0-dev", path = "../../../primitives/core" }
substrate-test-runtime = { version = "2.0.0", path = "../../runtime" }
sp-runtime = { version = "4.0.0-dev", path = "../../../primitives/runtime" }
sp-api = { version = "4.0.0-dev", path = "../../../primitives/api" }
diff --git a/substrate/utils/frame/benchmarking-cli/Cargo.toml b/substrate/utils/frame/benchmarking-cli/Cargo.toml
index 2943877ce4a04116b89be4ddf468b94141d0d104..c8d762ec73cd9754695ee79d4b4dd14d03c1d8bf 100644
--- a/substrate/utils/frame/benchmarking-cli/Cargo.toml
+++ b/substrate/utils/frame/benchmarking-cli/Cargo.toml
@@ -15,7 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"]
[dependencies]
frame-benchmarking = { version = "4.0.0-dev", path = "../../../frame/benchmarking" }
frame-support = { version = "4.0.0-dev", path = "../../../frame/support" }
-sp-core = { version = "4.0.0", path = "../../../primitives/core" }
+sp-core = { version = "4.1.0-dev", path = "../../../primitives/core" }
sc-service = { version = "0.10.0-dev", default-features = false, path = "../../../client/service" }
sc-cli = { version = "0.10.0-dev", path = "../../../client/cli" }
sc-client-db = { version = "0.10.0-dev", path = "../../../client/db" }
diff --git a/substrate/utils/frame/frame-utilities-cli/Cargo.toml b/substrate/utils/frame/frame-utilities-cli/Cargo.toml
index 6c3cb0428284936d84e11f1ee5b593a414bbe5cb..feb02f1eb7213a666be399c9d32b289f08176292 100644
--- a/substrate/utils/frame/frame-utilities-cli/Cargo.toml
+++ b/substrate/utils/frame/frame-utilities-cli/Cargo.toml
@@ -11,7 +11,7 @@ documentation = "https://docs.rs/substrate-frame-cli"
readme = "README.md"
[dependencies]
-sp-core = { version = "4.0.0", path = "../../../primitives/core" }
+sp-core = { version = "4.1.0-dev", path = "../../../primitives/core" }
sc-cli = { version = "0.10.0-dev", path = "../../../client/cli" }
sp-runtime = { version = "4.0.0-dev", path = "../../../primitives/runtime" }
structopt = "0.3.25"
diff --git a/substrate/utils/frame/remote-externalities/Cargo.toml b/substrate/utils/frame/remote-externalities/Cargo.toml
index ab91f26490178d29aeacd0e95f1d6fa4205eb6de..0cf4980a104c8780e53ba68b4a7ca8cfba07e6ee 100644
--- a/substrate/utils/frame/remote-externalities/Cargo.toml
+++ b/substrate/utils/frame/remote-externalities/Cargo.toml
@@ -23,7 +23,7 @@ serde_json = "1.0"
serde = "1.0.126"
sp-io = { version = "4.0.0-dev", path = "../../../primitives/io" }
-sp-core = { version = "4.0.0", path = "../../../primitives/core" }
+sp-core = { version = "4.1.0-dev", path = "../../../primitives/core" }
sp-runtime = { version = "4.0.0-dev", path = "../../../primitives/runtime" }
sp-version = { version = "4.0.0-dev", path = "../../../primitives/version" }
diff --git a/substrate/utils/frame/rpc/system/Cargo.toml b/substrate/utils/frame/rpc/system/Cargo.toml
index 5fc3812b84da451eff1704c3e6a0396589ea6bdd..f71f3d6e93e140bdd2916f5a77acfdcb7748626f 100644
--- a/substrate/utils/frame/rpc/system/Cargo.toml
+++ b/substrate/utils/frame/rpc/system/Cargo.toml
@@ -23,7 +23,7 @@ log = "0.4.8"
sp-runtime = { version = "4.0.0-dev", path = "../../../../primitives/runtime" }
sp-api = { version = "4.0.0-dev", path = "../../../../primitives/api" }
frame-system-rpc-runtime-api = { version = "4.0.0-dev", path = "../../../../frame/system/rpc/runtime-api" }
-sp-core = { version = "4.0.0", path = "../../../../primitives/core" }
+sp-core = { version = "4.1.0-dev", path = "../../../../primitives/core" }
sp-blockchain = { version = "4.0.0-dev", path = "../../../../primitives/blockchain" }
sc-transaction-pool-api = { version = "4.0.0-dev", path = "../../../../client/transaction-pool/api" }
sp-block-builder = { version = "4.0.0-dev", path = "../../../../primitives/block-builder" }
diff --git a/substrate/utils/frame/try-runtime/cli/Cargo.toml b/substrate/utils/frame/try-runtime/cli/Cargo.toml
index 71db6100ca1755807230eddc7e4aa8e9cba49f40..d6b75d31fac8e9510a02a44ce939d0b5610998d0 100644
--- a/substrate/utils/frame/try-runtime/cli/Cargo.toml
+++ b/substrate/utils/frame/try-runtime/cli/Cargo.toml
@@ -24,7 +24,7 @@ sc-executor = { version = "0.10.0-dev", path = "../../../../client/executor" }
sc-chain-spec = { version = "4.0.0-dev", path = "../../../../client/chain-spec" }
sp-state-machine = { version = "0.10.0-dev", path = "../../../../primitives/state-machine" }
sp-runtime = { version = "4.0.0-dev", path = "../../../../primitives/runtime" }
-sp-core = { version = "4.0.0", path = "../../../../primitives/core" }
+sp-core = { version = "4.1.0-dev", path = "../../../../primitives/core" }
sp-io = { version = "4.0.0-dev", path = "../../../../primitives/io" }
sp-keystore = { version = "0.10.0-dev", path = "../../../../primitives/keystore" }
sp-externalities = { version = "0.10.0", path = "../../../../primitives/externalities" }