difftreelog
feat(configuration) benchmarks
in: master
15 files changed
Cargo.lockdiffbeforeafterboth--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5846,6 +5846,7 @@
version = "0.1.2"
dependencies = [
"fp-evm",
+ "frame-benchmarking",
"frame-support",
"frame-system",
"parity-scale-codec 3.2.1",
Makefilediffbeforeafterboth--- a/Makefile
+++ b/Makefile
@@ -89,6 +89,10 @@
bench-evm-migration:
make _bench PALLET=evm-migration
+.PHONY: bench-configuration
+bench-configuration:
+ make _bench PALLET=configuration
+
.PHONY: bench-common
bench-common:
make _bench PALLET=common
@@ -143,4 +147,4 @@
.PHONY: bench
# Disabled: bench-scheduler, bench-rmrk-core, bench-rmrk-equip
-bench: bench-evm-migration bench-unique bench-structure bench-fungible bench-refungible bench-nonfungible bench-foreign-assets bench-collator-selection bench-identity
+bench: bench-evm-migration bench-unique bench-structure bench-fungible bench-refungible bench-nonfungible bench-configuration bench-foreign-assets bench-collator-selection bench-identity
pallets/collator-selection/src/benchmarking.rsdiffbeforeafterboth--- a/pallets/collator-selection/src/benchmarking.rs
+++ b/pallets/collator-selection/src/benchmarking.rs
@@ -52,9 +52,6 @@
};
use sp_std::prelude::*;
-/*pub type BalanceOf<T> =
-<<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;*/
-
const SEED: u32 = 0;
// TODO: remove if this is given in substrate commit.
@@ -116,14 +113,24 @@
validators.into_iter().map(|(who, _)| who).collect()
}
+fn register_invulnerables<T: Config + configuration::Config>(count: u32) {
+ let candidates = (0..count)
+ .map(|c| account("candidate", c, SEED))
+ .collect::<Vec<_>>();
+
+ for who in candidates {
+ <CollatorSelection<T>>::add_invulnerable(T::UpdateOrigin::successful_origin(), who).unwrap();
+ }
+}
+
fn register_candidates<T: Config + configuration::Config>(count: u32) {
let candidates = (0..count)
.map(|c| account("candidate", c, SEED))
.collect::<Vec<_>>();
- assert!(
+ /*assert!(
<LicenseBond<T>>::get() > 0u32.into(),
"Bond cannot be zero!"
- );
+ );*/
for who in candidates {
T::Currency::make_free_balance_be(&who, <LicenseBond<T>>::get() * 2u32.into());
@@ -132,16 +139,45 @@
}
}
+fn get_licenses<T: Config + configuration::Config>(count: u32) {
+ let candidates = (0..count)
+ .map(|c| account("candidate", c, SEED))
+ .collect::<Vec<_>>();
+ /*assert!(
+ <LicenseBond<T>>::get() > 0u32.into(),
+ "Bond cannot be zero!"
+ );*/
+
+ for who in candidates {
+ T::Currency::make_free_balance_be(&who, <LicenseBond<T>>::get() * 2u32.into());
+ <CollatorSelection<T>>::get_license(RawOrigin::Signed(who.clone()).into()).unwrap();
+ }
+}
+
benchmarks! {
where_clause { where T: pallet_authorship::Config + session::Config + configuration::Config }
add_invulnerable {
- let b in 1 .. T::MaxCollators::get();
- let new_invulnerable = register_validators::<T>(b)[0].clone();
- let origin = T::UpdateOrigin::successful_origin();
+ let b in 1 .. T::MaxCollators::get() - 3;
+ register_validators::<T>(b);
+ register_invulnerables::<T>(b);
+
+ // log::info!("{} {}", <Invulnerables<T>>::get().len(), b);
+
+ let new_invulnerable: T::AccountId = whitelisted_caller();
+ let bond: BalanceOf<T> = T::Currency::minimum_balance() * 2u32.into();
+ T::Currency::make_free_balance_be(&new_invulnerable, bond.clone());
+
+ <session::Pallet<T>>::set_keys(
+ RawOrigin::Signed(new_invulnerable.clone()).into(),
+ keys::<T>(b + 1),
+ Vec::new()
+ ).unwrap();
+
+ let root_origin = T::UpdateOrigin::successful_origin();
}: {
assert_ok!(
- <CollatorSelection<T>>::add_invulnerable(origin, new_invulnerable.clone())
+ <CollatorSelection<T>>::add_invulnerable(root_origin, new_invulnerable.clone())
);
}
verify {
@@ -150,52 +186,28 @@
remove_invulnerable {
let b in 1 .. T::MaxCollators::get();
- let new_invulnerable = register_validators::<T>(b)[0].clone();
- let origin = T::UpdateOrigin::successful_origin();
- assert_ok!(
- <CollatorSelection<T>>::add_invulnerable(origin.clone(), new_invulnerable.clone())
- );
- }: {
- assert_ok!(
- <CollatorSelection<T>>::remove_invulnerable(origin, new_invulnerable.clone())
- );
- }
- verify {
- assert_last_event::<T>(Event::InvulnerableRemoved{invulnerable: new_invulnerable}.into());
- }
+ register_validators::<T>(b);
+ register_invulnerables::<T>(b);
- /*set_desired_collators {
- let max: u32 = 999;
- let origin = T::UpdateOrigin::successful_origin();
+ let root_origin = T::UpdateOrigin::successful_origin();
+ let leaving = <Invulnerables<T>>::get().last().unwrap().clone();
+ whitelist!(leaving);
}: {
assert_ok!(
- <CollatorSelection<T>>::set_desired_collators(origin, max.clone())
+ <CollatorSelection<T>>::remove_invulnerable(root_origin, leaving.clone())
);
}
verify {
- assert_last_event::<T>(Event::NewDesiredCollators{desired_collators: max}.into());
+ assert_last_event::<T>(Event::InvulnerableRemoved{invulnerable: leaving}.into());
}
- set_license_bond {
- let bond_amount: BalanceOf<T> = T::Currency::minimum_balance() * 10u32.into();
- let origin = T::UpdateOrigin::successful_origin();
- }: {
- assert_ok!(
- <CollatorSelection<T>>::set_license_bond(origin, bond_amount.clone())
- );
- }
- verify {
- assert_last_event::<T>(Event::NewLicenseBond{bond_amount}.into());
- }*/
-
get_license {
let c in 1 .. T::MaxCollators::get();
<LicenseBond<T>>::put(T::Currency::minimum_balance());
- <DesiredCollators<T>>::put(c + 1);
register_validators::<T>(c);
- register_candidates::<T>(c);
+ get_licenses::<T>(c);
let caller: T::AccountId = whitelisted_caller();
let bond: BalanceOf<T> = T::Currency::minimum_balance() * 2u32.into();
@@ -215,10 +227,10 @@
// worst case is when we have all the max-candidate slots filled except one, and we fill that
// one.
onboard {
- let c in 1 .. T::MaxCollators::get();
+ let c in 1 .. 5;
<LicenseBond<T>>::put(T::Currency::minimum_balance());
- <DesiredCollators<T>>::put(c + 1);
+ <DesiredCollators<T>>::put(c + 2);
register_validators::<T>(c);
register_candidates::<T>(c);
@@ -247,7 +259,7 @@
offboard {
let c in 1 .. T::MaxCollators::get();
<LicenseBond<T>>::put(T::Currency::minimum_balance());
- <DesiredCollators<T>>::put(c);
+ <DesiredCollators<T>>::put(c + 2);
register_validators::<T>(c);
register_candidates::<T>(c);
pallets/collator-selection/src/lib.rsdiffbeforeafterboth--- a/pallets/collator-selection/src/lib.rs
+++ b/pallets/collator-selection/src/lib.rs
@@ -285,7 +285,7 @@
impl<T: Config> Pallet<T> {
/// Add a collator to the list of invulnerable (fixed) collators.
#[pallet::call_index(0)]
- #[pallet::weight(T::WeightInfo::add_invulnerable(T::MaxCollators::get()))]
+ #[pallet::weight(<T as Config>::WeightInfo::add_invulnerable(T::MaxCollators::get()))]
pub fn add_invulnerable(
origin: OriginFor<T>,
new: T::AccountId,
@@ -315,7 +315,7 @@
/// Remove a collator from the list of invulnerable (fixed) collators.
#[pallet::call_index(1)]
- #[pallet::weight(T::WeightInfo::remove_invulnerable(T::MaxCollators::get()))]
+ #[pallet::weight(<T as Config>::WeightInfo::remove_invulnerable(T::MaxCollators::get()))]
pub fn remove_invulnerable(
origin: OriginFor<T>,
who: T::AccountId,
@@ -344,7 +344,7 @@
///
/// This call is not available to `Invulnerable` collators.
#[pallet::call_index(2)]
- #[pallet::weight(T::WeightInfo::get_license(T::MaxCollators::get()))]
+ #[pallet::weight(<T as Config>::WeightInfo::get_license(T::MaxCollators::get()))]
pub fn get_license(origin: OriginFor<T>) -> DispatchResultWithPostInfo {
// register_as_candidate
let who = ensure_signed(origin)?;
@@ -377,7 +377,7 @@
///
/// This call is not available to `Invulnerable` collators.
#[pallet::call_index(3)]
- #[pallet::weight(T::WeightInfo::onboard(T::MaxCollators::get()))]
+ #[pallet::weight(<T as Config>::WeightInfo::onboard(T::MaxCollators::get()))]
pub fn onboard(origin: OriginFor<T>) -> DispatchResultWithPostInfo {
// register_as_candidate
let who = ensure_signed(origin)?;
@@ -417,33 +417,36 @@
})?;
Self::deposit_event(Event::CandidateAdded { account_id: who });
- Ok(Some(T::WeightInfo::onboard(current_count as u32)).into())
+ Ok(Some(<T as Config>::WeightInfo::onboard(current_count as u32)).into())
}
/// Deregister `origin` as a collator candidate. Note that the collator can only leave on
/// session change. The license to `onboard` later at any other time will remain.
#[pallet::call_index(4)]
- #[pallet::weight(T::WeightInfo::offboard(T::MaxCollators::get()))]
+ #[pallet::weight(<T as Config>::WeightInfo::offboard(T::MaxCollators::get()))]
pub fn offboard(origin: OriginFor<T>) -> DispatchResultWithPostInfo {
// leave_intent
let who = ensure_signed(origin)?;
let current_count = Self::try_remove_candidate(&who)?;
- Ok(Some(T::WeightInfo::offboard(current_count as u32)).into())
+ Ok(Some(<T as Config>::WeightInfo::offboard(current_count as u32)).into())
}
/// Forfeit `origin`'s own license. The `LicenseBond` will be unreserved immediately.
///
/// This call is not available to `Invulnerable` collators.
#[pallet::call_index(5)]
- #[pallet::weight(T::WeightInfo::release_license(T::MaxCollators::get()))]
+ #[pallet::weight(<T as Config>::WeightInfo::release_license(T::MaxCollators::get()))]
pub fn release_license(origin: OriginFor<T>) -> DispatchResultWithPostInfo {
// leave_intent
let who = ensure_signed(origin)?;
let current_count = Self::try_remove_candidate_and_release_license(&who, false, true)?;
- Ok(Some(T::WeightInfo::release_license(current_count as u32)).into())
+ Ok(Some(<T as Config>::WeightInfo::release_license(
+ current_count as u32,
+ ))
+ .into())
}
/// Force deregister `origin` as a collator candidate as a governing authority, and revoke its license.
@@ -452,7 +455,7 @@
///
/// This call is, of course, not applicable to `Invulnerable` collators.
#[pallet::call_index(6)]
- #[pallet::weight(T::WeightInfo::force_release_license(T::MaxCollators::get()))]
+ #[pallet::weight(<T as Config>::WeightInfo::force_release_license(T::MaxCollators::get()))]
pub fn force_release_license(
origin: OriginFor<T>,
who: T::AccountId,
@@ -462,7 +465,10 @@
let current_count = Self::try_remove_candidate_and_release_license(&who, false, true)?;
- Ok(Some(T::WeightInfo::force_release_license(current_count as u32)).into())
+ Ok(Some(<T as Config>::WeightInfo::force_release_license(
+ current_count as u32,
+ ))
+ .into())
}
}
@@ -599,7 +605,7 @@
<LastAuthoredBlock<T>>::insert(author, frame_system::Pallet::<T>::block_number());
frame_system::Pallet::<T>::register_extra_weight_unchecked(
- T::WeightInfo::note_author(),
+ <T as Config>::WeightInfo::note_author(),
DispatchClass::Mandatory,
);
}
@@ -625,7 +631,10 @@
let result = Self::assemble_collators(active_candidates);
frame_system::Pallet::<T>::register_extra_weight_unchecked(
- T::WeightInfo::new_session(candidates_len_before as u32, removed as u32),
+ <T as Config>::WeightInfo::new_session(
+ candidates_len_before as u32,
+ removed as u32,
+ ),
DispatchClass::Mandatory,
);
Some(result)
pallets/collator-selection/src/mock.rsdiffbeforeafterboth--- a/pallets/collator-selection/src/mock.rs
+++ b/pallets/collator-selection/src/mock.rs
@@ -225,6 +225,7 @@
type MaxXcmAllowedLocations = MaxXcmAllowedLocations;
type AppPromotionDailyRate = AppPromotionDailyRate;
type DayRelayBlocks = DayRelayBlocks;
+ type WeightInfo = ();
}
ord_parameter_types! {
pallets/configuration/Cargo.tomldiffbeforeafterboth--- a/pallets/configuration/Cargo.toml
+++ b/pallets/configuration/Cargo.toml
@@ -12,6 +12,7 @@
] }
frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" }
frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" }
+frame-benchmarking = { default-features = false, optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" }
sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" }
sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" }
sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" }
@@ -22,10 +23,12 @@
[features]
default = ["std"]
+runtime-benchmarks = ["frame-benchmarking"]
std = [
"parity-scale-codec/std",
"frame-support/std",
"frame-system/std",
+ "frame-benchmarking/std",
"sp-runtime/std",
"sp-std/std",
"sp-core/std",
pallets/configuration/src/benchmarking.rsdiffbeforeafterboth--- /dev/null
+++ b/pallets/configuration/src/benchmarking.rs
@@ -0,0 +1,100 @@
+// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.
+// This file is part of Unique Network.
+
+// Unique Network is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Unique Network is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
+
+//! Benchmarking setup for pallet-configuration
+
+use super::*;
+use frame_benchmarking::benchmarks;
+use frame_system::{EventRecord, RawOrigin};
+use frame_support::{assert_ok, BoundedVec, traits::Currency};
+use xcm::v1::MultiLocation;
+
+fn assert_last_event<T: Config>(generic_event: <T as Config>::RuntimeEvent) {
+ let events = frame_system::Pallet::<T>::events();
+ let system_event: <T as frame_system::Config>::RuntimeEvent = generic_event.into();
+ // compare to the last event record
+ let EventRecord { event, .. } = &events[events.len() - 1];
+ assert_eq!(event, &system_event);
+}
+
+benchmarks! {
+ where_clause { where T: Config }
+
+ set_weight_to_fee_coefficient_override {
+ let coeff: u64 = 999;
+ }: {
+ assert_ok!(
+ <Pallet<T>>::set_weight_to_fee_coefficient_override(RawOrigin::Root.into(), Some(coeff))
+ );
+ }
+
+ set_min_gas_price_override {
+ let coeff: u64 = 999;
+ }: {
+ assert_ok!(
+ <Pallet<T>>::set_min_gas_price_override(RawOrigin::Root.into(), Some(coeff))
+ );
+ }
+
+ set_xcm_allowed_locations {
+ let locations: BoundedVec<MultiLocation, T::MaxXcmAllowedLocations> = Default::default();
+ }: {
+ assert_ok!(
+ <Pallet<T>>::set_xcm_allowed_locations(RawOrigin::Root.into(), Some(locations))
+ );
+ }
+
+ set_app_promotion_configuration_override {
+ let configuration: AppPromotionConfiguration<T::BlockNumber> = Default::default();
+ }: {
+ assert_ok!(
+ <Pallet<T>>::set_app_promotion_configuration_override(RawOrigin::Root.into(), configuration)
+ );
+ }
+
+ set_collator_selection_desired_collators {
+ let max: u32 = 999;
+ }: {
+ assert_ok!(
+ <Pallet<T>>::set_collator_selection_desired_collators(RawOrigin::Root.into(), Some(max.clone()))
+ );
+ }
+ verify {
+ assert_last_event::<T>(Event::NewDesiredCollators{desired_collators: Some(max)}.into());
+ }
+
+ set_collator_selection_license_bond {
+ let bond_cost: Option<BalanceOf<T>> = Some(T::Currency::minimum_balance() * 10u32.into());
+ }: {
+ assert_ok!(
+ <Pallet<T>>::set_collator_selection_license_bond(RawOrigin::Root.into(), bond_cost.clone())
+ );
+ }
+ verify {
+ assert_last_event::<T>(Event::NewCollatorLicenseBond{bond_cost}.into());
+ }
+
+ set_collator_selection_kick_threshold {
+ let threshold: Option<T::BlockNumber> = Some(900u32.into());
+ }: {
+ assert_ok!(
+ <Pallet<T>>::set_collator_selection_kick_threshold(RawOrigin::Root.into(), threshold.clone())
+ );
+ }
+ verify {
+ assert_last_event::<T>(Event::NewCollatorKickThreshold{length_in_blocks: threshold}.into());
+ }
+}
pallets/configuration/src/lib.rsdiffbeforeafterboth--- a/pallets/configuration/src/lib.rs
+++ b/pallets/configuration/src/lib.rs
@@ -34,6 +34,10 @@
pub use pallet::*;
use sp_core::U256;
+#[cfg(feature = "runtime-benchmarks")]
+mod benchmarking;
+pub mod weights;
+
#[pallet]
mod pallet {
use super::*;
@@ -45,6 +49,7 @@
use frame_system::{pallet_prelude::OriginFor, ensure_root, Config as SystemConfig};
use xcm::v1::MultiLocation;
+ pub use crate::weights::WeightInfo;
pub type BalanceOf<T> =
<<T as Config>::Currency as Currency<<T as SystemConfig>::AccountId>>::Balance;
@@ -74,6 +79,9 @@
type DefaultCollatorSelectionLicenseBond: Get<BalanceOf<Self>>;
#[pallet::constant]
type DefaultCollatorSelectionKickThreshold: Get<Self::BlockNumber>;
+
+ /// The weight information of this pallet.
+ type WeightInfo: WeightInfo;
}
#[pallet::event]
@@ -140,7 +148,7 @@
#[pallet::call]
impl<T: Config> Pallet<T> {
#[pallet::call_index(0)]
- #[pallet::weight(T::DbWeight::get().writes(1))]
+ #[pallet::weight(T::WeightInfo::set_weight_to_fee_coefficient_override())]
pub fn set_weight_to_fee_coefficient_override(
origin: OriginFor<T>,
coeff: Option<u64>,
@@ -155,7 +163,7 @@
}
#[pallet::call_index(1)]
- #[pallet::weight(T::DbWeight::get().writes(1))]
+ #[pallet::weight(T::WeightInfo::set_min_gas_price_override())]
pub fn set_min_gas_price_override(
origin: OriginFor<T>,
coeff: Option<u64>,
@@ -170,7 +178,7 @@
}
#[pallet::call_index(2)]
- #[pallet::weight(T::DbWeight::get().writes(1))]
+ #[pallet::weight(T::WeightInfo::set_xcm_allowed_locations())]
pub fn set_xcm_allowed_locations(
origin: OriginFor<T>,
locations: Option<BoundedVec<MultiLocation, T::MaxXcmAllowedLocations>>,
@@ -181,7 +189,7 @@
}
#[pallet::call_index(3)]
- #[pallet::weight(T::DbWeight::get().writes(1))]
+ #[pallet::weight(T::WeightInfo::set_app_promotion_configuration_override())]
pub fn set_app_promotion_configuration_override(
origin: OriginFor<T>,
mut configuration: AppPromotionConfiguration<T::BlockNumber>,
@@ -202,7 +210,7 @@
}
#[pallet::call_index(4)]
- #[pallet::weight(T::DbWeight::get().writes(1))]
+ #[pallet::weight(T::WeightInfo::set_collator_selection_desired_collators())]
pub fn set_collator_selection_desired_collators(
origin: OriginFor<T>,
max: Option<u32>,
@@ -224,7 +232,7 @@
}
#[pallet::call_index(5)]
- #[pallet::weight(T::DbWeight::get().writes(1))]
+ #[pallet::weight(T::WeightInfo::set_collator_selection_license_bond())]
pub fn set_collator_selection_license_bond(
origin: OriginFor<T>,
amount: Option<BalanceOf<T>>,
@@ -240,7 +248,7 @@
}
#[pallet::call_index(6)]
- #[pallet::weight(T::DbWeight::get().writes(1))]
+ #[pallet::weight(T::WeightInfo::set_collator_selection_kick_threshold())]
pub fn set_collator_selection_kick_threshold(
origin: OriginFor<T>,
threshold: Option<T::BlockNumber>,
pallets/configuration/src/weights.rsdiffbeforeafterboth--- /dev/null
+++ b/pallets/configuration/src/weights.rs
@@ -0,0 +1,123 @@
+// Template adopted from https://github.com/paritytech/substrate/blob/master/.maintain/frame-weight-template.hbs
+
+//! Autogenerated weights for pallet_configuration
+//!
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
+//! DATE: 2022-12-28, STEPS: `50`, REPEAT: 80, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! EXECUTION: None, WASM-EXECUTION: Compiled, CHAIN: None, DB CACHE: 1024
+
+// Executed Command:
+// target/release/unique-collator
+// benchmark
+// pallet
+// --pallet
+// pallet-configuration
+// --wasm-execution
+// compiled
+// --extrinsic
+// *
+// --template
+// .maintain/frame-weight-template.hbs
+// --steps=50
+// --repeat=80
+// --heap-pages=4096
+// --output=./pallets/configuration/src/weights.rs
+
+#![cfg_attr(rustfmt, rustfmt_skip)]
+#![allow(unused_parens)]
+#![allow(unused_imports)]
+#![allow(missing_docs)]
+#![allow(clippy::unnecessary_cast)]
+
+use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
+use sp_std::marker::PhantomData;
+
+/// Weight functions needed for pallet_configuration.
+pub trait WeightInfo {
+ fn set_weight_to_fee_coefficient_override() -> Weight;
+ fn set_min_gas_price_override() -> Weight;
+ fn set_xcm_allowed_locations() -> Weight;
+ fn set_app_promotion_configuration_override() -> Weight;
+ fn set_collator_selection_desired_collators() -> Weight;
+ fn set_collator_selection_license_bond() -> Weight;
+ fn set_collator_selection_kick_threshold() -> Weight;
+}
+
+/// Weights for pallet_configuration using the Substrate node and recommended hardware.
+pub struct SubstrateWeight<T>(PhantomData<T>);
+impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
+ // Storage: Configuration WeightToFeeCoefficientOverride (r:0 w:1)
+ fn set_weight_to_fee_coefficient_override() -> Weight {
+ Weight::from_ref_time(5_691_000 as u64)
+ .saturating_add(T::DbWeight::get().writes(1 as u64))
+ }
+ // Storage: Configuration MinGasPriceOverride (r:0 w:1)
+ fn set_min_gas_price_override() -> Weight {
+ Weight::from_ref_time(5_521_000 as u64)
+ .saturating_add(T::DbWeight::get().writes(1 as u64))
+ }
+ // Storage: Configuration XcmAllowedLocationsOverride (r:0 w:1)
+ fn set_xcm_allowed_locations() -> Weight {
+ Weight::from_ref_time(6_091_000 as u64)
+ .saturating_add(T::DbWeight::get().writes(1 as u64))
+ }
+ // Storage: Configuration AppPromomotionConfigurationOverride (r:0 w:1)
+ fn set_app_promotion_configuration_override() -> Weight {
+ Weight::from_ref_time(6_241_000 as u64)
+ .saturating_add(T::DbWeight::get().writes(1 as u64))
+ }
+ // Storage: Configuration CollatorSelectionDesiredCollatorsOverride (r:0 w:1)
+ fn set_collator_selection_desired_collators() -> Weight {
+ Weight::from_ref_time(25_298_000 as u64)
+ .saturating_add(T::DbWeight::get().writes(1 as u64))
+ }
+ // Storage: Configuration CollatorSelectionLicenseBondOverride (r:0 w:1)
+ fn set_collator_selection_license_bond() -> Weight {
+ Weight::from_ref_time(18_675_000 as u64)
+ .saturating_add(T::DbWeight::get().writes(1 as u64))
+ }
+ // Storage: Configuration CollatorSelectionKickThresholdOverride (r:0 w:1)
+ fn set_collator_selection_kick_threshold() -> Weight {
+ Weight::from_ref_time(18_044_000 as u64)
+ .saturating_add(T::DbWeight::get().writes(1 as u64))
+ }
+}
+
+// For backwards compatibility and tests
+impl WeightInfo for () {
+ // Storage: Configuration WeightToFeeCoefficientOverride (r:0 w:1)
+ fn set_weight_to_fee_coefficient_override() -> Weight {
+ Weight::from_ref_time(5_691_000 as u64)
+ .saturating_add(RocksDbWeight::get().writes(1 as u64))
+ }
+ // Storage: Configuration MinGasPriceOverride (r:0 w:1)
+ fn set_min_gas_price_override() -> Weight {
+ Weight::from_ref_time(5_521_000 as u64)
+ .saturating_add(RocksDbWeight::get().writes(1 as u64))
+ }
+ // Storage: Configuration XcmAllowedLocationsOverride (r:0 w:1)
+ fn set_xcm_allowed_locations() -> Weight {
+ Weight::from_ref_time(6_091_000 as u64)
+ .saturating_add(RocksDbWeight::get().writes(1 as u64))
+ }
+ // Storage: Configuration AppPromomotionConfigurationOverride (r:0 w:1)
+ fn set_app_promotion_configuration_override() -> Weight {
+ Weight::from_ref_time(6_241_000 as u64)
+ .saturating_add(RocksDbWeight::get().writes(1 as u64))
+ }
+ // Storage: Configuration CollatorSelectionDesiredCollatorsOverride (r:0 w:1)
+ fn set_collator_selection_desired_collators() -> Weight {
+ Weight::from_ref_time(25_298_000 as u64)
+ .saturating_add(RocksDbWeight::get().writes(1 as u64))
+ }
+ // Storage: Configuration CollatorSelectionLicenseBondOverride (r:0 w:1)
+ fn set_collator_selection_license_bond() -> Weight {
+ Weight::from_ref_time(18_675_000 as u64)
+ .saturating_add(RocksDbWeight::get().writes(1 as u64))
+ }
+ // Storage: Configuration CollatorSelectionKickThresholdOverride (r:0 w:1)
+ fn set_collator_selection_kick_threshold() -> Weight {
+ Weight::from_ref_time(18_044_000 as u64)
+ .saturating_add(RocksDbWeight::get().writes(1 as u64))
+ }
+}
runtime/common/config/pallets/mod.rsdiffbeforeafterboth--- a/runtime/common/config/pallets/mod.rs
+++ b/runtime/common/config/pallets/mod.rs
@@ -121,6 +121,7 @@
type MaxXcmAllowedLocations = ConstU32<16>;
type AppPromotionDailyRate = AppPromotionDailyRate;
type DayRelayBlocks = DayRelayBlocks;
+ type WeightInfo = pallet_configuration::weights::SubstrateWeight<Self>;
}
impl pallet_maintenance::Config for Runtime {
runtime/common/construct_runtime/mod.rsdiffbeforeafterboth--- a/runtime/common/construct_runtime/mod.rs
+++ b/runtime/common/construct_runtime/mod.rs
@@ -32,17 +32,17 @@
ParachainSystem: cumulus_pallet_parachain_system::{Pallet, Call, Config, Storage, Inherent, Event<T>, ValidateUnsigned} = 20,
ParachainInfo: parachain_info::{Pallet, Storage, Config} = 21,
- Aura: pallet_aura::{Pallet, Config<T>} = 22,
- AuraExt: cumulus_pallet_aura_ext::{Pallet, Config} = 23,
+ #[runtimes(opal)]
+ Authorship: pallet_authorship::{Pallet, Call, Storage} = 22,
#[runtimes(opal)]
- Authorship: pallet_authorship::{Pallet, Call, Storage} = 24,
+ CollatorSelection: pallet_collator_selection::{Pallet, Call, Storage, Event<T>, Config<T>} = 23,
#[runtimes(opal)]
- CollatorSelection: pallet_collator_selection::{Pallet, Call, Storage, Event<T>, Config<T>} = 25,
+ Session: pallet_session::{Pallet, Call, Storage, Event, Config<T>} = 24,
- #[runtimes(opal)]
- Session: pallet_session::{Pallet, Call, Storage, Event, Config<T>} = 26,
+ Aura: pallet_aura::{Pallet, Config<T>} = 25,
+ AuraExt: cumulus_pallet_aura_ext::{Pallet, Config} = 26,
Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>} = 30,
RandomnessCollectiveFlip: pallet_randomness_collective_flip::{Pallet, Storage} = 31,
runtime/common/runtime_apis.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#[macro_export]18macro_rules! dispatch_unique_runtime {19 ($collection:ident.$method:ident($($name:ident),*)) => {{20 let collection = <Runtime as pallet_common::Config>::CollectionDispatch::dispatch(<pallet_common::CollectionHandle<Runtime>>::try_get($collection)?);21 let dispatch = collection.as_dyn();2223 Ok::<_, DispatchError>(dispatch.$method($($name),*))24 }};25}2627#[macro_export]28macro_rules! impl_common_runtime_apis {29 (30 $(31 #![custom_apis]3233 $($custom_apis:tt)+34 )?35 ) => {36 use sp_std::prelude::*;37 use sp_api::impl_runtime_apis;38 use sp_core::{crypto::KeyTypeId, OpaqueMetadata, H256, U256, H160, Bytes};39 use sp_runtime::{40 Permill,41 traits::Block as BlockT,42 transaction_validity::{TransactionSource, TransactionValidity},43 ApplyExtrinsicResult, DispatchError,44 };45 use fp_rpc::TransactionStatus;46 use pallet_transaction_payment::{47 FeeDetails, RuntimeDispatchInfo,48 };49 use pallet_evm::{50 Runner, account::CrossAccountId as _,51 Account as EVMAccount, FeeCalculator,52 };53 use runtime_common::{54 sponsoring::{SponsorshipPredict, UniqueSponsorshipPredict},55 dispatch::CollectionDispatch,56 config::ethereum::CrossAccountId,57 };58 use up_data_structs::*;596061 impl_runtime_apis! {62 $($($custom_apis)+)?6364 impl up_rpc::UniqueApi<Block, CrossAccountId, AccountId> for Runtime {65 fn account_tokens(collection: CollectionId, account: CrossAccountId) -> Result<Vec<TokenId>, DispatchError> {66 dispatch_unique_runtime!(collection.account_tokens(account))67 }68 fn collection_tokens(collection: CollectionId) -> Result<Vec<TokenId>, DispatchError> {69 dispatch_unique_runtime!(collection.collection_tokens())70 }71 fn token_exists(collection: CollectionId, token: TokenId) -> Result<bool, DispatchError> {72 dispatch_unique_runtime!(collection.token_exists(token))73 }7475 fn token_owner(collection: CollectionId, token: TokenId) -> Result<Option<CrossAccountId>, DispatchError> {76 dispatch_unique_runtime!(collection.token_owner(token))77 }7879 fn token_owners(collection: CollectionId, token: TokenId) -> Result<Vec::<CrossAccountId>, DispatchError> {80 dispatch_unique_runtime!(collection.token_owners(token))81 }8283 fn topmost_token_owner(collection: CollectionId, token: TokenId) -> Result<Option<CrossAccountId>, DispatchError> {84 let budget = up_data_structs::budget::Value::new(10);8586 Ok(Some(<pallet_structure::Pallet<Runtime>>::find_topmost_owner(collection, token, &budget)?))87 }88 fn token_children(collection: CollectionId, token: TokenId) -> Result<Vec<TokenChild>, DispatchError> {89 Ok(<pallet_nonfungible::Pallet<Runtime>>::token_children_ids(collection, token))90 }91 fn collection_properties(92 collection: CollectionId,93 keys: Option<Vec<Vec<u8>>>94 ) -> Result<Vec<Property>, DispatchError> {95 let keys = keys.map(96 |keys| Common::bytes_keys_to_property_keys(keys)97 ).transpose()?;9899 Common::filter_collection_properties(collection, keys)100 }101102 fn token_properties(103 collection: CollectionId,104 token_id: TokenId,105 keys: Option<Vec<Vec<u8>>>106 ) -> Result<Vec<Property>, DispatchError> {107 let keys = keys.map(108 |keys| Common::bytes_keys_to_property_keys(keys)109 ).transpose()?;110111 dispatch_unique_runtime!(collection.token_properties(token_id, keys))112 }113114 fn property_permissions(115 collection: CollectionId,116 keys: Option<Vec<Vec<u8>>>117 ) -> Result<Vec<PropertyKeyPermission>, DispatchError> {118 let keys = keys.map(119 |keys| Common::bytes_keys_to_property_keys(keys)120 ).transpose()?;121122 Common::filter_property_permissions(collection, keys)123 }124125 fn token_data(126 collection: CollectionId,127 token_id: TokenId,128 keys: Option<Vec<Vec<u8>>>129 ) -> Result<TokenData<CrossAccountId>, DispatchError> {130 let token_data = TokenData {131 properties: Self::token_properties(collection, token_id, keys)?,132 owner: Self::token_owner(collection, token_id)?,133 pieces: Self::total_pieces(collection, token_id)?.unwrap_or(0),134 };135136 Ok(token_data)137 }138139 fn total_supply(collection: CollectionId) -> Result<u32, DispatchError> {140 dispatch_unique_runtime!(collection.total_supply())141 }142 fn account_balance(collection: CollectionId, account: CrossAccountId) -> Result<u32, DispatchError> {143 dispatch_unique_runtime!(collection.account_balance(account))144 }145 fn balance(collection: CollectionId, account: CrossAccountId, token: TokenId) -> Result<u128, DispatchError> {146 dispatch_unique_runtime!(collection.balance(account, token))147 }148 fn allowance(149 collection: CollectionId,150 sender: CrossAccountId,151 spender: CrossAccountId,152 token: TokenId,153 ) -> Result<u128, DispatchError> {154 dispatch_unique_runtime!(collection.allowance(sender, spender, token))155 }156157 fn adminlist(collection: CollectionId) -> Result<Vec<CrossAccountId>, DispatchError> {158 Ok(<pallet_common::Pallet<Runtime>>::adminlist(collection))159 }160 fn allowlist(collection: CollectionId) -> Result<Vec<CrossAccountId>, DispatchError> {161 Ok(<pallet_common::Pallet<Runtime>>::allowlist(collection))162 }163 fn allowed(collection: CollectionId, user: CrossAccountId) -> Result<bool, DispatchError> {164 Ok(<pallet_common::Pallet<Runtime>>::allowed(collection, user))165 }166 fn last_token_id(collection: CollectionId) -> Result<TokenId, DispatchError> {167 dispatch_unique_runtime!(collection.last_token_id())168 }169 fn collection_by_id(collection: CollectionId) -> Result<Option<RpcCollection<AccountId>>, DispatchError> {170 Ok(<pallet_common::Pallet<Runtime>>::rpc_collection(collection))171 }172 fn collection_stats() -> Result<CollectionStats, DispatchError> {173 Ok(<pallet_common::Pallet<Runtime>>::collection_stats())174 }175 fn next_sponsored(collection: CollectionId, account: CrossAccountId, token: TokenId) -> Result<Option<u64>, DispatchError> {176 Ok(<UniqueSponsorshipPredict<Runtime> as SponsorshipPredict<Runtime>>::predict(177 collection,178 account,179 token180 ))181 }182183 fn effective_collection_limits(collection: CollectionId) -> Result<Option<CollectionLimits>, DispatchError> {184 Ok(<pallet_common::Pallet<Runtime>>::effective_collection_limits(collection))185 }186187 fn total_pieces(collection: CollectionId, token_id: TokenId) -> Result<Option<u128>, DispatchError> {188 dispatch_unique_runtime!(collection.total_pieces(token_id))189 }190191 fn allowance_for_all(collection: CollectionId, owner: CrossAccountId, operator: CrossAccountId) -> Result<bool, DispatchError> {192 dispatch_unique_runtime!(collection.allowance_for_all(owner, operator))193 }194 }195196 impl app_promotion_rpc::AppPromotionApi<Block, BlockNumber, CrossAccountId, AccountId> for Runtime {197 #[allow(unused_variables)]198 fn total_staked(staker: Option<CrossAccountId>) -> Result<u128, DispatchError> {199 #[cfg(not(feature = "app-promotion"))]200 return unsupported!();201202 #[cfg(feature = "app-promotion")]203 return Ok(<pallet_app_promotion::Pallet<Runtime>>::cross_id_total_staked(staker).unwrap_or_default());204 }205206 #[allow(unused_variables)]207 fn total_staked_per_block(staker: CrossAccountId) -> Result<Vec<(BlockNumber, u128)>, DispatchError> {208 #[cfg(not(feature = "app-promotion"))]209 return unsupported!();210211 #[cfg(feature = "app-promotion")]212 return Ok(<pallet_app_promotion::Pallet<Runtime>>::cross_id_total_staked_per_block(staker));213 }214215 #[allow(unused_variables)]216 fn pending_unstake(staker: Option<CrossAccountId>) -> Result<u128, DispatchError> {217 #[cfg(not(feature = "app-promotion"))]218 return unsupported!();219220 #[cfg(feature = "app-promotion")]221 return Ok(<pallet_app_promotion::Pallet<Runtime>>::cross_id_pending_unstake(staker));222 }223224 #[allow(unused_variables)]225 fn pending_unstake_per_block(staker: CrossAccountId) -> Result<Vec<(BlockNumber, u128)>, DispatchError> {226 #[cfg(not(feature = "app-promotion"))]227 return unsupported!();228229 #[cfg(feature = "app-promotion")]230 return Ok(<pallet_app_promotion::Pallet<Runtime>>::cross_id_pending_unstake_per_block(staker))231 }232 }233234 impl rmrk_rpc::RmrkApi<235 Block,236 AccountId,237 RmrkCollectionInfo<AccountId>,238 RmrkInstanceInfo<AccountId>,239 RmrkResourceInfo,240 RmrkPropertyInfo,241 RmrkBaseInfo<AccountId>,242 RmrkPartType,243 RmrkTheme244 > for Runtime {245 fn last_collection_idx() -> Result<RmrkCollectionId, DispatchError> {246 #[cfg(feature = "rmrk")]247 return pallet_proxy_rmrk_core::rpc::last_collection_idx::<Runtime>();248249 #[cfg(not(feature = "rmrk"))]250 return unsupported!();251 }252253 #[allow(unused_variables)]254 fn collection_by_id(collection_id: RmrkCollectionId) -> Result<Option<RmrkCollectionInfo<AccountId>>, DispatchError> {255 #[cfg(feature = "rmrk")]256 return pallet_proxy_rmrk_core::rpc::collection_by_id::<Runtime>(collection_id);257258 #[cfg(not(feature = "rmrk"))]259 return unsupported!();260 }261262 #[allow(unused_variables)]263 fn nft_by_id(collection_id: RmrkCollectionId, nft_by_id: RmrkNftId) -> Result<Option<RmrkInstanceInfo<AccountId>>, DispatchError> {264 #[cfg(feature = "rmrk")]265 return pallet_proxy_rmrk_core::rpc::nft_by_id::<Runtime>(collection_id, nft_by_id);266267 #[cfg(not(feature = "rmrk"))]268 return unsupported!();269 }270271 #[allow(unused_variables)]272 fn account_tokens(account_id: AccountId, collection_id: RmrkCollectionId) -> Result<Vec<RmrkNftId>, DispatchError> {273 #[cfg(feature = "rmrk")]274 return pallet_proxy_rmrk_core::rpc::account_tokens::<Runtime>(account_id, collection_id);275276 #[cfg(not(feature = "rmrk"))]277 return unsupported!();278 }279280 #[allow(unused_variables)]281 fn nft_children(collection_id: RmrkCollectionId, nft_id: RmrkNftId) -> Result<Vec<RmrkNftChild>, DispatchError> {282 #[cfg(feature = "rmrk")]283 return pallet_proxy_rmrk_core::rpc::nft_children::<Runtime>(collection_id, nft_id);284285 #[cfg(not(feature = "rmrk"))]286 return unsupported!();287 }288289 #[allow(unused_variables)]290 fn collection_properties(291 collection_id: RmrkCollectionId,292 filter_keys: Option<Vec<RmrkPropertyKey>>293 ) -> Result<Vec<RmrkPropertyInfo>, DispatchError> {294 #[cfg(feature = "rmrk")]295 return pallet_proxy_rmrk_core::rpc::collection_properties::<Runtime>(collection_id, filter_keys);296297 #[cfg(not(feature = "rmrk"))]298 return unsupported!();299 }300301 #[allow(unused_variables)]302 fn nft_properties(303 collection_id: RmrkCollectionId,304 nft_id: RmrkNftId,305 filter_keys: Option<Vec<RmrkPropertyKey>>306 ) -> Result<Vec<RmrkPropertyInfo>, DispatchError> {307 #[cfg(feature = "rmrk")]308 return pallet_proxy_rmrk_core::rpc::nft_properties::<Runtime>(collection_id, nft_id, filter_keys);309310 #[cfg(not(feature = "rmrk"))]311 return unsupported!();312 }313314 #[allow(unused_variables)]315 fn nft_resources(collection_id: RmrkCollectionId,nft_id: RmrkNftId) -> Result<Vec<RmrkResourceInfo>, DispatchError> {316 #[cfg(feature = "rmrk")]317 return pallet_proxy_rmrk_core::rpc::nft_resources::<Runtime>(collection_id, nft_id);318319 #[cfg(not(feature = "rmrk"))]320 return unsupported!();321 }322323 #[allow(unused_variables)]324 fn nft_resource_priority(325 collection_id: RmrkCollectionId,326 nft_id: RmrkNftId,327 resource_id: RmrkResourceId328 ) -> Result<Option<u32>, DispatchError> {329 #[cfg(feature = "rmrk")]330 return pallet_proxy_rmrk_core::rpc::nft_resource_priority::<Runtime>(collection_id, nft_id, resource_id);331332 #[cfg(not(feature = "rmrk"))]333 return unsupported!();334 }335336 #[allow(unused_variables)]337 fn base(base_id: RmrkBaseId) -> Result<Option<RmrkBaseInfo<AccountId>>, DispatchError> {338 #[cfg(feature = "rmrk")]339 return pallet_proxy_rmrk_equip::rpc::base::<Runtime>(base_id);340341 #[cfg(not(feature = "rmrk"))]342 return unsupported!();343 }344345 #[allow(unused_variables)]346 fn base_parts(base_id: RmrkBaseId) -> Result<Vec<RmrkPartType>, DispatchError> {347 #[cfg(feature = "rmrk")]348 return pallet_proxy_rmrk_equip::rpc::base_parts::<Runtime>(base_id);349350 #[cfg(not(feature = "rmrk"))]351 return unsupported!();352 }353354 #[allow(unused_variables)]355 fn theme_names(base_id: RmrkBaseId) -> Result<Vec<RmrkThemeName>, DispatchError> {356 #[cfg(feature = "rmrk")]357 return pallet_proxy_rmrk_equip::rpc::theme_names::<Runtime>(base_id);358359 #[cfg(not(feature = "rmrk"))]360 return unsupported!();361 }362363 #[allow(unused_variables)]364 fn theme(365 base_id: RmrkBaseId,366 theme_name: RmrkThemeName,367 filter_keys: Option<Vec<RmrkPropertyKey>>368 ) -> Result<Option<RmrkTheme>, DispatchError> {369 #[cfg(feature = "rmrk")]370 return pallet_proxy_rmrk_equip::rpc::theme::<Runtime>(base_id, theme_name, filter_keys);371372 #[cfg(not(feature = "rmrk"))]373 return unsupported!();374 }375 }376377 impl sp_api::Core<Block> for Runtime {378 fn version() -> RuntimeVersion {379 VERSION380 }381382 fn execute_block(block: Block) {383 Executive::execute_block(block)384 }385386 fn initialize_block(header: &<Block as BlockT>::Header) {387 Executive::initialize_block(header)388 }389 }390391 impl sp_api::Metadata<Block> for Runtime {392 fn metadata() -> OpaqueMetadata {393 OpaqueMetadata::new(Runtime::metadata().into())394 }395 }396397 impl sp_block_builder::BlockBuilder<Block> for Runtime {398 fn apply_extrinsic(extrinsic: <Block as BlockT>::Extrinsic) -> ApplyExtrinsicResult {399 Executive::apply_extrinsic(extrinsic)400 }401402 fn finalize_block() -> <Block as BlockT>::Header {403 Executive::finalize_block()404 }405406 fn inherent_extrinsics(data: sp_inherents::InherentData) -> Vec<<Block as BlockT>::Extrinsic> {407 data.create_extrinsics()408 }409410 fn check_inherents(411 block: Block,412 data: sp_inherents::InherentData,413 ) -> sp_inherents::CheckInherentsResult {414 data.check_extrinsics(&block)415 }416417 // fn random_seed() -> <Block as BlockT>::Hash {418 // RandomnessCollectiveFlip::random_seed().0419 // }420 }421422 impl sp_transaction_pool::runtime_api::TaggedTransactionQueue<Block> for Runtime {423 fn validate_transaction(424 source: TransactionSource,425 tx: <Block as BlockT>::Extrinsic,426 hash: <Block as BlockT>::Hash,427 ) -> TransactionValidity {428 Executive::validate_transaction(source, tx, hash)429 }430 }431432 impl sp_offchain::OffchainWorkerApi<Block> for Runtime {433 fn offchain_worker(header: &<Block as BlockT>::Header) {434 Executive::offchain_worker(header)435 }436 }437438 impl fp_rpc::EthereumRuntimeRPCApi<Block> for Runtime {439 fn chain_id() -> u64 {440 <Runtime as pallet_evm::Config>::ChainId::get()441 }442443 fn account_basic(address: H160) -> EVMAccount {444 let (account, _) = EVM::account_basic(&address);445 account446 }447448 fn gas_price() -> U256 {449 let (price, _) = <Runtime as pallet_evm::Config>::FeeCalculator::min_gas_price();450 price451 }452453 fn account_code_at(address: H160) -> Vec<u8> {454 EVM::account_codes(address)455 }456457 fn author() -> H160 {458 <pallet_evm::Pallet<Runtime>>::find_author()459 }460461 fn storage_at(address: H160, index: U256) -> H256 {462 let mut tmp = [0u8; 32];463 index.to_big_endian(&mut tmp);464 EVM::account_storages(address, H256::from_slice(&tmp[..]))465 }466467 #[allow(clippy::redundant_closure)]468 fn call(469 from: H160,470 to: H160,471 data: Vec<u8>,472 value: U256,473 gas_limit: U256,474 max_fee_per_gas: Option<U256>,475 max_priority_fee_per_gas: Option<U256>,476 nonce: Option<U256>,477 estimate: bool,478 access_list: Option<Vec<(H160, Vec<H256>)>>,479 ) -> Result<pallet_evm::CallInfo, sp_runtime::DispatchError> {480 let config = if estimate {481 let mut config = <Runtime as pallet_evm::Config>::config().clone();482 config.estimate = true;483 Some(config)484 } else {485 None486 };487488 let is_transactional = false;489 let validate = false;490 <Runtime as pallet_evm::Config>::Runner::call(491 CrossAccountId::from_eth(from),492 to,493 data,494 value,495 gas_limit.low_u64(),496 max_fee_per_gas,497 max_priority_fee_per_gas,498 nonce,499 access_list.unwrap_or_default(),500 is_transactional,501 validate,502 config.as_ref().unwrap_or_else(|| <Runtime as pallet_evm::Config>::config()),503 ).map_err(|err| err.error.into())504 }505506 #[allow(clippy::redundant_closure)]507 fn create(508 from: H160,509 data: Vec<u8>,510 value: U256,511 gas_limit: U256,512 max_fee_per_gas: Option<U256>,513 max_priority_fee_per_gas: Option<U256>,514 nonce: Option<U256>,515 estimate: bool,516 access_list: Option<Vec<(H160, Vec<H256>)>>,517 ) -> Result<pallet_evm::CreateInfo, sp_runtime::DispatchError> {518 let config = if estimate {519 let mut config = <Runtime as pallet_evm::Config>::config().clone();520 config.estimate = true;521 Some(config)522 } else {523 None524 };525526 let is_transactional = false;527 let validate = false;528 <Runtime as pallet_evm::Config>::Runner::create(529 CrossAccountId::from_eth(from),530 data,531 value,532 gas_limit.low_u64(),533 max_fee_per_gas,534 max_priority_fee_per_gas,535 nonce,536 access_list.unwrap_or_default(),537 is_transactional,538 validate,539 config.as_ref().unwrap_or_else(|| <Runtime as pallet_evm::Config>::config()),540 ).map_err(|err| err.error.into())541 }542543 fn current_transaction_statuses() -> Option<Vec<TransactionStatus>> {544 Ethereum::current_transaction_statuses()545 }546547 fn current_block() -> Option<pallet_ethereum::Block> {548 Ethereum::current_block()549 }550551 fn current_receipts() -> Option<Vec<pallet_ethereum::Receipt>> {552 Ethereum::current_receipts()553 }554555 fn current_all() -> (556 Option<pallet_ethereum::Block>,557 Option<Vec<pallet_ethereum::Receipt>>,558 Option<Vec<TransactionStatus>>559 ) {560 (561 Ethereum::current_block(),562 Ethereum::current_receipts(),563 Ethereum::current_transaction_statuses()564 )565 }566567 fn extrinsic_filter(xts: Vec<<Block as sp_api::BlockT>::Extrinsic>) -> Vec<pallet_ethereum::Transaction> {568 xts.into_iter().filter_map(|xt| match xt.0.function {569 RuntimeCall::Ethereum(pallet_ethereum::Call::transact { transaction }) => Some(transaction),570 _ => None571 }).collect()572 }573574 fn elasticity() -> Option<Permill> {575 None576 }577578 fn gas_limit_multiplier_support() {}579 }580581 impl fp_rpc::ConvertTransactionRuntimeApi<Block> for Runtime {582 fn convert_transaction(transaction: pallet_ethereum::Transaction) -> <Block as BlockT>::Extrinsic {583 UncheckedExtrinsic::new_unsigned(584 pallet_ethereum::Call::<Runtime>::transact { transaction }.into(),585 )586 }587 }588589 impl sp_session::SessionKeys<Block> for Runtime {590 fn decode_session_keys(591 encoded: Vec<u8>,592 ) -> Option<Vec<(Vec<u8>, KeyTypeId)>> {593 SessionKeys::decode_into_raw_public_keys(&encoded)594 }595596 fn generate_session_keys(seed: Option<Vec<u8>>) -> Vec<u8> {597 SessionKeys::generate(seed)598 }599 }600601 impl sp_consensus_aura::AuraApi<Block, AuraId> for Runtime {602 fn slot_duration() -> sp_consensus_aura::SlotDuration {603 sp_consensus_aura::SlotDuration::from_millis(Aura::slot_duration())604 }605606 fn authorities() -> Vec<AuraId> {607 Aura::authorities().to_vec()608 }609 }610611 impl cumulus_primitives_core::CollectCollationInfo<Block> for Runtime {612 fn collect_collation_info(header: &<Block as BlockT>::Header) -> cumulus_primitives_core::CollationInfo {613 ParachainSystem::collect_collation_info(header)614 }615 }616617 impl frame_system_rpc_runtime_api::AccountNonceApi<Block, AccountId, Index> for Runtime {618 fn account_nonce(account: AccountId) -> Index {619 System::account_nonce(account)620 }621 }622623 impl pallet_transaction_payment_rpc_runtime_api::TransactionPaymentApi<Block, Balance> for Runtime {624 fn query_info(uxt: <Block as BlockT>::Extrinsic, len: u32) -> RuntimeDispatchInfo<Balance> {625 TransactionPayment::query_info(uxt, len)626 }627 fn query_fee_details(uxt: <Block as BlockT>::Extrinsic, len: u32) -> FeeDetails<Balance> {628 TransactionPayment::query_fee_details(uxt, len)629 }630 }631632 /*633 impl pallet_contracts_rpc_runtime_api::ContractsApi<Block, AccountId, Balance, BlockNumber, Hash>634 for Runtime635 {636 fn call(637 origin: AccountId,638 dest: AccountId,639 value: Balance,640 gas_limit: u64,641 input_data: Vec<u8>,642 ) -> pallet_contracts_primitives::ContractExecResult {643 Contracts::bare_call(origin, dest, value, gas_limit, input_data, false)644 }645646 fn instantiate(647 origin: AccountId,648 endowment: Balance,649 gas_limit: u64,650 code: pallet_contracts_primitives::Code<Hash>,651 data: Vec<u8>,652 salt: Vec<u8>,653 ) -> pallet_contracts_primitives::ContractInstantiateResult<AccountId, BlockNumber>654 {655 Contracts::bare_instantiate(origin, endowment, gas_limit, code, data, salt, true, false)656 }657658 fn get_storage(659 address: AccountId,660 key: [u8; 32],661 ) -> pallet_contracts_primitives::GetStorageResult {662 Contracts::get_storage(address, key)663 }664665 fn rent_projection(666 address: AccountId,667 ) -> pallet_contracts_primitives::RentProjectionResult<BlockNumber> {668 Contracts::rent_projection(address)669 }670 }671 */672673 #[cfg(feature = "runtime-benchmarks")]674 impl frame_benchmarking::Benchmark<Block> for Runtime {675 fn benchmark_metadata(extra: bool) -> (676 Vec<frame_benchmarking::BenchmarkList>,677 Vec<frame_support::traits::StorageInfo>,678 ) {679 use frame_benchmarking::{list_benchmark, Benchmarking, BenchmarkList};680 use frame_support::traits::StorageInfoTrait;681682 let mut list = Vec::<BenchmarkList>::new();683684 list_benchmark!(list, extra, pallet_evm_migration, EvmMigration);685 list_benchmark!(list, extra, pallet_common, Common);686 list_benchmark!(list, extra, pallet_unique, Unique);687 list_benchmark!(list, extra, pallet_structure, Structure);688 list_benchmark!(list, extra, pallet_inflation, Inflation);689690 #[cfg(feature = "app-promotion")]691 list_benchmark!(list, extra, pallet_app_promotion, AppPromotion);692693 list_benchmark!(list, extra, pallet_fungible, Fungible);694 list_benchmark!(list, extra, pallet_nonfungible, Nonfungible);695696 #[cfg(feature = "refungible")]697 list_benchmark!(list, extra, pallet_refungible, Refungible);698699 #[cfg(feature = "scheduler")]700 list_benchmark!(list, extra, pallet_unique_scheduler_v2, Scheduler);701702 #[cfg(feature = "rmrk")]703 list_benchmark!(list, extra, pallet_proxy_rmrk_core, RmrkCore);704705 #[cfg(feature = "rmrk")]706 list_benchmark!(list, extra, pallet_proxy_rmrk_equip, RmrkEquip);707708 #[cfg(feature = "collator-selection")]709 list_benchmark!(list, extra, pallet_collator_selection, CollatorSelection);710711 #[cfg(feature = "collator-selection")]712 list_benchmark!(list, extra, pallet_identity, Identity);713714 #[cfg(feature = "foreign-assets")]715 list_benchmark!(list, extra, pallet_foreign_assets, ForeignAssets);716717718 // list_benchmark!(list, extra, pallet_evm_coder_substrate, EvmCoderSubstrate);719720 let storage_info = AllPalletsReversedWithSystemFirst::storage_info();721722 return (list, storage_info)723 }724725 fn dispatch_benchmark(726 config: frame_benchmarking::BenchmarkConfig727 ) -> Result<Vec<frame_benchmarking::BenchmarkBatch>, sp_runtime::RuntimeString> {728 use frame_benchmarking::{Benchmarking, BenchmarkBatch, add_benchmark, TrackedStorageKey};729730 let allowlist: Vec<TrackedStorageKey> = vec![731 // Total Issuance732 hex_literal::hex!("c2261276cc9d1f8598ea4b6a74b15c2f57c875e4cff74148e4628f264b974c80").to_vec().into(),733734 // Block Number735 hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef702a5c1b19ab7a04f536c519aca4983ac").to_vec().into(),736 // Execution Phase737 hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef7ff553b5a9862a516939d82b3d3d8661a").to_vec().into(),738 // Event Count739 hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef70a98fdbe9ce6c55837576c60c7af3850").to_vec().into(),740 // System Events741 hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef780d41e5e16056765bc8461851072c9d7").to_vec().into(),742743 // Evm CurrentLogs744 hex_literal::hex!("1da53b775b270400e7e61ed5cbc5a146547f210cec367e9af919603343b9cb56").to_vec().into(),745746 // Transactional depth747 hex_literal::hex!("3a7472616e73616374696f6e5f6c6576656c3a").to_vec().into(),748 ];749750 let mut batches = Vec::<BenchmarkBatch>::new();751 let params = (&config, &allowlist);752753 add_benchmark!(params, batches, pallet_evm_migration, EvmMigration);754 add_benchmark!(params, batches, pallet_common, Common);755 add_benchmark!(params, batches, pallet_unique, Unique);756 add_benchmark!(params, batches, pallet_structure, Structure);757 add_benchmark!(params, batches, pallet_inflation, Inflation);758759 #[cfg(feature = "app-promotion")]760 add_benchmark!(params, batches, pallet_app_promotion, AppPromotion);761762 add_benchmark!(params, batches, pallet_fungible, Fungible);763 add_benchmark!(params, batches, pallet_nonfungible, Nonfungible);764765 #[cfg(feature = "refungible")]766 add_benchmark!(params, batches, pallet_refungible, Refungible);767768 #[cfg(feature = "scheduler")]769 add_benchmark!(params, batches, pallet_unique_scheduler_v2, Scheduler);770771 #[cfg(feature = "rmrk")]772 add_benchmark!(params, batches, pallet_proxy_rmrk_core, RmrkCore);773774 #[cfg(feature = "rmrk")]775 add_benchmark!(params, batches, pallet_proxy_rmrk_equip, RmrkEquip);776777 #[cfg(feature = "collator-selection")]778 add_benchmark!(params, batches, pallet_collator_selection, CollatorSelection);779780 #[cfg(feature = "collator-selection")]781 add_benchmark!(params, batches, pallet_identity, Identity);782783 #[cfg(feature = "foreign-assets")]784 add_benchmark!(params, batches, pallet_foreign_assets, ForeignAssets);785786 // add_benchmark!(params, batches, pallet_evm_coder_substrate, EvmCoderSubstrate);787788 if batches.is_empty() { return Err("Benchmark not found for this pallet.".into()) }789 Ok(batches)790 }791 }792793 impl up_pov_estimate_rpc::PovEstimateApi<Block> for Runtime {794 #[allow(unused_variables)]795 fn pov_estimate(uxt: Bytes) -> ApplyExtrinsicResult {796 #[cfg(feature = "pov-estimate")]797 {798 use codec::Decode;799800 let uxt_decode = <<Block as BlockT>::Extrinsic as Decode>::decode(&mut &*uxt)801 .map_err(|_| DispatchError::Other("failed to decode the extrinsic"));802803 let uxt = match uxt_decode {804 Ok(uxt) => uxt,805 Err(err) => return Ok(err.into()),806 };807808 Executive::apply_extrinsic(uxt)809 }810811 #[cfg(not(feature = "pov-estimate"))]812 return Ok(unsupported!());813 }814 }815816 #[cfg(feature = "try-runtime")]817 impl frame_try_runtime::TryRuntime<Block> for Runtime {818 fn on_runtime_upgrade(checks: bool) -> (frame_support::pallet_prelude::Weight, frame_support::pallet_prelude::Weight) {819 log::info!("try-runtime::on_runtime_upgrade unique-chain.");820 let weight = Executive::try_runtime_upgrade(checks).unwrap();821 (weight, crate::config::substrate::RuntimeBlockWeights::get().max_block)822 }823824 fn execute_block(825 block: Block,826 state_root_check: bool,827 signature_check: bool,828 select: frame_try_runtime::TryStateSelect829 ) -> frame_support::pallet_prelude::Weight {830 log::info!(831 target: "node-runtime",832 "try-runtime: executing block {:?} / root checks: {:?} / try-state-select: {:?}",833 block.header.hash(),834 state_root_check,835 select,836 );837838 Executive::try_execute_block(block, state_root_check, signature_check, select).unwrap()839 }840 }841 }842 }843}runtime/opal/Cargo.tomldiffbeforeafterboth--- a/runtime/opal/Cargo.toml
+++ b/runtime/opal/Cargo.toml
@@ -28,6 +28,7 @@
'pallet-evm-coder-substrate/runtime-benchmarks',
'pallet-balances/runtime-benchmarks',
'pallet-timestamp/runtime-benchmarks',
+ 'pallet-configuration/runtime-benchmarks',
'pallet-common/runtime-benchmarks',
'pallet-structure/runtime-benchmarks',
'pallet-fungible/runtime-benchmarks',
runtime/quartz/Cargo.tomldiffbeforeafterboth--- a/runtime/quartz/Cargo.toml
+++ b/runtime/quartz/Cargo.toml
@@ -28,6 +28,7 @@
'pallet-evm-coder-substrate/runtime-benchmarks',
'pallet-balances/runtime-benchmarks',
'pallet-timestamp/runtime-benchmarks',
+ 'pallet-configuration/runtime-benchmarks',
'pallet-common/runtime-benchmarks',
'pallet-structure/runtime-benchmarks',
'pallet-fungible/runtime-benchmarks',
runtime/unique/Cargo.tomldiffbeforeafterboth--- a/runtime/unique/Cargo.toml
+++ b/runtime/unique/Cargo.toml
@@ -28,6 +28,7 @@
'pallet-evm-coder-substrate/runtime-benchmarks',
'pallet-balances/runtime-benchmarks',
'pallet-timestamp/runtime-benchmarks',
+ 'pallet-configuration/runtime-benchmarks',
'pallet-common/runtime-benchmarks',
'pallet-structure/runtime-benchmarks',
'pallet-fungible/runtime-benchmarks',