difftreelog
fix(preimage) maintenance not working with quantum preimage (due to runtimes)
in: master
9 files changed
pallets/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)
pallets/maintenance/src/lib.rsdiffbeforeafterboth--- a/pallets/maintenance/src/lib.rs
+++ b/pallets/maintenance/src/lib.rs
@@ -28,6 +28,8 @@
use frame_support::{
dispatch::*,
pallet_prelude::*,
+ };
+ use frame_support::{
traits::{QueryPreimage, StorePreimage},
};
use frame_system::pallet_prelude::*;
@@ -105,20 +107,31 @@
#[pallet::call_index(2)]
#[pallet::weight(<T as Config>::WeightInfo::execute_preimage())]
- pub fn execute_preimage(origin: OriginFor<T>, hash: H256) -> DispatchResult {
- ensure_root(origin)?;
+ pub fn execute_preimage(_origin: OriginFor<T>, _hash: H256) -> DispatchResult {
+ #[cfg(feature = "governance")]
+ {
+ let origin = _origin;
+ let hash = _hash;
+
+ ensure_root(origin)?;
- let len = T::Preimages::len(&hash).ok_or(DispatchError::Unavailable)?;
- let bounded = T::Preimages::pick::<<T as Config>::RuntimeCall>(hash, len);
- let (call, _) =
- T::Preimages::realize(&bounded).map_err(|_| DispatchError::Unavailable)?;
+ let len = T::Preimages::len(&hash).ok_or(DispatchError::Unavailable)?;
+ let bounded = T::Preimages::pick::<<T as Config>::RuntimeCall>(hash, len);
+ let (call, _) =
+ T::Preimages::realize(&bounded).map_err(|_| DispatchError::Unavailable)?;
- let result = match call.dispatch(frame_system::RawOrigin::Root.into()) {
- Ok(_) => Ok(()),
- Err(error_and_info) => Err(error_and_info.error),
- };
+ let result = match call.dispatch(frame_system::RawOrigin::Root.into()) {
+ Ok(_) => Ok(()),
+ Err(error_and_info) => Err(error_and_info.error),
+ };
- result
+ result
+ }
+
+ #[cfg(not(feature = "governance"))]
+ {
+ Err(DispatchError::Unavailable)
+ }
}
}
}
runtime/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>;
}
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 // todo:governance switch feature to governance60 #[cfg(feature = "collator-selection")]61 Preimage: pallet_preimage::{Pallet, Call, Storage, Event<T>} = 41,6263 // XCM helpers.64 XcmpQueue: cumulus_pallet_xcmp_queue::{Pallet, Call, Storage, Event<T>} = 50,65 PolkadotXcm: pallet_xcm::{Pallet, Call, Event<T>, Origin} = 51,66 CumulusXcm: cumulus_pallet_xcm::{Pallet, Call, Event<T>, Origin} = 52,67 DmpQueue: cumulus_pallet_dmp_queue::{Pallet, Call, Storage, Event<T>} = 53,6869 // Unique Pallets70 Inflation: pallet_inflation::{Pallet, Call, Storage} = 60,71 Unique: pallet_unique::{Pallet, Call, Storage} = 61,7273 // #[cfg(feature = "scheduler")]74 // Scheduler: pallet_unique_scheduler_v2::{Pallet, Call, Storage, Event<T>} = 62,7576 Configuration: pallet_configuration::{Pallet, Call, Storage, Event<T>} = 63,7778 Charging: pallet_charge_transaction::{Pallet, Call, Storage } = 64,79 // ContractHelpers: pallet_contract_helpers::{Pallet, Call, Storage} = 65,80 Common: pallet_common::{Pallet, Storage, Event<T>} = 66,81 Fungible: pallet_fungible::{Pallet, Storage} = 67,8283 #[cfg(feature = "refungible")]84 Refungible: pallet_refungible::{Pallet, Storage} = 68,8586 Nonfungible: pallet_nonfungible::{Pallet, Storage} = 69,87 Structure: pallet_structure::{Pallet, Call, Storage, Event<T>} = 70,8889 // RmrkCore: pallet_proxy_rmrk_core::{Pallet, Call, Storage, Event<T>} = 71,9091 // RmrkEquip: pallet_proxy_rmrk_equip::{Pallet, Call, Storage, Event<T>} = 72,9293 #[cfg(feature = "app-promotion")]94 AppPromotion: pallet_app_promotion::{Pallet, Call, Storage, Event<T>} = 73,9596 #[cfg(feature = "foreign-assets")]97 ForeignAssets: pallet_foreign_assets::{Pallet, Call, Storage, Event<T>} = 80,9899 // Frontier100 EVM: pallet_evm::{Pallet, Config, Call, Storage, Event<T>} = 100,101 Ethereum: pallet_ethereum::{Pallet, Config, Call, Storage, Event, Origin} = 101,102103 EvmCoderSubstrate: pallet_evm_coder_substrate::{Pallet, Storage} = 150,104 EvmContractHelpers: pallet_evm_contract_helpers::{Pallet, Storage, Event<T>} = 151,105 EvmTransactionPayment: pallet_evm_transaction_payment::{Pallet} = 152,106 EvmMigration: pallet_evm_migration::{Pallet, Call, Storage, Event<T>} = 153,107108 Maintenance: pallet_maintenance::{Pallet, Call, Storage, Event<T>} = 154,109110 #[cfg(feature = "pallet-test-utils")]111 TestUtils: pallet_test_utils = 255,112 }113 }114 }115}runtime/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")]
runtime/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")]
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', '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 = []
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', '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 = []
runtime/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 = []