diff --git a/.github/pr-custom-review.yml b/.github/pr-custom-review.yml
index 3620f7e770674..059f4a283af07 100644
--- a/.github/pr-custom-review.yml
+++ b/.github/pr-custom-review.yml
@@ -8,12 +8,24 @@ rules:
check_type: changed_files
condition:
include: .*
- # excluding files from 'CI team' rules
- exclude: ^\.gitlab-ci\.yml|^scripts/ci/.*|^\.github/.*|^\.config/nextest.toml
+ # excluding files from 'CI team' and 'FRAME coders' rules
+ exclude: ^\.gitlab-ci\.yml|^scripts/ci/.*|^\.github/.*|^\.config/nextest.toml|^frame/(?!.*(nfts/.*|uniques/.*|babe/.*|grandpa/.*|beefy|merkle-mountain-range/.*|contracts/.*|election|nomination-pools/.*|staking/.*|aura/.*))
min_approvals: 2
teams:
- core-devs
+ - name: FRAME coders
+ check_type: changed_files
+ condition:
+ include: ^frame/(?!.*(nfts/.*|uniques/.*|babe/.*|grandpa/.*|beefy|merkle-mountain-range/.*|contracts/.*|election|nomination-pools/.*|staking/.*|aura/.*))
+ all:
+ - min_approvals: 2
+ teams:
+ - core-devs
+ - min_approvals: 1
+ teams:
+ - frame-coders
+
- name: CI team
check_type: changed_files
condition:
diff --git a/Cargo.lock b/Cargo.lock
index d9cb87af47edd..62e99d437b21a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2700,6 +2700,7 @@ dependencies = [
"sp-arithmetic",
"sp-core",
"sp-core-hashing-proc-macro",
+ "sp-debug-derive",
"sp-inherents",
"sp-io",
"sp-runtime",
@@ -5484,9 +5485,10 @@ dependencies = [
"fs_extra",
"git2",
"glob",
+ "itertools",
"tar",
"tempfile",
- "toml 0.7.3",
+ "toml_edit",
]
[[package]]
@@ -7431,9 +7433,9 @@ dependencies = [
[[package]]
name = "parity-db"
-version = "0.4.7"
+version = "0.4.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd4572a52711e2ccff02b4973ec7e4a5b5c23387ebbfbd6cd42b34755714cefc"
+checksum = "4890dcb9556136a4ec2b0c51fa4a08c8b733b829506af8fff2e853f3a065985b"
dependencies = [
"blake2",
"crc32fast",
@@ -10900,7 +10902,6 @@ dependencies = [
"sp-debug-derive",
"sp-externalities",
"sp-runtime-interface",
- "sp-serializer",
"sp-std",
"sp-storage",
"ss58-registry",
@@ -11218,14 +11219,6 @@ dependencies = [
"substrate-wasm-builder",
]
-[[package]]
-name = "sp-serializer"
-version = "4.0.0-dev"
-dependencies = [
- "serde",
- "serde_json",
-]
-
[[package]]
name = "sp-session"
version = "4.0.0-dev"
@@ -11318,6 +11311,7 @@ dependencies = [
"sp-application-crypto",
"sp-core",
"sp-runtime",
+ "sp-std",
]
[[package]]
@@ -12300,9 +12294,9 @@ dependencies = [
[[package]]
name = "tower-http"
-version = "0.3.5"
+version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f873044bf02dd1e8239e9c1293ea39dad76dc594ec16185d0a1bf31d8dc8d858"
+checksum = "5d1d42a9b3f3ec46ba828e8d376aec14592ea199f70a06a548587ecd1c4ab658"
dependencies = [
"bitflags",
"bytes",
@@ -12623,7 +12617,7 @@ checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675"
dependencies = [
"cfg-if",
"digest 0.10.6",
- "rand 0.8.5",
+ "rand 0.7.3",
"static_assertions",
]
diff --git a/Cargo.toml b/Cargo.toml
index 7563a4a643286..2b1659d4fb37b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -219,7 +219,6 @@ members = [
"primitives/runtime-interface/test",
"primitives/runtime-interface/test-wasm",
"primitives/runtime-interface/test-wasm-deprecated",
- "primitives/serializer",
"primitives/session",
"primitives/staking",
"primitives/state-machine",
diff --git a/bin/node/bench/Cargo.toml b/bin/node/bench/Cargo.toml
index ea15fce4cbf7e..b3f1434a9c27b 100644
--- a/bin/node/bench/Cargo.toml
+++ b/bin/node/bench/Cargo.toml
@@ -38,7 +38,7 @@ tempfile = "3.1.0"
fs_extra = "1"
rand = { version = "0.8.5", features = ["small_rng"] }
lazy_static = "1.4.0"
-parity-db = "0.4.7"
+parity-db = "0.4.8"
sc-transaction-pool = { version = "4.0.0-dev", path = "../../../client/transaction-pool" }
sc-transaction-pool-api = { version = "4.0.0-dev", path = "../../../client/transaction-pool/api" }
futures = { version = "0.3.21", features = ["thread-pool"] }
diff --git a/client/db/Cargo.toml b/client/db/Cargo.toml
index 7d522b404b9c4..aeb31f9444faf 100644
--- a/client/db/Cargo.toml
+++ b/client/db/Cargo.toml
@@ -22,7 +22,7 @@ kvdb-memorydb = "0.13.0"
kvdb-rocksdb = { version = "0.19.0", optional = true }
linked-hash-map = "0.5.4"
log = "0.4.17"
-parity-db = "0.4.7"
+parity-db = "0.4.8"
parking_lot = "0.12.1"
sc-client-api = { version = "4.0.0-dev", path = "../api" }
sc-state-db = { version = "0.10.0-dev", path = "../state-db" }
diff --git a/client/network/src/lib.rs b/client/network/src/lib.rs
index 79023923e8b05..a66c187cacf7b 100644
--- a/client/network/src/lib.rs
+++ b/client/network/src/lib.rs
@@ -243,17 +243,17 @@
//! More precise usage details are still being worked on and will likely change in the future.
mod behaviour;
-mod discovery;
-mod peer_info;
mod protocol;
mod service;
-mod transport;
pub mod config;
+pub mod discovery;
pub mod error;
pub mod event;
pub mod network_state;
+pub mod peer_info;
pub mod request_responses;
+pub mod transport;
pub mod types;
pub mod utils;
diff --git a/client/network/src/peer_info.rs b/client/network/src/peer_info.rs
index e4a5c5753a00c..aab3fc9487e8c 100644
--- a/client/network/src/peer_info.rs
+++ b/client/network/src/peer_info.rs
@@ -16,6 +16,9 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see .
+//! [`PeerInfoBehaviour`] is implementation of `NetworkBehaviour` that holds information about peers
+//! in cache.
+
use crate::utils::interval;
use either::Either;
diff --git a/client/network/src/transport.rs b/client/network/src/transport.rs
index 9e63ce98878a6..4136b34fc0e8e 100644
--- a/client/network/src/transport.rs
+++ b/client/network/src/transport.rs
@@ -16,6 +16,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see .
+//! Transport that serves as a common ground for all connections.
+
use either::Either;
use libp2p::{
core::{
diff --git a/client/rpc-servers/Cargo.toml b/client/rpc-servers/Cargo.toml
index c6228d739048d..7047991126184 100644
--- a/client/rpc-servers/Cargo.toml
+++ b/client/rpc-servers/Cargo.toml
@@ -18,6 +18,6 @@ log = "0.4.17"
serde_json = "1.0.85"
tokio = { version = "1.22.0", features = ["parking_lot"] }
prometheus-endpoint = { package = "substrate-prometheus-endpoint", version = "0.10.0-dev", path = "../../utils/prometheus" }
-tower-http = { version = "0.3.4", features = ["cors"] }
+tower-http = { version = "0.4.0", features = ["cors"] }
tower = "0.4.13"
http = "0.2.8"
diff --git a/client/service/test/src/client/mod.rs b/client/service/test/src/client/mod.rs
index a33bce50aa40f..e71e211767f3d 100644
--- a/client/service/test/src/client/mod.rs
+++ b/client/service/test/src/client/mod.rs
@@ -173,7 +173,7 @@ fn construct_genesis_should_work_with_native() {
vec![AccountKeyring::One.into(), AccountKeyring::Two.into()],
1000 * DOLLARS,
)
- .build_storage();
+ .build();
let genesis_hash = insert_genesis_block(&mut storage);
let backend = InMemoryBackend::from((storage, StateVersion::default()));
@@ -204,7 +204,7 @@ fn construct_genesis_should_work_with_wasm() {
vec![AccountKeyring::One.into(), AccountKeyring::Two.into()],
1000 * DOLLARS,
)
- .build_storage();
+ .build();
let genesis_hash = insert_genesis_block(&mut storage);
let backend = InMemoryBackend::from((storage, StateVersion::default()));
diff --git a/client/statement-store/Cargo.toml b/client/statement-store/Cargo.toml
index 5a4948cee0a6c..936aeb6e3cd82 100644
--- a/client/statement-store/Cargo.toml
+++ b/client/statement-store/Cargo.toml
@@ -19,7 +19,7 @@ futures = "0.3.21"
futures-timer = "3.0.2"
log = "0.4.17"
parking_lot = "0.12.1"
-parity-db = "0.4.7"
+parity-db = "0.4.8"
tokio = { version = "1.22.0", features = ["time"] }
sp-statement-store = { version = "4.0.0-dev", path = "../../primitives/statement-store" }
prometheus-endpoint = { package = "substrate-prometheus-endpoint", version = "0.10.0-dev", path = "../../utils/prometheus" }
diff --git a/client/storage-monitor/src/lib.rs b/client/storage-monitor/src/lib.rs
index 277a74de08baf..655b940e8bedc 100644
--- a/client/storage-monitor/src/lib.rs
+++ b/client/storage-monitor/src/lib.rs
@@ -27,12 +27,15 @@ use std::{
const LOG_TARGET: &str = "storage-monitor";
+/// Result type used in this crate.
+pub type Result = std::result::Result;
+
/// Error type used in this crate.
#[derive(Debug, thiserror::Error)]
pub enum Error {
#[error("IO Error")]
IOError(#[from] io::Error),
- #[error("Out of storage space: available {0}MB, required {1}MB")]
+ #[error("Out of storage space: available {0}MiB, required {1}MiB")]
StorageOutOfSpace(u64, u64),
}
@@ -42,7 +45,7 @@ pub struct StorageMonitorParams {
/// Required available space on database storage. If available space for DB storage drops below
/// the given threshold, node will be gracefully terminated. If `0` is given monitoring will be
/// disabled.
- #[arg(long = "db-storage-threshold", value_name = "MB", default_value_t = 1000)]
+ #[arg(long = "db-storage-threshold", value_name = "MiB", default_value_t = 1024)]
pub threshold: u64,
/// How often available space is polled.
@@ -50,14 +53,14 @@ pub struct StorageMonitorParams {
pub polling_period: u32,
}
-/// Storage monitor service: checks the available space for the filesystem for fiven path.
+/// Storage monitor service: checks the available space for the filesystem for given path.
pub struct StorageMonitorService {
/// watched path
path: PathBuf,
/// number of megabytes that shall be free on the filesystem for watched path
threshold: u64,
- /// storage space polling period (seconds)
- polling_period: u32,
+ /// storage space polling period
+ polling_period: Duration,
}
impl StorageMonitorService {
@@ -66,7 +69,7 @@ impl StorageMonitorService {
parameters: StorageMonitorParams,
database: DatabaseSource,
spawner: &impl SpawnEssentialNamed,
- ) -> Result<(), Error> {
+ ) -> Result<()> {
Ok(match (parameters.threshold, database.path()) {
(0, _) => {
log::info!(
@@ -83,8 +86,7 @@ impl StorageMonitorService {
(threshold, Some(path)) => {
log::debug!(
target: LOG_TARGET,
- "Initializing StorageMonitorService for db path: {:?}",
- path,
+ "Initializing StorageMonitorService for db path: {path:?}",
);
Self::check_free_space(&path, threshold)?;
@@ -92,7 +94,7 @@ impl StorageMonitorService {
let storage_monitor_service = StorageMonitorService {
path: path.to_path_buf(),
threshold,
- polling_period: parameters.polling_period,
+ polling_period: Duration::from_secs(parameters.polling_period.into()),
};
spawner.spawn_essential(
@@ -108,22 +110,22 @@ impl StorageMonitorService {
/// below threshold.
async fn run(self) {
loop {
- tokio::time::sleep(Duration::from_secs(self.polling_period.into())).await;
+ tokio::time::sleep(self.polling_period).await;
if Self::check_free_space(&self.path, self.threshold).is_err() {
break
};
}
}
- /// Returns free space in MB, or error if statvfs failed.
- fn free_space(path: &Path) -> Result {
- Ok(fs4::available_space(path).map(|s| s / 1_000_000)?)
+ /// Returns free space in MiB, or error if statvfs failed.
+ fn free_space(path: &Path) -> Result {
+ Ok(fs4::available_space(path).map(|s| s / 1024 / 1024)?)
}
- /// Checks if the amount of free space for given `path` is above given `threshold`.
+ /// Checks if the amount of free space for given `path` is above given `threshold` in MiB.
/// If it dropped below, error is returned.
/// System errors are silently ignored.
- fn check_free_space(path: &Path, threshold: u64) -> Result<(), Error> {
+ fn check_free_space(path: &Path, threshold: u64) -> Result<()> {
match StorageMonitorService::free_space(path) {
Ok(available_space) => {
log::trace!(
@@ -132,14 +134,14 @@ impl StorageMonitorService {
);
if available_space < threshold {
- log::error!(target: LOG_TARGET, "Available space {available_space}MB for path `{}` dropped below threshold: {threshold}MB , terminating...", path.display());
+ log::error!(target: LOG_TARGET, "Available space {available_space}MiB for path `{}` dropped below threshold: {threshold}MiB , terminating...", path.display());
Err(Error::StorageOutOfSpace(available_space, threshold))
} else {
Ok(())
}
},
Err(e) => {
- log::error!(target: LOG_TARGET, "Could not read available space: {:?}.", e);
+ log::error!(target: LOG_TARGET, "Could not read available space: {e:?}.");
Err(e)
},
}
diff --git a/docs/node-template-release.md b/docs/node-template-release.md
index 4f4977a9df03c..911e6a2bbe71a 100644
--- a/docs/node-template-release.md
+++ b/docs/node-template-release.md
@@ -27,33 +27,26 @@ by running the following command.
delete files/directories that are removed from the source. So you need to manually check and
remove them in the destination.
-3. There are actually three packages in the Node Template, `node-template` (the node),
-`node-template-runtime` (the runtime), and `pallet-template`, and each has its own `Cargo.toml`.
-Inside these three files, dependencies are listed in expanded form and linked to a certain git
-commit in Substrate remote repository, such as:
+3. There is a `Cargo.toml` file in the root directory. Inside, dependencies are listed form and
+linked to a certain git commit in Substrate remote repository, such as:
```toml
- [dev-dependencies.sp-core]
- default-features = false
- git = 'https://github.com/paritytech/substrate.git'
- rev = 'c1fe59d060600a10eebb4ace277af1fee20bad17'
- version = '3.0.0'
+ sp-core = { version = "7.0.0", git = "https://github.com/paritytech/substrate.git", rev = "de80d0107336a9c7a2efdc0199015e4d67fcbdb5", default-features = false }
```
- We will update each of them to the shortened form and link them to the Rust
- [crate registry](https://crates.io/). After confirming the versioned package is published in
- the crate, the above will become:
+ We will update each of them to link to the Rust [crate registry](https://crates.io/).
+After confirming the versioned package is published in the crate, the above will become:
```toml
- [dev-dependencies]
- sp-core = { version = '3.0.0', default-features = false }
+ [workspace.dependencies]
+ sp-core = { version = "7.0.0", default-features = false }
```
P.S: This step can be automated if we update `node-template-release` package in
`scripts/ci/node-template-release`.
-4. Once the three `Cargo.toml`s are updated, compile and confirm that the Node Template builds. Then
-commit the changes to a new branch in [Substrate Node Template](https://github.com/substrate-developer-hub/substrate-node-template), and make a PR.
+4. Once the `Cargo.toml` is updated, compile and confirm that the Node Template builds. Then commit
+the changes to a new branch in [Substrate Node Template](https://github.com/substrate-developer-hub/substrate-node-template), and make a PR.
> Note that there is a chance the code in Substrate Node Template works with the linked Substrate git
commit but not with published packages due to the latest (as yet) unpublished features. In this case,
diff --git a/frame/assets/src/lib.rs b/frame/assets/src/lib.rs
index c25f33ae3eaf9..33aacd9323bf2 100644
--- a/frame/assets/src/lib.rs
+++ b/frame/assets/src/lib.rs
@@ -1654,7 +1654,7 @@ pub mod pallet {
impl, I: 'static> AccountTouch for Pallet {
type Balance = DepositBalanceOf;
- fn deposit_required() -> Self::Balance {
+ fn deposit_required(_: T::AssetId) -> Self::Balance {
T::AssetAccountDeposit::get()
}
diff --git a/frame/election-provider-multi-phase/test-staking-e2e/src/lib.rs b/frame/election-provider-multi-phase/test-staking-e2e/src/lib.rs
index c396b008fa4c5..2b4a255dcf606 100644
--- a/frame/election-provider-multi-phase/test-staking-e2e/src/lib.rs
+++ b/frame/election-provider-multi-phase/test-staking-e2e/src/lib.rs
@@ -20,6 +20,7 @@ mod mock;
pub(crate) const LOG_TARGET: &str = "tests::e2e-epm";
+use frame_support::assert_ok;
use mock::*;
use sp_core::Get;
use sp_npos_elections::{to_supports, StakedAssignment};
@@ -204,3 +205,72 @@ fn continous_slashes_below_offending_threshold() {
}
});
}
+
+#[test]
+/// When validators are slashed, they are chilled and removed from the current `VoterList`. Thus,
+/// the slashed validator should not be considered in the next validator set. However, if the
+/// slashed validator sets its intention to validate again in the same era when it was slashed and
+/// chilled, the validator may not be removed from the active validator set across eras, provided
+/// it would selected in the subsequent era if there was no slash. Nominators of the slashed
+/// validator will also be slashed and chilled, as expected, but the nomination intentions will
+/// remain after the validator re-set the intention to be validating again.
+///
+/// This behaviour is due to removing implicit chill upon slash
+/// .
+///
+/// Related to .
+fn set_validation_intention_after_chilled() {
+ use frame_election_provider_support::SortedListProvider;
+ use pallet_staking::{Event, Forcing, Nominators};
+
+ let staking_builder = StakingExtBuilder::default();
+ let epm_builder = EpmExtBuilder::default();
+
+ ExtBuilder::default()
+ .staking(staking_builder)
+ .epm(epm_builder)
+ .build_and_execute(|| {
+ assert_eq!(active_era(), 0);
+ // validator is part of the validator set.
+ assert!(Session::validators().contains(&81));
+ assert!(::VoterList::contains(&81));
+
+ // nominate validator 81.
+ assert_ok!(Staking::nominate(RuntimeOrigin::signed(21), vec![81]));
+ assert_eq!(Nominators::::get(21).unwrap().targets, vec![81]);
+
+ // validator is slashed. it is removed from the `VoterList` through chilling but in the
+ // current era, the validator is still part of the active validator set.
+ add_slash(&81);
+ assert!(Session::validators().contains(&81));
+ assert!(!::VoterList::contains(&81));
+ assert_eq!(
+ staking_events(),
+ [
+ Event::Chilled { stash: 81 },
+ Event::ForceEra { mode: Forcing::ForceNew },
+ Event::SlashReported {
+ validator: 81,
+ slash_era: 0,
+ fraction: Perbill::from_percent(10)
+ }
+ ],
+ );
+
+ // after the nominator is slashed and chilled, the nominations remain.
+ assert_eq!(Nominators::::get(21).unwrap().targets, vec![81]);
+
+ // validator sets intention to stake again in the same era it was chilled.
+ assert_ok!(Staking::validate(RuntimeOrigin::signed(81), Default::default()));
+
+ // progress era and check that the slashed validator is still part of the validator
+ // set.
+ assert!(start_next_active_era().is_ok());
+ assert_eq!(active_era(), 1);
+ assert!(Session::validators().contains(&81));
+ assert!(::VoterList::contains(&81));
+
+ // nominations are still active as before the slash.
+ assert_eq!(Nominators::::get(21).unwrap().targets, vec![81]);
+ })
+}
diff --git a/frame/election-provider-multi-phase/test-staking-e2e/src/mock.rs b/frame/election-provider-multi-phase/test-staking-e2e/src/mock.rs
index e1abbb909cbb1..490179e91ddda 100644
--- a/frame/election-provider-multi-phase/test-staking-e2e/src/mock.rs
+++ b/frame/election-provider-multi-phase/test-staking-e2e/src/mock.rs
@@ -124,11 +124,11 @@ impl pallet_balances::Config for Runtime {
type DustRemoval = ();
type ExistentialDeposit = ExistentialDeposit;
type AccountStore = System;
- type WeightInfo = ();
+ type MaxHolds = ConstU32<1>;
+ type MaxFreezes = traits::ConstU32<1>;
type HoldIdentifier = ();
type FreezeIdentifier = ();
- type MaxHolds = traits::ConstU32<1>;
- type MaxFreezes = traits::ConstU32<1>;
+ type WeightInfo = ();
}
impl pallet_timestamp::Config for Runtime {
@@ -781,3 +781,11 @@ pub(crate) fn set_minimum_election_score(
.map(|_| ())
.map_err(|_| ())
}
+
+pub(crate) fn staking_events() -> Vec> {
+ System::events()
+ .into_iter()
+ .map(|r| r.event)
+ .filter_map(|e| if let RuntimeEvent::Staking(inner) = e { Some(inner) } else { None })
+ .collect::>()
+}
diff --git a/frame/ranked-collective/src/lib.rs b/frame/ranked-collective/src/lib.rs
index 288fd78d6e718..6296403d2a1ce 100644
--- a/frame/ranked-collective/src/lib.rs
+++ b/frame/ranked-collective/src/lib.rs
@@ -112,36 +112,39 @@ impl, I: 'static, M: GetMaxVoters> Tally {
pub type TallyOf = Tally>;
pub type PollIndexOf = <>::Polls as Polling>>::Index;
+pub type ClassOf = <>::Polls as Polling>>::Class;
type AccountIdLookupOf = <::Lookup as StaticLookup>::Source;
-impl, I: 'static, M: GetMaxVoters> VoteTally for Tally {
- fn new(_: Rank) -> Self {
+impl, I: 'static, M: GetMaxVoters>>
+ VoteTally> for Tally
+{
+ fn new(_: ClassOf) -> Self {
Self { bare_ayes: 0, ayes: 0, nays: 0, dummy: PhantomData }
}
- fn ayes(&self, _: Rank) -> Votes {
+ fn ayes(&self, _: ClassOf) -> Votes {
self.bare_ayes
}
- fn support(&self, class: Rank) -> Perbill {
+ fn support(&self, class: ClassOf) -> Perbill {
Perbill::from_rational(self.bare_ayes, M::get_max_voters(class))
}
- fn approval(&self, _: Rank) -> Perbill {
+ fn approval(&self, _: ClassOf) -> Perbill {
Perbill::from_rational(self.ayes, 1.max(self.ayes + self.nays))
}
#[cfg(feature = "runtime-benchmarks")]
- fn unanimity(class: Rank) -> Self {
+ fn unanimity(class: ClassOf) -> Self {
Self {
- bare_ayes: M::get_max_voters(class),
+ bare_ayes: M::get_max_voters(class.clone()),
ayes: M::get_max_voters(class),
nays: 0,
dummy: PhantomData,
}
}
#[cfg(feature = "runtime-benchmarks")]
- fn rejection(class: Rank) -> Self {
+ fn rejection(class: ClassOf) -> Self {
Self { bare_ayes: 0, ayes: 0, nays: M::get_max_voters(class), dummy: PhantomData }
}
#[cfg(feature = "runtime-benchmarks")]
- fn from_requirements(support: Perbill, approval: Perbill, class: Rank) -> Self {
+ fn from_requirements(support: Perbill, approval: Perbill, class: ClassOf) -> Self {
let c = M::get_max_voters(class);
let ayes = support * c;
let nays = ((ayes as u64) * 1_000_000_000u64 / approval.deconstruct() as u64) as u32 - ayes;
@@ -149,14 +152,17 @@ impl, I: 'static, M: GetMaxVoters> VoteTally for Tally
}
#[cfg(feature = "runtime-benchmarks")]
- fn setup(class: Rank, granularity: Perbill) {
- if M::get_max_voters(class) == 0 {
+ fn setup(class: ClassOf, granularity: Perbill) {
+ if M::get_max_voters(class.clone()) == 0 {
let max_voters = granularity.saturating_reciprocal_mul(1u32);
for i in 0..max_voters {
let who: T::AccountId =
frame_benchmarking::account("ranked_collective_benchmarking", i, 0);
- crate::Pallet::::do_add_member_to_rank(who, class)
- .expect("could not add members for benchmarks");
+ crate::Pallet::::do_add_member_to_rank(
+ who,
+ T::MinRankOfClass::convert(class.clone()),
+ )
+ .expect("could not add members for benchmarks");
}
assert_eq!(M::get_max_voters(class), max_voters);
}
@@ -234,14 +240,17 @@ impl Convert for Geometric {
}
}
-/// Trait for getting the maximum number of voters for a given rank.
+/// Trait for getting the maximum number of voters for a given poll class.
pub trait GetMaxVoters {
- /// Return the maximum number of voters for the rank `r`.
- fn get_max_voters(r: Rank) -> MemberIndex;
+ /// Poll class type.
+ type Class;
+ /// Return the maximum number of voters for the poll class `c`.
+ fn get_max_voters(c: Self::Class) -> MemberIndex;
}
impl, I: 'static> GetMaxVoters for Pallet {
- fn get_max_voters(r: Rank) -> MemberIndex {
- MemberCount::::get(r)
+ type Class = ClassOf;
+ fn get_max_voters(c: Self::Class) -> MemberIndex {
+ MemberCount::::get(T::MinRankOfClass::convert(c))
}
}
@@ -346,7 +355,7 @@ pub mod pallet {
/// Convert the tally class into the minimum rank required to vote on the poll. If
/// `Polls::Class` is the same type as `Rank`, then `Identity` can be used here to mean
/// "a rank of at least the poll class".
- type MinRankOfClass: Convert<>>::Class, Rank>;
+ type MinRankOfClass: Convert, Rank>;
/// Convert a rank_delta into a number of votes the rank gets.
///
diff --git a/frame/ranked-collective/src/tests.rs b/frame/ranked-collective/src/tests.rs
index 91244a90b0b6a..04519bc0f8e22 100644
--- a/frame/ranked-collective/src/tests.rs
+++ b/frame/ranked-collective/src/tests.rs
@@ -25,10 +25,10 @@ use frame_support::{
parameter_types,
traits::{ConstU16, ConstU32, ConstU64, EitherOf, Everything, MapSuccess, Polling},
};
-use sp_core::H256;
+use sp_core::{Get, H256};
use sp_runtime::{
testing::Header,
- traits::{BlakeTwo256, Identity, IdentityLookup, ReduceBy},
+ traits::{BlakeTwo256, IdentityLookup, ReduceBy},
};
use super::*;
@@ -36,6 +36,7 @@ use crate as pallet_ranked_collective;
type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic;
type Block = frame_system::mocking::MockBlock;
+type Class = Rank;
frame_support::construct_runtime!(
pub enum Test where
@@ -95,7 +96,7 @@ impl Polling> for TestPolls {
type Index = u8;
type Votes = Votes;
type Moment = u64;
- type Class = Rank;
+ type Class = Class;
fn classes() -> Vec {
vec![0, 1, 2]
}
@@ -164,6 +165,19 @@ impl Polling> for TestPolls {
}
}
+/// Convert the tally class into the minimum rank required to vote on the poll.
+/// MinRank(Class) = Class - Delta
+pub struct MinRankOfClass(PhantomData);
+impl> Convert for MinRankOfClass {
+ fn convert(a: Class) -> Rank {
+ a.saturating_sub(Delta::get())
+ }
+}
+
+parameter_types! {
+ pub static MinRankOfClassDelta: Rank = 0;
+}
+
impl Config for Test {
type WeightInfo = ();
type RuntimeEvent = RuntimeEvent;
@@ -180,7 +194,7 @@ impl Config for Test {
MapSuccess, ReduceBy>>,
>;
type Polls = TestPolls;
- type MinRankOfClass = Identity;
+ type MinRankOfClass = MinRankOfClass;
type VoteWeight = Geometric;
}
@@ -499,3 +513,43 @@ fn do_add_member_to_rank_works() {
assert_eq!(member_count(max_rank + 1), 0);
})
}
+
+#[test]
+fn tally_support_correct() {
+ new_test_ext().execute_with(|| {
+ // add members,
+ // rank 1: accounts 1, 2, 3
+ // rank 2: accounts 2, 3
+ // rank 3: accounts 3.
+ assert_ok!(Club::add_member(RuntimeOrigin::root(), 1));
+ assert_ok!(Club::promote_member(RuntimeOrigin::root(), 1));
+ assert_ok!(Club::add_member(RuntimeOrigin::root(), 2));
+ assert_ok!(Club::promote_member(RuntimeOrigin::root(), 2));
+ assert_ok!(Club::promote_member(RuntimeOrigin::root(), 2));
+ assert_ok!(Club::add_member(RuntimeOrigin::root(), 3));
+ assert_ok!(Club::promote_member(RuntimeOrigin::root(), 3));
+ assert_ok!(Club::promote_member(RuntimeOrigin::root(), 3));
+ assert_ok!(Club::promote_member(RuntimeOrigin::root(), 3));
+
+ // init tally with 1 aye vote.
+ let tally: TallyOf = Tally::from_parts(1, 1, 0);
+
+ // with minRank(Class) = Class
+ // for class 3, 100% support.
+ MinRankOfClassDelta::set(0);
+ assert_eq!(tally.support(3), Perbill::from_rational(1u32, 1));
+
+ // with minRank(Class) = (Class - 1)
+ // for class 3, ~50% support.
+ MinRankOfClassDelta::set(1);
+ assert_eq!(tally.support(3), Perbill::from_rational(1u32, 2));
+
+ // with minRank(Class) = (Class - 2)
+ // for class 3, ~33% support.
+ MinRankOfClassDelta::set(2);
+ assert_eq!(tally.support(3), Perbill::from_rational(1u32, 3));
+
+ // reset back.
+ MinRankOfClassDelta::set(0);
+ });
+}
diff --git a/frame/staking/src/pallet/impls.rs b/frame/staking/src/pallet/impls.rs
index 1d9838572857d..82a0956da7b61 100644
--- a/frame/staking/src/pallet/impls.rs
+++ b/frame/staking/src/pallet/impls.rs
@@ -669,12 +669,12 @@ impl Pallet {
/// Clear all era information for given era.
pub(crate) fn clear_era_information(era_index: EraIndex) {
- #[allow(deprecated)]
- >::remove_prefix(era_index, None);
- #[allow(deprecated)]
- >::remove_prefix(era_index, None);
- #[allow(deprecated)]
- >::remove_prefix(era_index, None);
+ let mut cursor = >::clear_prefix(era_index, u32::MAX, None);
+ debug_assert!(cursor.maybe_cursor.is_none());
+ cursor = >::clear_prefix(era_index, u32::MAX, None);
+ debug_assert!(cursor.maybe_cursor.is_none());
+ cursor = >::clear_prefix(era_index, u32::MAX, None);
+ debug_assert!(cursor.maybe_cursor.is_none());
>::remove(era_index);
>::remove(era_index);
>::remove(era_index);
diff --git a/frame/staking/src/pallet/mod.rs b/frame/staking/src/pallet/mod.rs
index a725d43515b4c..c5c9c669d2b48 100644
--- a/frame/staking/src/pallet/mod.rs
+++ b/frame/staking/src/pallet/mod.rs
@@ -631,7 +631,7 @@ pub mod pallet {
MaxNominatorsCount::::put(x);
}
- for &(ref stash, ref controller, balance, ref status) in &self.stakers {
+ for &(ref stash, _, balance, ref status) in &self.stakers {
crate::log!(
trace,
"inserting genesis staker: {:?} => {:?} => {:?}",
@@ -650,11 +650,11 @@ pub mod pallet {
));
frame_support::assert_ok!(match status {
crate::StakerStatus::Validator => >::validate(
- T::RuntimeOrigin::from(Some(controller.clone()).into()),
+ T::RuntimeOrigin::from(Some(stash.clone()).into()),
Default::default(),
),
crate::StakerStatus::Nominator(votes) => >::nominate(
- T::RuntimeOrigin::from(Some(controller.clone()).into()),
+ T::RuntimeOrigin::from(Some(stash.clone()).into()),
votes.iter().map(|l| T::Lookup::unlookup(l.clone())).collect(),
),
_ => Ok(()),
diff --git a/frame/support/Cargo.toml b/frame/support/Cargo.toml
index d8b1b9c248720..6ed67c8081b5b 100644
--- a/frame/support/Cargo.toml
+++ b/frame/support/Cargo.toml
@@ -27,6 +27,7 @@ sp-arithmetic = { version = "6.0.0", default-features = false, path = "../../pri
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" }
sp-weights = { version = "4.0.0", default-features = false, path = "../../primitives/weights" }
+sp-debug-derive = { default-features = false, path = "../../primitives/debug-derive" }
tt-call = "1.0.8"
frame-support-procedural = { version = "4.0.0-dev", default-features = false, path = "./procedural" }
paste = "1.0"
@@ -75,7 +76,9 @@ runtime-benchmarks = [
"sp-runtime/runtime-benchmarks",
"sp-staking/runtime-benchmarks"
]
-try-runtime = []
+try-runtime = [
+ "sp-debug-derive/force-debug"
+]
# By default some types have documentation, `no-metadata-docs` allows to reduce the documentation
# in the metadata.
no-metadata-docs = ["frame-support-procedural/no-metadata-docs", "sp-api/no-metadata-docs"]
diff --git a/frame/support/procedural/src/lib.rs b/frame/support/procedural/src/lib.rs
index 895b09a17e083..b8aa5674ddde5 100644
--- a/frame/support/procedural/src/lib.rs
+++ b/frame/support/procedural/src/lib.rs
@@ -648,12 +648,13 @@ pub fn derive_debug_no_bound(input: TokenStream) -> TokenStream {
}
/// Derive [`Debug`], if `std` is enabled it uses `frame_support::DebugNoBound`, if `std` is not
-/// enabled it just returns `""`.
+/// enabled it just returns `""`.
/// This behaviour is useful to prevent bloating the runtime WASM blob from unneeded code.
#[proc_macro_derive(RuntimeDebugNoBound)]
pub fn derive_runtime_debug_no_bound(input: TokenStream) -> TokenStream {
- #[cfg(not(feature = "std"))]
- {
+ if cfg!(any(feature = "std", feature = "try-runtime")) {
+ debug_no_bound::derive_debug_no_bound(input)
+ } else {
let input: syn::DeriveInput = match syn::parse(input) {
Ok(input) => input,
Err(e) => return e.to_compile_error().into(),
@@ -666,18 +667,13 @@ pub fn derive_runtime_debug_no_bound(input: TokenStream) -> TokenStream {
const _: () = {
impl #impl_generics core::fmt::Debug for #name #ty_generics #where_clause {
fn fmt(&self, fmt: &mut core::fmt::Formatter) -> core::fmt::Result {
- fmt.write_str("")
+ fmt.write_str("")
}
}
};
)
.into()
}
-
- #[cfg(feature = "std")]
- {
- debug_no_bound::derive_debug_no_bound(input)
- }
}
/// Derive [`PartialEq`] but do not bound any generic. Docs are at
diff --git a/frame/support/procedural/src/pallet/expand/genesis_config.rs b/frame/support/procedural/src/pallet/expand/genesis_config.rs
index 85ad20dd45c9e..7c66ef7d355d4 100644
--- a/frame/support/procedural/src/pallet/expand/genesis_config.rs
+++ b/frame/support/procedural/src/pallet/expand/genesis_config.rs
@@ -89,7 +89,7 @@ pub fn expand_genesis_config(def: &mut Def) -> proc_macro2::TokenStream {
attrs.push(syn::parse_quote!(
#[doc = r"
Can be used to configure the
- [genesis state](https://docs.substrate.io/v3/runtime/chain-specs#the-genesis-state)
+ [genesis state](https://docs.substrate.io/build/genesis-configuration/)
of this pallet.
"]
));
diff --git a/frame/support/src/traits/misc.rs b/frame/support/src/traits/misc.rs
index e21fcfbb24179..a6f8c46d63951 100644
--- a/frame/support/src/traits/misc.rs
+++ b/frame/support/src/traits/misc.rs
@@ -1160,8 +1160,8 @@ pub trait AccountTouch {
/// The type for currency units of the deposit.
type Balance;
- /// The deposit amount of a native currency required for creating an asset account.
- fn deposit_required() -> Self::Balance;
+ /// The deposit amount of a native currency required for creating an account of the `asset`.
+ fn deposit_required(asset: AssetId) -> Self::Balance;
/// Create an account for `who` of the `asset` with a deposit taken from the `depositor`.
fn touch(asset: AssetId, who: AccountId, depositor: AccountId) -> DispatchResult;
diff --git a/frame/system/src/lib.rs b/frame/system/src/lib.rs
index 1b830105bb154..7a97ace736bb4 100644
--- a/frame/system/src/lib.rs
+++ b/frame/system/src/lib.rs
@@ -66,6 +66,7 @@
#[cfg(feature = "std")]
use serde::Serialize;
+use sp_io::hashing::blake2_256;
#[cfg(feature = "runtime-benchmarks")]
use sp_runtime::traits::TrailingZeroInput;
use sp_runtime::{
@@ -1316,6 +1317,8 @@ impl Pallet {
// populate environment
ExecutionPhase::::put(Phase::Initialization);
storage::unhashed::put(well_known_keys::EXTRINSIC_INDEX, &0u32);
+ let entropy = (b"frame_system::initialize", parent_hash).using_encoded(blake2_256);
+ storage::unhashed::put_raw(well_known_keys::INTRABLOCK_ENTROPY, &entropy[..]);
>::put(number);
>::put(digest);
>::put(parent_hash);
@@ -1365,6 +1368,7 @@ impl Pallet {
);
ExecutionPhase::::kill();
AllExtrinsicsLen::::kill();
+ storage::unhashed::kill(well_known_keys::INTRABLOCK_ENTROPY);
// The following fields
//
@@ -1614,25 +1618,35 @@ impl Pallet {
.ok_or(Error::::FailedToExtractRuntimeVersion)?;
cfg_if::cfg_if! {
- if #[cfg(all(feature = "runtime-benchmarks", not(test)))] {
+ if #[cfg(all(feature = "runtime-benchmarks", not(test)))] {
// Let's ensure the compiler doesn't optimize our fetching of the runtime version away.
core::hint::black_box((new_version, current_version));
Ok(())
- } else {
- if new_version.spec_name != current_version.spec_name {
- return Err(Error::::InvalidSpecName.into())
- }
+ } else {
+ if new_version.spec_name != current_version.spec_name {
+ return Err(Error::::InvalidSpecName.into())
+ }
- if new_version.spec_version <= current_version.spec_version {
- return Err(Error::::SpecVersionNeedsToIncrease.into())
- }
+ if new_version.spec_version <= current_version.spec_version {
+ return Err(Error::::SpecVersionNeedsToIncrease.into())
+ }
- Ok(())
- }
+ Ok(())
+ }
}
}
}
+/// Returns a 32 byte datum which is guaranteed to be universally unique. `entropy` is provided
+/// as a facility to reduce the potential for precalculating results.
+pub fn unique(entropy: impl Encode) -> [u8; 32] {
+ let mut last = [0u8; 32];
+ sp_io::storage::read(well_known_keys::INTRABLOCK_ENTROPY, &mut last[..], 0);
+ let next = (b"frame_system::unique", entropy, last).using_encoded(blake2_256);
+ sp_io::storage::set(well_known_keys::INTRABLOCK_ENTROPY, &next);
+ next
+}
+
/// Event handler which registers a provider when created.
pub struct Provider(PhantomData);
impl HandleLifetime for Provider {
diff --git a/frame/system/src/tests.rs b/frame/system/src/tests.rs
index dc245f0642e2f..05a7e96fdecb1 100644
--- a/frame/system/src/tests.rs
+++ b/frame/system/src/tests.rs
@@ -56,6 +56,43 @@ fn origin_works() {
assert_eq!(x.unwrap(), RawOrigin::::Signed(1u64));
}
+#[test]
+fn unique_datum_works() {
+ new_test_ext().execute_with(|| {
+ System::initialize(&1, &[0u8; 32].into(), &Default::default());
+ assert!(sp_io::storage::exists(well_known_keys::INTRABLOCK_ENTROPY));
+
+ let h1 = unique(b"");
+ assert_eq!(
+ 32,
+ sp_io::storage::read(well_known_keys::INTRABLOCK_ENTROPY, &mut [], 0).unwrap()
+ );
+ let h2 = unique(b"");
+ assert_eq!(
+ 32,
+ sp_io::storage::read(well_known_keys::INTRABLOCK_ENTROPY, &mut [], 0).unwrap()
+ );
+ assert_ne!(h1, h2);
+
+ let h3 = unique(b"Hello");
+ assert_eq!(
+ 32,
+ sp_io::storage::read(well_known_keys::INTRABLOCK_ENTROPY, &mut [], 0).unwrap()
+ );
+ assert_ne!(h2, h3);
+
+ let h4 = unique(b"Hello");
+ assert_eq!(
+ 32,
+ sp_io::storage::read(well_known_keys::INTRABLOCK_ENTROPY, &mut [], 0).unwrap()
+ );
+ assert_ne!(h3, h4);
+
+ System::finalize();
+ assert!(!sp_io::storage::exists(well_known_keys::INTRABLOCK_ENTROPY));
+ });
+}
+
#[test]
fn stored_map_works() {
new_test_ext().execute_with(|| {
diff --git a/primitives/application-crypto/Cargo.toml b/primitives/application-crypto/Cargo.toml
index 37b58bc2bf649..dc97948fdf5c8 100644
--- a/primitives/application-crypto/Cargo.toml
+++ b/primitives/application-crypto/Cargo.toml
@@ -18,7 +18,7 @@ targets = ["x86_64-unknown-linux-gnu"]
sp-core = { version = "7.0.0", default-features = false, path = "../core" }
codec = { package = "parity-scale-codec", version = "3.2.2", default-features = false, features = ["derive"] }
scale-info = { version = "2.5.0", default-features = false, features = ["derive"] }
-serde = { version = "1.0.136", optional = true, features = ["derive"] }
+serde = { version = "1.0.136", default-features = false, optional = true, features = ["derive", "alloc"] }
sp-std = { version = "5.0.0", default-features = false, path = "../std" }
sp-io = { version = "7.0.0", default-features = false, path = "../io" }
@@ -29,11 +29,18 @@ std = [
"sp-core/std",
"codec/std",
"scale-info/std",
- "serde",
+ "serde/std",
"sp-std/std",
"sp-io/std",
]
+# Serde support without relying on std features.
+serde = [
+ "dep:serde",
+ "sp-core/serde",
+ "scale-info/serde",
+]
+
# This feature enables all crypto primitives for `no_std` builds like microcontrollers
# or Intel SGX.
# For the regular wasm runtime builds this should not be used.
diff --git a/primitives/application-crypto/src/lib.rs b/primitives/application-crypto/src/lib.rs
index 3e8f2f5a77b3a..11be54e29c702 100644
--- a/primitives/application-crypto/src/lib.rs
+++ b/primitives/application-crypto/src/lib.rs
@@ -23,20 +23,25 @@
pub use sp_core::crypto::{key_types, CryptoTypeId, KeyTypeId};
#[doc(hidden)]
#[cfg(feature = "full_crypto")]
-pub use sp_core::crypto::{DeriveError, DeriveJunction, Pair, SecretStringError, Ss58Codec};
+pub use sp_core::crypto::{DeriveError, Pair, SecretStringError};
+#[cfg(any(feature = "full_crypto", feature = "serde"))]
+pub use sp_core::crypto::{DeriveJunction, Ss58Codec};
#[doc(hidden)]
pub use sp_core::{
self,
crypto::{ByteArray, CryptoType, Derive, IsWrappedBy, Public, UncheckedFrom, Wraps},
RuntimeDebug,
};
+#[doc(hidden)]
+#[cfg(all(not(feature = "std"), feature = "serde"))]
+pub use sp_std::alloc::{format, string::String};
#[doc(hidden)]
pub use codec;
#[doc(hidden)]
pub use scale_info;
#[doc(hidden)]
-#[cfg(feature = "std")]
+#[cfg(feature = "serde")]
pub use serde;
#[doc(hidden)]
pub use sp_std::{ops::Deref, vec::Vec};
@@ -282,7 +287,7 @@ macro_rules! app_crypto_public_not_full_crypto {
#[macro_export]
macro_rules! app_crypto_public_common {
($public:ty, $sig:ty, $key_type:expr, $crypto_type:expr) => {
- $crate::app_crypto_public_common_if_std!();
+ $crate::app_crypto_public_common_if_serde!();
impl AsRef<[u8]> for Public {
fn as_ref(&self) -> &[u8] {
@@ -323,11 +328,11 @@ macro_rules! app_crypto_public_common {
};
}
-/// Implements traits for the public key type if `feature = "std"` is enabled.
-#[cfg(feature = "std")]
+/// Implements traits for the public key type if `feature = "serde"` is enabled.
+#[cfg(feature = "serde")]
#[doc(hidden)]
#[macro_export]
-macro_rules! app_crypto_public_common_if_std {
+macro_rules! app_crypto_public_common_if_serde {
() => {
impl $crate::Derive for Public {
fn derive>(
@@ -338,15 +343,15 @@ macro_rules! app_crypto_public_common_if_std {
}
}
- impl std::fmt::Display for Public {
- fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
+ impl core::fmt::Display for Public {
+ fn fmt(&self, f: &mut core::fmt::Formatter) -> core::fmt::Result {
use $crate::Ss58Codec;
write!(f, "{}", self.0.to_ss58check())
}
}
impl $crate::serde::Serialize for Public {
- fn serialize(&self, serializer: S) -> std::result::Result
+ fn serialize(&self, serializer: S) -> core::result::Result
where
S: $crate::serde::Serializer,
{
@@ -356,11 +361,14 @@ macro_rules! app_crypto_public_common_if_std {
}
impl<'de> $crate::serde::Deserialize<'de> for Public {
- fn deserialize(deserializer: D) -> std::result::Result
+ fn deserialize(deserializer: D) -> core::result::Result
where
D: $crate::serde::Deserializer<'de>,
{
use $crate::Ss58Codec;
+ #[cfg(all(not(feature = "std"), feature = "serde"))]
+ use $crate::{format, String};
+
Public::from_ss58check(&String::deserialize(deserializer)?)
.map_err(|e| $crate::serde::de::Error::custom(format!("{:?}", e)))
}
@@ -368,10 +376,10 @@ macro_rules! app_crypto_public_common_if_std {
};
}
-#[cfg(not(feature = "std"))]
+#[cfg(not(feature = "serde"))]
#[doc(hidden)]
#[macro_export]
-macro_rules! app_crypto_public_common_if_std {
+macro_rules! app_crypto_public_common_if_serde {
() => {
impl $crate::Derive for Public {}
};
diff --git a/primitives/arithmetic/Cargo.toml b/primitives/arithmetic/Cargo.toml
index 92eebd4a6d8d6..122691623b8fd 100644
--- a/primitives/arithmetic/Cargo.toml
+++ b/primitives/arithmetic/Cargo.toml
@@ -21,7 +21,7 @@ codec = { package = "parity-scale-codec", version = "3.2.2", default-features =
integer-sqrt = "0.1.2"
num-traits = { version = "0.2.8", default-features = false }
scale-info = { version = "2.5.0", default-features = false, features = ["derive"] }
-serde = { version = "1.0.136", features = ["derive"], optional = true }
+serde = { version = "1.0.136", default-features = false, features = ["derive", "alloc"], optional = true }
static_assertions = "1.1.0"
sp-std = { version = "5.0.0", default-features = false, path = "../std" }
@@ -37,9 +37,14 @@ std = [
"codec/std",
"num-traits/std",
"scale-info/std",
- "serde",
+ "serde/std",
"sp-std/std",
]
+# Serde support without relying on std features.
+serde = [
+ "dep:serde",
+ "scale-info/serde",
+]
[[bench]]
name = "bench"
diff --git a/primitives/arithmetic/src/fixed_point.rs b/primitives/arithmetic/src/fixed_point.rs
index 67fbd5bc79c88..08b788e9abd76 100644
--- a/primitives/arithmetic/src/fixed_point.rs
+++ b/primitives/arithmetic/src/fixed_point.rs
@@ -32,9 +32,12 @@ use sp_std::{
prelude::*,
};
-#[cfg(feature = "std")]
+#[cfg(feature = "serde")]
use serde::{de, Deserialize, Deserializer, Serialize, Serializer};
+#[cfg(all(not(feature = "std"), feature = "serde"))]
+use sp_std::alloc::string::{String, ToString};
+
/// Integer types that can be used to interact with `FixedPointNumber` implementations.
pub trait FixedPointOperand:
Copy
@@ -928,14 +931,12 @@ macro_rules! implement_fixed {
}
}
- #[cfg(feature = "std")]
impl sp_std::fmt::Display for $name {
fn fmt(&self, f: &mut sp_std::fmt::Formatter) -> sp_std::fmt::Result {
write!(f, "{}", self.0)
}
}
- #[cfg(feature = "std")]
impl sp_std::str::FromStr for $name {
type Err = &'static str;
@@ -948,7 +949,7 @@ macro_rules! implement_fixed {
// Manual impl `Serialize` as serde_json does not support i128.
// TODO: remove impl if issue https://github.com/serde-rs/json/issues/548 fixed.
- #[cfg(feature = "std")]
+ #[cfg(feature = "serde")]
impl Serialize for $name {
fn serialize(&self, serializer: S) -> Result
where
@@ -960,7 +961,7 @@ macro_rules! implement_fixed {
// Manual impl `Deserialize` as serde_json does not support i128.
// TODO: remove impl if issue https://github.com/serde-rs/json/issues/548 fixed.
- #[cfg(feature = "std")]
+ #[cfg(feature = "serde")]
impl<'de> Deserialize<'de> for $name {
fn deserialize(deserializer: D) -> Result
where
diff --git a/primitives/arithmetic/src/lib.rs b/primitives/arithmetic/src/lib.rs
index e7ba08a532909..d2eceafab5ed0 100644
--- a/primitives/arithmetic/src/lib.rs
+++ b/primitives/arithmetic/src/lib.rs
@@ -53,12 +53,12 @@ use traits::{BaseArithmetic, One, SaturatedConversion, Unsigned, Zero};
use codec::{Decode, Encode, MaxEncodedLen};
use scale_info::TypeInfo;
-#[cfg(feature = "std")]
+#[cfg(feature = "serde")]
use serde::{Deserialize, Serialize};
/// Arithmetic errors.
#[derive(Eq, PartialEq, Clone, Copy, Encode, Decode, Debug, TypeInfo, MaxEncodedLen)]
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
pub enum ArithmeticError {
/// Underflow.
Underflow,
diff --git a/primitives/arithmetic/src/per_things.rs b/primitives/arithmetic/src/per_things.rs
index 611a4e05e1027..fe88b72e24c22 100644
--- a/primitives/arithmetic/src/per_things.rs
+++ b/primitives/arithmetic/src/per_things.rs
@@ -15,7 +15,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#[cfg(feature = "std")]
+#[cfg(feature = "serde")]
use serde::{Deserialize, Serialize};
use crate::traits::{
@@ -556,7 +556,7 @@ macro_rules! implement_per_thing {
/// A fixed point representation of a number in the range [0, 1].
///
#[doc = $title]
- #[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
+ #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
#[derive(Encode, Copy, Clone, PartialEq, Eq, codec::MaxEncodedLen, PartialOrd, Ord, scale_info::TypeInfo)]
pub struct $name($type);
diff --git a/primitives/consensus/babe/Cargo.toml b/primitives/consensus/babe/Cargo.toml
index 7e171811a7fe2..5e57f276aac8b 100644
--- a/primitives/consensus/babe/Cargo.toml
+++ b/primitives/consensus/babe/Cargo.toml
@@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
async-trait = { version = "0.1.57", optional = true }
codec = { package = "parity-scale-codec", version = "3.2.2", default-features = false }
scale-info = { version = "2.5.0", default-features = false, features = ["derive"] }
-serde = { version = "1.0.136", features = ["derive"], optional = true }
+serde = { version = "1.0.136", default-features = false, features = ["derive", "alloc"], optional = true }
sp-api = { version = "4.0.0-dev", default-features = false, path = "../../api" }
sp-application-crypto = { version = "7.0.0", default-features = false, path = "../../application-crypto" }
sp-consensus = { version = "0.10.0-dev", optional = true, path = "../common" }
@@ -34,7 +34,7 @@ std = [
"async-trait",
"codec/std",
"scale-info/std",
- "serde",
+ "serde/std",
"sp-api/std",
"sp-application-crypto/std",
"sp-consensus",
@@ -46,3 +46,13 @@ std = [
"sp-std/std",
"sp-timestamp",
]
+
+# Serde support without relying on std features.
+serde = [
+ "dep:serde",
+ "scale-info/serde",
+ "sp-application-crypto/serde",
+ "sp-consensus-slots/serde",
+ "sp-core/serde",
+ "sp-runtime/serde",
+]
diff --git a/primitives/consensus/babe/src/lib.rs b/primitives/consensus/babe/src/lib.rs
index dc161525a8511..c083bfd9a313e 100644
--- a/primitives/consensus/babe/src/lib.rs
+++ b/primitives/consensus/babe/src/lib.rs
@@ -25,7 +25,7 @@ pub mod inherents;
use codec::{Decode, Encode, MaxEncodedLen};
use scale_info::TypeInfo;
-#[cfg(feature = "std")]
+#[cfg(feature = "serde")]
use serde::{Deserialize, Serialize};
use sp_runtime::{traits::Header, ConsensusEngineId, RuntimeDebug};
use sp_std::vec::Vec;
@@ -217,7 +217,7 @@ impl BabeConfiguration {
/// Types of allowed slots.
#[derive(Clone, Copy, PartialEq, Eq, Encode, Decode, RuntimeDebug, MaxEncodedLen, TypeInfo)]
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
pub enum AllowedSlots {
/// Only allow primary slots.
PrimarySlots,
@@ -241,7 +241,7 @@ impl AllowedSlots {
/// Configuration data used by the BABE consensus engine that may change with epochs.
#[derive(Clone, PartialEq, Eq, Encode, Decode, RuntimeDebug, MaxEncodedLen, TypeInfo)]
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
pub struct BabeEpochConfiguration {
/// A constant value that is used in the threshold calculation formula.
/// Expressed as a rational where the first member of the tuple is the
diff --git a/primitives/consensus/beefy/Cargo.toml b/primitives/consensus/beefy/Cargo.toml
index 144c8452d71b0..cf5f660b22007 100644
--- a/primitives/consensus/beefy/Cargo.toml
+++ b/primitives/consensus/beefy/Cargo.toml
@@ -13,8 +13,8 @@ targets = ["x86_64-unknown-linux-gnu"]
[dependencies]
codec = { package = "parity-scale-codec", version = "3.2.2", default-features = false, features = ["derive"] }
-serde = { version = "1.0.136", optional = true, features = ["derive"] }
scale-info = { version = "2.5.0", default-features = false, features = ["derive"] }
+serde = { version = "1.0.136", default-features = false, optional = true, features = ["derive", "alloc"] }
sp-api = { version = "4.0.0-dev", default-features = false, path = "../../api" }
sp-application-crypto = { version = "7.0.0", default-features = false, path = "../../application-crypto" }
sp-core = { version = "7.0.0", default-features = false, path = "../../core" }
@@ -34,7 +34,7 @@ default = ["std"]
std = [
"codec/std",
"scale-info/std",
- "serde",
+ "serde/std",
"sp-api/std",
"sp-application-crypto/std",
"sp-core/std",
@@ -43,3 +43,12 @@ std = [
"sp-runtime/std",
"sp-std/std",
]
+
+# Serde support without relying on std features.
+serde = [
+ "dep:serde",
+ "scale-info/serde",
+ "sp-application-crypto/serde",
+ "sp-core/serde",
+ "sp-runtime/serde",
+]
diff --git a/primitives/consensus/beefy/src/mmr.rs b/primitives/consensus/beefy/src/mmr.rs
index 465008dc22499..c303cae2fdcc7 100644
--- a/primitives/consensus/beefy/src/mmr.rs
+++ b/primitives/consensus/beefy/src/mmr.rs
@@ -101,7 +101,7 @@ impl MmrLeafVersion {
/// Details of a BEEFY authority set.
#[derive(Debug, Default, PartialEq, Eq, Clone, Encode, Decode, TypeInfo, MaxEncodedLen)]
-#[cfg_attr(feature = "std", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
pub struct BeefyAuthoritySet {
/// Id of the set.
///
diff --git a/primitives/consensus/grandpa/Cargo.toml b/primitives/consensus/grandpa/Cargo.toml
index 446471da8361a..a1846aa76ac1f 100644
--- a/primitives/consensus/grandpa/Cargo.toml
+++ b/primitives/consensus/grandpa/Cargo.toml
@@ -18,7 +18,7 @@ codec = { package = "parity-scale-codec", version = "3.2.2", default-features =
grandpa = { package = "finality-grandpa", version = "0.16.2", default-features = false, features = ["derive-codec"] }
log = { version = "0.4.17", default-features = false }
scale-info = { version = "2.5.0", default-features = false, features = ["derive"] }
-serde = { version = "1.0.136", features = ["derive"], optional = true }
+serde = { version = "1.0.136", features = ["derive", "alloc"], default-features = false, optional = true }
sp-api = { version = "4.0.0-dev", default-features = false, path = "../../api" }
sp-application-crypto = { version = "7.0.0", default-features = false, path = "../../application-crypto" }
sp-core = { version = "7.0.0", default-features = false, path = "../../core" }
@@ -33,7 +33,7 @@ std = [
"grandpa/std",
"log/std",
"scale-info/std",
- "serde",
+ "serde/std",
"sp-api/std",
"sp-application-crypto/std",
"sp-core/std",
@@ -41,3 +41,12 @@ std = [
"sp-runtime/std",
"sp-std/std",
]
+
+# Serde support without relying on std features.
+serde = [
+ "dep:serde",
+ "scale-info/serde",
+ "sp-application-crypto/serde",
+ "sp-core/serde",
+ "sp-runtime/serde",
+]
diff --git a/primitives/consensus/grandpa/src/lib.rs b/primitives/consensus/grandpa/src/lib.rs
index 728ce3092888b..baeaee4738e48 100644
--- a/primitives/consensus/grandpa/src/lib.rs
+++ b/primitives/consensus/grandpa/src/lib.rs
@@ -22,7 +22,7 @@
#[cfg(not(feature = "std"))]
extern crate alloc;
-#[cfg(feature = "std")]
+#[cfg(feature = "serde")]
use serde::Serialize;
use codec::{Codec, Decode, Encode, Input};
@@ -140,8 +140,8 @@ pub struct GrandpaJustification {
}
/// A scheduled change of authority set.
-#[cfg_attr(feature = "std", derive(Serialize))]
#[derive(Clone, Eq, PartialEq, Encode, Decode, RuntimeDebug, TypeInfo)]
+#[cfg_attr(feature = "serde", derive(Serialize))]
pub struct ScheduledChange {
/// The new authorities after the change, along with their respective weights.
pub next_authorities: AuthorityList,
@@ -150,8 +150,8 @@ pub struct ScheduledChange {
}
/// An consensus log item for GRANDPA.
-#[cfg_attr(feature = "std", derive(Serialize))]
#[derive(Decode, Encode, PartialEq, Eq, Clone, RuntimeDebug)]
+#[cfg_attr(feature = "serde", derive(Serialize))]
pub enum ConsensusLog {
/// Schedule an authority set change.
///
diff --git a/primitives/consensus/slots/Cargo.toml b/primitives/consensus/slots/Cargo.toml
index a4d85dff6ea85..29aa3c10c2f55 100644
--- a/primitives/consensus/slots/Cargo.toml
+++ b/primitives/consensus/slots/Cargo.toml
@@ -15,7 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"]
[dependencies]
codec = { package = "parity-scale-codec", version = "3.2.2", default-features = false, features = ["derive", "max-encoded-len"] }
scale-info = { version = "2.0.0", default-features = false, features = ["derive"] }
-serde = { version = "1.0", features = ["derive"], optional = true }
+serde = { version = "1.0", default-features = false, features = ["derive", "alloc"], optional = true }
sp-std = { version = "5.0.0", default-features = false, path = "../../std" }
sp-timestamp = { version = "4.0.0-dev", default-features = false, path = "../../timestamp" }
@@ -24,7 +24,13 @@ default = ["std"]
std = [
"codec/std",
"scale-info/std",
- "serde",
+ "serde/std",
"sp-std/std",
"sp-timestamp/std",
]
+
+# Serde support without relying on std features.
+serde = [
+ "dep:serde",
+ "scale-info/serde",
+]
diff --git a/primitives/consensus/slots/src/lib.rs b/primitives/consensus/slots/src/lib.rs
index 1f2fa585df7f2..30bb42e2c7589 100644
--- a/primitives/consensus/slots/src/lib.rs
+++ b/primitives/consensus/slots/src/lib.rs
@@ -25,7 +25,7 @@ use sp_timestamp::Timestamp;
/// Unit type wrapper that represents a slot.
#[derive(Debug, Encode, MaxEncodedLen, Decode, Eq, Clone, Copy, Default, Ord, TypeInfo)]
-#[cfg_attr(feature = "std", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
pub struct Slot(u64);
impl core::ops::Deref for Slot {
diff --git a/primitives/core/Cargo.toml b/primitives/core/Cargo.toml
index 0c203a03d904d..d0ec98b1c3080 100644
--- a/primitives/core/Cargo.toml
+++ b/primitives/core/Cargo.toml
@@ -16,10 +16,10 @@ targets = ["x86_64-unknown-linux-gnu"]
codec = { package = "parity-scale-codec", version = "3.2.2", default-features = false, features = ["derive","max-encoded-len"] }
scale-info = { version = "2.5.0", default-features = false, features = ["derive"] }
log = { version = "0.4.17", default-features = false }
-serde = { version = "1.0.136", optional = true, features = ["derive"] }
+serde = { version = "1.0.136", optional = true, default-features = false, features = ["derive", "alloc"] }
bounded-collections = { version = "0.1.4", default-features = false }
primitive-types = { version = "0.12.0", default-features = false, features = ["codec", "scale-info"] }
-impl-serde = { version = "0.4.0", optional = true }
+impl-serde = { version = "0.4.0", default-features = false, optional = true }
hash-db = { version = "0.16.0", default-features = false }
hash256-std-hasher = { version = "0.15.2", default-features = false }
bs58 = { version = "0.4.0", default-features = false, optional = true }
@@ -31,6 +31,7 @@ zeroize = { version = "1.4.3", default-features = false }
secrecy = { version = "0.8.0", default-features = false }
lazy_static = { version = "1.4.0", default-features = false, optional = true }
parking_lot = { version = "0.12.1", optional = true }
+ss58-registry = { version = "1.34.0", default-features = false }
sp-std = { version = "5.0.0", default-features = false, path = "../std" }
sp-debug-derive = { version = "5.0.0", default-features = false, path = "../debug-derive" }
sp-storage = { version = "7.0.0", default-features = false, path = "../storage" }
@@ -49,14 +50,12 @@ libsecp256k1 = { version = "0.7", default-features = false, features = ["static-
schnorrkel = { version = "0.9.1", features = ["preaudit_deprecated", "u64_backend"], default-features = false }
merlin = { version = "2.0", default-features = false }
secp256k1 = { version = "0.24.0", default-features = false, features = ["recovery", "alloc"], optional = true }
-ss58-registry = { version = "1.34.0", default-features = false }
sp-core-hashing = { version = "5.0.0", path = "./hashing", default-features = false, optional = true }
sp-runtime-interface = { version = "7.0.0", default-features = false, path = "../runtime-interface" }
# bls crypto
w3f-bls = { version = "0.1.3", default-features = false, optional = true}
[dev-dependencies]
-sp-serializer = { version = "4.0.0-dev", path = "../serializer" }
rand = "0.8.5"
criterion = "0.4.0"
serde_json = "1.0"
@@ -84,13 +83,13 @@ std = [
"primitive-types/serde",
"primitive-types/byteorder",
"primitive-types/rustc-hex",
- "impl-serde",
+ "impl-serde/std",
"codec/std",
"scale-info/std",
"hash256-std-hasher/std",
"hash-db/std",
"sp-std/std",
- "serde",
+ "serde/std",
"blake2/std",
"array-bytes",
"ed25519-zebra/std",
@@ -116,6 +115,20 @@ std = [
"dyn-clonable",
]
+# Serde support without relying on std features.
+serde = [
+ "dep:serde",
+ "array-bytes",
+ "blake2",
+ "bs58/alloc",
+ "scale-info/serde",
+ "secrecy/alloc",
+ "impl-serde",
+ "primitive-types/serde_no_std",
+ "sp-storage/serde",
+ "sp-core-hashing",
+]
+
# This feature enables all crypto primitives for `no_std` builds like microcontrollers
# or Intel SGX.
# For the regular wasm runtime builds this should not be used.
diff --git a/primitives/core/src/crypto.rs b/primitives/core/src/crypto.rs
index 27b24057b0e80..5947603cd0942 100644
--- a/primitives/core/src/crypto.rs
+++ b/primitives/core/src/crypto.rs
@@ -33,13 +33,16 @@ pub use secrecy::{ExposeSecret, SecretString};
use sp_runtime_interface::pass_by::PassByInner;
#[doc(hidden)]
pub use sp_std::ops::Deref;
+#[cfg(all(not(feature = "std"), feature = "serde"))]
+use sp_std::{
+ alloc::{format, string::String},
+ vec,
+};
use sp_std::{hash::Hash, str, vec::Vec};
+pub use ss58_registry::{from_known_address_format, Ss58AddressFormat, Ss58AddressFormatRegistry};
/// Trait to zeroize a memory buffer.
pub use zeroize::Zeroize;
-#[cfg(feature = "full_crypto")]
-pub use ss58_registry::{from_known_address_format, Ss58AddressFormat, Ss58AddressFormatRegistry};
-
/// The root phrase for our publicly known keys.
pub const DEV_PHRASE: &str =
"bottom drive obey lake curtain smoke basket hold race lonely fit walk";
@@ -49,7 +52,6 @@ pub const DEV_ADDRESS: &str = "5DfhGyQdFobKM8NsWvEeAKk5EQQgYe9AydgJ7rMB6E1EqRzV"
/// The length of the junction identifier. Note that this is also referred to as the
/// `CHAIN_CODE_LENGTH` in the context of Schnorrkel.
-#[cfg(feature = "full_crypto")]
pub const JUNCTION_ID_LEN: usize = 32;
/// Similar to `From`, except that the onus is on the part of the caller to ensure
@@ -113,7 +115,7 @@ pub enum DeriveError {
/// a new secret key from an existing secret key and, in the case of `SoftRaw` and `SoftIndex`
/// a new public key from an existing public key.
#[derive(Copy, Clone, Eq, PartialEq, Hash, Debug, Encode, Decode)]
-#[cfg(feature = "full_crypto")]
+#[cfg(any(feature = "full_crypto", feature = "serde"))]
pub enum DeriveJunction {
/// Soft (vanilla) derivation. Public keys have a correspondent derivation.
Soft([u8; JUNCTION_ID_LEN]),
@@ -121,7 +123,7 @@ pub enum DeriveJunction {
Hard([u8; JUNCTION_ID_LEN]),
}
-#[cfg(feature = "full_crypto")]
+#[cfg(any(feature = "full_crypto", feature = "serde"))]
impl DeriveJunction {
/// Consume self to return a soft derive junction with the same chain code.
pub fn soften(self) -> Self {
@@ -180,7 +182,7 @@ impl DeriveJunction {
}
}
-#[cfg(feature = "full_crypto")]
+#[cfg(any(feature = "full_crypto", feature = "serde"))]
impl> From for DeriveJunction {
fn from(j: T) -> DeriveJunction {
let j = j.as_ref();
@@ -208,7 +210,7 @@ impl> From for DeriveJunction {
#[cfg_attr(not(feature = "std"), derive(Debug))]
#[derive(Clone, Copy, Eq, PartialEq)]
#[allow(missing_docs)]
-#[cfg(feature = "full_crypto")]
+#[cfg(any(feature = "full_crypto", feature = "serde"))]
pub enum PublicError {
#[cfg_attr(feature = "std", error("Base 58 requirement is violated"))]
BadBase58,
@@ -247,7 +249,6 @@ impl sp_std::fmt::Debug for PublicError {
///
/// See
/// for information on the codec.
-#[cfg(feature = "full_crypto")]
pub trait Ss58Codec: Sized + AsMut<[u8]> + AsRef<[u8]> + ByteArray {
/// A format filterer, can be used to ensure that `from_ss58check` family only decode for
/// allowed identifiers. By default just refuses the two reserved identifiers.
@@ -256,7 +257,7 @@ pub trait Ss58Codec: Sized + AsMut<[u8]> + AsRef<[u8]> + ByteArray {
}
/// Some if the string is a properly encoded SS58Check address.
- #[cfg(feature = "std")]
+ #[cfg(feature = "serde")]
fn from_ss58check(s: &str) -> Result {
Self::from_ss58check_with_version(s).and_then(|(r, v)| match v {
v if !v.is_custom() => Ok(r),
@@ -266,7 +267,7 @@ pub trait Ss58Codec: Sized + AsMut<[u8]> + AsRef<[u8]> + ByteArray {
}
/// Some if the string is a properly encoded SS58Check address.
- #[cfg(feature = "std")]
+ #[cfg(feature = "serde")]
fn from_ss58check_with_version(s: &str) -> Result<(Self, Ss58AddressFormat), PublicError> {
const CHECKSUM_LEN: usize = 2;
let body_len = Self::LEN;
@@ -321,7 +322,7 @@ pub trait Ss58Codec: Sized + AsMut<[u8]> + AsRef<[u8]> + ByteArray {
}
/// Return the ss58-check string for this key.
- #[cfg(feature = "std")]
+ #[cfg(feature = "serde")]
fn to_ss58check_with_version(&self, version: Ss58AddressFormat) -> String {
// We mask out the upper two bits of the ident - SS58 Prefix currently only supports 14-bits
let ident: u16 = u16::from(version) & 0b0011_1111_1111_1111;
@@ -344,7 +345,7 @@ pub trait Ss58Codec: Sized + AsMut<[u8]> + AsRef<[u8]> + ByteArray {
}
/// Return the ss58-check string for this key.
- #[cfg(feature = "std")]
+ #[cfg(feature = "serde")]
fn to_ss58check(&self) -> String {
self.to_ss58check_with_version(default_ss58_version())
}
@@ -362,16 +363,16 @@ pub trait Derive: Sized {
/// Derive a child key from a series of given junctions.
///
/// Will be `None` for public keys if there are any hard junctions in there.
- #[cfg(feature = "std")]
+ #[cfg(feature = "serde")]
fn derive>(&self, _path: Iter) -> Option {
None
}
}
-#[cfg(feature = "std")]
+#[cfg(feature = "serde")]
const PREFIX: &[u8] = b"SS58PRE";
-#[cfg(feature = "std")]
+#[cfg(feature = "serde")]
fn ss58hash(data: &[u8]) -> Vec {
use blake2::{Blake2b512, Digest};
@@ -382,19 +383,19 @@ fn ss58hash(data: &[u8]) -> Vec {
}
/// Default prefix number
-#[cfg(feature = "std")]
-static DEFAULT_VERSION: core::sync::atomic::AtomicU16 = std::sync::atomic::AtomicU16::new(
+#[cfg(feature = "serde")]
+static DEFAULT_VERSION: core::sync::atomic::AtomicU16 = core::sync::atomic::AtomicU16::new(
from_known_address_format(Ss58AddressFormatRegistry::SubstrateAccount),
);
/// Returns default SS58 format used by the current active process.
-#[cfg(feature = "std")]
+#[cfg(feature = "serde")]
pub fn default_ss58_version() -> Ss58AddressFormat {
- DEFAULT_VERSION.load(std::sync::atomic::Ordering::Relaxed).into()
+ DEFAULT_VERSION.load(core::sync::atomic::Ordering::Relaxed).into()
}
/// Returns either the input address format or the default.
-#[cfg(feature = "std")]
+#[cfg(feature = "serde")]
pub fn unwrap_or_default_ss58_version(network: Option) -> Ss58AddressFormat {
network.unwrap_or_else(default_ss58_version)
}
@@ -408,9 +409,9 @@ pub fn unwrap_or_default_ss58_version(network: Option) -> Ss5
/// This will enable the node to decode ss58 addresses with this prefix.
///
/// This SS58 version/format is also only used by the node and not by the runtime.
-#[cfg(feature = "std")]
+#[cfg(feature = "serde")]
pub fn set_default_ss58_version(new_default: Ss58AddressFormat) {
- DEFAULT_VERSION.store(new_default.into(), std::sync::atomic::Ordering::Relaxed);
+ DEFAULT_VERSION.store(new_default.into(), core::sync::atomic::Ordering::Relaxed);
}
#[cfg(feature = "std")]
@@ -458,6 +459,11 @@ impl + AsRef<[u8]> + Public + Derive> Ss58Codec for T {
}
}
+// Use the default implementations of the trait in serde feature.
+// The std implementation is not available because of std only crate Regex.
+#[cfg(all(not(feature = "std"), feature = "serde"))]
+impl + AsRef<[u8]> + Public + Derive> Ss58Codec for T {}
+
/// Trait used for types that are really just a fixed-length array.
pub trait ByteArray: AsRef<[u8]> + AsMut<[u8]> + for<'a> TryFrom<&'a [u8], Error = ()> {
/// The "length" of the values of this type, which is always the same.
@@ -507,7 +513,7 @@ impl ByteArray for AccountId32 {
const LEN: usize = 32;
}
-#[cfg(feature = "std")]
+#[cfg(feature = "serde")]
impl Ss58Codec for AccountId32 {}
impl AsRef<[u8]> for AccountId32 {
@@ -591,7 +597,7 @@ impl sp_std::fmt::Debug for AccountId32 {
}
}
-#[cfg(feature = "std")]
+#[cfg(feature = "serde")]
impl serde::Serialize for AccountId32 {
fn serialize(&self, serializer: S) -> Result
where
@@ -601,7 +607,7 @@ impl serde::Serialize for AccountId32 {
}
}
-#[cfg(feature = "std")]
+#[cfg(feature = "serde")]
impl<'de> serde::Deserialize<'de> for AccountId32 {
fn deserialize(deserializer: D) -> Result
where
@@ -1063,7 +1069,7 @@ pub trait CryptoType {
crate::RuntimeDebug,
TypeInfo,
)]
-#[cfg_attr(feature = "std", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
pub struct KeyTypeId(pub [u8; 4]);
impl From for KeyTypeId {
@@ -1121,7 +1127,7 @@ pub trait VrfPublic: VrfCrypto {
/// An identifier for a specific cryptographic algorithm used by a key pair
#[derive(Debug, Copy, Clone, Default, PartialEq, Eq, PartialOrd, Ord, Hash, Encode, Decode)]
-#[cfg_attr(feature = "std", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
pub struct CryptoTypeId(pub [u8; 4]);
/// Known key types; this also functions as a global registry of key types for projects wishing to
diff --git a/primitives/core/src/ecdsa.rs b/primitives/core/src/ecdsa.rs
index 2474fa7736b78..0c997bc290008 100644
--- a/primitives/core/src/ecdsa.rs
+++ b/primitives/core/src/ecdsa.rs
@@ -21,7 +21,7 @@ use codec::{Decode, Encode, MaxEncodedLen};
use scale_info::TypeInfo;
use sp_runtime_interface::pass_by::PassByInner;
-#[cfg(feature = "std")]
+#[cfg(feature = "serde")]
use crate::crypto::Ss58Codec;
use crate::crypto::{
ByteArray, CryptoType, CryptoTypeId, Derive, Public as TraitPublic, UncheckedFrom,
@@ -40,8 +40,10 @@ use secp256k1::{
ecdsa::{RecoverableSignature, RecoveryId},
Message, PublicKey, SecretKey,
};
-#[cfg(feature = "std")]
+#[cfg(feature = "serde")]
use serde::{de, Deserialize, Deserializer, Serialize, Serializer};
+#[cfg(all(not(feature = "std"), feature = "serde"))]
+use sp_std::alloc::{format, string::String};
#[cfg(feature = "full_crypto")]
use sp_std::vec::Vec;
@@ -164,7 +166,7 @@ impl sp_std::fmt::Debug for Public {
}
}
-#[cfg(feature = "std")]
+#[cfg(feature = "serde")]
impl Serialize for Public {
fn serialize(&self, serializer: S) -> Result
where
@@ -174,7 +176,7 @@ impl Serialize for Public {
}
}
-#[cfg(feature = "std")]
+#[cfg(feature = "serde")]
impl<'de> Deserialize<'de> for Public {
fn deserialize(deserializer: D) -> Result
where
@@ -204,7 +206,7 @@ impl TryFrom<&[u8]> for Signature {
}
}
-#[cfg(feature = "std")]
+#[cfg(feature = "serde")]
impl Serialize for Signature {
fn serialize(&self, serializer: S) -> Result
where
@@ -214,7 +216,7 @@ impl Serialize for Signature {
}
}
-#[cfg(feature = "std")]
+#[cfg(feature = "serde")]
impl<'de> Deserialize<'de> for Signature {
fn deserialize(deserializer: D) -> Result
where
diff --git a/primitives/core/src/ed25519.rs b/primitives/core/src/ed25519.rs
index d0e6bef97a7d9..29da78626f850 100644
--- a/primitives/core/src/ed25519.rs
+++ b/primitives/core/src/ed25519.rs
@@ -29,7 +29,7 @@ use crate::{
use codec::{Decode, Encode, MaxEncodedLen};
use scale_info::TypeInfo;
-#[cfg(feature = "std")]
+#[cfg(feature = "serde")]
use crate::crypto::Ss58Codec;
use crate::crypto::{CryptoType, CryptoTypeId, Derive, Public as TraitPublic, UncheckedFrom};
#[cfg(feature = "full_crypto")]
@@ -38,9 +38,11 @@ use crate::crypto::{DeriveError, DeriveJunction, Pair as TraitPair, SecretString
use core::convert::TryFrom;
#[cfg(feature = "full_crypto")]
use ed25519_zebra::{SigningKey, VerificationKey};
-#[cfg(feature = "std")]
+#[cfg(feature = "serde")]
use serde::{de, Deserialize, Deserializer, Serialize, Serializer};
use sp_runtime_interface::pass_by::PassByInner;
+#[cfg(all(not(feature = "std"), feature = "serde"))]
+use sp_std::alloc::{format, string::String};
use sp_std::ops::Deref;
/// An identifier used to match public keys against ed25519 keys
@@ -176,7 +178,7 @@ impl sp_std::fmt::Debug for Public {
}
}
-#[cfg(feature = "std")]
+#[cfg(feature = "serde")]
impl Serialize for Public {
fn serialize(&self, serializer: S) -> Result
where
@@ -186,7 +188,7 @@ impl Serialize for Public {
}
}
-#[cfg(feature = "std")]
+#[cfg(feature = "serde")]
impl<'de> Deserialize<'de> for Public {
fn deserialize(deserializer: D) -> Result
where
@@ -216,7 +218,7 @@ impl TryFrom<&[u8]> for Signature {
}
}
-#[cfg(feature = "std")]
+#[cfg(feature = "serde")]
impl Serialize for Signature {
fn serialize(&self, serializer: S) -> Result
where
@@ -226,7 +228,7 @@ impl Serialize for Signature {
}
}
-#[cfg(feature = "std")]
+#[cfg(feature = "serde")]
impl<'de> Deserialize<'de> for Signature {
fn deserialize(deserializer: D) -> Result
where
diff --git a/primitives/core/src/hash.rs b/primitives/core/src/hash.rs
index ec7da98296bf3..ece9b1af794aa 100644
--- a/primitives/core/src/hash.rs
+++ b/primitives/core/src/hash.rs
@@ -32,7 +32,6 @@ pub fn convert_hash, H2: AsRef<[u8]>>(src: &H2) -> H1
#[cfg(test)]
mod tests {
use super::*;
- use sp_serializer as ser;
#[test]
fn test_h160() {
@@ -47,8 +46,11 @@ mod tests {
];
for (number, expected) in tests {
- assert_eq!(format!("{:?}", expected), ser::to_string_pretty(&number));
- assert_eq!(number, ser::from_str(&format!("{:?}", expected)).unwrap());
+ assert_eq!(
+ format!("{:?}", expected),
+ serde_json::to_string_pretty(&number).expect("Json pretty print failed")
+ );
+ assert_eq!(number, serde_json::from_str(&format!("{:?}", expected)).unwrap());
}
}
@@ -86,30 +88,33 @@ mod tests {
];
for (number, expected) in tests {
- assert_eq!(format!("{:?}", expected), ser::to_string_pretty(&number));
- assert_eq!(number, ser::from_str(&format!("{:?}", expected)).unwrap());
+ assert_eq!(
+ format!("{:?}", expected),
+ serde_json::to_string_pretty(&number).expect("Json pretty print failed")
+ );
+ assert_eq!(number, serde_json::from_str(&format!("{:?}", expected)).unwrap());
}
}
#[test]
fn test_invalid() {
- assert!(ser::from_str::(
+ assert!(serde_json::from_str::(
"\"0x000000000000000000000000000000000000000000000000000000000000000\""
)
.unwrap_err()
.is_data());
- assert!(ser::from_str::(
+ assert!(serde_json::from_str::(
"\"0x000000000000000000000000000000000000000000000000000000000000000g\""
)
.unwrap_err()
.is_data());
- assert!(ser::from_str::(
+ assert!(serde_json::from_str::(
"\"0x00000000000000000000000000000000000000000000000000000000000000000\""
)
.unwrap_err()
.is_data());
- assert!(ser::from_str::("\"\"").unwrap_err().is_data());
- assert!(ser::from_str::("\"0\"").unwrap_err().is_data());
- assert!(ser::from_str::("\"10\"").unwrap_err().is_data());
+ assert!(serde_json::from_str::("\"\"").unwrap_err().is_data());
+ assert!(serde_json::from_str::("\"0\"").unwrap_err().is_data());
+ assert!(serde_json::from_str::("\"10\"").unwrap_err().is_data());
}
}
diff --git a/primitives/core/src/lib.rs b/primitives/core/src/lib.rs
index f9541b02e2903..b61009bc640ee 100644
--- a/primitives/core/src/lib.rs
+++ b/primitives/core/src/lib.rs
@@ -34,16 +34,16 @@ macro_rules! map {
#[doc(hidden)]
pub use codec::{Decode, Encode, MaxEncodedLen};
use scale_info::TypeInfo;
-#[cfg(feature = "std")]
+#[cfg(feature = "serde")]
pub use serde;
-#[cfg(feature = "std")]
+#[cfg(feature = "serde")]
use serde::{Deserialize, Serialize};
use sp_runtime_interface::pass_by::{PassByEnum, PassByInner};
use sp_std::{ops::Deref, prelude::*};
pub use sp_debug_derive::RuntimeDebug;
-#[cfg(feature = "std")]
+#[cfg(feature = "serde")]
pub use impl_serde::serialize as bytes;
#[cfg(feature = "full_crypto")]
@@ -139,8 +139,8 @@ impl ExecutionContext {
/// Hex-serialized shim for `Vec`.
#[derive(PartialEq, Eq, Clone, RuntimeDebug)]
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize, Hash, PartialOrd, Ord))]
-pub struct Bytes(#[cfg_attr(feature = "std", serde(with = "bytes"))] pub Vec);
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize, Hash, PartialOrd, Ord))]
+pub struct Bytes(#[cfg_attr(feature = "serde", serde(with = "bytes"))] pub Vec);
impl From> for Bytes {
fn from(s: Vec) -> Self {
@@ -209,7 +209,7 @@ impl sp_std::ops::Deref for OpaqueMetadata {
PassByInner,
TypeInfo,
)]
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
pub struct OpaquePeerId(pub Vec);
impl OpaquePeerId {
@@ -394,6 +394,45 @@ macro_rules! impl_maybe_marker {
}
}
+/// Macro for creating `Maybe*` marker traits.
+///
+/// Such a maybe-marker trait requires the given bound when either `feature = std` or `feature =
+/// serde` is activated.
+///
+/// # Example
+///
+/// ```
+/// sp_core::impl_maybe_marker_std_or_serde! {
+/// /// A marker for a type that implements `Debug` when `feature = serde` or `feature = std`.
+/// trait MaybeDebug: std::fmt::Debug;
+/// /// A marker for a type that implements `Debug + Display` when `feature = serde` or `feature = std`.
+/// trait MaybeDebugDisplay: std::fmt::Debug, std::fmt::Display;
+/// }
+/// ```
+#[macro_export]
+macro_rules! impl_maybe_marker_std_or_serde {
+ (
+ $(
+ $(#[$doc:meta] )+
+ trait $trait_name:ident: $( $trait_bound:path ),+;
+ )+
+ ) => {
+ $(
+ $(#[$doc])+
+ #[cfg(any(feature = "serde", feature = "std"))]
+ pub trait $trait_name: $( $trait_bound + )+ {}
+ #[cfg(any(feature = "serde", feature = "std"))]
+ impl $trait_name for T {}
+
+ $(#[$doc])+
+ #[cfg(not(any(feature = "serde", feature = "std")))]
+ pub trait $trait_name {}
+ #[cfg(not(any(feature = "serde", feature = "std")))]
+ impl $trait_name for T {}
+ )+
+ }
+}
+
/// The maximum number of bytes that can be allocated at one time.
// The maximum possible allocation size was chosen rather arbitrary, 32 MiB should be enough for
// everybody.
@@ -445,7 +484,7 @@ macro_rules! generate_feature_enabled_macro {
}
// Work around for:
- #[doc(hidden)]
+ #[doc(hidden)]
pub use [<_ $macro_name>] as $macro_name;
}
};
diff --git a/primitives/core/src/offchain/mod.rs b/primitives/core/src/offchain/mod.rs
index a9e6639807023..a6cef85e6ac1b 100644
--- a/primitives/core/src/offchain/mod.rs
+++ b/primitives/core/src/offchain/mod.rs
@@ -58,7 +58,7 @@ pub trait OffchainStorage: Clone + Send + Sync {
/// A type of supported crypto.
#[derive(Clone, Copy, PartialEq, Eq, Encode, Decode, RuntimeDebug, PassByEnum)]
-#[cfg_attr(feature = "std", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
#[repr(C)]
pub enum StorageKind {
/// Persistent storage is non-revertible and not fork-aware. It means that any value
@@ -208,14 +208,14 @@ impl OpaqueMultiaddr {
#[derive(
Clone, Copy, PartialEq, Eq, Ord, PartialOrd, Default, RuntimeDebug, PassByInner, Encode, Decode,
)]
-#[cfg_attr(feature = "std", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
pub struct Timestamp(u64);
/// Duration type
#[derive(
Clone, Copy, PartialEq, Eq, Ord, PartialOrd, Default, RuntimeDebug, PassByInner, Encode, Decode,
)]
-#[cfg_attr(feature = "std", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
pub struct Duration(u64);
impl Duration {
diff --git a/primitives/core/src/sr25519.rs b/primitives/core/src/sr25519.rs
index fead9e2a09df3..cfcdd6a9fdd41 100644
--- a/primitives/core/src/sr25519.rs
+++ b/primitives/core/src/sr25519.rs
@@ -19,15 +19,20 @@
//!
//! Note: `CHAIN_CODE_LENGTH` must be equal to `crate::crypto::JUNCTION_ID_LEN`
//! for this to work.
-
-#[cfg(feature = "std")]
+#[cfg(any(feature = "full_crypto", feature = "serde"))]
+use crate::crypto::DeriveJunction;
+#[cfg(feature = "serde")]
use crate::crypto::Ss58Codec;
#[cfg(feature = "full_crypto")]
-use crate::crypto::{DeriveError, DeriveJunction, Pair as TraitPair, SecretStringError};
+use crate::crypto::{DeriveError, Pair as TraitPair, SecretStringError};
#[cfg(feature = "full_crypto")]
use schnorrkel::{
- derive::{ChainCode, Derivation, CHAIN_CODE_LENGTH},
- signing_context, ExpansionMode, Keypair, MiniSecretKey, PublicKey, SecretKey,
+ derive::CHAIN_CODE_LENGTH, signing_context, ExpansionMode, Keypair, MiniSecretKey, SecretKey,
+};
+#[cfg(any(feature = "full_crypto", feature = "serde"))]
+use schnorrkel::{
+ derive::{ChainCode, Derivation},
+ PublicKey,
};
use sp_std::vec::Vec;
@@ -41,9 +46,11 @@ use sp_std::ops::Deref;
#[cfg(feature = "full_crypto")]
use schnorrkel::keys::{MINI_SECRET_KEY_LENGTH, SECRET_KEY_LENGTH};
-#[cfg(feature = "std")]
+#[cfg(feature = "serde")]
use serde::{de, Deserialize, Deserializer, Serialize, Serializer};
use sp_runtime_interface::pass_by::PassByInner;
+#[cfg(all(not(feature = "std"), feature = "serde"))]
+use sp_std::alloc::{format, string::String};
// signing context
#[cfg(feature = "full_crypto")]
@@ -176,7 +183,7 @@ impl sp_std::fmt::Debug for Public {
}
}
-#[cfg(feature = "std")]
+#[cfg(feature = "serde")]
impl Serialize for Public {
fn serialize(&self, serializer: S) -> Result
where
@@ -186,7 +193,7 @@ impl Serialize for Public {
}
}
-#[cfg(feature = "std")]
+#[cfg(feature = "serde")]
impl<'de> Deserialize<'de> for Public {
fn deserialize(deserializer: D) -> Result
where
@@ -216,7 +223,7 @@ impl TryFrom<&[u8]> for Signature {
}
}
-#[cfg(feature = "std")]
+#[cfg(feature = "serde")]
impl Serialize for Signature {
fn serialize(&self, serializer: S) -> Result
where
@@ -226,7 +233,7 @@ impl Serialize for Signature {
}
}
-#[cfg(feature = "std")]
+#[cfg(feature = "serde")]
impl<'de> Deserialize<'de> for Signature {
fn deserialize(deserializer: D) -> Result
where
@@ -339,7 +346,7 @@ impl Derive for Public {
/// Derive a child key from a series of given junctions.
///
/// `None` if there are any hard junctions in there.
- #[cfg(feature = "std")]
+ #[cfg(feature = "serde")]
fn derive>(&self, path: Iter) -> Option {
let mut acc = PublicKey::from_bytes(self.as_ref()).ok()?;
for j in path {
diff --git a/primitives/core/src/uint.rs b/primitives/core/src/uint.rs
index df49511e84943..b251671dbeea5 100644
--- a/primitives/core/src/uint.rs
+++ b/primitives/core/src/uint.rs
@@ -23,7 +23,6 @@ pub use primitive_types::{U256, U512};
mod tests {
use super::*;
use codec::{Decode, Encode};
- use sp_serializer as ser;
macro_rules! test {
($name: ident, $test_name: ident) => {
@@ -43,14 +42,17 @@ mod tests {
];
for (number, expected) in tests {
- assert_eq!(format!("{:?}", expected), ser::to_string_pretty(&number));
- assert_eq!(number, ser::from_str(&format!("{:?}", expected)).unwrap());
+ assert_eq!(
+ format!("{:?}", expected),
+ serde_json::to_string_pretty(&number).expect("Json pretty print failed")
+ );
+ assert_eq!(number, serde_json::from_str(&format!("{:?}", expected)).unwrap());
}
// Invalid examples
- assert!(ser::from_str::<$name>("\"0x\"").unwrap_err().is_data());
- assert!(ser::from_str::<$name>("\"0xg\"").unwrap_err().is_data());
- assert!(ser::from_str::<$name>("\"\"").unwrap_err().is_data());
+ assert!(serde_json::from_str::<$name>("\"0x\"").unwrap_err().is_data());
+ assert!(serde_json::from_str::<$name>("\"0xg\"").unwrap_err().is_data());
+ assert!(serde_json::from_str::<$name>("\"\"").unwrap_err().is_data());
}
};
}
@@ -78,10 +80,10 @@ mod tests {
#[test]
fn test_large_values() {
assert_eq!(
- ser::to_string_pretty(&!U256::zero()),
+ serde_json::to_string_pretty(&!U256::zero()).expect("Json pretty print failed"),
"\"0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff\""
);
- assert!(ser::from_str::(
+ assert!(serde_json::from_str::(
"\"0x1ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff\""
)
.unwrap_err()
diff --git a/primitives/merkle-mountain-range/Cargo.toml b/primitives/merkle-mountain-range/Cargo.toml
index cb3d6ddd51ad2..4d2c050899493 100644
--- a/primitives/merkle-mountain-range/Cargo.toml
+++ b/primitives/merkle-mountain-range/Cargo.toml
@@ -16,7 +16,7 @@ codec = { package = "parity-scale-codec", version = "3.2.2", default-features =
scale-info = { version = "2.5.0", default-features = false, features = ["derive"] }
log = { version = "0.4.17", default-features = false }
mmr-lib = { package = "ckb-merkle-mountain-range", version = "0.5.2", default-features = false }
-serde = { version = "1.0.136", features = ["derive"], optional = true }
+serde = { version = "1.0.136", features = ["derive", "alloc"], default-features = false, optional = true }
sp-api = { version = "4.0.0-dev", default-features = false, path = "../api" }
sp-core = { version = "7.0.0", default-features = false, path = "../core" }
sp-debug-derive = { version = "5.0.0", default-features = false, path = "../debug-derive" }
@@ -33,10 +33,18 @@ std = [
"codec/std",
"log/std",
"mmr-lib/std",
- "serde",
+ "serde/std",
"sp-api/std",
"sp-core/std",
"sp-debug-derive/std",
"sp-runtime/std",
"sp-std/std",
]
+
+# Serde support without relying on std features.
+serde = [
+ "dep:serde",
+ "scale-info/serde",
+ "sp-core/serde",
+ "sp-runtime/serde",
+]
diff --git a/primitives/merkle-mountain-range/src/lib.rs b/primitives/merkle-mountain-range/src/lib.rs
index 436755c032908..6c0e75005ead8 100644
--- a/primitives/merkle-mountain-range/src/lib.rs
+++ b/primitives/merkle-mountain-range/src/lib.rs
@@ -101,13 +101,13 @@ impl FullLeaf
/// This type does not implement SCALE encoding/decoding on purpose to avoid confusion,
/// it would have to be SCALE-compatible with the concrete leaf type, but due to SCALE limitations
/// it's not possible to know how many bytes the encoding of concrete leaf type uses.
-#[cfg_attr(feature = "std", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
#[derive(RuntimeDebug, Clone, PartialEq)]
pub struct OpaqueLeaf(
/// Raw bytes of the leaf type encoded in its compact form.
///
/// NOTE it DOES NOT include length prefix (like `Vec` encoding would).
- #[cfg_attr(feature = "std", serde(with = "sp_core::bytes"))]
+ #[cfg_attr(feature = "serde", serde(with = "sp_core::bytes"))]
pub Vec,
);
diff --git a/primitives/npos-elections/Cargo.toml b/primitives/npos-elections/Cargo.toml
index 50a7a5bcd6088..9006a4d199189 100644
--- a/primitives/npos-elections/Cargo.toml
+++ b/primitives/npos-elections/Cargo.toml
@@ -15,7 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"]
[dependencies]
codec = { package = "parity-scale-codec", version = "3.2.2", default-features = false, features = ["derive"] }
scale-info = { version = "2.5.0", default-features = false, features = ["derive"] }
-serde = { version = "1.0.136", features = ["derive"], optional = true }
+serde = { version = "1.0.136", default-features = false, features = ["derive", "alloc"], optional = true }
sp-arithmetic = { version = "6.0.0", default-features = false, path = "../arithmetic" }
sp-core = { version = "7.0.0", default-features = false, path = "../core" }
sp-runtime = { version = "7.0.0", default-features = false, path = "../runtime" }
@@ -31,9 +31,18 @@ bench = []
std = [
"codec/std",
"scale-info/std",
- "serde",
+ "serde/std",
"sp-arithmetic/std",
"sp-core/std",
"sp-runtime/std",
"sp-std/std",
]
+
+# Serde support without relying on std features.
+serde = [
+ "dep:serde",
+ "scale-info/serde",
+ "sp-arithmetic/serde",
+ "sp-core/serde",
+ "sp-runtime/serde",
+]
diff --git a/primitives/npos-elections/src/assignments.rs b/primitives/npos-elections/src/assignments.rs
index 9390cd1f4f9fc..2ac2b9bebd771 100644
--- a/primitives/npos-elections/src/assignments.rs
+++ b/primitives/npos-elections/src/assignments.rs
@@ -18,7 +18,7 @@
//! Structs and helpers for distributing a voter's stake among various winners.
use crate::{ExtendedBalance, IdentifierT, PerThing128};
-#[cfg(feature = "std")]
+#[cfg(feature = "serde")]
use codec::{Decode, Encode};
use sp_arithmetic::{
traits::{Bounded, Zero},
@@ -29,7 +29,7 @@ use sp_std::vec::Vec;
/// A voter's stake assignment among a set of targets, represented as ratios.
#[derive(RuntimeDebug, Clone, Default)]
-#[cfg_attr(feature = "std", derive(PartialEq, Eq, Encode, Decode))]
+#[cfg_attr(feature = "serde", derive(PartialEq, Eq, Encode, Decode))]
pub struct Assignment {
/// Voter's identifier.
pub who: AccountId,
@@ -97,7 +97,7 @@ impl Assignment {
/// A voter's stake assignment among a set of targets, represented as absolute values in the scale
/// of [`ExtendedBalance`].
#[derive(RuntimeDebug, Clone, Default)]
-#[cfg_attr(feature = "std", derive(PartialEq, Eq, Encode, Decode))]
+#[cfg_attr(feature = "serde", derive(PartialEq, Eq, Encode, Decode))]
pub struct StakedAssignment {
/// Voter's identifier
pub who: AccountId,
diff --git a/primitives/npos-elections/src/lib.rs b/primitives/npos-elections/src/lib.rs
index 716c4b283c68e..253a231602f77 100644
--- a/primitives/npos-elections/src/lib.rs
+++ b/primitives/npos-elections/src/lib.rs
@@ -77,7 +77,7 @@
use codec::{Decode, Encode, MaxEncodedLen};
use scale_info::TypeInfo;
-#[cfg(feature = "std")]
+#[cfg(feature = "serde")]
use serde::{Deserialize, Serialize};
use sp_arithmetic::{traits::Zero, Normalizable, PerThing, Rational128, ThresholdOrd};
use sp_core::{bounded::BoundedVec, RuntimeDebug};
@@ -144,7 +144,7 @@ pub type ExtendedBalance = u128;
/// 2. `sum_stake`.
/// 3. `sum_stake_squared`.
#[derive(Clone, Copy, PartialEq, Eq, Encode, Decode, MaxEncodedLen, TypeInfo, Debug, Default)]
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
pub struct ElectionScore {
/// The minimal winner, in terms of total backing stake.
///
@@ -430,7 +430,7 @@ pub struct ElectionResult {
/// This, at the current version, resembles the `Exposure` defined in the Staking pallet, yet they
/// do not necessarily have to be the same.
#[derive(RuntimeDebug, Encode, Decode, Clone, Eq, PartialEq, TypeInfo)]
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
pub struct Support {
/// Total support.
pub total: ExtendedBalance,
diff --git a/primitives/runtime/Cargo.toml b/primitives/runtime/Cargo.toml
index 4ec55162e9774..0d67a89c38c03 100644
--- a/primitives/runtime/Cargo.toml
+++ b/primitives/runtime/Cargo.toml
@@ -22,7 +22,7 @@ log = { version = "0.4.17", default-features = false }
paste = "1.0"
rand = { version = "0.8.5", optional = true }
scale-info = { version = "2.5.0", default-features = false, features = ["derive"] }
-serde = { version = "1.0.136", features = ["derive"], optional = true }
+serde = { version = "1.0.136", default-features = false, features = ["derive", "alloc"], optional = true }
sp-application-crypto = { version = "7.0.0", default-features = false, path = "../application-crypto" }
sp-arithmetic = { version = "6.0.0", default-features = false, path = "../arithmetic" }
sp-core = { version = "7.0.0", default-features = false, path = "../core" }
@@ -50,7 +50,7 @@ std = [
"log/std",
"rand",
"scale-info/std",
- "serde",
+ "serde/std",
"sp-application-crypto/std",
"sp-arithmetic/std",
"sp-core/std",
@@ -58,3 +58,13 @@ std = [
"sp-std/std",
"sp-weights/std",
]
+
+# Serde support without relying on std features.
+serde = [
+ "dep:serde",
+ "scale-info/serde",
+ "sp-application-crypto/serde",
+ "sp-arithmetic/serde",
+ "sp-core/serde",
+ "sp-weights/serde",
+]
diff --git a/primitives/runtime/src/generic/block.rs b/primitives/runtime/src/generic/block.rs
index 1df747a16c839..6261e412eb8ad 100644
--- a/primitives/runtime/src/generic/block.rs
+++ b/primitives/runtime/src/generic/block.rs
@@ -20,7 +20,7 @@
#[cfg(feature = "std")]
use std::fmt;
-#[cfg(feature = "std")]
+#[cfg(feature = "serde")]
use serde::{Deserialize, Serialize};
use crate::{
@@ -76,9 +76,9 @@ impl fmt::Display for BlockId {
/// Abstraction over a substrate block.
#[derive(PartialEq, Eq, Clone, Encode, Decode, RuntimeDebug, scale_info::TypeInfo)]
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
-#[cfg_attr(feature = "std", serde(rename_all = "camelCase"))]
-#[cfg_attr(feature = "std", serde(deny_unknown_fields))]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "serde", serde(rename_all = "camelCase"))]
+#[cfg_attr(feature = "serde", serde(deny_unknown_fields))]
pub struct Block {
/// The block header.
pub header: Header,
@@ -114,9 +114,9 @@ where
/// Abstraction over a substrate block and justification.
#[derive(PartialEq, Eq, Clone, Encode, Decode, RuntimeDebug)]
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
-#[cfg_attr(feature = "std", serde(rename_all = "camelCase"))]
-#[cfg_attr(feature = "std", serde(deny_unknown_fields))]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "serde", serde(rename_all = "camelCase"))]
+#[cfg_attr(feature = "serde", serde(deny_unknown_fields))]
pub struct SignedBlock {
/// Full block.
pub block: Block,
diff --git a/primitives/runtime/src/generic/digest.rs b/primitives/runtime/src/generic/digest.rs
index 143fc2ce58d90..d7db0f91a4821 100644
--- a/primitives/runtime/src/generic/digest.rs
+++ b/primitives/runtime/src/generic/digest.rs
@@ -17,8 +17,10 @@
//! Generic implementation of a digest.
-#[cfg(feature = "std")]
+#[cfg(feature = "serde")]
use serde::{Deserialize, Serialize};
+#[cfg(all(not(feature = "std"), feature = "serde"))]
+use sp_std::alloc::format;
use sp_std::prelude::*;
@@ -34,7 +36,7 @@ use sp_core::RuntimeDebug;
/// Generic header digest.
#[derive(PartialEq, Eq, Clone, Encode, Decode, RuntimeDebug, TypeInfo, Default)]
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
pub struct Digest {
/// A list of logs in the digest.
pub logs: Vec,
@@ -106,7 +108,7 @@ pub enum DigestItem {
RuntimeEnvironmentUpdated,
}
-#[cfg(feature = "std")]
+#[cfg(feature = "serde")]
impl serde::Serialize for DigestItem {
fn serialize(&self, seq: S) -> Result
where
@@ -116,7 +118,7 @@ impl serde::Serialize for DigestItem {
}
}
-#[cfg(feature = "std")]
+#[cfg(feature = "serde")]
impl<'a> serde::Deserialize<'a> for DigestItem {
fn deserialize(de: D) -> Result
where
diff --git a/primitives/runtime/src/generic/era.rs b/primitives/runtime/src/generic/era.rs
index 79dea7258c9e1..bdc7e9930fb1d 100644
--- a/primitives/runtime/src/generic/era.rs
+++ b/primitives/runtime/src/generic/era.rs
@@ -17,7 +17,7 @@
//! Generic implementation of an unchecked (pre-verification) extrinsic.
-#[cfg(feature = "std")]
+#[cfg(feature = "serde")]
use serde::{Deserialize, Serialize};
use crate::codec::{Decode, Encode, Error, Input, Output};
@@ -30,7 +30,7 @@ pub type Phase = u64;
/// An era to describe the longevity of a transaction.
#[derive(PartialEq, Eq, Clone, Copy, sp_core::RuntimeDebug)]
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
pub enum Era {
/// The transaction is valid forever. The genesis hash must be present in the signed content.
Immortal,
diff --git a/primitives/runtime/src/generic/header.rs b/primitives/runtime/src/generic/header.rs
index e8b99efd42c75..7c1faaefb419a 100644
--- a/primitives/runtime/src/generic/header.rs
+++ b/primitives/runtime/src/generic/header.rs
@@ -26,22 +26,22 @@ use crate::{
MaybeSerializeDeserialize, Member, SimpleBitOps,
},
};
-#[cfg(feature = "std")]
+#[cfg(feature = "serde")]
use serde::{Deserialize, Serialize};
use sp_core::U256;
use sp_std::fmt::Debug;
/// Abstraction over a block header for a substrate chain.
#[derive(Encode, Decode, PartialEq, Eq, Clone, sp_core::RuntimeDebug, TypeInfo)]
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
-#[cfg_attr(feature = "std", serde(rename_all = "camelCase"))]
-#[cfg_attr(feature = "std", serde(deny_unknown_fields))]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "serde", serde(rename_all = "camelCase"))]
+#[cfg_attr(feature = "serde", serde(deny_unknown_fields))]
pub struct Header + TryFrom, Hash: HashT> {
/// The parent hash.
pub parent_hash: Hash::Output,
/// The block number.
#[cfg_attr(
- feature = "std",
+ feature = "serde",
serde(serialize_with = "serialize_number", deserialize_with = "deserialize_number")
)]
#[codec(compact)]
@@ -54,7 +54,7 @@ pub struct Header + TryFrom, Hash: HashT> {
pub digest: Digest,
}
-#[cfg(feature = "std")]
+#[cfg(feature = "serde")]
pub fn serialize_number + TryFrom>(
val: &T,
s: S,
@@ -66,7 +66,7 @@ where
serde::Serialize::serialize(&u256, s)
}
-#[cfg(feature = "std")]
+#[cfg(feature = "serde")]
pub fn deserialize_number<'a, D, T: Copy + Into + TryFrom>(d: D) -> Result
where
D: serde::Deserializer<'a>,
diff --git a/primitives/runtime/src/generic/unchecked_extrinsic.rs b/primitives/runtime/src/generic/unchecked_extrinsic.rs
index d147e7b6c1505..b9d7b9eb1b6c8 100644
--- a/primitives/runtime/src/generic/unchecked_extrinsic.rs
+++ b/primitives/runtime/src/generic/unchecked_extrinsic.rs
@@ -29,6 +29,8 @@ use crate::{
use codec::{Compact, Decode, Encode, EncodeLike, Error, Input};
use scale_info::{build::Fields, meta_type, Path, StaticTypeInfo, Type, TypeInfo, TypeParameter};
use sp_io::hashing::blake2_256;
+#[cfg(all(not(feature = "std"), feature = "serde"))]
+use sp_std::alloc::format;
use sp_std::{fmt, prelude::*};
/// Current version of the [`UncheckedExtrinsic`] encoded format.
@@ -317,7 +319,7 @@ where
{
}
-#[cfg(feature = "std")]
+#[cfg(feature = "serde")]
impl serde::Serialize
for UncheckedExtrinsic
{
@@ -329,7 +331,7 @@ impl s
}
}
-#[cfg(feature = "std")]
+#[cfg(feature = "serde")]
impl<'a, Address: Decode, Signature: Decode, Call: Decode, Extra: SignedExtension>
serde::Deserialize<'a> for UncheckedExtrinsic
{
diff --git a/primitives/runtime/src/legacy/byte_sized_error.rs b/primitives/runtime/src/legacy/byte_sized_error.rs
index b552d6af3066e..a592c751231dc 100644
--- a/primitives/runtime/src/legacy/byte_sized_error.rs
+++ b/primitives/runtime/src/legacy/byte_sized_error.rs
@@ -20,12 +20,12 @@
use crate::{ArithmeticError, TokenError};
use codec::{Decode, Encode};
use scale_info::TypeInfo;
-#[cfg(feature = "std")]
+#[cfg(feature = "serde")]
use serde::{Deserialize, Serialize};
/// [`ModuleError`] type definition before BlockBuilder API version 6.
#[derive(Eq, Clone, Copy, Encode, Decode, Debug, TypeInfo)]
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
pub struct ModuleError {
/// Module index, matching the metadata module index.
pub index: u8,
@@ -33,7 +33,7 @@ pub struct ModuleError {
pub error: u8,
/// Optional error message.
#[codec(skip)]
- #[cfg_attr(feature = "std", serde(skip_deserializing))]
+ #[cfg_attr(feature = "serde", serde(skip_deserializing))]
pub message: Option<&'static str>,
}
@@ -45,12 +45,12 @@ impl PartialEq for ModuleError {
/// [`DispatchError`] type definition before BlockBuilder API version 6.
#[derive(Eq, Clone, Copy, Encode, Decode, Debug, TypeInfo, PartialEq)]
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
pub enum DispatchError {
/// Some error occurred.
Other(
#[codec(skip)]
- #[cfg_attr(feature = "std", serde(skip_deserializing))]
+ #[cfg_attr(feature = "serde", serde(skip_deserializing))]
&'static str,
),
/// Failed to lookup some data.
diff --git a/primitives/runtime/src/lib.rs b/primitives/runtime/src/lib.rs
index 13ef157dff19e..7be5bebf5de80 100644
--- a/primitives/runtime/src/lib.rs
+++ b/primitives/runtime/src/lib.rs
@@ -24,7 +24,7 @@
pub use codec;
#[doc(hidden)]
pub use scale_info;
-#[cfg(feature = "std")]
+#[cfg(feature = "serde")]
#[doc(hidden)]
pub use serde;
#[doc(hidden)]
@@ -52,6 +52,8 @@ use sp_std::prelude::*;
use codec::{Decode, Encode, MaxEncodedLen};
use scale_info::TypeInfo;
+#[cfg(all(not(feature = "std"), feature = "serde"))]
+use sp_std::alloc::format;
pub mod curve;
pub mod generic;
@@ -122,7 +124,7 @@ pub type EncodedJustification = Vec;
/// Collection of justifications for a given block, multiple justifications may
/// be provided by different consensus engines for the same block.
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
#[derive(Debug, Clone, PartialEq, Eq, Encode, Decode)]
pub struct Justifications(Vec);
@@ -179,7 +181,7 @@ impl From for Justifications {
use traits::{Lazy, Verify};
use crate::traits::IdentifyAccount;
-#[cfg(feature = "std")]
+#[cfg(feature = "serde")]
pub use serde::{de::DeserializeOwned, Deserialize, Serialize};
/// Complex storage builder stuff.
@@ -235,7 +237,7 @@ impl BuildStorage for () {
pub type ConsensusEngineId = [u8; 4];
/// Signature verify that can work with any known signature types.
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
#[derive(Eq, PartialEq, Clone, Encode, Decode, MaxEncodedLen, RuntimeDebug, TypeInfo)]
pub enum MultiSignature {
/// An Ed25519 signature.
@@ -299,7 +301,7 @@ impl TryFrom for ecdsa::Signature {
/// Public key for any known crypto algorithm.
#[derive(Eq, PartialEq, Ord, PartialOrd, Clone, Encode, Decode, RuntimeDebug, TypeInfo)]
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
pub enum MultiSigner {
/// An Ed25519 identity.
Ed25519(ed25519::Public),
@@ -427,7 +429,7 @@ impl Verify for MultiSignature {
/// Signature verify that can work with any known signature types..
#[derive(Eq, PartialEq, Clone, Default, Encode, Decode, RuntimeDebug)]
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
pub struct AnySignature(H512);
impl Verify for AnySignature {
@@ -475,7 +477,7 @@ pub type DispatchResultWithInfo = sp_std::result::Result,
}
@@ -495,7 +497,7 @@ impl PartialEq for ModuleError {
/// Errors related to transactional storage layers.
#[derive(Eq, PartialEq, Clone, Copy, Encode, Decode, Debug, TypeInfo, MaxEncodedLen)]
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
pub enum TransactionalError {
/// Too many transactional layers have been spawned.
LimitReached,
@@ -520,12 +522,12 @@ impl From for DispatchError {
/// Reason why a dispatch call failed.
#[derive(Eq, Clone, Copy, Encode, Decode, Debug, TypeInfo, PartialEq, MaxEncodedLen)]
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
pub enum DispatchError {
/// Some error occurred.
Other(
#[codec(skip)]
- #[cfg_attr(feature = "std", serde(skip_deserializing))]
+ #[cfg_attr(feature = "serde", serde(skip_deserializing))]
&'static str,
),
/// Failed to lookup some data.
@@ -605,7 +607,7 @@ impl From for DispatchError {
/// Description of what went wrong when trying to complete an operation on a token.
#[derive(Eq, PartialEq, Clone, Copy, Encode, Decode, Debug, TypeInfo, MaxEncodedLen)]
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
pub enum TokenError {
/// Funds are unavailable.
FundsUnavailable,
@@ -879,7 +881,7 @@ impl sp_std::fmt::Debug for OpaqueExtrinsic {
}
}
-#[cfg(feature = "std")]
+#[cfg(feature = "serde")]
impl ::serde::Serialize for OpaqueExtrinsic {
fn serialize(&self, seq: S) -> Result
where
@@ -889,7 +891,7 @@ impl ::serde::Serialize for OpaqueExtrinsic {
}
}
-#[cfg(feature = "std")]
+#[cfg(feature = "serde")]
impl<'a> ::serde::Deserialize<'a> for OpaqueExtrinsic {
fn deserialize(de: D) -> Result
where
diff --git a/primitives/runtime/src/runtime_string.rs b/primitives/runtime/src/runtime_string.rs
index f8f183ec785c4..aa0bd52e56fe4 100644
--- a/primitives/runtime/src/runtime_string.rs
+++ b/primitives/runtime/src/runtime_string.rs
@@ -129,7 +129,7 @@ impl std::fmt::Display for RuntimeString {
}
}
-#[cfg(feature = "std")]
+#[cfg(feature = "serde")]
impl serde::Serialize for RuntimeString {
fn serialize(&self, serializer: S) -> Result {
match self {
@@ -139,10 +139,10 @@ impl serde::Serialize for RuntimeString {
}
}
-#[cfg(feature = "std")]
+#[cfg(feature = "serde")]
impl<'de> serde::Deserialize<'de> for RuntimeString {
fn deserialize>(de: D) -> Result {
- String::deserialize(de).map(Self::Owned)
+ Ok(Self::Owned(serde::Deserialize::deserialize(de)?))
}
}
diff --git a/primitives/runtime/src/traits.rs b/primitives/runtime/src/traits.rs
index 95f977077e704..d37db4802d78f 100644
--- a/primitives/runtime/src/traits.rs
+++ b/primitives/runtime/src/traits.rs
@@ -28,7 +28,7 @@ use crate::{
DispatchResult,
};
use impl_trait_for_tuples::impl_for_tuples;
-#[cfg(feature = "std")]
+#[cfg(feature = "serde")]
use serde::{de::DeserializeOwned, Deserialize, Serialize};
use sp_application_crypto::AppCrypto;
pub use sp_arithmetic::traits::{
@@ -716,7 +716,7 @@ pub trait Hash:
/// Blake2-256 Hash implementation.
#[derive(PartialEq, Eq, Clone, RuntimeDebug, TypeInfo)]
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
pub struct BlakeTwo256;
impl Hasher for BlakeTwo256 {
@@ -743,7 +743,7 @@ impl Hash for BlakeTwo256 {
/// Keccak-256 Hash implementation.
#[derive(PartialEq, Eq, Clone, RuntimeDebug, TypeInfo)]
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
pub struct Keccak256;
impl Hasher for Keccak256 {
@@ -824,11 +824,13 @@ sp_core::impl_maybe_marker!(
/// A type that implements Hash when in std environment.
trait MaybeHash: sp_std::hash::Hash;
+);
- /// A type that implements Serialize when in std environment.
+sp_core::impl_maybe_marker_std_or_serde!(
+ /// A type that implements Serialize when in std environment or serde feature is activated.
trait MaybeSerialize: Serialize;
- /// A type that implements Serialize, DeserializeOwned and Debug when in std environment.
+ /// A type that implements Serialize, DeserializeOwned and Debug when in std environment or serde feature is activated.
trait MaybeSerializeDeserialize: DeserializeOwned, Serialize;
);
diff --git a/primitives/runtime/src/transaction_validity.rs b/primitives/runtime/src/transaction_validity.rs
index 072609c667b41..836948493823c 100644
--- a/primitives/runtime/src/transaction_validity.rs
+++ b/primitives/runtime/src/transaction_validity.rs
@@ -36,7 +36,7 @@ pub type TransactionTag = Vec;
/// An invalid transaction validity.
#[derive(Clone, PartialEq, Eq, Encode, Decode, Copy, RuntimeDebug, TypeInfo)]
-#[cfg_attr(feature = "std", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
pub enum InvalidTransaction {
/// The call of the transaction is not expected.
Call,
@@ -119,7 +119,7 @@ impl From for &'static str {
/// An unknown transaction validity.
#[derive(Clone, PartialEq, Eq, Encode, Decode, Copy, RuntimeDebug, TypeInfo)]
-#[cfg_attr(feature = "std", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
pub enum UnknownTransaction {
/// Could not lookup some information that is required to validate the transaction.
CannotLookup,
@@ -143,7 +143,7 @@ impl From for &'static str {
/// Errors that can occur while checking the validity of a transaction.
#[derive(Clone, PartialEq, Eq, Encode, Decode, Copy, RuntimeDebug, TypeInfo)]
-#[cfg_attr(feature = "std", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
pub enum TransactionValidityError {
/// The transaction is invalid.
Invalid(InvalidTransaction),
diff --git a/primitives/serializer/Cargo.toml b/primitives/serializer/Cargo.toml
deleted file mode 100644
index 585e4b4e0dc20..0000000000000
--- a/primitives/serializer/Cargo.toml
+++ /dev/null
@@ -1,18 +0,0 @@
-[package]
-name = "sp-serializer"
-version = "4.0.0-dev"
-authors = ["Parity Technologies "]
-edition = "2021"
-license = "Apache-2.0"
-homepage = "https://substrate.io"
-repository = "https://github.com/paritytech/substrate/"
-description = "Substrate customizable serde serializer."
-documentation = "https://docs.rs/sp-serializer"
-readme = "README.md"
-
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
-
-[dependencies]
-serde = "1.0.136"
-serde_json = "1.0.85"
diff --git a/primitives/serializer/README.md b/primitives/serializer/README.md
deleted file mode 100644
index 083a0857cc0d2..0000000000000
--- a/primitives/serializer/README.md
+++ /dev/null
@@ -1,6 +0,0 @@
-Substrate customizable serde serializer.
-
-The idea is that we can later change the implementation
-to something more compact, but for now we're using JSON.
-
-License: Apache-2.0
\ No newline at end of file
diff --git a/primitives/serializer/src/lib.rs b/primitives/serializer/src/lib.rs
deleted file mode 100644
index 3d42707143d5e..0000000000000
--- a/primitives/serializer/src/lib.rs
+++ /dev/null
@@ -1,45 +0,0 @@
-// This file is part of Substrate.
-
-// Copyright (C) Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: Apache-2.0
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-//! Substrate customizable serde serializer.
-//!
-//! The idea is that we can later change the implementation
-//! to something more compact, but for now we're using JSON.
-
-#![warn(missing_docs)]
-
-pub use serde_json::{from_reader, from_slice, from_str, Error, Result};
-
-const PROOF: &str = "Serializers are infallible; qed";
-
-/// Serialize the given data structure as a pretty-printed String of JSON.
-pub fn to_string_pretty(value: &T) -> String {
- serde_json::to_string_pretty(value).expect(PROOF)
-}
-
-/// Serialize the given data structure as a JSON byte vector.
-pub fn encode(value: &T) -> Vec {
- serde_json::to_vec(value).expect(PROOF)
-}
-
-/// Serialize the given data structure as JSON into the IO stream.
-pub fn to_writer