Polkadot v0.9.43

bin/node/runtime/Cargo.toml

@@ -241,6 +241,7 @@ runtime-benchmarks = [
 	"pallet-office/runtime-benchmarks",
 	"pallet-federated-bridge/runtime-benchmarks",
 	"pallet-liberland-legislation/runtime-benchmarks",
+	"pallet-llm/runtime-benchmarks",
 	"frame-system-benchmarking/runtime-benchmarks",
 ]
 try-runtime = [

bin/node/runtime/src/lib.rs

@@ -143,7 +143,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	// and set impl_version to 0. If only runtime
 	// implementation changes and behavior does not, then leave spec_version as
 	// is and increment impl_version.
-	spec_version: 10,
+	spec_version: 11,
 	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 1,
@@ -160,7 +160,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	// and set impl_version to 0. If only runtime
 	// implementation changes and behavior does not, then leave spec_version as
 	// is and increment impl_version.
-	spec_version: 10,
+	spec_version: 11,
 	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 1,
@@ -457,17 +457,6 @@ parameter_types! {
 	pub const MaxReserves: u32 = 50;
 }
 
-/// A reason for placing a hold on funds.
-#[derive(
-	Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Encode, Decode, MaxEncodedLen, Debug, TypeInfo,
-)]
-pub enum HoldReason {
-	/// The NIS Pallet has reserved it for a non-fungible receipt.
-	Nis,
-	/// Used by the NFT Fractionalization Pallet.
-	NftFractionalization,
-}
-
 impl pallet_balances::Config for Runtime {
 	type MaxLocks = MaxLocks;
 	type MaxReserves = MaxReserves;
@@ -480,8 +469,8 @@ impl pallet_balances::Config for Runtime {
 	type WeightInfo = pallet_balances::weights::SubstrateWeight<Runtime>;
 	type FreezeIdentifier = ();
 	type MaxFreezes = ();
-	type HoldIdentifier = HoldReason;
-	type MaxHolds = ConstU32<2>;
+	type HoldIdentifier = ();
+	type MaxHolds = ();
 }
 
 parameter_types! {
@@ -1340,21 +1329,6 @@ impl pallet_assets::Config for Runtime {
 	type BenchmarkHelper = ();
 }
 
-parameter_types! {
-	pub const QueueCount: u32 = 300;
-	pub const MaxQueueLen: u32 = 1000;
-	pub const FifoQueueLen: u32 = 500;
-	pub const NisBasePeriod: BlockNumber = 3 * DAYS;
-	pub const MinBid: Balance = 100 * DOLLARS;
-	pub const MinReceipt: Perquintill = Perquintill::from_percent(1);
-	pub const IntakePeriod: BlockNumber = 10;
-	pub MaxIntakeWeight: Weight = MAXIMUM_BLOCK_WEIGHT / 10;
-	pub const ThawThrottle: (Perquintill, BlockNumber) = (Perquintill::from_percent(25), 5);
-	pub Target: Perquintill = Perquintill::zero();
-	pub const NisPalletId: PalletId = PalletId(*b"py/nis  ");
-	pub const NisHoldReason: HoldReason = HoldReason::Nis;
-}
-
 parameter_types! {
 	pub const TOTALLLM: Balance      = 70_000_000u128 * GRAINS_IN_LLM;
 	pub const PRERELEASELLM: Balance = 13_300_000u128 * GRAINS_IN_LLM;
@@ -1382,6 +1356,7 @@ impl pallet_llm::Config for Runtime {
 		HalfSenateOrigin
 	>;
 	type OnLLMPoliticsUnlock = OnLLMPoliticsUnlock;
+	type WeightInfo = ();
 }
 
 parameter_types! {
@@ -1612,6 +1587,7 @@ impl pallet_federated_bridge::Config<EthLLDBridgeInstance> for Runtime {
 	type WithdrawalDelay = WithdrawalDelay;
 	type WithdrawalRateLimit = LLDRateLimit;
 	type MaxTotalLocked = LLDMaxTotalLocked;
+	type WeightInfo = ();
 }
 
 type EthLLMBridgeInstance = pallet_federated_bridge::Instance2;
@@ -1626,6 +1602,7 @@ impl pallet_federated_bridge::Config<EthLLMBridgeInstance> for Runtime {
 	type WithdrawalDelay = WithdrawalDelay;
 	type WithdrawalRateLimit = LLMRateLimit;
 	type MaxTotalLocked = LLMMaxTotalLocked;
+	type WeightInfo = ();
 }
 
 construct_runtime!(
@@ -1771,7 +1748,7 @@ mod staking_v12 {
 	pub struct Migration<T>(sp_std::marker::PhantomData<T>);
 	impl<T: pallet_staking::Config> OnRuntimeUpgrade for Migration<T> {
 		#[cfg(feature = "try-runtime")]
-		fn pre_upgrade() -> Result<Vec<u8>, &'static str> {
+		fn pre_upgrade() -> Result<Vec<u8>, sp_runtime::TryRuntimeError> {
 			frame_support::ensure!(
                 StorageVersion::<T>::get() == ObsoleteReleases::V7_0_0,
                 "Expected v7 before upgrading to v12"
@@ -1787,7 +1764,7 @@ mod staking_v12 {
 		}
 
 		#[cfg(feature = "try-runtime")]
-		fn post_upgrade(_: Vec<u8>) -> Result<(), &'static str> {
+		fn post_upgrade(_: Vec<u8>) -> Result<(), sp_runtime::TryRuntimeError> {
 			frame_support::ensure!(
                 StorageVersion::<T>::get() == ObsoleteReleases::V12_0_0,
                 "Failed to upgrade to v12"
@@ -1801,6 +1778,8 @@ mod staking_v12 {
 // `OnRuntimeUpgrade`.
 type Migrations = (
 	pallet_contracts::Migration<Runtime>,
+	pallet_nfts::migration::v1::MigrateToV1<Runtime>,
+	pallet_offences::migration::v1::MigrateToV1<Runtime>,
 );
 
 type EventRecord = frame_system::EventRecord<
@@ -1830,7 +1809,6 @@ mod benches {
 		[pallet_child_bounties, ChildBounties]
 		[pallet_collective, Council]
 		[pallet_contracts, Contracts]
-		[pallet_core_fellowship, CoreFellowship]
 		[pallet_democracy, Democracy]
 		[pallet_election_provider_multi_phase, ElectionProviderMultiPhase]
 		[pallet_election_provider_support_benchmarking, EPSBench::<Runtime>]
@@ -1855,12 +1833,13 @@ mod benches {
 		[pallet_transaction_storage, TransactionStorage]
 		[pallet_treasury, Treasury]
 		[pallet_nfts, Nfts]
-		[pallet_nft_fractionalization, NftFractionalization]
 		[pallet_utility, Utility]
 		[pallet_whitelist, Whitelist]
 		[pallet_registry, CompanyRegistry]
 		[pallet_office, IdentityOffice]
 		[pallet_liberland_legislation, LiberlandLegislation]
+		[pallet_federated_bridge, EthLLDBridge]
+		[pallet_llm, LLM]
 	);
 }
 

frame/democracy/src/lib.rs

@@ -1807,6 +1807,19 @@ impl<
 	> EnsureOrigin<O> for EnsureReferendumProportionAtLeast<T, N, D>
 {
 	type Success = ();
+
+	#[cfg(feature = "runtime-benchmarks")]
+	fn try_successful_origin() -> Result<O, ()> {
+		let tally = Tally::<BalanceOf<T>> {
+			ayes: 1u8.into(),
+			nays: 0u8.into(),
+			aye_voters: 1,
+			nay_voters: 0,
+			turnout: 1u8.into(),
+		};
+		Ok(O::from(RawOrigin::Referendum(tally, 1u8.into())))
+	}
+
 	fn try_origin(o: O) -> Result<Self::Success, O> {
 		let n: BalanceOf<T> = N.into();
 		let d: BalanceOf<T> = D.into();

frame/democracy/src/migrations.rs

@@ -240,7 +240,7 @@ pub mod v2 {
 
 	impl<T: Config> OnRuntimeUpgrade for Migration<T> {
 		#[cfg(feature = "try-runtime")]
-		fn pre_upgrade() -> Result<Vec<u8>, &'static str> {
+		fn pre_upgrade() -> Result<Vec<u8>, sp_runtime::TryRuntimeError> {
 			assert_eq!(StorageVersion::get::<Pallet<T>>(), 1, "can only upgrade from version 1");
 
 			let props_count = v0::PublicProps::<T>::get().len();
@@ -312,7 +312,7 @@ pub mod v2 {
 		}
 
 		#[cfg(feature = "try-runtime")]
-		fn post_upgrade(state: Vec<u8>) -> Result<(), &'static str> {
+		fn post_upgrade(state: Vec<u8>) -> Result<(), sp_runtime::TryRuntimeError> {
 			assert_eq!(StorageVersion::get::<Pallet<T>>(), 2, "must upgrade");
 
 			let (old_props_count, old_ref_count): (u32, u32) =
@@ -339,7 +339,7 @@ pub mod v3 {
 
 	impl<T: Config> OnRuntimeUpgrade for Migration<T> {
 		#[cfg(feature = "try-runtime")]
-		fn pre_upgrade() -> Result<Vec<u8>, &'static str> {
+		fn pre_upgrade() -> Result<Vec<u8>, sp_runtime::TryRuntimeError> {
 			assert_eq!(StorageVersion::get::<Pallet<T>>(), 2, "can only upgrade from version 2");
 
 			let voting_of_count = v2::VotingOf::<T>::iter().count();
@@ -397,7 +397,7 @@ pub mod v3 {
 		}
 
 		#[cfg(feature = "try-runtime")]
-		fn post_upgrade(state: Vec<u8>) -> Result<(), &'static str> {
+		fn post_upgrade(state: Vec<u8>) -> Result<(), sp_runtime::TryRuntimeError> {
 			assert_eq!(StorageVersion::get::<Pallet<T>>(), 3, "must upgrade");
 
 			let old_votings: u32 =

frame/democracy/src/tests.rs

@@ -35,7 +35,7 @@ use frame_support::{
 use frame_system::{EnsureRoot, EnsureSigned, EnsureSignedBy};
 use sp_core::H256;
 use sp_runtime::{
-	testing::Header,
+	testing::{TestSignature, Header},
 	traits::{BadOrigin, BlakeTwo256, Hash, IdentityLookup},
 	Perbill,
 	Permill,
@@ -186,6 +186,7 @@ impl pallet_balances::Config for Test {
 use pallet_nfts::PalletFeatures;
 parameter_types! {
 	pub storage Features: PalletFeatures = PalletFeatures::all_enabled();
+	pub const MaxAttributesPerCall: u32 = 10;
 }
 impl pallet_nfts::Config for Test {
 	type RuntimeEvent = RuntimeEvent;
@@ -213,6 +214,9 @@ impl pallet_nfts::Config for Test {
 	type Helper = ();
 	type Citizenship = ();
 	type MetadataValidator = ();
+	type MaxAttributesPerCall = MaxAttributesPerCall;
+	type OffchainSignature = TestSignature;
+	type OffchainPublic = <TestSignature as sp_runtime::traits::Verify>::Signer;
 }
 parameter_types! {
 	pub static PreimageByteDeposit: u64 = 0;
@@ -261,6 +265,7 @@ impl pallet_llm::Config for Test {
 	type InflationEventInterval = InflationEventInterval;
 	type OnLLMPoliticsUnlock = ();
 	type SenateOrigin = EnsureRoot<u64>;
+	type WeightInfo = ();
 }
 
 parameter_types! {

frame/democracy/src/tests/metadata.rs

@@ -19,6 +19,8 @@
 
 use super::*;
 
+use super::types::DispatchOrigin;
+
 #[test]
 fn set_external_metadata_works() {
 	new_test_ext().execute_with(|| {
@@ -141,6 +143,7 @@ fn set_referendum_metadata_by_root() {
 		let index = Democracy::inject_referendum(
 			2,
 			set_balance_proposal(2),
+			DispatchOrigin::Root,
 			VoteThreshold::SuperMajorityApprove,
 			0,
 		);
@@ -180,6 +183,7 @@ fn clear_referendum_metadata_works() {
 		let index = Democracy::inject_referendum(
 			2,
 			set_balance_proposal(2),
+			DispatchOrigin::Root,
 			VoteThreshold::SuperMajorityApprove,
 			0,
 		);

frame/elections-phragmen/src/lib.rs

@@ -1266,7 +1266,7 @@ mod tests {
 	use frame_system::ensure_signed;
 	use sp_runtime::{
 		Permill,
-		testing::{Header, H256},
+		testing::{TestSignature, Header, H256},
 		traits::{BlakeTwo256, IdentityLookup},
 		BuildStorage,
 	};
@@ -1346,6 +1346,7 @@ mod tests {
 	use pallet_nfts::PalletFeatures;
 	parameter_types! {
 		pub storage Features: PalletFeatures = PalletFeatures::all_enabled();
+		pub const MaxAttributesPerCall: u32 = 10;
 	}
 	impl pallet_nfts::Config for Test {
 		type RuntimeEvent = RuntimeEvent;
@@ -1373,6 +1374,9 @@ mod tests {
 		type Helper = ();
 		type Citizenship = ();
 		type MetadataValidator = ();
+		type MaxAttributesPerCall = MaxAttributesPerCall;
+		type OffchainSignature = TestSignature;
+		type OffchainPublic = <TestSignature as sp_runtime::traits::Verify>::Signer;
 	}
 
 	impl pallet_assets::Config for Test {
@@ -1451,6 +1455,7 @@ mod tests {
 		type InflationEventInterval = InflationEventInterval;
 		type OnLLMPoliticsUnlock = ();
 		type SenateOrigin = EnsureRoot<u64>;
+		type WeightInfo = ();
 	}
 
 	pub struct TestChangeMembers;