git.delta.rocks / unique-network / refs/commits / cec8ffa65f46

difftreelog

fix(preimage) maintenance not working with quantum preimage (due to runtimes)

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

9 files changed

modifiedpallets/maintenance/src/benchmarking.rsdiffbeforeafterboth
--- a/pallets/maintenance/src/benchmarking.rs
+++ b/pallets/maintenance/src/benchmarking.rs
@@ -23,6 +23,30 @@
 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
before · pallets/maintenance/src/lib.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/>.1617#![cfg_attr(not(feature = "std"), no_std)]1819pub use pallet::*;2021#[cfg(feature = "runtime-benchmarks")]22pub mod benchmarking;2324pub mod weights;2526#[frame_support::pallet]27pub mod pallet {28	use frame_support::{29		dispatch::*,30		pallet_prelude::*,31		traits::{QueryPreimage, StorePreimage},32	};33	use frame_system::pallet_prelude::*;34	use sp_core::H256;3536	use crate::weights::WeightInfo;3738	#[pallet::config]39	pub trait Config: frame_system::Config {40		/// The overarching event type.41		type RuntimeEvent: From<Event<Self>> + IsType<<Self as frame_system::Config>::RuntimeEvent>;4243		/// The runtime origin type.44		type RuntimeOrigin: From<RawOrigin<Self::AccountId>>45			+ IsType<<Self as frame_system::Config>::RuntimeOrigin>;4647		/// The aggregated call type.48		type RuntimeCall: Parameter49			+ Dispatchable<50				RuntimeOrigin = <Self as Config>::RuntimeOrigin,51				PostInfo = PostDispatchInfo,52			> + GetDispatchInfo53			+ From<frame_system::Call<Self>>;5455		/// The preimage provider with which we look up call hashes to get the call.56		type Preimages: QueryPreimage + StorePreimage;5758		/// Weight information for extrinsics in this pallet.59		type WeightInfo: WeightInfo;60	}6162	#[pallet::event]63	#[pallet::generate_deposit(pub(super) fn deposit_event)]64	pub enum Event<T: Config> {65		MaintenanceEnabled,66		MaintenanceDisabled,67	}6869	#[pallet::pallet]70	#[pallet::generate_store(pub(super) trait Store)]71	pub struct Pallet<T>(_);7273	#[pallet::storage]74	#[pallet::getter(fn is_enabled)]75	pub type Enabled<T> = StorageValue<_, bool, ValueQuery>;7677	#[pallet::error]78	pub enum Error<T> {}7980	#[pallet::call]81	impl<T: Config> Pallet<T> {82		#[pallet::call_index(0)]83		#[pallet::weight(<T as Config>::WeightInfo::enable())]84		pub fn enable(origin: OriginFor<T>) -> DispatchResult {85			ensure_root(origin)?;8687			<Enabled<T>>::set(true);8889			Self::deposit_event(Event::MaintenanceEnabled);9091			Ok(())92		}9394		#[pallet::call_index(1)]95		#[pallet::weight(<T as Config>::WeightInfo::disable())]96		pub fn disable(origin: OriginFor<T>) -> DispatchResult {97			ensure_root(origin)?;9899			<Enabled<T>>::set(false);100101			Self::deposit_event(Event::MaintenanceDisabled);102103			Ok(())104		}105106		#[pallet::call_index(2)]107		#[pallet::weight(<T as Config>::WeightInfo::execute_preimage())]108		pub fn execute_preimage(origin: OriginFor<T>, hash: H256) -> DispatchResult {109			ensure_root(origin)?;110111			let len = T::Preimages::len(&hash).ok_or(DispatchError::Unavailable)?;112			let bounded = T::Preimages::pick::<<T as Config>::RuntimeCall>(hash, len);113			let (call, _) =114				T::Preimages::realize(&bounded).map_err(|_| DispatchError::Unavailable)?;115116			let result = match call.dispatch(frame_system::RawOrigin::Root.into()) {117				Ok(_) => Ok(()),118				Err(error_and_info) => Err(error_and_info.error),119			};120121			result122		}123	}124}
after · pallets/maintenance/src/lib.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/>.1617#![cfg_attr(not(feature = "std"), no_std)]1819pub use pallet::*;2021#[cfg(feature = "runtime-benchmarks")]22pub mod benchmarking;2324pub mod weights;2526#[frame_support::pallet]27pub mod pallet {28	use frame_support::{29		dispatch::*,30		pallet_prelude::*,31	};32	use frame_support::{33		traits::{QueryPreimage, StorePreimage},34	};35	use frame_system::pallet_prelude::*;36	use sp_core::H256;3738	use crate::weights::WeightInfo;3940	#[pallet::config]41	pub trait Config: frame_system::Config {42		/// The overarching event type.43		type RuntimeEvent: From<Event<Self>> + IsType<<Self as frame_system::Config>::RuntimeEvent>;4445		/// The runtime origin type.46		type RuntimeOrigin: From<RawOrigin<Self::AccountId>>47			+ IsType<<Self as frame_system::Config>::RuntimeOrigin>;4849		/// The aggregated call type.50		type RuntimeCall: Parameter51			+ Dispatchable<52				RuntimeOrigin = <Self as Config>::RuntimeOrigin,53				PostInfo = PostDispatchInfo,54			> + GetDispatchInfo55			+ From<frame_system::Call<Self>>;5657		/// The preimage provider with which we look up call hashes to get the call.58		type Preimages: QueryPreimage + StorePreimage;5960		/// Weight information for extrinsics in this pallet.61		type WeightInfo: WeightInfo;62	}6364	#[pallet::event]65	#[pallet::generate_deposit(pub(super) fn deposit_event)]66	pub enum Event<T: Config> {67		MaintenanceEnabled,68		MaintenanceDisabled,69	}7071	#[pallet::pallet]72	#[pallet::generate_store(pub(super) trait Store)]73	pub struct Pallet<T>(_);7475	#[pallet::storage]76	#[pallet::getter(fn is_enabled)]77	pub type Enabled<T> = StorageValue<_, bool, ValueQuery>;7879	#[pallet::error]80	pub enum Error<T> {}8182	#[pallet::call]83	impl<T: Config> Pallet<T> {84		#[pallet::call_index(0)]85		#[pallet::weight(<T as Config>::WeightInfo::enable())]86		pub fn enable(origin: OriginFor<T>) -> DispatchResult {87			ensure_root(origin)?;8889			<Enabled<T>>::set(true);9091			Self::deposit_event(Event::MaintenanceEnabled);9293			Ok(())94		}9596		#[pallet::call_index(1)]97		#[pallet::weight(<T as Config>::WeightInfo::disable())]98		pub fn disable(origin: OriginFor<T>) -> DispatchResult {99			ensure_root(origin)?;100101			<Enabled<T>>::set(false);102103			Self::deposit_event(Event::MaintenanceDisabled);104105			Ok(())106		}107108		#[pallet::call_index(2)]109		#[pallet::weight(<T as Config>::WeightInfo::execute_preimage())]110		pub fn execute_preimage(_origin: OriginFor<T>, _hash: H256) -> DispatchResult {111			#[cfg(feature = "governance")]112			{113				let origin = _origin;114				let hash = _hash;115				116				ensure_root(origin)?;117118				let len = T::Preimages::len(&hash).ok_or(DispatchError::Unavailable)?;119				let bounded = T::Preimages::pick::<<T as Config>::RuntimeCall>(hash, len);120				let (call, _) =121					T::Preimages::realize(&bounded).map_err(|_| DispatchError::Unavailable)?;122123				let result = match call.dispatch(frame_system::RawOrigin::Root.into()) {124					Ok(_) => Ok(()),125					Err(error_and_info) => Err(error_and_info.error),126				};127128				result129			}130131			#[cfg(not(feature = "governance"))]132			{133				Err(DispatchError::Unavailable)134			}135		}136	}137}
modifiedruntime/common/config/pallets/mod.rsdiffbeforeafterboth
--- a/runtime/common/config/pallets/mod.rs
+++ b/runtime/common/config/pallets/mod.rs
@@ -23,7 +23,7 @@
 		weights::CommonWeights,
 		RelayChainBlockNumberProvider,
 	},
