git.delta.rocks / unique-network / refs/commits / 23641e0cc8f7

difftreelog

refactor(preimage) switch governance feature to preimage

Fahrrader2023-02-21parent: #cec8ffa.patch.diff
in: master

12 files changed

modifiedpallets/maintenance/src/benchmarking.rsdiffbeforeafterboth
--- a/pallets/maintenance/src/benchmarking.rs
+++ b/pallets/maintenance/src/benchmarking.rs
@@ -23,30 +23,6 @@
 use codec::Encode;
 use sp_std::vec;
 
-#[cfg(not(feature = "governance"))]
-benchmarks! {
-	enable {
-	}: _(RawOrigin::Root)
-	verify {
-		ensure!(<Enabled<T>>::get(), "didn't enable the MM");
-	}
-
-	disable {
-		Maintenance::<T>::enable(RawOrigin::Root.into())?;
-	}: _(RawOrigin::Root)
-	verify {
-		ensure!(!<Enabled<T>>::get(), "didn't disable the MM");
-	}
-
-	execute_preimage {
-		let call_hash = RuntimeCall::<T>::set_storage { items: vec![] }.encode();
-		let hash = T::Preimages::note(call_hash.into())?;
-	}: _(RawOrigin::Root, hash)
-	verify {
-	}
-}
-
-#[cfg(feature = "governance")]
 benchmarks! {
 	enable {
 	}: _(RawOrigin::Root)
modifiedpallets/maintenance/src/lib.rsdiffbeforeafterboth
--- a/pallets/maintenance/src/lib.rs
+++ b/pallets/maintenance/src/lib.rs
@@ -25,10 +25,7 @@
 
 #[frame_support::pallet]
 pub mod pallet {
-	use frame_support::{
-		dispatch::*,
-		pallet_prelude::*,
-	};
+	use frame_support::{dispatch::*, pallet_prelude::*};
 	use frame_support::{
 		traits::{QueryPreimage, StorePreimage},
 	};
@@ -108,11 +105,11 @@
 		#[pallet::call_index(2)]
 		#[pallet::weight(<T as Config>::WeightInfo::execute_preimage())]
 		pub fn execute_preimage(_origin: OriginFor<T>, _hash: H256) -> DispatchResult {
-			#[cfg(feature = "governance")]
+			#[cfg(feature = "preimage")]
 			{
 				let origin = _origin;
 				let hash = _hash;
-				
+
 				ensure_root(origin)?;
 
 				let len = T::Preimages::len(&hash).ok_or(DispatchError::Unavailable)?;
@@ -128,7 +125,7 @@
 				result
 			}
 
-			#[cfg(not(feature = "governance"))]
+			#[cfg(not(feature = "preimage"))]
 			{
 				Err(DispatchError::Unavailable)
 			}
deletedruntime/common/config/pallets/governance.rsdiffbeforeafterboth
--- a/runtime/common/config/pallets/governance.rs
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.
-// This file is part of Unique Network.
-
-// Unique Network is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Unique Network is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
-
-use frame_support::parameter_types;
-use frame_system::EnsureRoot;
-use crate::{AccountId, Balance, Balances, Runtime, RuntimeEvent};
-use up_common::constants::*;
-
-parameter_types! {
-	pub PreimageBaseDeposit: Balance = 1000 * UNIQUE; // deposit(2, 64);
-	// pub PreimageByteDeposit: Balance = 1 * CENTIUNIQUE; // deposit(0, 1);
-}
-
-impl pallet_preimage::Config for Runtime {
-	type WeightInfo = pallet_preimage::weights::SubstrateWeight<Runtime>;
-	type RuntimeEvent = RuntimeEvent;
-	type Currency = Balances;
-	type ManagerOrigin = EnsureRoot<AccountId>;
-	type BaseDeposit = PreimageBaseDeposit;
-	type ByteDeposit = TransactionByteFee;
-}
modifiedruntime/common/config/pallets/mod.rsdiffbeforeafterboth
before · runtime/common/config/pallets/mod.rs
1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617use frame_support::parameter_types;18use sp_runtime::traits::AccountIdConversion;19use crate::{20	runtime_common::{21		dispatch::CollectionDispatchT,22		config::{substrate::TreasuryModuleId, ethereum::EvmCollectionHelpersAddress},23		weights::CommonWeights,24		RelayChainBlockNumberProvider,25	},26	Runtime, RuntimeEvent, RuntimeCall, RuntimeOrigin, Balances,27};28use frame_support::traits::{ConstU32, ConstU64};29use up_common::{30	types::{AccountId, Balance, BlockNumber},31	constants::*,32};33use up_data_structs::{34	mapping::{EvmTokenAddressMapping, CrossTokenAddressMapping},35};36use sp_arithmetic::Perbill;3738#[cfg(feature = "scheduler")]39pub mod scheduler;4041#[cfg(feature = "foreign-assets")]42pub mod foreign_asset;4344#[cfg(feature = "app-promotion")]45pub mod app_promotion;4647#[cfg(feature = "collator-selection")]48pub mod collator_selection;4950#[cfg(feature = "governance")]51pub mod governance;5253parameter_types! {54	pub TreasuryAccountId: AccountId = TreasuryModuleId::get().into_account_truncating();55	pub const CollectionCreationPrice: Balance = 2 * UNIQUE;56}5758impl pallet_common::Config for Runtime {59	type WeightInfo = pallet_common::weights::SubstrateWeight<Self>;60	type RuntimeEvent = RuntimeEvent;61	type Currency = Balances;62	type CollectionCreationPrice = CollectionCreationPrice;63	type TreasuryAccountId = TreasuryAccountId;64	type CollectionDispatch = CollectionDispatchT<Self>;6566	type EvmTokenAddressMapping = EvmTokenAddressMapping;67	type CrossTokenAddressMapping = CrossTokenAddressMapping<Self::AccountId>;68	type ContractAddress = EvmCollectionHelpersAddress;69}7071impl pallet_structure::Config for Runtime {72	type RuntimeEvent = RuntimeEvent;73	type RuntimeCall = RuntimeCall;74	type WeightInfo = pallet_structure::weights::SubstrateWeight<Self>;75}7677impl pallet_fungible::Config for Runtime {78	type WeightInfo = pallet_fungible::weights::SubstrateWeight<Self>;79}80impl pallet_refungible::Config for Runtime {81	type WeightInfo = pallet_refungible::weights::SubstrateWeight<Self>;82}83impl pallet_nonfungible::Config for Runtime {84	type WeightInfo = pallet_nonfungible::weights::SubstrateWeight<Self>;85}8687parameter_types! {88	pub const InflationBlockInterval: BlockNumber = 100; // every time per how many blocks inflation is applied89}9091/// Used for the pallet inflation92impl pallet_inflation::Config for Runtime {93	type Currency = Balances;94	type TreasuryAccountId = TreasuryAccountId;95	type InflationBlockInterval = InflationBlockInterval;96	type BlockNumberProvider = RelayChainBlockNumberProvider<Runtime>;97}9899impl pallet_unique::Config for Runtime {100	type WeightInfo = pallet_unique::weights::SubstrateWeight<Self>;101	type CommonWeightInfo = CommonWeights<Self>;102	type RefungibleExtensionsWeightInfo = CommonWeights<Self>;103}104105parameter_types! {106	pub AppPromotionDailyRate: Perbill = Perbill::from_rational(5u32, 10_000);107	pub const MaxCollators: u32 = MAX_COLLATORS;108	pub const LicenseBond: Balance = GENESIS_LICENSE_BOND;109	pub const SessionPeriod: BlockNumber = SESSION_LENGTH;110	pub const DayRelayBlocks: BlockNumber = RELAY_DAYS;111}112113impl pallet_configuration::Config for Runtime {114	type RuntimeEvent = RuntimeEvent;115	type Currency = Balances;116	type DefaultWeightToFeeCoefficient = ConstU64<{ up_common::constants::WEIGHT_TO_FEE_COEFF }>;117	type DefaultMinGasPrice = ConstU64<{ up_common::constants::MIN_GAS_PRICE }>;118	type DefaultCollatorSelectionMaxCollators = MaxCollators;119	type DefaultCollatorSelectionKickThreshold = SessionPeriod;120	type DefaultCollatorSelectionLicenseBond = LicenseBond;121	type MaxXcmAllowedLocations = ConstU32<16>;122	type AppPromotionDailyRate = AppPromotionDailyRate;123	type DayRelayBlocks = DayRelayBlocks;124	type WeightInfo = pallet_configuration::weights::SubstrateWeight<Self>;125}126127impl pallet_maintenance::Config for Runtime {128	type RuntimeEvent = RuntimeEvent;129	type RuntimeOrigin = RuntimeOrigin;130	type RuntimeCall = RuntimeCall;131	#[cfg(feature = "governance")]132	type Preimages = crate::Preimage;133	#[cfg(not(feature = "governance"))]134	type Preimages = ();135	type WeightInfo = pallet_maintenance::weights::SubstrateWeight<Self>;136}
addedruntime/common/config/pallets/preimage.rsdiffbeforeafterboth
--- /dev/null
+++ b/runtime/common/config/pallets/preimage.rs
@@ -0,0 +1,34 @@
+// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.
+// This file is part of Unique Network.
+
+// Unique Network is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Unique Network is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
+
+use frame_support::parameter_types;
+use frame_system::EnsureRoot;
+use crate::{AccountId, Balance, Balances, Runtime, RuntimeEvent};
+use up_common::constants::*;
+
+parameter_types! {
+	pub PreimageBaseDeposit: Balance = 1000 * UNIQUE; // deposit(2, 64);
+	// pub PreimageByteDeposit: Balance = 1 * CENTIUNIQUE; // deposit(0, 1);
+}
+
+impl pallet_preimage::Config for Runtime {
+	type WeightInfo = pallet_preimage::weights::SubstrateWeight<Runtime>;
+	type RuntimeEvent = RuntimeEvent;
+	type Currency = Balances;
+	type ManagerOrigin = EnsureRoot<AccountId>;
+	type BaseDeposit = PreimageBaseDeposit;
+	type ByteDeposit = TransactionByteFee;
+}
modifiedruntime/common/construct_runtime.rsdiffbeforeafterboth
--- a/runtime/common/construct_runtime.rs
+++ b/runtime/common/construct_runtime.rs
@@ -56,7 +56,7 @@
                 #[cfg(feature = "collator-selection")]
                 Identity: pallet_identity::{Pallet, Call, Storage, Event<T>} = 40,
 
-                #[cfg(feature = "governance")]
+                #[cfg(feature = "preimage")]
                 Preimage: pallet_preimage::{Pallet, Call, Storage, Event<T>} = 41,
 
                 // XCM helpers.
modifiedruntime/common/maintenance.rsdiffbeforeafterboth
--- a/runtime/common/maintenance.rs
+++ b/runtime/common/maintenance.rs
@@ -86,7 +86,7 @@
 				| RuntimeCall::Session(_)
 				| RuntimeCall::Identity(_) => Err(TransactionValidityError::Invalid(InvalidTransaction::Call)),
 
-				#[cfg(feature = "governance")]
+				#[cfg(feature = "preimage")]
 				RuntimeCall::Preimage(_) => Err(TransactionValidityError::Invalid(InvalidTransaction::Call)),
 
 				#[cfg(feature = "pallet-test-utils")]
modifiedruntime/common/runtime_apis.rsdiffbeforeafterboth
--- a/runtime/common/runtime_apis.rs
+++ b/runtime/common/runtime_apis.rs
@@ -565,7 +565,7 @@
                     #[cfg(feature = "collator-selection")]
                     list_benchmark!(list, extra, pallet_identity, Identity);
 
-                    #[cfg(feature = "governance")]
+                    #[cfg(feature = "preimage")]
                     list_benchmark!(list, extra, pallet_preimage, Preimage);
 
                     #[cfg(feature = "foreign-assets")]
@@ -632,7 +632,7 @@
                     #[cfg(feature = "collator-selection")]
                     add_benchmark!(params, batches, pallet_identity, Identity);
 
-                    #[cfg(feature = "governance")]
+                    #[cfg(feature = "preimage")]
                     add_benchmark!(params, batches, pallet_preimage, Preimage);
 
                     #[cfg(feature = "foreign-assets")]
modifiedruntime/opal/Cargo.tomldiffbeforeafterboth
--- a/runtime/opal/Cargo.toml
+++ b/runtime/opal/Cargo.toml
@@ -18,7 +18,7 @@
 [features]
 default = ['opal-runtime', 'std']
 limit-testing = ['pallet-unique/limit-testing', 'up-data-structs/limit-testing']
-opal-runtime = ['app-promotion', 'collator-selection', 'foreign-assets', 'governance', 'pallet-test-utils', 'refungible']
+opal-runtime = ['app-promotion', 'collator-selection', 'foreign-assets', 'preimage', 'pallet-test-utils', 'refungible']
 pov-estimate = []
 runtime-benchmarks = [
 	'cumulus-pallet-parachain-system/runtime-benchmarks',
@@ -191,7 +191,7 @@
 app-promotion = []
 collator-selection = []
 foreign-assets = []
-governance = []
+preimage = []
 pallet-test-utils = []
 refungible = []
 scheduler = []
modifiedruntime/quartz/Cargo.tomldiffbeforeafterboth
--- a/runtime/quartz/Cargo.toml
+++ b/runtime/quartz/Cargo.toml
@@ -20,7 +20,7 @@
 default = ['quartz-runtime', 'std']
 limit-testing = ['pallet-unique/limit-testing', 'up-data-structs/limit-testing']
 pov-estimate = []
-quartz-runtime = ['app-promotion', 'collator-selection', 'foreign-assets', 'governance', 'refungible']
+quartz-runtime = ['app-promotion', 'collator-selection', 'foreign-assets', 'preimage', 'refungible']
 runtime-benchmarks = [
 	'cumulus-pallet-parachain-system/runtime-benchmarks',
 	'frame-benchmarking',
@@ -184,7 +184,7 @@
 app-promotion = []
 collator-selection = []
 foreign-assets = []
-governance = []
+preimage = []
 refungible = []
 scheduler = []
modifiedruntime/unique/Cargo.tomldiffbeforeafterboth
--- a/runtime/unique/Cargo.toml
+++ b/runtime/unique/Cargo.toml
@@ -183,7 +183,7 @@
 app-promotion = []
 collator-selection = []
 foreign-assets = []
-governance = []
+preimage = []
 refungible = []
 scheduler = []
modifiedtests/src/pallet-presence.test.tsdiffbeforeafterboth
--- a/tests/src/pallet-presence.test.ts
+++ b/tests/src/pallet-presence.test.ts
@@ -66,7 +66,7 @@
       const foreignAssets = 'foreignassets';
       const appPromotion = 'apppromotion';
       const collatorSelection = ['authorship', 'session', 'collatorselection', 'identity'];
-      const governance = ['preimage'];
+      const preimage = ['preimage'];
       const testUtils = 'testutils';
 
       if (chain.eq('OPAL by UNIQUE')) {
@@ -76,7 +76,7 @@
           appPromotion,
           testUtils,
           ...collatorSelection,
-          ...governance,
+          ...preimage,
         );
       } else if (chain.eq('QUARTZ by UNIQUE') || chain.eq('SAPPHIRE by UNIQUE')) {
         requiredPallets.push(
@@ -84,7 +84,7 @@
           appPromotion,
           foreignAssets,
           ...collatorSelection,
-          ...governance,
+          ...preimage,
         );
       } else if (chain.eq('UNIQUE')) {
         // Insert Unique additional pallets here