Update to stable2412

Author: 0xLucca

.snippets/code/Cargo.lock

@@ -14,134 +14,21 @@ members = ["tutorials/polkadot-sdk/parachains/zero-to-hero/runtime"]
 resolver = "2"
 
 [workspace.dependencies]
-clap = { version = "4.5.10" }
+clap = { version = "4.5.13" }
 codec = { version = "3.6.12", default-features = false, package = "parity-scale-codec" }
 color-print = { version = "0.3.4" }
-cumulus-client-cli = { version = "0.18.0", default-features = false }
-cumulus-client-collator = { version = "0.18.0", default-features = false }
-cumulus-client-consensus-aura = { version = "0.18.0", default-features = false }
-cumulus-client-consensus-common = { version = "0.18.0", default-features = false }
-cumulus-client-consensus-proposer = { version = "0.16.0", default-features = false }
-cumulus-client-service = { version = "0.19.0", default-features = false }
-cumulus-primitives-core = { version = "0.16.0", default-features = false }
-cumulus-primitives-parachain-inherent = { version = "0.16.0", default-features = false }
-cumulus-relay-chain-interface = { version = "0.18.0", default-features = false }
-docify = { version = "0.2.8" }
-frame-benchmarking = { version = "38.0.0", default-features = false }
-frame-benchmarking-cli = { version = "43.0.0", default-features = false }
-futures = { version = "0.3.30" }
+docify = { version = "0.2.9" }
+futures = { version = "0.3.31" }
 jsonrpsee = { version = "0.24.3" }
 log = { version = "0.4.22", default-features = false }
-pallet-transaction-payment-rpc = { version = "41.0.0", default-features = false }
-polkadot-cli = { version = "19.0.0", default-features = false }
-polkadot-primitives = { version = "16.0.0", default-features = false }
-prometheus-endpoint = { version = "0.17.0", default-features = false, package = "substrate-prometheus-endpoint" }
-sc-basic-authorship = { version = "0.45.0", default-features = false }
-sc-chain-spec = { version = "38.0.0", default-features = false }
-sc-cli = { version = "0.47.0", default-features = false }
-sc-client-api = { version = "37.0.0", default-features = false }
-sc-consensus = { version = "0.44.0", default-features = false }
-sc-executor = { version = "0.40.1", default-features = false }
-sc-network = { version = "0.45.0", default-features = false }
-sc-network-sync = { version = "0.44.0", default-features = false }
-sc-offchain = { version = "40.0.0", default-features = false }
-sc-rpc = { version = "40.0.0", default-features = false }
-sc-service = { version = "0.46.0", default-features = false }
-sc-sysinfo = { version = "38.0.0", default-features = false }
-sc-telemetry = { version = "25.0.0", default-features = false }
-sc-tracing = { version = "37.0.1", default-features = false }
-sc-transaction-pool = { version = "37.0.0", default-features = false }
-sc-transaction-pool-api = { version = "37.0.0", default-features = false }
-serde = { version = "1.0.209", default-features = false }
-serde_json = { version = "1.0.127", default-features = false }
-sp-api = { version = "34.0.0", default-features = false }
-sp-block-builder = { version = "34.0.0", default-features = false }
-sp-blockchain = { version = "37.0.1", default-features = false }
-sp-consensus-aura = { version = "0.40.0", default-features = false }
-sp-core = { version = "34.0.0", default-features = false }
-sp-genesis-builder = { version = "0.15.1", default-features = false }
-sp-io = { version = "38.0.0", default-features = false }
-sp-keystore = { version = "0.40.0", default-features = false }
-sp-runtime = { version = "39.0.1", default-features = false }
-sp-timestamp = { version = "34.0.0", default-features = false }
-substrate-frame-rpc-system = { version = "39.0.0", default-features = false }
-xcm = { version = "14.2.0", default-features = false, package = "staging-xcm" }
-substrate-build-script-utils = { version = "11.0.0", default-features = false }
-cumulus-pallet-aura-ext = { version = "0.17.0", default-features = false }
-cumulus-pallet-parachain-system = { version = "0.17.0", default-features = false }
-cumulus-pallet-session-benchmarking = { version = "19.0.0", default-features = false }
-cumulus-pallet-xcm = { version = "0.17.0", default-features = false }
-cumulus-pallet-xcmp-queue = { version = "0.17.0", default-features = false }
-cumulus-primitives-aura = { version = "0.15.0", default-features = false }
-cumulus-primitives-storage-weight-reclaim = { version = "8.0.0", default-features = false }
-cumulus-primitives-utility = { version = "0.17.0", default-features = false }
-frame-executive = { version = "38.0.0", default-features = false }
-frame-metadata-hash-extension = { version = "0.6.0", default-features = false }
-frame-support = { version = "38.0.0", default-features = false }
-frame-system = { version = "38.0.0", default-features = false }
-frame-system-benchmarking = { version = "38.0.0", default-features = false }
-frame-system-rpc-runtime-api = { version = "34.0.0", default-features = false }
-frame-try-runtime = { version = "0.44.0", default-features = false }
+polkadot-sdk = { version = "0.12.2", default-features = false }
+prometheus-endpoint = { version = "0.17.1", default-features = false, package = "substrate-prometheus-endpoint" }
+sc-tracing = { version = "38.0.0", default-features = false }
+serde = { version = "1.0.214", default-features = false }
+serde_json = { version = "1.0.132", default-features = false }
+cumulus-pallet-parachain-system = { version = "0.18.1", default-features = false }
 hex-literal = { version = "0.4.1", default-features = false }
