--- 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 --- 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 "] edition = "2021" --- a/pallets/scheduler/src/benchmarking.rs +++ b/pallets/scheduler/src/benchmarking.rs @@ -123,6 +123,18 @@ assert!(Agenda::::iter().count() == 0); } + on_initialize_periodic { + let s in 1 .. T::MaxScheduledPerBlock::get(); + let when = BLOCK_NUMBER.into(); + fill_schedule::(when, s, true, Some(false))?; + }: { Scheduler::::on_initialize(when); } + verify { + assert_eq!(System::::event_count(), s); + for i in 0..s { + assert_eq!(Agenda::::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::(when, s, false, None)?; + }: { Scheduler::::on_initialize(BLOCK_NUMBER.into()); } + verify { + assert_eq!(System::::event_count(), 0); + } + + on_initialize_named_aborted { + let s in 1 .. T::MaxScheduledPerBlock::get(); + let when = BLOCK_NUMBER.into(); + fill_schedule::(when, s, false, Some(false))?; + }: { Scheduler::::on_initialize(BLOCK_NUMBER.into()); } + verify { + } + + on_initialize_named { + let s in 1 .. T::MaxScheduledPerBlock::get(); + let when = BLOCK_NUMBER.into(); + fill_schedule::(when, s, false, None)?; + }: { Scheduler::::on_initialize(BLOCK_NUMBER.into()); } + verify { + assert_eq!(System::::event_count(), 0); + } + + on_initialize { + let s in 1 .. T::MaxScheduledPerBlock::get(); + let when = BLOCK_NUMBER.into(); + fill_schedule::(when, s, false, Some(false))?; + }: { Scheduler::::on_initialize(BLOCK_NUMBER.into()); } + verify { + assert_eq!(System::::event_count(), s); + assert!(Agenda::::iter().count() == 0); + } + on_initialize_resolved { let s in 1 .. T::MaxScheduledPerBlock::get(); let when = BLOCK_NUMBER.into(); --- a/pallets/scheduler/src/lib.rs +++ b/pallets/scheduler/src/lib.rs @@ -158,11 +158,10 @@ Self::on_initialize_periodic(2) - Self::on_initialize_periodic(1) } (true, true, Some(false)) => { - Self::on_initialize_periodic_named(2) - Self::on_initialize_periodic_named(1) - } - (false, false, Some(true)) => { - Self::on_initialize_resolved(2) - Self::on_initialize_resolved(1) + Self::on_initialize_periodic_named_resolved(2) + - Self::on_initialize_periodic_named_resolved(1) } + (false, false, Some(true)) => Self::on_initialize(2) - Self::on_initialize(1), (false, true, Some(true)) => { Self::on_initialize_named_resolved(2) - Self::on_initialize_named_resolved(1) } --- 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(PhantomData); impl WeightInfo for SubstrateWeight { // 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)) } --- 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" --- 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); --- 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 } --- 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 +impl DispatchCall for SchedulerPaymentExecutor where ::Call: Member @@ -976,13 +976,13 @@ + From>, SelfContainedSignedInfo: Send + Sync + 'static, Call: From<::Call> - + From<::Call> + + From<::Call> + SelfContainedCall, sp_runtime::AccountId32: From<::AccountId>, { fn dispatch_call( signer: ::AccountId, - call: ::Call, + call: ::Call, ) -> Result< Result>, TransactionValidityError, @@ -1008,7 +1008,7 @@ fn reserve_balance( id: [u8; 16], sponsor: ::AccountId, - call: ::Call, + call: ::Call, count: u32, ) -> Result<(), DispatchError> { let dispatch_info = call.get_dispatch_info(); @@ -1025,7 +1025,7 @@ fn pay_for_call( id: [u8; 16], sponsor: ::AccountId, - call: ::Call, + call: ::Call, ) -> Result { 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} = 61, - Scheduler: pallet_unq_scheduler::{Pallet, Call, Storage, Event} = 62, + Scheduler: pallet_unique_scheduler::{Pallet, Call, Storage, Event} = 62, // free = 63 Charging: pallet_charge_transaction::{Pallet, Call, Storage } = 64, // ContractHelpers: pallet_contract_helpers::{Pallet, Call, Storage} = 65, --- 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 } --- 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 +impl DispatchCall for SchedulerPaymentExecutor where ::Call: Member @@ -973,13 +973,13 @@ + From>, SelfContainedSignedInfo: Send + Sync + 'static, Call: From<::Call> - + From<::Call> + + From<::Call> + SelfContainedCall, sp_runtime::AccountId32: From<::AccountId>, { fn dispatch_call( signer: ::AccountId, - call: ::Call, + call: ::Call, ) -> Result< Result>, TransactionValidityError, @@ -1005,7 +1005,7 @@ fn reserve_balance( id: [u8; 16], sponsor: ::AccountId, - call: ::Call, + call: ::Call, count: u32, ) -> Result<(), DispatchError> { let dispatch_info = call.get_dispatch_info(); @@ -1022,7 +1022,7 @@ fn pay_for_call( id: [u8; 16], sponsor: ::AccountId, - call: ::Call, + call: ::Call, ) -> Result { 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} = 61, - Scheduler: pallet_unq_scheduler::{Pallet, Call, Storage, Event} = 62, + Scheduler: pallet_unique_scheduler::{Pallet, Call, Storage, Event} = 62, // free = 63 Charging: pallet_charge_transaction::{Pallet, Call, Storage } = 64, // ContractHelpers: pallet_contract_helpers::{Pallet, Call, Storage} = 65, --- 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 } --- 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 +impl DispatchCall for SchedulerPaymentExecutor where ::Call: Member @@ -972,13 +972,13 @@ + From>, SelfContainedSignedInfo: Send + Sync + 'static, Call: From<::Call> - + From<::Call> + + From<::Call> + SelfContainedCall, sp_runtime::AccountId32: From<::AccountId>, { fn dispatch_call( signer: ::AccountId, - call: ::Call, + call: ::Call, ) -> Result< Result>, TransactionValidityError, @@ -1004,7 +1004,7 @@ fn reserve_balance( id: [u8; 16], sponsor: ::AccountId, - call: ::Call, + call: ::Call, count: u32, ) -> Result<(), DispatchError> { let dispatch_info = call.get_dispatch_info(); @@ -1021,7 +1021,7 @@ fn pay_for_call( id: [u8; 16], sponsor: ::AccountId, - call: ::Call, + call: ::Call, ) -> Result { 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} = 61, - Scheduler: pallet_unq_scheduler::{Pallet, Call, Storage, Event} = 62, + Scheduler: pallet_unique_scheduler::{Pallet, Call, Storage, Event} = 62, // free = 63 Charging: pallet_charge_transaction::{Pallet, Call, Storage } = 64, // ContractHelpers: pallet_contract_helpers::{Pallet, Call, Storage} = 65,