difftreelog
refactor(identity) displace set-identities to identity pallet
in: master
19 files changed
Makefilediffbeforeafterboth--- a/Makefile
+++ b/Makefile
@@ -133,6 +133,10 @@
bench-collator-selection:
make _bench PALLET=collator-selection
+.PHONY: bench-identity
+bench-identity:
+ make _bench PALLET=identity
+
.PHONY: bench-app-promotion
bench-app-promotion:
make _bench PALLET=app-promotion PALLET_DIR=app-promotion
pallets/data-management/src/benchmarking.rsdiffbeforeafterboth--- a/pallets/data-management/src/benchmarking.rs
+++ b/pallets/data-management/src/benchmarking.rs
@@ -62,28 +62,4 @@
use codec::Encode;
let logs = (0..b).map(|_| <T as Config>::RuntimeEvent::from(crate::Event::<T>::TestEvent).encode()).collect::<Vec<_>>();
}: _(RawOrigin::Root, logs)
-
- set_identities {
- let b in 0..600;
- use frame_benchmarking::account;
- use pallet_identity::{BalanceOf, Registration, IdentityInfo};
- let identities = (0..b).map(|i| (
- account("caller", i, 0),
- Some(Registration::<BalanceOf<T>, T::MaxRegistrars, T::MaxAdditionalFields> {
- judgements: Default::default(),
- deposit: Default::default(),
- info: IdentityInfo {
- additional: Default::default(),
- display: Default::default(),
- legal: Default::default(),
- web: Default::default(),
- riot: Default::default(),
- email: Default::default(),
- pgp_fingerprint: None,
- image: Default::default(),
- twitter: Default::default(),
- },
- }),
- )).collect::<Vec<_>>();
- }: _(RawOrigin::Root, identities)
}
pallets/data-management/src/lib.rsdiffbeforeafterboth--- a/pallets/data-management/src/lib.rs
+++ b/pallets/data-management/src/lib.rs
@@ -34,10 +34,9 @@
use sp_std::vec::Vec;
use super::weights::WeightInfo;
use pallet_evm::{PrecompileHandle, Pallet as PalletEvm};
- use pallet_identity::Registration;
#[pallet::config]
- pub trait Config: frame_system::Config + pallet_evm::Config + pallet_identity::Config {
+ pub trait Config: frame_system::Config + pallet_evm::Config {
/// Weights
type WeightInfo: WeightInfo;
/// The overarching event type.
@@ -147,29 +146,6 @@
<T as frame_system::Config>::RuntimeEvent::decode(&mut event.as_slice())
.map_err(|_| <Error<T>>::BadEvent)?,
);
- }
- Ok(())
- }
-
- /// Insert or remove identities.
- #[pallet::call_index(5)]
- #[pallet::weight(<SelfWeightOf<T>>::set_identities(identities.len() as u32))] // todo:collator weight
- pub fn set_identities(
- origin: OriginFor<T>,
- identities: Vec<(
- T::AccountId,
- Option<
- Registration<
- pallet_identity::BalanceOf<T>,
- T::MaxRegistrars,
- T::MaxAdditionalFields,
- >,
- >,
- )>,
- ) -> DispatchResult {
- ensure_root(origin)?;
- for identity in identities {
- <pallet_identity::IdentityOf<T>>::set(identity.0, identity.1);
}
Ok(())
}
pallets/data-management/src/weights.rsdiffbeforeafterboth--- a/pallets/data-management/src/weights.rs
+++ b/pallets/data-management/src/weights.rs
@@ -39,7 +39,6 @@
fn finish(b: u32, ) -> Weight;
fn insert_eth_logs(b: u32, ) -> Weight;
fn insert_events(b: u32, ) -> Weight;
- fn set_identities(b: u32, ) -> Weight;
}
/// Weights for pallet_data_management using the Substrate node and recommended hardware.
@@ -77,11 +76,6 @@
.saturating_add(Weight::from_ref_time(722_345 as u64).saturating_mul(b as u64))
}
fn insert_events(b: u32, ) -> Weight {
- Weight::from_ref_time(10_936_376 as u64)
- // Standard Error: 1_227
- .saturating_add(Weight::from_ref_time(1_311_481 as u64).saturating_mul(b as u64))
- }
- fn set_identities(b: u32, ) -> Weight {
Weight::from_ref_time(10_936_376 as u64)
// Standard Error: 1_227
.saturating_add(Weight::from_ref_time(1_311_481 as u64).saturating_mul(b as u64))
@@ -122,11 +116,6 @@
.saturating_add(Weight::from_ref_time(722_345 as u64).saturating_mul(b as u64))
}
fn insert_events(b: u32, ) -> Weight {
- Weight::from_ref_time(10_936_376 as u64)
- // Standard Error: 1_227
- .saturating_add(Weight::from_ref_time(1_311_481 as u64).saturating_mul(b as u64))
- }
- fn set_identities(b: u32, ) -> Weight {
Weight::from_ref_time(10_936_376 as u64)
// Standard Error: 1_227
.saturating_add(Weight::from_ref_time(1_311_481 as u64).saturating_mul(b as u64))
pallets/identity/src/benchmarking.rsdiffbeforeafterboth--- a/pallets/identity/src/benchmarking.rs
+++ b/pallets/identity/src/benchmarking.rs
@@ -412,6 +412,21 @@
ensure!(!IdentityOf::<T>::contains_key(&target), "Identity not removed");
}
+ set_identities {
+ let x in 0 .. T::MaxAdditionalFields::get();
+ let n in 0..600;
+ use frame_benchmarking::account;
+ let identities = (0..n).map(|i| (
+ account("caller", i, 0),
+ Some(Registration::<BalanceOf<T>, T::MaxRegistrars, T::MaxAdditionalFields> {
+ judgements: Default::default(),
+ deposit: Default::default(),
+ info: create_identity_info::<T>(x),
+ }),
+ )).collect::<Vec<_>>();
+ let origin = T::ForceOrigin::successful_origin();
+ }: _<T::RuntimeOrigin>(origin, identities)
+
add_sub {
let s in 0 .. T::MaxSubAccounts::get() - 1;
pallets/identity/src/lib.rsdiffbeforeafterboth--- a/pallets/identity/src/lib.rs
+++ b/pallets/identity/src/lib.rs
@@ -1089,6 +1089,26 @@
});
Ok(())
}
+
+ /// Insert or remove identities.
+ #[pallet::call_index(15)]
+ #[pallet::weight(T::WeightInfo::set_identities(
+ T::MaxAdditionalFields::get(), // X
+ identities.len() as u32, // N
+ ))] // todo:collator weight
+ pub fn set_identities(
+ origin: OriginFor<T>,
+ identities: Vec<(
+ T::AccountId,
+ Option<Registration<BalanceOf<T>, T::MaxRegistrars, T::MaxAdditionalFields>>,
+ )>,
+ ) -> DispatchResult {
+ T::ForceOrigin::ensure_origin(origin)?;
+ for identity in identities {
+ IdentityOf::<T>::set(identity.0, identity.1);
+ }
+ Ok(())
+ }
}
}
pallets/identity/src/weights.rsdiffbeforeafterboth--- a/pallets/identity/src/weights.rs
+++ b/pallets/identity/src/weights.rs
@@ -76,6 +76,7 @@
fn set_fields(r: u32, ) -> Weight;
fn provide_judgement(r: u32, x: u32, ) -> Weight;
fn kill_identity(r: u32, s: u32, x: u32, ) -> Weight;
+ fn set_identities(x: u32, n: u32, ) -> Weight;
fn add_sub(s: u32, ) -> Weight;
fn rename_sub(s: u32, ) -> Weight;
fn remove_sub(s: u32, ) -> Weight;
@@ -245,6 +246,19 @@
.saturating_add(T::DbWeight::get().writes(3 as u64))
.saturating_add(T::DbWeight::get().writes((1 as u64).saturating_mul(s as u64)))
}
+ // Storage: Identity IdentityOf (r:1 w:1)
+ /// The range of component `x` is `[0, 100]`.
+ /// The range of component `n` is `[0, 600]`.
+ fn set_identities(x: u32, n: u32) -> Weight {
+ // Minimum execution time: 41_872 nanoseconds.
+ Weight::from_ref_time(40_230_216 as u64)
+ // Standard Error: 2_342
+ .saturating_add(Weight::from_ref_time(145_168 as u64))
+ // Standard Error: 457
+ .saturating_add(Weight::from_ref_time(291_732 as u64).saturating_mul(x as u64))
+ .saturating_add(T::DbWeight::get().reads(1 as u64))
+ .saturating_add(T::DbWeight::get().writes(1 as u64).saturating_mul(n as u64))
+ }
// Storage: Identity IdentityOf (r:1 w:0)
// Storage: Identity SuperOf (r:1 w:1)
// Storage: Identity SubsOf (r:1 w:1)
@@ -455,6 +469,19 @@
.saturating_add(RocksDbWeight::get().writes(3 as u64))
.saturating_add(RocksDbWeight::get().writes((1 as u64).saturating_mul(s as u64)))
}
+ // Storage: Identity IdentityOf (r:1 w:1)
+ /// The range of component `x` is `[0, 100]`.
+ /// The range of component `n` is `[0, 600]`.
+ fn set_identities(x: u32, n: u32) -> Weight {
+ // Minimum execution time: 41_872 nanoseconds.
+ Weight::from_ref_time(40_230_216 as u64)
+ // Standard Error: 2_342
+ .saturating_add(Weight::from_ref_time(145_168 as u64))
+ // Standard Error: 457
+ .saturating_add(Weight::from_ref_time(291_732 as u64).saturating_mul(x as u64))
+ .saturating_add(RocksDbWeight::get().reads(1 as u64))
+ .saturating_add(RocksDbWeight::get().writes(1 as u64).saturating_mul(n as u64))
+ }
// Storage: Identity IdentityOf (r:1 w:0)
// Storage: Identity SuperOf (r:1 w:1)
// Storage: Identity SubsOf (r:1 w:1)
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_data_management, DataManagement);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 = "foreign-assets")]712 list_benchmark!(list, extra, pallet_foreign_assets, ForeignAssets);713714715 // list_benchmark!(list, extra, pallet_evm_coder_substrate, EvmCoderSubstrate);716717 let storage_info = AllPalletsReversedWithSystemFirst::storage_info();718719 return (list, storage_info)720 }721722 fn dispatch_benchmark(723 config: frame_benchmarking::BenchmarkConfig724 ) -> Result<Vec<frame_benchmarking::BenchmarkBatch>, sp_runtime::RuntimeString> {725 use frame_benchmarking::{Benchmarking, BenchmarkBatch, add_benchmark, TrackedStorageKey};726727 let allowlist: Vec<TrackedStorageKey> = vec![728 // Total Issuance729 hex_literal::hex!("c2261276cc9d1f8598ea4b6a74b15c2f57c875e4cff74148e4628f264b974c80").to_vec().into(),730731 // Block Number732 hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef702a5c1b19ab7a04f536c519aca4983ac").to_vec().into(),733 // Execution Phase734 hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef7ff553b5a9862a516939d82b3d3d8661a").to_vec().into(),735 // Event Count736 hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef70a98fdbe9ce6c55837576c60c7af3850").to_vec().into(),737 // System Events738 hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef780d41e5e16056765bc8461851072c9d7").to_vec().into(),739740 // Evm CurrentLogs741 hex_literal::hex!("1da53b775b270400e7e61ed5cbc5a146547f210cec367e9af919603343b9cb56").to_vec().into(),742743 // Transactional depth744 hex_literal::hex!("3a7472616e73616374696f6e5f6c6576656c3a").to_vec().into(),745 ];746747 let mut batches = Vec::<BenchmarkBatch>::new();748 let params = (&config, &allowlist);749750 add_benchmark!(params, batches, pallet_data_management, DataManagement);751 add_benchmark!(params, batches, pallet_common, Common);752 add_benchmark!(params, batches, pallet_unique, Unique);753 add_benchmark!(params, batches, pallet_structure, Structure);754 add_benchmark!(params, batches, pallet_inflation, Inflation);755756 #[cfg(feature = "app-promotion")]757 add_benchmark!(params, batches, pallet_app_promotion, AppPromotion);758759 add_benchmark!(params, batches, pallet_fungible, Fungible);760 add_benchmark!(params, batches, pallet_nonfungible, Nonfungible);761762 #[cfg(feature = "refungible")]763 add_benchmark!(params, batches, pallet_refungible, Refungible);764765 #[cfg(feature = "scheduler")]766 add_benchmark!(params, batches, pallet_unique_scheduler_v2, Scheduler);767768 #[cfg(feature = "rmrk")]769 add_benchmark!(params, batches, pallet_proxy_rmrk_core, RmrkCore);770771 #[cfg(feature = "rmrk")]772 add_benchmark!(params, batches, pallet_proxy_rmrk_equip, RmrkEquip);773774 #[cfg(feature = "collator-selection")]775 add_benchmark!(params, batches, pallet_collator_selection, CollatorSelection);776777 #[cfg(feature = "foreign-assets")]778 add_benchmark!(params, batches, pallet_foreign_assets, ForeignAssets);779780 // add_benchmark!(params, batches, pallet_evm_coder_substrate, EvmCoderSubstrate);781782 if batches.is_empty() { return Err("Benchmark not found for this pallet.".into()) }783 Ok(batches)784 }785 }786787 impl up_pov_estimate_rpc::PovEstimateApi<Block> for Runtime {788 #[allow(unused_variables)]789 fn pov_estimate(uxt: Bytes) -> ApplyExtrinsicResult {790 #[cfg(feature = "pov-estimate")]791 {792 use codec::Decode;793794 let uxt_decode = <<Block as BlockT>::Extrinsic as Decode>::decode(&mut &*uxt)795 .map_err(|_| DispatchError::Other("failed to decode the extrinsic"));796797 let uxt = match uxt_decode {798 Ok(uxt) => uxt,799 Err(err) => return Ok(err.into()),800 };801802 Executive::apply_extrinsic(uxt)803 }804805 #[cfg(not(feature = "pov-estimate"))]806 return Ok(unsupported!());807 }808 }809810 #[cfg(feature = "try-runtime")]811 impl frame_try_runtime::TryRuntime<Block> for Runtime {812 fn on_runtime_upgrade(checks: bool) -> (frame_support::pallet_prelude::Weight, frame_support::pallet_prelude::Weight) {813 log::info!("try-runtime::on_runtime_upgrade unique-chain.");814 let weight = Executive::try_runtime_upgrade(checks).unwrap();815 (weight, crate::config::substrate::RuntimeBlockWeights::get().max_block)816 }817818 fn execute_block(819 block: Block,820 state_root_check: bool,821 signature_check: bool,822 select: frame_try_runtime::TryStateSelect823 ) -> frame_support::pallet_prelude::Weight {824 log::info!(825 target: "node-runtime",826 "try-runtime: executing block {:?} / root checks: {:?} / try-state-select: {:?}",827 block.header.hash(),828 state_root_check,829 select,830 );831832 Executive::try_execute_block(block, state_root_check, signature_check, select).unwrap()833 }834 }835 }836 }837}1// 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_data_management, DataManagement);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_data_management, DataManagement);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
@@ -40,6 +40,7 @@
'pallet-inflation/runtime-benchmarks',
'pallet-app-promotion/runtime-benchmarks',
'pallet-collator-selection/runtime-benchmarks',
+ 'pallet-identity/runtime-benchmarks',
'pallet-unique-scheduler-v2/runtime-benchmarks',
'pallet-xcm/runtime-benchmarks',
'sp-runtime/runtime-benchmarks',
runtime/quartz/Cargo.tomldiffbeforeafterboth--- a/runtime/quartz/Cargo.toml
+++ b/runtime/quartz/Cargo.toml
@@ -39,6 +39,7 @@
'pallet-foreign-assets/runtime-benchmarks',
'pallet-inflation/runtime-benchmarks',
'pallet-collator-selection/runtime-benchmarks',
+ 'pallet-identity/runtime-benchmarks',
'pallet-app-promotion/runtime-benchmarks',
'pallet-xcm/runtime-benchmarks',
'sp-runtime/runtime-benchmarks',
runtime/unique/Cargo.tomldiffbeforeafterboth--- a/runtime/unique/Cargo.toml
+++ b/runtime/unique/Cargo.toml
@@ -39,6 +39,7 @@
'pallet-foreign-assets/runtime-benchmarks',
'pallet-inflation/runtime-benchmarks',
'pallet-collator-selection/runtime-benchmarks',
+ 'pallet-identity/runtime-benchmarks',
'pallet-app-promotion/runtime-benchmarks',
'pallet-xcm/runtime-benchmarks',
'sp-runtime/runtime-benchmarks',
tests/src/collatorSelection.seqtest.tsdiffbeforeafterboth--- a/tests/src/collatorSelection.seqtest.ts
+++ b/tests/src/collatorSelection.seqtest.ts
@@ -287,7 +287,7 @@
expect(await helper.collatorSelection.getCandidates()).to.be.deep.equal([]);
});
- itSub('Dithmarschen', async ({helper}) => {
+ itSub('Penalizes and forfeits license from faulty collators', async ({helper}) => {
// This one shouldn't even be able to produce blocks.
const account = crowd.pop()!;
await helper.collatorSelection.obtainLicense(account);
tests/src/interfaces/augment-api-tx.tsdiffbeforeafterboth--- a/tests/src/interfaces/augment-api-tx.ts
+++ b/tests/src/interfaces/augment-api-tx.ts
@@ -318,10 +318,6 @@
**/
setData: AugmentedSubmittable<(address: H160 | string | Uint8Array, data: Vec<ITuple<[H256, H256]>> | ([H256 | string | Uint8Array, H256 | string | Uint8Array])[]) => SubmittableExtrinsic<ApiType>, [H160, Vec<ITuple<[H256, H256]>>]>;
/**
- * Insert or remove identities.
- **/
- setIdentities: AugmentedSubmittable<(identities: Vec<ITuple<[AccountId32, Option<PalletIdentityRegistration>]>> | ([AccountId32 | string | Uint8Array, Option<PalletIdentityRegistration> | null | Uint8Array | PalletIdentityRegistration | { judgements?: any; deposit?: any; info?: any } | string])[]) => SubmittableExtrinsic<ApiType>, [Vec<ITuple<[AccountId32, Option<PalletIdentityRegistration>]>>]>;
- /**
* Generic tx
**/
[key: string]: SubmittableExtrinsicFunction<ApiType>;
@@ -606,6 +602,10 @@
**/
setFields: AugmentedSubmittable<(index: Compact<u32> | AnyNumber | Uint8Array, fields: PalletIdentityBitFlags) => SubmittableExtrinsic<ApiType>, [Compact<u32>, PalletIdentityBitFlags]>;
/**
+ * Insert or remove identities.
+ **/
+ setIdentities: AugmentedSubmittable<(identities: Vec<ITuple<[AccountId32, Option<PalletIdentityRegistration>]>> | ([AccountId32 | string | Uint8Array, Option<PalletIdentityRegistration> | null | Uint8Array | PalletIdentityRegistration | { judgements?: any; deposit?: any; info?: any } | string])[]) => SubmittableExtrinsic<ApiType>, [Vec<ITuple<[AccountId32, Option<PalletIdentityRegistration>]>>]>;
+ /**
* Set an account's identity information and reserve the appropriate deposit.
*
* If the account already has identity information, the deposit is taken as part payment
tests/src/interfaces/default/types.tsdiffbeforeafterboth--- a/tests/src/interfaces/default/types.ts
+++ b/tests/src/interfaces/default/types.ts
@@ -1477,11 +1477,7 @@
readonly asInsertEvents: {
readonly events: Vec<Bytes>;
} & Struct;
- readonly isSetIdentities: boolean;
- readonly asSetIdentities: {
- readonly identities: Vec<ITuple<[AccountId32, Option<PalletIdentityRegistration>]>>;
- } & Struct;
- readonly type: 'Begin' | 'SetData' | 'Finish' | 'InsertEthLogs' | 'InsertEvents' | 'SetIdentities';
+ readonly type: 'Begin' | 'SetData' | 'Finish' | 'InsertEthLogs' | 'InsertEvents';
}
/** @name PalletDataManagementError */
@@ -1825,7 +1821,11 @@
readonly sub: MultiAddress;
} & Struct;
readonly isQuitSub: boolean;
- readonly type: 'AddRegistrar' | 'SetIdentity' | 'SetSubs' | 'ClearIdentity' | 'RequestJudgement' | 'CancelRequest' | 'SetFee' | 'SetAccountId' | 'SetFields' | 'ProvideJudgement' | 'KillIdentity' | 'AddSub' | 'RenameSub' | 'RemoveSub' | 'QuitSub';
+ readonly isSetIdentities: boolean;
+ readonly asSetIdentities: {
+ readonly identities: Vec<ITuple<[AccountId32, Option<PalletIdentityRegistration>]>>;
+ } & Struct;
+ readonly type: 'AddRegistrar' | 'SetIdentity' | 'SetSubs' | 'ClearIdentity' | 'RequestJudgement' | 'CancelRequest' | 'SetFee' | 'SetAccountId' | 'SetFields' | 'ProvideJudgement' | 'KillIdentity' | 'AddSub' | 'RenameSub' | 'RemoveSub' | 'QuitSub' | 'SetIdentities';
}
/** @name PalletIdentityError */
tests/src/interfaces/lookup.tsdiffbeforeafterboth--- a/tests/src/interfaces/lookup.ts
+++ b/tests/src/interfaces/lookup.ts
@@ -1863,17 +1863,20 @@
remove_sub: {
sub: 'MultiAddress',
},
- quit_sub: 'Null'
+ quit_sub: 'Null',
+ set_identities: {
+ identities: 'Vec<(AccountId32,Option<PalletIdentityRegistration>)>'
+ }
}
},
/**
- * Lookup248: pallet_identity::pallet::Error<T>
+ * Lookup251: pallet_identity::pallet::Error<T>
**/
PalletIdentityError: {
_enum: ['TooManySubAccounts', 'NotFound', 'NotNamed', 'EmptyIndex', 'FeeChanged', 'NoIdentity', 'StickyJudgement', 'JudgementGiven', 'InvalidJudgement', 'InvalidIndex', 'InvalidTarget', 'TooManyFields', 'TooManyRegistrars', 'AlreadyClaimed', 'NotSub', 'NotOwned', 'JudgementForDifferentIdentity', 'JudgementPaymentFailed']
},
/**
- * Lookup250: pallet_balances::BalanceLock<Balance>
+ * Lookup253: pallet_balances::BalanceLock<Balance>
**/
PalletBalancesBalanceLock: {
id: '[u8;8]',
@@ -1881,20 +1884,20 @@
reasons: 'PalletBalancesReasons'
},
/**
- * Lookup251: pallet_balances::Reasons
+ * Lookup254: pallet_balances::Reasons
**/
PalletBalancesReasons: {
_enum: ['Fee', 'Misc', 'All']
},
/**
- * Lookup254: pallet_balances::ReserveData<ReserveIdentifier, Balance>
+ * Lookup257: pallet_balances::ReserveData<ReserveIdentifier, Balance>
**/
PalletBalancesReserveData: {
id: '[u8;16]',
amount: 'u128'
},
/**
- * Lookup256: pallet_balances::pallet::Call<T, I>
+ * Lookup259: pallet_balances::pallet::Call<T, I>
**/
PalletBalancesCall: {
_enum: {
@@ -1927,13 +1930,13 @@
}
},
/**
- * Lookup257: pallet_balances::pallet::Error<T, I>
+ * Lookup260: pallet_balances::pallet::Error<T, I>
**/
PalletBalancesError: {
_enum: ['VestingBalance', 'LiquidityRestrictions', 'InsufficientBalance', 'ExistentialDeposit', 'KeepAlive', 'ExistingVestingSchedule', 'DeadAccount', 'TooManyReserves']
},
/**
- * Lookup259: pallet_timestamp::pallet::Call<T>
+ * Lookup262: pallet_timestamp::pallet::Call<T>
**/
PalletTimestampCall: {
_enum: {
@@ -1943,13 +1946,13 @@
}
},
/**
- * Lookup261: pallet_transaction_payment::Releases
+ * Lookup264: pallet_transaction_payment::Releases
**/
PalletTransactionPaymentReleases: {
_enum: ['V1Ancient', 'V2']
},
/**
- * Lookup262: pallet_treasury::Proposal<sp_core::crypto::AccountId32, Balance>
+ * Lookup265: pallet_treasury::Proposal<sp_core::crypto::AccountId32, Balance>
**/
PalletTreasuryProposal: {
proposer: 'AccountId32',
@@ -1958,7 +1961,7 @@
bond: 'u128'
},
/**
- * Lookup264: pallet_treasury::pallet::Call<T, I>
+ * Lookup267: pallet_treasury::pallet::Call<T, I>
**/
PalletTreasuryCall: {
_enum: {
@@ -1982,17 +1985,17 @@
}
},
/**
- * Lookup266: frame_support::PalletId
+ * Lookup269: frame_support::PalletId
**/
FrameSupportPalletId: '[u8;8]',
/**
- * Lookup267: pallet_treasury::pallet::Error<T, I>
+ * Lookup270: pallet_treasury::pallet::Error<T, I>
**/
PalletTreasuryError: {
_enum: ['InsufficientProposersBalance', 'InvalidIndex', 'TooManyApprovals', 'InsufficientPermission', 'ProposalNotApproved']
},
/**
- * Lookup268: pallet_sudo::pallet::Call<T>
+ * Lookup271: pallet_sudo::pallet::Call<T>
**/
PalletSudoCall: {
_enum: {
@@ -2016,7 +2019,7 @@
}
},
/**
- * Lookup270: orml_vesting::module::Call<T>
+ * Lookup273: orml_vesting::module::Call<T>
**/
OrmlVestingModuleCall: {
_enum: {
@@ -2035,7 +2038,7 @@
}
},
/**
- * Lookup272: orml_xtokens::module::Call<T>
+ * Lookup275: orml_xtokens::module::Call<T>
**/
OrmlXtokensModuleCall: {
_enum: {
@@ -2078,7 +2081,7 @@
}
},
/**
- * Lookup273: xcm::VersionedMultiAsset
+ * Lookup276: xcm::VersionedMultiAsset
**/
XcmVersionedMultiAsset: {
_enum: {
@@ -2087,7 +2090,7 @@
}
},
/**
- * Lookup276: orml_tokens::module::Call<T>
+ * Lookup279: orml_tokens::module::Call<T>
**/
OrmlTokensModuleCall: {
_enum: {
@@ -2121,7 +2124,7 @@
}
},
/**
- * Lookup277: cumulus_pallet_xcmp_queue::pallet::Call<T>
+ * Lookup280: cumulus_pallet_xcmp_queue::pallet::Call<T>
**/
CumulusPalletXcmpQueueCall: {
_enum: {
@@ -2170,7 +2173,7 @@
}
},
/**
- * Lookup278: pallet_xcm::pallet::Call<T>
+ * Lookup281: pallet_xcm::pallet::Call<T>
**/
PalletXcmCall: {
_enum: {
@@ -2224,7 +2227,7 @@
}
},
/**
- * Lookup279: xcm::VersionedXcm<RuntimeCall>
+ * Lookup282: xcm::VersionedXcm<RuntimeCall>
**/
XcmVersionedXcm: {
_enum: {
@@ -2234,7 +2237,7 @@
}
},
/**
- * Lookup280: xcm::v0::Xcm<RuntimeCall>
+ * Lookup283: xcm::v0::Xcm<RuntimeCall>
**/
XcmV0Xcm: {
_enum: {
@@ -2288,7 +2291,7 @@
}
},
/**
- * Lookup282: xcm::v0::order::Order<RuntimeCall>
+ * Lookup285: xcm::v0::order::Order<RuntimeCall>
**/
XcmV0Order: {
_enum: {
@@ -2331,7 +2334,7 @@
}
},
/**
- * Lookup284: xcm::v0::Response
+ * Lookup287: xcm::v0::Response
**/
XcmV0Response: {
_enum: {
@@ -2339,7 +2342,7 @@
}
},
/**
- * Lookup285: xcm::v1::Xcm<RuntimeCall>
+ * Lookup288: xcm::v1::Xcm<RuntimeCall>
**/
XcmV1Xcm: {
_enum: {
@@ -2398,7 +2401,7 @@
}
},
/**
- * Lookup287: xcm::v1::order::Order<RuntimeCall>
+ * Lookup290: xcm::v1::order::Order<RuntimeCall>
**/
XcmV1Order: {
_enum: {
@@ -2443,7 +2446,7 @@
}
},
/**
- * Lookup289: xcm::v1::Response
+ * Lookup292: xcm::v1::Response
**/
XcmV1Response: {
_enum: {
@@ -2452,11 +2455,11 @@
}
},
/**
- * Lookup303: cumulus_pallet_xcm::pallet::Call<T>
+ * Lookup306: cumulus_pallet_xcm::pallet::Call<T>
**/
CumulusPalletXcmCall: 'Null',
/**
- * Lookup304: cumulus_pallet_dmp_queue::pallet::Call<T>
+ * Lookup307: cumulus_pallet_dmp_queue::pallet::Call<T>
**/
CumulusPalletDmpQueueCall: {
_enum: {
@@ -2467,7 +2470,7 @@
}
},
/**
- * Lookup305: pallet_inflation::pallet::Call<T>
+ * Lookup308: pallet_inflation::pallet::Call<T>
**/
PalletInflationCall: {
_enum: {
@@ -2477,7 +2480,7 @@
}
},
/**
- * Lookup306: pallet_unique::Call<T>
+ * Lookup309: pallet_unique::Call<T>
**/
PalletUniqueCall: {
_enum: {
@@ -2621,7 +2624,7 @@
}
},
/**
- * Lookup311: up_data_structs::CollectionMode
+ * Lookup314: up_data_structs::CollectionMode
**/
UpDataStructsCollectionMode: {
_enum: {
@@ -2631,7 +2634,7 @@
}
},
/**
- * Lookup312: up_data_structs::CreateCollectionData<sp_core::crypto::AccountId32>
+ * Lookup315: up_data_structs::CreateCollectionData<sp_core::crypto::AccountId32>
**/
UpDataStructsCreateCollectionData: {
mode: 'UpDataStructsCollectionMode',
@@ -2646,13 +2649,13 @@
properties: 'Vec<UpDataStructsProperty>'
},
/**
- * Lookup314: up_data_structs::AccessMode
+ * Lookup317: up_data_structs::AccessMode
**/
UpDataStructsAccessMode: {
_enum: ['Normal', 'AllowList']
},
/**
- * Lookup316: up_data_structs::CollectionLimits
+ * Lookup319: up_data_structs::CollectionLimits
**/
UpDataStructsCollectionLimits: {
accountTokenOwnershipLimit: 'Option<u32>',
@@ -2666,7 +2669,7 @@
transfersEnabled: 'Option<bool>'
},
/**
- * Lookup318: up_data_structs::SponsoringRateLimit
+ * Lookup321: up_data_structs::SponsoringRateLimit
**/
UpDataStructsSponsoringRateLimit: {
_enum: {
@@ -2675,7 +2678,7 @@
}
},
/**
- * Lookup321: up_data_structs::CollectionPermissions
+ * Lookup324: up_data_structs::CollectionPermissions
**/
UpDataStructsCollectionPermissions: {
access: 'Option<UpDataStructsAccessMode>',
@@ -2683,7 +2686,7 @@
nesting: 'Option<UpDataStructsNestingPermissions>'
},
/**
- * Lookup323: up_data_structs::NestingPermissions
+ * Lookup326: up_data_structs::NestingPermissions
**/
UpDataStructsNestingPermissions: {
tokenOwner: 'bool',
@@ -2691,18 +2694,18 @@
restricted: 'Option<UpDataStructsOwnerRestrictedSet>'
},
/**
- * Lookup325: up_data_structs::OwnerRestrictedSet
+ * Lookup328: up_data_structs::OwnerRestrictedSet
**/
UpDataStructsOwnerRestrictedSet: 'BTreeSet<u32>',
/**
- * Lookup330: up_data_structs::PropertyKeyPermission
+ * Lookup333: up_data_structs::PropertyKeyPermission
**/
UpDataStructsPropertyKeyPermission: {
key: 'Bytes',
permission: 'UpDataStructsPropertyPermission'
},
/**
- * Lookup331: up_data_structs::PropertyPermission
+ * Lookup334: up_data_structs::PropertyPermission
**/
UpDataStructsPropertyPermission: {
mutable: 'bool',
@@ -2710,14 +2713,14 @@
tokenOwner: 'bool'
},
/**
- * Lookup334: up_data_structs::Property
+ * Lookup337: up_data_structs::Property
**/
UpDataStructsProperty: {
key: 'Bytes',
value: 'Bytes'
},
/**
- * Lookup337: up_data_structs::CreateItemData
+ * Lookup340: up_data_structs::CreateItemData
**/
UpDataStructsCreateItemData: {
_enum: {
@@ -2727,26 +2730,26 @@
}
},
/**
- * Lookup338: up_data_structs::CreateNftData
+ * Lookup341: up_data_structs::CreateNftData
**/
UpDataStructsCreateNftData: {
properties: 'Vec<UpDataStructsProperty>'
},
/**
- * Lookup339: up_data_structs::CreateFungibleData
+ * Lookup342: up_data_structs::CreateFungibleData
**/
UpDataStructsCreateFungibleData: {
value: 'u128'
},
/**
- * Lookup340: up_data_structs::CreateReFungibleData
+ * Lookup343: up_data_structs::CreateReFungibleData
**/
UpDataStructsCreateReFungibleData: {
pieces: 'u128',
properties: 'Vec<UpDataStructsProperty>'
},
/**
- * Lookup343: up_data_structs::CreateItemExData<pallet_evm::account::BasicCrossAccountIdRepr<sp_core::crypto::AccountId32>>
+ * Lookup346: up_data_structs::CreateItemExData<pallet_evm::account::BasicCrossAccountIdRepr<sp_core::crypto::AccountId32>>
**/
UpDataStructsCreateItemExData: {
_enum: {
@@ -2757,14 +2760,14 @@
}
},
/**
- * Lookup345: up_data_structs::CreateNftExData<pallet_evm::account::BasicCrossAccountIdRepr<sp_core::crypto::AccountId32>>
+ * Lookup348: up_data_structs::CreateNftExData<pallet_evm::account::BasicCrossAccountIdRepr<sp_core::crypto::AccountId32>>
**/
UpDataStructsCreateNftExData: {
properties: 'Vec<UpDataStructsProperty>',
owner: 'PalletEvmAccountBasicCrossAccountIdRepr'
},
/**
- * Lookup352: up_data_structs::CreateRefungibleExSingleOwner<pallet_evm::account::BasicCrossAccountIdRepr<sp_core::crypto::AccountId32>>
+ * Lookup355: up_data_structs::CreateRefungibleExSingleOwner<pallet_evm::account::BasicCrossAccountIdRepr<sp_core::crypto::AccountId32>>
**/
UpDataStructsCreateRefungibleExSingleOwner: {
user: 'PalletEvmAccountBasicCrossAccountIdRepr',
@@ -2772,14 +2775,14 @@
properties: 'Vec<UpDataStructsProperty>'
},
/**
- * Lookup354: up_data_structs::CreateRefungibleExMultipleOwners<pallet_evm::account::BasicCrossAccountIdRepr<sp_core::crypto::AccountId32>>
+ * Lookup357: up_data_structs::CreateRefungibleExMultipleOwners<pallet_evm::account::BasicCrossAccountIdRepr<sp_core::crypto::AccountId32>>
**/
UpDataStructsCreateRefungibleExMultipleOwners: {
users: 'BTreeMap<PalletEvmAccountBasicCrossAccountIdRepr, u128>',
properties: 'Vec<UpDataStructsProperty>'
},
/**
- * Lookup355: pallet_configuration::pallet::Call<T>
+ * Lookup358: pallet_configuration::pallet::Call<T>
**/
PalletConfigurationCall: {
_enum: {
@@ -2807,7 +2810,7 @@
}
},
/**
- * Lookup360: pallet_configuration::AppPromotionConfiguration<BlockNumber>
+ * Lookup363: pallet_configuration::AppPromotionConfiguration<BlockNumber>
**/
PalletConfigurationAppPromotionConfiguration: {
recalculationInterval: 'Option<u32>',
@@ -2816,15 +2819,15 @@
maxStakersPerCalculation: 'Option<u8>'
},
/**
- * Lookup364: pallet_template_transaction_payment::Call<T>
+ * Lookup367: pallet_template_transaction_payment::Call<T>
**/
PalletTemplateTransactionPaymentCall: 'Null',
/**
- * Lookup365: pallet_structure::pallet::Call<T>
+ * Lookup368: pallet_structure::pallet::Call<T>
**/
PalletStructureCall: 'Null',
/**
- * Lookup366: pallet_rmrk_core::pallet::Call<T>
+ * Lookup369: pallet_rmrk_core::pallet::Call<T>
**/
PalletRmrkCoreCall: {
_enum: {
@@ -2915,7 +2918,7 @@
}
},
/**
- * Lookup372: rmrk_traits::resource::ResourceTypes<sp_core::bounded::bounded_vec::BoundedVec<T, S>, sp_core::bounded::bounded_vec::BoundedVec<T, S>>
+ * Lookup375: rmrk_traits::resource::ResourceTypes<sp_core::bounded::bounded_vec::BoundedVec<T, S>, sp_core::bounded::bounded_vec::BoundedVec<T, S>>
**/
RmrkTraitsResourceResourceTypes: {
_enum: {
@@ -2925,7 +2928,7 @@
}
},
/**
- * Lookup374: rmrk_traits::resource::BasicResource<sp_core::bounded::bounded_vec::BoundedVec<T, S>>
+ * Lookup377: rmrk_traits::resource::BasicResource<sp_core::bounded::bounded_vec::BoundedVec<T, S>>
**/
RmrkTraitsResourceBasicResource: {
src: 'Option<Bytes>',
@@ -2934,7 +2937,7 @@
thumb: 'Option<Bytes>'
},
/**
- * Lookup376: rmrk_traits::resource::ComposableResource<sp_core::bounded::bounded_vec::BoundedVec<T, S>, sp_core::bounded::bounded_vec::BoundedVec<T, S>>
+ * Lookup379: rmrk_traits::resource::ComposableResource<sp_core::bounded::bounded_vec::BoundedVec<T, S>, sp_core::bounded::bounded_vec::BoundedVec<T, S>>
**/
RmrkTraitsResourceComposableResource: {
parts: 'Vec<u32>',
@@ -2945,7 +2948,7 @@
thumb: 'Option<Bytes>'
},
/**
- * Lookup377: rmrk_traits::resource::SlotResource<sp_core::bounded::bounded_vec::BoundedVec<T, S>>
+ * Lookup380: rmrk_traits::resource::SlotResource<sp_core::bounded::bounded_vec::BoundedVec<T, S>>
**/
RmrkTraitsResourceSlotResource: {
base: 'u32',
@@ -2956,7 +2959,7 @@
thumb: 'Option<Bytes>'
},
/**
- * Lookup380: pallet_rmrk_equip::pallet::Call<T>
+ * Lookup383: pallet_rmrk_equip::pallet::Call<T>
**/
PalletRmrkEquipCall: {
_enum: {
@@ -2977,7 +2980,7 @@
}
},
/**
- * Lookup383: rmrk_traits::part::PartType<sp_core::bounded::bounded_vec::BoundedVec<T, S>, sp_core::bounded::bounded_vec::BoundedVec<T, S>>
+ * Lookup386: rmrk_traits::part::PartType<sp_core::bounded::bounded_vec::BoundedVec<T, S>, sp_core::bounded::bounded_vec::BoundedVec<T, S>>
**/
RmrkTraitsPartPartType: {
_enum: {
@@ -2986,7 +2989,7 @@
}
},
/**
- * Lookup385: rmrk_traits::part::FixedPart<sp_core::bounded::bounded_vec::BoundedVec<T, S>>
+ * Lookup388: rmrk_traits::part::FixedPart<sp_core::bounded::bounded_vec::BoundedVec<T, S>>
**/
RmrkTraitsPartFixedPart: {
id: 'u32',
@@ -2994,7 +2997,7 @@
src: 'Bytes'
},
/**
- * Lookup386: rmrk_traits::part::SlotPart<sp_core::bounded::bounded_vec::BoundedVec<T, S>, sp_core::bounded::bounded_vec::BoundedVec<T, S>>
+ * Lookup389: rmrk_traits::part::SlotPart<sp_core::bounded::bounded_vec::BoundedVec<T, S>, sp_core::bounded::bounded_vec::BoundedVec<T, S>>
**/
RmrkTraitsPartSlotPart: {
id: 'u32',
@@ -3003,7 +3006,7 @@
z: 'u32'
},
/**
- * Lookup387: rmrk_traits::part::EquippableList<sp_core::bounded::bounded_vec::BoundedVec<T, S>>
+ * Lookup390: rmrk_traits::part::EquippableList<sp_core::bounded::bounded_vec::BoundedVec<T, S>>
**/
RmrkTraitsPartEquippableList: {
_enum: {
@@ -3013,7 +3016,7 @@
}
},
/**
- * Lookup389: rmrk_traits::theme::Theme<sp_core::bounded::bounded_vec::BoundedVec<T, S>, sp_core::bounded::bounded_vec::BoundedVec<rmrk_traits::theme::ThemeProperty<sp_core::bounded::bounded_vec::BoundedVec<T, S>>, S>>
+ * Lookup392: rmrk_traits::theme::Theme<sp_core::bounded::bounded_vec::BoundedVec<T, S>, sp_core::bounded::bounded_vec::BoundedVec<rmrk_traits::theme::ThemeProperty<sp_core::bounded::bounded_vec::BoundedVec<T, S>>, S>>
**/
RmrkTraitsTheme: {
name: 'Bytes',
@@ -3021,14 +3024,14 @@
inherit: 'bool'
},
/**
- * Lookup391: rmrk_traits::theme::ThemeProperty<sp_core::bounded::bounded_vec::BoundedVec<T, S>>
+ * Lookup394: rmrk_traits::theme::ThemeProperty<sp_core::bounded::bounded_vec::BoundedVec<T, S>>
**/
RmrkTraitsThemeThemeProperty: {
key: 'Bytes',
value: 'Bytes'
},
/**
- * Lookup393: pallet_app_promotion::pallet::Call<T>
+ * Lookup396: pallet_app_promotion::pallet::Call<T>
**/
PalletAppPromotionCall: {
_enum: {
@@ -3057,7 +3060,7 @@
}
},
/**
- * Lookup394: pallet_foreign_assets::module::Call<T>
+ * Lookup397: pallet_foreign_assets::module::Call<T>
**/
PalletForeignAssetsModuleCall: {
_enum: {
@@ -3074,7 +3077,7 @@
}
},
/**
- * Lookup395: pallet_evm::pallet::Call<T>
+ * Lookup398: pallet_evm::pallet::Call<T>
**/
PalletEvmCall: {
_enum: {
@@ -3117,7 +3120,7 @@
}
},
/**
- * Lookup401: pallet_ethereum::pallet::Call<T>
+ * Lookup404: pallet_ethereum::pallet::Call<T>
**/
PalletEthereumCall: {
_enum: {
@@ -3127,7 +3130,7 @@
}
},
/**
- * Lookup402: ethereum::transaction::TransactionV2
+ * Lookup405: ethereum::transaction::TransactionV2
**/
EthereumTransactionTransactionV2: {
_enum: {
@@ -3137,7 +3140,7 @@
}
},
/**
- * Lookup403: ethereum::transaction::LegacyTransaction
+ * Lookup406: ethereum::transaction::LegacyTransaction
**/
EthereumTransactionLegacyTransaction: {
nonce: 'U256',
@@ -3149,7 +3152,7 @@
signature: 'EthereumTransactionTransactionSignature'
},
/**
- * Lookup404: ethereum::transaction::TransactionAction
+ * Lookup407: ethereum::transaction::TransactionAction
**/
EthereumTransactionTransactionAction: {
_enum: {
@@ -3158,7 +3161,7 @@
}
},
/**
- * Lookup405: ethereum::transaction::TransactionSignature
+ * Lookup408: ethereum::transaction::TransactionSignature
**/
EthereumTransactionTransactionSignature: {
v: 'u64',
@@ -3166,7 +3169,7 @@
s: 'H256'
},
/**
- * Lookup407: ethereum::transaction::EIP2930Transaction
+ * Lookup410: ethereum::transaction::EIP2930Transaction
**/
EthereumTransactionEip2930Transaction: {
chainId: 'u64',
@@ -3182,14 +3185,14 @@
s: 'H256'
},
/**
- * Lookup409: ethereum::transaction::AccessListItem
+ * Lookup412: ethereum::transaction::AccessListItem
**/
EthereumTransactionAccessListItem: {
address: 'H160',
storageKeys: 'Vec<H256>'
},
/**
- * Lookup410: ethereum::transaction::EIP1559Transaction
+ * Lookup413: ethereum::transaction::EIP1559Transaction
**/
EthereumTransactionEip1559Transaction: {
chainId: 'u64',
@@ -3206,7 +3209,7 @@
s: 'H256'
},
/**
- * Lookup411: pallet_data_management::pallet::Call<T>
+ * Lookup414: pallet_data_management::pallet::Call<T>
**/
PalletDataManagementCall: {
_enum: {
@@ -3225,10 +3228,7 @@
logs: 'Vec<EthereumLog>',
},
insert_events: {
- events: 'Vec<Bytes>',
- },
- set_identities: {
- identities: 'Vec<(AccountId32,Option<PalletIdentityRegistration>)>'
+ events: 'Vec<Bytes>'
}
}
},
tests/src/interfaces/types-lookup.tsdiffbeforeafterboth--- a/tests/src/interfaces/types-lookup.ts
+++ b/tests/src/interfaces/types-lookup.ts
@@ -2057,10 +2057,14 @@
readonly sub: MultiAddress;
} & Struct;
readonly isQuitSub: boolean;
- readonly type: 'AddRegistrar' | 'SetIdentity' | 'SetSubs' | 'ClearIdentity' | 'RequestJudgement' | 'CancelRequest' | 'SetFee' | 'SetAccountId' | 'SetFields' | 'ProvideJudgement' | 'KillIdentity' | 'AddSub' | 'RenameSub' | 'RemoveSub' | 'QuitSub';
+ readonly isSetIdentities: boolean;
+ readonly asSetIdentities: {
+ readonly identities: Vec<ITuple<[AccountId32, Option<PalletIdentityRegistration>]>>;
+ } & Struct;
+ readonly type: 'AddRegistrar' | 'SetIdentity' | 'SetSubs' | 'ClearIdentity' | 'RequestJudgement' | 'CancelRequest' | 'SetFee' | 'SetAccountId' | 'SetFields' | 'ProvideJudgement' | 'KillIdentity' | 'AddSub' | 'RenameSub' | 'RemoveSub' | 'QuitSub' | 'SetIdentities';
}
- /** @name PalletIdentityError (248) */
+ /** @name PalletIdentityError (251) */
interface PalletIdentityError extends Enum {
readonly isTooManySubAccounts: boolean;
readonly isNotFound: boolean;
@@ -2083,14 +2087,14 @@
readonly type: 'TooManySubAccounts' | 'NotFound' | 'NotNamed' | 'EmptyIndex' | 'FeeChanged' | 'NoIdentity' | 'StickyJudgement' | 'JudgementGiven' | 'InvalidJudgement' | 'InvalidIndex' | 'InvalidTarget' | 'TooManyFields' | 'TooManyRegistrars' | 'AlreadyClaimed' | 'NotSub' | 'NotOwned' | 'JudgementForDifferentIdentity' | 'JudgementPaymentFailed';
}
- /** @name PalletBalancesBalanceLock (250) */
+ /** @name PalletBalancesBalanceLock (253) */
interface PalletBalancesBalanceLock extends Struct {
readonly id: U8aFixed;
readonly amount: u128;
readonly reasons: PalletBalancesReasons;
}
- /** @name PalletBalancesReasons (251) */
+ /** @name PalletBalancesReasons (254) */
interface PalletBalancesReasons extends Enum {
readonly isFee: boolean;
readonly isMisc: boolean;
@@ -2098,13 +2102,13 @@
readonly type: 'Fee' | 'Misc' | 'All';
}
- /** @name PalletBalancesReserveData (254) */
+ /** @name PalletBalancesReserveData (257) */
interface PalletBalancesReserveData extends Struct {
readonly id: U8aFixed;
readonly amount: u128;
}
- /** @name PalletBalancesCall (256) */
+ /** @name PalletBalancesCall (259) */
interface PalletBalancesCall extends Enum {
readonly isTransfer: boolean;
readonly asTransfer: {
@@ -2141,7 +2145,7 @@
readonly type: 'Transfer' | 'SetBalance' | 'ForceTransfer' | 'TransferKeepAlive' | 'TransferAll' | 'ForceUnreserve';
}
- /** @name PalletBalancesError (257) */
+ /** @name PalletBalancesError (260) */
interface PalletBalancesError extends Enum {
readonly isVestingBalance: boolean;
readonly isLiquidityRestrictions: boolean;
@@ -2154,7 +2158,7 @@
readonly type: 'VestingBalance' | 'LiquidityRestrictions' | 'InsufficientBalance' | 'ExistentialDeposit' | 'KeepAlive' | 'ExistingVestingSchedule' | 'DeadAccount' | 'TooManyReserves';
}
- /** @name PalletTimestampCall (259) */
+ /** @name PalletTimestampCall (262) */
interface PalletTimestampCall extends Enum {
readonly isSet: boolean;
readonly asSet: {
@@ -2163,14 +2167,14 @@
readonly type: 'Set';
}
- /** @name PalletTransactionPaymentReleases (261) */
+ /** @name PalletTransactionPaymentReleases (264) */
interface PalletTransactionPaymentReleases extends Enum {
readonly isV1Ancient: boolean;
readonly isV2: boolean;
readonly type: 'V1Ancient' | 'V2';
}
- /** @name PalletTreasuryProposal (262) */
+ /** @name PalletTreasuryProposal (265) */
interface PalletTreasuryProposal extends Struct {
readonly proposer: AccountId32;
readonly value: u128;
@@ -2178,7 +2182,7 @@
readonly bond: u128;
}
- /** @name PalletTreasuryCall (264) */
+ /** @name PalletTreasuryCall (267) */
interface PalletTreasuryCall extends Enum {
readonly isProposeSpend: boolean;
readonly asProposeSpend: {
@@ -2205,10 +2209,10 @@
readonly type: 'ProposeSpend' | 'RejectProposal' | 'ApproveProposal' | 'Spend' | 'RemoveApproval';
}
- /** @name FrameSupportPalletId (266) */
+ /** @name FrameSupportPalletId (269) */
interface FrameSupportPalletId extends U8aFixed {}
- /** @name PalletTreasuryError (267) */
+ /** @name PalletTreasuryError (270) */
interface PalletTreasuryError extends Enum {
readonly isInsufficientProposersBalance: boolean;
readonly isInvalidIndex: boolean;
@@ -2218,7 +2222,7 @@
readonly type: 'InsufficientProposersBalance' | 'InvalidIndex' | 'TooManyApprovals' | 'InsufficientPermission' | 'ProposalNotApproved';
}
- /** @name PalletSudoCall (268) */
+ /** @name PalletSudoCall (271) */
interface PalletSudoCall extends Enum {
readonly isSudo: boolean;
readonly asSudo: {
@@ -2241,7 +2245,7 @@
readonly type: 'Sudo' | 'SudoUncheckedWeight' | 'SetKey' | 'SudoAs';
}
- /** @name OrmlVestingModuleCall (270) */
+ /** @name OrmlVestingModuleCall (273) */
interface OrmlVestingModuleCall extends Enum {
readonly isClaim: boolean;
readonly isVestedTransfer: boolean;
@@ -2261,7 +2265,7 @@
readonly type: 'Claim' | 'VestedTransfer' | 'UpdateVestingSchedules' | 'ClaimFor';
}
- /** @name OrmlXtokensModuleCall (272) */
+ /** @name OrmlXtokensModuleCall (275) */
interface OrmlXtokensModuleCall extends Enum {
readonly isTransfer: boolean;
readonly asTransfer: {
@@ -2308,7 +2312,7 @@
readonly type: 'Transfer' | 'TransferMultiasset' | 'TransferWithFee' | 'TransferMultiassetWithFee' | 'TransferMulticurrencies' | 'TransferMultiassets';
}
- /** @name XcmVersionedMultiAsset (273) */
+ /** @name XcmVersionedMultiAsset (276) */
interface XcmVersionedMultiAsset extends Enum {
readonly isV0: boolean;
readonly asV0: XcmV0MultiAsset;
@@ -2317,7 +2321,7 @@
readonly type: 'V0' | 'V1';
}
- /** @name OrmlTokensModuleCall (276) */
+ /** @name OrmlTokensModuleCall (279) */
interface OrmlTokensModuleCall extends Enum {
readonly isTransfer: boolean;
readonly asTransfer: {
@@ -2354,7 +2358,7 @@
readonly type: 'Transfer' | 'TransferAll' | 'TransferKeepAlive' | 'ForceTransfer' | 'SetBalance';
}
- /** @name CumulusPalletXcmpQueueCall (277) */
+ /** @name CumulusPalletXcmpQueueCall (280) */
interface CumulusPalletXcmpQueueCall extends Enum {
readonly isServiceOverweight: boolean;
readonly asServiceOverweight: {
@@ -2390,7 +2394,7 @@
readonly type: 'ServiceOverweight' | 'SuspendXcmExecution' | 'ResumeXcmExecution' | 'UpdateSuspendThreshold' | 'UpdateDropThreshold' | 'UpdateResumeThreshold' | 'UpdateThresholdWeight' | 'UpdateWeightRestrictDecay' | 'UpdateXcmpMaxIndividualWeight';
}
- /** @name PalletXcmCall (278) */
+ /** @name PalletXcmCall (281) */
interface PalletXcmCall extends Enum {
readonly isSend: boolean;
readonly asSend: {
@@ -2452,7 +2456,7 @@
readonly type: 'Send' | 'TeleportAssets' | 'ReserveTransferAssets' | 'Execute' | 'ForceXcmVersion' | 'ForceDefaultXcmVersion' | 'ForceSubscribeVersionNotify' | 'ForceUnsubscribeVersionNotify' | 'LimitedReserveTransferAssets' | 'LimitedTeleportAssets';
}
- /** @name XcmVersionedXcm (279) */
+ /** @name XcmVersionedXcm (282) */
interface XcmVersionedXcm extends Enum {
readonly isV0: boolean;
readonly asV0: XcmV0Xcm;
@@ -2463,7 +2467,7 @@
readonly type: 'V0' | 'V1' | 'V2';
}
- /** @name XcmV0Xcm (280) */
+ /** @name XcmV0Xcm (283) */
interface XcmV0Xcm extends Enum {
readonly isWithdrawAsset: boolean;
readonly asWithdrawAsset: {
@@ -2526,7 +2530,7 @@
readonly type: 'WithdrawAsset' | 'ReserveAssetDeposit' | 'TeleportAsset' | 'QueryResponse' | 'TransferAsset' | 'TransferReserveAsset' | 'Transact' | 'HrmpNewChannelOpenRequest' | 'HrmpChannelAccepted' | 'HrmpChannelClosing' | 'RelayedFrom';
}
- /** @name XcmV0Order (282) */
+ /** @name XcmV0Order (285) */
interface XcmV0Order extends Enum {
readonly isNull: boolean;
readonly isDepositAsset: boolean;
@@ -2574,14 +2578,14 @@
readonly type: 'Null' | 'DepositAsset' | 'DepositReserveAsset' | 'ExchangeAsset' | 'InitiateReserveWithdraw' | 'InitiateTeleport' | 'QueryHolding' | 'BuyExecution';
}
- /** @name XcmV0Response (284) */
+ /** @name XcmV0Response (287) */
interface XcmV0Response extends Enum {
readonly isAssets: boolean;
readonly asAssets: Vec<XcmV0MultiAsset>;
readonly type: 'Assets';
}
- /** @name XcmV1Xcm (285) */
+ /** @name XcmV1Xcm (288) */
interface XcmV1Xcm extends Enum {
readonly isWithdrawAsset: boolean;
readonly asWithdrawAsset: {
@@ -2650,7 +2654,7 @@
readonly type: 'WithdrawAsset' | 'ReserveAssetDeposited' | 'ReceiveTeleportedAsset' | 'QueryResponse' | 'TransferAsset' | 'TransferReserveAsset' | 'Transact' | 'HrmpNewChannelOpenRequest' | 'HrmpChannelAccepted' | 'HrmpChannelClosing' | 'RelayedFrom' | 'SubscribeVersion' | 'UnsubscribeVersion';
}
- /** @name XcmV1Order (287) */
+ /** @name XcmV1Order (290) */
interface XcmV1Order extends Enum {
readonly isNoop: boolean;
readonly isDepositAsset: boolean;
@@ -2700,7 +2704,7 @@
readonly type: 'Noop' | 'DepositAsset' | 'DepositReserveAsset' | 'ExchangeAsset' | 'InitiateReserveWithdraw' | 'InitiateTeleport' | 'QueryHolding' | 'BuyExecution';
}
- /** @name XcmV1Response (289) */
+ /** @name XcmV1Response (292) */
interface XcmV1Response extends Enum {
readonly isAssets: boolean;
readonly asAssets: XcmV1MultiassetMultiAssets;
@@ -2709,10 +2713,10 @@
readonly type: 'Assets' | 'Version';
}
- /** @name CumulusPalletXcmCall (303) */
+ /** @name CumulusPalletXcmCall (306) */
type CumulusPalletXcmCall = Null;
- /** @name CumulusPalletDmpQueueCall (304) */
+ /** @name CumulusPalletDmpQueueCall (307) */
interface CumulusPalletDmpQueueCall extends Enum {
readonly isServiceOverweight: boolean;
readonly asServiceOverweight: {
@@ -2722,7 +2726,7 @@
readonly type: 'ServiceOverweight';
}
- /** @name PalletInflationCall (305) */
+ /** @name PalletInflationCall (308) */
interface PalletInflationCall extends Enum {
readonly isStartInflation: boolean;
readonly asStartInflation: {
@@ -2731,7 +2735,7 @@
readonly type: 'StartInflation';
}
- /** @name PalletUniqueCall (306) */
+ /** @name PalletUniqueCall (309) */
interface PalletUniqueCall extends Enum {
readonly isCreateCollection: boolean;
readonly asCreateCollection: {
@@ -2904,7 +2908,7 @@
readonly type: 'CreateCollection' | 'CreateCollectionEx' | 'DestroyCollection' | 'AddToAllowList' | 'RemoveFromAllowList' | 'ChangeCollectionOwner' | 'AddCollectionAdmin' | 'RemoveCollectionAdmin' | 'SetCollectionSponsor' | 'ConfirmSponsorship' | 'RemoveCollectionSponsor' | 'CreateItem' | 'CreateMultipleItems' | 'SetCollectionProperties' | 'DeleteCollectionProperties' | 'SetTokenProperties' | 'DeleteTokenProperties' | 'SetTokenPropertyPermissions' | 'CreateMultipleItemsEx' | 'SetTransfersEnabledFlag' | 'BurnItem' | 'BurnFrom' | 'Transfer' | 'Approve' | 'TransferFrom' | 'SetCollectionLimits' | 'SetCollectionPermissions' | 'Repartition' | 'SetAllowanceForAll' | 'ForceRepairCollection' | 'ForceRepairItem';
}
- /** @name UpDataStructsCollectionMode (311) */
+ /** @name UpDataStructsCollectionMode (314) */
interface UpDataStructsCollectionMode extends Enum {
readonly isNft: boolean;
readonly isFungible: boolean;
@@ -2913,7 +2917,7 @@
readonly type: 'Nft' | 'Fungible' | 'ReFungible';
}
- /** @name UpDataStructsCreateCollectionData (312) */
+ /** @name UpDataStructsCreateCollectionData (315) */
interface UpDataStructsCreateCollectionData extends Struct {
readonly mode: UpDataStructsCollectionMode;
readonly access: Option<UpDataStructsAccessMode>;
@@ -2927,14 +2931,14 @@
readonly properties: Vec<UpDataStructsProperty>;
}
- /** @name UpDataStructsAccessMode (314) */
+ /** @name UpDataStructsAccessMode (317) */
interface UpDataStructsAccessMode extends Enum {
readonly isNormal: boolean;
readonly isAllowList: boolean;
readonly type: 'Normal' | 'AllowList';
}
- /** @name UpDataStructsCollectionLimits (316) */
+ /** @name UpDataStructsCollectionLimits (319) */
interface UpDataStructsCollectionLimits extends Struct {
readonly accountTokenOwnershipLimit: Option<u32>;
readonly sponsoredDataSize: Option<u32>;
@@ -2947,7 +2951,7 @@
readonly transfersEnabled: Option<bool>;
}
- /** @name UpDataStructsSponsoringRateLimit (318) */
+ /** @name UpDataStructsSponsoringRateLimit (321) */
interface UpDataStructsSponsoringRateLimit extends Enum {
readonly isSponsoringDisabled: boolean;
readonly isBlocks: boolean;
@@ -2955,43 +2959,43 @@
readonly type: 'SponsoringDisabled' | 'Blocks';
}
- /** @name UpDataStructsCollectionPermissions (321) */
+ /** @name UpDataStructsCollectionPermissions (324) */
interface UpDataStructsCollectionPermissions extends Struct {
readonly access: Option<UpDataStructsAccessMode>;
readonly mintMode: Option<bool>;
readonly nesting: Option<UpDataStructsNestingPermissions>;
}
- /** @name UpDataStructsNestingPermissions (323) */
+ /** @name UpDataStructsNestingPermissions (326) */
interface UpDataStructsNestingPermissions extends Struct {
readonly tokenOwner: bool;
readonly collectionAdmin: bool;
readonly restricted: Option<UpDataStructsOwnerRestrictedSet>;
}
- /** @name UpDataStructsOwnerRestrictedSet (325) */
+ /** @name UpDataStructsOwnerRestrictedSet (328) */
interface UpDataStructsOwnerRestrictedSet extends BTreeSet<u32> {}
- /** @name UpDataStructsPropertyKeyPermission (330) */
+ /** @name UpDataStructsPropertyKeyPermission (333) */
interface UpDataStructsPropertyKeyPermission extends Struct {
readonly key: Bytes;
readonly permission: UpDataStructsPropertyPermission;
}
- /** @name UpDataStructsPropertyPermission (331) */
+ /** @name UpDataStructsPropertyPermission (334) */
interface UpDataStructsPropertyPermission extends Struct {
readonly mutable: bool;
readonly collectionAdmin: bool;
readonly tokenOwner: bool;
}
- /** @name UpDataStructsProperty (334) */
+ /** @name UpDataStructsProperty (337) */
interface UpDataStructsProperty extends Struct {
readonly key: Bytes;
readonly value: Bytes;
}
- /** @name UpDataStructsCreateItemData (337) */
+ /** @name UpDataStructsCreateItemData (340) */
interface UpDataStructsCreateItemData extends Enum {
readonly isNft: boolean;
readonly asNft: UpDataStructsCreateNftData;
@@ -3002,23 +3006,23 @@
readonly type: 'Nft' | 'Fungible' | 'ReFungible';
}
- /** @name UpDataStructsCreateNftData (338) */
+ /** @name UpDataStructsCreateNftData (341) */
interface UpDataStructsCreateNftData extends Struct {
readonly properties: Vec<UpDataStructsProperty>;
}
- /** @name UpDataStructsCreateFungibleData (339) */
+ /** @name UpDataStructsCreateFungibleData (342) */
interface UpDataStructsCreateFungibleData extends Struct {
readonly value: u128;
}
- /** @name UpDataStructsCreateReFungibleData (340) */
+ /** @name UpDataStructsCreateReFungibleData (343) */
interface UpDataStructsCreateReFungibleData extends Struct {
readonly pieces: u128;
readonly properties: Vec<UpDataStructsProperty>;
}
- /** @name UpDataStructsCreateItemExData (343) */
+ /** @name UpDataStructsCreateItemExData (346) */
interface UpDataStructsCreateItemExData extends Enum {
readonly isNft: boolean;
readonly asNft: Vec<UpDataStructsCreateNftExData>;
@@ -3031,26 +3035,26 @@
readonly type: 'Nft' | 'Fungible' | 'RefungibleMultipleItems' | 'RefungibleMultipleOwners';
}
- /** @name UpDataStructsCreateNftExData (345) */
+ /** @name UpDataStructsCreateNftExData (348) */
interface UpDataStructsCreateNftExData extends Struct {
readonly properties: Vec<UpDataStructsProperty>;
readonly owner: PalletEvmAccountBasicCrossAccountIdRepr;
}
- /** @name UpDataStructsCreateRefungibleExSingleOwner (352) */
+ /** @name UpDataStructsCreateRefungibleExSingleOwner (355) */
interface UpDataStructsCreateRefungibleExSingleOwner extends Struct {
readonly user: PalletEvmAccountBasicCrossAccountIdRepr;
readonly pieces: u128;
readonly properties: Vec<UpDataStructsProperty>;
}
- /** @name UpDataStructsCreateRefungibleExMultipleOwners (354) */
+ /** @name UpDataStructsCreateRefungibleExMultipleOwners (357) */
interface UpDataStructsCreateRefungibleExMultipleOwners extends Struct {
readonly users: BTreeMap<PalletEvmAccountBasicCrossAccountIdRepr, u128>;
readonly properties: Vec<UpDataStructsProperty>;
}
- /** @name PalletConfigurationCall (355) */
+ /** @name PalletConfigurationCall (358) */
interface PalletConfigurationCall extends Enum {
readonly isSetWeightToFeeCoefficientOverride: boolean;
readonly asSetWeightToFeeCoefficientOverride: {
@@ -3083,7 +3087,7 @@
readonly type: 'SetWeightToFeeCoefficientOverride' | 'SetMinGasPriceOverride' | 'SetXcmAllowedLocations' | 'SetAppPromotionConfigurationOverride' | 'SetCollatorSelectionDesiredCollators' | 'SetCollatorSelectionLicenseBond' | 'SetCollatorSelectionKickThreshold';
}
- /** @name PalletConfigurationAppPromotionConfiguration (360) */
+ /** @name PalletConfigurationAppPromotionConfiguration (363) */
interface PalletConfigurationAppPromotionConfiguration extends Struct {
readonly recalculationInterval: Option<u32>;
readonly pendingInterval: Option<u32>;
@@ -3091,13 +3095,13 @@
readonly maxStakersPerCalculation: Option<u8>;
}
- /** @name PalletTemplateTransactionPaymentCall (364) */
+ /** @name PalletTemplateTransactionPaymentCall (367) */
type PalletTemplateTransactionPaymentCall = Null;
- /** @name PalletStructureCall (365) */
+ /** @name PalletStructureCall (368) */
type PalletStructureCall = Null;
- /** @name PalletRmrkCoreCall (366) */
+ /** @name PalletRmrkCoreCall (369) */
interface PalletRmrkCoreCall extends Enum {
readonly isCreateCollection: boolean;
readonly asCreateCollection: {
@@ -3203,7 +3207,7 @@
readonly type: 'CreateCollection' | 'DestroyCollection' | 'ChangeCollectionIssuer' | 'LockCollection' | 'MintNft' | 'BurnNft' | 'Send' | 'AcceptNft' | 'RejectNft' | 'AcceptResource' | 'AcceptResourceRemoval' | 'SetProperty' | 'SetPriority' | 'AddBasicResource' | 'AddComposableResource' | 'AddSlotResource' | 'RemoveResource';
}
- /** @name RmrkTraitsResourceResourceTypes (372) */
+ /** @name RmrkTraitsResourceResourceTypes (375) */
interface RmrkTraitsResourceResourceTypes extends Enum {
readonly isBasic: boolean;
readonly asBasic: RmrkTraitsResourceBasicResource;
@@ -3214,7 +3218,7 @@
readonly type: 'Basic' | 'Composable' | 'Slot';
}
- /** @name RmrkTraitsResourceBasicResource (374) */
+ /** @name RmrkTraitsResourceBasicResource (377) */
interface RmrkTraitsResourceBasicResource extends Struct {
readonly src: Option<Bytes>;
readonly metadata: Option<Bytes>;
@@ -3222,7 +3226,7 @@
readonly thumb: Option<Bytes>;
}
- /** @name RmrkTraitsResourceComposableResource (376) */
+ /** @name RmrkTraitsResourceComposableResource (379) */
interface RmrkTraitsResourceComposableResource extends Struct {
readonly parts: Vec<u32>;
readonly base: u32;
@@ -3232,7 +3236,7 @@
readonly thumb: Option<Bytes>;
}
- /** @name RmrkTraitsResourceSlotResource (377) */
+ /** @name RmrkTraitsResourceSlotResource (380) */
interface RmrkTraitsResourceSlotResource extends Struct {
readonly base: u32;
readonly src: Option<Bytes>;
@@ -3242,7 +3246,7 @@
readonly thumb: Option<Bytes>;
}
- /** @name PalletRmrkEquipCall (380) */
+ /** @name PalletRmrkEquipCall (383) */
interface PalletRmrkEquipCall extends Enum {
readonly isCreateBase: boolean;
readonly asCreateBase: {
@@ -3264,7 +3268,7 @@
readonly type: 'CreateBase' | 'ThemeAdd' | 'Equippable';
}
- /** @name RmrkTraitsPartPartType (383) */
+ /** @name RmrkTraitsPartPartType (386) */
interface RmrkTraitsPartPartType extends Enum {
readonly isFixedPart: boolean;
readonly asFixedPart: RmrkTraitsPartFixedPart;
@@ -3273,14 +3277,14 @@
readonly type: 'FixedPart' | 'SlotPart';
}
- /** @name RmrkTraitsPartFixedPart (385) */
+ /** @name RmrkTraitsPartFixedPart (388) */
interface RmrkTraitsPartFixedPart extends Struct {
readonly id: u32;
readonly z: u32;
readonly src: Bytes;
}
- /** @name RmrkTraitsPartSlotPart (386) */
+ /** @name RmrkTraitsPartSlotPart (389) */
interface RmrkTraitsPartSlotPart extends Struct {
readonly id: u32;
readonly equippable: RmrkTraitsPartEquippableList;
@@ -3288,7 +3292,7 @@
readonly z: u32;
}
- /** @name RmrkTraitsPartEquippableList (387) */
+ /** @name RmrkTraitsPartEquippableList (390) */
interface RmrkTraitsPartEquippableList extends Enum {
readonly isAll: boolean;
readonly isEmpty: boolean;
@@ -3297,20 +3301,20 @@
readonly type: 'All' | 'Empty' | 'Custom';
}
- /** @name RmrkTraitsTheme (389) */
+ /** @name RmrkTraitsTheme (392) */
interface RmrkTraitsTheme extends Struct {
readonly name: Bytes;
readonly properties: Vec<RmrkTraitsThemeThemeProperty>;
readonly inherit: bool;
}
- /** @name RmrkTraitsThemeThemeProperty (391) */
+ /** @name RmrkTraitsThemeThemeProperty (394) */
interface RmrkTraitsThemeThemeProperty extends Struct {
readonly key: Bytes;
readonly value: Bytes;
}
- /** @name PalletAppPromotionCall (393) */
+ /** @name PalletAppPromotionCall (396) */
interface PalletAppPromotionCall extends Enum {
readonly isSetAdminAddress: boolean;
readonly asSetAdminAddress: {
@@ -3344,7 +3348,7 @@
readonly type: 'SetAdminAddress' | 'Stake' | 'Unstake' | 'SponsorCollection' | 'StopSponsoringCollection' | 'SponsorContract' | 'StopSponsoringContract' | 'PayoutStakers';
}
- /** @name PalletForeignAssetsModuleCall (394) */
+ /** @name PalletForeignAssetsModuleCall (397) */
interface PalletForeignAssetsModuleCall extends Enum {
readonly isRegisterForeignAsset: boolean;
readonly asRegisterForeignAsset: {
@@ -3361,7 +3365,7 @@
readonly type: 'RegisterForeignAsset' | 'UpdateForeignAsset';
}
- /** @name PalletEvmCall (395) */
+ /** @name PalletEvmCall (398) */
interface PalletEvmCall extends Enum {
readonly isWithdraw: boolean;
readonly asWithdraw: {
@@ -3406,7 +3410,7 @@
readonly type: 'Withdraw' | 'Call' | 'Create' | 'Create2';
}
- /** @name PalletEthereumCall (401) */
+ /** @name PalletEthereumCall (404) */
interface PalletEthereumCall extends Enum {
readonly isTransact: boolean;
readonly asTransact: {
@@ -3415,7 +3419,7 @@
readonly type: 'Transact';
}
- /** @name EthereumTransactionTransactionV2 (402) */
+ /** @name EthereumTransactionTransactionV2 (405) */
interface EthereumTransactionTransactionV2 extends Enum {
readonly isLegacy: boolean;
readonly asLegacy: EthereumTransactionLegacyTransaction;
@@ -3426,7 +3430,7 @@
readonly type: 'Legacy' | 'Eip2930' | 'Eip1559';
}
- /** @name EthereumTransactionLegacyTransaction (403) */
+ /** @name EthereumTransactionLegacyTransaction (406) */
interface EthereumTransactionLegacyTransaction extends Struct {
readonly nonce: U256;
readonly gasPrice: U256;
@@ -3437,7 +3441,7 @@
readonly signature: EthereumTransactionTransactionSignature;
}
- /** @name EthereumTransactionTransactionAction (404) */
+ /** @name EthereumTransactionTransactionAction (407) */
interface EthereumTransactionTransactionAction extends Enum {
readonly isCall: boolean;
readonly asCall: H160;
@@ -3445,14 +3449,14 @@
readonly type: 'Call' | 'Create';
}
- /** @name EthereumTransactionTransactionSignature (405) */
+ /** @name EthereumTransactionTransactionSignature (408) */
interface EthereumTransactionTransactionSignature extends Struct {
readonly v: u64;
readonly r: H256;
readonly s: H256;
}
- /** @name EthereumTransactionEip2930Transaction (407) */
+ /** @name EthereumTransactionEip2930Transaction (410) */
interface EthereumTransactionEip2930Transaction extends Struct {
readonly chainId: u64;
readonly nonce: U256;
@@ -3467,13 +3471,13 @@
readonly s: H256;
}
- /** @name EthereumTransactionAccessListItem (409) */
+ /** @name EthereumTransactionAccessListItem (412) */
interface EthereumTransactionAccessListItem extends Struct {
readonly address: H160;
readonly storageKeys: Vec<H256>;
}
- /** @name EthereumTransactionEip1559Transaction (410) */
+ /** @name EthereumTransactionEip1559Transaction (413) */
interface EthereumTransactionEip1559Transaction extends Struct {
readonly chainId: u64;
readonly nonce: U256;
@@ -3489,7 +3493,7 @@
readonly s: H256;
}
- /** @name PalletDataManagementCall (411) */
+ /** @name PalletDataManagementCall (414) */
interface PalletDataManagementCall extends Enum {
readonly isBegin: boolean;
readonly asBegin: {
@@ -3513,11 +3517,7 @@
readonly asInsertEvents: {
readonly events: Vec<Bytes>;
} & Struct;
- readonly isSetIdentities: boolean;
- readonly asSetIdentities: {
- readonly identities: Vec<ITuple<[AccountId32, Option<PalletIdentityRegistration>]>>;
- } & Struct;
- readonly type: 'Begin' | 'SetData' | 'Finish' | 'InsertEthLogs' | 'InsertEvents' | 'SetIdentities';
+ readonly type: 'Begin' | 'SetData' | 'Finish' | 'InsertEthLogs' | 'InsertEvents';
}
/** @name PalletMaintenanceCall (418) */
tests/src/pallet-presence.test.tsdiffbeforeafterboth--- a/tests/src/pallet-presence.test.ts
+++ b/tests/src/pallet-presence.test.ts
@@ -69,7 +69,7 @@
const collatorSelection = ['authorship', 'session', 'collatorselection', 'identity'];
const testUtils = 'testutils';
- if (chain.eq('OPAL by UNIQUE')) {
+ if (chain.eq('OPAL by UNIQUE') || chain.eq('SAPPHIRE by UNIQUE')) {
requiredPallets.push(
refungible,
foreignAssets,
tests/src/util/identitySetter.tsdiffbeforeafterboth--- a/tests/src/util/identitySetter.ts
+++ b/tests/src/util/identitySetter.ts
@@ -33,7 +33,7 @@
try {
const superuser = await privateKey(key);
// todo:collator
- await helper.getSudo().executeExtrinsic(superuser, 'api.tx.dataManagement.setIdentities', [identities]);
+ await helper.getSudo().executeExtrinsic(superuser, 'api.tx.identity.setIdentities', [identities]);
console.log(`Tried to upload ${identities.length} identities. `
+ `Now there are ${(await helper.getApi().query.identity.identityOf.keys()).length}.`);
} catch (error) {
tests/src/util/playgrounds/unique.dev.tsdiffbeforeafterboth--- a/tests/src/util/playgrounds/unique.dev.ts
+++ b/tests/src/util/playgrounds/unique.dev.ts
@@ -257,16 +257,17 @@
const accounts: IKeyringPair[] = [];
let nonce = await this.helper.chain.getNonce(donor.address);
const tokenNominal = this.helper.balance.getOneTokenNominal();
+ const ss58Format = this.helper.chain.getChainProperties().ss58Format;
for (let i = 0; i < accountsToCreate; i++) {
if (i === 500) { // if there are too many accounts to create
await Promise.allSettled(transactions); // wait while first 500 (should be 100 for devnode) tx will be settled
transactions = []; //
nonce = await this.helper.chain.getNonce(donor.address); // update nonce
}
- const recepient = this.helper.util.fromSeed(mnemonicGenerate());
- accounts.push(recepient);
+ const recipient = this.helper.util.fromSeed(mnemonicGenerate(), ss58Format);
+ accounts.push(recipient);
if (withBalance !== 0n) {
- const tx = this.helper.constructApiCall('api.tx.balances.transfer', [{Id: recepient.address}, withBalance * tokenNominal]);
+ const tx = this.helper.constructApiCall('api.tx.balances.transfer', [{Id: recipient.address}, withBalance * tokenNominal]);
transactions.push(this.helper.signTransaction(donor, tx, {nonce}, 'account generation'));
nonce++;
}