difftreelog
fix scheduler config/dispatch_call
in: master
2 files changed
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::{traits::EqualPrivilegeOnly, weights::Weight, parameter_types};18use frame_system::EnsureSigned;19use sp_runtime::Perbill;20use crate::{21 runtime_common::{scheduler::SchedulerPaymentExecutor, config::substrate::RuntimeBlockWeights},22 Runtime, Call, Event, Origin, OriginCaller, Balances,23};24use up_common::types::AccountId;2526parameter_types! {27 pub MaximumSchedulerWeight: Weight = Perbill::from_percent(50) *28 RuntimeBlockWeights::get().max_block;29 pub const MaxScheduledPerBlock: u32 = 50;3031 pub const NoPreimagePostponement: Option<u32> = Some(10);32 pub const Preimage: Option<u32> = Some(10);33}3435impl pallet_unique_scheduler::Config for Runtime {36 type RuntimeEvent = RuntimeEvent;37 type RuntimeOrigin = RuntimeOrigin;38 type Currency = Balances;39 type PalletsOrigin = OriginCaller;40 type RuntimeCall = RuntimeCall;41 type MaximumWeight = MaximumSchedulerWeight;42 type ScheduleOrigin = EnsureSigned<AccountId>;43 type MaxScheduledPerBlock = MaxScheduledPerBlock;44 type WeightInfo = ();45 type CallExecutor = SchedulerPaymentExecutor;46 type OriginPrivilegeCmp = EqualPrivilegeOnly;47 type PreimageProvider = ();48 type NoPreimagePostponement = NoPreimagePostponement;49}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/>.1617use frame_support::{traits::{PrivilegeCmp, EnsureOrigin}, weights::Weight, parameter_types};18use frame_system::{EnsureRoot, RawOrigin};19use sp_runtime::Perbill;20use core::cmp::Ordering;21use codec::Decode;22use crate::{23 runtime_common::{scheduler::SchedulerPaymentExecutor, config::substrate::RuntimeBlockWeights},24 Runtime, Call, Event, Origin, OriginCaller, Balances,25};26use pallet_unique_scheduler::ScheduledEnsureOriginSuccess;27use up_common::types::AccountId;2829parameter_types! {30 pub MaximumSchedulerWeight: Weight = Perbill::from_percent(50) *31 RuntimeBlockWeights::get().max_block;32 pub const MaxScheduledPerBlock: u32 = 50;3334 pub const NoPreimagePostponement: Option<u32> = Some(10);35 pub const Preimage: Option<u32> = Some(10);36}3738pub struct EnsureSignedOrRoot<AccountId>(sp_std::marker::PhantomData<AccountId>);39impl<O: Into<Result<RawOrigin<AccountId>, O>> + From<RawOrigin<AccountId>>, AccountId: Decode>40 EnsureOrigin<O> for EnsureSignedOrRoot<AccountId> {41 type Success = ScheduledEnsureOriginSuccess<AccountId>;42 fn try_origin(o: O) -> Result<Self::Success, O> {43 o.into().and_then(|o| match o {44 RawOrigin::Root => Ok(ScheduledEnsureOriginSuccess::Root),45 RawOrigin::Signed(who) => Ok(ScheduledEnsureOriginSuccess::Signed(who)),46 r => Err(O::from(r)),47 })48 }49}5051pub struct EqualOrRootOnly;52impl PrivilegeCmp<OriginCaller> for EqualOrRootOnly {53 fn cmp_privilege(left: &OriginCaller, right: &OriginCaller) -> Option<Ordering> {54 use RawOrigin::*;5556 let left = left.clone().try_into().ok()?;57 let right = right.clone().try_into().ok()?;5859 match (left, right) {60 (Root, Root) => Some(Ordering::Equal),61 (Root, _) => Some(Ordering::Greater),62 (_, Root) => Some(Ordering::Less),63 lr @ _ => (lr.0 == lr.1).then(|| Ordering::Equal)64 }65 }66}6768impl pallet_unique_scheduler::Config for Runtime {69 type RuntimeEvent = RuntimeEvent;70 type RuntimeOrigin = RuntimeOrigin;71 type Currency = Balances;72 type PalletsOrigin = OriginCaller;73 type RuntimeCall = RuntimeCall;74 type MaximumWeight = MaximumSchedulerWeight;75 type ScheduleOrigin = EnsureSignedOrRoot<AccountId>;76 type PrioritySetOrigin = EnsureRoot<AccountId>;77 type MaxScheduledPerBlock = MaxScheduledPerBlock;78 type WeightInfo = ();79 type CallExecutor = SchedulerPaymentExecutor;80 type OriginPrivilegeCmp = EqualOrRootOnly;81 type PreimageProvider = ();82 type NoPreimagePostponement = NoPreimagePostponement;83}runtime/common/scheduler.rsdiffbeforeafterboth--- a/runtime/common/scheduler.rs
+++ b/runtime/common/scheduler.rs
@@ -74,7 +74,7 @@
sp_runtime::AccountId32: From<<T as frame_system::Config>::AccountId>,
{
fn dispatch_call(
- signer: <T as frame_system::Config>::AccountId,
+ signer: Option<<T as frame_system::Config>::AccountId>,
call: <T as pallet_unique_scheduler::Config>::Call,
) -> Result<
Result<PostDispatchInfo, DispatchErrorWithPostInfo<PostDispatchInfo>>,
@@ -82,17 +82,19 @@
> {
let dispatch_info = call.get_dispatch_info();
let len = call.encoded_size();
+
+ let signed = match signer {
+ Some(signer) => fp_self_contained::CheckedSignature::Signed(signer.clone().into(), get_signed_extras(signer.into())),
+ None => fp_self_contained::CheckedSignature::Unsigned,
+ };
+
let extrinsic = fp_self_contained::CheckedExtrinsic::<
AccountId,
Call,
SignedExtraScheduler,
SelfContainedSignedInfo,
> {
- signed: fp_self_contained::CheckedSignature::<
- AccountId,
- SignedExtraScheduler,
- SelfContainedSignedInfo,
- >::Signed(signer.clone().into(), get_signed_extras(signer.into())),
+ signed,
function: call.into(),
};