difftreelog
refactor(preimage) switch governance feature to preimage
in: master
12 files changed
pallets/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)
pallets/maintenance/src/lib.rsdiffbeforeafterboth1// 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}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::{dispatch::*, pallet_prelude::*};29 use frame_support::{30 traits::{QueryPreimage, StorePreimage},31 };32 use frame_system::pallet_prelude::*;33 use sp_core::H256;3435 use crate::weights::WeightInfo;3637 #[pallet::config]38 pub trait Config: frame_system::Config {39 /// The overarching event type.40 type RuntimeEvent: From<Event<Self>> + IsType<<Self as frame_system::Config>::RuntimeEvent>;4142 /// The runtime origin type.43 type RuntimeOrigin: From<RawOrigin<Self::AccountId>>44 + IsType<<Self as frame_system::Config>::RuntimeOrigin>;4546 /// The aggregated call type.47 type RuntimeCall: Parameter48 + Dispatchable<49 RuntimeOrigin = <Self as Config>::RuntimeOrigin,50 PostInfo = PostDispatchInfo,51 > + GetDispatchInfo52 + From<frame_system::Call<Self>>;5354 /// The preimage provider with which we look up call hashes to get the call.55 type Preimages: QueryPreimage + StorePreimage;5657 /// Weight information for extrinsics in this pallet.58 type WeightInfo: WeightInfo;59 }6061 #[pallet::event]62 #[pallet::generate_deposit(pub(super) fn deposit_event)]63 pub enum Event<T: Config> {64 MaintenanceEnabled,65 MaintenanceDisabled,66 }6768 #[pallet::pallet]69 #[pallet::generate_store(pub(super) trait Store)]70 pub struct Pallet<T>(_);7172 #[pallet::storage]73 #[pallet::getter(fn is_enabled)]74 pub type Enabled<T> = StorageValue<_, bool, ValueQuery>;7576 #[pallet::error]77 pub enum Error<T> {}7879 #[pallet::call]80 impl<T: Config> Pallet<T> {81 #[pallet::call_index(0)]82 #[pallet::weight(<T as Config>::WeightInfo::enable())]83 pub fn enable(origin: OriginFor<T>) -> DispatchResult {84 ensure_root(origin)?;8586 <Enabled<T>>::set(true);8788 Self::deposit_event(Event::MaintenanceEnabled);8990 Ok(())91 }9293 #[pallet::call_index(1)]94 #[pallet::weight(<T as Config>::WeightInfo::disable())]95 pub fn disable(origin: OriginFor<T>) -> DispatchResult {96 ensure_root(origin)?;9798 <Enabled<T>>::set(false);99100 Self::deposit_event(Event::MaintenanceDisabled);101102 Ok(())103 }104105 #[pallet::call_index(2)]106 #[pallet::weight(<T as Config>::WeightInfo::execute_preimage())]107 pub fn execute_preimage(_origin: OriginFor<T>, _hash: H256) -> DispatchResult {108 #[cfg(feature = "preimage")]109 {110 let origin = _origin;111 let hash = _hash;112113 ensure_root(origin)?;114115 let len = T::Preimages::len(&hash).ok_or(DispatchError::Unavailable)?;116 let bounded = T::Preimages::pick::<<T as Config>::RuntimeCall>(hash, len);117 let (call, _) =118 T::Preimages::realize(&bounded).map_err(|_| DispatchError::Unavailable)?;119120 let result = match call.dispatch(frame_system::RawOrigin::Root.into()) {121 Ok(_) => Ok(()),122 Err(error_and_info) => Err(error_and_info.error),123 };124125 result126 }127128 #[cfg(not(feature = "preimage"))]129 {130 Err(DispatchError::Unavailable)131 }132 }133 }134}runtime/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;
-}
runtime/common/config/pallets/mod.rsdiffbeforeafterboth--- a/runtime/common/config/pallets/mod.rs
+++ b/runtime/common/config/pallets/mod.rs
@@ -47,8 +47,8 @@
#[cfg(feature = "collator-selection")]
pub mod collator_selection;
-#[cfg(feature = "governance")]
-pub mod governance;
+#[cfg(feature = "preimage")]
+pub mod preimage;
parameter_types! {
pub TreasuryAccountId: AccountId = TreasuryModuleId::get().into_account_truncating();
@@ -128,9 +128,9 @@
type RuntimeEvent = RuntimeEvent;
type RuntimeOrigin = RuntimeOrigin;
type RuntimeCall = RuntimeCall;
- #[cfg(feature = "governance")]
+ #[cfg(feature = "preimage")]
type Preimages = crate::Preimage;
- #[cfg(not(feature = "governance"))]
+ #[cfg(not(feature = "preimage"))]
type Preimages = ();
type WeightInfo = pallet_maintenance::weights::SubstrateWeight<Self>;
}
runtime/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;
+}
runtime/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.
runtime/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")]
runtime/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")]
runtime/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 = []
runtime/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 = []
runtime/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 = []
tests/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