difftreelog
fix scheduler config/dispatch_call
in: master
2 files changed
runtime/common/config/pallets/scheduler.rsdiffbeforeafterboth14// You should have received a copy of the GNU General Public License14// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.161617use frame_support::{traits::EqualPrivilegeOnly, weights::Weight, parameter_types};17use frame_support::{traits::{PrivilegeCmp, EnsureOrigin}, weights::Weight, parameter_types};18use frame_system::EnsureSigned;18use frame_system::{EnsureRoot, RawOrigin};19use sp_runtime::Perbill;19use sp_runtime::Perbill;20use core::cmp::Ordering;21use codec::Decode;20use crate::{22use crate::{21 runtime_common::{scheduler::SchedulerPaymentExecutor, config::substrate::RuntimeBlockWeights},23 runtime_common::{scheduler::SchedulerPaymentExecutor, config::substrate::RuntimeBlockWeights},22 Runtime, Call, Event, Origin, OriginCaller, Balances,24 Runtime, Call, Event, Origin, OriginCaller, Balances,23};25};26use pallet_unique_scheduler::ScheduledEnsureOriginSuccess;24use up_common::types::AccountId;27use up_common::types::AccountId;252826parameter_types! {29parameter_types! {32 pub const Preimage: Option<u32> = Some(10);35 pub const Preimage: Option<u32> = Some(10);33}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}346735impl pallet_unique_scheduler::Config for Runtime {68impl pallet_unique_scheduler::Config for Runtime {36 type RuntimeEvent = RuntimeEvent;69 type RuntimeEvent = RuntimeEvent;39 type PalletsOrigin = OriginCaller;72 type PalletsOrigin = OriginCaller;40 type RuntimeCall = RuntimeCall;73 type RuntimeCall = RuntimeCall;41 type MaximumWeight = MaximumSchedulerWeight;74 type MaximumWeight = MaximumSchedulerWeight;42 type ScheduleOrigin = EnsureSigned<AccountId>;75 type ScheduleOrigin = EnsureSignedOrRoot<AccountId>;76 type PrioritySetOrigin = EnsureRoot<AccountId>;43 type MaxScheduledPerBlock = MaxScheduledPerBlock;77 type MaxScheduledPerBlock = MaxScheduledPerBlock;44 type WeightInfo = ();78 type WeightInfo = ();45 type CallExecutor = SchedulerPaymentExecutor;79 type CallExecutor = SchedulerPaymentExecutor;46 type OriginPrivilegeCmp = EqualPrivilegeOnly;80 type OriginPrivilegeCmp = EqualOrRootOnly;47 type PreimageProvider = ();81 type PreimageProvider = ();48 type NoPreimagePostponement = NoPreimagePostponement;82 type NoPreimagePostponement = NoPreimagePostponement;49}83}runtime/common/scheduler.rsdiffbeforeafterboth74 sp_runtime::AccountId32: From<<T as frame_system::Config>::AccountId>,74 sp_runtime::AccountId32: From<<T as frame_system::Config>::AccountId>,75{75{76 fn dispatch_call(76 fn dispatch_call(77 signer: <T as frame_system::Config>::AccountId,77 signer: Option<<T as frame_system::Config>::AccountId>,78 call: <T as pallet_unique_scheduler::Config>::Call,78 call: <T as pallet_unique_scheduler::Config>::Call,79 ) -> Result<79 ) -> Result<80 Result<PostDispatchInfo, DispatchErrorWithPostInfo<PostDispatchInfo>>,80 Result<PostDispatchInfo, DispatchErrorWithPostInfo<PostDispatchInfo>>,81 TransactionValidityError,81 TransactionValidityError,82 > {82 > {83 let dispatch_info = call.get_dispatch_info();83 let dispatch_info = call.get_dispatch_info();84 let len = call.encoded_size();84 let len = call.encoded_size();8585 let extrinsic = fp_self_contained::CheckedExtrinsic::<86 let signed = match signer {86 AccountId,87 Call,88 SignedExtraScheduler,89 SelfContainedSignedInfo,90 > {91 signed: fp_self_contained::CheckedSignature::<87 Some(signer) => fp_self_contained::CheckedSignature::Signed(signer.clone().into(), get_signed_extras(signer.into())),92 AccountId,88 None => fp_self_contained::CheckedSignature::Unsigned,93 SignedExtraScheduler,94 SelfContainedSignedInfo,95 >::Signed(signer.clone().into(), get_signed_extras(signer.into())),96 function: call.into(),97 };89 };90 91 let extrinsic = fp_self_contained::CheckedExtrinsic::<92 AccountId,93 Call,94 SignedExtraScheduler,95 SelfContainedSignedInfo,96 > {97 signed,98 function: call.into(),99 };9810099 extrinsic.apply::<Runtime>(&dispatch_info, len)101 extrinsic.apply::<Runtime>(&dispatch_info, len)100 }102 }