-pallet-aura = { version = "37.0.0", default-features = false }
-pallet-authorship = { version = "38.0.0", default-features = false }
-pallet-balances = { version = "39.0.0", default-features = false }
-pallet-collator-selection = { version = "19.0.0", default-features = false }
-pallet-message-queue = { version = "41.0.0", default-features = false }
-pallet-session = { version = "38.0.0", default-features = false }
-pallet-sudo = { version = "38.0.0", default-features = false }
-pallet-timestamp = { version = "37.0.0", default-features = false }
-pallet-transaction-payment = { version = "38.0.0", default-features = false }
-pallet-transaction-payment-rpc-runtime-api = { version = "38.0.0", default-features = false }
-pallet-xcm = { version = "17.0.0", default-features = false }
-parachain-info = { version = "0.17.0", default-features = false, package = "staging-parachain-info" }
-parachains-common = { version = "18.0.0", default-features = false }
-polkadot-parachain-primitives = { version = "14.0.0", default-features = false }
-polkadot-runtime-common = { version = "17.0.0", default-features = false }
 scale-info = { version = "2.11.1", default-features = false }
 smallvec = { version = "1.11.0", default-features = false }
-sp-inherents = { version = "34.0.0", default-features = false }
-sp-offchain = { version = "34.0.0", default-features = false }
-sp-session = { version = "36.0.0", default-features = false }
-sp-transaction-pool = { version = "34.0.0", default-features = false }
-sp-version = { version = "37.0.0", default-features = false }
-xcm-builder = { version = "17.0.0", default-features = false, package = "staging-xcm-builder" }
-xcm-executor = { version = "17.0.0", default-features = false, package = "staging-xcm-executor" }
-substrate-wasm-builder = { version = "24.0.1", default-features = false }
-
-[workspace.lints.rust]
-suspicious_double_ref_op = { level = "allow", priority = 2 }
-# `substrate_runtime` is a common `cfg` condition name used in the repo.
-unexpected_cfgs = { level = "warn", check-cfg = [
-  'cfg(build_opt_level, values("3"))',
-  'cfg(build_profile, values("debug", "release"))',
-  'cfg(enable_alloc_error_handler)',
-  'cfg(fuzzing)',
-  'cfg(substrate_runtime)',
-] }
-
-[workspace.lints.clippy]
-all = { level = "allow", priority = 0 }
-bind_instead_of_map = { level = "allow", priority = 2 }              # stylistic
-borrowed-box = { level = "allow", priority = 2 }                     # Reasonable to fix this one
-complexity = { level = "warn", priority = 1 }
-correctness = { level = "warn", priority = 1 }
-default_constructed_unit_structs = { level = "allow", priority = 2 } # stylistic
-derivable_impls = { level = "allow", priority = 2 }                  # false positives
-eq_op = { level = "allow", priority = 2 }                            # In tests we test equality.
-erasing_op = { level = "allow", priority = 2 }                       # E.g. 0 * DOLLARS
-extra-unused-type-parameters = { level = "allow", priority = 2 }     # stylistic
-identity-op = { level = "allow", priority = 2 }                      # One case where we do 0 +
-if-same-then-else = { level = "allow", priority = 2 }
-needless-lifetimes = { level = "allow", priority = 2 }               # generated code
-needless_option_as_deref = { level = "allow", priority = 2 }         # false positives
-nonminimal-bool = { level = "allow", priority = 2 }                  # maybe
-option-map-unit-fn = { level = "allow", priority = 2 }               # stylistic
-stable_sort_primitive = { level = "allow", priority = 2 }            # prefer stable sort
-too-many-arguments = { level = "allow", priority = 2 }               # (Turning this on would lead to)
-type_complexity = { level = "allow", priority = 2 }                  # raison d'etre
-unit_arg = { level = "allow", priority = 2 }                         # stylistic
-unnecessary_cast = { level = "allow", priority = 2 }                 # Types may change
-useless_conversion = { level = "allow", priority = 2 }               # Types may change
-while_immutable_condition = { level = "allow", priority = 2 }        # false positives
-zero-prefixed-literal = { level = "allow", priority = 2 }            # 00_1000_000
+substrate-wasm-builder = { version = "25.0.0", default-features = false }
+frame = { version = "0.8.1", default-features = false, package = "polkadot-sdk-frame" }

