git.delta.rocks / unique-network / refs/commits / c1d4e9108a7d

difftreelog

Missed tests was added. Scheduler pallet renamed.

Dev2022-06-09parent: #c6fcdce.patch.diff
in: master

13 files changed

modifiedMakefilediffbeforeafterboth
--- a/Makefile
+++ b/Makefile
@@ -103,7 +103,7 @@
 
 .PHONY: bench-scheduler
 bench-scheduler:
-	make _bench2 PALLET=unq-scheduler PALLET_DIR=scheduler
+	make _bench2 PALLET=unique-scheduler PALLET_DIR=scheduler
 
 .PHONY: bench
 bench: bench-evm-migration bench-unique bench-structure bench-fungible bench-refungible bench-nonfungible bench-scheduler
modifiedpallets/scheduler/Cargo.tomldiffbeforeafterboth
--- a/pallets/scheduler/Cargo.toml
+++ b/pallets/scheduler/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "pallet-unq-scheduler"
+name = "pallet-unique-scheduler"
 version = "0.1.0"
 authors = ["Unique Network <support@uniquenetwork.io>"]
 edition = "2021"
modifiedpallets/scheduler/src/benchmarking.rsdiffbeforeafterboth
--- a/pallets/scheduler/src/benchmarking.rs
+++ b/pallets/scheduler/src/benchmarking.rs
@@ -123,6 +123,18 @@
 		assert!(Agenda::<T>::iter().count() == 0);
 	}
 
+	on_initialize_periodic {
+		let s in 1 .. T::MaxScheduledPerBlock::get();
+		let when = BLOCK_NUMBER.into();
+		fill_schedule::<T>(when, s, true, Some(false))?;
+	}: { Scheduler::<T>::on_initialize(when); }
+	verify {
+		assert_eq!(System::<T>::event_count(), s);
+		for i in 0..s {
+			assert_eq!(Agenda::<T>::get(when + (i + 100).into()).len(), 1 as usize);
+		}
+	}
+
 	on_initialize_periodic_resolved {
 		let s in 1 .. T::MaxScheduledPerBlock::get();
 		let when = BLOCK_NUMBER.into();
@@ -135,6 +147,42 @@
 		}
 	}
 
