diff --git a/Cargo.lock b/Cargo.lock
index 6151ed33c5b6e8c396258655469ca3f7fb3344e3..3c55a14256c51cfeb45bc1796afb0ead16a55cfc 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -14029,18 +14029,13 @@ dependencies = [
name = "pallet-mixnet"
version = "0.4.0"
dependencies = [
- "frame-benchmarking 28.0.0",
- "frame-support 28.0.0",
- "frame-system 28.0.0",
"log",
"parity-scale-codec",
+ "polkadot-sdk-frame 0.1.0",
"scale-info",
"serde",
"sp-application-crypto 30.0.0",
- "sp-arithmetic 23.0.0",
- "sp-io 30.0.0",
"sp-mixnet 0.4.0",
- "sp-runtime 31.0.1",
]
[[package]]
diff --git a/prdoc/pr_6986.prdoc b/prdoc/pr_6986.prdoc
new file mode 100644
index 0000000000000000000000000000000000000000..8deb6b04bd1cdd43fc37feab352aed4b56d16e9a
--- /dev/null
+++ b/prdoc/pr_6986.prdoc
@@ -0,0 +1,18 @@
+# Schema: Polkadot SDK PRDoc Schema (prdoc) v1.0.0
+# See doc at https://raw.githubusercontent.com/paritytech/polkadot-sdk/master/prdoc/schema_user.json
+
+title: '[pallet-mixnet] Migrate to using frame umbrella crate'
+
+doc:
+ - audience: Runtime Dev
+ description: This PR migrates the pallet-mixnet to use the frame umbrella crate. This
+ is part of the ongoing effort to migrate all pallets to use the frame umbrella crate.
+ The effort is tracked [here](https://github.com/paritytech/polkadot-sdk/issues/6504).
+
+crates:
+ - name: pallet-mixnet
+ bump: minor
+ - name: polkadot-sdk-frame
+ bump: minor
+ - name: polkadot-sdk
+ bump: none
\ No newline at end of file
diff --git a/substrate/frame/mixnet/Cargo.toml b/substrate/frame/mixnet/Cargo.toml
index bb5e8486456658bf27835d56d5663e5cce0855a9..0ae3b3938c608b6ad10a0b6a06f256b463c50564 100644
--- a/substrate/frame/mixnet/Cargo.toml
+++ b/substrate/frame/mixnet/Cargo.toml
@@ -17,42 +17,24 @@ targets = ["x86_64-unknown-linux-gnu"]
[dependencies]
codec = { features = ["derive", "max-encoded-len"], workspace = true }
-frame-benchmarking = { optional = true, workspace = true }
-frame-support = { workspace = true }
-frame-system = { workspace = true }
+frame = { workspace = true, features = ["experimental", "runtime"] }
log = { workspace = true }
scale-info = { features = ["derive"], workspace = true }
serde = { features = ["derive"], workspace = true }
sp-application-crypto = { workspace = true }
-sp-arithmetic = { workspace = true }
-sp-io = { workspace = true }
sp-mixnet = { workspace = true }
-sp-runtime = { workspace = true }
[features]
default = ["std"]
std = [
"codec/std",
- "frame-benchmarking?/std",
- "frame-support/std",
- "frame-system/std",
+ "frame/std",
"log/std",
"scale-info/std",
"serde/std",
"sp-application-crypto/std",
- "sp-arithmetic/std",
- "sp-io/std",
"sp-mixnet/std",
- "sp-runtime/std",
-]
-runtime-benchmarks = [
- "frame-benchmarking/runtime-benchmarks",
- "frame-support/runtime-benchmarks",
- "frame-system/runtime-benchmarks",
- "sp-runtime/runtime-benchmarks",
]
try-runtime = [
- "frame-support/try-runtime",
- "frame-system/try-runtime",
- "sp-runtime/try-runtime",
+ "frame/try-runtime",
]
diff --git a/substrate/frame/mixnet/src/lib.rs b/substrate/frame/mixnet/src/lib.rs
index 6579ed678ae7a6a10200c80284a749acdb4bfbae..9849818176760cf9dfadb0a72d94b8c0206cc758 100644
--- a/substrate/frame/mixnet/src/lib.rs
+++ b/substrate/frame/mixnet/src/lib.rs
@@ -23,28 +23,23 @@
extern crate alloc;
+pub use pallet::*;
+
use alloc::vec::Vec;
-use codec::{Decode, Encode, MaxEncodedLen};
use core::cmp::Ordering;
-use frame_support::{
- traits::{EstimateNextSessionRotation, Get, OneSessionHandler},
- BoundedVec,
+use frame::{
+ deps::{
+ sp_io::{self, MultiRemovalResults},
+ sp_runtime,
+ },
+ prelude::*,
};
-use frame_system::{
- offchain::{CreateInherent, SubmitTransaction},
- pallet_prelude::BlockNumberFor,
-};
-pub use pallet::*;
-use scale_info::TypeInfo;
use serde::{Deserialize, Serialize};
use sp_application_crypto::RuntimeAppPublic;
-use sp_arithmetic::traits::{CheckedSub, Saturating, UniqueSaturatedInto, Zero};
-use sp_io::MultiRemovalResults;
use sp_mixnet::types::{
AuthorityId, AuthoritySignature, KxPublic, Mixnode, MixnodesErr, PeerId, SessionIndex,
SessionPhase, SessionStatus, KX_PUBLIC_SIZE,
};
-use sp_runtime::RuntimeDebug;
const LOG_TARGET: &str = "runtime::mixnet";
@@ -168,12 +163,9 @@ fn twox<BlockNumber: UniqueSaturatedInto<u64>>(
// The pallet
////////////////////////////////////////////////////////////////////////////////
-#[frame_support::pallet(dev_mode)]
+#[frame::pallet(dev_mode)]
pub mod pallet {
use super::*;
- use frame_support::pallet_prelude::*;
- use frame_system::pallet_prelude::*;
-
#[pallet::pallet]
pub struct Pallet<T>(_);
@@ -254,7 +246,7 @@ pub mod pallet {
StorageDoubleMap<_, Identity, SessionIndex, Identity, AuthorityIndex, BoundedMixnodeFor<T>>;
#[pallet::genesis_config]
- #[derive(frame_support::DefaultNoBound)]
+ #[derive(DefaultNoBound)]
pub struct GenesisConfig<T: Config> {
/// The mixnode set for the very first session.
pub mixnodes: BoundedVec<BoundedMixnodeFor<T>, T::MaxAuthorities>,
@@ -308,7 +300,7 @@ pub mod pallet {
fn validate_unsigned(_source: TransactionSource, call: &Self::Call) -> TransactionValidity {
let Self::Call::register { registration, signature } = call else {
- return InvalidTransaction::Call.into()
+ return InvalidTransaction::Call.into();
};
// Check session index matches
@@ -320,16 +312,16 @@ pub mod pallet {
// Check authority index is valid
if registration.authority_index >= T::MaxAuthorities::get() {
- return InvalidTransaction::BadProof.into()
+ return InvalidTransaction::BadProof.into();
}
let Some(authority_id) = NextAuthorityIds::<T>::get(registration.authority_index)
else {
- return InvalidTransaction::BadProof.into()
+ return InvalidTransaction::BadProof.into();
};
// Check the authority hasn't registered a mixnode yet
if Self::already_registered(registration.session_index, registration.authority_index) {
- return InvalidTransaction::Stale.into()
+ return InvalidTransaction::Stale.into();
}
// Check signature. Note that we don't use regular signed transactions for registration
@@ -339,7 +331,7 @@ pub mod pallet {
authority_id.verify(&encoded_registration, signature)
});
if !signature_ok {
- return InvalidTransaction::BadProof.into()
+ return InvalidTransaction::BadProof.into();
}
ValidTransaction::with_tag_prefix("MixnetRegistration")
@@ -368,12 +360,12 @@ impl<T: Config> Pallet<T> {
.saturating_sub(CurrentSessionStartBlock::<T>::get());
let Some(block_in_phase) = block_in_phase.checked_sub(&T::NumCoverToCurrentBlocks::get())
else {
- return SessionPhase::CoverToCurrent
+ return SessionPhase::CoverToCurrent;
};
let Some(block_in_phase) =
block_in_phase.checked_sub(&T::NumRequestsToCurrentBlocks::get())
else {
- return SessionPhase::RequestsToCurrent
+ return SessionPhase::RequestsToCurrent;
};
if block_in_phase < T::NumCoverToPrevBlocks::get() {
SessionPhase::CoverToPrev
@@ -411,7 +403,7 @@ impl<T: Config> Pallet<T> {
return Err(MixnodesErr::InsufficientRegistrations {
num: 0,
min: T::MinMixnodes::get(),
- })
+ });
};
Self::mixnodes(prev_session_index)
}
@@ -430,7 +422,7 @@ impl<T: Config> Pallet<T> {
// registering
let block_in_session = block_number.saturating_sub(CurrentSessionStartBlock::<T>::get());
if block_in_session < T::NumRegisterStartSlackBlocks::get() {
- return false
+ return false;
}
let (Some(end_block), _weight) =
@@ -438,7 +430,7 @@ impl<T: Config> Pallet<T> {
else {
// Things aren't going to work terribly well in this case as all the authorities will
// just pile in after the slack period...
- return true
+ return true;
};
let remaining_blocks = end_block
@@ -447,7 +439,7 @@ impl<T: Config> Pallet<T> {
if remaining_blocks.is_zero() {
// Into the slack time at the end of the session. Not necessarily too late;
// registrations are accepted right up until the session ends.
- return true
+ return true;
}
// Want uniform distribution over the remaining blocks, so pick this block with probability
@@ -496,7 +488,7 @@ impl<T: Config> Pallet<T> {
"Session {session_index} registration attempted, \
but current session is {current_session_index}",
);
- return false
+ return false;
}
let block_number = frame_system::Pallet::<T>::block_number();
@@ -505,7 +497,7 @@ impl<T: Config> Pallet<T> {
target: LOG_TARGET,
"Waiting for the session to progress further before registering",
);
- return false
+ return false;
}
let Some((authority_index, authority_id)) = Self::next_local_authority() else {
@@ -513,7 +505,7 @@ impl<T: Config> Pallet<T> {
target: LOG_TARGET,
"Not an authority in the next session; cannot register a mixnode",
);
- return false
+ return false;
};
if Self::already_registered(session_index, authority_index) {
@@ -521,14 +513,14 @@ impl<T: Config> Pallet<T> {
target: LOG_TARGET,
"Already registered a mixnode for the next session",
);
- return false
+ return false;
}
let registration =
Registration { block_number, session_index, authority_index, mixnode: mixnode.into() };
let Some(signature) = authority_id.sign(®istration.encode()) else {
log::debug!(target: LOG_TARGET, "Failed to sign registration");
- return false
+ return false;
};
let call = Call::register { registration, signature };
let xt = T::create_inherent(call.into());
diff --git a/substrate/frame/src/lib.rs b/substrate/frame/src/lib.rs
index 8031ddf96e6a1711cc38f167b55bc633f2d3ed8d..b3e340cbcbffaece0002437c314ac64cc75a140b 100644
--- a/substrate/frame/src/lib.rs
+++ b/substrate/frame/src/lib.rs
@@ -203,12 +203,18 @@ pub mod prelude {
/// Dispatch types from `frame-support`, other fundamental traits
#[doc(no_inline)]
pub use frame_support::dispatch::{GetDispatchInfo, PostDispatchInfo};
- pub use frame_support::traits::{Contains, IsSubType, OnRuntimeUpgrade};
+ pub use frame_support::traits::{
+ Contains, EstimateNextSessionRotation, IsSubType, OnRuntimeUpgrade, OneSessionHandler,
+ };
/// Pallet prelude of `frame-system`.
#[doc(no_inline)]
pub use frame_system::pallet_prelude::*;
+ /// Transaction related helpers to submit transactions.
+ #[doc(no_inline)]
+ pub use frame_system::offchain::*;
+
/// All FRAME-relevant derive macros.
#[doc(no_inline)]
pub use super::derive::*;
@@ -216,6 +222,9 @@ pub mod prelude {
/// All hashing related things
pub use super::hashing::*;
+ /// All arithmetic types and traits used for safe math.
+ pub use super::arithmetic::*;
+
/// Runtime traits
#[doc(no_inline)]
pub use sp_runtime::traits::{
@@ -223,9 +232,11 @@ pub mod prelude {
Saturating, StaticLookup, TrailingZeroInput,
};
- /// Other error/result types for runtime
+ /// Other runtime types and traits
#[doc(no_inline)]
- pub use sp_runtime::{DispatchErrorWithPostInfo, DispatchResultWithInfo, TokenError};
+ pub use sp_runtime::{
+ BoundToRuntimeAppPublic, DispatchErrorWithPostInfo, DispatchResultWithInfo, TokenError,
+ };
}
#[cfg(any(feature = "try-runtime", test))]
@@ -509,6 +520,8 @@ pub mod traits {
}
/// The arithmetic types used for safe math.
+///
+/// This is already part of the [`prelude`].
pub mod arithmetic {
pub use sp_arithmetic::{traits::*, *};
}
diff --git a/umbrella/Cargo.toml b/umbrella/Cargo.toml
index f36d39d63f6ae9640a7f8eb38e3ddf744475a620..d2a47ade7f8754f4c9ef068722c22d920f5103e1 100644
--- a/umbrella/Cargo.toml
+++ b/umbrella/Cargo.toml
@@ -290,7 +290,6 @@ runtime-benchmarks = [
"pallet-membership?/runtime-benchmarks",
"pallet-message-queue?/runtime-benchmarks",
"pallet-migrations?/runtime-benchmarks",
- "pallet-mixnet?/runtime-benchmarks",
"pallet-mmr?/runtime-benchmarks",
"pallet-multisig?/runtime-benchmarks",
"pallet-nft-fractionalization?/runtime-benchmarks",