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.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)
}
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.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#[macro_export]18macro_rules! construct_runtime {19 () => {20 frame_support::construct_runtime! {2122 pub enum Runtime where23 Block = Block,24 NodeBlock = opaque::Block,25 UncheckedExtrinsic = UncheckedExtrinsic26 {27 System: frame_system = 0,2829 ParachainSystem: cumulus_pallet_parachain_system::{Pallet, Call, Config, Storage, Inherent, Event<T>, ValidateUnsigned} = 20,30 ParachainInfo: parachain_info::{Pallet, Storage, Config} = 21,3132 #[cfg(feature = "collator-selection")]33 Authorship: pallet_authorship::{Pallet, Call, Storage} = 22,3435 #[cfg(feature = "collator-selection")]36 CollatorSelection: pallet_collator_selection::{Pallet, Call, Storage, Event<T>, Config<T>} = 23,3738 #[cfg(feature = "collator-selection")]39 Session: pallet_session::{Pallet, Call, Storage, Event, Config<T>} = 24,4041 Aura: pallet_aura::{Pallet, Config<T>} = 25,42 AuraExt: cumulus_pallet_aura_ext::{Pallet, Config} = 26,4344 Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>} = 30,45 RandomnessCollectiveFlip: pallet_randomness_collective_flip::{Pallet, Storage} = 31,46 Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent} = 32,47 TransactionPayment: pallet_transaction_payment::{Pallet, Storage, Event<T>} = 33,48 Treasury: pallet_treasury::{Pallet, Call, Storage, Config, Event<T>} = 34,49 Sudo: pallet_sudo::{Pallet, Call, Storage, Config<T>, Event<T>} = 35,50 Vesting: orml_vesting::{Pallet, Storage, Call, Event<T>, Config<T>} = 37,5152 XTokens: orml_xtokens = 38,53 Tokens: orml_tokens = 39,54 // Contracts: pallet_contracts::{Pallet, Call, Storage, Event<T>} = 38,5556 #[cfg(feature = "collator-selection")]57 Identity: pallet_identity::{Pallet, Call, Storage, Event<T>} = 40,5859 #[cfg(feature = "governance")]60 Preimage: pallet_preimage::{Pallet, Call, Storage, Event<T>} = 41,6162 // XCM helpers.63 XcmpQueue: cumulus_pallet_xcmp_queue::{Pallet, Call, Storage, Event<T>} = 50,64 PolkadotXcm: pallet_xcm::{Pallet, Call, Event<T>, Origin} = 51,65 CumulusXcm: cumulus_pallet_xcm::{Pallet, Call, Event<T>, Origin} = 52,66 DmpQueue: cumulus_pallet_dmp_queue::{Pallet, Call, Storage, Event<T>} = 53,6768 // Unique Pallets69 Inflation: pallet_inflation::{Pallet, Call, Storage} = 60,70 Unique: pallet_unique::{Pallet, Call, Storage} = 61,7172 // #[cfg(feature = "scheduler")]73 // Scheduler: pallet_unique_scheduler_v2::{Pallet, Call, Storage, Event<T>} = 62,7475 Configuration: pallet_configuration::{Pallet, Call, Storage, Event<T>} = 63,7677 Charging: pallet_charge_transaction::{Pallet, Call, Storage } = 64,78 // ContractHelpers: pallet_contract_helpers::{Pallet, Call, Storage} = 65,79 Common: pallet_common::{Pallet, Storage, Event<T>} = 66,80 Fungible: pallet_fungible::{Pallet, Storage} = 67,8182 #[cfg(feature = "refungible")]83 Refungible: pallet_refungible::{Pallet, Storage} = 68,8485 Nonfungible: pallet_nonfungible::{Pallet, Storage} = 69,86 Structure: pallet_structure::{Pallet, Call, Storage, Event<T>} = 70,8788 // RmrkCore: pallet_proxy_rmrk_core::{Pallet, Call, Storage, Event<T>} = 71,8990 // RmrkEquip: pallet_proxy_rmrk_equip::{Pallet, Call, Storage, Event<T>} = 72,9192 #[cfg(feature = "app-promotion")]93 AppPromotion: pallet_app_promotion::{Pallet, Call, Storage, Event<T>} = 73,9495 #[cfg(feature = "foreign-assets")]96 ForeignAssets: pallet_foreign_assets::{Pallet, Call, Storage, Event<T>} = 80,9798 // Frontier99 EVM: pallet_evm::{Pallet, Config, Call, Storage, Event<T>} = 100,100 Ethereum: pallet_ethereum::{Pallet, Config, Call, Storage, Event, Origin} = 101,101102 EvmCoderSubstrate: pallet_evm_coder_substrate::{Pallet, Storage} = 150,103 EvmContractHelpers: pallet_evm_contract_helpers::{Pallet, Storage, Event<T>} = 151,104 EvmTransactionPayment: pallet_evm_transaction_payment::{Pallet} = 152,105 EvmMigration: pallet_evm_migration::{Pallet, Call, Storage, Event<T>} = 153,106107 Maintenance: pallet_maintenance::{Pallet, Call, Storage, Event<T>} = 154,108109 #[cfg(feature = "pallet-test-utils")]110 TestUtils: pallet_test_utils = 255,111 }112 }113 }114}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#[macro_export]18macro_rules! construct_runtime {19 () => {20 frame_support::construct_runtime! {2122 pub enum Runtime where23 Block = Block,24 NodeBlock = opaque::Block,25 UncheckedExtrinsic = UncheckedExtrinsic26 {27 System: frame_system = 0,2829 ParachainSystem: cumulus_pallet_parachain_system::{Pallet, Call, Config, Storage, Inherent, Event<T>, ValidateUnsigned} = 20,30 ParachainInfo: parachain_info::{Pallet, Storage, Config} = 21,3132 #[cfg(feature = "collator-selection")]33 Authorship: pallet_authorship::{Pallet, Call, Storage} = 22,3435 #[cfg(feature = "collator-selection")]36 CollatorSelection: pallet_collator_selection::{Pallet, Call, Storage, Event<T>, Config<T>} = 23,3738 #[cfg(feature = "collator-selection")]39 Session: pallet_session::{Pallet, Call, Storage, Event, Config<T>} = 24,4041 Aura: pallet_aura::{Pallet, Config<T>} = 25,42 AuraExt: cumulus_pallet_aura_ext::{Pallet, Config} = 26,4344 Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>} = 30,45 RandomnessCollectiveFlip: pallet_randomness_collective_flip::{Pallet, Storage} = 31,46 Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent} = 32,47 TransactionPayment: pallet_transaction_payment::{Pallet, Storage, Event<T>} = 33,48 Treasury: pallet_treasury::{Pallet, Call, Storage, Config, Event<T>} = 34,49 Sudo: pallet_sudo::{Pallet, Call, Storage, Config<T>, Event<T>} = 35,50 Vesting: orml_vesting::{Pallet, Storage, Call, Event<T>, Config<T>} = 37,5152 XTokens: orml_xtokens = 38,53 Tokens: orml_tokens = 39,54 // Contracts: pallet_contracts::{Pallet, Call, Storage, Event<T>} = 38,5556 #[cfg(feature = "collator-selection")]57 Identity: pallet_identity::{Pallet, Call, Storage, Event<T>} = 40,5859 #[cfg(feature = "preimage")]60 Preimage: pallet_preimage::{Pallet, Call, Storage, Event<T>} = 41,6162 // XCM helpers.63 XcmpQueue: cumulus_pallet_xcmp_queue::{Pallet, Call, Storage, Event<T>} = 50,64 PolkadotXcm: pallet_xcm::{Pallet, Call, Event<T>, Origin} = 51,65 CumulusXcm: cumulus_pallet_xcm::{Pallet, Call, Event<T>, Origin} = 52,66 DmpQueue: cumulus_pallet_dmp_queue::{Pallet, Call, Storage, Event<T>} = 53,6768 // Unique Pallets69 Inflation: pallet_inflation::{Pallet, Call, Storage} = 60,70 Unique: pallet_unique::{Pallet, Call, Storage} = 61,7172 // #[cfg(feature = "scheduler")]73 // Scheduler: pallet_unique_scheduler_v2::{Pallet, Call, Storage, Event<T>} = 62,7475 Configuration: pallet_configuration::{Pallet, Call, Storage, Event<T>} = 63,7677 Charging: pallet_charge_transaction::{Pallet, Call, Storage } = 64,78 // ContractHelpers: pallet_contract_helpers::{Pallet, Call, Storage} = 65,79 Common: pallet_common::{Pallet, Storage, Event<T>} = 66,80 Fungible: pallet_fungible::{Pallet, Storage} = 67,8182 #[cfg(feature = "refungible")]83 Refungible: pallet_refungible::{Pallet, Storage} = 68,8485 Nonfungible: pallet_nonfungible::{Pallet, Storage} = 69,86 Structure: pallet_structure::{Pallet, Call, Storage, Event<T>} = 70,8788 // RmrkCore: pallet_proxy_rmrk_core::{Pallet, Call, Storage, Event<T>} = 71,8990 // RmrkEquip: pallet_proxy_rmrk_equip::{Pallet, Call, Storage, Event<T>} = 72,9192 #[cfg(feature = "app-promotion")]93 AppPromotion: pallet_app_promotion::{Pallet, Call, Storage, Event<T>} = 73,9495 #[cfg(feature = "foreign-assets")]96 ForeignAssets: pallet_foreign_assets::{Pallet, Call, Storage, Event<T>} = 80,9798 // Frontier99 EVM: pallet_evm::{Pallet, Config, Call, Storage, Event<T>} = 100,100 Ethereum: pallet_ethereum::{Pallet, Config, Call, Storage, Event, Origin} = 101,101102 EvmCoderSubstrate: pallet_evm_coder_substrate::{Pallet, Storage} = 150,103 EvmContractHelpers: pallet_evm_contract_helpers::{Pallet, Storage, Event<T>} = 151,104 EvmTransactionPayment: pallet_evm_transaction_payment::{Pallet} = 152,105 EvmMigration: pallet_evm_migration::{Pallet, Call, Storage, Event<T>} = 153,106107 Maintenance: pallet_maintenance::{Pallet, Call, Storage, Event<T>} = 154,108109 #[cfg(feature = "pallet-test-utils")]110 TestUtils: pallet_test_utils = 255,111 }112 }113 }114}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