+	on_initialize_aborted {
+		let s in 1 .. T::MaxScheduledPerBlock::get();
+		let when = BLOCK_NUMBER.into();
+		fill_schedule::<T>(when, s, false, None)?;
+	}: { Scheduler::<T>::on_initialize(BLOCK_NUMBER.into()); }
+	verify {
+		assert_eq!(System::<T>::event_count(), 0);
+	}
+
+	on_initialize_named_aborted {
+		let s in 1 .. T::MaxScheduledPerBlock::get();
+		let when = BLOCK_NUMBER.into();
+		fill_schedule::<T>(when, s, false, Some(false))?;
+	}: { Scheduler::<T>::on_initialize(BLOCK_NUMBER.into()); }
+	verify {
+	}
+
+	on_initialize_named {
+		let s in 1 .. T::MaxScheduledPerBlock::get();
+		let when = BLOCK_NUMBER.into();
+		fill_schedule::<T>(when, s, false, None)?;
+	}: { Scheduler::<T>::on_initialize(BLOCK_NUMBER.into()); }
+	verify {
+		assert_eq!(System::<T>::event_count(), 0);
+	}
+
+	on_initialize {
+		let s in 1 .. T::MaxScheduledPerBlock::get();
+		let when = BLOCK_NUMBER.into();
+		fill_schedule::<T>(when, s, false, Some(false))?;
+	}: { Scheduler::<T>::on_initialize(BLOCK_NUMBER.into()); }
+	verify {
+		assert_eq!(System::<T>::event_count(), s);
+		assert!(Agenda::<T>::iter().count() == 0);
+	}
+
 	on_initialize_resolved {
 		let s in 1 .. T::MaxScheduledPerBlock::get();
 		let when = BLOCK_NUMBER.into();
modifiedpallets/scheduler/src/lib.rsdiffbeforeafterboth
before · pallets/scheduler/src/lib.rs
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// Original license:18// This file is part of Substrate.1920// Copyright (C) 2017-2022 Parity Technologies (UK) Ltd.21// SPDX-License-Identifier: Apache-2.02223// Licensed under the Apache License, Version 2.0 (the "License");24// you may not use this file except in compliance with the License.25// You may obtain a copy of the License at26//27// 	http://www.apache.org/licenses/LICENSE-2.028//29// Unless required by applicable law or agreed to in writing, software30// distributed under the License is distributed on an "AS IS" BASIS,31// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.32// See the License for the specific language governing permissions and33// limitations under the License.3435//! # Schedulerdo_reschedule36//!37//! This Pallet exposes capabilities for scheduling dispatches to occur at a38//! specified block number or at a specified period. These scheduled dispatches39//! may be named or anonymous and may be canceled.40//!41//! **NOTE:** The scheduled calls will be dispatched with the default filter42//! for the origin: namely `frame_system::Config::BaseCallFilter` for all origin43//! except root which will get no filter. And not the filter contained in origin44//! use to call `fn schedule`.45//!46//! If a call is scheduled using proxy or whatever mecanism which adds filter,47//! then those filter will not be used when dispatching the schedule call.48//!49//! ## Interface50//!51//! ### Dispatchable Functions52//!53//! * `schedule` - schedule a dispatch, which may be periodic, to occur at a specified block and54//!   with a specified priority.55//! * `cancel` - cancel a scheduled dispatch, specified by block number and index.56//! * `schedule_named` - augments the `schedule` interface with an additional `Vec<u8>` parameter57//!   that can be used for identification.58//! * `cancel_named` - the named complement to the cancel function.5960// Ensure we're `no_std` when compiling for Wasm.61#![cfg_attr(not(feature = "std"), no_std)]6263#[cfg(feature = "runtime-benchmarks")]64mod benchmarking;6566pub mod weights;6768use sp_core::H160;69use codec::{Codec, Decode, Encode};70use frame_system::{self as system, ensure_signed};71pub use pallet::*;72use scale_info::TypeInfo;73use sp_runtime::{74	traits::{BadOrigin, One, Saturating, Zero},75	RuntimeDebug, DispatchErrorWithPostInfo,76};77use sp_std::{borrow::Borrow, cmp::Ordering, marker::PhantomData, prelude::*};7879use frame_support::{80	dispatch::{DispatchError, DispatchResult, Dispatchable, Parameter},81	traits::{82		schedule::{self, DispatchTime, MaybeHashed},83		NamedReservableCurrency, EnsureOrigin, Get, IsType, OriginTrait, PrivilegeCmp,84		StorageVersion,85	},86	weights::{GetDispatchInfo, Weight},87};8889pub use weights::WeightInfo;9091/// Just a simple index for naming period tasks.92pub type PeriodicIndex = u32;93/// The location of a scheduled task that can be used to remove it.94pub type TaskAddress<BlockNumber> = (BlockNumber, u32);95pub const MAX_TASK_ID_LENGTH_IN_BYTES: u8 = 16;9697type ScheduledId = [u8; MAX_TASK_ID_LENGTH_IN_BYTES as usize];98pub type CallOrHashOf<T> = MaybeHashed<<T as Config>::Call, <T as frame_system::Config>::Hash>;99100/// Information regarding an item to be executed in the future.101#[cfg_attr(any(feature = "std", test), derive(PartialEq, Eq))]102#[derive(Clone, RuntimeDebug, Encode, Decode, TypeInfo)]103pub struct ScheduledV3<Call, BlockNumber, PalletsOrigin, AccountId> {104	/// The unique identity for this task, if there is one.105	maybe_id: Option<ScheduledId>,106	/// This task's priority.107	priority: schedule::Priority,108	/// The call to be dispatched.109	call: Call,110	/// If the call is periodic, then this points to the information concerning that.111	maybe_periodic: Option<schedule::Period<BlockNumber>>,112	/// The origin to dispatch the call.113	origin: PalletsOrigin,114	_phantom: PhantomData<AccountId>,115}116117pub type ScheduledV3Of<T> = ScheduledV3<118	CallOrHashOf<T>,119	<T as frame_system::Config>::BlockNumber,120	<T as Config>::PalletsOrigin,121	<T as frame_system::Config>::AccountId,122>;123124pub type ScheduledOf<T> = ScheduledV3Of<T>;125126/// The current version of Scheduled struct.127pub type Scheduled<Call, BlockNumber, PalletsOrigin, AccountId> =128	ScheduledV3<Call, BlockNumber, PalletsOrigin, AccountId>;129130#[cfg(feature = "runtime-benchmarks")]131mod preimage_provider {132	use frame_support::traits::PreimageRecipient;133	pub trait PreimageProviderAndMaybeRecipient<H>: PreimageRecipient<H> {}134	impl<H, T: PreimageRecipient<H>> PreimageProviderAndMaybeRecipient<H> for T {}135}136137#[cfg(not(feature = "runtime-benchmarks"))]138mod preimage_provider {139	use frame_support::traits::PreimageProvider;140	pub trait PreimageProviderAndMaybeRecipient<H>: PreimageProvider<H> {}141	impl<H, T: PreimageProvider<H>> PreimageProviderAndMaybeRecipient<H> for T {}142}143144pub use preimage_provider::PreimageProviderAndMaybeRecipient;145146pub(crate) trait MarginalWeightInfo: WeightInfo {147	fn item(periodic: bool, named: bool, resolved: Option<bool>) -> Weight {148		match (periodic, named, resolved) {149			(_, false, None) => Self::on_initialize_aborted(2) - Self::on_initialize_aborted(1),150			(_, true, None) => {151				Self::on_initialize_named_aborted(2) - Self::on_initialize_named_aborted(1)152			}153			(false, false, Some(false)) => Self::on_initialize(2) - Self::on_initialize(1),154			(false, true, Some(false)) => {155				Self::on_initialize_named(2) - Self::on_initialize_named(1)156			}157			(true, false, Some(false)) => {158				Self::on_initialize_periodic(2) - Self::on_initialize_periodic(1)159			}160			(true, true, Some(false)) => {161				Self::on_initialize_periodic_named(2) - Self::on_initialize_periodic_named(1)162			}163			(false, false, Some(true)) => {164				Self::on_initialize_resolved(2) - Self::on_initialize_resolved(1)165			}166			(false, true, Some(true)) => {167				Self::on_initialize_named_resolved(2) - Self::on_initialize_named_resolved(1)168			}169			(true, false, Some(true)) => {170				Self::on_initialize_periodic_resolved(2) - Self::on_initialize_periodic_resolved(1)171			}172			(true, true, Some(true)) => {173				Self::on_initialize_periodic_named_resolved(2)174					- Self::on_initialize_periodic_named_resolved(1)175			}176		}177	}178}179impl<T: WeightInfo> MarginalWeightInfo for T {}180181#[frame_support::pallet]182pub mod pallet {183	use super::*;184	use frame_support::{185		dispatch::PostDispatchInfo,186		pallet_prelude::*,187		traits::{schedule::LookupError, PreimageProvider},188	};189	use frame_system::pallet_prelude::*;190191	/// The current storage version.192	const STORAGE_VERSION: StorageVersion = StorageVersion::new(3);193194	#[pallet::pallet]195	#[pallet::generate_store(pub(super) trait Store)]196	#[pallet::storage_version(STORAGE_VERSION)]197	#[pallet::without_storage_info]198	pub struct Pallet<T>(_);199200	/// `system::Config` should always be included in our implied traits.201	#[pallet::config]202	pub trait Config: frame_system::Config {203		/// The overarching event type.204		type Event: From<Event<Self>> + IsType<<Self as frame_system::Config>::Event>;205206		/// The aggregated origin which the dispatch will take.207		type Origin: OriginTrait<PalletsOrigin = Self::PalletsOrigin>208			+ From<Self::PalletsOrigin>209			+ IsType<<Self as system::Config>::Origin>;210211		/// The caller origin, overarching type of all pallets origins.212		type PalletsOrigin: From<system::RawOrigin<Self::AccountId>> + Codec + Clone + Eq + TypeInfo;213214		type Currency: NamedReservableCurrency<Self::AccountId, ReserveIdentifier = ScheduledId>;215216		/// The aggregated call type.217		type Call: Parameter218			+ Dispatchable<Origin = <Self as Config>::Origin, PostInfo = PostDispatchInfo>219			+ GetDispatchInfo220			+ From<system::Call<Self>>;221222		/// The maximum weight that may be scheduled per block for any dispatchables of less223		/// priority than `schedule::HARD_DEADLINE`.224		#[pallet::constant]225		type MaximumWeight: Get<Weight>;226227		/// Required origin to schedule or cancel calls.228		type ScheduleOrigin: EnsureOrigin<<Self as system::Config>::Origin>;229230		/// Compare the privileges of origins.231		///232		/// This will be used when canceling a task, to ensure that the origin that tries233		/// to cancel has greater or equal privileges as the origin that created the scheduled task.234		///235		/// For simplicity the [`EqualPrivilegeOnly`](frame_support::traits::EqualPrivilegeOnly) can236		/// be used. This will only check if two given origins are equal.237		type OriginPrivilegeCmp: PrivilegeCmp<Self::PalletsOrigin>;238239		/// The maximum number of scheduled calls in the queue for a single block.240		/// Not strictly enforced, but used for weight estimation.241		#[pallet::constant]242		type MaxScheduledPerBlock: Get<u32>;243244		/// Weight information for extrinsics in this pallet.245		type WeightInfo: WeightInfo;246247		/// The preimage provider with which we look up call hashes to get the call.248		type PreimageProvider: PreimageProviderAndMaybeRecipient<Self::Hash>;249250		/// If `Some` then the number of blocks to postpone execution for when the item is delayed.251		type NoPreimagePostponement: Get<Option<Self::BlockNumber>>;252253		/// Sponsoring function.254		// type SponsorshipHandler: SponsorshipHandler<Self::AccountId, <Self as Config>::Call>;255256		/// The helper type used for custom transaction fee logic.257		type CallExecutor: DispatchCall<Self, H160>;258	}259260	/// A Scheduler-Runtime interface for finer payment handling.261	pub trait DispatchCall<T: frame_system::Config + Config, SelfContainedSignedInfo> {262		fn reserve_balance(263			id: ScheduledId,264			sponsor: <T as frame_system::Config>::AccountId,265			call: <T as Config>::Call,266			count: u32,267		) -> Result<(), DispatchError>;268269		fn pay_for_call(270			id: ScheduledId,271			sponsor: <T as frame_system::Config>::AccountId,272			call: <T as Config>::Call,273		) -> Result<u128, DispatchError>;274275		/// Resolve the call dispatch, including any post-dispatch operations.276		fn dispatch_call(277			signer: T::AccountId,278			function: <T as Config>::Call,279		) -> Result<280			Result<PostDispatchInfo, DispatchErrorWithPostInfo<PostDispatchInfo>>,281			TransactionValidityError,282		>;283284		fn cancel_reserve(285			id: ScheduledId,286			sponsor: <T as frame_system::Config>::AccountId,287		) -> Result<u128, DispatchError>;288	}289290	/// Items to be executed, indexed by the block number that they should be executed on.291	#[pallet::storage]292	pub type Agenda<T: Config> =293		StorageMap<_, Twox64Concat, T::BlockNumber, Vec<Option<ScheduledV3Of<T>>>, ValueQuery>;294295	/// Lookup from identity to the block number and index of the task.296	#[pallet::storage]297	pub(crate) type Lookup<T: Config> =298		StorageMap<_, Twox64Concat, ScheduledId, TaskAddress<T::BlockNumber>>;299300	/// Events type.301	#[pallet::event]302	#[pallet::generate_deposit(pub(super) fn deposit_event)]303	pub enum Event<T: Config> {304		/// Scheduled some task.305		Scheduled { when: T::BlockNumber, index: u32 },306		/// Canceled some task.307		Canceled { when: T::BlockNumber, index: u32 },308		/// Dispatched some task.309		Dispatched {310			task: TaskAddress<T::BlockNumber>,311			id: Option<ScheduledId>,312			result: DispatchResult,313		},314		/// The call for the provided hash was not found so the task has been aborted.315		CallLookupFailed {316			task: TaskAddress<T::BlockNumber>,317			id: Option<ScheduledId>,318			error: LookupError,319		},320	}321322	#[pallet::error]323	pub enum Error<T> {324		/// Failed to schedule a call325		FailedToSchedule,326		/// Cannot find the scheduled call.327		NotFound,328		/// Given target block number is in the past.329		TargetBlockNumberInPast,330		/// Reschedule failed because it does not change scheduled time.331		RescheduleNoChange,332	}333334	#[pallet::hooks]335	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {336		/// Execute the scheduled calls337		fn on_initialize(now: T::BlockNumber) -> Weight {338			let limit = T::MaximumWeight::get();339340			let mut queued = Agenda::<T>::take(now)341				.into_iter()342				.enumerate()343				.filter_map(|(index, s)| Some((index as u32, s?)))344				.collect::<Vec<_>>();345346			if queued.len() as u32 > T::MaxScheduledPerBlock::get() {347				log::warn!(348					target: "runtime::scheduler",349					"Warning: This block has more items queued in Scheduler than \350					expected from the runtime configuration. An update might be needed."351				);352			}353354			queued.sort_by_key(|(_, s)| s.priority);355356			let next = now + One::one();357358			let mut total_weight: Weight = T::WeightInfo::on_initialize(0);359			for (order, (index, mut s)) in queued.into_iter().enumerate() {360				let named = if let Some(ref id) = s.maybe_id {361					Lookup::<T>::remove(id);362					true363				} else {364					false365				};366367				let (call, maybe_completed) = s.call.resolved::<T::PreimageProvider>();368				s.call = call;369370				let resolved = if let Some(completed) = maybe_completed {371					T::PreimageProvider::unrequest_preimage(&completed);372					true373				} else {374					false375				};376				let call = match s.call.as_value().cloned() {377					Some(c) => c,378					None => {379						// Preimage not available - postpone until some block.380						total_weight.saturating_accrue(T::WeightInfo::item(false, named, None));381						if let Some(delay) = T::NoPreimagePostponement::get() {382							let until = now.saturating_add(delay);383							if let Some(ref id) = s.maybe_id {384								let index = Agenda::<T>::decode_len(until).unwrap_or(0);385								Lookup::<T>::insert(id, (until, index as u32));386							}387							Agenda::<T>::append(until, Some(s));388						}389						continue;390					}391				};392393				let periodic = s.maybe_periodic.is_some();394				let call_weight = call.get_dispatch_info().weight;395				let mut item_weight = T::WeightInfo::item(periodic, named, Some(resolved));396				let origin =397					<<T as Config>::Origin as From<T::PalletsOrigin>>::from(s.origin.clone())398						.into();399				if ensure_signed(origin).is_ok() {400					// Weights of Signed dispatches expect their signing account to be whitelisted.401					item_weight.saturating_accrue(T::DbWeight::get().reads_writes(1, 1));402				}403404				// We allow a scheduled call if any is true:405				// - It's priority is `HARD_DEADLINE`406				// - It does not push the weight past the limit.407				// - It is the first item in the schedule408				let hard_deadline = s.priority <= schedule::HARD_DEADLINE;409				let test_weight = total_weight410					.saturating_add(call_weight)411					.saturating_add(item_weight);412				if !hard_deadline && order > 0 && test_weight > limit {413					// Cannot be scheduled this block - postpone until next.414					total_weight.saturating_accrue(T::WeightInfo::item(false, named, None));415					if let Some(ref id) = s.maybe_id {416						// NOTE: We could reasonably not do this (in which case there would be one417						// block where the named and delayed item could not be referenced by name),418						// but we will do it anyway since it should be mostly free in terms of419						// weight and it is slightly cleaner.420						let index = Agenda::<T>::decode_len(next).unwrap_or(0);421						Lookup::<T>::insert(id, (next, index as u32));422					}423					Agenda::<T>::append(next, Some(s));424					continue;425				}426427				let sender = ensure_signed(428					<<T as Config>::Origin as From<T::PalletsOrigin>>::from(s.origin.clone())429						.into(),430				)431				.unwrap();432433				// // if call have id it was be reserved434				// if s.maybe_id.is_some() {435				// 	let _ = T::CallExecutor::pay_for_call(436				// 		s.maybe_id.unwrap(),437				// 		sender.clone(),438				// 		call.clone(),439				// 	);440				// }441442				let r = T::CallExecutor::dispatch_call(sender, call.clone());443444				let mut actual_call_weight: Weight = item_weight;445				let result: Result<_, DispatchError> = match r {446					Ok(o) => match o {447						Ok(di) => {448							actual_call_weight = di.actual_weight.unwrap_or(item_weight);449							Ok(())450						}451						Err(err) => Err(err.error),452					},453					Err(_) => {454						log::error!(455							target: "runtime::scheduler",456							"Warning: Scheduler has failed to execute a post-dispatch transaction. \457							This block might have become invalid.");458						Err(DispatchError::CannotLookup)459					} // todo possibly force a skip/return here, do something with the error460				};461462				total_weight.saturating_accrue(item_weight);463				total_weight.saturating_accrue(actual_call_weight);464465				Self::deposit_event(Event::Dispatched {466					task: (now, index),467					id: s.maybe_id.clone(),468					result,469				});470471				if let &Some((period, count)) = &s.maybe_periodic {472					if count > 1 {473						s.maybe_periodic = Some((period, count - 1));474					} else {475						s.maybe_periodic = None;476					}477					let wake = now + period;478					// If scheduled is named, place its information in `Lookup`479					if let Some(ref id) = s.maybe_id {480						let wake_index = Agenda::<T>::decode_len(wake).unwrap_or(0);481						Lookup::<T>::insert(id, (wake, wake_index as u32));482					}483					Agenda::<T>::append(wake, Some(s));484				}485			}486			0487			//total_weight488		}489	}490491	#[pallet::call]492	impl<T: Config> Pallet<T> {493		/// Schedule a named task.494		#[pallet::weight(<T as Config>::WeightInfo::schedule_named(T::MaxScheduledPerBlock::get()))]495		pub fn schedule_named(496			origin: OriginFor<T>,497			id: ScheduledId,498			when: T::BlockNumber,499			maybe_periodic: Option<schedule::Period<T::BlockNumber>>,500			priority: schedule::Priority,501			call: Box<CallOrHashOf<T>>,502		) -> DispatchResult {503			T::ScheduleOrigin::ensure_origin(origin.clone())?;504			let origin = <T as Config>::Origin::from(origin);505			Self::do_schedule_named(506				id,507				DispatchTime::At(when),508				maybe_periodic,509				priority,510				origin.caller().clone(),511				*call,512			)?;513			Ok(())514		}515516		/// Cancel a named scheduled task.517		#[pallet::weight(<T as Config>::WeightInfo::cancel_named(T::MaxScheduledPerBlock::get()))]518		pub fn cancel_named(origin: OriginFor<T>, id: ScheduledId) -> DispatchResult {519			T::ScheduleOrigin::ensure_origin(origin.clone())?;520			let origin = <T as Config>::Origin::from(origin);521			Self::do_cancel_named(Some(origin.caller().clone()), id)?;522			Ok(())523		}524525		/// Schedule a named task after a delay.526		///527		/// # <weight>528		/// Same as [`schedule_named`](Self::schedule_named).529		/// # </weight>530		#[pallet::weight(<T as Config>::WeightInfo::schedule_named(T::MaxScheduledPerBlock::get()))]531		pub fn schedule_named_after(532			origin: OriginFor<T>,533			id: ScheduledId,534			after: T::BlockNumber,535			maybe_periodic: Option<schedule::Period<T::BlockNumber>>,536			priority: schedule::Priority,537			call: Box<CallOrHashOf<T>>,538		) -> DispatchResult {539			T::ScheduleOrigin::ensure_origin(origin.clone())?;540			let origin = <T as Config>::Origin::from(origin);541			Self::do_schedule_named(542				id,543				DispatchTime::After(after),544				maybe_periodic,545				priority,546				origin.caller().clone(),547				*call,548			)?;549			Ok(())550		}551	}552}553554impl<T: Config> Pallet<T> {555	#[cfg(feature = "try-runtime")]556	pub fn pre_migrate_to_v3() -> Result<(), &'static str> {557		Ok(())558	}559560	#[cfg(feature = "try-runtime")]561	pub fn post_migrate_to_v3() -> Result<(), &'static str> {562		use frame_support::dispatch::GetStorageVersion;563564		assert!(Self::current_storage_version() == 3);565		for k in Agenda::<T>::iter_keys() {566			let _ = Agenda::<T>::try_get(k).map_err(|()| "Invalid item in Agenda")?;567		}568		Ok(())569	}570571	/// Helper to migrate scheduler when the pallet origin type has changed.572	pub fn migrate_origin<OldOrigin: Into<T::PalletsOrigin> + codec::Decode>() {573		Agenda::<T>::translate::<574			Vec<Option<Scheduled<CallOrHashOf<T>, T::BlockNumber, OldOrigin, T::AccountId>>>,575			_,576		>(|_, agenda| {577			Some(578				agenda579					.into_iter()580					.map(|schedule| {581						schedule.map(|schedule| Scheduled {582							maybe_id: schedule.maybe_id,583							priority: schedule.priority,584							call: schedule.call,585							maybe_periodic: schedule.maybe_periodic,586							origin: schedule.origin.into(),587							_phantom: Default::default(),588						})589					})590					.collect::<Vec<_>>(),591			)592		});593	}594595	fn resolve_time(when: DispatchTime<T::BlockNumber>) -> Result<T::BlockNumber, DispatchError> {596		let now = frame_system::Pallet::<T>::block_number();597598		let when = match when {599			DispatchTime::At(x) => x,600			// The current block has already completed it's scheduled tasks, so601			// Schedule the task at lest one block after this current block.602			DispatchTime::After(x) => now.saturating_add(x).saturating_add(One::one()),603		};604605		if when <= now {606			return Err(Error::<T>::TargetBlockNumberInPast.into());607		}608609		Ok(when)610	}611612	fn do_schedule_named(613		id: ScheduledId,614		when: DispatchTime<T::BlockNumber>,615		maybe_periodic: Option<schedule::Period<T::BlockNumber>>,616		priority: schedule::Priority,617		origin: T::PalletsOrigin,618		call: CallOrHashOf<T>,619	) -> Result<TaskAddress<T::BlockNumber>, DispatchError> {620		// ensure id it is unique621		if Lookup::<T>::contains_key(&id) {622			return Err(Error::<T>::FailedToSchedule)?;623		}624625		let when = Self::resolve_time(when)?;626627		call.ensure_requested::<T::PreimageProvider>();628629		// sanitize maybe_periodic630		let maybe_periodic = maybe_periodic631			.filter(|p| p.1 > 1 && !p.0.is_zero())632			// Remove one from the number of repetitions since we will schedule one now.633			.map(|(p, c)| (p, c - 1));634635		let s = Scheduled {636			maybe_id: Some(id.clone()),637			priority,638			call: call.clone(),639			maybe_periodic,640			origin: origin.clone(),641			_phantom: Default::default(),642		};643644		// reserve balance for periodic execution645		// let sender =646		// 	ensure_signed(<<T as Config>::Origin as From<T::PalletsOrigin>>::from(origin).into())?;647		// let repeats = match maybe_periodic {648		// 	Some(p) => p.1,649		// 	None => 1,650		// };651		// let _ = T::CallExecutor::reserve_balance(652		// 	id.clone(),653		// 	sender,654		// 	call.as_value().unwrap().clone(),655		// 	repeats,656		// );657658		Agenda::<T>::append(when, Some(s));659		let index = Agenda::<T>::decode_len(when).unwrap_or(1) as u32 - 1;660		let address = (when, index);661		Lookup::<T>::insert(&id, &address);662		Self::deposit_event(Event::Scheduled { when, index });663664		Ok(address)665	}666667	fn do_cancel_named(origin: Option<T::PalletsOrigin>, id: ScheduledId) -> DispatchResult {668		Lookup::<T>::try_mutate_exists(id, |lookup| -> DispatchResult {669			if let Some((when, index)) = lookup.take() {670				let i = index as usize;671				Agenda::<T>::try_mutate(when, |agenda| -> DispatchResult {672					if let Some(s) = agenda.get_mut(i) {673						if let (Some(ref o), Some(ref s)) = (origin.clone(), s.borrow()) {674							if matches!(675								T::OriginPrivilegeCmp::cmp_privilege(o, &s.origin),676								Some(Ordering::Less) | None677							) {678								return Err(BadOrigin.into());679							}680							// release balance reserve681							// let sender = ensure_signed(682							// 	<<T as Config>::Origin as From<T::PalletsOrigin>>::from(683							// 		origin.unwrap(),684							// 	)685							// 	.into(),686							// )?;687							// let _ = T::CallExecutor::cancel_reserve(id, sender);688689							s.call.ensure_unrequested::<T::PreimageProvider>();690						}691						*s = None;692					}693					Ok(())694				})?;695696				Self::deposit_event(Event::Canceled { when, index });697				Ok(())698			} else {699				Err(Error::<T>::NotFound)?700			}701		})702	}703}
after · pallets/scheduler/src/lib.rs
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// Original license:18// This file is part of Substrate.1920// Copyright (C) 2017-2022 Parity Technologies (UK) Ltd.21// SPDX-License-Identifier: Apache-2.02223// Licensed under the Apache License, Version 2.0 (the "License");24// you may not use this file except in compliance with the License.25// You may obtain a copy of the License at26//27// 	http://www.apache.org/licenses/LICENSE-2.028//29// Unless required by applicable law or agreed to in writing, software30// distributed under the License is distributed on an "AS IS" BASIS,31// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.32// See the License for the specific language governing permissions and33// limitations under the License.3435//! # Schedulerdo_reschedule36//!37//! This Pallet exposes capabilities for scheduling dispatches to occur at a38//! specified block number or at a specified period. These scheduled dispatches39//! may be named or anonymous and may be canceled.40//!41//! **NOTE:** The scheduled calls will be dispatched with the default filter42//! for the origin: namely `frame_system::Config::BaseCallFilter` for all origin43//! except root which will get no filter. And not the filter contained in origin44//! use to call `fn schedule`.45//!46//! If a call is scheduled using proxy or whatever mecanism which adds filter,47//! then those filter will not be used when dispatching the schedule call.48//!49//! ## Interface50//!51//! ### Dispatchable Functions52//!53//! * `schedule` - schedule a dispatch, which may be periodic, to occur at a specified block and54//!   with a specified priority.55//! * `cancel` - cancel a scheduled dispatch, specified by block number and index.56//! * `schedule_named` - augments the `schedule` interface with an additional `Vec<u8>` parameter57//!   that can be used for identification.58//! * `cancel_named` - the named complement to the cancel function.5960// Ensure we're `no_std` when compiling for Wasm.61#![cfg_attr(not(feature = "std"), no_std)]6263#[cfg(feature = "runtime-benchmarks")]64mod benchmarking;6566pub mod weights;6768use sp_core::H160;69use codec::{Codec, Decode, Encode};70use frame_system::{self as system, ensure_signed};71pub use pallet::*;72use scale_info::TypeInfo;73use sp_runtime::{74	traits::{BadOrigin, One, Saturating, Zero},75	RuntimeDebug, DispatchErrorWithPostInfo,76};77use sp_std::{borrow::Borrow, cmp::Ordering, marker::PhantomData, prelude::*};7879use frame_support::{80	dispatch::{DispatchError, DispatchResult, Dispatchable, Parameter},81	traits::{82		schedule::{self, DispatchTime, MaybeHashed},83		NamedReservableCurrency, EnsureOrigin, Get, IsType, OriginTrait, PrivilegeCmp,84		StorageVersion,85	},86	weights::{GetDispatchInfo, Weight},87};8889pub use weights::WeightInfo;9091/// Just a simple index for naming period tasks.92pub type PeriodicIndex = u32;93/// The location of a scheduled task that can be used to remove it.94pub type TaskAddress<BlockNumber> = (BlockNumber, u32);95pub const MAX_TASK_ID_LENGTH_IN_BYTES: u8 = 16;9697type ScheduledId = [u8; MAX_TASK_ID_LENGTH_IN_BYTES as usize];98pub type CallOrHashOf<T> = MaybeHashed<<T as Config>::Call, <T as frame_system::Config>::Hash>;99100/// Information regarding an item to be executed in the future.101#[cfg_attr(any(feature = "std", test), derive(PartialEq, Eq))]102#[derive(Clone, RuntimeDebug, Encode, Decode, TypeInfo)]103pub struct ScheduledV3<Call, BlockNumber, PalletsOrigin, AccountId> {104	/// The unique identity for this task, if there is one.105	maybe_id: Option<ScheduledId>,106	/// This task's priority.107	priority: schedule::Priority,108	/// The call to be dispatched.109	call: Call,110	/// If the call is periodic, then this points to the information concerning that.111	maybe_periodic: Option<schedule::Period<BlockNumber>>,112	/// The origin to dispatch the call.113	origin: PalletsOrigin,114	_phantom: PhantomData<AccountId>,115}116117pub type ScheduledV3Of<T> = ScheduledV3<118	CallOrHashOf<T>,119	<T as frame_system::Config>::BlockNumber,120	<T as Config>::PalletsOrigin,121	<T as frame_system::Config>::AccountId,122>;123124pub type ScheduledOf<T> = ScheduledV3Of<T>;125126/// The current version of Scheduled struct.127pub type Scheduled<Call, BlockNumber, PalletsOrigin, AccountId> =128	ScheduledV3<Call, BlockNumber, PalletsOrigin, AccountId>;129130#[cfg(feature = "runtime-benchmarks")]131mod preimage_provider {132	use frame_support::traits::PreimageRecipient;133	pub trait PreimageProviderAndMaybeRecipient<H>: PreimageRecipient<H> {}134	impl<H, T: PreimageRecipient<H>> PreimageProviderAndMaybeRecipient<H> for T {}135}136137#[cfg(not(feature = "runtime-benchmarks"))]138mod preimage_provider {139	use frame_support::traits::PreimageProvider;140	pub trait PreimageProviderAndMaybeRecipient<H>: PreimageProvider<H> {}141	impl<H, T: PreimageProvider<H>> PreimageProviderAndMaybeRecipient<H> for T {}142}143144pub use preimage_provider::PreimageProviderAndMaybeRecipient;145146pub(crate) trait MarginalWeightInfo: WeightInfo {147	fn item(periodic: bool, named: bool, resolved: Option<bool>) -> Weight {148		match (periodic, named, resolved) {149			(_, false, None) => Self::on_initialize_aborted(2) - Self::on_initialize_aborted(1),150			(_, true, None) => {151				Self::on_initialize_named_aborted(2) - Self::on_initialize_named_aborted(1)152			}153			(false, false, Some(false)) => Self::on_initialize(2) - Self::on_initialize(1),154			(false, true, Some(false)) => {155				Self::on_initialize_named(2) - Self::on_initialize_named(1)156			}157			(true, false, Some(false)) => {158				Self::on_initialize_periodic(2) - Self::on_initialize_periodic(1)159			}160			(true, true, Some(false)) => {161				Self::on_initialize_periodic_named_resolved(2)162					- Self::on_initialize_periodic_named_resolved(1)163			}164			(false, false, Some(true)) => Self::on_initialize(2) - Self::on_initialize(1),165			(false, true, Some(true)) => {166				Self::on_initialize_named_resolved(2) - Self::on_initialize_named_resolved(1)167			}168			(true, false, Some(true)) => {169				Self::on_initialize_periodic_resolved(2) - Self::on_initialize_periodic_resolved(1)170			}171			(true, true, Some(true)) => {172				Self::on_initialize_periodic_named_resolved(2)173					- Self::on_initialize_periodic_named_resolved(1)174			}175		}176	}177}178impl<T: WeightInfo> MarginalWeightInfo for T {}179180#[frame_support::pallet]181pub mod pallet {182	use super::*;183	use frame_support::{184		dispatch::PostDispatchInfo,185		pallet_prelude::*,186		traits::{schedule::LookupError, PreimageProvider},187	};188	use frame_system::pallet_prelude::*;189190	/// The current storage version.191	const STORAGE_VERSION: StorageVersion = StorageVersion::new(3);192193	#[pallet::pallet]194	#[pallet::generate_store(pub(super) trait Store)]195	#[pallet::storage_version(STORAGE_VERSION)]196	#[pallet::without_storage_info]197	pub struct Pallet<T>(_);198199	/// `system::Config` should always be included in our implied traits.200	#[pallet::config]201	pub trait Config: frame_system::Config {202		/// The overarching event type.203		type Event: From<Event<Self>> + IsType<<Self as frame_system::Config>::Event>;204205		/// The aggregated origin which the dispatch will take.206		type Origin: OriginTrait<PalletsOrigin = Self::PalletsOrigin>207			+ From<Self::PalletsOrigin>208			+ IsType<<Self as system::Config>::Origin>;209210		/// The caller origin, overarching type of all pallets origins.211		type PalletsOrigin: From<system::RawOrigin<Self::AccountId>> + Codec + Clone + Eq + TypeInfo;212213		type Currency: NamedReservableCurrency<Self::AccountId, ReserveIdentifier = ScheduledId>;214215		/// The aggregated call type.216		type Call: Parameter217			+ Dispatchable<Origin = <Self as Config>::Origin, PostInfo = PostDispatchInfo>218			+ GetDispatchInfo219			+ From<system::Call<Self>>;220221		/// The maximum weight that may be scheduled per block for any dispatchables of less222		/// priority than `schedule::HARD_DEADLINE`.223		#[pallet::constant]224		type MaximumWeight: Get<Weight>;225226		/// Required origin to schedule or cancel calls.227		type ScheduleOrigin: EnsureOrigin<<Self as system::Config>::Origin>;228229		/// Compare the privileges of origins.230		///231		/// This will be used when canceling a task, to ensure that the origin that tries232		/// to cancel has greater or equal privileges as the origin that created the scheduled task.233		///234		/// For simplicity the [`EqualPrivilegeOnly`](frame_support::traits::EqualPrivilegeOnly) can235		/// be used. This will only check if two given origins are equal.236		type OriginPrivilegeCmp: PrivilegeCmp<Self::PalletsOrigin>;237238		/// The maximum number of scheduled calls in the queue for a single block.239		/// Not strictly enforced, but used for weight estimation.240		#[pallet::constant]241		type MaxScheduledPerBlock: Get<u32>;242243		/// Weight information for extrinsics in this pallet.244		type WeightInfo: WeightInfo;245246		/// The preimage provider with which we look up call hashes to get the call.247		type PreimageProvider: PreimageProviderAndMaybeRecipient<Self::Hash>;248249		/// If `Some` then the number of blocks to postpone execution for when the item is delayed.250		type NoPreimagePostponement: Get<Option<Self::BlockNumber>>;251252		/// Sponsoring function.253		// type SponsorshipHandler: SponsorshipHandler<Self::AccountId, <Self as Config>::Call>;254255		/// The helper type used for custom transaction fee logic.256		type CallExecutor: DispatchCall<Self, H160>;257	}258259	/// A Scheduler-Runtime interface for finer payment handling.260	pub trait DispatchCall<T: frame_system::Config + Config, SelfContainedSignedInfo> {261		fn reserve_balance(262			id: ScheduledId,263			sponsor: <T as frame_system::Config>::AccountId,264			call: <T as Config>::Call,265			count: u32,266		) -> Result<(), DispatchError>;267268		fn pay_for_call(269			id: ScheduledId,270			sponsor: <T as frame_system::Config>::AccountId,271			call: <T as Config>::Call,272		) -> Result<u128, DispatchError>;273274		/// Resolve the call dispatch, including any post-dispatch operations.275		fn dispatch_call(276			signer: T::AccountId,277			function: <T as Config>::Call,278		) -> Result<279			Result<PostDispatchInfo, DispatchErrorWithPostInfo<PostDispatchInfo>>,280			TransactionValidityError,281		>;282283		fn cancel_reserve(284			id: ScheduledId,285			sponsor: <T as frame_system::Config>::AccountId,286		) -> Result<u128, DispatchError>;287	}288289	/// Items to be executed, indexed by the block number that they should be executed on.290	#[pallet::storage]291	pub type Agenda<T: Config> =292		StorageMap<_, Twox64Concat, T::BlockNumber, Vec<Option<ScheduledV3Of<T>>>, ValueQuery>;293294	/// Lookup from identity to the block number and index of the task.295	#[pallet::storage]296	pub(crate) type Lookup<T: Config> =297		StorageMap<_, Twox64Concat, ScheduledId, TaskAddress<T::BlockNumber>>;298299	/// Events type.300	#[pallet::event]301	#[pallet::generate_deposit(pub(super) fn deposit_event)]302	pub enum Event<T: Config> {303		/// Scheduled some task.304		Scheduled { when: T::BlockNumber, index: u32 },305		/// Canceled some task.306		Canceled { when: T::BlockNumber, index: u32 },307		/// Dispatched some task.308		Dispatched {309			task: TaskAddress<T::BlockNumber>,310			id: Option<ScheduledId>,311			result: DispatchResult,312		},313		/// The call for the provided hash was not found so the task has been aborted.314		CallLookupFailed {315			task: TaskAddress<T::BlockNumber>,316			id: Option<ScheduledId>,317			error: LookupError,318		},319	}320321	#[pallet::error]322	pub enum Error<T> {323		/// Failed to schedule a call324		FailedToSchedule,325		/// Cannot find the scheduled call.326		NotFound,327		/// Given target block number is in the past.328		TargetBlockNumberInPast,329		/// Reschedule failed because it does not change scheduled time.330		RescheduleNoChange,331	}332333	#[pallet::hooks]334	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {335		/// Execute the scheduled calls336		fn on_initialize(now: T::BlockNumber) -> Weight {337			let limit = T::MaximumWeight::get();338339			let mut queued = Agenda::<T>::take(now)340				.into_iter()341				.enumerate()342				.filter_map(|(index, s)| Some((index as u32, s?)))343				.collect::<Vec<_>>();344345			if queued.len() as u32 > T::MaxScheduledPerBlock::get() {346				log::warn!(347					target: "runtime::scheduler",348					"Warning: This block has more items queued in Scheduler than \349					expected from the runtime configuration. An update might be needed."350				);351			}352353			queued.sort_by_key(|(_, s)| s.priority);354355			let next = now + One::one();356357			let mut total_weight: Weight = T::WeightInfo::on_initialize(0);358			for (order, (index, mut s)) in queued.into_iter().enumerate() {359				let named = if let Some(ref id) = s.maybe_id {360					Lookup::<T>::remove(id);361					true362				} else {363					false364				};365366				let (call, maybe_completed) = s.call.resolved::<T::PreimageProvider>();367				s.call = call;368369				let resolved = if let Some(completed) = maybe_completed {370					T::PreimageProvider::unrequest_preimage(&completed);371					true372				} else {373					false374				};375				let call = match s.call.as_value().cloned() {376					Some(c) => c,377					None => {378						// Preimage not available - postpone until some block.379						total_weight.saturating_accrue(T::WeightInfo::item(false, named, None));380						if let Some(delay) = T::NoPreimagePostponement::get() {381							let until = now.saturating_add(delay);382							if let Some(ref id) = s.maybe_id {383								let index = Agenda::<T>::decode_len(until).unwrap_or(0);384								Lookup::<T>::insert(id, (until, index as u32));385							}386							Agenda::<T>::append(until, Some(s));387						}388						continue;389					}390				};391392				let periodic = s.maybe_periodic.is_some();393				let call_weight = call.get_dispatch_info().weight;394				let mut item_weight = T::WeightInfo::item(periodic, named, Some(resolved));395				let origin =396					<<T as Config>::Origin as From<T::PalletsOrigin>>::from(s.origin.clone())397						.into();398				if ensure_signed(origin).is_ok() {399					// Weights of Signed dispatches expect their signing account to be whitelisted.400					item_weight.saturating_accrue(T::DbWeight::get().reads_writes(1, 1));401				}402403				// We allow a scheduled call if any is true:404				// - It's priority is `HARD_DEADLINE`405				// - It does not push the weight past the limit.406				// - It is the first item in the schedule407				let hard_deadline = s.priority <= schedule::HARD_DEADLINE;408				let test_weight = total_weight409					.saturating_add(call_weight)410					.saturating_add(item_weight);411				if !hard_deadline && order > 0 && test_weight > limit {412					// Cannot be scheduled this block - postpone until next.413					total_weight.saturating_accrue(T::WeightInfo::item(false, named, None));414					if let Some(ref id) = s.maybe_id {415						// NOTE: We could reasonably not do this (in which case there would be one416						// block where the named and delayed item could not be referenced by name),417						// but we will do it anyway since it should be mostly free in terms of418						// weight and it is slightly cleaner.419						let index = Agenda::<T>::decode_len(next).unwrap_or(0);420						Lookup::<T>::insert(id, (next, index as u32));421					}422					Agenda::<T>::append(next, Some(s));423					continue;424				}425426				let sender = ensure_signed(427					<<T as Config>::Origin as From<T::PalletsOrigin>>::from(s.origin.clone())428						.into(),429				)430				.unwrap();431432				// // if call have id it was be reserved433				// if s.maybe_id.is_some() {434				// 	let _ = T::CallExecutor::pay_for_call(435				// 		s.maybe_id.unwrap(),436				// 		sender.clone(),437				// 		call.clone(),438				// 	);439				// }440441				let r = T::CallExecutor::dispatch_call(sender, call.clone());442443				let mut actual_call_weight: Weight = item_weight;444				let result: Result<_, DispatchError> = match r {445					Ok(o) => match o {446						Ok(di) => {447							actual_call_weight = di.actual_weight.unwrap_or(item_weight);448							Ok(())449						}450						Err(err) => Err(err.error),451					},452					Err(_) => {453						log::error!(454							target: "runtime::scheduler",455							"Warning: Scheduler has failed to execute a post-dispatch transaction. \456							This block might have become invalid.");457						Err(DispatchError::CannotLookup)458					} // todo possibly force a skip/return here, do something with the error459				};460461				total_weight.saturating_accrue(item_weight);462				total_weight.saturating_accrue(actual_call_weight);463464				Self::deposit_event(Event::Dispatched {465					task: (now, index),466					id: s.maybe_id.clone(),467					result,468				});469470				if let &Some((period, count)) = &s.maybe_periodic {471					if count > 1 {472						s.maybe_periodic = Some((period, count - 1));473					} else {474						s.maybe_periodic = None;475					}476					let wake = now + period;477					// If scheduled is named, place its information in `Lookup`478					if let Some(ref id) = s.maybe_id {479						let wake_index = Agenda::<T>::decode_len(wake).unwrap_or(0);480						Lookup::<T>::insert(id, (wake, wake_index as u32));481					}482					Agenda::<T>::append(wake, Some(s));483				}484			}485			0486			//total_weight487		}488	}489490	#[pallet::call]491	impl<T: Config> Pallet<T> {492		/// Schedule a named task.493		#[pallet::weight(<T as Config>::WeightInfo::schedule_named(T::MaxScheduledPerBlock::get()))]494		pub fn schedule_named(495			origin: OriginFor<T>,496			id: ScheduledId,497			when: T::BlockNumber,498			maybe_periodic: Option<schedule::Period<T::BlockNumber>>,499			priority: schedule::Priority,500			call: Box<CallOrHashOf<T>>,501		) -> DispatchResult {502			T::ScheduleOrigin::ensure_origin(origin.clone())?;503			let origin = <T as Config>::Origin::from(origin);504			Self::do_schedule_named(505				id,506				DispatchTime::At(when),507				maybe_periodic,508				priority,509				origin.caller().clone(),510				*call,511			)?;512			Ok(())513		}514515		/// Cancel a named scheduled task.516		#[pallet::weight(<T as Config>::WeightInfo::cancel_named(T::MaxScheduledPerBlock::get()))]517		pub fn cancel_named(origin: OriginFor<T>, id: ScheduledId) -> DispatchResult {518			T::ScheduleOrigin::ensure_origin(origin.clone())?;519			let origin = <T as Config>::Origin::from(origin);520			Self::do_cancel_named(Some(origin.caller().clone()), id)?;521			Ok(())522		}523524		/// Schedule a named task after a delay.525		///526		/// # <weight>527		/// Same as [`schedule_named`](Self::schedule_named).528		/// # </weight>529		#[pallet::weight(<T as Config>::WeightInfo::schedule_named(T::MaxScheduledPerBlock::get()))]530		pub fn schedule_named_after(531			origin: OriginFor<T>,532			id: ScheduledId,533			after: T::BlockNumber,534			maybe_periodic: Option<schedule::Period<T::BlockNumber>>,535			priority: schedule::Priority,536			call: Box<CallOrHashOf<T>>,537		) -> DispatchResult {538			T::ScheduleOrigin::ensure_origin(origin.clone())?;539			let origin = <T as Config>::Origin::from(origin);540			Self::do_schedule_named(541				id,542				DispatchTime::After(after),543				maybe_periodic,544				priority,545				origin.caller().clone(),546				*call,547			)?;548			Ok(())549		}550	}551}552553impl<T: Config> Pallet<T> {554	#[cfg(feature = "try-runtime")]555	pub fn pre_migrate_to_v3() -> Result<(), &'static str> {556		Ok(())557	}558559	#[cfg(feature = "try-runtime")]560	pub fn post_migrate_to_v3() -> Result<(), &'static str> {561		use frame_support::dispatch::GetStorageVersion;562563		assert!(Self::current_storage_version() == 3);564		for k in Agenda::<T>::iter_keys() {565			let _ = Agenda::<T>::try_get(k).map_err(|()| "Invalid item in Agenda")?;566		}567		Ok(())568	}569570	/// Helper to migrate scheduler when the pallet origin type has changed.571	pub fn migrate_origin<OldOrigin: Into<T::PalletsOrigin> + codec::Decode>() {572		Agenda::<T>::translate::<573			Vec<Option<Scheduled<CallOrHashOf<T>, T::BlockNumber, OldOrigin, T::AccountId>>>,574			_,575		>(|_, agenda| {576			Some(577				agenda578					.into_iter()579					.map(|schedule| {580						schedule.map(|schedule| Scheduled {581							maybe_id: schedule.maybe_id,582							priority: schedule.priority,583							call: schedule.call,584							maybe_periodic: schedule.maybe_periodic,585							origin: schedule.origin.into(),586							_phantom: Default::default(),587						})588					})589					.collect::<Vec<_>>(),590			)591		});592	}593594	fn resolve_time(when: DispatchTime<T::BlockNumber>) -> Result<T::BlockNumber, DispatchError> {595		let now = frame_system::Pallet::<T>::block_number();596597		let when = match when {598			DispatchTime::At(x) => x,599			// The current block has already completed it's scheduled tasks, so600			// Schedule the task at lest one block after this current block.601			DispatchTime::After(x) => now.saturating_add(x).saturating_add(One::one()),602		};603604		if when <= now {605			return Err(Error::<T>::TargetBlockNumberInPast.into());606		}607608		Ok(when)609	}610611	fn do_schedule_named(612		id: ScheduledId,613		when: DispatchTime<T::BlockNumber>,614		maybe_periodic: Option<schedule::Period<T::BlockNumber>>,615		priority: schedule::Priority,616		origin: T::PalletsOrigin,617		call: CallOrHashOf<T>,618	) -> Result<TaskAddress<T::BlockNumber>, DispatchError> {619		// ensure id it is unique620		if Lookup::<T>::contains_key(&id) {621			return Err(Error::<T>::FailedToSchedule)?;622		}623624		let when = Self::resolve_time(when)?;625626		call.ensure_requested::<T::PreimageProvider>();627628		// sanitize maybe_periodic629		let maybe_periodic = maybe_periodic630			.filter(|p| p.1 > 1 && !p.0.is_zero())631			// Remove one from the number of repetitions since we will schedule one now.632			.map(|(p, c)| (p, c - 1));633634		let s = Scheduled {635			maybe_id: Some(id.clone()),636			priority,637			call: call.clone(),638			maybe_periodic,639			origin: origin.clone(),640			_phantom: Default::default(),641		};642643		// reserve balance for periodic execution644		// let sender =645		// 	ensure_signed(<<T as Config>::Origin as From<T::PalletsOrigin>>::from(origin).into())?;646		// let repeats = match maybe_periodic {647		// 	Some(p) => p.1,648		// 	None => 1,649		// };650		// let _ = T::CallExecutor::reserve_balance(651		// 	id.clone(),652		// 	sender,653		// 	call.as_value().unwrap().clone(),654		// 	repeats,655		// );656657		Agenda::<T>::append(when, Some(s));658		let index = Agenda::<T>::decode_len(when).unwrap_or(1) as u32 - 1;659		let address = (when, index);660		Lookup::<T>::insert(&id, &address);661		Self::deposit_event(Event::Scheduled { when, index });662663		Ok(address)664	}665666	fn do_cancel_named(origin: Option<T::PalletsOrigin>, id: ScheduledId) -> DispatchResult {667		Lookup::<T>::try_mutate_exists(id, |lookup| -> DispatchResult {668			if let Some((when, index)) = lookup.take() {669				let i = index as usize;670				Agenda::<T>::try_mutate(when, |agenda| -> DispatchResult {671					if let Some(s) = agenda.get_mut(i) {672						if let (Some(ref o), Some(ref s)) = (origin.clone(), s.borrow()) {673							if matches!(674								T::OriginPrivilegeCmp::cmp_privilege(o, &s.origin),675								Some(Ordering::Less) | None676							) {677								return Err(BadOrigin.into());678							}679							// release balance reserve680							// let sender = ensure_signed(681							// 	<<T as Config>::Origin as From<T::PalletsOrigin>>::from(682							// 		origin.unwrap(),683							// 	)684							// 	.into(),685							// )?;686							// let _ = T::CallExecutor::cancel_reserve(id, sender);687688							s.call.ensure_unrequested::<T::PreimageProvider>();689						}690						*s = None;691					}692					Ok(())693				})?;694695				Self::deposit_event(Event::Canceled { when, index });696				Ok(())697			} else {698				Err(Error::<T>::NotFound)?699			}700		})701	}702}
modifiedpallets/scheduler/src/weights.rsdiffbeforeafterboth
--- a/pallets/scheduler/src/weights.rs
+++ b/pallets/scheduler/src/weights.rs
@@ -1,6 +1,6 @@
 // Template adopted from https://github.com/paritytech/substrate/blob/master/.maintain/frame-weight-template.hbs
 
-//! Autogenerated weights for pallet_unq_scheduler
+//! Autogenerated weights for pallet_unique_scheduler
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
 //! DATE: 2022-06-09, STEPS: `50`, REPEAT: 200, LOW RANGE: `[]`, HIGH RANGE: `[]`
@@ -11,7 +11,7 @@
 // benchmark
 // pallet
 // --pallet
-// pallet-unq-scheduler
+// pallet-unique-scheduler
 // --wasm-execution
 // compiled
 // --extrinsic
@@ -31,17 +31,22 @@
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
 use sp_std::marker::PhantomData;
 
-/// Weight functions needed for pallet_unq_scheduler.
+/// Weight functions needed for pallet_unique_scheduler.
 pub trait WeightInfo {
 	fn on_initialize_periodic_named_resolved(s: u32, ) -> Weight;
 	fn on_initialize_named_resolved(s: u32, ) -> Weight;
+	fn on_initialize_periodic(s: u32, ) -> Weight;
 	fn on_initialize_periodic_resolved(s: u32, ) -> Weight;
+	fn on_initialize_aborted(s: u32, ) -> Weight;
+	fn on_initialize_named_aborted(s: u32, ) -> Weight;
+	fn on_initialize_named(s: u32, ) -> Weight;
+	fn on_initialize(s: u32, ) -> Weight;
 	fn on_initialize_resolved(s: u32, ) -> Weight;
 	fn schedule_named(s: u32, ) -> Weight;
 	fn cancel_named(s: u32, ) -> Weight;
 }
 
-/// Weights for pallet_unq_scheduler using the Substrate node and recommended hardware.
+/// Weights for pallet_unique_scheduler using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Scheduler Agenda (r:2 w:2)
@@ -50,9 +55,9 @@
 	// Storage: System BlockWeight (r:1 w:1)
 	// Storage: Scheduler Lookup (r:0 w:1)
 	fn on_initialize_periodic_named_resolved(s: u32, ) -> Weight {
-		(39_822_000 as Weight)
-			// Standard Error: 4_000
-			.saturating_add((31_823_000 as Weight).saturating_mul(s as Weight))
+		(35_999_000 as Weight)
+			// Standard Error: 3_000
+			.saturating_add((32_234_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(s as Weight)))
 			.saturating_add(T::DbWeight::get().writes(4 as Weight))
@@ -64,9 +69,9 @@
 	// Storage: System BlockWeight (r:1 w:1)
 	// Storage: Scheduler Lookup (r:0 w:1)
 	fn on_initialize_named_resolved(s: u32, ) -> Weight {
-		(36_019_000 as Weight)
-			// Standard Error: 3_000
-			.saturating_add((22_660_000 as Weight).saturating_mul(s as Weight))
+		(34_874_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((23_114_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
@@ -76,24 +81,84 @@
 	// Storage: System AllExtrinsicsLen (r:1 w:1)
 	// Storage: System BlockWeight (r:1 w:1)
 	// Storage: Scheduler Lookup (r:0 w:1)
+	fn on_initialize_periodic(s: u32, ) -> Weight {
+		(36_469_000 as Weight)
+			// Standard Error: 3_000
+			.saturating_add((32_202_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add(T::DbWeight::get().reads(4 as Weight))
+			.saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(s as Weight)))
+			.saturating_add(T::DbWeight::get().writes(4 as Weight))
+			.saturating_add(T::DbWeight::get().writes((2 as Weight).saturating_mul(s as Weight)))
+	}
+	// Storage: Scheduler Agenda (r:2 w:2)
+	// Storage: System Account (r:1 w:1)
+	// Storage: System AllExtrinsicsLen (r:1 w:1)
+	// Storage: System BlockWeight (r:1 w:1)
+	// Storage: Scheduler Lookup (r:0 w:1)
 	fn on_initialize_periodic_resolved(s: u32, ) -> Weight {
-		(36_613_000 as Weight)
+		(35_352_000 as Weight)
 			// Standard Error: 3_000
-			.saturating_add((31_895_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add((32_309_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(s as Weight)))
 			.saturating_add(T::DbWeight::get().writes(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes((2 as Weight).saturating_mul(s as Weight)))
 	}
+	// Storage: Scheduler Agenda (r:2 w:2)
+	// Storage: Scheduler Lookup (r:0 w:1)
+	fn on_initialize_aborted(s: u32, ) -> Weight {
+		(11_267_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((9_368_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add(T::DbWeight::get().reads(2 as Weight))
+			.saturating_add(T::DbWeight::get().writes(2 as Weight))
+			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
+	}
+	// Storage: Scheduler Agenda (r:1 w:1)
+	// Storage: System Account (r:1 w:1)
+	// Storage: System AllExtrinsicsLen (r:1 w:1)
+	// Storage: System BlockWeight (r:1 w:1)
+	// Storage: Scheduler Lookup (r:0 w:1)
+	fn on_initialize_named_aborted(s: u32, ) -> Weight {
+		(35_937_000 as Weight)
+			// Standard Error: 3_000
+			.saturating_add((23_037_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add(T::DbWeight::get().reads(4 as Weight))
+			.saturating_add(T::DbWeight::get().writes(4 as Weight))
+			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
+	}
+	// Storage: Scheduler Agenda (r:2 w:2)
+	// Storage: Scheduler Lookup (r:0 w:1)
+	fn on_initialize_named(s: u32, ) -> Weight {
+		(10_338_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((9_422_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add(T::DbWeight::get().reads(2 as Weight))
+			.saturating_add(T::DbWeight::get().writes(2 as Weight))
+			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
+	}
+	// Storage: Scheduler Agenda (r:1 w:1)
+	// Storage: System Account (r:1 w:1)
+	// Storage: System AllExtrinsicsLen (r:1 w:1)
+	// Storage: System BlockWeight (r:1 w:1)
+	// Storage: Scheduler Lookup (r:0 w:1)
+	fn on_initialize(s: u32, ) -> Weight {
+		(37_448_000 as Weight)
+			// Standard Error: 7_000
+			.saturating_add((22_907_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add(T::DbWeight::get().reads(4 as Weight))
+			.saturating_add(T::DbWeight::get().writes(4 as Weight))
+			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
+	}
 	// Storage: Scheduler Agenda (r:1 w:1)
 	// Storage: System Account (r:1 w:1)
 	// Storage: System AllExtrinsicsLen (r:1 w:1)
 	// Storage: System BlockWeight (r:1 w:1)
 	// Storage: Scheduler Lookup (r:0 w:1)
 	fn on_initialize_resolved(s: u32, ) -> Weight {
-		(36_252_000 as Weight)
-			// Standard Error: 3_000
-			.saturating_add((22_662_000 as Weight).saturating_mul(s as Weight))
+		(34_841_000 as Weight)
+			// Standard Error: 7_000
+			.saturating_add((22_966_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
@@ -101,18 +166,18 @@
 	// Storage: Scheduler Lookup (r:1 w:1)
 	// Storage: Scheduler Agenda (r:1 w:1)
 	fn schedule_named(s: u32, ) -> Weight {
-		(34_561_000 as Weight)
+		(33_845_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((161_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add((168_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	// Storage: Scheduler Lookup (r:1 w:1)
 	// Storage: Scheduler Agenda (r:1 w:1)
 	fn cancel_named(s: u32, ) -> Weight {
-		(30_932_000 as Weight)
+		(31_169_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((1_537_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add((1_565_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
@@ -126,9 +191,9 @@
 	// Storage: System BlockWeight (r:1 w:1)
 	// Storage: Scheduler Lookup (r:0 w:1)
 	fn on_initialize_periodic_named_resolved(s: u32, ) -> Weight {
-		(39_822_000 as Weight)
-			// Standard Error: 4_000
-			.saturating_add((31_823_000 as Weight).saturating_mul(s as Weight))
+		(35_999_000 as Weight)
+			// Standard Error: 3_000
+			.saturating_add((32_234_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(s as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
@@ -140,12 +205,26 @@
 	// Storage: System BlockWeight (r:1 w:1)
 	// Storage: Scheduler Lookup (r:0 w:1)
 	fn on_initialize_named_resolved(s: u32, ) -> Weight {
-		(36_019_000 as Weight)
+		(34_874_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((23_114_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
+			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
+	}
+	// Storage: Scheduler Agenda (r:2 w:2)
+	// Storage: System Account (r:1 w:1)
+	// Storage: System AllExtrinsicsLen (r:1 w:1)
+	// Storage: System BlockWeight (r:1 w:1)
+	// Storage: Scheduler Lookup (r:0 w:1)
+	fn on_initialize_periodic(s: u32, ) -> Weight {
+		(36_469_000 as Weight)
 			// Standard Error: 3_000
-			.saturating_add((22_660_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add((32_202_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
+			.saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(s as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
-			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
+			.saturating_add(RocksDbWeight::get().writes((2 as Weight).saturating_mul(s as Weight)))
 	}
 	// Storage: Scheduler Agenda (r:2 w:2)
 	// Storage: System Account (r:1 w:1)
@@ -153,23 +232,69 @@
 	// Storage: System BlockWeight (r:1 w:1)
 	// Storage: Scheduler Lookup (r:0 w:1)
 	fn on_initialize_periodic_resolved(s: u32, ) -> Weight {
-		(36_613_000 as Weight)
+		(35_352_000 as Weight)
 			// Standard Error: 3_000
-			.saturating_add((31_895_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add((32_309_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(s as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((2 as Weight).saturating_mul(s as Weight)))
 	}
+	// Storage: Scheduler Agenda (r:2 w:2)
+	// Storage: Scheduler Lookup (r:0 w:1)
+	fn on_initialize_aborted(s: u32, ) -> Weight {
+		(11_267_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((9_368_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
+			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
+	}
+	// Storage: Scheduler Agenda (r:1 w:1)
+	// Storage: System Account (r:1 w:1)
+	// Storage: System AllExtrinsicsLen (r:1 w:1)
+	// Storage: System BlockWeight (r:1 w:1)
+	// Storage: Scheduler Lookup (r:0 w:1)
+	fn on_initialize_named_aborted(s: u32, ) -> Weight {
+		(35_937_000 as Weight)
+			// Standard Error: 3_000
+			.saturating_add((23_037_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
+			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
+	}
+	// Storage: Scheduler Agenda (r:2 w:2)
+	// Storage: Scheduler Lookup (r:0 w:1)
+	fn on_initialize_named(s: u32, ) -> Weight {
+		(10_338_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((9_422_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
+			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
+	}
+	// Storage: Scheduler Agenda (r:1 w:1)
+	// Storage: System Account (r:1 w:1)
+	// Storage: System AllExtrinsicsLen (r:1 w:1)
+	// Storage: System BlockWeight (r:1 w:1)
+	// Storage: Scheduler Lookup (r:0 w:1)
+	fn on_initialize(s: u32, ) -> Weight {
+		(37_448_000 as Weight)
+			// Standard Error: 7_000
+			.saturating_add((22_907_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
+			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
+	}
 	// Storage: Scheduler Agenda (r:1 w:1)
 	// Storage: System Account (r:1 w:1)
 	// Storage: System AllExtrinsicsLen (r:1 w:1)
 	// Storage: System BlockWeight (r:1 w:1)
 	// Storage: Scheduler Lookup (r:0 w:1)
 	fn on_initialize_resolved(s: u32, ) -> Weight {
-		(36_252_000 as Weight)
-			// Standard Error: 3_000
-			.saturating_add((22_662_000 as Weight).saturating_mul(s as Weight))
+		(34_841_000 as Weight)
+			// Standard Error: 7_000
+			.saturating_add((22_966_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
@@ -177,18 +302,18 @@
 	// Storage: Scheduler Lookup (r:1 w:1)
 	// Storage: Scheduler Agenda (r:1 w:1)
 	fn schedule_named(s: u32, ) -> Weight {
-		(34_561_000 as Weight)
+		(33_845_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((161_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add((168_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	// Storage: Scheduler Lookup (r:1 w:1)
 	// Storage: Scheduler Agenda (r:1 w:1)
 	fn cancel_named(s: u32, ) -> Weight {
-		(30_932_000 as Weight)
+		(31_169_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((1_537_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add((1_565_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
modifiedruntime/common/Cargo.tomldiffbeforeafterboth
--- a/runtime/common/Cargo.toml
+++ b/runtime/common/Cargo.toml
@@ -89,7 +89,7 @@
 default-features = false
 path = "../../pallets/refungible"
 
-[dependencies.pallet-unq-scheduler]
+[dependencies.pallet-unique-scheduler]
 default-features = false
 path = "../../pallets/scheduler"
 
modifiedruntime/common/src/runtime_apis.rsdiffbeforeafterboth
--- a/runtime/common/src/runtime_apis.rs
+++ b/runtime/common/src/runtime_apis.rs
@@ -774,7 +774,7 @@
                     list_benchmark!(list, extra, pallet_fungible, Fungible);
                     list_benchmark!(list, extra, pallet_refungible, Refungible);
                     list_benchmark!(list, extra, pallet_nonfungible, Nonfungible);
-                    list_benchmark!(list, extra, pallet_unq_scheduler, Scheduler);
+                    list_benchmark!(list, extra, pallet_unique_scheduler, Scheduler);
                     // list_benchmark!(list, extra, pallet_evm_coder_substrate, EvmCoderSubstrate);
 
                     let storage_info = AllPalletsReversedWithSystemFirst::storage_info();
@@ -818,7 +818,7 @@
                     add_benchmark!(params, batches, pallet_fungible, Fungible);
                     add_benchmark!(params, batches, pallet_refungible, Refungible);
                     add_benchmark!(params, batches, pallet_nonfungible, Nonfungible);
-                    add_benchmark!(params, batches, pallet_unq_scheduler, Scheduler);
+                    add_benchmark!(params, batches, pallet_unique_scheduler, Scheduler);
 
                     // add_benchmark!(params, batches, pallet_evm_coder_substrate, EvmCoderSubstrate);
 
modifiedruntime/opal/Cargo.tomldiffbeforeafterboth
--- a/runtime/opal/Cargo.toml
+++ b/runtime/opal/Cargo.toml
@@ -36,7 +36,7 @@
     'pallet-proxy-rmrk-core/runtime-benchmarks',
     'pallet-unique/runtime-benchmarks',
     'pallet-inflation/runtime-benchmarks',
-    'pallet-unq-scheduler/runtime-benchmarks',
+    'pallet-unique-scheduler/runtime-benchmarks',
     'pallet-xcm/runtime-benchmarks',
     'sp-runtime/runtime-benchmarks',
     'xcm-builder/runtime-benchmarks',
@@ -94,7 +94,7 @@
     'pallet-proxy-rmrk-core/std',
     'pallet-proxy-rmrk-equip/std',
     'pallet-unique/std',
-    'pallet-unq-scheduler/std',
+    'pallet-unique-scheduler/std',
     'pallet-charge-transaction/std',
     'up-data-structs/std',
     'sp-api/std',
@@ -413,7 +413,7 @@
 pallet-nonfungible = { default-features = false, path = "../../pallets/nonfungible" }
 pallet-proxy-rmrk-core = { default-features = false, path = "../../pallets/proxy-rmrk-core", package = "pallet-rmrk-core" }
 pallet-proxy-rmrk-equip = { default-features = false, path = "../../pallets/proxy-rmrk-equip", package = "pallet-rmrk-equip" }
-pallet-unq-scheduler = { path = '../../pallets/scheduler', default-features = false }
+pallet-unique-scheduler = { path = '../../pallets/scheduler', default-features = false }
 # pallet-contract-helpers = { path = '../pallets/contract-helpers', default-features = false, version = '0.1.0' }
 pallet-charge-transaction = { git = "https://github.com/uniquenetwork/pallet-sponsoring", branch = "polkadot-v0.9.22", package = "pallet-template-transaction-payment", default-features = false, version = "3.0.0" }
 pallet-evm-migration = { path = '../../pallets/evm-migration', default-features = false }
modifiedruntime/opal/src/lib.rsdiffbeforeafterboth
--- a/runtime/opal/src/lib.rs
+++ b/runtime/opal/src/lib.rs
@@ -68,7 +68,7 @@
 		WeightToFeePolynomial, WeightToFeeCoefficient, WeightToFeeCoefficients, ConstantMultiplier,
 	},
 };
-use pallet_unq_scheduler::DispatchCall;
+use pallet_unique_scheduler::DispatchCall;
 use up_data_structs::{
 	CollectionId, TokenId, TokenData, Property, PropertyKeyPermission, CollectionLimits,
 	CollectionStats, RpcCollection,
@@ -966,7 +966,7 @@
 }
 
 pub struct SchedulerPaymentExecutor;
-impl<T: frame_system::Config + pallet_unq_scheduler::Config, SelfContainedSignedInfo>
+impl<T: frame_system::Config + pallet_unique_scheduler::Config, SelfContainedSignedInfo>
 	DispatchCall<T, SelfContainedSignedInfo> for SchedulerPaymentExecutor
 where
 	<T as frame_system::Config>::Call: Member
@@ -976,13 +976,13 @@
 		+ From<frame_system::Call<Runtime>>,
 	SelfContainedSignedInfo: Send + Sync + 'static,
 	Call: From<<T as frame_system::Config>::Call>
-		+ From<<T as pallet_unq_scheduler::Config>::Call>
+		+ From<<T as pallet_unique_scheduler::Config>::Call>
 		+ SelfContainedCall<SignedInfo = SelfContainedSignedInfo>,
 	sp_runtime::AccountId32: From<<T as frame_system::Config>::AccountId>,
 {
 	fn dispatch_call(
 		signer: <T as frame_system::Config>::AccountId,
-		call: <T as pallet_unq_scheduler::Config>::Call,
+		call: <T as pallet_unique_scheduler::Config>::Call,
 	) -> Result<
 		Result<PostDispatchInfo, DispatchErrorWithPostInfo<PostDispatchInfo>>,
 		TransactionValidityError,
@@ -1008,7 +1008,7 @@
 	fn reserve_balance(
 		id: [u8; 16],
 		sponsor: <T as frame_system::Config>::AccountId,
-		call: <T as pallet_unq_scheduler::Config>::Call,
+		call: <T as pallet_unique_scheduler::Config>::Call,
 		count: u32,
 	) -> Result<(), DispatchError> {
 		let dispatch_info = call.get_dispatch_info();
@@ -1025,7 +1025,7 @@
 	fn pay_for_call(
 		id: [u8; 16],
 		sponsor: <T as frame_system::Config>::AccountId,
-		call: <T as pallet_unq_scheduler::Config>::Call,
+		call: <T as pallet_unique_scheduler::Config>::Call,
 	) -> Result<u128, DispatchError> {
 		let dispatch_info = call.get_dispatch_info();
 		let weight: Balance = ChargeTransactionPayment::traditional_fee(0, &dispatch_info, 0);
@@ -1066,7 +1066,7 @@
 	}
 }
 
-impl pallet_unq_scheduler::Config for Runtime {
+impl pallet_unique_scheduler::Config for Runtime {
 	type Event = Event;
 	type Origin = Origin;
 	type Currency = Balances;
@@ -1155,7 +1155,7 @@
 		// Unique Pallets
 		Inflation: pallet_inflation::{Pallet, Call, Storage} = 60,
 		Unique: pallet_unique::{Pallet, Call, Storage, Event<T>} = 61,
-		Scheduler: pallet_unq_scheduler::{Pallet, Call, Storage, Event<T>} = 62,
+		Scheduler: pallet_unique_scheduler::{Pallet, Call, Storage, Event<T>} = 62,
 		// free = 63
 		Charging: pallet_charge_transaction::{Pallet, Call, Storage } = 64,
 		// ContractHelpers: pallet_contract_helpers::{Pallet, Call, Storage} = 65,
modifiedruntime/quartz/Cargo.tomldiffbeforeafterboth
--- a/runtime/quartz/Cargo.toml
+++ b/runtime/quartz/Cargo.toml
@@ -36,7 +36,7 @@
     'pallet-proxy-rmrk-core/runtime-benchmarks',
     'pallet-unique/runtime-benchmarks',
     'pallet-inflation/runtime-benchmarks',
-    'pallet-unq-scheduler/runtime-benchmarks',
+    'pallet-unique-scheduler/runtime-benchmarks',
     'pallet-xcm/runtime-benchmarks',
     'sp-runtime/runtime-benchmarks',
     'xcm-builder/runtime-benchmarks',
@@ -93,7 +93,7 @@
     'pallet-nonfungible/std',
     'pallet-proxy-rmrk-core/std',
     'pallet-unique/std',
-    'pallet-unq-scheduler/std',
+    'pallet-unique-scheduler/std',
     'pallet-charge-transaction/std',
     'up-data-structs/std',
     'sp-api/std',
@@ -417,7 +417,7 @@
 pallet-refungible = { default-features = false, path = "../../pallets/refungible" }
 pallet-nonfungible = { default-features = false, path = "../../pallets/nonfungible" }
 pallet-proxy-rmrk-core = { default-features = false, path = "../../pallets/proxy-rmrk-core", package = "pallet-rmrk-core" }
-pallet-unq-scheduler = { path = '../../pallets/scheduler', default-features = false }
+pallet-unique-scheduler = { path = '../../pallets/scheduler', default-features = false }
 # pallet-contract-helpers = { path = '../pallets/contract-helpers', default-features = false, version = '0.1.0' }
 pallet-charge-transaction = { git = "https://github.com/uniquenetwork/pallet-sponsoring", branch = "polkadot-v0.9.22", package = "pallet-template-transaction-payment", default-features = false, version = "3.0.0" }
 pallet-evm-migration = { path = '../../pallets/evm-migration', default-features = false }
modifiedruntime/quartz/src/lib.rsdiffbeforeafterboth
--- a/runtime/quartz/src/lib.rs
+++ b/runtime/quartz/src/lib.rs
@@ -68,7 +68,7 @@
 		WeightToFeePolynomial, WeightToFeeCoefficient, WeightToFeeCoefficients, ConstantMultiplier,
 	},
 };
-use pallet_unq_scheduler::DispatchCall;
+use pallet_unique_scheduler::DispatchCall;
 use up_data_structs::{
 	CollectionId, TokenId, TokenData, Property, PropertyKeyPermission, CollectionLimits, 
 	CollectionStats, RpcCollection, 
@@ -963,7 +963,7 @@
 }
 
 pub struct SchedulerPaymentExecutor;
-impl<T: frame_system::Config + pallet_unq_scheduler::Config, SelfContainedSignedInfo>
+impl<T: frame_system::Config + pallet_unique_scheduler::Config, SelfContainedSignedInfo>
 	DispatchCall<T, SelfContainedSignedInfo> for SchedulerPaymentExecutor
 where
 	<T as frame_system::Config>::Call: Member
@@ -973,13 +973,13 @@
 		+ From<frame_system::Call<Runtime>>,
 	SelfContainedSignedInfo: Send + Sync + 'static,
 	Call: From<<T as frame_system::Config>::Call>
-		+ From<<T as pallet_unq_scheduler::Config>::Call>
+		+ From<<T as pallet_unique_scheduler::Config>::Call>
 		+ SelfContainedCall<SignedInfo = SelfContainedSignedInfo>,
 	sp_runtime::AccountId32: From<<T as frame_system::Config>::AccountId>,
 {
 	fn dispatch_call(
 		signer: <T as frame_system::Config>::AccountId,
-		call: <T as pallet_unq_scheduler::Config>::Call,
+		call: <T as pallet_unique_scheduler::Config>::Call,
 	) -> Result<
 		Result<PostDispatchInfo, DispatchErrorWithPostInfo<PostDispatchInfo>>,
 		TransactionValidityError,
@@ -1005,7 +1005,7 @@
 	fn reserve_balance(
 		id: [u8; 16],
 		sponsor: <T as frame_system::Config>::AccountId,
-		call: <T as pallet_unq_scheduler::Config>::Call,
+		call: <T as pallet_unique_scheduler::Config>::Call,
 		count: u32,
 	) -> Result<(), DispatchError> {
 		let dispatch_info = call.get_dispatch_info();
@@ -1022,7 +1022,7 @@
 	fn pay_for_call(
 		id: [u8; 16],
 		sponsor: <T as frame_system::Config>::AccountId,
-		call: <T as pallet_unq_scheduler::Config>::Call,
+		call: <T as pallet_unique_scheduler::Config>::Call,
 	) -> Result<u128, DispatchError> {
 		let dispatch_info = call.get_dispatch_info();
 		let weight: Balance = ChargeTransactionPayment::traditional_fee(0, &dispatch_info, 0);
@@ -1063,7 +1063,7 @@
 	}
 }
 
-impl pallet_unq_scheduler::Config for Runtime {
+impl pallet_unique_scheduler::Config for Runtime {
 	type Event = Event;
 	type Origin = Origin;
 	type Currency = Balances;
@@ -1151,7 +1151,7 @@
 		// Unique Pallets
 		Inflation: pallet_inflation::{Pallet, Call, Storage} = 60,
 		Unique: pallet_unique::{Pallet, Call, Storage, Event<T>} = 61,
-		Scheduler: pallet_unq_scheduler::{Pallet, Call, Storage, Event<T>} = 62,
+		Scheduler: pallet_unique_scheduler::{Pallet, Call, Storage, Event<T>} = 62,
 		// free = 63
 		Charging: pallet_charge_transaction::{Pallet, Call, Storage } = 64,
 		// ContractHelpers: pallet_contract_helpers::{Pallet, Call, Storage} = 65,
modifiedruntime/unique/Cargo.tomldiffbeforeafterboth
--- a/runtime/unique/Cargo.toml
+++ b/runtime/unique/Cargo.toml
@@ -36,7 +36,7 @@
     'pallet-proxy-rmrk-core/runtime-benchmarks',
     'pallet-unique/runtime-benchmarks',
     'pallet-inflation/runtime-benchmarks',
-    'pallet-unq-scheduler/runtime-benchmarks',
+    'pallet-unique-scheduler/runtime-benchmarks',
     'pallet-xcm/runtime-benchmarks',
     'sp-runtime/runtime-benchmarks',
     'xcm-builder/runtime-benchmarks',
@@ -94,7 +94,7 @@
     'pallet-nonfungible/std',
     'pallet-proxy-rmrk-core/std',
     'pallet-unique/std',
-    'pallet-unq-scheduler/std',
+    'pallet-unique-scheduler/std',
     'pallet-charge-transaction/std',
     'up-data-structs/std',
     'sp-api/std',
@@ -410,7 +410,7 @@
 pallet-refungible = { default-features = false, path = "../../pallets/refungible" }
 pallet-nonfungible = { default-features = false, path = "../../pallets/nonfungible" }
 pallet-proxy-rmrk-core = { default-features = false, path = "../../pallets/proxy-rmrk-core", package = "pallet-rmrk-core" }
-pallet-unq-scheduler = { path = '../../pallets/scheduler', default-features = false }
+pallet-unique-scheduler = { path = '../../pallets/scheduler', default-features = false }
 # pallet-contract-helpers = { path = '../pallets/contract-helpers', default-features = false, version = '0.1.0' }
 pallet-charge-transaction = { git = "https://github.com/uniquenetwork/pallet-sponsoring", branch = "polkadot-v0.9.22", package = "pallet-template-transaction-payment", default-features = false, version = "3.0.0" }
 pallet-evm-migration = { path = '../../pallets/evm-migration', default-features = false }
modifiedruntime/unique/src/lib.rsdiffbeforeafterboth
--- a/runtime/unique/src/lib.rs
+++ b/runtime/unique/src/lib.rs
@@ -68,7 +68,7 @@
 		WeightToFeePolynomial, WeightToFeeCoefficient, WeightToFeeCoefficients, ConstantMultiplier,
 	},
 };
-use pallet_unq_scheduler::DispatchCall;
+use pallet_unique_scheduler::DispatchCall;
 use up_data_structs::{
 	CollectionId, TokenId, TokenData, Property, PropertyKeyPermission, CollectionLimits,
 	CollectionStats, RpcCollection,
@@ -962,7 +962,7 @@
 }
 
 pub struct SchedulerPaymentExecutor;
-impl<T: frame_system::Config + pallet_unq_scheduler::Config, SelfContainedSignedInfo>
+impl<T: frame_system::Config + pallet_unique_scheduler::Config, SelfContainedSignedInfo>
 	DispatchCall<T, SelfContainedSignedInfo> for SchedulerPaymentExecutor
 where
 	<T as frame_system::Config>::Call: Member
@@ -972,13 +972,13 @@
 		+ From<frame_system::Call<Runtime>>,
 	SelfContainedSignedInfo: Send + Sync + 'static,
 	Call: From<<T as frame_system::Config>::Call>
-		+ From<<T as pallet_unq_scheduler::Config>::Call>
+		+ From<<T as pallet_unique_scheduler::Config>::Call>
 		+ SelfContainedCall<SignedInfo = SelfContainedSignedInfo>,
 	sp_runtime::AccountId32: From<<T as frame_system::Config>::AccountId>,
 {
 	fn dispatch_call(
 		signer: <T as frame_system::Config>::AccountId,
-		call: <T as pallet_unq_scheduler::Config>::Call,
+		call: <T as pallet_unique_scheduler::Config>::Call,
 	) -> Result<
 		Result<PostDispatchInfo, DispatchErrorWithPostInfo<PostDispatchInfo>>,
 		TransactionValidityError,
@@ -1004,7 +1004,7 @@
 	fn reserve_balance(
 		id: [u8; 16],
 		sponsor: <T as frame_system::Config>::AccountId,
-		call: <T as pallet_unq_scheduler::Config>::Call,
+		call: <T as pallet_unique_scheduler::Config>::Call,
 		count: u32,
 	) -> Result<(), DispatchError> {
 		let dispatch_info = call.get_dispatch_info();
@@ -1021,7 +1021,7 @@
 	fn pay_for_call(
 		id: [u8; 16],
 		sponsor: <T as frame_system::Config>::AccountId,
-		call: <T as pallet_unq_scheduler::Config>::Call,
+		call: <T as pallet_unique_scheduler::Config>::Call,
 	) -> Result<u128, DispatchError> {
 		let dispatch_info = call.get_dispatch_info();
 		let weight: Balance = ChargeTransactionPayment::traditional_fee(0, &dispatch_info, 0);
@@ -1062,7 +1062,7 @@
 	}
 }
 
-impl pallet_unq_scheduler::Config for Runtime {
+impl pallet_unique_scheduler::Config for Runtime {
 	type Event = Event;
 	type Origin = Origin;
 	type Currency = Balances;
@@ -1150,7 +1150,7 @@
 		// Unique Pallets
 		Inflation: pallet_inflation::{Pallet, Call, Storage} = 60,
 		Unique: pallet_unique::{Pallet, Call, Storage, Event<T>} = 61,
-		Scheduler: pallet_unq_scheduler::{Pallet, Call, Storage, Event<T>} = 62,
+		Scheduler: pallet_unique_scheduler::{Pallet, Call, Storage, Event<T>} = 62,
 		// free = 63
 		Charging: pallet_charge_transaction::{Pallet, Call, Storage } = 64,
 		// ContractHelpers: pallet_contract_helpers::{Pallet, Call, Storage} = 65,