.snippets/code/Cargo.toml

@@ -10,28 +10,9 @@ edition.workspace = true
 [dependencies]
 codec = { features = ["derive"], workspace = true }
 scale-info = { features = ["derive"], workspace = true }
-frame-support.workspace = true
-frame-system.workspace = true
-frame-benchmarking = { optional = true, workspace = true }
-
-[dev-dependencies]
-sp-core = { workspace = true, default-features = true }
-sp-io = { workspace = true, default-features = true }
-sp-runtime = { workspace = true, default-features = true }
+frame = { features = ["experimental", "runtime"], workspace = true }
 
 [features]
 default = ["std"]
-std = [
-  "codec/std",
-  "frame-support/std",
-  "frame-system/std",
-  "scale-info/std",
-  "frame-benchmarking?/std",
-]
-runtime-benchmarks = [
-  "frame-benchmarking/runtime-benchmarks",
-  "frame-support/runtime-benchmarks",
-  "frame-system/runtime-benchmarks",
-  "sp-runtime/runtime-benchmarks",
-]
-try-runtime = []
+std = ["codec/std", "frame/std", "scale-info/std"]
+runtime-benchmarks = ["frame/runtime-benchmarks"]

.snippets/code/tutorials/polkadot-sdk/parachains/zero-to-hero/pallets/custom-pallet/Cargo.toml

@@ -20,8 +20,8 @@
 #![cfg(feature = "runtime-benchmarks")]
 
 use super::{Pallet as CustomPallet, *};
