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

81	traits::{81	traits::{
82		schedule::{self, DispatchTime},82		schedule::{self, DispatchTime},
83		EnsureOrigin, Get, IsType, OriginTrait, PrivilegeCmp, StorageVersion, PreimageRecipient,83		EnsureOrigin, Get, IsType, OriginTrait, PrivilegeCmp, StorageVersion, PreimageRecipient,
84		ConstU32,84		ConstU32, UnfilteredDispatchable,
85	},85	},
86	weights::Weight,86	weights::{Weight, PostDispatchInfo}, unsigned::TransactionValidityError,
87};87};
8888
89use frame_system::{self as system};89use frame_system::{self as system};
90use scale_info::TypeInfo;90use scale_info::TypeInfo;
91use sp_runtime::{91use sp_runtime::{
92	traits::{BadOrigin, One, Saturating, Zero, Hash},92	traits::{BadOrigin, One, Saturating, Zero, Hash},
93	BoundedVec, RuntimeDebug,93	BoundedVec, RuntimeDebug, DispatchErrorWithPostInfo,
94};94};
95use sp_core::H160;
95use sp_std::{borrow::Borrow, cmp::Ordering, marker::PhantomData, prelude::*};96use sp_std::{borrow::Borrow, cmp::Ordering, marker::PhantomData, prelude::*};
96pub use weights::WeightInfo;97pub use weights::WeightInfo;
9798
206	}207	}
207}208}
209
210pub enum ScheduledEnsureOriginSuccess<AccountId> {
211	Root,
212	Signed(AccountId),
213	Unsigned,
214}
208215
209pub type TaskName = [u8; 32];216pub type TaskName = [u8; 32];
210217
312		/// The aggregated call type.319		/// The aggregated call type.
313		type Call: Parameter320		type Call: Parameter
314			+ Dispatchable<Origin = <Self as Config>::Origin, PostInfo = PostDispatchInfo>321			+ Dispatchable<Origin = <Self as Config>::Origin, PostInfo = PostDispatchInfo>
322			+ UnfilteredDispatchable<Origin = <Self as system::Config>::Origin>
315			+ GetDispatchInfo323			+ GetDispatchInfo
316			+ From<system::Call<Self>>;324			+ From<system::Call<Self>>;
317325
321329
322		/// Required origin to schedule or cancel calls.330		/// Required origin to schedule or cancel calls.
323		type ScheduleOrigin: EnsureOrigin<<Self as system::Config>::Origin>;331		type ScheduleOrigin: EnsureOrigin<
332			<Self as system::Config>::Origin,
333			Success = ScheduledEnsureOriginSuccess<Self::AccountId>,
334		>;
324335
325		/// Compare the privileges of origins.336		/// Compare the privileges of origins.
341		/// The preimage provider with which we look up call hashes to get the call.352		/// The preimage provider with which we look up call hashes to get the call.
342		type Preimages: SchedulerPreimages<Self>;353		type Preimages: SchedulerPreimages<Self>;
354
355		/// The helper type used for custom transaction fee logic.
356		type CallExecutor: DispatchCall<Self, H160>;
343	}357	}
344358
345	#[pallet::storage]359	#[pallet::storage]
726}740}
727use ServiceTaskError::*;741use ServiceTaskError::*;
742
743/// A Scheduler-Runtime interface for finer payment handling.
744pub trait DispatchCall<T: frame_system::Config + Config, SelfContainedSignedInfo> {
745	/// Resolve the call dispatch, including any post-dispatch operations.
746	fn dispatch_call(
747		signer: Option<T::AccountId>,
748		function: <T as Config>::Call,
749	) -> Result<
750		Result<PostDispatchInfo, DispatchErrorWithPostInfo<PostDispatchInfo>>,
751		TransactionValidityError,
752	>;
753}
728754
729impl<T: Config> Pallet<T> {755impl<T: Config> Pallet<T> {
730	/// Service up to `max` agendas queue starting from earliest incompletely executed agenda.756	/// Service up to `max` agendas queue starting from earliest incompletely executed agenda.
927			return Err(Overweight);953			return Err(Overweight);
928		}954		}
955
956		// let scheduled_origin =
957		// 	<<T as Config>::Origin as From<T::PalletsOrigin>>::from(origin.clone());
958		let ensured_origin = T::ScheduleOrigin::ensure_origin(dispatch_origin.into());
959
960		let r = match ensured_origin {
961			Ok(ScheduledEnsureOriginSuccess::Root) => {
962				Ok(call.dispatch_bypass_filter(frame_system::RawOrigin::Root.into()))
963			},
964			Ok(ScheduledEnsureOriginSuccess::Signed(sender)) => {
965				// Execute transaction via chain default pipeline
966				// That means dispatch will be processed like any user's extrinsic e.g. transaction fees will be taken
967				T::CallExecutor::dispatch_call(Some(sender), call.clone())
968			},
969			Ok(ScheduledEnsureOriginSuccess::Unsigned) => {
970				// Unsigned version of the above
971				T::CallExecutor::dispatch_call(None, call.clone())
972			}
973			Err(e) => Ok(Err(e.into())),
974		};
929975
930		let (maybe_actual_call_weight, result) = match call.dispatch(dispatch_origin) {976		let (maybe_actual_call_weight, result) = match r {
977			Ok(result) => match result {
931			Ok(post_info) => (post_info.actual_weight, Ok(())),978				Ok(post_info) => (post_info.actual_weight, Ok(())),
932			Err(error_and_info) => (979				Err(error_and_info) => (
933				error_and_info.post_info.actual_weight,980					error_and_info.post_info.actual_weight,
934				Err(error_and_info.error),981					Err(error_and_info.error),
935			),982				),
936		};983			},
984			Err(_) => {
985				log::error!(
986					target: "runtime::scheduler",
987					"Warning: Scheduler has failed to execute a post-dispatch transaction. \
988					This block might have become invalid.");
989				(None, Err(DispatchError::CannotLookup))
990			}
991		};
937		let call_weight = maybe_actual_call_weight.unwrap_or(call_weight);992		let call_weight = maybe_actual_call_weight.unwrap_or(call_weight);
938		weight.check_accrue(base_weight);993		weight.check_accrue(base_weight);
939		weight.check_accrue(call_weight);994		weight.check_accrue(call_weight);

