git.delta.rocks / unique-network / refs/commits / 83f1741d1d73

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