difftreelog
Merge commit '2074c933e3ff90b7ea5fc778111ead850fd4a5ea' into release-v922000
in: master
20 files changed
client/rpc/src/lib.rsdiffbeforeafterboth--- a/client/rpc/src/lib.rs
+++ b/client/rpc/src/lib.rs
@@ -25,7 +25,7 @@
use anyhow::anyhow;
use up_data_structs::{
RpcCollection, CollectionId, CollectionStats, CollectionLimits, TokenId, Property,
- PropertyKeyPermission, TokenData,
+ PropertyKeyPermission, TokenData, TokenChild,
};
use sp_api::{BlockId, BlockT, ProvideRuntimeApi, ApiExt};
use sp_blockchain::HeaderBackend;
@@ -77,6 +77,13 @@
token: TokenId,
at: Option<BlockHash>,
) -> Result<Option<CrossAccountId>>;
+ #[method(name = "unique_tokenChildren")]
+ fn token_children(
+ &self,
+ collection: CollectionId,
+ token: TokenId,
+ at: Option<BlockHash>,
+ ) -> Result<Vec<TokenChild>>;
#[method(name = "unique_collectionProperties")]
fn collection_properties(
@@ -394,6 +401,7 @@
pass_method!(
topmost_token_owner(collection: CollectionId, token: TokenId) -> Option<CrossAccountId>, unique_api
);
+ pass_method!(token_children(collection: CollectionId, token: TokenId) -> Vec<TokenChild>, unique_api);
pass_method!(total_supply(collection: CollectionId) -> u32, unique_api);
pass_method!(account_balance(collection: CollectionId, account: CrossAccountId) -> u32, unique_api);
pass_method!(balance(collection: CollectionId, account: CrossAccountId, token: TokenId) -> String => |v| v.to_string(), unique_api);
pallets/common/src/lib.rsdiffbeforeafterboth--- a/pallets/common/src/lib.rs
+++ b/pallets/common/src/lib.rs
@@ -40,6 +40,7 @@
MAX_TOKEN_PREFIX_LENGTH,
COLLECTION_ADMINS_LIMIT,
TokenId,
+ TokenChild,
CollectionStats,
MAX_TOKEN_OWNERSHIP,
CollectionMode,
@@ -502,6 +503,7 @@
CollectionStats,
CollectionId,
TokenId,
+ TokenChild,
PhantomType<(
TokenData<T::CrossAccountId>,
RpcCollection<T::AccountId>,
pallets/nonfungible/src/lib.rsdiffbeforeafterboth1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617#![cfg_attr(not(feature = "std"), no_std)]1819use erc::ERC721Events;20use evm_coder::ToLog;21use frame_support::{BoundedVec, ensure, fail, transactional, storage::with_transaction};22use up_data_structs::{23 AccessMode, CollectionId, CustomDataLimit, TokenId, CreateCollectionData, CreateNftExData,24 mapping::TokenAddressMapping, NestingRule, budget::Budget, Property, PropertyPermission,25 PropertyKey, PropertyKeyPermission, Properties, PropertyScope, TrySetProperty,26};27use pallet_evm::{account::CrossAccountId, Pallet as PalletEvm};28use pallet_common::{29 Error as CommonError, Pallet as PalletCommon, Event as CommonEvent, CollectionHandle,30 eth::collection_id_to_address,31};32use pallet_structure::Pallet as PalletStructure;33use pallet_evm_coder_substrate::{SubstrateRecorder, WithRecorder};34use sp_core::H160;35use sp_runtime::{ArithmeticError, DispatchError, DispatchResult, TransactionOutcome};36use sp_std::{vec::Vec, vec, collections::btree_map::BTreeMap, collections::btree_set::BTreeSet};37use core::ops::Deref;38use codec::{Encode, Decode, MaxEncodedLen};39use scale_info::TypeInfo;4041pub use pallet::*;42#[cfg(feature = "runtime-benchmarks")]43pub mod benchmarking;44pub mod common;45pub mod erc;46pub mod weights;4748pub type CreateItemData<T> = CreateNftExData<<T as pallet_evm::account::Config>::CrossAccountId>;49pub(crate) type SelfWeightOf<T> = <T as Config>::WeightInfo;5051#[struct_versioning::versioned(version = 2, upper)]52#[derive(Encode, Decode, TypeInfo, MaxEncodedLen)]53pub struct ItemData<CrossAccountId> {54 #[version(..2)]55 pub const_data: BoundedVec<u8, CustomDataLimit>,5657 #[version(..2)]58 pub variable_data: BoundedVec<u8, CustomDataLimit>,5960 pub owner: CrossAccountId,61}6263#[frame_support::pallet]64pub mod pallet {65 use super::*;66 use frame_support::{67 Blake2_128Concat, Twox64Concat, pallet_prelude::*, storage::Key, traits::StorageVersion,68 };69 use frame_system::pallet_prelude::*;70 use up_data_structs::{CollectionId, TokenId};71 use super::weights::WeightInfo;7273 #[pallet::error]74 pub enum Error<T> {75 /// Not Nonfungible item data used to mint in Nonfungible collection.76 NotNonfungibleDataUsedToMintFungibleCollectionToken,77 /// Used amount > 1 with NFT78 NonfungibleItemsHaveNoAmount,79 /// Unable to burn NFT with children80 CantBurnNftWithChildren,81 }8283 #[pallet::config]84 pub trait Config:85 frame_system::Config + pallet_common::Config + pallet_structure::Config + pallet_evm::Config86 {87 type WeightInfo: WeightInfo;88 }8990 const STORAGE_VERSION: StorageVersion = StorageVersion::new(1);9192 #[pallet::pallet]93 #[pallet::storage_version(STORAGE_VERSION)]94 #[pallet::generate_store(pub(super) trait Store)]95 pub struct Pallet<T>(_);9697 #[pallet::storage]98 pub type TokensMinted<T: Config> =99 StorageMap<Hasher = Twox64Concat, Key = CollectionId, Value = u32, QueryKind = ValueQuery>;100 #[pallet::storage]101 pub type TokensBurnt<T: Config> =102 StorageMap<Hasher = Twox64Concat, Key = CollectionId, Value = u32, QueryKind = ValueQuery>;103104 #[pallet::storage]105 pub type TokenData<T: Config> = StorageNMap<106 Key = (Key<Twox64Concat, CollectionId>, Key<Twox64Concat, TokenId>),107 Value = ItemData<T::CrossAccountId>,108 QueryKind = OptionQuery,109 >;110111 #[pallet::storage]112 #[pallet::getter(fn token_properties)]113 pub type TokenProperties<T: Config> = StorageNMap<114 Key = (Key<Twox64Concat, CollectionId>, Key<Twox64Concat, TokenId>),115 Value = Properties,116 QueryKind = ValueQuery,117 OnEmpty = up_data_structs::TokenProperties,118 >;119120 /// Used to enumerate tokens owned by account121 #[pallet::storage]122 pub type Owned<T: Config> = StorageNMap<123 Key = (124 Key<Twox64Concat, CollectionId>,125 Key<Blake2_128Concat, T::CrossAccountId>,126 Key<Twox64Concat, TokenId>,127 ),128 Value = bool,129 QueryKind = ValueQuery,130 >;131132 /// Used to enumerate token's children133 #[pallet::storage]134 #[pallet::getter(fn token_children)]135 pub type TokenChildren<T: Config> = StorageNMap<136 Key = (137 Key<Twox64Concat, CollectionId>,138 Key<Twox64Concat, TokenId>,139 Key<Twox64Concat, (CollectionId, TokenId)>,140 ),141 Value = bool,142 QueryKind = ValueQuery,143 >;144145 #[pallet::storage]146 pub type AccountBalance<T: Config> = StorageNMap<147 Key = (148 Key<Twox64Concat, CollectionId>,149 Key<Blake2_128Concat, T::CrossAccountId>,150 ),151 Value = u32,152 QueryKind = ValueQuery,153 >;154155 #[pallet::storage]156 pub type Allowance<T: Config> = StorageNMap<157 Key = (Key<Twox64Concat, CollectionId>, Key<Twox64Concat, TokenId>),158 Value = T::CrossAccountId,159 QueryKind = OptionQuery,160 >;161162 #[pallet::hooks]163 impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {164 fn on_runtime_upgrade() -> Weight {165 if StorageVersion::get::<Pallet<T>>() < StorageVersion::new(1) {166 let mut had_consts = BTreeSet::new();167 <TokenData<T>>::translate::<ItemDataVersion1<T::CrossAccountId>, _>(168 |(collection, token), v| {169 let mut props = vec![];170 if !v.const_data.is_empty() {171 props.push(Property {172 key: b"_old_constData".to_vec().try_into().unwrap(),173 value: v174 .const_data175 .clone()176 .into_inner()177 .try_into()178 .expect("const too long"),179 });180 had_consts.insert(collection);181 }182 if !v.variable_data.is_empty() {183 props.push(Property {184 key: b"_old_variableData".to_vec().try_into().unwrap(),185 value: v186 .variable_data187 .clone()188 .into_inner()189 .try_into()190 .expect("variable too long"),191 })192 }193 if !props.is_empty() {194 Self::set_scoped_token_properties(195 collection,196 token,197 PropertyScope::None,198 props.into_iter(),199 )200 .expect("existing token data exceeds property storage");201 }202 Some(<ItemDataVersion2<T::CrossAccountId>>::from(v))203 },204 );205 for collection in had_consts {206 <PalletCommon<T>>::set_property_permission_unchecked(207 collection,208 PropertyKeyPermission {209 key: b"_old_constData".to_vec().try_into().unwrap(),210 permission: PropertyPermission {211 mutable: false,212 collection_admin: true,213 token_owner: false,214 },215 },216 )217 .expect("failed to configure permission");218 }219 }220221 0222 }223 }224}225226pub struct NonfungibleHandle<T: Config>(pallet_common::CollectionHandle<T>);227impl<T: Config> NonfungibleHandle<T> {228 pub fn cast(inner: pallet_common::CollectionHandle<T>) -> Self {229 Self(inner)230 }231 pub fn into_inner(self) -> pallet_common::CollectionHandle<T> {232 self.0233 }234 pub fn common_mut(&mut self) -> &mut pallet_common::CollectionHandle<T> {235 &mut self.0236 }237}238impl<T: Config> WithRecorder<T> for NonfungibleHandle<T> {239 fn recorder(&self) -> &SubstrateRecorder<T> {240 self.0.recorder()241 }242 fn into_recorder(self) -> SubstrateRecorder<T> {243 self.0.into_recorder()244 }245}246impl<T: Config> Deref for NonfungibleHandle<T> {247 type Target = pallet_common::CollectionHandle<T>;248249 fn deref(&self) -> &Self::Target {250 &self.0251 }252}253254impl<T: Config> Pallet<T> {255 pub fn total_supply(collection: &NonfungibleHandle<T>) -> u32 {256 <TokensMinted<T>>::get(collection.id) - <TokensBurnt<T>>::get(collection.id)257 }258 pub fn token_exists(collection: &NonfungibleHandle<T>, token: TokenId) -> bool {259 <TokenData<T>>::contains_key((collection.id, token))260 }261262 pub fn set_scoped_token_property(263 collection_id: CollectionId,264 token_id: TokenId,265 scope: PropertyScope,266 property: Property,267 ) -> DispatchResult {268 TokenProperties::<T>::try_mutate((collection_id, token_id), |properties| {269 properties.try_scoped_set(scope, property.key, property.value)270 })271 .map_err(<CommonError<T>>::from)?;272273 Ok(())274 }275276 pub fn set_scoped_token_properties(277 collection_id: CollectionId,278 token_id: TokenId,279 scope: PropertyScope,280 properties: impl Iterator<Item = Property>,281 ) -> DispatchResult {282 TokenProperties::<T>::try_mutate((collection_id, token_id), |stored_properties| {283 stored_properties.try_scoped_set_from_iter(scope, properties)284 })285 .map_err(<CommonError<T>>::from)?;286287 Ok(())288 }289290 pub fn current_token_id(collection_id: CollectionId) -> TokenId {291 TokenId(<TokensMinted<T>>::get(collection_id))292 }293}294295// unchecked calls skips any permission checks296impl<T: Config> Pallet<T> {297 pub fn init_collection(298 owner: T::CrossAccountId,299 data: CreateCollectionData<T::AccountId>,300 ) -> Result<CollectionId, DispatchError> {301 <PalletCommon<T>>::init_collection(owner, data)302 }303 pub fn destroy_collection(304 collection: NonfungibleHandle<T>,305 sender: &T::CrossAccountId,306 ) -> DispatchResult {307 let id = collection.id;308309 if Self::collection_has_tokens(id) {310 return Err(<CommonError<T>>::CantDestroyNotEmptyCollection.into());311 }312313 // =========314315 PalletCommon::destroy_collection(collection.0, sender)?;316317 <TokenData<T>>::remove_prefix((id,), None);318 <TokenChildren<T>>::remove_prefix((id,), None);319 <Owned<T>>::remove_prefix((id,), None);320 <TokensMinted<T>>::remove(id);321 <TokensBurnt<T>>::remove(id);322 <Allowance<T>>::remove_prefix((id,), None);323 <AccountBalance<T>>::remove_prefix((id,), None);324 Ok(())325 }326327 pub fn burn(328 collection: &NonfungibleHandle<T>,329 sender: &T::CrossAccountId,330 token: TokenId,331 ) -> DispatchResult {332 let token_data =333 <TokenData<T>>::get((collection.id, token)).ok_or(<CommonError<T>>::TokenNotFound)?;334 ensure!(335 &token_data.owner == sender336 || (collection.limits.owner_can_transfer() && collection.is_owner_or_admin(sender)),337 <CommonError<T>>::NoPermission338 );339340 if collection.permissions.access() == AccessMode::AllowList {341 collection.check_allowlist(sender)?;342 }343344 if Self::token_has_children(collection.id, token) {345 return Err(<Error<T>>::CantBurnNftWithChildren.into());346 }347348 let burnt = <TokensBurnt<T>>::get(collection.id)349 .checked_add(1)350 .ok_or(ArithmeticError::Overflow)?;351352 let balance = <AccountBalance<T>>::get((collection.id, token_data.owner.clone()))353 .checked_sub(1)354 .ok_or(ArithmeticError::Overflow)?;355356 // =========357358 if balance == 0 {359 <AccountBalance<T>>::remove((collection.id, token_data.owner.clone()));360 } else {361 <AccountBalance<T>>::insert((collection.id, token_data.owner.clone()), balance);362 }363364 <PalletStructure<T>>::unnest_if_nested(&token_data.owner, collection.id, token);365366 <Owned<T>>::remove((collection.id, &token_data.owner, token));367 <TokensBurnt<T>>::insert(collection.id, burnt);368 <TokenData<T>>::remove((collection.id, token));369 <TokenProperties<T>>::remove((collection.id, token));370 let old_spender = <Allowance<T>>::take((collection.id, token));371372 if let Some(old_spender) = old_spender {373 <PalletCommon<T>>::deposit_event(CommonEvent::Approved(374 collection.id,375 token,376 sender.clone(),377 old_spender,378 0,379 ));380 }381382 <PalletEvm<T>>::deposit_log(383 ERC721Events::Transfer {384 from: *token_data.owner.as_eth(),385 to: H160::default(),386 token_id: token.into(),387 }388 .to_log(collection_id_to_address(collection.id)),389 );390 <PalletCommon<T>>::deposit_event(CommonEvent::ItemDestroyed(391 collection.id,392 token,393 token_data.owner,394 1,395 ));396 Ok(())397 }398399 pub fn set_token_property(400 collection: &NonfungibleHandle<T>,401 sender: &T::CrossAccountId,402 token_id: TokenId,403 property: Property,404 ) -> DispatchResult {405 Self::check_token_change_permission(collection, sender, token_id, &property.key)?;406407 <TokenProperties<T>>::try_mutate((collection.id, token_id), |properties| {408 let property = property.clone();409 properties.try_set(property.key, property.value)410 })411 .map_err(<CommonError<T>>::from)?;412413 <PalletCommon<T>>::deposit_event(CommonEvent::TokenPropertySet(414 collection.id,415 token_id,416 property.key,417 ));418419 Ok(())420 }421422 #[transactional]423 pub fn set_token_properties(424 collection: &NonfungibleHandle<T>,425 sender: &T::CrossAccountId,426 token_id: TokenId,427 properties: Vec<Property>,428 ) -> DispatchResult {429 for property in properties {430 Self::set_token_property(collection, sender, token_id, property)?;431 }432433 Ok(())434 }435436 pub fn delete_token_property(437 collection: &NonfungibleHandle<T>,438 sender: &T::CrossAccountId,439 token_id: TokenId,440 property_key: PropertyKey,441 ) -> DispatchResult {442 Self::check_token_change_permission(collection, sender, token_id, &property_key)?;443444 <TokenProperties<T>>::try_mutate((collection.id, token_id), |properties| {445 properties.remove(&property_key)446 })447 .map_err(<CommonError<T>>::from)?;448449 <PalletCommon<T>>::deposit_event(CommonEvent::TokenPropertyDeleted(450 collection.id,451 token_id,452 property_key,453 ));454455 Ok(())456 }457458 fn check_token_change_permission(459 collection: &NonfungibleHandle<T>,460 sender: &T::CrossAccountId,461 token_id: TokenId,462 property_key: &PropertyKey,463 ) -> DispatchResult {464 let permission = <PalletCommon<T>>::property_permissions(collection.id)465 .get(property_key)466 .cloned()467 .unwrap_or_else(PropertyPermission::none);468469 let token_data = <TokenData<T>>::get((collection.id, token_id))470 .ok_or(<CommonError<T>>::TokenNotFound)?;471472 let check_token_owner = || -> DispatchResult {473 ensure!(&token_data.owner == sender, <CommonError<T>>::NoPermission);474 Ok(())475 };476477 let is_property_exists = TokenProperties::<T>::get((collection.id, token_id))478 .get(property_key)479 .is_some();480481 match permission {482 PropertyPermission { mutable: false, .. } if is_property_exists => {483 Err(<CommonError<T>>::NoPermission.into())484 }485486 PropertyPermission {487 collection_admin,488 token_owner,489 ..490 } => {491 let mut check_result = Err(<CommonError<T>>::NoPermission.into());492493 if collection_admin {494 check_result = collection.check_is_owner_or_admin(sender);495 }496497 if token_owner {498 check_result.or_else(|_| check_token_owner())499 } else {500 check_result501 }502 }503 }504 }505506 #[transactional]507 pub fn delete_token_properties(508 collection: &NonfungibleHandle<T>,509 sender: &T::CrossAccountId,510 token_id: TokenId,511 property_keys: Vec<PropertyKey>,512 ) -> DispatchResult {513 for key in property_keys {514 Self::delete_token_property(collection, sender, token_id, key)?;515 }516517 Ok(())518 }519520 pub fn set_collection_properties(521 collection: &NonfungibleHandle<T>,522 sender: &T::CrossAccountId,523 properties: Vec<Property>,524 ) -> DispatchResult {525 <PalletCommon<T>>::set_collection_properties(collection, sender, properties)526 }527528 pub fn delete_collection_properties(529 collection: &CollectionHandle<T>,530 sender: &T::CrossAccountId,531 property_keys: Vec<PropertyKey>,532 ) -> DispatchResult {533 <PalletCommon<T>>::delete_collection_properties(collection, sender, property_keys)534 }535536 pub fn set_property_permissions(537 collection: &CollectionHandle<T>,538 sender: &T::CrossAccountId,539 property_permissions: Vec<PropertyKeyPermission>,540 ) -> DispatchResult {541 <PalletCommon<T>>::set_property_permissions(collection, sender, property_permissions)542 }543544 pub fn set_property_permission(545 collection: &CollectionHandle<T>,546 sender: &T::CrossAccountId,547 permission: PropertyKeyPermission,548 ) -> DispatchResult {549 <PalletCommon<T>>::set_property_permission(collection, sender, permission)550 }551552 pub fn transfer(553 collection: &NonfungibleHandle<T>,554 from: &T::CrossAccountId,555 to: &T::CrossAccountId,556 token: TokenId,557 nesting_budget: &dyn Budget,558 ) -> DispatchResult {559 ensure!(560 collection.limits.transfers_enabled(),561 <CommonError<T>>::TransferNotAllowed562 );563564 let token_data =565 <TokenData<T>>::get((collection.id, token)).ok_or(<CommonError<T>>::TokenNotFound)?;566 // TODO: require sender to be token, owner, require admins to go through transfer_from567 ensure!(568 &token_data.owner == from569 || (collection.limits.owner_can_transfer() && collection.is_owner_or_admin(from)),570 <CommonError<T>>::NoPermission571 );572573 if collection.permissions.access() == AccessMode::AllowList {574 collection.check_allowlist(from)?;575 collection.check_allowlist(to)?;576 }577 <PalletCommon<T>>::ensure_correct_receiver(to)?;578579 let balance_from = <AccountBalance<T>>::get((collection.id, from))580 .checked_sub(1)581 .ok_or(<CommonError<T>>::TokenValueTooLow)?;582 let balance_to = if from != to {583 let balance_to = <AccountBalance<T>>::get((collection.id, to))584 .checked_add(1)585 .ok_or(ArithmeticError::Overflow)?;586587 ensure!(588 balance_to < collection.limits.account_token_ownership_limit(),589 <CommonError<T>>::AccountTokenLimitExceeded,590 );591592 Some(balance_to)593 } else {594 None595 };596597 <PalletStructure<T>>::nest_if_sent_to_token(598 from.clone(),599 to,600 collection.id,601 token,602 nesting_budget,603 )?;604605 // =========606607 <PalletStructure<T>>::unnest_if_nested(from, collection.id, token);608609 <TokenData<T>>::insert(610 (collection.id, token),611 ItemData {612 owner: to.clone(),613 ..token_data614 },615 );616617 if let Some(balance_to) = balance_to {618 // from != to619 if balance_from == 0 {620 <AccountBalance<T>>::remove((collection.id, from));621 } else {622 <AccountBalance<T>>::insert((collection.id, from), balance_from);623 }624 <AccountBalance<T>>::insert((collection.id, to), balance_to);625 <Owned<T>>::remove((collection.id, from, token));626 <Owned<T>>::insert((collection.id, to, token), true);627 }628 Self::set_allowance_unchecked(collection, from, token, None, true);629630 <PalletEvm<T>>::deposit_log(631 ERC721Events::Transfer {632 from: *from.as_eth(),633 to: *to.as_eth(),634 token_id: token.into(),635 }636 .to_log(collection_id_to_address(collection.id)),637 );638 <PalletCommon<T>>::deposit_event(CommonEvent::Transfer(639 collection.id,640 token,641 from.clone(),642 to.clone(),643 1,644 ));645 Ok(())646 }647648 pub fn create_multiple_items(649 collection: &NonfungibleHandle<T>,650 sender: &T::CrossAccountId,651 data: Vec<CreateItemData<T>>,652 nesting_budget: &dyn Budget,653 ) -> DispatchResult {654 if !collection.is_owner_or_admin(sender) {655 ensure!(656 collection.permissions.mint_mode(),657 <CommonError<T>>::PublicMintingNotAllowed658 );659 collection.check_allowlist(sender)?;660661 for item in data.iter() {662 collection.check_allowlist(&item.owner)?;663 }664 }665666 for data in data.iter() {667 <PalletCommon<T>>::ensure_correct_receiver(&data.owner)?;668 }669670 let first_token = <TokensMinted<T>>::get(collection.id);671 let tokens_minted = first_token672 .checked_add(data.len() as u32)673 .ok_or(ArithmeticError::Overflow)?;674 ensure!(675 tokens_minted <= collection.limits.token_limit(),676 <CommonError<T>>::CollectionTokenLimitExceeded677 );678679 let mut balances = BTreeMap::new();680 for data in &data {681 let balance = balances682 .entry(&data.owner)683 .or_insert_with(|| <AccountBalance<T>>::get((collection.id, &data.owner)));684 *balance = balance.checked_add(1).ok_or(ArithmeticError::Overflow)?;685686 ensure!(687 *balance <= collection.limits.account_token_ownership_limit(),688 <CommonError<T>>::AccountTokenLimitExceeded,689 );690 }691692 for (i, data) in data.iter().enumerate() {693 let token = TokenId(first_token + i as u32 + 1);694695 <PalletStructure<T>>::check_nesting(696 sender.clone(),697 &data.owner,698 collection.id,699 token,700 nesting_budget,701 )?;702 }703704 // =========705706 with_transaction(|| {707 for (i, data) in data.iter().enumerate() {708 let token = first_token + i as u32 + 1;709710 <TokenData<T>>::insert(711 (collection.id, token),712 ItemData {713 // const_data: data.const_data.clone(),714 owner: data.owner.clone(),715 },716 );717718 <PalletStructure<T>>::nest_if_sent_to_token_unchecked(719 &data.owner,720 collection.id,721 TokenId(token),722 );723724 if let Err(e) = Self::set_token_properties(725 collection,726 sender,727 TokenId(token),728 data.properties.clone().into_inner(),729 ) {730 return TransactionOutcome::Rollback(Err(e));731 }732 }733 TransactionOutcome::Commit(Ok(()))734 })?;735736 <TokensMinted<T>>::insert(collection.id, tokens_minted);737 for (account, balance) in balances {738 <AccountBalance<T>>::insert((collection.id, account), balance);739 }740 for (i, data) in data.into_iter().enumerate() {741 let token = first_token + i as u32 + 1;742 <Owned<T>>::insert((collection.id, &data.owner, token), true);743744 <PalletEvm<T>>::deposit_log(745 ERC721Events::Transfer {746 from: H160::default(),747 to: *data.owner.as_eth(),748 token_id: token.into(),749 }750 .to_log(collection_id_to_address(collection.id)),751 );752 <PalletCommon<T>>::deposit_event(CommonEvent::ItemCreated(753 collection.id,754 TokenId(token),755 data.owner.clone(),756 1,757 ));758 }759 Ok(())760 }761762 pub fn set_allowance_unchecked(763 collection: &NonfungibleHandle<T>,764 sender: &T::CrossAccountId,765 token: TokenId,766 spender: Option<&T::CrossAccountId>,767 assume_implicit_eth: bool,768 ) {769 if let Some(spender) = spender {770 let old_spender = <Allowance<T>>::get((collection.id, token));771 <Allowance<T>>::insert((collection.id, token), spender);772 // In ERC721 there is only one possible approved user of token, so we set773 // approved user to spender774 <PalletEvm<T>>::deposit_log(775 ERC721Events::Approval {776 owner: *sender.as_eth(),777 approved: *spender.as_eth(),778 token_id: token.into(),779 }780 .to_log(collection_id_to_address(collection.id)),781 );782 // In Unique chain, any token can have any amount of approved users, so we need to783 // set allowance of old owner to 0, and allowance of new owner to 1784 if old_spender.as_ref() != Some(spender) {785 if let Some(old_owner) = old_spender {786 <PalletCommon<T>>::deposit_event(CommonEvent::Approved(787 collection.id,788 token,789 sender.clone(),790 old_owner,791 0,792 ));793 }794 <PalletCommon<T>>::deposit_event(CommonEvent::Approved(795 collection.id,796 token,797 sender.clone(),798 spender.clone(),799 1,800 ));801 }802 } else {803 let old_spender = <Allowance<T>>::take((collection.id, token));804 if !assume_implicit_eth {805 // In ERC721 there is only one possible approved user of token, so we set806 // approved user to zero address807 <PalletEvm<T>>::deposit_log(808 ERC721Events::Approval {809 owner: *sender.as_eth(),810 approved: H160::default(),811 token_id: token.into(),812 }813 .to_log(collection_id_to_address(collection.id)),814 );815 }816 // In Unique chain, any token can have any amount of approved users, so we need to817 // set allowance of old owner to 0818 if let Some(old_spender) = old_spender {819 <PalletCommon<T>>::deposit_event(CommonEvent::Approved(820 collection.id,821 token,822 sender.clone(),823 old_spender,824 0,825 ));826 }827 }828 }829830 pub fn set_allowance(831 collection: &NonfungibleHandle<T>,832 sender: &T::CrossAccountId,833 token: TokenId,834 spender: Option<&T::CrossAccountId>,835 ) -> DispatchResult {836 if collection.permissions.access() == AccessMode::AllowList {837 collection.check_allowlist(sender)?;838 if let Some(spender) = spender {839 collection.check_allowlist(spender)?;840 }841 }842843 if let Some(spender) = spender {844 <PalletCommon<T>>::ensure_correct_receiver(spender)?;845 }846 let token_data =847 <TokenData<T>>::get((collection.id, token)).ok_or(<CommonError<T>>::TokenNotFound)?;848 if &token_data.owner != sender {849 ensure!(850 collection.ignores_owned_amount(sender),851 <CommonError<T>>::CantApproveMoreThanOwned852 );853 }854855 // =========856857 Self::set_allowance_unchecked(collection, sender, token, spender, false);858 Ok(())859 }860861 fn check_allowed(862 collection: &NonfungibleHandle<T>,863 spender: &T::CrossAccountId,864 from: &T::CrossAccountId,865 token: TokenId,866 nesting_budget: &dyn Budget,867 ) -> DispatchResult {868 if spender.conv_eq(from) {869 return Ok(());870 }871 if collection.permissions.access() == AccessMode::AllowList {872 // `from`, `to` checked in [`transfer`]873 collection.check_allowlist(spender)?;874 }875 if let Some(source) = T::CrossTokenAddressMapping::address_to_token(from) {876 // TODO: should collection owner be allowed to perform this transfer?877 ensure!(878 <PalletStructure<T>>::check_indirectly_owned(879 spender.clone(),880 source.0,881 source.1,882 None,883 nesting_budget884 )?,885 <CommonError<T>>::ApprovedValueTooLow,886 );887 return Ok(());888 }889 if <Allowance<T>>::get((collection.id, token)).as_ref() == Some(spender) {890 return Ok(());891 }892 ensure!(893 collection.ignores_allowance(spender),894 <CommonError<T>>::ApprovedValueTooLow895 );896 Ok(())897 }898899 pub fn transfer_from(900 collection: &NonfungibleHandle<T>,901 spender: &T::CrossAccountId,902 from: &T::CrossAccountId,903 to: &T::CrossAccountId,904 token: TokenId,905 nesting_budget: &dyn Budget,906 ) -> DispatchResult {907 Self::check_allowed(collection, spender, from, token, nesting_budget)?;908909 // =========910911 // Allowance is reset in [`transfer`]912 Self::transfer(collection, from, to, token, nesting_budget)913 }914915 pub fn burn_from(916 collection: &NonfungibleHandle<T>,917 spender: &T::CrossAccountId,918 from: &T::CrossAccountId,919 token: TokenId,920 nesting_budget: &dyn Budget,921 ) -> DispatchResult {922 Self::check_allowed(collection, spender, from, token, nesting_budget)?;923924 // =========925926 Self::burn(collection, from, token)927 }928929 pub fn check_nesting(930 handle: &NonfungibleHandle<T>,931 sender: T::CrossAccountId,932 from: (CollectionId, TokenId),933 under: TokenId,934 nesting_budget: &dyn Budget,935 ) -> DispatchResult {936 fn ensure_sender_allowed<T: Config>(937 collection: CollectionId,938 token: TokenId,939 for_nest: (CollectionId, TokenId),940 sender: T::CrossAccountId,941 budget: &dyn Budget,942 ) -> DispatchResult {943 ensure!(944 <PalletStructure<T>>::check_indirectly_owned(945 sender,946 collection,947 token,948 Some(for_nest),949 budget950 )?,951 <CommonError<T>>::OnlyOwnerAllowedToNest,952 );953 Ok(())954 }955 match handle.permissions.nesting() {956 NestingRule::Disabled => fail!(<CommonError<T>>::NestingIsDisabled),957 NestingRule::Owner => {958 ensure_sender_allowed::<T>(handle.id, under, from, sender, nesting_budget)?959 }960 NestingRule::OwnerRestricted(whitelist) => {961 ensure!(962 whitelist.contains(&from.0),963 <CommonError<T>>::SourceCollectionIsNotAllowedToNest964 );965 ensure_sender_allowed::<T>(handle.id, under, from, sender, nesting_budget)?966 }967 }968 Ok(())969 }970971 fn nest(under: (CollectionId, TokenId), to_nest: (CollectionId, TokenId)) {972 <TokenChildren<T>>::insert((under.0, under.1, (to_nest.0, to_nest.1)), true);973 }974975 fn unnest(under: (CollectionId, TokenId), to_unnest: (CollectionId, TokenId)) {976 <TokenChildren<T>>::remove((under.0, under.1, to_unnest));977 }978979 fn collection_has_tokens(collection_id: CollectionId) -> bool {980 <TokenData<T>>::iter_prefix((collection_id,))981 .next()982 .is_some()983 }984985 fn token_has_children(collection_id: CollectionId, token_id: TokenId) -> bool {986 <TokenChildren<T>>::iter_prefix((collection_id, token_id))987 .next()988 .is_some()989 }990991 /// Delegated to `create_multiple_items`992 pub fn create_item(993 collection: &NonfungibleHandle<T>,994 sender: &T::CrossAccountId,995 data: CreateItemData<T>,996 nesting_budget: &dyn Budget,997 ) -> DispatchResult {998 Self::create_multiple_items(collection, sender, vec![data], nesting_budget)999 }1000}pallets/structure/src/lib.rsdiffbeforeafterboth--- a/pallets/structure/src/lib.rs
+++ b/pallets/structure/src/lib.rs
@@ -191,8 +191,8 @@
token_id: TokenId,
nesting_budget: &dyn Budget,
) -> DispatchResult {
- Self::try_exec_if_owner_is_valid_nft(under, |d, parent_id| {
- d.check_nesting(from, (collection_id, token_id), parent_id, nesting_budget)
+ Self::try_exec_if_owner_is_valid_nft(under, |collection, parent_id| {
+ collection.check_nesting(from, (collection_id, token_id), parent_id, nesting_budget)
})
}
@@ -203,10 +203,10 @@
token_id: TokenId,
nesting_budget: &dyn Budget,
) -> DispatchResult {
- Self::try_exec_if_owner_is_valid_nft(under, |d, parent_id| {
- d.check_nesting(from, (collection_id, token_id), parent_id, nesting_budget)?;
+ Self::try_exec_if_owner_is_valid_nft(under, |collection, parent_id| {
+ collection.check_nesting(from, (collection_id, token_id), parent_id, nesting_budget)?;
- d.nest(parent_id, (collection_id, token_id));
+ collection.nest(parent_id, (collection_id, token_id));
Ok(())
})
@@ -217,8 +217,8 @@
collection_id: CollectionId,
token_id: TokenId,
) {
- Self::exec_if_owner_is_valid_nft(owner, |d, parent_id| {
- d.nest(parent_id, (collection_id, token_id))
+ Self::exec_if_owner_is_valid_nft(owner, |collection, parent_id| {
+ collection.nest(parent_id, (collection_id, token_id))
});
}
@@ -227,8 +227,8 @@
collection_id: CollectionId,
token_id: TokenId,
) {
- Self::exec_if_owner_is_valid_nft(owner, |d, parent_id| {
- d.unnest(parent_id, (collection_id, token_id))
+ Self::exec_if_owner_is_valid_nft(owner, |collection, parent_id| {
+ collection.unnest(parent_id, (collection_id, token_id))
});
}
@@ -236,8 +236,8 @@
account: &T::CrossAccountId,
action: impl FnOnce(&dyn CommonCollectionOperations<T>, TokenId),
) {
- Self::try_exec_if_owner_is_valid_nft(account, |d, id| {
- action(d, id);
+ Self::try_exec_if_owner_is_valid_nft(account, |collection, id| {
+ action(collection, id);
Ok(())
})
.unwrap();
primitives/data-structs/src/lib.rsdiffbeforeafterboth--- a/primitives/data-structs/src/lib.rs
+++ b/primitives/data-structs/src/lib.rs
@@ -585,6 +585,14 @@
#[derive(Encode, Decode, MaxEncodedLen, PartialEq, Clone, Debug, TypeInfo)]
#[cfg_attr(feature = "serde1", derive(Serialize, Deserialize))]
+// todo possibly rename to be used generally as an address pair
+pub struct TokenChild {
+ pub token: TokenId,
+ pub collection: CollectionId,
+}
+
+#[derive(Encode, Decode, MaxEncodedLen, PartialEq, Clone, Debug, TypeInfo)]
+#[cfg_attr(feature = "serde1", derive(Serialize, Deserialize))]
pub struct CollectionStats {
pub created: u32,
pub destroyed: u32,
primitives/rpc/src/lib.rsdiffbeforeafterboth--- a/primitives/rpc/src/lib.rs
+++ b/primitives/rpc/src/lib.rs
@@ -18,7 +18,7 @@
use up_data_structs::{
CollectionId, TokenId, RpcCollection, CollectionStats, CollectionLimits, Property,
- PropertyKeyPermission, TokenData,
+ PropertyKeyPermission, TokenData, TokenChild,
};
use sp_std::vec::Vec;
use codec::Decode;
@@ -41,6 +41,7 @@
fn token_owner(collection: CollectionId, token: TokenId) -> Result<Option<CrossAccountId>>;
fn topmost_token_owner(collection: CollectionId, token: TokenId) -> Result<Option<CrossAccountId>>;
+ fn token_children(collection: CollectionId, token: TokenId) -> Result<Vec<TokenChild>>;
fn collection_properties(collection: CollectionId, properties: Option<Vec<Vec<u8>>>) -> Result<Vec<Property>>;
runtime/common/src/runtime_apis.rsdiffbeforeafterboth--- a/runtime/common/src/runtime_apis.rs
+++ b/runtime/common/src/runtime_apis.rs
@@ -29,7 +29,9 @@
Ok(Some(<pallet_structure::Pallet<Runtime>>::find_topmost_owner(collection, token, &budget)?))
}
-
+ fn token_children(collection: CollectionId, token: TokenId) -> Result<Vec<TokenChild>, DispatchError> {
+ Ok(<pallet_nonfungible::Pallet<Runtime>>::token_children_ids(collection, token))
+ }
fn collection_properties(
collection: CollectionId,
keys: Option<Vec<Vec<u8>>>
runtime/opal/src/lib.rsdiffbeforeafterboth--- a/runtime/opal/src/lib.rs
+++ b/runtime/opal/src/lib.rs
@@ -73,6 +73,7 @@
CollectionId, TokenId, TokenData, Property, PropertyKeyPermission, CollectionLimits,
CollectionStats, RpcCollection,
mapping::{EvmTokenAddressMapping, CrossTokenAddressMapping},
+ TokenChild,
};
// use pallet_contracts::weights::WeightInfo;
runtime/quartz/src/lib.rsdiffbeforeafterboth--- a/runtime/quartz/src/lib.rs
+++ b/runtime/quartz/src/lib.rs
@@ -72,7 +72,8 @@
use up_data_structs::{
CollectionId, TokenId, TokenData, Property, PropertyKeyPermission, CollectionLimits,
CollectionStats, RpcCollection,
- mapping::{EvmTokenAddressMapping, CrossTokenAddressMapping}
+ mapping::{EvmTokenAddressMapping, CrossTokenAddressMapping},
+ TokenChild,
};
// use pallet_contracts::weights::WeightInfo;
runtime/tests/src/tests.rsdiffbeforeafterboth--- a/runtime/tests/src/tests.rs
+++ b/runtime/tests/src/tests.rs
@@ -21,7 +21,7 @@
CreateReFungibleData, MAX_DECIMAL_POINTS, COLLECTION_ADMINS_LIMIT, TokenId,
MAX_TOKEN_OWNERSHIP, CreateCollectionData, CollectionMode, AccessMode, CollectionPermissions,
PropertyKeyPermission, PropertyPermission, Property, CollectionPropertiesVec,
- CollectionPropertiesPermissionsVec,
+ CollectionPropertiesPermissionsVec, TokenChild,
};
use frame_support::{assert_noop, assert_ok, assert_err};
use sp_std::convert::TryInto;
tests/src/interfaces/augment-api-query.tsdiffbeforeafterboth--- a/tests/src/interfaces/augment-api-query.ts
+++ b/tests/src/interfaces/augment-api-query.ts
@@ -5,7 +5,7 @@
import type { BTreeMap, Bytes, Option, U256, Vec, bool, u128, u16, u32, u64 } from '@polkadot/types-codec';
import type { AnyNumber, ITuple } from '@polkadot/types-codec/types';
import type { AccountId32, H160, H256 } from '@polkadot/types/interfaces/runtime';
-import type { CumulusPalletDmpQueueConfigData, CumulusPalletDmpQueuePageIndexData, CumulusPalletParachainSystemRelayStateSnapshotMessagingStateSnapshot, CumulusPalletXcmpQueueInboundChannelDetails, CumulusPalletXcmpQueueOutboundChannelDetails, CumulusPalletXcmpQueueQueueConfigData, EthereumBlock, EthereumLog, EthereumReceiptReceiptV3, EthereumTransactionTransactionV2, FpRpcTransactionStatus, FrameSupportWeightsPerDispatchClassU64, FrameSystemAccountInfo, FrameSystemEventRecord, FrameSystemLastRuntimeUpgradeInfo, FrameSystemPhase, OrmlVestingVestingSchedule, PalletBalancesAccountData, PalletBalancesBalanceLock, PalletBalancesReleases, PalletBalancesReserveData, PalletEvmAccountBasicCrossAccountIdRepr, PalletEvmContractHelpersSponsoringModeT, PalletNonfungibleItemData, PalletRefungibleItemData, PalletTransactionPaymentReleases, PalletTreasuryProposal, PhantomTypeUpDataStructs, PolkadotCorePrimitivesOutboundHrmpMessage, PolkadotPrimitivesV2AbridgedHostConfiguration, PolkadotPrimitivesV2PersistedValidationData, PolkadotPrimitivesV2UpgradeRestriction, SpRuntimeDigest, SpTrieStorageProof, UpDataStructsCollection, UpDataStructsCollectionStats, UpDataStructsProperties, UpDataStructsPropertiesMapPropertyPermission, UpDataStructsPropertyPermission } from '@polkadot/types/lookup';
+import type { CumulusPalletDmpQueueConfigData, CumulusPalletDmpQueuePageIndexData, CumulusPalletParachainSystemRelayStateSnapshotMessagingStateSnapshot, CumulusPalletXcmpQueueInboundChannelDetails, CumulusPalletXcmpQueueOutboundChannelDetails, CumulusPalletXcmpQueueQueueConfigData, EthereumBlock, EthereumLog, EthereumReceiptReceiptV3, EthereumTransactionTransactionV2, FpRpcTransactionStatus, FrameSupportWeightsPerDispatchClassU64, FrameSystemAccountInfo, FrameSystemEventRecord, FrameSystemLastRuntimeUpgradeInfo, FrameSystemPhase, OrmlVestingVestingSchedule, PalletBalancesAccountData, PalletBalancesBalanceLock, PalletBalancesReleases, PalletBalancesReserveData, PalletEvmAccountBasicCrossAccountIdRepr, PalletEvmContractHelpersSponsoringModeT, PalletNonfungibleItemData, PalletRefungibleItemData, PalletTransactionPaymentReleases, PalletTreasuryProposal, PhantomTypeUpDataStructs, PolkadotCorePrimitivesOutboundHrmpMessage, PolkadotPrimitivesV2AbridgedHostConfiguration, PolkadotPrimitivesV2PersistedValidationData, PolkadotPrimitivesV2UpgradeRestriction, SpRuntimeDigest, SpTrieStorageProof, UpDataStructsCollection, UpDataStructsCollectionStats, UpDataStructsProperties, UpDataStructsPropertiesMapPropertyPermission, UpDataStructsPropertyPermission, UpDataStructsTokenChild } from '@polkadot/types/lookup';
import type { Observable } from '@polkadot/types/types';
declare module '@polkadot/api-base/types/storage' {
@@ -88,7 +88,7 @@
/**
* Not used by code, exists only to provide some types to metadata
**/
- dummyStorageValue: AugmentedQuery<ApiType, () => Observable<Option<ITuple<[UpDataStructsCollectionStats, u32, u32, PhantomTypeUpDataStructs]>>>, []> & QueryableStorageEntry<ApiType, []>;
+ dummyStorageValue: AugmentedQuery<ApiType, () => Observable<Option<ITuple<[UpDataStructsCollectionStats, u32, u32, UpDataStructsTokenChild, PhantomTypeUpDataStructs]>>>, []> & QueryableStorageEntry<ApiType, []>;
/**
* List of collection admins
**/
tests/src/interfaces/augment-api-rpc.tsdiffbeforeafterboth--- a/tests/src/interfaces/augment-api-rpc.ts
+++ b/tests/src/interfaces/augment-api-rpc.ts
@@ -1,7 +1,7 @@
// Auto-generated via `yarn polkadot-types-from-chain`, do not edit
/* eslint-disable */
-import type { PalletEvmAccountBasicCrossAccountIdRepr, UpDataStructsCollectionLimits, UpDataStructsCollectionStats, UpDataStructsProperty, UpDataStructsPropertyKeyPermission, UpDataStructsRpcCollection, UpDataStructsTokenData } from './default';
+import type { PalletEvmAccountBasicCrossAccountIdRepr, UpDataStructsCollectionLimits, UpDataStructsCollectionStats, UpDataStructsProperty, UpDataStructsPropertyKeyPermission, UpDataStructsRpcCollection, UpDataStructsTokenChild, UpDataStructsTokenData } from './default';
import type { AugmentedRpc } from '@polkadot/rpc-core/types';
import type { Metadata, StorageKey } from '@polkadot/types';
import type { Bytes, HashMap, Json, Null, Option, Text, U256, U64, Vec, bool, u128, u32, u64 } from '@polkadot/types-codec';
@@ -639,6 +639,10 @@
**/
propertyPermissions: AugmentedRpc<(collection: u32 | AnyNumber | Uint8Array, propertyKeys?: Vec<Text> | (Text | string)[], at?: Hash | string | Uint8Array) => Observable<Vec<UpDataStructsPropertyKeyPermission>>>;
/**
+ * Get tokens nested directly into the token
+ **/
+ tokenChildren: AugmentedRpc<(collection: u32 | AnyNumber | Uint8Array, tokenId: u32 | AnyNumber | Uint8Array, at?: Hash | string | Uint8Array) => Observable<Vec<UpDataStructsTokenChild>>>;
+ /**
* Get token data
**/
tokenData: AugmentedRpc<(collection: u32 | AnyNumber | Uint8Array, tokenId: u32 | AnyNumber | Uint8Array, propertyKeys?: Vec<Text> | (Text | string)[], at?: Hash | string | Uint8Array) => Observable<UpDataStructsTokenData>>;
tests/src/interfaces/augment-types.tsdiffbeforeafterboth--- a/tests/src/interfaces/augment-types.ts
+++ b/tests/src/interfaces/augment-types.ts
@@ -1,7 +1,7 @@
// Auto-generated via `yarn polkadot-types-from-defs`, do not edit
/* eslint-disable */
-import type { CumulusPalletDmpQueueCall, CumulusPalletDmpQueueConfigData, CumulusPalletDmpQueueError, CumulusPalletDmpQueueEvent, CumulusPalletDmpQueuePageIndexData, CumulusPalletParachainSystemCall, CumulusPalletParachainSystemError, CumulusPalletParachainSystemEvent, CumulusPalletParachainSystemRelayStateSnapshotMessagingStateSnapshot, CumulusPalletXcmCall, CumulusPalletXcmError, CumulusPalletXcmEvent, CumulusPalletXcmpQueueCall, CumulusPalletXcmpQueueError, CumulusPalletXcmpQueueEvent, CumulusPalletXcmpQueueInboundChannelDetails, CumulusPalletXcmpQueueInboundState, CumulusPalletXcmpQueueOutboundChannelDetails, CumulusPalletXcmpQueueOutboundState, CumulusPalletXcmpQueueQueueConfigData, CumulusPrimitivesParachainInherentParachainInherentData, EthbloomBloom, EthereumBlock, EthereumHeader, EthereumLog, EthereumReceiptEip658ReceiptData, EthereumReceiptReceiptV3, EthereumTransactionAccessListItem, EthereumTransactionEip1559Transaction, EthereumTransactionEip2930Transaction, EthereumTransactionLegacyTransaction, EthereumTransactionTransactionAction, EthereumTransactionTransactionSignature, EthereumTransactionTransactionV2, EthereumTypesHashH64, EvmCoreErrorExitError, EvmCoreErrorExitFatal, EvmCoreErrorExitReason, EvmCoreErrorExitRevert, EvmCoreErrorExitSucceed, FpRpcTransactionStatus, FrameSupportPalletId, FrameSupportTokensMiscBalanceStatus, FrameSupportWeightsDispatchClass, FrameSupportWeightsDispatchInfo, FrameSupportWeightsPays, FrameSupportWeightsPerDispatchClassU32, FrameSupportWeightsPerDispatchClassU64, FrameSupportWeightsPerDispatchClassWeightsPerClass, FrameSupportWeightsRuntimeDbWeight, FrameSupportWeightsWeightToFeeCoefficient, FrameSystemAccountInfo, FrameSystemCall, FrameSystemError, FrameSystemEvent, FrameSystemEventRecord, FrameSystemExtensionsCheckGenesis, FrameSystemExtensionsCheckNonce, FrameSystemExtensionsCheckSpecVersion, FrameSystemExtensionsCheckWeight, FrameSystemLastRuntimeUpgradeInfo, FrameSystemLimitsBlockLength, FrameSystemLimitsBlockWeights, FrameSystemLimitsWeightsPerClass, FrameSystemPhase, OpalRuntimeRuntime, OrmlVestingModuleCall, OrmlVestingModuleError, OrmlVestingModuleEvent, OrmlVestingVestingSchedule, PalletBalancesAccountData, PalletBalancesBalanceLock, PalletBalancesCall, PalletBalancesError, PalletBalancesEvent, PalletBalancesReasons, PalletBalancesReleases, PalletBalancesReserveData, PalletCommonError, PalletCommonEvent, PalletEthereumCall, PalletEthereumError, PalletEthereumEvent, PalletEthereumFakeTransactionFinalizer, PalletEvmAccountBasicCrossAccountIdRepr, PalletEvmCall, PalletEvmCoderSubstrateError, PalletEvmContractHelpersError, PalletEvmContractHelpersSponsoringModeT, PalletEvmError, PalletEvmEvent, PalletEvmMigrationCall, PalletEvmMigrationError, PalletFungibleError, PalletInflationCall, PalletNonfungibleError, PalletNonfungibleItemData, PalletRefungibleError, PalletRefungibleItemData, PalletStructureCall, PalletStructureError, PalletStructureEvent, PalletSudoCall, PalletSudoError, PalletSudoEvent, PalletTemplateTransactionPaymentCall, PalletTemplateTransactionPaymentChargeTransactionPayment, PalletTimestampCall, PalletTransactionPaymentReleases, PalletTreasuryCall, PalletTreasuryError, PalletTreasuryEvent, PalletTreasuryProposal, PalletUniqueCall, PalletUniqueError, PalletUniqueRawEvent, PalletXcmCall, PalletXcmError, PalletXcmEvent, PhantomTypeUpDataStructs, PolkadotCorePrimitivesInboundDownwardMessage, PolkadotCorePrimitivesInboundHrmpMessage, PolkadotCorePrimitivesOutboundHrmpMessage, PolkadotParachainPrimitivesXcmpMessageFormat, PolkadotPrimitivesV2AbridgedHostConfiguration, PolkadotPrimitivesV2AbridgedHrmpChannel, PolkadotPrimitivesV2PersistedValidationData, PolkadotPrimitivesV2UpgradeRestriction, SpCoreEcdsaSignature, SpCoreEd25519Signature, SpCoreSr25519Signature, SpRuntimeArithmeticError, SpRuntimeDigest, SpRuntimeDigestDigestItem, SpRuntimeDispatchError, SpRuntimeModuleError, SpRuntimeMultiSignature, SpRuntimeTokenError, SpRuntimeTransactionalError, SpTrieStorageProof, SpVersionRuntimeVersion, UpDataStructsAccessMode, UpDataStructsCollection, UpDataStructsCollectionLimits, UpDataStructsCollectionMode, UpDataStructsCollectionPermissions, UpDataStructsCollectionStats, UpDataStructsCreateCollectionData, UpDataStructsCreateFungibleData, UpDataStructsCreateItemData, UpDataStructsCreateItemExData, UpDataStructsCreateNftData, UpDataStructsCreateNftExData, UpDataStructsCreateReFungibleData, UpDataStructsCreateRefungibleExData, UpDataStructsNestingRule, UpDataStructsProperties, UpDataStructsPropertiesMapBoundedVec, UpDataStructsPropertiesMapPropertyPermission, UpDataStructsProperty, UpDataStructsPropertyKeyPermission, UpDataStructsPropertyPermission, UpDataStructsRmrkAccountIdOrCollectionNftTuple, UpDataStructsRmrkBaseInfo, UpDataStructsRmrkBasicResource, UpDataStructsRmrkCollectionInfo, UpDataStructsRmrkComposableResource, UpDataStructsRmrkEquippableList, UpDataStructsRmrkFixedPart, UpDataStructsRmrkNftChild, UpDataStructsRmrkNftInfo, UpDataStructsRmrkPartType, UpDataStructsRmrkPropertyInfo, UpDataStructsRmrkResourceInfo, UpDataStructsRmrkResourceTypes, UpDataStructsRmrkRoyaltyInfo, UpDataStructsRmrkSlotPart, UpDataStructsRmrkSlotResource, UpDataStructsRmrkTheme, UpDataStructsRmrkThemeProperty, UpDataStructsRpcCollection, UpDataStructsSponsoringRateLimit, UpDataStructsSponsorshipState, UpDataStructsTokenData, XcmDoubleEncoded, XcmV0Junction, XcmV0JunctionBodyId, XcmV0JunctionBodyPart, XcmV0JunctionNetworkId, XcmV0MultiAsset, XcmV0MultiLocation, XcmV0Order, XcmV0OriginKind, XcmV0Response, XcmV0Xcm, XcmV1Junction, XcmV1MultiAsset, XcmV1MultiLocation, XcmV1MultiassetAssetId, XcmV1MultiassetAssetInstance, XcmV1MultiassetFungibility, XcmV1MultiassetMultiAssetFilter, XcmV1MultiassetMultiAssets, XcmV1MultiassetWildFungibility, XcmV1MultiassetWildMultiAsset, XcmV1MultilocationJunctions, XcmV1Order, XcmV1Response, XcmV1Xcm, XcmV2Instruction, XcmV2Response, XcmV2TraitsError, XcmV2TraitsOutcome, XcmV2WeightLimit, XcmV2Xcm, XcmVersionedMultiAssets, XcmVersionedMultiLocation, XcmVersionedXcm } from './default';
+import type { CumulusPalletDmpQueueCall, CumulusPalletDmpQueueConfigData, CumulusPalletDmpQueueError, CumulusPalletDmpQueueEvent, CumulusPalletDmpQueuePageIndexData, CumulusPalletParachainSystemCall, CumulusPalletParachainSystemError, CumulusPalletParachainSystemEvent, CumulusPalletParachainSystemRelayStateSnapshotMessagingStateSnapshot, CumulusPalletXcmCall, CumulusPalletXcmError, CumulusPalletXcmEvent, CumulusPalletXcmpQueueCall, CumulusPalletXcmpQueueError, CumulusPalletXcmpQueueEvent, CumulusPalletXcmpQueueInboundChannelDetails, CumulusPalletXcmpQueueInboundState, CumulusPalletXcmpQueueOutboundChannelDetails, CumulusPalletXcmpQueueOutboundState, CumulusPalletXcmpQueueQueueConfigData, CumulusPrimitivesParachainInherentParachainInherentData, EthbloomBloom, EthereumBlock, EthereumHeader, EthereumLog, EthereumReceiptEip658ReceiptData, EthereumReceiptReceiptV3, EthereumTransactionAccessListItem, EthereumTransactionEip1559Transaction, EthereumTransactionEip2930Transaction, EthereumTransactionLegacyTransaction, EthereumTransactionTransactionAction, EthereumTransactionTransactionSignature, EthereumTransactionTransactionV2, EthereumTypesHashH64, EvmCoreErrorExitError, EvmCoreErrorExitFatal, EvmCoreErrorExitReason, EvmCoreErrorExitRevert, EvmCoreErrorExitSucceed, FpRpcTransactionStatus, FrameSupportPalletId, FrameSupportTokensMiscBalanceStatus, FrameSupportWeightsDispatchClass, FrameSupportWeightsDispatchInfo, FrameSupportWeightsPays, FrameSupportWeightsPerDispatchClassU32, FrameSupportWeightsPerDispatchClassU64, FrameSupportWeightsPerDispatchClassWeightsPerClass, FrameSupportWeightsRuntimeDbWeight, FrameSupportWeightsWeightToFeeCoefficient, FrameSystemAccountInfo, FrameSystemCall, FrameSystemError, FrameSystemEvent, FrameSystemEventRecord, FrameSystemExtensionsCheckGenesis, FrameSystemExtensionsCheckNonce, FrameSystemExtensionsCheckSpecVersion, FrameSystemExtensionsCheckWeight, FrameSystemLastRuntimeUpgradeInfo, FrameSystemLimitsBlockLength, FrameSystemLimitsBlockWeights, FrameSystemLimitsWeightsPerClass, FrameSystemPhase, OpalRuntimeRuntime, OrmlVestingModuleCall, OrmlVestingModuleError, OrmlVestingModuleEvent, OrmlVestingVestingSchedule, PalletBalancesAccountData, PalletBalancesBalanceLock, PalletBalancesCall, PalletBalancesError, PalletBalancesEvent, PalletBalancesReasons, PalletBalancesReleases, PalletBalancesReserveData, PalletCommonError, PalletCommonEvent, PalletEthereumCall, PalletEthereumError, PalletEthereumEvent, PalletEthereumFakeTransactionFinalizer, PalletEvmAccountBasicCrossAccountIdRepr, PalletEvmCall, PalletEvmCoderSubstrateError, PalletEvmContractHelpersError, PalletEvmContractHelpersSponsoringModeT, PalletEvmError, PalletEvmEvent, PalletEvmMigrationCall, PalletEvmMigrationError, PalletFungibleError, PalletInflationCall, PalletNonfungibleError, PalletNonfungibleItemData, PalletRefungibleError, PalletRefungibleItemData, PalletStructureCall, PalletStructureError, PalletStructureEvent, PalletSudoCall, PalletSudoError, PalletSudoEvent, PalletTemplateTransactionPaymentCall, PalletTemplateTransactionPaymentChargeTransactionPayment, PalletTimestampCall, PalletTransactionPaymentReleases, PalletTreasuryCall, PalletTreasuryError, PalletTreasuryEvent, PalletTreasuryProposal, PalletUniqueCall, PalletUniqueError, PalletUniqueRawEvent, PalletXcmCall, PalletXcmError, PalletXcmEvent, PhantomTypeUpDataStructs, PolkadotCorePrimitivesInboundDownwardMessage, PolkadotCorePrimitivesInboundHrmpMessage, PolkadotCorePrimitivesOutboundHrmpMessage, PolkadotParachainPrimitivesXcmpMessageFormat, PolkadotPrimitivesV2AbridgedHostConfiguration, PolkadotPrimitivesV2AbridgedHrmpChannel, PolkadotPrimitivesV2PersistedValidationData, PolkadotPrimitivesV2UpgradeRestriction, SpCoreEcdsaSignature, SpCoreEd25519Signature, SpCoreSr25519Signature, SpRuntimeArithmeticError, SpRuntimeDigest, SpRuntimeDigestDigestItem, SpRuntimeDispatchError, SpRuntimeModuleError, SpRuntimeMultiSignature, SpRuntimeTokenError, SpRuntimeTransactionalError, SpTrieStorageProof, SpVersionRuntimeVersion, UpDataStructsAccessMode, UpDataStructsCollection, UpDataStructsCollectionLimits, UpDataStructsCollectionMode, UpDataStructsCollectionPermissions, UpDataStructsCollectionStats, UpDataStructsCreateCollectionData, UpDataStructsCreateFungibleData, UpDataStructsCreateItemData, UpDataStructsCreateItemExData, UpDataStructsCreateNftData, UpDataStructsCreateNftExData, UpDataStructsCreateReFungibleData, UpDataStructsCreateRefungibleExData, UpDataStructsNestingRule, UpDataStructsProperties, UpDataStructsPropertiesMapBoundedVec, UpDataStructsPropertiesMapPropertyPermission, UpDataStructsProperty, UpDataStructsPropertyKeyPermission, UpDataStructsPropertyPermission, UpDataStructsRmrkAccountIdOrCollectionNftTuple, UpDataStructsRmrkBaseInfo, UpDataStructsRmrkBasicResource, UpDataStructsRmrkCollectionInfo, UpDataStructsRmrkComposableResource, UpDataStructsRmrkEquippableList, UpDataStructsRmrkFixedPart, UpDataStructsRmrkNftChild, UpDataStructsRmrkNftInfo, UpDataStructsRmrkPartType, UpDataStructsRmrkPropertyInfo, UpDataStructsRmrkResourceInfo, UpDataStructsRmrkResourceTypes, UpDataStructsRmrkRoyaltyInfo, UpDataStructsRmrkSlotPart, UpDataStructsRmrkSlotResource, UpDataStructsRmrkTheme, UpDataStructsRmrkThemeProperty, UpDataStructsRpcCollection, UpDataStructsSponsoringRateLimit, UpDataStructsSponsorshipState, UpDataStructsTokenChild, UpDataStructsTokenData, XcmDoubleEncoded, XcmV0Junction, XcmV0JunctionBodyId, XcmV0JunctionBodyPart, XcmV0JunctionNetworkId, XcmV0MultiAsset, XcmV0MultiLocation, XcmV0Order, XcmV0OriginKind, XcmV0Response, XcmV0Xcm, XcmV1Junction, XcmV1MultiAsset, XcmV1MultiLocation, XcmV1MultiassetAssetId, XcmV1MultiassetAssetInstance, XcmV1MultiassetFungibility, XcmV1MultiassetMultiAssetFilter, XcmV1MultiassetMultiAssets, XcmV1MultiassetWildFungibility, XcmV1MultiassetWildMultiAsset, XcmV1MultilocationJunctions, XcmV1Order, XcmV1Response, XcmV1Xcm, XcmV2Instruction, XcmV2Response, XcmV2TraitsError, XcmV2TraitsOutcome, XcmV2WeightLimit, XcmV2Xcm, XcmVersionedMultiAssets, XcmVersionedMultiLocation, XcmVersionedXcm } from './default';
import type { Data, StorageKey } from '@polkadot/types';
import type { BitVec, Bool, Bytes, I128, I16, I256, I32, I64, I8, Json, Null, OptionBool, Raw, Text, Type, U128, U16, U256, U32, U64, U8, USize, bool, i128, i16, i256, i32, i64, i8, u128, u16, u256, u32, u64, u8, usize } from '@polkadot/types-codec';
import type { AssetApproval, AssetApprovalKey, AssetBalance, AssetDestroyWitness, AssetDetails, AssetMetadata, TAssetBalance, TAssetDepositBalance } from '@polkadot/types/interfaces/assets';
@@ -1210,6 +1210,7 @@
UpDataStructsRpcCollection: UpDataStructsRpcCollection;
UpDataStructsSponsoringRateLimit: UpDataStructsSponsoringRateLimit;
UpDataStructsSponsorshipState: UpDataStructsSponsorshipState;
+ UpDataStructsTokenChild: UpDataStructsTokenChild;
UpDataStructsTokenData: UpDataStructsTokenData;
UpgradeGoAhead: UpgradeGoAhead;
UpgradeRestriction: UpgradeRestriction;
tests/src/interfaces/default/types.tsdiffbeforeafterboth--- a/tests/src/interfaces/default/types.ts
+++ b/tests/src/interfaces/default/types.ts
@@ -1588,7 +1588,7 @@
}
/** @name PhantomTypeUpDataStructs */
-export interface PhantomTypeUpDataStructs extends Vec<ITuple<[UpDataStructsTokenData, UpDataStructsRpcCollection, PalletEvmAccountBasicCrossAccountIdRepr, UpDataStructsRmrkCollectionInfo, UpDataStructsRmrkNftInfo, UpDataStructsRmrkResourceInfo, UpDataStructsRmrkPropertyInfo, UpDataStructsRmrkBaseInfo, UpDataStructsRmrkPartType, UpDataStructsRmrkTheme, UpDataStructsRmrkNftChild]>> {}
+export interface PhantomTypeUpDataStructs extends Vec<ITuple<[UpDataStructsTokenData, UpDataStructsRpcCollection, UpDataStructsRmrkCollectionInfo, UpDataStructsRmrkNftInfo, UpDataStructsRmrkResourceInfo, UpDataStructsRmrkPropertyInfo, UpDataStructsRmrkBaseInfo, UpDataStructsRmrkPartType, UpDataStructsRmrkTheme, UpDataStructsRmrkNftChild]>> {}
/** @name PolkadotCorePrimitivesInboundDownwardMessage */
export interface PolkadotCorePrimitivesInboundDownwardMessage extends Struct {
@@ -1861,7 +1861,6 @@
/** @name UpDataStructsCreateNftData */
export interface UpDataStructsCreateNftData extends Struct {
- readonly constData: Bytes;
readonly properties: Vec<UpDataStructsProperty>;
}
@@ -2101,6 +2100,12 @@
readonly type: 'Disabled' | 'Unconfirmed' | 'Confirmed';
}
+/** @name UpDataStructsTokenChild */
+export interface UpDataStructsTokenChild extends Struct {
+ readonly token: u32;
+ readonly collection: u32;
+}
+
/** @name UpDataStructsTokenData */
export interface UpDataStructsTokenData extends Struct {
readonly properties: Vec<UpDataStructsProperty>;
tests/src/interfaces/lookup.tsdiffbeforeafterboth--- a/tests/src/interfaces/lookup.ts
+++ b/tests/src/interfaces/lookup.ts
@@ -1479,17 +1479,16 @@
* Lookup186: up_data_structs::CreateNftData
**/
UpDataStructsCreateNftData: {
- constData: 'Bytes',
properties: 'Vec<UpDataStructsProperty>'
},
/**
- * Lookup188: up_data_structs::CreateFungibleData
+ * Lookup187: up_data_structs::CreateFungibleData
**/
UpDataStructsCreateFungibleData: {
value: 'u128'
},
/**
- * Lookup189: up_data_structs::CreateReFungibleData
+ * Lookup188: up_data_structs::CreateReFungibleData
**/
UpDataStructsCreateReFungibleData: {
constData: 'Bytes',
@@ -2282,18 +2281,25 @@
alive: 'u32'
},
/**
- * Lookup323: PhantomType::up_data_structs<T>
+ * Lookup323: up_data_structs::TokenChild
**/
- PhantomTypeUpDataStructs: '[(UpDataStructsTokenData,UpDataStructsRpcCollection,PalletEvmAccountBasicCrossAccountIdRepr,UpDataStructsRmrkCollectionInfo,UpDataStructsRmrkNftInfo,UpDataStructsRmrkResourceInfo,UpDataStructsRmrkPropertyInfo,UpDataStructsRmrkBaseInfo,UpDataStructsRmrkPartType,UpDataStructsRmrkTheme,UpDataStructsRmrkNftChild);0]',
+ UpDataStructsTokenChild: {
+ token: 'u32',
+ collection: 'u32'
+ },
+ /**
+ * Lookup324: PhantomType::up_data_structs<T>
+ **/
+ PhantomTypeUpDataStructs: '[(UpDataStructsTokenData,UpDataStructsRpcCollection,UpDataStructsRmrkCollectionInfo,UpDataStructsRmrkNftInfo,UpDataStructsRmrkResourceInfo,UpDataStructsRmrkPropertyInfo,UpDataStructsRmrkBaseInfo,UpDataStructsRmrkPartType,UpDataStructsRmrkTheme,UpDataStructsRmrkNftChild);0]',
/**
- * Lookup325: up_data_structs::TokenData<pallet_evm::account::BasicCrossAccountIdRepr<sp_core::crypto::AccountId32>>
+ * Lookup326: up_data_structs::TokenData<pallet_evm::account::BasicCrossAccountIdRepr<sp_core::crypto::AccountId32>>
**/
UpDataStructsTokenData: {
properties: 'Vec<UpDataStructsProperty>',
owner: 'Option<PalletEvmAccountBasicCrossAccountIdRepr>'
},
/**
- * Lookup327: up_data_structs::RpcCollection<sp_core::crypto::AccountId32>
+ * Lookup328: up_data_structs::RpcCollection<sp_core::crypto::AccountId32>
**/
UpDataStructsRpcCollection: {
owner: 'AccountId32',
@@ -2308,7 +2314,7 @@
properties: 'Vec<UpDataStructsProperty>'
},
/**
- * Lookup328: up_data_structs::rmrk::CollectionInfo<frame_support::storage::bounded_vec::BoundedVec<T, S>, frame_support::storage::bounded_vec::BoundedVec<T, S>, sp_core::crypto::AccountId32>
+ * Lookup329: up_data_structs::rmrk::CollectionInfo<frame_support::storage::bounded_vec::BoundedVec<T, S>, frame_support::storage::bounded_vec::BoundedVec<T, S>, sp_core::crypto::AccountId32>
**/
UpDataStructsRmrkCollectionInfo: {
issuer: 'AccountId32',
@@ -2318,7 +2324,7 @@
nftsCount: 'u32'
},
/**
- * Lookup331: up_data_structs::rmrk::NftInfo<sp_core::crypto::AccountId32, sp_arithmetic::per_things::Permill, frame_support::storage::bounded_vec::BoundedVec<T, S>>
+ * Lookup332: up_data_structs::rmrk::NftInfo<sp_core::crypto::AccountId32, sp_arithmetic::per_things::Permill, frame_support::storage::bounded_vec::BoundedVec<T, S>>
**/
UpDataStructsRmrkNftInfo: {
owner: 'UpDataStructsRmrkAccountIdOrCollectionNftTuple',
@@ -2328,7 +2334,7 @@
pending: 'bool'
},
/**
- * Lookup332: up_data_structs::rmrk::AccountIdOrCollectionNftTuple<sp_core::crypto::AccountId32>
+ * Lookup333: up_data_structs::rmrk::AccountIdOrCollectionNftTuple<sp_core::crypto::AccountId32>
**/
UpDataStructsRmrkAccountIdOrCollectionNftTuple: {
_enum: {
@@ -2337,14 +2343,14 @@
}
},
/**
- * Lookup334: up_data_structs::rmrk::RoyaltyInfo<sp_core::crypto::AccountId32, sp_arithmetic::per_things::Permill>
+ * Lookup335: up_data_structs::rmrk::RoyaltyInfo<sp_core::crypto::AccountId32, sp_arithmetic::per_things::Permill>
**/
UpDataStructsRmrkRoyaltyInfo: {
recipient: 'AccountId32',
amount: 'Permill'
},
/**
- * Lookup335: up_data_structs::rmrk::ResourceInfo<frame_support::storage::bounded_vec::BoundedVec<T, S>, frame_support::storage::bounded_vec::BoundedVec<T, S>, frame_support::storage::bounded_vec::BoundedVec<T, S>>
+ * Lookup336: up_data_structs::rmrk::ResourceInfo<frame_support::storage::bounded_vec::BoundedVec<T, S>, frame_support::storage::bounded_vec::BoundedVec<T, S>, frame_support::storage::bounded_vec::BoundedVec<T, S>>
**/
UpDataStructsRmrkResourceInfo: {
id: 'Bytes',
@@ -2353,7 +2359,7 @@
pendingRemoval: 'bool'
},
/**
- * Lookup338: up_data_structs::rmrk::ResourceTypes<frame_support::storage::bounded_vec::BoundedVec<T, S>, frame_support::storage::bounded_vec::BoundedVec<T, S>>
+ * Lookup339: up_data_structs::rmrk::ResourceTypes<frame_support::storage::bounded_vec::BoundedVec<T, S>, frame_support::storage::bounded_vec::BoundedVec<T, S>>
**/
UpDataStructsRmrkResourceTypes: {
_enum: {
@@ -2363,7 +2369,7 @@
}
},
/**
- * Lookup339: up_data_structs::rmrk::BasicResource<frame_support::storage::bounded_vec::BoundedVec<T, S>>
+ * Lookup340: up_data_structs::rmrk::BasicResource<frame_support::storage::bounded_vec::BoundedVec<T, S>>
**/
UpDataStructsRmrkBasicResource: {
src: 'Option<Bytes>',
@@ -2372,7 +2378,7 @@
thumb: 'Option<Bytes>'
},
/**
- * Lookup341: up_data_structs::rmrk::ComposableResource<frame_support::storage::bounded_vec::BoundedVec<T, S>, frame_support::storage::bounded_vec::BoundedVec<T, S>>
+ * Lookup342: up_data_structs::rmrk::ComposableResource<frame_support::storage::bounded_vec::BoundedVec<T, S>, frame_support::storage::bounded_vec::BoundedVec<T, S>>
**/
UpDataStructsRmrkComposableResource: {
parts: 'Vec<u32>',
@@ -2383,7 +2389,7 @@
thumb: 'Option<Bytes>'
},
/**
- * Lookup342: up_data_structs::rmrk::SlotResource<frame_support::storage::bounded_vec::BoundedVec<T, S>>
+ * Lookup343: up_data_structs::rmrk::SlotResource<frame_support::storage::bounded_vec::BoundedVec<T, S>>
**/
UpDataStructsRmrkSlotResource: {
base: 'u32',
@@ -2394,14 +2400,14 @@
thumb: 'Option<Bytes>'
},
/**
- * Lookup343: up_data_structs::rmrk::PropertyInfo<frame_support::storage::bounded_vec::BoundedVec<T, S>, frame_support::storage::bounded_vec::BoundedVec<T, S>>
+ * Lookup344: up_data_structs::rmrk::PropertyInfo<frame_support::storage::bounded_vec::BoundedVec<T, S>, frame_support::storage::bounded_vec::BoundedVec<T, S>>
**/
UpDataStructsRmrkPropertyInfo: {
key: 'Bytes',
value: 'Bytes'
},
/**
- * Lookup346: up_data_structs::rmrk::BaseInfo<sp_core::crypto::AccountId32, frame_support::storage::bounded_vec::BoundedVec<T, S>>
+ * Lookup347: up_data_structs::rmrk::BaseInfo<sp_core::crypto::AccountId32, frame_support::storage::bounded_vec::BoundedVec<T, S>>
**/
UpDataStructsRmrkBaseInfo: {
issuer: 'AccountId32',
@@ -2409,7 +2415,7 @@
symbol: 'Bytes'
},
/**
- * Lookup347: up_data_structs::rmrk::PartType<frame_support::storage::bounded_vec::BoundedVec<T, S>, frame_support::storage::bounded_vec::BoundedVec<T, S>>
+ * Lookup348: up_data_structs::rmrk::PartType<frame_support::storage::bounded_vec::BoundedVec<T, S>, frame_support::storage::bounded_vec::BoundedVec<T, S>>
**/
UpDataStructsRmrkPartType: {
_enum: {
@@ -2418,7 +2424,7 @@
}
},
/**
- * Lookup349: up_data_structs::rmrk::FixedPart<frame_support::storage::bounded_vec::BoundedVec<T, S>>
+ * Lookup350: up_data_structs::rmrk::FixedPart<frame_support::storage::bounded_vec::BoundedVec<T, S>>
**/
UpDataStructsRmrkFixedPart: {
id: 'u32',
@@ -2426,7 +2432,7 @@
src: 'Bytes'
},
/**
- * Lookup350: up_data_structs::rmrk::SlotPart<frame_support::storage::bounded_vec::BoundedVec<T, S>, frame_support::storage::bounded_vec::BoundedVec<T, S>>
+ * Lookup351: up_data_structs::rmrk::SlotPart<frame_support::storage::bounded_vec::BoundedVec<T, S>, frame_support::storage::bounded_vec::BoundedVec<T, S>>
**/
UpDataStructsRmrkSlotPart: {
id: 'u32',
@@ -2435,7 +2441,7 @@
z: 'u32'
},
/**
- * Lookup351: up_data_structs::rmrk::EquippableList<frame_support::storage::bounded_vec::BoundedVec<T, S>>
+ * Lookup352: up_data_structs::rmrk::EquippableList<frame_support::storage::bounded_vec::BoundedVec<T, S>>
**/
UpDataStructsRmrkEquippableList: {
_enum: {
@@ -2445,7 +2451,7 @@
}
},
/**
- * Lookup352: up_data_structs::rmrk::Theme<frame_support::storage::bounded_vec::BoundedVec<T, S>, PropertyList>
+ * Lookup353: up_data_structs::rmrk::Theme<frame_support::storage::bounded_vec::BoundedVec<T, S>, PropertyList>
**/
UpDataStructsRmrkTheme: {
name: 'Bytes',
@@ -2453,69 +2459,69 @@
inherit: 'bool'
},
/**
- * Lookup354: up_data_structs::rmrk::ThemeProperty<frame_support::storage::bounded_vec::BoundedVec<T, S>>
+ * Lookup355: up_data_structs::rmrk::ThemeProperty<frame_support::storage::bounded_vec::BoundedVec<T, S>>
**/
UpDataStructsRmrkThemeProperty: {
key: 'Bytes',
value: 'Bytes'
},
/**
- * Lookup355: up_data_structs::rmrk::NftChild
+ * Lookup356: up_data_structs::rmrk::NftChild
**/
UpDataStructsRmrkNftChild: {
collectionId: 'u32',
nftId: 'u32'
},
/**
- * Lookup357: pallet_common::pallet::Error<T>
+ * Lookup358: pallet_common::pallet::Error<T>
**/
PalletCommonError: {
_enum: ['CollectionNotFound', 'MustBeTokenOwner', 'NoPermission', 'CantDestroyNotEmptyCollection', 'PublicMintingNotAllowed', 'AddressNotInAllowlist', 'CollectionNameLimitExceeded', 'CollectionDescriptionLimitExceeded', 'CollectionTokenPrefixLimitExceeded', 'TotalCollectionsLimitExceeded', 'CollectionAdminCountExceeded', 'CollectionLimitBoundsExceeded', 'OwnerPermissionsCantBeReverted', 'TransferNotAllowed', 'AccountTokenLimitExceeded', 'CollectionTokenLimitExceeded', 'MetadataFlagFrozen', 'TokenNotFound', 'TokenValueTooLow', 'ApprovedValueTooLow', 'CantApproveMoreThanOwned', 'AddressIsZero', 'UnsupportedOperation', 'NotSufficientFounds', 'NestingIsDisabled', 'OnlyOwnerAllowedToNest', 'SourceCollectionIsNotAllowedToNest', 'CollectionFieldSizeExceeded', 'NoSpaceForProperty', 'PropertyLimitReached', 'PropertyKeyIsTooLong', 'InvalidCharacterInPropertyKey', 'EmptyPropertyKey']
},
/**
- * Lookup359: pallet_fungible::pallet::Error<T>
+ * Lookup360: pallet_fungible::pallet::Error<T>
**/
PalletFungibleError: {
_enum: ['NotFungibleDataUsedToMintFungibleCollectionToken', 'FungibleItemsHaveNoId', 'FungibleItemsDontHaveData', 'FungibleDisallowsNesting', 'SettingPropertiesNotAllowed']
},
/**
- * Lookup360: pallet_refungible::ItemData
+ * Lookup361: pallet_refungible::ItemData
**/
PalletRefungibleItemData: {
constData: 'Bytes'
},
/**
- * Lookup364: pallet_refungible::pallet::Error<T>
+ * Lookup365: pallet_refungible::pallet::Error<T>
**/
PalletRefungibleError: {
_enum: ['NotRefungibleDataUsedToMintFungibleCollectionToken', 'WrongRefungiblePieces', 'RefungibleDisallowsNesting', 'SettingPropertiesNotAllowed']
},
/**
- * Lookup365: pallet_nonfungible::ItemData<pallet_evm::account::BasicCrossAccountIdRepr<sp_core::crypto::AccountId32>>
+ * Lookup366: pallet_nonfungible::ItemData<pallet_evm::account::BasicCrossAccountIdRepr<sp_core::crypto::AccountId32>>
**/
PalletNonfungibleItemData: {
owner: 'PalletEvmAccountBasicCrossAccountIdRepr'
},
/**
- * Lookup367: pallet_nonfungible::pallet::Error<T>
+ * Lookup368: pallet_nonfungible::pallet::Error<T>
**/
PalletNonfungibleError: {
_enum: ['NotNonfungibleDataUsedToMintFungibleCollectionToken', 'NonfungibleItemsHaveNoAmount', 'CantBurnNftWithChildren']
},
/**
- * Lookup368: pallet_structure::pallet::Error<T>
+ * Lookup369: pallet_structure::pallet::Error<T>
**/
PalletStructureError: {
_enum: ['OuroborosDetected', 'DepthLimit', 'TokenNotFound']
},
/**
- * Lookup371: pallet_evm::pallet::Error<T>
+ * Lookup372: pallet_evm::pallet::Error<T>
**/
PalletEvmError: {
_enum: ['BalanceLow', 'FeeOverflow', 'PaymentOverflow', 'WithdrawFailed', 'GasPriceTooLow', 'InvalidNonce']
},
/**
- * Lookup374: fp_rpc::TransactionStatus
+ * Lookup375: fp_rpc::TransactionStatus
**/
FpRpcTransactionStatus: {
transactionHash: 'H256',
@@ -2527,11 +2533,11 @@
logsBloom: 'EthbloomBloom'
},
/**
- * Lookup376: ethbloom::Bloom
+ * Lookup377: ethbloom::Bloom
**/
EthbloomBloom: '[u8;256]',
/**
- * Lookup378: ethereum::receipt::ReceiptV3
+ * Lookup379: ethereum::receipt::ReceiptV3
**/
EthereumReceiptReceiptV3: {
_enum: {
@@ -2541,7 +2547,7 @@
}
},
/**
- * Lookup379: ethereum::receipt::EIP658ReceiptData
+ * Lookup380: ethereum::receipt::EIP658ReceiptData
**/
EthereumReceiptEip658ReceiptData: {
statusCode: 'u8',
@@ -2550,7 +2556,7 @@
logs: 'Vec<EthereumLog>'
},
/**
- * Lookup380: ethereum::block::Block<ethereum::transaction::TransactionV2>
+ * Lookup381: ethereum::block::Block<ethereum::transaction::TransactionV2>
**/
EthereumBlock: {
header: 'EthereumHeader',
@@ -2558,7 +2564,7 @@
ommers: 'Vec<EthereumHeader>'
},
/**
- * Lookup381: ethereum::header::Header
+ * Lookup382: ethereum::header::Header
**/
EthereumHeader: {
parentHash: 'H256',
@@ -2578,41 +2584,41 @@
nonce: 'EthereumTypesHashH64'
},
/**
- * Lookup382: ethereum_types::hash::H64
+ * Lookup383: ethereum_types::hash::H64
**/
EthereumTypesHashH64: '[u8;8]',
/**
- * Lookup387: pallet_ethereum::pallet::Error<T>
+ * Lookup388: pallet_ethereum::pallet::Error<T>
**/
PalletEthereumError: {
_enum: ['InvalidSignature', 'PreLogExists']
},
/**
- * Lookup388: pallet_evm_coder_substrate::pallet::Error<T>
+ * Lookup389: pallet_evm_coder_substrate::pallet::Error<T>
**/
PalletEvmCoderSubstrateError: {
_enum: ['OutOfGas', 'OutOfFund']
},
/**
- * Lookup389: pallet_evm_contract_helpers::SponsoringModeT
+ * Lookup390: pallet_evm_contract_helpers::SponsoringModeT
**/
PalletEvmContractHelpersSponsoringModeT: {
_enum: ['Disabled', 'Allowlisted', 'Generous']
},
/**
- * Lookup391: pallet_evm_contract_helpers::pallet::Error<T>
+ * Lookup392: pallet_evm_contract_helpers::pallet::Error<T>
**/
PalletEvmContractHelpersError: {
_enum: ['NoPermission']
},
/**
- * Lookup392: pallet_evm_migration::pallet::Error<T>
+ * Lookup393: pallet_evm_migration::pallet::Error<T>
**/
PalletEvmMigrationError: {
_enum: ['AccountNotEmpty', 'AccountIsNotMigrating']
},
/**
- * Lookup394: sp_runtime::MultiSignature
+ * Lookup395: sp_runtime::MultiSignature
**/
SpRuntimeMultiSignature: {
_enum: {
@@ -2622,43 +2628,43 @@
}
},
/**
- * Lookup395: sp_core::ed25519::Signature
+ * Lookup396: sp_core::ed25519::Signature
**/
SpCoreEd25519Signature: '[u8;64]',
/**
- * Lookup397: sp_core::sr25519::Signature
+ * Lookup398: sp_core::sr25519::Signature
**/
SpCoreSr25519Signature: '[u8;64]',
/**
- * Lookup398: sp_core::ecdsa::Signature
+ * Lookup399: sp_core::ecdsa::Signature
**/
SpCoreEcdsaSignature: '[u8;65]',
/**
- * Lookup401: frame_system::extensions::check_spec_version::CheckSpecVersion<T>
+ * Lookup402: frame_system::extensions::check_spec_version::CheckSpecVersion<T>
**/
FrameSystemExtensionsCheckSpecVersion: 'Null',
/**
- * Lookup402: frame_system::extensions::check_genesis::CheckGenesis<T>
+ * Lookup403: frame_system::extensions::check_genesis::CheckGenesis<T>
**/
FrameSystemExtensionsCheckGenesis: 'Null',
/**
- * Lookup405: frame_system::extensions::check_nonce::CheckNonce<T>
+ * Lookup406: frame_system::extensions::check_nonce::CheckNonce<T>
**/
FrameSystemExtensionsCheckNonce: 'Compact<u32>',
/**
- * Lookup406: frame_system::extensions::check_weight::CheckWeight<T>
+ * Lookup407: frame_system::extensions::check_weight::CheckWeight<T>
**/
FrameSystemExtensionsCheckWeight: 'Null',
/**
- * Lookup407: pallet_template_transaction_payment::ChargeTransactionPayment<opal_runtime::Runtime>
+ * Lookup408: pallet_template_transaction_payment::ChargeTransactionPayment<opal_runtime::Runtime>
**/
PalletTemplateTransactionPaymentChargeTransactionPayment: 'Compact<u128>',
/**
- * Lookup408: opal_runtime::Runtime
+ * Lookup409: opal_runtime::Runtime
**/
OpalRuntimeRuntime: 'Null',
/**
- * Lookup409: pallet_ethereum::FakeTransactionFinalizer<opal_runtime::Runtime>
+ * Lookup410: pallet_ethereum::FakeTransactionFinalizer<opal_runtime::Runtime>
**/
PalletEthereumFakeTransactionFinalizer: 'Null'
};
tests/src/interfaces/registry.tsdiffbeforeafterboth--- a/tests/src/interfaces/registry.ts
+++ b/tests/src/interfaces/registry.ts
@@ -1,7 +1,7 @@
// Auto-generated via `yarn polkadot-types-from-defs`, do not edit
/* eslint-disable */
-import type { CumulusPalletDmpQueueCall, CumulusPalletDmpQueueConfigData, CumulusPalletDmpQueueError, CumulusPalletDmpQueueEvent, CumulusPalletDmpQueuePageIndexData, CumulusPalletParachainSystemCall, CumulusPalletParachainSystemError, CumulusPalletParachainSystemEvent, CumulusPalletParachainSystemRelayStateSnapshotMessagingStateSnapshot, CumulusPalletXcmCall, CumulusPalletXcmError, CumulusPalletXcmEvent, CumulusPalletXcmpQueueCall, CumulusPalletXcmpQueueError, CumulusPalletXcmpQueueEvent, CumulusPalletXcmpQueueInboundChannelDetails, CumulusPalletXcmpQueueInboundState, CumulusPalletXcmpQueueOutboundChannelDetails, CumulusPalletXcmpQueueOutboundState, CumulusPalletXcmpQueueQueueConfigData, CumulusPrimitivesParachainInherentParachainInherentData, EthbloomBloom, EthereumBlock, EthereumHeader, EthereumLog, EthereumReceiptEip658ReceiptData, EthereumReceiptReceiptV3, EthereumTransactionAccessListItem, EthereumTransactionEip1559Transaction, EthereumTransactionEip2930Transaction, EthereumTransactionLegacyTransaction, EthereumTransactionTransactionAction, EthereumTransactionTransactionSignature, EthereumTransactionTransactionV2, EthereumTypesHashH64, EvmCoreErrorExitError, EvmCoreErrorExitFatal, EvmCoreErrorExitReason, EvmCoreErrorExitRevert, EvmCoreErrorExitSucceed, FpRpcTransactionStatus, FrameSupportPalletId, FrameSupportTokensMiscBalanceStatus, FrameSupportWeightsDispatchClass, FrameSupportWeightsDispatchInfo, FrameSupportWeightsPays, FrameSupportWeightsPerDispatchClassU32, FrameSupportWeightsPerDispatchClassU64, FrameSupportWeightsPerDispatchClassWeightsPerClass, FrameSupportWeightsRuntimeDbWeight, FrameSupportWeightsWeightToFeeCoefficient, FrameSystemAccountInfo, FrameSystemCall, FrameSystemError, FrameSystemEvent, FrameSystemEventRecord, FrameSystemExtensionsCheckGenesis, FrameSystemExtensionsCheckNonce, FrameSystemExtensionsCheckSpecVersion, FrameSystemExtensionsCheckWeight, FrameSystemLastRuntimeUpgradeInfo, FrameSystemLimitsBlockLength, FrameSystemLimitsBlockWeights, FrameSystemLimitsWeightsPerClass, FrameSystemPhase, OpalRuntimeRuntime, OrmlVestingModuleCall, OrmlVestingModuleError, OrmlVestingModuleEvent, OrmlVestingVestingSchedule, PalletBalancesAccountData, PalletBalancesBalanceLock, PalletBalancesCall, PalletBalancesError, PalletBalancesEvent, PalletBalancesReasons, PalletBalancesReleases, PalletBalancesReserveData, PalletCommonError, PalletCommonEvent, PalletEthereumCall, PalletEthereumError, PalletEthereumEvent, PalletEthereumFakeTransactionFinalizer, PalletEvmAccountBasicCrossAccountIdRepr, PalletEvmCall, PalletEvmCoderSubstrateError, PalletEvmContractHelpersError, PalletEvmContractHelpersSponsoringModeT, PalletEvmError, PalletEvmEvent, PalletEvmMigrationCall, PalletEvmMigrationError, PalletFungibleError, PalletInflationCall, PalletNonfungibleError, PalletNonfungibleItemData, PalletRefungibleError, PalletRefungibleItemData, PalletStructureCall, PalletStructureError, PalletStructureEvent, PalletSudoCall, PalletSudoError, PalletSudoEvent, PalletTemplateTransactionPaymentCall, PalletTemplateTransactionPaymentChargeTransactionPayment, PalletTimestampCall, PalletTransactionPaymentReleases, PalletTreasuryCall, PalletTreasuryError, PalletTreasuryEvent, PalletTreasuryProposal, PalletUniqueCall, PalletUniqueError, PalletUniqueRawEvent, PalletXcmCall, PalletXcmError, PalletXcmEvent, PhantomTypeUpDataStructs, PolkadotCorePrimitivesInboundDownwardMessage, PolkadotCorePrimitivesInboundHrmpMessage, PolkadotCorePrimitivesOutboundHrmpMessage, PolkadotParachainPrimitivesXcmpMessageFormat, PolkadotPrimitivesV2AbridgedHostConfiguration, PolkadotPrimitivesV2AbridgedHrmpChannel, PolkadotPrimitivesV2PersistedValidationData, PolkadotPrimitivesV2UpgradeRestriction, SpCoreEcdsaSignature, SpCoreEd25519Signature, SpCoreSr25519Signature, SpRuntimeArithmeticError, SpRuntimeDigest, SpRuntimeDigestDigestItem, SpRuntimeDispatchError, SpRuntimeModuleError, SpRuntimeMultiSignature, SpRuntimeTokenError, SpRuntimeTransactionalError, SpTrieStorageProof, SpVersionRuntimeVersion, UpDataStructsAccessMode, UpDataStructsCollection, UpDataStructsCollectionLimits, UpDataStructsCollectionMode, UpDataStructsCollectionPermissions, UpDataStructsCollectionStats, UpDataStructsCreateCollectionData, UpDataStructsCreateFungibleData, UpDataStructsCreateItemData, UpDataStructsCreateItemExData, UpDataStructsCreateNftData, UpDataStructsCreateNftExData, UpDataStructsCreateReFungibleData, UpDataStructsCreateRefungibleExData, UpDataStructsNestingRule, UpDataStructsProperties, UpDataStructsPropertiesMapBoundedVec, UpDataStructsPropertiesMapPropertyPermission, UpDataStructsProperty, UpDataStructsPropertyKeyPermission, UpDataStructsPropertyPermission, UpDataStructsRmrkAccountIdOrCollectionNftTuple, UpDataStructsRmrkBaseInfo, UpDataStructsRmrkBasicResource, UpDataStructsRmrkCollectionInfo, UpDataStructsRmrkComposableResource, UpDataStructsRmrkEquippableList, UpDataStructsRmrkFixedPart, UpDataStructsRmrkNftChild, UpDataStructsRmrkNftInfo, UpDataStructsRmrkPartType, UpDataStructsRmrkPropertyInfo, UpDataStructsRmrkResourceInfo, UpDataStructsRmrkResourceTypes, UpDataStructsRmrkRoyaltyInfo, UpDataStructsRmrkSlotPart, UpDataStructsRmrkSlotResource, UpDataStructsRmrkTheme, UpDataStructsRmrkThemeProperty, UpDataStructsRpcCollection, UpDataStructsSponsoringRateLimit, UpDataStructsSponsorshipState, UpDataStructsTokenData, XcmDoubleEncoded, XcmV0Junction, XcmV0JunctionBodyId, XcmV0JunctionBodyPart, XcmV0JunctionNetworkId, XcmV0MultiAsset, XcmV0MultiLocation, XcmV0Order, XcmV0OriginKind, XcmV0Response, XcmV0Xcm, XcmV1Junction, XcmV1MultiAsset, XcmV1MultiLocation, XcmV1MultiassetAssetId, XcmV1MultiassetAssetInstance, XcmV1MultiassetFungibility, XcmV1MultiassetMultiAssetFilter, XcmV1MultiassetMultiAssets, XcmV1MultiassetWildFungibility, XcmV1MultiassetWildMultiAsset, XcmV1MultilocationJunctions, XcmV1Order, XcmV1Response, XcmV1Xcm, XcmV2Instruction, XcmV2Response, XcmV2TraitsError, XcmV2TraitsOutcome, XcmV2WeightLimit, XcmV2Xcm, XcmVersionedMultiAssets, XcmVersionedMultiLocation, XcmVersionedXcm } from '@polkadot/types/lookup';
+import type { CumulusPalletDmpQueueCall, CumulusPalletDmpQueueConfigData, CumulusPalletDmpQueueError, CumulusPalletDmpQueueEvent, CumulusPalletDmpQueuePageIndexData, CumulusPalletParachainSystemCall, CumulusPalletParachainSystemError, CumulusPalletParachainSystemEvent, CumulusPalletParachainSystemRelayStateSnapshotMessagingStateSnapshot, CumulusPalletXcmCall, CumulusPalletXcmError, CumulusPalletXcmEvent, CumulusPalletXcmpQueueCall, CumulusPalletXcmpQueueError, CumulusPalletXcmpQueueEvent, CumulusPalletXcmpQueueInboundChannelDetails, CumulusPalletXcmpQueueInboundState, CumulusPalletXcmpQueueOutboundChannelDetails, CumulusPalletXcmpQueueOutboundState, CumulusPalletXcmpQueueQueueConfigData, CumulusPrimitivesParachainInherentParachainInherentData, EthbloomBloom, EthereumBlock, EthereumHeader, EthereumLog, EthereumReceiptEip658ReceiptData, EthereumReceiptReceiptV3, EthereumTransactionAccessListItem, EthereumTransactionEip1559Transaction, EthereumTransactionEip2930Transaction, EthereumTransactionLegacyTransaction, EthereumTransactionTransactionAction, EthereumTransactionTransactionSignature, EthereumTransactionTransactionV2, EthereumTypesHashH64, EvmCoreErrorExitError, EvmCoreErrorExitFatal, EvmCoreErrorExitReason, EvmCoreErrorExitRevert, EvmCoreErrorExitSucceed, FpRpcTransactionStatus, FrameSupportPalletId, FrameSupportTokensMiscBalanceStatus, FrameSupportWeightsDispatchClass, FrameSupportWeightsDispatchInfo, FrameSupportWeightsPays, FrameSupportWeightsPerDispatchClassU32, FrameSupportWeightsPerDispatchClassU64, FrameSupportWeightsPerDispatchClassWeightsPerClass, FrameSupportWeightsRuntimeDbWeight, FrameSupportWeightsWeightToFeeCoefficient, FrameSystemAccountInfo, FrameSystemCall, FrameSystemError, FrameSystemEvent, FrameSystemEventRecord, FrameSystemExtensionsCheckGenesis, FrameSystemExtensionsCheckNonce, FrameSystemExtensionsCheckSpecVersion, FrameSystemExtensionsCheckWeight, FrameSystemLastRuntimeUpgradeInfo, FrameSystemLimitsBlockLength, FrameSystemLimitsBlockWeights, FrameSystemLimitsWeightsPerClass, FrameSystemPhase, OpalRuntimeRuntime, OrmlVestingModuleCall, OrmlVestingModuleError, OrmlVestingModuleEvent, OrmlVestingVestingSchedule, PalletBalancesAccountData, PalletBalancesBalanceLock, PalletBalancesCall, PalletBalancesError, PalletBalancesEvent, PalletBalancesReasons, PalletBalancesReleases, PalletBalancesReserveData, PalletCommonError, PalletCommonEvent, PalletEthereumCall, PalletEthereumError, PalletEthereumEvent, PalletEthereumFakeTransactionFinalizer, PalletEvmAccountBasicCrossAccountIdRepr, PalletEvmCall, PalletEvmCoderSubstrateError, PalletEvmContractHelpersError, PalletEvmContractHelpersSponsoringModeT, PalletEvmError, PalletEvmEvent, PalletEvmMigrationCall, PalletEvmMigrationError, PalletFungibleError, PalletInflationCall, PalletNonfungibleError, PalletNonfungibleItemData, PalletRefungibleError, PalletRefungibleItemData, PalletStructureCall, PalletStructureError, PalletStructureEvent, PalletSudoCall, PalletSudoError, PalletSudoEvent, PalletTemplateTransactionPaymentCall, PalletTemplateTransactionPaymentChargeTransactionPayment, PalletTimestampCall, PalletTransactionPaymentReleases, PalletTreasuryCall, PalletTreasuryError, PalletTreasuryEvent, PalletTreasuryProposal, PalletUniqueCall, PalletUniqueError, PalletUniqueRawEvent, PalletXcmCall, PalletXcmError, PalletXcmEvent, PhantomTypeUpDataStructs, PolkadotCorePrimitivesInboundDownwardMessage, PolkadotCorePrimitivesInboundHrmpMessage, PolkadotCorePrimitivesOutboundHrmpMessage, PolkadotParachainPrimitivesXcmpMessageFormat, PolkadotPrimitivesV2AbridgedHostConfiguration, PolkadotPrimitivesV2AbridgedHrmpChannel, PolkadotPrimitivesV2PersistedValidationData, PolkadotPrimitivesV2UpgradeRestriction, SpCoreEcdsaSignature, SpCoreEd25519Signature, SpCoreSr25519Signature, SpRuntimeArithmeticError, SpRuntimeDigest, SpRuntimeDigestDigestItem, SpRuntimeDispatchError, SpRuntimeModuleError, SpRuntimeMultiSignature, SpRuntimeTokenError, SpRuntimeTransactionalError, SpTrieStorageProof, SpVersionRuntimeVersion, UpDataStructsAccessMode, UpDataStructsCollection, UpDataStructsCollectionLimits, UpDataStructsCollectionMode, UpDataStructsCollectionPermissions, UpDataStructsCollectionStats, UpDataStructsCreateCollectionData, UpDataStructsCreateFungibleData, UpDataStructsCreateItemData, UpDataStructsCreateItemExData, UpDataStructsCreateNftData, UpDataStructsCreateNftExData, UpDataStructsCreateReFungibleData, UpDataStructsCreateRefungibleExData, UpDataStructsNestingRule, UpDataStructsProperties, UpDataStructsPropertiesMapBoundedVec, UpDataStructsPropertiesMapPropertyPermission, UpDataStructsProperty, UpDataStructsPropertyKeyPermission, UpDataStructsPropertyPermission, UpDataStructsRmrkAccountIdOrCollectionNftTuple, UpDataStructsRmrkBaseInfo, UpDataStructsRmrkBasicResource, UpDataStructsRmrkCollectionInfo, UpDataStructsRmrkComposableResource, UpDataStructsRmrkEquippableList, UpDataStructsRmrkFixedPart, UpDataStructsRmrkNftChild, UpDataStructsRmrkNftInfo, UpDataStructsRmrkPartType, UpDataStructsRmrkPropertyInfo, UpDataStructsRmrkResourceInfo, UpDataStructsRmrkResourceTypes, UpDataStructsRmrkRoyaltyInfo, UpDataStructsRmrkSlotPart, UpDataStructsRmrkSlotResource, UpDataStructsRmrkTheme, UpDataStructsRmrkThemeProperty, UpDataStructsRpcCollection, UpDataStructsSponsoringRateLimit, UpDataStructsSponsorshipState, UpDataStructsTokenChild, UpDataStructsTokenData, XcmDoubleEncoded, XcmV0Junction, XcmV0JunctionBodyId, XcmV0JunctionBodyPart, XcmV0JunctionNetworkId, XcmV0MultiAsset, XcmV0MultiLocation, XcmV0Order, XcmV0OriginKind, XcmV0Response, XcmV0Xcm, XcmV1Junction, XcmV1MultiAsset, XcmV1MultiLocation, XcmV1MultiassetAssetId, XcmV1MultiassetAssetInstance, XcmV1MultiassetFungibility, XcmV1MultiassetMultiAssetFilter, XcmV1MultiassetMultiAssets, XcmV1MultiassetWildFungibility, XcmV1MultiassetWildMultiAsset, XcmV1MultilocationJunctions, XcmV1Order, XcmV1Response, XcmV1Xcm, XcmV2Instruction, XcmV2Response, XcmV2TraitsError, XcmV2TraitsOutcome, XcmV2WeightLimit, XcmV2Xcm, XcmVersionedMultiAssets, XcmVersionedMultiLocation, XcmVersionedXcm } from '@polkadot/types/lookup';
declare module '@polkadot/types/types/registry' {
export interface InterfaceTypes {
@@ -188,6 +188,7 @@
UpDataStructsRpcCollection: UpDataStructsRpcCollection;
UpDataStructsSponsoringRateLimit: UpDataStructsSponsoringRateLimit;
UpDataStructsSponsorshipState: UpDataStructsSponsorshipState;
+ UpDataStructsTokenChild: UpDataStructsTokenChild;
UpDataStructsTokenData: UpDataStructsTokenData;
XcmDoubleEncoded: XcmDoubleEncoded;
XcmV0Junction: XcmV0Junction;
tests/src/interfaces/types-lookup.tsdiffbeforeafterboth--- a/tests/src/interfaces/types-lookup.ts
+++ b/tests/src/interfaces/types-lookup.ts
@@ -1604,16 +1604,15 @@
/** @name UpDataStructsCreateNftData (186) */
export interface UpDataStructsCreateNftData extends Struct {
- readonly constData: Bytes;
readonly properties: Vec<UpDataStructsProperty>;
}
- /** @name UpDataStructsCreateFungibleData (188) */
+ /** @name UpDataStructsCreateFungibleData (187) */
export interface UpDataStructsCreateFungibleData extends Struct {
readonly value: u128;
}
- /** @name UpDataStructsCreateReFungibleData (189) */
+ /** @name UpDataStructsCreateReFungibleData (188) */
export interface UpDataStructsCreateReFungibleData extends Struct {
readonly constData: Bytes;
readonly pieces: u128;
@@ -2469,16 +2468,22 @@
readonly alive: u32;
}
- /** @name PhantomTypeUpDataStructs (323) */
- export interface PhantomTypeUpDataStructs extends Vec<ITuple<[UpDataStructsTokenData, UpDataStructsRpcCollection, PalletEvmAccountBasicCrossAccountIdRepr, UpDataStructsRmrkCollectionInfo, UpDataStructsRmrkNftInfo, UpDataStructsRmrkResourceInfo, UpDataStructsRmrkPropertyInfo, UpDataStructsRmrkBaseInfo, UpDataStructsRmrkPartType, UpDataStructsRmrkTheme, UpDataStructsRmrkNftChild]>> {}
+ /** @name UpDataStructsTokenChild (323) */
+ export interface UpDataStructsTokenChild extends Struct {
+ readonly token: u32;
+ readonly collection: u32;
+ }
+
+ /** @name PhantomTypeUpDataStructs (324) */
+ export interface PhantomTypeUpDataStructs extends Vec<ITuple<[UpDataStructsTokenData, UpDataStructsRpcCollection, UpDataStructsRmrkCollectionInfo, UpDataStructsRmrkNftInfo, UpDataStructsRmrkResourceInfo, UpDataStructsRmrkPropertyInfo, UpDataStructsRmrkBaseInfo, UpDataStructsRmrkPartType, UpDataStructsRmrkTheme, UpDataStructsRmrkNftChild]>> {}
- /** @name UpDataStructsTokenData (325) */
+ /** @name UpDataStructsTokenData (326) */
export interface UpDataStructsTokenData extends Struct {
readonly properties: Vec<UpDataStructsProperty>;
readonly owner: Option<PalletEvmAccountBasicCrossAccountIdRepr>;
}
- /** @name UpDataStructsRpcCollection (327) */
+ /** @name UpDataStructsRpcCollection (328) */
export interface UpDataStructsRpcCollection extends Struct {
readonly owner: AccountId32;
readonly mode: UpDataStructsCollectionMode;
@@ -2492,7 +2497,7 @@
readonly properties: Vec<UpDataStructsProperty>;
}
- /** @name UpDataStructsRmrkCollectionInfo (328) */
+ /** @name UpDataStructsRmrkCollectionInfo (329) */
export interface UpDataStructsRmrkCollectionInfo extends Struct {
readonly issuer: AccountId32;
readonly metadata: Bytes;
@@ -2501,7 +2506,7 @@
readonly nftsCount: u32;
}
- /** @name UpDataStructsRmrkNftInfo (331) */
+ /** @name UpDataStructsRmrkNftInfo (332) */
export interface UpDataStructsRmrkNftInfo extends Struct {
readonly owner: UpDataStructsRmrkAccountIdOrCollectionNftTuple;
readonly royalty: Option<UpDataStructsRmrkRoyaltyInfo>;
@@ -2510,7 +2515,7 @@
readonly pending: bool;
}
- /** @name UpDataStructsRmrkAccountIdOrCollectionNftTuple (332) */
+ /** @name UpDataStructsRmrkAccountIdOrCollectionNftTuple (333) */
export interface UpDataStructsRmrkAccountIdOrCollectionNftTuple extends Enum {
readonly isAccountId: boolean;
readonly asAccountId: AccountId32;
@@ -2519,13 +2524,13 @@
readonly type: 'AccountId' | 'CollectionAndNftTuple';
}
- /** @name UpDataStructsRmrkRoyaltyInfo (334) */
+ /** @name UpDataStructsRmrkRoyaltyInfo (335) */
export interface UpDataStructsRmrkRoyaltyInfo extends Struct {
readonly recipient: AccountId32;
readonly amount: Permill;
}
- /** @name UpDataStructsRmrkResourceInfo (335) */
+ /** @name UpDataStructsRmrkResourceInfo (336) */
export interface UpDataStructsRmrkResourceInfo extends Struct {
readonly id: Bytes;
readonly resource: UpDataStructsRmrkResourceTypes;
@@ -2533,7 +2538,7 @@
readonly pendingRemoval: bool;
}
- /** @name UpDataStructsRmrkResourceTypes (338) */
+ /** @name UpDataStructsRmrkResourceTypes (339) */
export interface UpDataStructsRmrkResourceTypes extends Enum {
readonly isBasic: boolean;
readonly asBasic: UpDataStructsRmrkBasicResource;
@@ -2544,7 +2549,7 @@
readonly type: 'Basic' | 'Composable' | 'Slot';
}
- /** @name UpDataStructsRmrkBasicResource (339) */
+ /** @name UpDataStructsRmrkBasicResource (340) */
export interface UpDataStructsRmrkBasicResource extends Struct {
readonly src: Option<Bytes>;
readonly metadata: Option<Bytes>;
@@ -2552,7 +2557,7 @@
readonly thumb: Option<Bytes>;
}
- /** @name UpDataStructsRmrkComposableResource (341) */
+ /** @name UpDataStructsRmrkComposableResource (342) */
export interface UpDataStructsRmrkComposableResource extends Struct {
readonly parts: Vec<u32>;
readonly base: u32;
@@ -2562,7 +2567,7 @@
readonly thumb: Option<Bytes>;
}
- /** @name UpDataStructsRmrkSlotResource (342) */
+ /** @name UpDataStructsRmrkSlotResource (343) */
export interface UpDataStructsRmrkSlotResource extends Struct {
readonly base: u32;
readonly src: Option<Bytes>;
@@ -2572,20 +2577,20 @@
readonly thumb: Option<Bytes>;
}
- /** @name UpDataStructsRmrkPropertyInfo (343) */
+ /** @name UpDataStructsRmrkPropertyInfo (344) */
export interface UpDataStructsRmrkPropertyInfo extends Struct {
readonly key: Bytes;
readonly value: Bytes;
}
- /** @name UpDataStructsRmrkBaseInfo (346) */
+ /** @name UpDataStructsRmrkBaseInfo (347) */
export interface UpDataStructsRmrkBaseInfo extends Struct {
readonly issuer: AccountId32;
readonly baseType: Bytes;
readonly symbol: Bytes;
}
- /** @name UpDataStructsRmrkPartType (347) */
+ /** @name UpDataStructsRmrkPartType (348) */
export interface UpDataStructsRmrkPartType extends Enum {
readonly isFixedPart: boolean;
readonly asFixedPart: UpDataStructsRmrkFixedPart;
@@ -2594,14 +2599,14 @@
readonly type: 'FixedPart' | 'SlotPart';
}
- /** @name UpDataStructsRmrkFixedPart (349) */
+ /** @name UpDataStructsRmrkFixedPart (350) */
export interface UpDataStructsRmrkFixedPart extends Struct {
readonly id: u32;
readonly z: u32;
readonly src: Bytes;
}
- /** @name UpDataStructsRmrkSlotPart (350) */
+ /** @name UpDataStructsRmrkSlotPart (351) */
export interface UpDataStructsRmrkSlotPart extends Struct {
readonly id: u32;
readonly equippable: UpDataStructsRmrkEquippableList;
@@ -2609,7 +2614,7 @@
readonly z: u32;
}
- /** @name UpDataStructsRmrkEquippableList (351) */
+ /** @name UpDataStructsRmrkEquippableList (352) */
export interface UpDataStructsRmrkEquippableList extends Enum {
readonly isAll: boolean;
readonly isEmpty: boolean;
@@ -2618,26 +2623,26 @@
readonly type: 'All' | 'Empty' | 'Custom';
}
- /** @name UpDataStructsRmrkTheme (352) */
+ /** @name UpDataStructsRmrkTheme (353) */
export interface UpDataStructsRmrkTheme extends Struct {
readonly name: Bytes;
readonly properties: Vec<UpDataStructsRmrkThemeProperty>;
readonly inherit: bool;
}
- /** @name UpDataStructsRmrkThemeProperty (354) */
+ /** @name UpDataStructsRmrkThemeProperty (355) */
export interface UpDataStructsRmrkThemeProperty extends Struct {
readonly key: Bytes;
readonly value: Bytes;
}
- /** @name UpDataStructsRmrkNftChild (355) */
+ /** @name UpDataStructsRmrkNftChild (356) */
export interface UpDataStructsRmrkNftChild extends Struct {
readonly collectionId: u32;
readonly nftId: u32;
}
- /** @name PalletCommonError (357) */
+ /** @name PalletCommonError (358) */
export interface PalletCommonError extends Enum {
readonly isCollectionNotFound: boolean;
readonly isMustBeTokenOwner: boolean;
@@ -2675,7 +2680,7 @@
readonly type: 'CollectionNotFound' | 'MustBeTokenOwner' | 'NoPermission' | 'CantDestroyNotEmptyCollection' | 'PublicMintingNotAllowed' | 'AddressNotInAllowlist' | 'CollectionNameLimitExceeded' | 'CollectionDescriptionLimitExceeded' | 'CollectionTokenPrefixLimitExceeded' | 'TotalCollectionsLimitExceeded' | 'CollectionAdminCountExceeded' | 'CollectionLimitBoundsExceeded' | 'OwnerPermissionsCantBeReverted' | 'TransferNotAllowed' | 'AccountTokenLimitExceeded' | 'CollectionTokenLimitExceeded' | 'MetadataFlagFrozen' | 'TokenNotFound' | 'TokenValueTooLow' | 'ApprovedValueTooLow' | 'CantApproveMoreThanOwned' | 'AddressIsZero' | 'UnsupportedOperation' | 'NotSufficientFounds' | 'NestingIsDisabled' | 'OnlyOwnerAllowedToNest' | 'SourceCollectionIsNotAllowedToNest' | 'CollectionFieldSizeExceeded' | 'NoSpaceForProperty' | 'PropertyLimitReached' | 'PropertyKeyIsTooLong' | 'InvalidCharacterInPropertyKey' | 'EmptyPropertyKey';
}
- /** @name PalletFungibleError (359) */
+ /** @name PalletFungibleError (360) */
export interface PalletFungibleError extends Enum {
readonly isNotFungibleDataUsedToMintFungibleCollectionToken: boolean;
readonly isFungibleItemsHaveNoId: boolean;
@@ -2685,12 +2690,12 @@
readonly type: 'NotFungibleDataUsedToMintFungibleCollectionToken' | 'FungibleItemsHaveNoId' | 'FungibleItemsDontHaveData' | 'FungibleDisallowsNesting' | 'SettingPropertiesNotAllowed';
}
- /** @name PalletRefungibleItemData (360) */
+ /** @name PalletRefungibleItemData (361) */
export interface PalletRefungibleItemData extends Struct {
readonly constData: Bytes;
}
- /** @name PalletRefungibleError (364) */
+ /** @name PalletRefungibleError (365) */
export interface PalletRefungibleError extends Enum {
readonly isNotRefungibleDataUsedToMintFungibleCollectionToken: boolean;
readonly isWrongRefungiblePieces: boolean;
@@ -2699,12 +2704,12 @@
readonly type: 'NotRefungibleDataUsedToMintFungibleCollectionToken' | 'WrongRefungiblePieces' | 'RefungibleDisallowsNesting' | 'SettingPropertiesNotAllowed';
}
- /** @name PalletNonfungibleItemData (365) */
+ /** @name PalletNonfungibleItemData (366) */
export interface PalletNonfungibleItemData extends Struct {
readonly owner: PalletEvmAccountBasicCrossAccountIdRepr;
}
- /** @name PalletNonfungibleError (367) */
+ /** @name PalletNonfungibleError (368) */
export interface PalletNonfungibleError extends Enum {
readonly isNotNonfungibleDataUsedToMintFungibleCollectionToken: boolean;
readonly isNonfungibleItemsHaveNoAmount: boolean;
@@ -2712,7 +2717,7 @@
readonly type: 'NotNonfungibleDataUsedToMintFungibleCollectionToken' | 'NonfungibleItemsHaveNoAmount' | 'CantBurnNftWithChildren';
}
- /** @name PalletStructureError (368) */
+ /** @name PalletStructureError (369) */
export interface PalletStructureError extends Enum {
readonly isOuroborosDetected: boolean;
readonly isDepthLimit: boolean;
@@ -2720,7 +2725,7 @@
readonly type: 'OuroborosDetected' | 'DepthLimit' | 'TokenNotFound';
}
- /** @name PalletEvmError (371) */
+ /** @name PalletEvmError (372) */
export interface PalletEvmError extends Enum {
readonly isBalanceLow: boolean;
readonly isFeeOverflow: boolean;
@@ -2731,7 +2736,7 @@
readonly type: 'BalanceLow' | 'FeeOverflow' | 'PaymentOverflow' | 'WithdrawFailed' | 'GasPriceTooLow' | 'InvalidNonce';
}
- /** @name FpRpcTransactionStatus (374) */
+ /** @name FpRpcTransactionStatus (375) */
export interface FpRpcTransactionStatus extends Struct {
readonly transactionHash: H256;
readonly transactionIndex: u32;
@@ -2742,10 +2747,10 @@
readonly logsBloom: EthbloomBloom;
}
- /** @name EthbloomBloom (376) */
+ /** @name EthbloomBloom (377) */
export interface EthbloomBloom extends U8aFixed {}
- /** @name EthereumReceiptReceiptV3 (378) */
+ /** @name EthereumReceiptReceiptV3 (379) */
export interface EthereumReceiptReceiptV3 extends Enum {
readonly isLegacy: boolean;
readonly asLegacy: EthereumReceiptEip658ReceiptData;
@@ -2756,7 +2761,7 @@
readonly type: 'Legacy' | 'Eip2930' | 'Eip1559';
}
- /** @name EthereumReceiptEip658ReceiptData (379) */
+ /** @name EthereumReceiptEip658ReceiptData (380) */
export interface EthereumReceiptEip658ReceiptData extends Struct {
readonly statusCode: u8;
readonly usedGas: U256;
@@ -2764,14 +2769,14 @@
readonly logs: Vec<EthereumLog>;
}
- /** @name EthereumBlock (380) */
+ /** @name EthereumBlock (381) */
export interface EthereumBlock extends Struct {
readonly header: EthereumHeader;
readonly transactions: Vec<EthereumTransactionTransactionV2>;
readonly ommers: Vec<EthereumHeader>;
}
- /** @name EthereumHeader (381) */
+ /** @name EthereumHeader (382) */
export interface EthereumHeader extends Struct {
readonly parentHash: H256;
readonly ommersHash: H256;
@@ -2790,24 +2795,24 @@
readonly nonce: EthereumTypesHashH64;
}
- /** @name EthereumTypesHashH64 (382) */
+ /** @name EthereumTypesHashH64 (383) */
export interface EthereumTypesHashH64 extends U8aFixed {}
- /** @name PalletEthereumError (387) */
+ /** @name PalletEthereumError (388) */
export interface PalletEthereumError extends Enum {
readonly isInvalidSignature: boolean;
readonly isPreLogExists: boolean;
readonly type: 'InvalidSignature' | 'PreLogExists';
}
- /** @name PalletEvmCoderSubstrateError (388) */
+ /** @name PalletEvmCoderSubstrateError (389) */
export interface PalletEvmCoderSubstrateError extends Enum {
readonly isOutOfGas: boolean;
readonly isOutOfFund: boolean;
readonly type: 'OutOfGas' | 'OutOfFund';
}
- /** @name PalletEvmContractHelpersSponsoringModeT (389) */
+ /** @name PalletEvmContractHelpersSponsoringModeT (390) */
export interface PalletEvmContractHelpersSponsoringModeT extends Enum {
readonly isDisabled: boolean;
readonly isAllowlisted: boolean;
@@ -2815,20 +2820,20 @@
readonly type: 'Disabled' | 'Allowlisted' | 'Generous';
}
- /** @name PalletEvmContractHelpersError (391) */
+ /** @name PalletEvmContractHelpersError (392) */
export interface PalletEvmContractHelpersError extends Enum {
readonly isNoPermission: boolean;
readonly type: 'NoPermission';
}
- /** @name PalletEvmMigrationError (392) */
+ /** @name PalletEvmMigrationError (393) */
export interface PalletEvmMigrationError extends Enum {
readonly isAccountNotEmpty: boolean;
readonly isAccountIsNotMigrating: boolean;
readonly type: 'AccountNotEmpty' | 'AccountIsNotMigrating';
}
- /** @name SpRuntimeMultiSignature (394) */
+ /** @name SpRuntimeMultiSignature (395) */
export interface SpRuntimeMultiSignature extends Enum {
readonly isEd25519: boolean;
readonly asEd25519: SpCoreEd25519Signature;
@@ -2839,34 +2844,34 @@
readonly type: 'Ed25519' | 'Sr25519' | 'Ecdsa';
}
- /** @name SpCoreEd25519Signature (395) */
+ /** @name SpCoreEd25519Signature (396) */
export interface SpCoreEd25519Signature extends U8aFixed {}
- /** @name SpCoreSr25519Signature (397) */
+ /** @name SpCoreSr25519Signature (398) */
export interface SpCoreSr25519Signature extends U8aFixed {}
- /** @name SpCoreEcdsaSignature (398) */
+ /** @name SpCoreEcdsaSignature (399) */
export interface SpCoreEcdsaSignature extends U8aFixed {}
- /** @name FrameSystemExtensionsCheckSpecVersion (401) */
+ /** @name FrameSystemExtensionsCheckSpecVersion (402) */
export type FrameSystemExtensionsCheckSpecVersion = Null;
- /** @name FrameSystemExtensionsCheckGenesis (402) */
+ /** @name FrameSystemExtensionsCheckGenesis (403) */
export type FrameSystemExtensionsCheckGenesis = Null;
- /** @name FrameSystemExtensionsCheckNonce (405) */
+ /** @name FrameSystemExtensionsCheckNonce (406) */
export interface FrameSystemExtensionsCheckNonce extends Compact<u32> {}
- /** @name FrameSystemExtensionsCheckWeight (406) */
+ /** @name FrameSystemExtensionsCheckWeight (407) */
export type FrameSystemExtensionsCheckWeight = Null;
- /** @name PalletTemplateTransactionPaymentChargeTransactionPayment (407) */
+ /** @name PalletTemplateTransactionPaymentChargeTransactionPayment (408) */
export interface PalletTemplateTransactionPaymentChargeTransactionPayment extends Compact<u128> {}
- /** @name OpalRuntimeRuntime (408) */
+ /** @name OpalRuntimeRuntime (409) */
export type OpalRuntimeRuntime = Null;
- /** @name PalletEthereumFakeTransactionFinalizer (409) */
+ /** @name PalletEthereumFakeTransactionFinalizer (410) */
export type PalletEthereumFakeTransactionFinalizer = Null;
} // declare module
tests/src/interfaces/unique/definitions.tsdiffbeforeafterboth--- a/tests/src/interfaces/unique/definitions.ts
+++ b/tests/src/interfaces/unique/definitions.ts
@@ -50,6 +50,7 @@
allowance: fun('Get allowed amount', [collectionParam, crossAccountParam('sender'), crossAccountParam('spender'), tokenParam], 'u128'),
tokenOwner: fun('Get token owner', [collectionParam, tokenParam], `Option<${CROSS_ACCOUNT_ID_TYPE}>`),
topmostTokenOwner: fun('Get token owner, in case of nested token - find parent recursive', [collectionParam, tokenParam], `Option<${CROSS_ACCOUNT_ID_TYPE}>`),
+ tokenChildren: fun('Get tokens nested directly into the token', [collectionParam, tokenParam], 'Vec<UpDataStructsTokenChild>'),
constMetadata: fun('Get token constant metadata', [collectionParam, tokenParam], 'Vec<u8>'),
variableMetadata: fun('Get token variable metadata', [collectionParam, tokenParam], 'Vec<u8>'),
collectionProperties: fun(
tests/src/nesting/nest.test.tsdiffbeforeafterboth--- a/tests/src/nesting/nest.test.ts
+++ b/tests/src/nesting/nest.test.ts
@@ -7,6 +7,7 @@
createItemExpectSuccess,
enableAllowListExpectSuccess,
enablePublicMintingExpectSuccess,
+ getTokenChildren,
getTokenOwner,
getTopmostTokenOwner,
normalizeAccountId,
@@ -76,8 +77,8 @@
api,
alice,
api.tx.unique.transferFrom(
- normalizeAccountId({Ethereum: tokenIdToAddress(collection, tokenA)}),
- normalizeAccountId({Ethereum: tokenIdToAddress(collection, tokenB)}),
+ normalizeAccountId({Ethereum: tokenIdToAddress(collection, tokenA)}),
+ normalizeAccountId({Ethereum: tokenIdToAddress(collection, tokenB)}),
collection,
tokenC,
1,
@@ -88,6 +89,63 @@
});
});
+ it('Checks token children', async () => {
+ await usingApi(async api => {
+ const collectionA = await createCollectionExpectSuccess({mode: {type: 'NFT'}});
+ await setCollectionPermissionsExpectSuccess(alice, collectionA, {nesting: 'Owner'});
+ const collectionB = await createCollectionExpectSuccess({mode: {type: 'Fungible', decimalPoints: 0}});
+
+ const targetToken = await createItemExpectSuccess(alice, collectionA, 'NFT');
+ const targetAddress = {Ethereum: tokenIdToAddress(collectionA, targetToken)};
+ let children = await getTokenChildren(api, collectionA, targetToken);
+ expect(children.length).to.be.equal(0, 'Children length check at creation');
+
+ // Create a nested NFT token
+ const tokenA = await createItemExpectSuccess(alice, collectionA, 'NFT', targetAddress);
+ children = await getTokenChildren(api, collectionA, targetToken);
+ expect(children.length).to.be.equal(1, 'Children length check at nesting #1');
+ expect(children).to.have.deep.members([
+ {token: tokenA, collection: collectionA},
+ ], 'Children contents check at nesting #1');
+
+ // Create then nest
+ const tokenB = await createItemExpectSuccess(alice, collectionA, 'NFT');
+ await transferExpectSuccess(collectionA, tokenB, alice, targetAddress);
+ children = await getTokenChildren(api, collectionA, targetToken);
+ expect(children.length).to.be.equal(2, 'Children length check at nesting #2');
+ expect(children).to.have.deep.members([
+ {token: tokenA, collection: collectionA},
+ {token: tokenB, collection: collectionA},
+ ], 'Children contents check at nesting #2');
+
+ // Move token B to a different user outside the nesting tree
+ await transferExpectSuccess(collectionA, tokenB, alice, bob);
+ children = await getTokenChildren(api, collectionA, targetToken);
+ expect(children.length).to.be.equal(1, 'Children length check at unnesting');
+ expect(children).to.be.have.deep.members([
+ {token: tokenA, collection: collectionA},
+ ], 'Children contents check at unnesting');
+
+ // Create a fungible token in another collection and then nest
+ const tokenC = await createItemExpectSuccess(alice, collectionB, 'Fungible');
+ await transferExpectSuccess(collectionB, tokenC, alice, targetAddress, 1, 'Fungible');
+ children = await getTokenChildren(api, collectionA, targetToken);
+ expect(children.length).to.be.equal(2, 'Children length check at nesting #3 (from another collection)');
+ expect(children).to.be.have.deep.members([
+ {token: tokenA, collection: collectionA},
+ {token: tokenC, collection: collectionB},
+ ], 'Children contents check at nesting #3 (from another collection)');
+
+ // Move the fungible token inside token A deeper in the nesting tree
+ await transferFromExpectSuccess(collectionB, tokenC, alice, targetAddress, {Ethereum: tokenIdToAddress(collectionA, tokenA)}, 1, 'Fungible');
+ children = await getTokenChildren(api, collectionA, targetToken);
+ expect(children.length).to.be.equal(1, 'Children length check at deeper nesting');
+ expect(children).to.be.have.deep.members([
+ {token: tokenA, collection: collectionA},
+ ], 'Children contents check at deeper nesting');
+ });
+ });
+
// ---------- Non-Fungible ----------
it('NFT: allows an Owner to nest/unnest their token', async () => {
tests/src/util/helpers.tsdiffbeforeafterboth--- a/tests/src/util/helpers.ts
+++ b/tests/src/util/helpers.ts
@@ -27,6 +27,7 @@
import {default as usingApi, executeTransaction, submitTransactionAsync, submitTransactionExpectFailAsync} from '../substrate/substrate-api';
import {hexToStr, strToUTF16, utf16ToStr} from './util';
import {UpDataStructsRpcCollection, UpDataStructsCreateItemData, UpDataStructsProperty} from '@polkadot/types/lookup';
+import {UpDataStructsTokenChild} from '../interfaces';
chai.use(chaiAsPromised);
const expect = chai.expect;
@@ -1165,6 +1166,13 @@
if (owner == null) throw new Error('owner == null');
return normalizeAccountId(owner);
}
+export async function getTokenChildren(
+ api: ApiPromise,
+ collectionId: number,
+ tokenId: number,
+): Promise<UpDataStructsTokenChild[]> {
+ return (await api.rpc.unique.tokenChildren(collectionId, tokenId)).toJSON() as any;
+}
export async function isTokenExists(
api: ApiPromise,
collectionId: number,