27	runtime_common::{scheduler::SchedulerPaymentExecutor, config::substrate::RuntimeBlockWeights},27	runtime_common::{scheduler::SchedulerPaymentExecutor, config::substrate::RuntimeBlockWeights},
28	Runtime, RuntimeCall, RuntimeEvent, RuntimeOrigin, OriginCaller, Balances,28	Runtime, RuntimeCall, RuntimeEvent, RuntimeOrigin, OriginCaller, Balances,
29};29};
30use pallet_unique_scheduler::ScheduledEnsureOriginSuccess;30use pallet_unique_scheduler_v2::ScheduledEnsureOriginSuccess;
31use up_common::types::AccountId;31use up_common::types::AccountId;
3232
33parameter_types! {33parameter_types! {
98	type MaxScheduledPerBlock = MaxScheduledPerBlock;98	type MaxScheduledPerBlock = MaxScheduledPerBlock;
99	type WeightInfo = ();99	type WeightInfo = ();
100	type Preimages = ();100	type Preimages = ();
101	type CallExecutor = SchedulerPaymentExecutor;
101}102}
102103

28use crate::{Runtime, RuntimeCall, RuntimeOrigin, Balances};28use crate::{Runtime, RuntimeCall, RuntimeOrigin, Balances};
29use up_common::types::{AccountId, Balance};29use up_common::types::{AccountId, Balance};
30use fp_self_contained::SelfContainedCall;30use fp_self_contained::SelfContainedCall;
31use pallet_unique_scheduler::DispatchCall;31use pallet_unique_scheduler_v2::DispatchCall;
32use pallet_transaction_payment::ChargeTransactionPayment;32use pallet_transaction_payment::ChargeTransactionPayment;
3333
34type SponsorshipChargeTransactionPayment =34// type SponsorshipChargeTransactionPayment =
35	pallet_charge_transaction::ChargeTransactionPayment<Runtime>;35// 	pallet_charge_transaction::ChargeTransactionPayment<Runtime>;
3636
37/// The SignedExtension to the basic transaction logic.37/// The SignedExtension to the basic transaction logic.
38pub type SignedExtraScheduler = (38pub type SignedExtraScheduler = (
5959
60pub struct SchedulerPaymentExecutor;60pub struct SchedulerPaymentExecutor;
6161
62impl<T: frame_system::Config + pallet_unique_scheduler::Config, SelfContainedSignedInfo>62impl<T: frame_system::Config + pallet_unique_scheduler_v2::Config, SelfContainedSignedInfo>
63	DispatchCall<T, SelfContainedSignedInfo> for SchedulerPaymentExecutor63	DispatchCall<T, SelfContainedSignedInfo> for SchedulerPaymentExecutor
64where64where
65	<T as frame_system::Config>::RuntimeCall: Member65	<T as frame_system::Config>::RuntimeCall: Member
69		+ From<frame_system::Call<Runtime>>,69		+ From<frame_system::Call<Runtime>>,
70	SelfContainedSignedInfo: Send + Sync + 'static,70	SelfContainedSignedInfo: Send + Sync + 'static,
71	RuntimeCall: From<<T as frame_system::Config>::RuntimeCall>71	RuntimeCall: From<<T as frame_system::Config>::RuntimeCall>
72		+ From<<T as pallet_unique_scheduler::Config>::RuntimeCall>72		+ From<<T as pallet_unique_scheduler_v2::Config>::RuntimeCall>
73		+ SelfContainedCall<SignedInfo = SelfContainedSignedInfo>,73		+ SelfContainedCall<SignedInfo = SelfContainedSignedInfo>,
74	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: Option<<T as frame_system::Config>::AccountId>,77		signer: Option<<T as frame_system::Config>::AccountId>,
78		call: <T as pallet_unique_scheduler::Config>::RuntimeCall,78		call: <T as pallet_unique_scheduler_v2::Config>::RuntimeCall,
79	) -> Result<79	) -> Result<
80		Result<PostDispatchInfo, DispatchErrorWithPostInfo<PostDispatchInfo>>,80		Result<PostDispatchInfo, DispatchErrorWithPostInfo<PostDispatchInfo>>,
81		TransactionValidityError,81		TransactionValidityError,
104		extrinsic.apply::<Runtime>(&dispatch_info, len)104		extrinsic.apply::<Runtime>(&dispatch_info, len)
105	}105	}
106
107	fn reserve_balance(
108		id: [u8; 16],
109		sponsor: <T as frame_system::Config>::AccountId,
110		call: <T as pallet_unique_scheduler::Config>::RuntimeCall,
111		count: u32,
112	) -> Result<(), DispatchError> {
113		let dispatch_info = call.get_dispatch_info();
114		let weight: Balance =
115			SponsorshipChargeTransactionPayment::traditional_fee(0, &dispatch_info, 0)
116				.saturating_mul(count.into());
117
118		<Balances as NamedReservableCurrency<AccountId>>::reserve_named(
119			&id,
120			&(sponsor.into()),
121			weight,
122		)
123	}
124
125	fn pay_for_call(
126		id: [u8; 16],
127		sponsor: <T as frame_system::Config>::AccountId,
128		call: <T as pallet_unique_scheduler::Config>::RuntimeCall,
129	) -> Result<u128, DispatchError> {
130		let dispatch_info = call.get_dispatch_info();
131		let weight: Balance =
132			SponsorshipChargeTransactionPayment::traditional_fee(0, &dispatch_info, 0);
133		Ok(
134			<Balances as NamedReservableCurrency<AccountId>>::unreserve_named(
135				&id,
136				&(sponsor.into()),
137				weight,
138			),
139		)
140	}
141
142	fn cancel_reserve(
143		id: [u8; 16],
144		sponsor: <T as frame_system::Config>::AccountId,
145	) -> Result<u128, DispatchError> {
146		Ok(
147			<Balances as NamedReservableCurrency<AccountId>>::unreserve_named(
148				&id,
149				&(sponsor.into()),
150				u128::MAX,
151			),
152		)
153	}
154}106}
107
108
109// impl<T: frame_system::Config + pallet_unique_scheduler::Config, SelfContainedSignedInfo>
110// 	DispatchCall<T, SelfContainedSignedInfo> for SchedulerPaymentExecutor
111// where
112// 	<T as frame_system::Config>::Call: Member
113// 		+ Dispatchable<Origin = Origin, Info = DispatchInfo>
114// 		+ SelfContainedCall<SignedInfo = SelfContainedSignedInfo>
115// 		+ GetDispatchInfo
116// 		+ From<frame_system::Call<Runtime>>,
117// 	SelfContainedSignedInfo: Send + Sync + 'static,
118// 	Call: From<<T as frame_system::Config>::Call>
119// 		+ From<<T as pallet_unique_scheduler::Config>::Call>
120// 		+ SelfContainedCall<SignedInfo = SelfContainedSignedInfo>,
121// 	sp_runtime::AccountId32: From<<T as frame_system::Config>::AccountId>,
122// {
123// 	fn dispatch_call(
124// 		signer: Option<<T as frame_system::Config>::AccountId>,
125// 		call: <T as pallet_unique_scheduler::Config>::Call,
126// 	) -> Result<
127// 		Result<PostDispatchInfo, DispatchErrorWithPostInfo<PostDispatchInfo>>,
128// 		TransactionValidityError,
129// 	> {
130// 		let dispatch_info = call.get_dispatch_info();
131// 		let len = call.encoded_size();
132
133// 		let signed = match signer {
134// 			Some(signer) => fp_self_contained::CheckedSignature::Signed(
135// 				signer.clone().into(),
136// 				get_signed_extras(signer.into()),
137// 			),
138// 			None => fp_self_contained::CheckedSignature::Unsigned,
139// 		};
140
141// 		let extrinsic = fp_self_contained::CheckedExtrinsic::<
142// 			AccountId,
143// 			Call,
144// 			SignedExtraScheduler,
145// 			SelfContainedSignedInfo,
146// 		> {
147// 			signed,
148// 			function: call.into(),
149// 		};
150
151// 		extrinsic.apply::<Runtime>(&dispatch_info, len)
152// 	}
153
154// 	fn reserve_balance(
155// 		id: [u8; 16],
156// 		sponsor: <T as frame_system::Config>::AccountId,
157// 		call: <T as pallet_unique_scheduler::Config>::Call,
158// 		count: u32,
159// 	) -> Result<(), DispatchError> {
160// 		let dispatch_info = call.get_dispatch_info();
161// 		let weight: Balance =
162// 			SponsorshipChargeTransactionPayment::traditional_fee(0, &dispatch_info, 0)
163// 				.saturating_mul(count.into());
164
165// 		<Balances as NamedReservableCurrency<AccountId>>::reserve_named(
166// 			&id,
167// 			&(sponsor.into()),
168// 			weight,
169// 		)
170// 	}
171
172// 	fn pay_for_call(
173// 		id: [u8; 16],
174// 		sponsor: <T as frame_system::Config>::AccountId,
175// 		call: <T as pallet_unique_scheduler::Config>::Call,
176// 	) -> Result<u128, DispatchError> {
177// 		let dispatch_info = call.get_dispatch_info();
178// 		let weight: Balance =
179// 			SponsorshipChargeTransactionPayment::traditional_fee(0, &dispatch_info, 0);
180// 		Ok(
181// 			<Balances as NamedReservableCurrency<AccountId>>::unreserve_named(
182// 				&id,
183// 				&(sponsor.into()),
184// 				weight,
185// 			),
186// 		)
187// 	}
188
189// 	fn cancel_reserve(
190// 		id: [u8; 16],
191// 		sponsor: <T as frame_system::Config>::AccountId,
192// 	) -> Result<u128, DispatchError> {
193// 		Ok(
194// 			<Balances as NamedReservableCurrency<AccountId>>::unreserve_named(
195// 				&id,
196// 				&(sponsor.into()),
197// 				u128::MAX,
198// 			),
199// 		)
200// 	}
201// }
155202