-use frame_benchmarking::v2::*;
-use frame_support::assert_ok;
+use frame::deps::frame_support::assert_ok;
+use frame::{deps::frame_benchmarking::v2::*, prelude::*};
 
 #[benchmarks]
 mod benchmarks {

.snippets/code/tutorials/polkadot-sdk/parachains/zero-to-hero/pallets/custom-pallet/src/benchmarking.rs

@@ -33,11 +33,10 @@ mod benchmarking;
 pub mod weights;
 use crate::weights::WeightInfo;
 
-#[frame_support::pallet]
+#[frame::pallet]
 pub mod pallet {
     use super::*;
-    use frame_support::pallet_prelude::*;
-    use frame_system::pallet_prelude::*;
+    use frame::prelude::*;
 
     #[pallet::pallet]
     pub struct Pallet<T>(_);
@@ -215,4 +214,4 @@ pub mod pallet {
             Ok(())
         }
     }
-}
+}

.snippets/code/tutorials/polkadot-sdk/parachains/zero-to-hero/pallets/custom-pallet/src/lib.rs

@@ -18,12 +18,12 @@
 // SOFTWARE.
 
 use crate as custom_pallet;
-use frame_support::{derive_impl, parameter_types};
-use sp_runtime::BuildStorage;
+use frame::{prelude::*, runtime::prelude::*, testing_prelude::*};
 
 type Block = frame_system::mocking::MockBlock<Test>;
 
