difftreelog
Merge branch 'develop' into tests/increase_timeout
in: master
3 files changed
pallets/unique/src/eth/mod.rsdiffbeforeafterboth--- a/pallets/unique/src/eth/mod.rs
+++ b/pallets/unique/src/eth/mod.rs
@@ -23,10 +23,7 @@
use crate::Pallet;
use pallet_common::{
- CollectionById,
- dispatch::CollectionDispatch,
- erc::{static_property::key, CollectionHelpersEvents},
- Pallet as PalletCommon,
+ CollectionById, dispatch::CollectionDispatch, erc::static_property::key, Pallet as PalletCommon,
};
use pallet_evm::{account::CrossAccountId, OnMethodCall, PrecompileHandle, PrecompileResult};
use pallet_evm_coder_substrate::{dispatch_to_evm, SubstrateRecorder, WithRecorder};
runtime/common/config/pallets/scheduler.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/>.1617use frame_support::{18 traits::{PrivilegeCmp, EnsureOrigin},19 weights::Weight,20 parameter_types,21};22use frame_system::{EnsureRoot, RawOrigin};23use sp_runtime::Perbill;24use core::cmp::Ordering;25use codec::Decode;26use crate::{27 runtime_common::{scheduler::SchedulerPaymentExecutor, config::substrate::RuntimeBlockWeights},28 Runtime, RuntimeCall, RuntimeEvent, RuntimeOrigin, OriginCaller,29};30use pallet_unique_scheduler::ScheduledEnsureOriginSuccess;31use up_common::types::AccountId;3233parameter_types! {34 pub MaximumSchedulerWeight: Weight = Perbill::from_percent(50) *35 RuntimeBlockWeights::get().max_block;36 pub const MaxScheduledPerBlock: u32 = 50;3738 pub const NoPreimagePostponement: Option<u32> = Some(10);39 pub const Preimage: Option<u32> = Some(10);40}4142pub struct EnsureSignedOrRoot<AccountId>(sp_std::marker::PhantomData<AccountId>);43impl<O: Into<Result<RawOrigin<AccountId>, O>> + From<RawOrigin<AccountId>>, AccountId: Decode>44 EnsureOrigin<O> for EnsureSignedOrRoot<AccountId>45{46 type Success = ScheduledEnsureOriginSuccess<AccountId>;47 fn try_origin(o: O) -> Result<Self::Success, O> {48 o.into().and_then(|o| match o {49 RawOrigin::Root => Ok(ScheduledEnsureOriginSuccess::Root),50 RawOrigin::Signed(who) => Ok(ScheduledEnsureOriginSuccess::Signed(who)),51 r => Err(O::from(r)),52 })53 }54}5556pub struct EqualOrRootOnly;57impl PrivilegeCmp<OriginCaller> for EqualOrRootOnly {58 fn cmp_privilege(left: &OriginCaller, right: &OriginCaller) -> Option<Ordering> {59 use RawOrigin::*;6061 let left = left.clone().try_into().ok()?;62 let right = right.clone().try_into().ok()?;6364 match (left, right) {65 (Root, Root) => Some(Ordering::Equal),66 (Root, _) => Some(Ordering::Greater),67 (_, Root) => Some(Ordering::Less),68 lr @ _ => (lr.0 == lr.1).then(|| Ordering::Equal),69 }70 }71}7273impl pallet_unique_scheduler::Config for Runtime {74 type RuntimeEvent = RuntimeEvent;75 type RuntimeOrigin = RuntimeOrigin;76 type Currency = Balances;77 type PalletsOrigin = OriginCaller;78 type RuntimeCall = RuntimeCall;79 type MaximumWeight = MaximumSchedulerWeight;80 type ScheduleOrigin = EnsureSignedOrRoot<AccountId>;81 type PrioritySetOrigin = EnsureRoot<AccountId>;82 type MaxScheduledPerBlock = MaxScheduledPerBlock;83 type WeightInfo = ();84 type CallExecutor = SchedulerPaymentExecutor;85 type OriginPrivilegeCmp = EqualOrRootOnly;86 type PreimageProvider = ();87 type NoPreimagePostponement = NoPreimagePostponement;88}runtime/common/scheduler.rsdiffbeforeafterboth--- a/runtime/common/scheduler.rs
+++ b/runtime/common/scheduler.rs
@@ -14,16 +14,19 @@
// 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::dispatch::{GetDispatchInfo, PostDispatchInfo, DispatchInfo};
+use frame_support::{
+ traits::NamedReservableCurrency,
+ dispatch::{GetDispatchInfo, PostDispatchInfo, DispatchInfo},
+};
use sp_runtime::{
traits::{Dispatchable, Applyable, Member},
generic::Era,
transaction_validity::TransactionValidityError,
- DispatchErrorWithPostInfo,
+ DispatchErrorWithPostInfo, DispatchError,
};
use codec::Encode;
-use crate::{Runtime, RuntimeCall, RuntimeOrigin};
-use up_common::types::AccountId;
+use crate::{Runtime, RuntimeCall, RuntimeOrigin, Balances};
+use up_common::types::{AccountId, Balance};
use fp_self_contained::SelfContainedCall;
use pallet_unique_scheduler::DispatchCall;
use pallet_transaction_payment::ChargeTransactionPayment;