difftreelog
Merge branch 'master' into release-v922000
in: master
9 files changed
README.mddiffbeforeafterboth--- a/README.md
+++ b/README.md
@@ -62,8 +62,18 @@
```
5. Build:
+
+Opal
+```bash
+cargo build --release
+```
+Quartz
+```bash
+cargo build --features=quartz-runtime --release
+```
+Unique
```bash
-cargo build --features=unique-runtime,quartz-runtime --release
+cargo build --features=unique-runtime --release
```
## Building as Parachain locally
@@ -155,13 +165,13 @@
location:
V0(X2(Parent, Parachain(PARA_ID)))
metadata:
- name OPL
- symbol OPL
+ name QTZ
+ symbol QTZ
decimals 18
minimalBalance 1
```
-### Next, we can send tokens from Opal to Karura:
+### Next, we can send tokens from Quartz to Karura:
```
polkadotXcm -> reserveTransferAssets
dest:
@@ -179,7 +189,7 @@
The result will be displayed in ChainState
tokens -> accounts
-### To send tokens from Karura to Opal:
+### To send tokens from Karura to Quartz:
```
xtokens -> transfer
client/rpc/src/lib.rsdiffbeforeafterboth--- a/client/rpc/src/lib.rs
+++ b/client/rpc/src/lib.rs
@@ -14,6 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
+// Original License
use std::sync::Arc;
use codec::{Decode, Encode};
node/cli/src/service.rsdiffbeforeafterboth--- a/node/cli/src/service.rs
+++ b/node/cli/src/service.rs
@@ -14,8 +14,6 @@
// You should have received a copy of the GNU General Public License
// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
-//! Service and ServiceFactory implementation. Specialized wrapper over substrate service.
-
// std
use std::sync::Arc;
use std::sync::Mutex;
pallets/scheduler/src/lib.rsdiffbeforeafterboth1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.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(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 let when = Self::resolve_time(when)?;620 call.ensure_requested::<T::PreimageProvider>();621622 // sanitize maybe_periodic623 let maybe_periodic = maybe_periodic624 .filter(|p| p.1 > 1 && !p.0.is_zero())625 // Remove one from the number of repetitions since we will schedule one now.626 .map(|(p, c)| (p, c - 1));627 let s = Some(Scheduled {628 maybe_id: None,629 priority,630 call,631 maybe_periodic,632 origin,633 _phantom: PhantomData::<T::AccountId>::default(),634 });635 Agenda::<T>::append(when, s);636 let index = Agenda::<T>::decode_len(when).unwrap_or(1) as u32 - 1;637 Self::deposit_event(Event::Scheduled { when, index });638639 Ok((when, index))640 }641642 fn do_cancel(643 origin: Option<T::PalletsOrigin>,644 (when, index): TaskAddress<T::BlockNumber>,645 ) -> Result<(), DispatchError> {646 let scheduled = Agenda::<T>::try_mutate(when, |agenda| {647 agenda.get_mut(index as usize).map_or(648 Ok(None),649 |s| -> Result<Option<Scheduled<_, _, _, _>>, DispatchError> {650 if let (Some(ref o), Some(ref s)) = (origin, s.borrow()) {651 if matches!(652 T::OriginPrivilegeCmp::cmp_privilege(o, &s.origin),653 Some(Ordering::Less) | None654 ) {655 return Err(BadOrigin.into());656 }657 };658 Ok(s.take())659 },660 )661 })?;662 if let Some(s) = scheduled {663 s.call.ensure_unrequested::<T::PreimageProvider>();664 if let Some(id) = s.maybe_id {665 Lookup::<T>::remove(id);666 }667 Self::deposit_event(Event::Canceled { when, index });668 Ok(())669 } else {670 Err(Error::<T>::NotFound)?671 }672 }673674 fn do_reschedule(675 (when, index): TaskAddress<T::BlockNumber>,676 new_time: DispatchTime<T::BlockNumber>,677 ) -> Result<TaskAddress<T::BlockNumber>, DispatchError> {678 let new_time = Self::resolve_time(new_time)?;679680 if new_time == when {681 return Err(Error::<T>::RescheduleNoChange.into());682 }683684 Agenda::<T>::try_mutate(when, |agenda| -> DispatchResult {685 let task = agenda.get_mut(index as usize).ok_or(Error::<T>::NotFound)?;686 let task = task.take().ok_or(Error::<T>::NotFound)?;687 Agenda::<T>::append(new_time, Some(task));688 Ok(())689 })?;690691 let new_index = Agenda::<T>::decode_len(new_time).unwrap_or(1) as u32 - 1;692 Self::deposit_event(Event::Canceled { when, index });693 Self::deposit_event(Event::Scheduled {694 when: new_time,695 index: new_index,696 });697698 Ok((new_time, new_index))699 }700701 fn do_schedule_named(702 id: ScheduledId,703 when: DispatchTime<T::BlockNumber>,704 maybe_periodic: Option<schedule::Period<T::BlockNumber>>,705 priority: schedule::Priority,706 origin: T::PalletsOrigin,707 call: CallOrHashOf<T>,708 ) -> Result<TaskAddress<T::BlockNumber>, DispatchError> {709 // ensure id it is unique710 if Lookup::<T>::contains_key(&id) {711 return Err(Error::<T>::FailedToSchedule)?;712 }713714 let when = Self::resolve_time(when)?;715716 call.ensure_requested::<T::PreimageProvider>();717718 // sanitize maybe_periodic719 let maybe_periodic = maybe_periodic720 .filter(|p| p.1 > 1 && !p.0.is_zero())721 // Remove one from the number of repetitions since we will schedule one now.722 .map(|(p, c)| (p, c - 1));723724 let s = Scheduled {725 maybe_id: Some(id.clone()),726 priority,727 call: call.clone(),728 maybe_periodic,729 origin: origin.clone(),730 _phantom: Default::default(),731 };732733 // reserve balance for periodic execution734 // let sender =735 // ensure_signed(<<T as Config>::Origin as From<T::PalletsOrigin>>::from(origin).into())?;736 // let repeats = match maybe_periodic {737 // Some(p) => p.1,738 // None => 1,739 // };740 // let _ = T::CallExecutor::reserve_balance(741 // id.clone(),742 // sender,743 // call.as_value().unwrap().clone(),744 // repeats,745 // );746747 Agenda::<T>::append(when, Some(s));748 let index = Agenda::<T>::decode_len(when).unwrap_or(1) as u32 - 1;749 let address = (when, index);750 Lookup::<T>::insert(&id, &address);751 Self::deposit_event(Event::Scheduled { when, index });752753 Ok(address)754 }755756 fn do_cancel_named(origin: Option<T::PalletsOrigin>, id: ScheduledId) -> DispatchResult {757 Lookup::<T>::try_mutate_exists(id, |lookup| -> DispatchResult {758 if let Some((when, index)) = lookup.take() {759 let i = index as usize;760 Agenda::<T>::try_mutate(when, |agenda| -> DispatchResult {761 if let Some(s) = agenda.get_mut(i) {762 if let (Some(ref o), Some(ref s)) = (origin.clone(), s.borrow()) {763 if matches!(764 T::OriginPrivilegeCmp::cmp_privilege(o, &s.origin),765 Some(Ordering::Less) | None766 ) {767 return Err(BadOrigin.into());768 }769 // release balance reserve770 // let sender = ensure_signed(771 // <<T as Config>::Origin as From<T::PalletsOrigin>>::from(772 // origin.unwrap(),773 // )774 // .into(),775 // )?;776 // let _ = T::CallExecutor::cancel_reserve(id, sender);777778 s.call.ensure_unrequested::<T::PreimageProvider>();779 }780 *s = None;781 }782 Ok(())783 })?;784785 Self::deposit_event(Event::Canceled { when, index });786 Ok(())787 } else {788 Err(Error::<T>::NotFound)?789 }790 })791 }792793 fn do_reschedule_named(794 id: ScheduledId,795 new_time: DispatchTime<T::BlockNumber>,796 ) -> Result<TaskAddress<T::BlockNumber>, DispatchError> {797 let new_time = Self::resolve_time(new_time)?;798799 Lookup::<T>::try_mutate_exists(800 id,801 |lookup| -> Result<TaskAddress<T::BlockNumber>, DispatchError> {802 let (when, index) = lookup.ok_or(Error::<T>::NotFound)?;803804 if new_time == when {805 return Err(Error::<T>::RescheduleNoChange.into());806 }807808 Agenda::<T>::try_mutate(when, |agenda| -> DispatchResult {809 let task = agenda.get_mut(index as usize).ok_or(Error::<T>::NotFound)?;810 let task = task.take().ok_or(Error::<T>::NotFound)?;811 Agenda::<T>::append(new_time, Some(task));812813 Ok(())814 })?;815816 let new_index = Agenda::<T>::decode_len(new_time).unwrap_or(1) as u32 - 1;817 Self::deposit_event(Event::Canceled { when, index });818 Self::deposit_event(Event::Scheduled {819 when: new_time,820 index: new_index,821 });822823 *lookup = Some((new_time, new_index));824825 Ok((new_time, new_index))826 },827 )828 }829}830831impl<T: Config> schedule::v2::Anon<T::BlockNumber, <T as Config>::Call, T::PalletsOrigin>832 for Pallet<T>833{834 type Address = TaskAddress<T::BlockNumber>;835 type Hash = T::Hash;836837 fn schedule(838 when: DispatchTime<T::BlockNumber>,839 maybe_periodic: Option<schedule::Period<T::BlockNumber>>,840 priority: schedule::Priority,841 origin: T::PalletsOrigin,842 call: CallOrHashOf<T>,843 ) -> Result<Self::Address, DispatchError> {844 Self::do_schedule(when, maybe_periodic, priority, origin, call)845 }846847 fn cancel((when, index): Self::Address) -> Result<(), ()> {848 Self::do_cancel(None, (when, index)).map_err(|_| ())849 }850851 fn reschedule(852 address: Self::Address,853 when: DispatchTime<T::BlockNumber>,854 ) -> Result<Self::Address, DispatchError> {855 Self::do_reschedule(address, when)856 }857858 fn next_dispatch_time((when, index): Self::Address) -> Result<T::BlockNumber, ()> {859 Agenda::<T>::get(when)860 .get(index as usize)861 .ok_or(())862 .map(|_| when)863 }864}865866impl<T: Config> schedule::v2::Named<T::BlockNumber, <T as Config>::Call, T::PalletsOrigin>867 for Pallet<T>868{869 type Address = TaskAddress<T::BlockNumber>;870 type Hash = T::Hash;871872 fn schedule_named(873 id: Vec<u8>,874 when: DispatchTime<T::BlockNumber>,875 maybe_periodic: Option<schedule::Period<T::BlockNumber>>,876 priority: schedule::Priority,877 origin: T::PalletsOrigin,878 call: CallOrHashOf<T>,879 ) -> Result<Self::Address, ()> {880 let inner_id: ScheduledId = id881 .try_into()882 .unwrap_or([0; MAX_TASK_ID_LENGTH_IN_BYTES as usize]);883 Self::do_schedule_named(inner_id, when, maybe_periodic, priority, origin, call)884 .map_err(|_| ())885 }886887 fn cancel_named(id: Vec<u8>) -> Result<(), ()> {888 let inner_id: ScheduledId = id889 .try_into()890 .unwrap_or([0; MAX_TASK_ID_LENGTH_IN_BYTES as usize]);891 Self::do_cancel_named(None, inner_id).map_err(|_| ())892 }893894 fn reschedule_named(895 id: Vec<u8>,896 when: DispatchTime<T::BlockNumber>,897 ) -> Result<Self::Address, DispatchError> {898 let inner_id: ScheduledId = id899 .try_into()900 .unwrap_or([0; MAX_TASK_ID_LENGTH_IN_BYTES as usize]);901 Self::do_reschedule_named(inner_id, when)902 }903904 fn next_dispatch_time(id: Vec<u8>) -> Result<T::BlockNumber, ()> {905 let inner_id: ScheduledId = id906 .try_into()907 .unwrap_or([0; MAX_TASK_ID_LENGTH_IN_BYTES as usize]);908 Lookup::<T>::get(inner_id)909 .and_then(|(when, index)| Agenda::<T>::get(when).get(index as usize).map(|_| when))910 .ok_or(())911 }912}tests/flipper-src/lib.rsdiffbeforeafterboth--- a/tests/flipper-src/lib.rs
+++ b/tests/flipper-src/lib.rs
@@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
-// Original license
+// Original License
// Copyright 2018-2020 Parity Technologies (UK) Ltd.
//
// Licensed under the Apache License, Version 2.0 (the "License");
tests/ink-types-node-runtime/src/calls.rsdiffbeforeafterboth--- a/tests/ink-types-node-runtime/src/calls.rs
+++ b/tests/ink-types-node-runtime/src/calls.rs
@@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
-// Original license
+// Original License
// Copyright 2019 Parity Technologies (UK) Ltd.
// This file is part of ink!.
//
tests/ink-types-node-runtime/src/lib.rsdiffbeforeafterboth--- a/tests/ink-types-node-runtime/src/lib.rs
+++ b/tests/ink-types-node-runtime/src/lib.rs
@@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
-// Original license
+// Original License
// Copyright 2018-2019 Parity Technologies (UK) Ltd.
// This file is part of ink!.
//
tests/loadtester-src/lib.rsdiffbeforeafterboth--- a/tests/loadtester-src/lib.rs
+++ b/tests/loadtester-src/lib.rs
@@ -14,6 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
+// Original License
#![cfg_attr(not(feature = "std"), no_std)]
use ink_lang as ink;
tests/src/xcmTransfer.test.tsdiffbeforeafterboth--- a/tests/src/xcmTransfer.test.ts
+++ b/tests/src/xcmTransfer.test.ts
@@ -33,7 +33,7 @@
const KARURA_CHAIN = 2000;
const KARURA_PORT = '9946';
-describe('Integration test: Exchanging OPL with Karura', () => {
+describe('Integration test: Exchanging QTZ with Karura', () => {
let alice: IKeyringPair;
before(async () => {
@@ -59,8 +59,8 @@
const metadata =
{
- name: 'OPL',
- symbol: 'OPL',
+ name: 'QTZ',
+ symbol: 'QTZ',
decimals: 18,
minimalBalance: 1,
};
@@ -73,7 +73,7 @@
}, karuraApiOptions);
});
- it('Should connect and send OPL to Karura', async () => {
+ it('Should connect and send QTZ to Karura', async () => {
let balanceOnKaruraBefore: bigint;
await usingApi(async (api) => {
@@ -140,7 +140,7 @@
}, {provider: new WsProvider('ws://127.0.0.1:' + KARURA_PORT)});
});
- it('Should connect to Karura and send OPL back', async () => {
+ it('Should connect to Karura and send QTZ back', async () => {
let balanceBefore: bigint;
await usingApi(async (api) => {