-#[frame_support::runtime]
+// Configure a mock runtime to test the pallet.
+#[frame_construct_runtime]
 mod runtime {
     #[runtime::runtime]
     #[runtime::derive(
@@ -40,10 +40,10 @@ mod runtime {
     pub struct Test;
 
     #[runtime::pallet_index(0)]
-    pub type System = frame_system::Pallet<Test>;
+    pub type System = frame_system;
 
     #[runtime::pallet_index(1)]
-    pub type CustomPallet = custom_pallet::Pallet<Test>;
+    pub type CustomPallet = custom_pallet;
 }
 
 // System pallet configuration
@@ -64,7 +64,7 @@ impl custom_pallet::Config for Test {
 }
 
 // Test externalities initialization
-pub fn new_test_ext() -> sp_io::TestExternalities {
+pub fn new_test_ext() -> TestExternalities {
     frame_system::GenesisConfig::<Test>::default()
         .build_storage()
         .unwrap()

.snippets/code/tutorials/polkadot-sdk/parachains/zero-to-hero/pallets/custom-pallet/src/mock.rs

@@ -18,7 +18,8 @@
 // SOFTWARE.
 
 use crate::{mock::*, Error, Event, UserInteractions};
-use frame_support::{assert_noop, assert_ok};
+use frame::testing_prelude::*;
+use frame::deps::sp_runtime;
 
 // Verify root can successfully set counter value
 #[test]

.snippets/code/tutorials/polkadot-sdk/parachains/zero-to-hero/pallets/custom-pallet/src/tests.rs

@@ -2,9 +2,9 @@
 //! Autogenerated weights for `custom_pallet`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 43.0.0
-//! DATE: 2025-01-03, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2025-04-28, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `192.168.1.4`, CPU: `<UNKNOWN>`
+//! HOSTNAME: `192.168.1.5`, CPU: `<UNKNOWN>`
 //! WASM-EXECUTION: `Compiled`, CHAIN: `None`, DB CACHE: `1024`
 
 // Executed Command:
@@ -19,7 +19,7 @@
 // --extrinsic
 // 
 // --template
-// ./pallets/benchmarking/frame-weight-template.hbs
+// ./pallets/benchmarking/frame-umbrella-weight-template.hbs
 // --output
 // ./pallets/custom-pallet/src/weights.rs
 
@@ -28,8 +28,7 @@
 #![allow(unused_imports)]
 #![allow(missing_docs)]
 
-use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use core::marker::PhantomData;
+use frame::weights_prelude::*;
 
 /// Weight functions needed for `custom_pallet`.
 pub trait WeightInfo {
@@ -42,7 +41,7 @@ pub trait WeightInfo {
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// Storage: `CustomPallet::CounterValue` (r:0 w:1)
-	/// Proof: `CustomPallet::CounterValue` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Proof: `CustomPallet::CounterValue` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
 	fn set_counter_value() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
@@ -52,28 +51,28 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
 	/// Storage: `CustomPallet::CounterValue` (r:1 w:1)
-	/// Proof: `CustomPallet::CounterValue` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Proof: `CustomPallet::CounterValue` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
 	/// Storage: `CustomPallet::UserInteractions` (r:1 w:1)
-	/// Proof: `CustomPallet::UserInteractions` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Proof: `CustomPallet::UserInteractions` (`max_values`: None, `max_size`: Some(44), added: 2519, mode: `MaxEncodedLen`)
 	fn increment() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `69`
-		//  Estimated: `3534`
-		// Minimum execution time: 11_000_000 picoseconds.
-		Weight::from_parts(12_000_000, 3534)
+		//  Estimated: `3509`
+		// Minimum execution time: 9_000_000 picoseconds.
+		Weight::from_parts(10_000_000, 3509)
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
 	/// Storage: `CustomPallet::CounterValue` (r:1 w:1)
-	/// Proof: `CustomPallet::CounterValue` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Proof: `CustomPallet::CounterValue` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
 	/// Storage: `CustomPallet::UserInteractions` (r:1 w:1)
-	/// Proof: `CustomPallet::UserInteractions` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Proof: `CustomPallet::UserInteractions` (`max_values`: None, `max_size`: Some(44), added: 2519, mode: `MaxEncodedLen`)
 	fn decrement() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `69`
-		//  Estimated: `3534`
-		// Minimum execution time: 11_000_000 picoseconds.
-		Weight::from_parts(11_000_000, 3534)
+		//  Estimated: `3509`
+		// Minimum execution time: 9_000_000 picoseconds.
+		Weight::from_parts(10_000_000, 3509)
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
@@ -82,7 +81,7 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 // For backwards compatibility and tests.
 impl WeightInfo for () {
 	/// Storage: `CustomPallet::CounterValue` (r:0 w:1)
-	/// Proof: `CustomPallet::CounterValue` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Proof: `CustomPallet::CounterValue` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
 	fn set_counter_value() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
@@ -92,28 +91,28 @@ impl WeightInfo for () {
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
 	/// Storage: `CustomPallet::CounterValue` (r:1 w:1)
-	/// Proof: `CustomPallet::CounterValue` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Proof: `CustomPallet::CounterValue` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
 	/// Storage: `CustomPallet::UserInteractions` (r:1 w:1)
-	/// Proof: `CustomPallet::UserInteractions` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Proof: `CustomPallet::UserInteractions` (`max_values`: None, `max_size`: Some(44), added: 2519, mode: `MaxEncodedLen`)
 	fn increment() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `69`
-		//  Estimated: `3534`
-		// Minimum execution time: 11_000_000 picoseconds.
-		Weight::from_parts(12_000_000, 3534)
+		//  Estimated: `3509`
+		// Minimum execution time: 9_000_000 picoseconds.
+		Weight::from_parts(10_000_000, 3509)
 			.saturating_add(RocksDbWeight::get().reads(2_u64))
 			.saturating_add(RocksDbWeight::get().writes(2_u64))
 	}
 	/// Storage: `CustomPallet::CounterValue` (r:1 w:1)
-	/// Proof: `CustomPallet::CounterValue` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Proof: `CustomPallet::CounterValue` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
 	/// Storage: `CustomPallet::UserInteractions` (r:1 w:1)
-	/// Proof: `CustomPallet::UserInteractions` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Proof: `CustomPallet::UserInteractions` (`max_values`: None, `max_size`: Some(44), added: 2519, mode: `MaxEncodedLen`)
 	fn decrement() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `69`
-		//  Estimated: `3534`
-		// Minimum execution time: 11_000_000 picoseconds.
-		Weight::from_parts(11_000_000, 3534)
+		//  Estimated: `3509`
+		// Minimum execution time: 9_000_000 picoseconds.
+		Weight::from_parts(10_000_000, 3509)
 			.saturating_add(RocksDbWeight::get().reads(2_u64))
 			.saturating_add(RocksDbWeight::get().writes(2_u64))
 	}