-	Runtime, RuntimeEvent, RuntimeCall, RuntimeOrigin, Balances, Preimage,
+	Runtime, RuntimeEvent, RuntimeCall, RuntimeOrigin, Balances,
 };
 use frame_support::traits::{ConstU32, ConstU64};
 use up_common::{
@@ -47,8 +47,7 @@
 #[cfg(feature = "collator-selection")]
 pub mod collator_selection;
 
-// todo:governance replace the feature with governance
-#[cfg(feature = "collator-selection")]
+#[cfg(feature = "governance")]
 pub mod governance;
 
 parameter_types! {
@@ -129,6 +128,9 @@
 	type RuntimeEvent = RuntimeEvent;
 	type RuntimeOrigin = RuntimeOrigin;
 	type RuntimeCall = RuntimeCall;
-	type Preimages = Preimage;
+	#[cfg(feature = "governance")]
+	type Preimages = crate::Preimage;
+	#[cfg(not(feature = "governance"))]
+	type Preimages = ();
 	type WeightInfo = pallet_maintenance::weights::SubstrateWeight<Self>;
 }
modifiedruntime/common/construct_runtime.rsdiffbeforeafterboth
--- a/runtime/common/construct_runtime.rs
+++ b/runtime/common/construct_runtime.rs
@@ -56,8 +56,7 @@
                 #[cfg(feature = "collator-selection")]
                 Identity: pallet_identity::{Pallet, Call, Storage, Event<T>} = 40,
 
-                // todo:governance switch feature to governance
-                #[cfg(feature = "collator-selection")]
+                #[cfg(feature = "governance")]
                 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,8 +86,7 @@
 				| RuntimeCall::Session(_)
 				| RuntimeCall::Identity(_) => Err(TransactionValidityError::Invalid(InvalidTransaction::Call)),
 
-				// todo:governance switch the feature to governance
-				#[cfg(feature = "collator-selection")]
+				#[cfg(feature = "governance")]
 				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,8 +565,7 @@
                     #[cfg(feature = "collator-selection")]
                     list_benchmark!(list, extra, pallet_identity, Identity);
 
-                    // todo:governance switch feature to governance
-                    #[cfg(feature = "collator-selection")]
+                    #[cfg(feature = "governance")]
                     list_benchmark!(list, extra, pallet_preimage, Preimage);
 
                     #[cfg(feature = "foreign-assets")]
@@ -633,8 +632,7 @@
                     #[cfg(feature = "collator-selection")]
                     add_benchmark!(params, batches, pallet_identity, Identity);
 
-                    // todo:governance switch feature to governance
-                    #[cfg(feature = "collator-selection")]
+                    #[cfg(feature = "governance")]
                     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', 'pallet-test-utils', 'refungible']
+opal-runtime = ['app-promotion', 'collator-selection', 'foreign-assets', 'governance', 'pallet-test-utils', 'refungible']
 pov-estimate = []
 runtime-benchmarks = [
 	'cumulus-pallet-parachain-system/runtime-benchmarks',
@@ -191,6 +191,7 @@
 app-promotion = []
 collator-selection = []
 foreign-assets = []
+governance = []
 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', 'refungible']
+quartz-runtime = ['app-promotion', 'collator-selection', 'foreign-assets', 'governance', 'refungible']
 runtime-benchmarks = [
 	'cumulus-pallet-parachain-system/runtime-benchmarks',
 	'frame-benchmarking',
@@ -184,6 +184,7 @@
 app-promotion = []
 collator-selection = []
 foreign-assets = []
+governance = []
 refungible = []
 scheduler = []
modifiedruntime/unique/Cargo.tomldiffbeforeafterboth
--- a/runtime/unique/Cargo.toml
+++ b/runtime/unique/Cargo.toml
@@ -183,6 +183,7 @@
 app-promotion = []
 collator-selection = []
 foreign-assets = []
+governance = []
 refungible = []
 scheduler = []