--- a/.gitignore +++ b/.gitignore @@ -12,6 +12,7 @@ /.idea/ /.cargo/ +/.vscode/ tests/.vscode cumulus-parachain/ --- a/pallets/common/src/lib.rs +++ b/pallets/common/src/lib.rs @@ -1258,6 +1258,10 @@ } } +pub trait RefungibleExtensionsWeightInfo { + fn repartition() -> Weight; +} + pub trait CommonCollectionOperations { fn create_item( &self, @@ -1384,6 +1388,19 @@ spender: T::CrossAccountId, token: TokenId, ) -> u128; + fn refungible_extensions(&self) -> Option<&dyn RefungibleExtensions>; +} + +pub trait RefungibleExtensions +where + T: Config, +{ + fn repartition( + &self, + owner: &T::CrossAccountId, + token: TokenId, + amount: u128, + ) -> DispatchResultWithPostInfo; } // Flexible enough for implementing CommonCollectionOperations --- a/pallets/fungible/src/common.rs +++ b/pallets/fungible/src/common.rs @@ -18,7 +18,7 @@ use frame_support::{dispatch::DispatchResultWithPostInfo, ensure, fail, weights::Weight, traits::Get}; use up_data_structs::{TokenId, CollectionId, CreateItemExData, budget::Budget, CreateItemData}; -use pallet_common::{CommonCollectionOperations, CommonWeightInfo, with_weight}; +use pallet_common::{CommonCollectionOperations, CommonWeightInfo, RefungibleExtensions, with_weight}; use pallet_structure::Error as StructureError; use sp_runtime::ArithmeticError; use sp_std::{vec::Vec, vec}; @@ -399,4 +399,8 @@ } >::get((self.id, sender, spender)) } + + fn refungible_extensions(&self) -> Option<&dyn RefungibleExtensions> { + None + } } --- a/pallets/nonfungible/src/common.rs +++ b/pallets/nonfungible/src/common.rs @@ -22,7 +22,8 @@ PropertyKeyPermission, PropertyValue, }; use pallet_common::{ - CommonCollectionOperations, CommonWeightInfo, with_weight, weights::WeightInfo as _, + CommonCollectionOperations, CommonWeightInfo, RefungibleExtensions, with_weight, + weights::WeightInfo as _, }; use sp_runtime::DispatchError; use sp_std::vec::Vec; @@ -467,4 +468,8 @@ 0 } } + + fn refungible_extensions(&self) -> Option<&dyn RefungibleExtensions> { + None + } } --- a/pallets/refungible/src/benchmarking.rs +++ b/pallets/refungible/src/benchmarking.rs @@ -203,4 +203,12 @@ let item = create_max_item(&collection, &owner, [(sender.clone(), 200)])?; >::set_allowance(&collection, &sender, &burner, item, 200)?; }: {>::burn_from(&collection, &burner, &sender, item, 200, &Unlimited)?} + + repartition_item { + bench_init!{ + owner: sub; collection: collection(owner); + sender: cross_from_sub(owner); owner: cross_sub; + }; + let item = create_max_item(&collection, &sender, [(owner.clone(), 100)])?; + }: {>::repartition(&collection, &owner, item, 200)?} } --- a/pallets/refungible/src/common.rs +++ b/pallets/refungible/src/common.rs @@ -22,9 +22,9 @@ CollectionId, TokenId, CreateItemExData, CreateRefungibleExData, budget::Budget, Property, PropertyKey, PropertyValue, PropertyKeyPermission, CreateItemData, }; -use pallet_common::{CommonCollectionOperations, CommonWeightInfo, with_weight}; +use pallet_common::{CommonCollectionOperations, CommonWeightInfo, RefungibleExtensions, with_weight}; use pallet_structure::Error as StructureError; -use sp_runtime::DispatchError; +use sp_runtime::{DispatchError}; use sp_std::{vec::Vec, vec}; use crate::{ @@ -405,4 +405,22 @@ ) -> u128 { >::get((self.id, token, sender, spender)) } + + fn refungible_extensions(&self) -> Option<&dyn RefungibleExtensions> { + Some(self) + } +} + +impl RefungibleExtensions for RefungibleHandle { + fn repartition( + &self, + owner: &T::CrossAccountId, + token: TokenId, + amount: u128, + ) -> DispatchResultWithPostInfo { + with_weight( + >::repartition(self, owner, token, amount), + >::repartition_item(), + ) + } } --- a/pallets/refungible/src/lib.rs +++ b/pallets/refungible/src/lib.rs @@ -64,6 +64,8 @@ NotRefungibleDataUsedToMintFungibleCollectionToken, /// Maximum refungibility exceeded WrongRefungiblePieces, + /// Refungible token can't be repartitioned by user who isn't owns all pieces + RepartitionWhileNotOwningAllPieces, /// Refungible token can't nest other tokens RefungibleDisallowsNesting, /// Setting item properties is not allowed @@ -684,4 +686,28 @@ ) -> DispatchResult { Self::create_multiple_items(collection, sender, vec![data], nesting_budget) } + + pub fn repartition( + collection: &RefungibleHandle, + owner: &T::CrossAccountId, + token: TokenId, + amount: u128, + ) -> DispatchResult { + ensure!( + amount <= MAX_REFUNGIBLE_PIECES, + >::WrongRefungiblePieces + ); + ensure!(amount > 0, >::TokenValueTooLow); + // Ensure user owns all pieces + let total_supply = >::get((collection.id, token)); + let balance = >::get((collection.id, token, owner)); + ensure!( + total_supply == balance, + >::RepartitionWhileNotOwningAllPieces + ); + + >::insert((collection.id, token, owner), amount); + >::insert((collection.id, token), amount); + Ok(()) + } } --- a/pallets/refungible/src/weights.rs +++ b/pallets/refungible/src/weights.rs @@ -3,7 +3,7 @@ //! Autogenerated weights for pallet_refungible //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2022-06-15, STEPS: `50`, REPEAT: 80, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2022-06-27, STEPS: `50`, REPEAT: 80, LOW RANGE: `[]`, HIGH RANGE: `[]` //! EXECUTION: None, WASM-EXECUTION: Compiled, CHAIN: None, DB CACHE: 1024 // Executed Command: @@ -49,6 +49,7 @@ fn transfer_from_removing() -> Weight; fn transfer_from_creating_removing() -> Weight; fn burn_from() -> Weight; + fn repartition_item() -> Weight; } /// Weights for pallet_refungible using the Substrate node and recommended hardware. @@ -61,7 +62,7 @@ // Storage: Refungible TokenData (r:0 w:1) // Storage: Refungible Owned (r:0 w:1) fn create_item() -> Weight { - (21_321_000 as Weight) + (17_553_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(6 as Weight)) } @@ -72,9 +73,9 @@ // Storage: Refungible TokenData (r:0 w:4) // Storage: Refungible Owned (r:0 w:4) fn create_multiple_items(b: u32, ) -> Weight { - (16_313_000 as Weight) - // Standard Error: 4_000 - .saturating_add((5_464_000 as Weight).saturating_mul(b as Weight)) + (10_654_000 as Weight) + // Standard Error: 1_000 + .saturating_add((5_114_000 as Weight).saturating_mul(b as Weight)) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) .saturating_add(T::DbWeight::get().writes((4 as Weight).saturating_mul(b as Weight))) @@ -86,9 +87,9 @@ // Storage: Refungible TokenData (r:0 w:4) // Storage: Refungible Owned (r:0 w:4) fn create_multiple_items_ex_multiple_items(b: u32, ) -> Weight { - (15_631_000 as Weight) - // Standard Error: 5_000 - .saturating_add((8_141_000 as Weight).saturating_mul(b as Weight)) + (3_587_000 as Weight) + // Standard Error: 2_000 + .saturating_add((7_931_000 as Weight).saturating_mul(b as Weight)) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(b as Weight))) .saturating_add(T::DbWeight::get().writes(1 as Weight)) @@ -101,9 +102,9 @@ // Storage: Refungible Balance (r:0 w:4) // Storage: Refungible Owned (r:0 w:4) fn create_multiple_items_ex_multiple_owners(b: u32, ) -> Weight { - (11_191_000 as Weight) - // Standard Error: 4_000 - .saturating_add((6_321_000 as Weight).saturating_mul(b as Weight)) + (1_980_000 as Weight) + // Standard Error: 2_000 + .saturating_add((6_305_000 as Weight).saturating_mul(b as Weight)) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(b as Weight))) .saturating_add(T::DbWeight::get().writes(3 as Weight)) @@ -114,7 +115,7 @@ // Storage: Refungible AccountBalance (r:1 w:1) // Storage: Refungible Owned (r:0 w:1) fn burn_item_partial() -> Weight { - (24_421_000 as Weight) + (21_010_000 as Weight) .saturating_add(T::DbWeight::get().reads(3 as Weight)) .saturating_add(T::DbWeight::get().writes(4 as Weight)) } @@ -125,13 +126,13 @@ // Storage: Refungible TokenData (r:0 w:1) // Storage: Refungible Owned (r:0 w:1) fn burn_item_fully() -> Weight { - (32_900_000 as Weight) + (28_413_000 as Weight) .saturating_add(T::DbWeight::get().reads(4 as Weight)) .saturating_add(T::DbWeight::get().writes(6 as Weight)) } // Storage: Refungible Balance (r:2 w:2) fn transfer_normal() -> Weight { - (20_215_000 as Weight) + (17_513_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } @@ -139,7 +140,7 @@ // Storage: Refungible AccountBalance (r:1 w:1) // Storage: Refungible Owned (r:0 w:1) fn transfer_creating() -> Weight { - (24_809_000 as Weight) + (20_469_000 as Weight) .saturating_add(T::DbWeight::get().reads(3 as Weight)) .saturating_add(T::DbWeight::get().writes(4 as Weight)) } @@ -147,7 +148,7 @@ // Storage: Refungible AccountBalance (r:1 w:1) // Storage: Refungible Owned (r:0 w:1) fn transfer_removing() -> Weight { - (26_704_000 as Weight) + (22_472_000 as Weight) .saturating_add(T::DbWeight::get().reads(3 as Weight)) .saturating_add(T::DbWeight::get().writes(4 as Weight)) } @@ -155,21 +156,21 @@ // Storage: Refungible AccountBalance (r:2 w:2) // Storage: Refungible Owned (r:0 w:2) fn transfer_creating_removing() -> Weight { - (28_728_000 as Weight) + (24_866_000 as Weight) .saturating_add(T::DbWeight::get().reads(4 as Weight)) .saturating_add(T::DbWeight::get().writes(6 as Weight)) } // Storage: Refungible Balance (r:1 w:0) // Storage: Refungible Allowance (r:0 w:1) fn approve() -> Weight { - (16_107_000 as Weight) + (13_475_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } // Storage: Refungible Allowance (r:1 w:1) // Storage: Refungible Balance (r:2 w:2) fn transfer_from_normal() -> Weight { - (28_765_000 as Weight) + (24_707_000 as Weight) .saturating_add(T::DbWeight::get().reads(3 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } @@ -178,7 +179,7 @@ // Storage: Refungible AccountBalance (r:1 w:1) // Storage: Refungible Owned (r:0 w:1) fn transfer_from_creating() -> Weight { - (32_788_000 as Weight) + (27_812_000 as Weight) .saturating_add(T::DbWeight::get().reads(4 as Weight)) .saturating_add(T::DbWeight::get().writes(5 as Weight)) } @@ -187,7 +188,7 @@ // Storage: Refungible AccountBalance (r:1 w:1) // Storage: Refungible Owned (r:0 w:1) fn transfer_from_removing() -> Weight { - (34_523_000 as Weight) + (29_966_000 as Weight) .saturating_add(T::DbWeight::get().reads(4 as Weight)) .saturating_add(T::DbWeight::get().writes(5 as Weight)) } @@ -196,7 +197,7 @@ // Storage: Refungible AccountBalance (r:2 w:2) // Storage: Refungible Owned (r:0 w:2) fn transfer_from_creating_removing() -> Weight { - (36_749_000 as Weight) + (31_660_000 as Weight) .saturating_add(T::DbWeight::get().reads(5 as Weight)) .saturating_add(T::DbWeight::get().writes(7 as Weight)) } @@ -208,10 +209,17 @@ // Storage: Refungible TokenData (r:0 w:1) // Storage: Refungible Owned (r:0 w:1) fn burn_from() -> Weight { - (42_259_000 as Weight) + (36_248_000 as Weight) .saturating_add(T::DbWeight::get().reads(5 as Weight)) .saturating_add(T::DbWeight::get().writes(7 as Weight)) } + // Storage: Refungible TotalSupply (r:1 w:1) + // Storage: Refungible Balance (r:1 w:1) + fn repartition_item() -> Weight { + (8_226_000 as Weight) + .saturating_add(T::DbWeight::get().reads(2 as Weight)) + .saturating_add(T::DbWeight::get().writes(2 as Weight)) + } } // For backwards compatibility and tests @@ -223,7 +231,7 @@ // Storage: Refungible TokenData (r:0 w:1) // Storage: Refungible Owned (r:0 w:1) fn create_item() -> Weight { - (21_321_000 as Weight) + (17_553_000 as Weight) .saturating_add(RocksDbWeight::get().reads(2 as Weight)) .saturating_add(RocksDbWeight::get().writes(6 as Weight)) } @@ -234,9 +242,9 @@ // Storage: Refungible TokenData (r:0 w:4) // Storage: Refungible Owned (r:0 w:4) fn create_multiple_items(b: u32, ) -> Weight { - (16_313_000 as Weight) - // Standard Error: 4_000 - .saturating_add((5_464_000 as Weight).saturating_mul(b as Weight)) + (10_654_000 as Weight) + // Standard Error: 1_000 + .saturating_add((5_114_000 as Weight).saturating_mul(b as Weight)) .saturating_add(RocksDbWeight::get().reads(2 as Weight)) .saturating_add(RocksDbWeight::get().writes(2 as Weight)) .saturating_add(RocksDbWeight::get().writes((4 as Weight).saturating_mul(b as Weight))) @@ -248,9 +256,9 @@ // Storage: Refungible TokenData (r:0 w:4) // Storage: Refungible Owned (r:0 w:4) fn create_multiple_items_ex_multiple_items(b: u32, ) -> Weight { - (15_631_000 as Weight) - // Standard Error: 5_000 - .saturating_add((8_141_000 as Weight).saturating_mul(b as Weight)) + (3_587_000 as Weight) + // Standard Error: 2_000 + .saturating_add((7_931_000 as Weight).saturating_mul(b as Weight)) .saturating_add(RocksDbWeight::get().reads(1 as Weight)) .saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(b as Weight))) .saturating_add(RocksDbWeight::get().writes(1 as Weight)) @@ -263,9 +271,9 @@ // Storage: Refungible Balance (r:0 w:4) // Storage: Refungible Owned (r:0 w:4) fn create_multiple_items_ex_multiple_owners(b: u32, ) -> Weight { - (11_191_000 as Weight) - // Standard Error: 4_000 - .saturating_add((6_321_000 as Weight).saturating_mul(b as Weight)) + (1_980_000 as Weight) + // Standard Error: 2_000 + .saturating_add((6_305_000 as Weight).saturating_mul(b as Weight)) .saturating_add(RocksDbWeight::get().reads(1 as Weight)) .saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(b as Weight))) .saturating_add(RocksDbWeight::get().writes(3 as Weight)) @@ -276,7 +284,7 @@ // Storage: Refungible AccountBalance (r:1 w:1) // Storage: Refungible Owned (r:0 w:1) fn burn_item_partial() -> Weight { - (24_421_000 as Weight) + (21_010_000 as Weight) .saturating_add(RocksDbWeight::get().reads(3 as Weight)) .saturating_add(RocksDbWeight::get().writes(4 as Weight)) } @@ -287,13 +295,13 @@ // Storage: Refungible TokenData (r:0 w:1) // Storage: Refungible Owned (r:0 w:1) fn burn_item_fully() -> Weight { - (32_900_000 as Weight) + (28_413_000 as Weight) .saturating_add(RocksDbWeight::get().reads(4 as Weight)) .saturating_add(RocksDbWeight::get().writes(6 as Weight)) } // Storage: Refungible Balance (r:2 w:2) fn transfer_normal() -> Weight { - (20_215_000 as Weight) + (17_513_000 as Weight) .saturating_add(RocksDbWeight::get().reads(2 as Weight)) .saturating_add(RocksDbWeight::get().writes(2 as Weight)) } @@ -301,7 +309,7 @@ // Storage: Refungible AccountBalance (r:1 w:1) // Storage: Refungible Owned (r:0 w:1) fn transfer_creating() -> Weight { - (24_809_000 as Weight) + (20_469_000 as Weight) .saturating_add(RocksDbWeight::get().reads(3 as Weight)) .saturating_add(RocksDbWeight::get().writes(4 as Weight)) } @@ -309,7 +317,7 @@ // Storage: Refungible AccountBalance (r:1 w:1) // Storage: Refungible Owned (r:0 w:1) fn transfer_removing() -> Weight { - (26_704_000 as Weight) + (22_472_000 as Weight) .saturating_add(RocksDbWeight::get().reads(3 as Weight)) .saturating_add(RocksDbWeight::get().writes(4 as Weight)) } @@ -317,21 +325,21 @@ // Storage: Refungible AccountBalance (r:2 w:2) // Storage: Refungible Owned (r:0 w:2) fn transfer_creating_removing() -> Weight { - (28_728_000 as Weight) + (24_866_000 as Weight) .saturating_add(RocksDbWeight::get().reads(4 as Weight)) .saturating_add(RocksDbWeight::get().writes(6 as Weight)) } // Storage: Refungible Balance (r:1 w:0) // Storage: Refungible Allowance (r:0 w:1) fn approve() -> Weight { - (16_107_000 as Weight) + (13_475_000 as Weight) .saturating_add(RocksDbWeight::get().reads(1 as Weight)) .saturating_add(RocksDbWeight::get().writes(1 as Weight)) } // Storage: Refungible Allowance (r:1 w:1) // Storage: Refungible Balance (r:2 w:2) fn transfer_from_normal() -> Weight { - (28_765_000 as Weight) + (24_707_000 as Weight) .saturating_add(RocksDbWeight::get().reads(3 as Weight)) .saturating_add(RocksDbWeight::get().writes(3 as Weight)) } @@ -340,7 +348,7 @@ // Storage: Refungible AccountBalance (r:1 w:1) // Storage: Refungible Owned (r:0 w:1) fn transfer_from_creating() -> Weight { - (32_788_000 as Weight) + (27_812_000 as Weight) .saturating_add(RocksDbWeight::get().reads(4 as Weight)) .saturating_add(RocksDbWeight::get().writes(5 as Weight)) } @@ -349,7 +357,7 @@ // Storage: Refungible AccountBalance (r:1 w:1) // Storage: Refungible Owned (r:0 w:1) fn transfer_from_removing() -> Weight { - (34_523_000 as Weight) + (29_966_000 as Weight) .saturating_add(RocksDbWeight::get().reads(4 as Weight)) .saturating_add(RocksDbWeight::get().writes(5 as Weight)) } @@ -358,7 +366,7 @@ // Storage: Refungible AccountBalance (r:2 w:2) // Storage: Refungible Owned (r:0 w:2) fn transfer_from_creating_removing() -> Weight { - (36_749_000 as Weight) + (31_660_000 as Weight) .saturating_add(RocksDbWeight::get().reads(5 as Weight)) .saturating_add(RocksDbWeight::get().writes(7 as Weight)) } @@ -370,8 +378,15 @@ // Storage: Refungible TokenData (r:0 w:1) // Storage: Refungible Owned (r:0 w:1) fn burn_from() -> Weight { - (42_259_000 as Weight) + (36_248_000 as Weight) .saturating_add(RocksDbWeight::get().reads(5 as Weight)) .saturating_add(RocksDbWeight::get().writes(7 as Weight)) } + // Storage: Refungible TotalSupply (r:1 w:1) + // Storage: Refungible Balance (r:1 w:1) + fn repartition_item() -> Weight { + (8_226_000 as Weight) + .saturating_add(RocksDbWeight::get().reads(2 as Weight)) + .saturating_add(RocksDbWeight::get().writes(2 as Weight)) + } } --- a/pallets/unique/src/lib.rs +++ b/pallets/unique/src/lib.rs @@ -27,7 +27,7 @@ use frame_support::{ decl_module, decl_storage, decl_error, decl_event, dispatch::DispatchResult, - ensure, + ensure, fail, weights::{Weight}, transactional, pallet_prelude::{DispatchResultWithPostInfo, ConstU32}, @@ -45,7 +45,7 @@ use pallet_evm::account::CrossAccountId; use pallet_common::{ CollectionHandle, Pallet as PalletCommon, CommonWeightInfo, dispatch::dispatch_tx, - dispatch::CollectionDispatch, + dispatch::CollectionDispatch, RefungibleExtensionsWeightInfo, }; pub mod eth; @@ -65,6 +65,8 @@ ConfirmUnsetSponsorFail, /// Length of items properties must be greater than 0. EmptyArgument, + /// Repertition is only supported by refungible collection + RepartitionCalledOnNonRefungibleCollection, } } @@ -74,6 +76,7 @@ /// Weight information for extrinsics in this pallet. type WeightInfo: WeightInfo; type CommonWeightInfo: CommonWeightInfo; + type RefungibleExtensionsWeightInfo: RefungibleExtensionsWeightInfo; } decl_event! { @@ -898,5 +901,23 @@ target_collection.save() } + + #[weight = T::RefungibleExtensionsWeightInfo::repartition()] + #[transactional] + pub fn repartition( + origin, + collection_id: CollectionId, + token: TokenId, + amount: u128, + ) -> DispatchResultWithPostInfo { + let sender = T::CrossAccountId::from_sub(ensure_signed(origin)?); + dispatch_tx::(collection_id, |d| { + if let Some(refungible_extensions) = d.refungible_extensions() { + refungible_extensions.repartition(&sender, token, amount) + } else { + fail!(>::RepartitionCalledOnNonRefungibleCollection) + } + }) + } } } --- a/pallets/unique/src/weights.rs +++ b/pallets/unique/src/weights.rs @@ -3,7 +3,7 @@ //! Autogenerated weights for pallet_unique //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2022-06-15, STEPS: `50`, REPEAT: 80, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2022-06-28, STEPS: `50`, REPEAT: 80, LOW RANGE: `[]`, HIGH RANGE: `[]` //! EXECUTION: None, WASM-EXECUTION: Compiled, CHAIN: None, DB CACHE: 1024 // Executed Command: @@ -57,7 +57,7 @@ // Storage: Common CollectionProperties (r:0 w:1) // Storage: Common CollectionById (r:0 w:1) fn create_collection() -> Weight { - (39_427_000 as Weight) + (53_511_000 as Weight) .saturating_add(T::DbWeight::get().reads(4 as Weight)) .saturating_add(T::DbWeight::get().writes(6 as Weight)) } @@ -69,27 +69,27 @@ // Storage: Common AdminAmount (r:0 w:1) // Storage: Common CollectionProperties (r:0 w:1) fn destroy_collection() -> Weight { - (48_339_000 as Weight) + (69_481_000 as Weight) .saturating_add(T::DbWeight::get().reads(3 as Weight)) .saturating_add(T::DbWeight::get().writes(6 as Weight)) } // Storage: Common CollectionById (r:1 w:0) // Storage: Common Allowlist (r:0 w:1) fn add_to_allow_list() -> Weight { - (17_379_000 as Weight) + (22_892_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } // Storage: Common CollectionById (r:1 w:0) // Storage: Common Allowlist (r:0 w:1) fn remove_from_allow_list() -> Weight { - (17_490_000 as Weight) + (22_973_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } // Storage: Common CollectionById (r:1 w:1) fn change_collection_owner() -> Weight { - (17_701_000 as Weight) + (22_392_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } @@ -97,7 +97,7 @@ // Storage: Common IsAdmin (r:1 w:1) // Storage: Common AdminAmount (r:1 w:1) fn add_collection_admin() -> Weight { - (23_301_000 as Weight) + (30_298_000 as Weight) .saturating_add(T::DbWeight::get().reads(3 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } @@ -105,37 +105,37 @@ // Storage: Common IsAdmin (r:1 w:1) // Storage: Common AdminAmount (r:1 w:1) fn remove_collection_admin() -> Weight { - (24_859_000 as Weight) + (32_842_000 as Weight) .saturating_add(T::DbWeight::get().reads(3 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } // Storage: Common CollectionById (r:1 w:1) fn set_collection_sponsor() -> Weight { - (17_795_000 as Weight) + (22_613_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } // Storage: Common CollectionById (r:1 w:1) fn confirm_sponsorship() -> Weight { - (17_297_000 as Weight) + (22_462_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } // Storage: Common CollectionById (r:1 w:1) fn remove_collection_sponsor() -> Weight { - (17_079_000 as Weight) + (21_730_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } // Storage: Common CollectionById (r:1 w:1) fn set_transfers_enabled_flag() -> Weight { - (9_734_000 as Weight) + (10_941_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } // Storage: Common CollectionById (r:1 w:1) fn set_collection_limits() -> Weight { - (17_998_000 as Weight) + (22_363_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } @@ -150,7 +150,7 @@ // Storage: Common CollectionProperties (r:0 w:1) // Storage: Common CollectionById (r:0 w:1) fn create_collection() -> Weight { - (39_427_000 as Weight) + (53_511_000 as Weight) .saturating_add(RocksDbWeight::get().reads(4 as Weight)) .saturating_add(RocksDbWeight::get().writes(6 as Weight)) } @@ -162,27 +162,27 @@ // Storage: Common AdminAmount (r:0 w:1) // Storage: Common CollectionProperties (r:0 w:1) fn destroy_collection() -> Weight { - (48_339_000 as Weight) + (69_481_000 as Weight) .saturating_add(RocksDbWeight::get().reads(3 as Weight)) .saturating_add(RocksDbWeight::get().writes(6 as Weight)) } // Storage: Common CollectionById (r:1 w:0) // Storage: Common Allowlist (r:0 w:1) fn add_to_allow_list() -> Weight { - (17_379_000 as Weight) + (22_892_000 as Weight) .saturating_add(RocksDbWeight::get().reads(1 as Weight)) .saturating_add(RocksDbWeight::get().writes(1 as Weight)) } // Storage: Common CollectionById (r:1 w:0) // Storage: Common Allowlist (r:0 w:1) fn remove_from_allow_list() -> Weight { - (17_490_000 as Weight) + (22_973_000 as Weight) .saturating_add(RocksDbWeight::get().reads(1 as Weight)) .saturating_add(RocksDbWeight::get().writes(1 as Weight)) } // Storage: Common CollectionById (r:1 w:1) fn change_collection_owner() -> Weight { - (17_701_000 as Weight) + (22_392_000 as Weight) .saturating_add(RocksDbWeight::get().reads(1 as Weight)) .saturating_add(RocksDbWeight::get().writes(1 as Weight)) } @@ -190,7 +190,7 @@ // Storage: Common IsAdmin (r:1 w:1) // Storage: Common AdminAmount (r:1 w:1) fn add_collection_admin() -> Weight { - (23_301_000 as Weight) + (30_298_000 as Weight) .saturating_add(RocksDbWeight::get().reads(3 as Weight)) .saturating_add(RocksDbWeight::get().writes(2 as Weight)) } @@ -198,37 +198,37 @@ // Storage: Common IsAdmin (r:1 w:1) // Storage: Common AdminAmount (r:1 w:1) fn remove_collection_admin() -> Weight { - (24_859_000 as Weight) + (32_842_000 as Weight) .saturating_add(RocksDbWeight::get().reads(3 as Weight)) .saturating_add(RocksDbWeight::get().writes(2 as Weight)) } // Storage: Common CollectionById (r:1 w:1) fn set_collection_sponsor() -> Weight { - (17_795_000 as Weight) + (22_613_000 as Weight) .saturating_add(RocksDbWeight::get().reads(1 as Weight)) .saturating_add(RocksDbWeight::get().writes(1 as Weight)) } // Storage: Common CollectionById (r:1 w:1) fn confirm_sponsorship() -> Weight { - (17_297_000 as Weight) + (22_462_000 as Weight) .saturating_add(RocksDbWeight::get().reads(1 as Weight)) .saturating_add(RocksDbWeight::get().writes(1 as Weight)) } // Storage: Common CollectionById (r:1 w:1) fn remove_collection_sponsor() -> Weight { - (17_079_000 as Weight) + (21_730_000 as Weight) .saturating_add(RocksDbWeight::get().reads(1 as Weight)) .saturating_add(RocksDbWeight::get().writes(1 as Weight)) } // Storage: Common CollectionById (r:1 w:1) fn set_transfers_enabled_flag() -> Weight { - (9_734_000 as Weight) + (10_941_000 as Weight) .saturating_add(RocksDbWeight::get().reads(1 as Weight)) .saturating_add(RocksDbWeight::get().writes(1 as Weight)) } // Storage: Common CollectionById (r:1 w:1) fn set_collection_limits() -> Weight { - (17_998_000 as Weight) + (22_363_000 as Weight) .saturating_add(RocksDbWeight::get().reads(1 as Weight)) .saturating_add(RocksDbWeight::get().writes(1 as Weight)) } --- a/runtime/common/src/weights.rs +++ b/runtime/common/src/weights.rs @@ -16,11 +16,13 @@ use core::marker::PhantomData; use frame_support::{weights::Weight}; -use pallet_common::{CommonWeightInfo, dispatch::dispatch_weight}; +use pallet_common::{CommonWeightInfo, dispatch::dispatch_weight, RefungibleExtensionsWeightInfo}; use pallet_fungible::{Config as FungibleConfig, common::CommonWeights as FungibleWeights}; use pallet_nonfungible::{Config as NonfungibleConfig, common::CommonWeights as NonfungibleWeights}; -use pallet_refungible::{Config as RefungibleConfig, common::CommonWeights as RefungibleWeights}; +use pallet_refungible::{ + Config as RefungibleConfig, weights::WeightInfo, common::CommonWeights as RefungibleWeights, +}; use up_data_structs::{CreateItemExData, CreateItemData}; macro_rules! max_weight_of { @@ -98,3 +100,12 @@ max_weight_of!(burn_recursively_breadth_raw(amount)) } } + +impl RefungibleExtensionsWeightInfo for CommonWeights +where + T: FungibleConfig + NonfungibleConfig + RefungibleConfig, +{ + fn repartition() -> Weight { + dispatch_weight::() + <::WeightInfo>::repartition_item() + } +} --- a/runtime/opal/src/lib.rs +++ b/runtime/opal/src/lib.rs @@ -925,6 +925,7 @@ type Event = Event; type WeightInfo = pallet_unique::weights::SubstrateWeight; type CommonWeightInfo = CommonWeights; + type RefungibleExtensionsWeightInfo = CommonWeights; } parameter_types! { --- a/runtime/tests/src/lib.rs +++ b/runtime/tests/src/lib.rs @@ -255,6 +255,7 @@ type Event = (); type WeightInfo = (); type CommonWeightInfo = CommonWeights; + type RefungibleExtensionsWeightInfo = CommonWeights; } // Build genesis storage according to the mock runtime. --- 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, TokenChild, + CollectionPropertiesPermissionsVec, }; use frame_support::{assert_noop, assert_ok, assert_err}; use sp_std::convert::TryInto; --- a/tests/package.json +++ b/tests/package.json @@ -78,6 +78,7 @@ "testEnableDisableTransfers": "mocha --timeout 9999999 -r ts-node/register ./**/enableDisableTransfer.test.ts", "testLimits": "mocha --timeout 9999999 -r ts-node/register ./**/limits.test.ts", "testEthCreateCollection": "mocha --timeout 9999999 -r ts-node/register ./**/eth/createCollection.test.ts", + "testRFT": "mocha --timeout 9999999 -r ts-node/register ./**/refungible.test.ts", "polkadot-types-fetch-metadata": "curl -H 'Content-Type: application/json' -d '{\"id\":\"1\", \"jsonrpc\":\"2.0\", \"method\": \"state_getMetadata\", \"params\":[]}' http://localhost:9933 > src/interfaces/metadata.json", "polkadot-types-from-defs": "ts-node ./node_modules/.bin/polkadot-types-from-defs --endpoint src/interfaces/metadata.json --input src/interfaces/ --package .", "polkadot-types-from-chain": "ts-node ./node_modules/.bin/polkadot-types-from-chain --endpoint src/interfaces/metadata.json --output src/interfaces/ --package .", --- a/tests/src/interfaces/augment-api-consts.ts +++ b/tests/src/interfaces/augment-api-consts.ts @@ -2,10 +2,10 @@ /* eslint-disable */ import type { ApiTypes } from '@polkadot/api-base/types'; -import type { Option, Vec, u128, u16, u32, u64, u8 } from '@polkadot/types-codec'; +import type { Option, u128, u16, u32, u64, u8 } from '@polkadot/types-codec'; import type { Codec } from '@polkadot/types-codec/types'; import type { Permill } from '@polkadot/types/interfaces/runtime'; -import type { FrameSupportPalletId, FrameSupportWeightsRuntimeDbWeight, FrameSupportWeightsWeightToFeeCoefficient, FrameSystemLimitsBlockLength, FrameSystemLimitsBlockWeights, SpVersionRuntimeVersion } from '@polkadot/types/lookup'; +import type { FrameSupportPalletId, FrameSupportWeightsRuntimeDbWeight, FrameSystemLimitsBlockLength, FrameSystemLimitsBlockWeights, SpVersionRuntimeVersion } from '@polkadot/types/lookup'; declare module '@polkadot/api-base/types/consts' { export interface AugmentedConsts { @@ -110,10 +110,6 @@ [key: string]: Codec; }; transactionPayment: { - /** - * The polynomial that is applied in order to derive fee from length. - **/ - lengthToFee: Vec & AugmentedConst; /** * A fee mulitplier for `Operational` extrinsics to compute "virtual tip" to boost their * `priority` @@ -138,10 +134,6 @@ * transactions. **/ operationalFeeMultiplier: u8 & AugmentedConst; - /** - * The polynomial that is applied in order to derive fee from weight. - **/ - weightToFee: Vec & AugmentedConst; /** * Generic const **/ --- a/tests/src/interfaces/augment-api-errors.ts +++ b/tests/src/interfaces/augment-api-errors.ts @@ -429,6 +429,10 @@ **/ RefungibleDisallowsNesting: AugmentedError; /** + * Refungible token can't be repartitioned by user who isn't owns all pieces + **/ + RepartitionWhileNotOwningAllPieces: AugmentedError; + /** * Setting item properties is not allowed **/ SettingPropertiesNotAllowed: AugmentedError; @@ -444,6 +448,7 @@ rmrkCore: { CannotAcceptNonOwnedNft: AugmentedError; CannotRejectNonOwnedNft: AugmentedError; + CannotRejectNonPendingNft: AugmentedError; CannotSendToDescendentOrSelf: AugmentedError; CollectionFullOrLocked: AugmentedError; CollectionNotEmpty: AugmentedError; @@ -452,10 +457,12 @@ NftTypeEncodeError: AugmentedError; NoAvailableCollectionId: AugmentedError; NoAvailableNftId: AugmentedError; + NoAvailableResourceId: AugmentedError; NonTransferable: AugmentedError; NoPermission: AugmentedError; ResourceDoesntExist: AugmentedError; ResourceNotPending: AugmentedError; + RmrkPropertyIsNotFound: AugmentedError; RmrkPropertyKeyIsTooLong: AugmentedError; RmrkPropertyValueIsTooLong: AugmentedError; UnableToDecodeRmrkData: AugmentedError; @@ -469,6 +476,8 @@ NeedsDefaultThemeFirst: AugmentedError; NoAvailableBaseId: AugmentedError; NoAvailablePartId: AugmentedError; + NoEquippableOnFixedPart: AugmentedError; + PartDoesntExist: AugmentedError; PermissionError: AugmentedError; /** * Generic error @@ -599,6 +608,10 @@ **/ EmptyArgument: AugmentedError; /** + * Repertition is only supported by refungible collection + **/ + RepartitionCalledOnNonRefungibleCollection: AugmentedError; + /** * Generic error **/ [key: string]: AugmentedError; --- a/tests/src/interfaces/augment-api-events.ts +++ b/tests/src/interfaces/augment-api-events.ts @@ -166,34 +166,28 @@ dmpQueue: { /** * Downward message executed with the given outcome. - * \[ id, outcome \] **/ - ExecutedDownward: AugmentedEvent; + ExecutedDownward: AugmentedEvent; /** * Downward message is invalid XCM. - * \[ id \] **/ - InvalidFormat: AugmentedEvent; + InvalidFormat: AugmentedEvent; /** * Downward message is overweight and was placed in the overweight queue. - * \[ id, index, required \] **/ - OverweightEnqueued: AugmentedEvent; + OverweightEnqueued: AugmentedEvent; /** * Downward message from the overweight queue was executed. - * \[ index, used \] **/ - OverweightServiced: AugmentedEvent; + OverweightServiced: AugmentedEvent; /** * Downward message is unsupported version of XCM. - * \[ id \] **/ - UnsupportedVersion: AugmentedEvent; + UnsupportedVersion: AugmentedEvent; /** * The weight limit for handling downward messages was reached. - * \[ id, remaining, required \] **/ - WeightExhausted: AugmentedEvent; + WeightExhausted: AugmentedEvent; /** * Generic event **/ @@ -246,22 +240,20 @@ parachainSystem: { /** * Downward messages were processed using the given weight. - * \[ weight_used, result_mqc_head \] **/ - DownwardMessagesProcessed: AugmentedEvent; + DownwardMessagesProcessed: AugmentedEvent; /** * Some downward messages have been received and will be processed. - * \[ count \] **/ - DownwardMessagesReceived: AugmentedEvent; + DownwardMessagesReceived: AugmentedEvent; /** * An upgrade has been authorized. **/ - UpgradeAuthorized: AugmentedEvent; + UpgradeAuthorized: AugmentedEvent; /** * The validation function was applied as of the contained relay chain block number. **/ - ValidationFunctionApplied: AugmentedEvent; + ValidationFunctionApplied: AugmentedEvent; /** * The relay-chain aborted the upgrade process. **/ @@ -420,6 +412,7 @@ }; rmrkEquip: { BaseCreated: AugmentedEvent; + EquippablesUpdated: AugmentedEvent; /** * Generic event **/ --- 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, U8aFixed, 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, PalletUniqueSchedulerScheduledV3, PhantomTypeUpDataStructs, PolkadotCorePrimitivesOutboundHrmpMessage, PolkadotPrimitivesV2AbridgedHostConfiguration, PolkadotPrimitivesV2PersistedValidationData, PolkadotPrimitivesV2UpgradeRestriction, SpRuntimeDigest, SpTrieStorageProof, UpDataStructsCollection, UpDataStructsCollectionStats, UpDataStructsProperties, UpDataStructsPropertiesMapPropertyPermission, UpDataStructsPropertyPermission, UpDataStructsTokenChild } 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, PalletUniqueSchedulerScheduledV3, PhantomTypeUpDataStructs, PolkadotCorePrimitivesOutboundHrmpMessage, PolkadotPrimitivesV2AbridgedHostConfiguration, PolkadotPrimitivesV2PersistedValidationData, PolkadotPrimitivesV2UpgradeRestriction, SpRuntimeDigest, SpTrieStorageProof, UpDataStructsCollection, UpDataStructsCollectionStats, UpDataStructsProperties, UpDataStructsPropertiesMapPropertyPermission, UpDataStructsPropertyPermission, UpDataStructsPropertyScope, UpDataStructsTokenChild } from '@polkadot/types/lookup'; import type { Observable } from '@polkadot/types/types'; declare module '@polkadot/api-base/types/storage' { @@ -228,6 +228,7 @@ * Used to enumerate tokens owned by account **/ owned: AugmentedQuery Observable, [u32, PalletEvmAccountBasicCrossAccountIdRepr, u32]> & QueryableStorageEntry; + tokenAuxProperties: AugmentedQuery Observable>, [u32, u32, UpDataStructsPropertyScope, Bytes]> & QueryableStorageEntry; /** * Used to enumerate token's children **/ --- a/tests/src/interfaces/augment-api-tx.ts +++ b/tests/src/interfaces/augment-api-tx.ts @@ -5,7 +5,7 @@ import type { Bytes, Compact, Option, U256, U8aFixed, Vec, bool, u128, u16, u32, u64, u8 } from '@polkadot/types-codec'; import type { AnyNumber, IMethod, ITuple } from '@polkadot/types-codec/types'; import type { AccountId32, Call, H160, H256, MultiAddress, Perbill, Permill } from '@polkadot/types/interfaces/runtime'; -import type { CumulusPrimitivesParachainInherentParachainInherentData, EthereumTransactionTransactionV2, FrameSupportScheduleMaybeHashed, OrmlVestingVestingSchedule, PalletEvmAccountBasicCrossAccountIdRepr, RmrkTraitsNftAccountIdOrCollectionNftTuple, RmrkTraitsPartPartType, RmrkTraitsResourceBasicResource, RmrkTraitsResourceComposableResource, RmrkTraitsResourceResourceTypes, RmrkTraitsResourceSlotResource, RmrkTraitsTheme, UpDataStructsCollectionLimits, UpDataStructsCollectionMode, UpDataStructsCollectionPermissions, UpDataStructsCreateCollectionData, UpDataStructsCreateItemData, UpDataStructsCreateItemExData, UpDataStructsProperty, UpDataStructsPropertyKeyPermission, XcmV1MultiLocation, XcmV2WeightLimit, XcmVersionedMultiAssets, XcmVersionedMultiLocation, XcmVersionedXcm } from '@polkadot/types/lookup'; +import type { CumulusPrimitivesParachainInherentParachainInherentData, EthereumTransactionTransactionV2, FrameSupportScheduleMaybeHashed, OrmlVestingVestingSchedule, PalletEvmAccountBasicCrossAccountIdRepr, RmrkTraitsNftAccountIdOrCollectionNftTuple, RmrkTraitsPartEquippableList, RmrkTraitsPartPartType, RmrkTraitsResourceBasicResource, RmrkTraitsResourceComposableResource, RmrkTraitsResourceResourceTypes, RmrkTraitsResourceSlotResource, RmrkTraitsTheme, UpDataStructsCollectionLimits, UpDataStructsCollectionMode, UpDataStructsCollectionPermissions, UpDataStructsCreateCollectionData, UpDataStructsCreateItemData, UpDataStructsCreateItemExData, UpDataStructsProperty, UpDataStructsPropertyKeyPermission, XcmV1MultiLocation, XcmV2WeightLimit, XcmVersionedMultiAssets, XcmVersionedMultiLocation, XcmVersionedXcm } from '@polkadot/types/lookup'; declare module '@polkadot/api-base/types/submittable' { export interface AugmentedSubmittables { @@ -361,11 +361,11 @@ /** * accept the addition of a new resource to an existing NFT **/ - acceptResource: AugmentedSubmittable<(rmrkCollectionId: u32 | AnyNumber | Uint8Array, rmrkNftId: u32 | AnyNumber | Uint8Array, rmrkResourceId: u32 | AnyNumber | Uint8Array) => SubmittableExtrinsic, [u32, u32, u32]>; + acceptResource: AugmentedSubmittable<(rmrkCollectionId: u32 | AnyNumber | Uint8Array, rmrkNftId: u32 | AnyNumber | Uint8Array, resourceId: u32 | AnyNumber | Uint8Array) => SubmittableExtrinsic, [u32, u32, u32]>; /** * accept the removal of a resource of an existing NFT **/ - acceptResourceRemoval: AugmentedSubmittable<(rmrkCollectionId: u32 | AnyNumber | Uint8Array, rmrkNftId: u32 | AnyNumber | Uint8Array, rmrkResourceId: u32 | AnyNumber | Uint8Array) => SubmittableExtrinsic, [u32, u32, u32]>; + acceptResourceRemoval: AugmentedSubmittable<(rmrkCollectionId: u32 | AnyNumber | Uint8Array, rmrkNftId: u32 | AnyNumber | Uint8Array, resourceId: u32 | AnyNumber | Uint8Array) => SubmittableExtrinsic, [u32, u32, u32]>; /** * Create basic resource **/ @@ -415,7 +415,7 @@ * - `metadata`: Arbitrary data about an nft, e.g. IPFS hash * - `transferable`: Ability to transfer this NFT **/ - mintNft: AugmentedSubmittable<(owner: AccountId32 | string | Uint8Array, collectionId: u32 | AnyNumber | Uint8Array, recipient: Option | null | object | string | Uint8Array, royaltyAmount: Option | null | object | string | Uint8Array, metadata: Bytes | string | Uint8Array, transferable: bool | boolean | Uint8Array, resources: Option> | null | object | string | Uint8Array) => SubmittableExtrinsic, [AccountId32, u32, Option, Option, Bytes, bool, Option>]>; + mintNft: AugmentedSubmittable<(owner: Option | null | object | string | Uint8Array, collectionId: u32 | AnyNumber | Uint8Array, recipient: Option | null | object | string | Uint8Array, royaltyAmount: Option | null | object | string | Uint8Array, metadata: Bytes | string | Uint8Array, transferable: bool | boolean | Uint8Array, resources: Option> | null | object | string | Uint8Array) => SubmittableExtrinsic, [Option, u32, Option, Option, Bytes, bool, Option>]>; /** * Rejects an NFT sent from another account to self or owned NFT * @@ -465,6 +465,7 @@ * RmrkPartsLimit **/ createBase: AugmentedSubmittable<(baseType: Bytes | string | Uint8Array, symbol: Bytes | string | Uint8Array, parts: Vec | (RmrkTraitsPartPartType | { FixedPart: any } | { SlotPart: any } | string | Uint8Array)[]) => SubmittableExtrinsic, [Bytes, Bytes, Vec]>; + equippable: AugmentedSubmittable<(baseId: u32 | AnyNumber | Uint8Array, slotId: u32 | AnyNumber | Uint8Array, equippables: RmrkTraitsPartEquippableList | { All: any } | { Empty: any } | { Custom: any } | string | Uint8Array) => SubmittableExtrinsic, [u32, u32, RmrkTraitsPartEquippableList]>; /** * Adds a Theme to a Base. * Modeled after [themeadd interaction](https://github.com/rmrk-team/rmrk-spec/blob/master/standards/rmrk2.0.0/interactions/themeadd.md) @@ -959,6 +960,7 @@ * * address. **/ removeFromAllowList: AugmentedSubmittable<(collectionId: u32 | AnyNumber | Uint8Array, address: PalletEvmAccountBasicCrossAccountIdRepr | { Substrate: any } | { Ethereum: any } | string | Uint8Array) => SubmittableExtrinsic, [u32, PalletEvmAccountBasicCrossAccountIdRepr]>; + repartition: AugmentedSubmittable<(collectionId: u32 | AnyNumber | Uint8Array, token: u32 | AnyNumber | Uint8Array, amount: u128 | AnyNumber | Uint8Array) => SubmittableExtrinsic, [u32, u32, u128]>; setCollectionLimits: AugmentedSubmittable<(collectionId: u32 | AnyNumber | Uint8Array, newLimit: UpDataStructsCollectionLimits | { accountTokenOwnershipLimit?: any; sponsoredDataSize?: any; sponsoredDataRateLimit?: any; tokenLimit?: any; sponsorTransferTimeout?: any; sponsorApproveTimeout?: any; ownerCanTransfer?: any; ownerCanDestroy?: any; transfersEnabled?: any } | string | Uint8Array) => SubmittableExtrinsic, [u32, UpDataStructsCollectionLimits]>; setCollectionPermissions: AugmentedSubmittable<(collectionId: u32 | AnyNumber | Uint8Array, newLimit: UpDataStructsCollectionPermissions | { access?: any; mintMode?: any; nesting?: any } | string | Uint8Array) => SubmittableExtrinsic, [u32, UpDataStructsCollectionPermissions]>; setCollectionProperties: AugmentedSubmittable<(collectionId: u32 | AnyNumber | Uint8Array, properties: Vec | (UpDataStructsProperty | { key?: any; value?: any } | string | Uint8Array)[]) => SubmittableExtrinsic, [u32, Vec]>; --- 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, CumulusPalletXcmOrigin, 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, FrameSupportDispatchRawOrigin, FrameSupportPalletId, FrameSupportScheduleLookupError, FrameSupportScheduleMaybeHashed, FrameSupportTokensMiscBalanceStatus, FrameSupportWeightsDispatchClass, FrameSupportWeightsDispatchInfo, FrameSupportWeightsPays, FrameSupportWeightsPerDispatchClassU32, FrameSupportWeightsPerDispatchClassU64, FrameSupportWeightsPerDispatchClassWeightsPerClass, FrameSupportWeightsRuntimeDbWeight, FrameSupportWeightsWeightToFeeCoefficient, FrameSystemAccountInfo, FrameSystemCall, FrameSystemError, FrameSystemEvent, FrameSystemEventRecord, FrameSystemExtensionsCheckGenesis, FrameSystemExtensionsCheckNonce, FrameSystemExtensionsCheckSpecVersion, FrameSystemExtensionsCheckWeight, FrameSystemLastRuntimeUpgradeInfo, FrameSystemLimitsBlockLength, FrameSystemLimitsBlockWeights, FrameSystemLimitsWeightsPerClass, FrameSystemPhase, OpalRuntimeOriginCaller, OpalRuntimeRuntime, OrmlVestingModuleCall, OrmlVestingModuleError, OrmlVestingModuleEvent, OrmlVestingVestingSchedule, PalletBalancesAccountData, PalletBalancesBalanceLock, PalletBalancesCall, PalletBalancesError, PalletBalancesEvent, PalletBalancesReasons, PalletBalancesReleases, PalletBalancesReserveData, PalletCommonError, PalletCommonEvent, PalletEthereumCall, PalletEthereumError, PalletEthereumEvent, PalletEthereumFakeTransactionFinalizer, PalletEthereumRawOrigin, PalletEvmAccountBasicCrossAccountIdRepr, PalletEvmCall, PalletEvmCoderSubstrateError, PalletEvmContractHelpersError, PalletEvmContractHelpersSponsoringModeT, PalletEvmError, PalletEvmEvent, PalletEvmMigrationCall, PalletEvmMigrationError, PalletFungibleError, PalletInflationCall, PalletNonfungibleError, PalletNonfungibleItemData, PalletRefungibleError, PalletRefungibleItemData, PalletRmrkCoreCall, PalletRmrkCoreError, PalletRmrkCoreEvent, PalletRmrkEquipCall, PalletRmrkEquipError, PalletRmrkEquipEvent, PalletStructureCall, PalletStructureError, PalletStructureEvent, PalletSudoCall, PalletSudoError, PalletSudoEvent, PalletTemplateTransactionPaymentCall, PalletTemplateTransactionPaymentChargeTransactionPayment, PalletTimestampCall, PalletTransactionPaymentReleases, PalletTreasuryCall, PalletTreasuryError, PalletTreasuryEvent, PalletTreasuryProposal, PalletUniqueCall, PalletUniqueError, PalletUniqueRawEvent, PalletUniqueSchedulerCall, PalletUniqueSchedulerError, PalletUniqueSchedulerEvent, PalletUniqueSchedulerScheduledV3, PalletXcmCall, PalletXcmError, PalletXcmEvent, PalletXcmOrigin, PhantomTypeUpDataStructs, PolkadotCorePrimitivesInboundDownwardMessage, PolkadotCorePrimitivesInboundHrmpMessage, PolkadotCorePrimitivesOutboundHrmpMessage, PolkadotParachainPrimitivesXcmpMessageFormat, PolkadotPrimitivesV2AbridgedHostConfiguration, PolkadotPrimitivesV2AbridgedHrmpChannel, PolkadotPrimitivesV2PersistedValidationData, PolkadotPrimitivesV2UpgradeRestriction, RmrkTraitsBaseBaseInfo, RmrkTraitsCollectionCollectionInfo, RmrkTraitsNftAccountIdOrCollectionNftTuple, RmrkTraitsNftNftChild, RmrkTraitsNftNftInfo, RmrkTraitsNftRoyaltyInfo, RmrkTraitsPartEquippableList, RmrkTraitsPartFixedPart, RmrkTraitsPartPartType, RmrkTraitsPartSlotPart, RmrkTraitsPropertyPropertyInfo, RmrkTraitsResourceBasicResource, RmrkTraitsResourceComposableResource, RmrkTraitsResourceResourceInfo, RmrkTraitsResourceResourceTypes, RmrkTraitsResourceSlotResource, RmrkTraitsTheme, RmrkTraitsThemeThemeProperty, SpCoreEcdsaSignature, SpCoreEd25519Signature, SpCoreSr25519Signature, SpCoreVoid, SpRuntimeArithmeticError, SpRuntimeDigest, SpRuntimeDigestDigestItem, SpRuntimeDispatchError, SpRuntimeModuleError, SpRuntimeMultiSignature, SpRuntimeTokenError, SpRuntimeTransactionalError, SpTrieStorageProof, SpVersionRuntimeVersion, UpDataStructsAccessMode, UpDataStructsCollection, UpDataStructsCollectionLimits, UpDataStructsCollectionMode, UpDataStructsCollectionPermissions, UpDataStructsCollectionStats, UpDataStructsCreateCollectionData, UpDataStructsCreateFungibleData, UpDataStructsCreateItemData, UpDataStructsCreateItemExData, UpDataStructsCreateNftData, UpDataStructsCreateNftExData, UpDataStructsCreateReFungibleData, UpDataStructsCreateRefungibleExData, UpDataStructsNestingPermissions, UpDataStructsOwnerRestrictedSet, UpDataStructsProperties, UpDataStructsPropertiesMapBoundedVec, UpDataStructsPropertiesMapPropertyPermission, UpDataStructsProperty, UpDataStructsPropertyKeyPermission, UpDataStructsPropertyPermission, 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 { CumulusPalletDmpQueueCall, CumulusPalletDmpQueueConfigData, CumulusPalletDmpQueueError, CumulusPalletDmpQueueEvent, CumulusPalletDmpQueuePageIndexData, CumulusPalletParachainSystemCall, CumulusPalletParachainSystemError, CumulusPalletParachainSystemEvent, CumulusPalletParachainSystemRelayStateSnapshotMessagingStateSnapshot, CumulusPalletXcmCall, CumulusPalletXcmError, CumulusPalletXcmEvent, CumulusPalletXcmOrigin, 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, FrameSupportDispatchRawOrigin, FrameSupportPalletId, FrameSupportScheduleLookupError, FrameSupportScheduleMaybeHashed, FrameSupportTokensMiscBalanceStatus, FrameSupportWeightsDispatchClass, FrameSupportWeightsDispatchInfo, FrameSupportWeightsPays, FrameSupportWeightsPerDispatchClassU32, FrameSupportWeightsPerDispatchClassU64, FrameSupportWeightsPerDispatchClassWeightsPerClass, FrameSupportWeightsRuntimeDbWeight, FrameSystemAccountInfo, FrameSystemCall, FrameSystemError, FrameSystemEvent, FrameSystemEventRecord, FrameSystemExtensionsCheckGenesis, FrameSystemExtensionsCheckNonce, FrameSystemExtensionsCheckSpecVersion, FrameSystemExtensionsCheckWeight, FrameSystemLastRuntimeUpgradeInfo, FrameSystemLimitsBlockLength, FrameSystemLimitsBlockWeights, FrameSystemLimitsWeightsPerClass, FrameSystemPhase, OpalRuntimeOriginCaller, OpalRuntimeRuntime, OrmlVestingModuleCall, OrmlVestingModuleError, OrmlVestingModuleEvent, OrmlVestingVestingSchedule, PalletBalancesAccountData, PalletBalancesBalanceLock, PalletBalancesCall, PalletBalancesError, PalletBalancesEvent, PalletBalancesReasons, PalletBalancesReleases, PalletBalancesReserveData, PalletCommonError, PalletCommonEvent, PalletEthereumCall, PalletEthereumError, PalletEthereumEvent, PalletEthereumFakeTransactionFinalizer, PalletEthereumRawOrigin, PalletEvmAccountBasicCrossAccountIdRepr, PalletEvmCall, PalletEvmCoderSubstrateError, PalletEvmContractHelpersError, PalletEvmContractHelpersSponsoringModeT, PalletEvmError, PalletEvmEvent, PalletEvmMigrationCall, PalletEvmMigrationError, PalletFungibleError, PalletInflationCall, PalletNonfungibleError, PalletNonfungibleItemData, PalletRefungibleError, PalletRefungibleItemData, PalletRmrkCoreCall, PalletRmrkCoreError, PalletRmrkCoreEvent, PalletRmrkEquipCall, PalletRmrkEquipError, PalletRmrkEquipEvent, PalletStructureCall, PalletStructureError, PalletStructureEvent, PalletSudoCall, PalletSudoError, PalletSudoEvent, PalletTemplateTransactionPaymentCall, PalletTemplateTransactionPaymentChargeTransactionPayment, PalletTimestampCall, PalletTransactionPaymentReleases, PalletTreasuryCall, PalletTreasuryError, PalletTreasuryEvent, PalletTreasuryProposal, PalletUniqueCall, PalletUniqueError, PalletUniqueRawEvent, PalletUniqueSchedulerCall, PalletUniqueSchedulerError, PalletUniqueSchedulerEvent, PalletUniqueSchedulerScheduledV3, PalletXcmCall, PalletXcmError, PalletXcmEvent, PalletXcmOrigin, PhantomTypeUpDataStructs, PolkadotCorePrimitivesInboundDownwardMessage, PolkadotCorePrimitivesInboundHrmpMessage, PolkadotCorePrimitivesOutboundHrmpMessage, PolkadotParachainPrimitivesXcmpMessageFormat, PolkadotPrimitivesV2AbridgedHostConfiguration, PolkadotPrimitivesV2AbridgedHrmpChannel, PolkadotPrimitivesV2PersistedValidationData, PolkadotPrimitivesV2UpgradeRestriction, RmrkTraitsBaseBaseInfo, RmrkTraitsCollectionCollectionInfo, RmrkTraitsNftAccountIdOrCollectionNftTuple, RmrkTraitsNftNftChild, RmrkTraitsNftNftInfo, RmrkTraitsNftRoyaltyInfo, RmrkTraitsPartEquippableList, RmrkTraitsPartFixedPart, RmrkTraitsPartPartType, RmrkTraitsPartSlotPart, RmrkTraitsPropertyPropertyInfo, RmrkTraitsResourceBasicResource, RmrkTraitsResourceComposableResource, RmrkTraitsResourceResourceInfo, RmrkTraitsResourceResourceTypes, RmrkTraitsResourceSlotResource, RmrkTraitsTheme, RmrkTraitsThemeThemeProperty, SpCoreEcdsaSignature, SpCoreEd25519Signature, SpCoreSr25519Signature, SpCoreVoid, SpRuntimeArithmeticError, SpRuntimeDigest, SpRuntimeDigestDigestItem, SpRuntimeDispatchError, SpRuntimeModuleError, SpRuntimeMultiSignature, SpRuntimeTokenError, SpRuntimeTransactionalError, SpTrieStorageProof, SpVersionRuntimeVersion, UpDataStructsAccessMode, UpDataStructsCollection, UpDataStructsCollectionLimits, UpDataStructsCollectionMode, UpDataStructsCollectionPermissions, UpDataStructsCollectionStats, UpDataStructsCreateCollectionData, UpDataStructsCreateFungibleData, UpDataStructsCreateItemData, UpDataStructsCreateItemExData, UpDataStructsCreateNftData, UpDataStructsCreateNftExData, UpDataStructsCreateReFungibleData, UpDataStructsCreateRefungibleExData, UpDataStructsNestingPermissions, UpDataStructsOwnerRestrictedSet, UpDataStructsProperties, UpDataStructsPropertiesMapBoundedVec, UpDataStructsPropertiesMapPropertyPermission, UpDataStructsProperty, UpDataStructsPropertyKeyPermission, UpDataStructsPropertyPermission, UpDataStructsPropertyScope, 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'; @@ -489,7 +489,6 @@ FrameSupportWeightsPerDispatchClassU64: FrameSupportWeightsPerDispatchClassU64; FrameSupportWeightsPerDispatchClassWeightsPerClass: FrameSupportWeightsPerDispatchClassWeightsPerClass; FrameSupportWeightsRuntimeDbWeight: FrameSupportWeightsRuntimeDbWeight; - FrameSupportWeightsWeightToFeeCoefficient: FrameSupportWeightsWeightToFeeCoefficient; FrameSystemAccountInfo: FrameSystemAccountInfo; FrameSystemCall: FrameSystemCall; FrameSystemError: FrameSystemError; @@ -1226,6 +1225,7 @@ UpDataStructsProperty: UpDataStructsProperty; UpDataStructsPropertyKeyPermission: UpDataStructsPropertyKeyPermission; UpDataStructsPropertyPermission: UpDataStructsPropertyPermission; + UpDataStructsPropertyScope: UpDataStructsPropertyScope; UpDataStructsRpcCollection: UpDataStructsRpcCollection; UpDataStructsSponsoringRateLimit: UpDataStructsSponsoringRateLimit; UpDataStructsSponsorshipState: UpDataStructsSponsorshipState; --- a/tests/src/interfaces/default/types.ts +++ b/tests/src/interfaces/default/types.ts @@ -31,17 +31,35 @@ /** @name CumulusPalletDmpQueueEvent */ export interface CumulusPalletDmpQueueEvent extends Enum { readonly isInvalidFormat: boolean; - readonly asInvalidFormat: U8aFixed; + readonly asInvalidFormat: { + readonly messageId: U8aFixed; + } & Struct; readonly isUnsupportedVersion: boolean; - readonly asUnsupportedVersion: U8aFixed; + readonly asUnsupportedVersion: { + readonly messageId: U8aFixed; + } & Struct; readonly isExecutedDownward: boolean; - readonly asExecutedDownward: ITuple<[U8aFixed, XcmV2TraitsOutcome]>; + readonly asExecutedDownward: { + readonly messageId: U8aFixed; + readonly outcome: XcmV2TraitsOutcome; + } & Struct; readonly isWeightExhausted: boolean; - readonly asWeightExhausted: ITuple<[U8aFixed, u64, u64]>; + readonly asWeightExhausted: { + readonly messageId: U8aFixed; + readonly remainingWeight: u64; + readonly requiredWeight: u64; + } & Struct; readonly isOverweightEnqueued: boolean; - readonly asOverweightEnqueued: ITuple<[U8aFixed, u64, u64]>; + readonly asOverweightEnqueued: { + readonly messageId: U8aFixed; + readonly overweightIndex: u64; + readonly requiredWeight: u64; + } & Struct; readonly isOverweightServiced: boolean; - readonly asOverweightServiced: ITuple<[u64, u64]>; + readonly asOverweightServiced: { + readonly overweightIndex: u64; + readonly weightUsed: u64; + } & Struct; readonly type: 'InvalidFormat' | 'UnsupportedVersion' | 'ExecutedDownward' | 'WeightExhausted' | 'OverweightEnqueued' | 'OverweightServiced'; } @@ -90,14 +108,23 @@ export interface CumulusPalletParachainSystemEvent extends Enum { readonly isValidationFunctionStored: boolean; readonly isValidationFunctionApplied: boolean; - readonly asValidationFunctionApplied: u32; + readonly asValidationFunctionApplied: { + readonly relayChainBlockNum: u32; + } & Struct; readonly isValidationFunctionDiscarded: boolean; readonly isUpgradeAuthorized: boolean; - readonly asUpgradeAuthorized: H256; + readonly asUpgradeAuthorized: { + readonly codeHash: H256; + } & Struct; readonly isDownwardMessagesReceived: boolean; - readonly asDownwardMessagesReceived: u32; + readonly asDownwardMessagesReceived: { + readonly count: u32; + } & Struct; readonly isDownwardMessagesProcessed: boolean; - readonly asDownwardMessagesProcessed: ITuple<[u64, H256]>; + readonly asDownwardMessagesProcessed: { + readonly weightUsed: u64; + readonly dmqHead: H256; + } & Struct; readonly type: 'ValidationFunctionStored' | 'ValidationFunctionApplied' | 'ValidationFunctionDiscarded' | 'UpgradeAuthorized' | 'DownwardMessagesReceived' | 'DownwardMessagesProcessed'; } @@ -535,14 +562,6 @@ readonly write: u64; } -/** @name FrameSupportWeightsWeightToFeeCoefficient */ -export interface FrameSupportWeightsWeightToFeeCoefficient extends Struct { - readonly coeffInteger: u128; - readonly coeffFrac: Perbill; - readonly negative: bool; - readonly degree: u8; -} - /** @name FrameSystemAccountInfo */ export interface FrameSystemAccountInfo extends Struct { readonly nonce: u32; @@ -1175,9 +1194,10 @@ export interface PalletRefungibleError extends Enum { readonly isNotRefungibleDataUsedToMintFungibleCollectionToken: boolean; readonly isWrongRefungiblePieces: boolean; + readonly isRepartitionWhileNotOwningAllPieces: boolean; readonly isRefungibleDisallowsNesting: boolean; readonly isSettingPropertiesNotAllowed: boolean; - readonly type: 'NotRefungibleDataUsedToMintFungibleCollectionToken' | 'WrongRefungiblePieces' | 'RefungibleDisallowsNesting' | 'SettingPropertiesNotAllowed'; + readonly type: 'NotRefungibleDataUsedToMintFungibleCollectionToken' | 'WrongRefungiblePieces' | 'RepartitionWhileNotOwningAllPieces' | 'RefungibleDisallowsNesting' | 'SettingPropertiesNotAllowed'; } /** @name PalletRefungibleItemData */ @@ -1208,7 +1228,7 @@ } & Struct; readonly isMintNft: boolean; readonly asMintNft: { - readonly owner: AccountId32; + readonly owner: Option; readonly collectionId: u32; readonly recipient: Option; readonly royaltyAmount: Option; @@ -1243,13 +1263,13 @@ readonly asAcceptResource: { readonly rmrkCollectionId: u32; readonly rmrkNftId: u32; - readonly rmrkResourceId: u32; + readonly resourceId: u32; } & Struct; readonly isAcceptResourceRemoval: boolean; readonly asAcceptResourceRemoval: { readonly rmrkCollectionId: u32; readonly rmrkNftId: u32; - readonly rmrkResourceId: u32; + readonly resourceId: u32; } & Struct; readonly isSetProperty: boolean; readonly asSetProperty: { @@ -1297,6 +1317,7 @@ readonly isNftTypeEncodeError: boolean; readonly isRmrkPropertyKeyIsTooLong: boolean; readonly isRmrkPropertyValueIsTooLong: boolean; + readonly isRmrkPropertyIsNotFound: boolean; readonly isUnableToDecodeRmrkData: boolean; readonly isCollectionNotEmpty: boolean; readonly isNoAvailableCollectionId: boolean; @@ -1309,8 +1330,10 @@ readonly isCannotSendToDescendentOrSelf: boolean; readonly isCannotAcceptNonOwnedNft: boolean; readonly isCannotRejectNonOwnedNft: boolean; + readonly isCannotRejectNonPendingNft: boolean; readonly isResourceNotPending: boolean; - readonly type: 'CorruptedCollectionType' | 'NftTypeEncodeError' | 'RmrkPropertyKeyIsTooLong' | 'RmrkPropertyValueIsTooLong' | 'UnableToDecodeRmrkData' | 'CollectionNotEmpty' | 'NoAvailableCollectionId' | 'NoAvailableNftId' | 'CollectionUnknown' | 'NoPermission' | 'NonTransferable' | 'CollectionFullOrLocked' | 'ResourceDoesntExist' | 'CannotSendToDescendentOrSelf' | 'CannotAcceptNonOwnedNft' | 'CannotRejectNonOwnedNft' | 'ResourceNotPending'; + readonly isNoAvailableResourceId: boolean; + readonly type: 'CorruptedCollectionType' | 'NftTypeEncodeError' | 'RmrkPropertyKeyIsTooLong' | 'RmrkPropertyValueIsTooLong' | 'RmrkPropertyIsNotFound' | 'UnableToDecodeRmrkData' | 'CollectionNotEmpty' | 'NoAvailableCollectionId' | 'NoAvailableNftId' | 'CollectionUnknown' | 'NoPermission' | 'NonTransferable' | 'CollectionFullOrLocked' | 'ResourceDoesntExist' | 'CannotSendToDescendentOrSelf' | 'CannotAcceptNonOwnedNft' | 'CannotRejectNonOwnedNft' | 'CannotRejectNonPendingNft' | 'ResourceNotPending' | 'NoAvailableResourceId'; } /** @name PalletRmrkCoreEvent */ @@ -1416,7 +1439,13 @@ readonly baseId: u32; readonly theme: RmrkTraitsTheme; } & Struct; - readonly type: 'CreateBase' | 'ThemeAdd'; + readonly isEquippable: boolean; + readonly asEquippable: { + readonly baseId: u32; + readonly slotId: u32; + readonly equippables: RmrkTraitsPartEquippableList; + } & Struct; + readonly type: 'CreateBase' | 'ThemeAdd' | 'Equippable'; } /** @name PalletRmrkEquipError */ @@ -1426,7 +1455,9 @@ readonly isNoAvailablePartId: boolean; readonly isBaseDoesntExist: boolean; readonly isNeedsDefaultThemeFirst: boolean; - readonly type: 'PermissionError' | 'NoAvailableBaseId' | 'NoAvailablePartId' | 'BaseDoesntExist' | 'NeedsDefaultThemeFirst'; + readonly isPartDoesntExist: boolean; + readonly isNoEquippableOnFixedPart: boolean; + readonly type: 'PermissionError' | 'NoAvailableBaseId' | 'NoAvailablePartId' | 'BaseDoesntExist' | 'NeedsDefaultThemeFirst' | 'PartDoesntExist' | 'NoEquippableOnFixedPart'; } /** @name PalletRmrkEquipEvent */ @@ -1436,7 +1467,12 @@ readonly issuer: AccountId32; readonly baseId: u32; } & Struct; - readonly type: 'BaseCreated'; + readonly isEquippablesUpdated: boolean; + readonly asEquippablesUpdated: { + readonly baseId: u32; + readonly slotId: u32; + } & Struct; + readonly type: 'BaseCreated' | 'EquippablesUpdated'; } /** @name PalletStructureCall */ @@ -1750,7 +1786,13 @@ readonly collectionId: u32; readonly newLimit: UpDataStructsCollectionPermissions; } & Struct; - readonly type: 'CreateCollection' | 'CreateCollectionEx' | 'DestroyCollection' | 'AddToAllowList' | 'RemoveFromAllowList' | 'ChangeCollectionOwner' | 'AddCollectionAdmin' | 'RemoveCollectionAdmin' | 'SetCollectionSponsor' | 'ConfirmSponsorship' | 'RemoveCollectionSponsor' | 'CreateItem' | 'CreateMultipleItems' | 'SetCollectionProperties' | 'DeleteCollectionProperties' | 'SetTokenProperties' | 'DeleteTokenProperties' | 'SetTokenPropertyPermissions' | 'CreateMultipleItemsEx' | 'SetTransfersEnabledFlag' | 'BurnItem' | 'BurnFrom' | 'Transfer' | 'Approve' | 'TransferFrom' | 'SetCollectionLimits' | 'SetCollectionPermissions'; + readonly isRepartition: boolean; + readonly asRepartition: { + readonly collectionId: u32; + readonly token: u32; + readonly amount: u128; + } & Struct; + readonly type: 'CreateCollection' | 'CreateCollectionEx' | 'DestroyCollection' | 'AddToAllowList' | 'RemoveFromAllowList' | 'ChangeCollectionOwner' | 'AddCollectionAdmin' | 'RemoveCollectionAdmin' | 'SetCollectionSponsor' | 'ConfirmSponsorship' | 'RemoveCollectionSponsor' | 'CreateItem' | 'CreateMultipleItems' | 'SetCollectionProperties' | 'DeleteCollectionProperties' | 'SetTokenProperties' | 'DeleteTokenProperties' | 'SetTokenPropertyPermissions' | 'CreateMultipleItemsEx' | 'SetTransfersEnabledFlag' | 'BurnItem' | 'BurnFrom' | 'Transfer' | 'Approve' | 'TransferFrom' | 'SetCollectionLimits' | 'SetCollectionPermissions' | 'Repartition'; } /** @name PalletUniqueError */ @@ -1758,7 +1800,8 @@ readonly isCollectionDecimalPointLimitExceeded: boolean; readonly isConfirmUnsetSponsorFail: boolean; readonly isEmptyArgument: boolean; - readonly type: 'CollectionDecimalPointLimitExceeded' | 'ConfirmUnsetSponsorFail' | 'EmptyArgument'; + readonly isRepartitionCalledOnNonRefungibleCollection: boolean; + readonly type: 'CollectionDecimalPointLimitExceeded' | 'ConfirmUnsetSponsorFail' | 'EmptyArgument' | 'RepartitionCalledOnNonRefungibleCollection'; } /** @name PalletUniqueRawEvent */ @@ -2431,7 +2474,6 @@ readonly tokenOwner: bool; readonly collectionAdmin: bool; readonly restricted: Option; - readonly permissive: bool; } /** @name UpDataStructsOwnerRestrictedSet */ @@ -2469,6 +2511,13 @@ readonly tokenOwner: bool; } +/** @name UpDataStructsPropertyScope */ +export interface UpDataStructsPropertyScope extends Enum { + readonly isNone: boolean; + readonly isRmrk: boolean; + readonly type: 'None' | 'Rmrk'; +} + /** @name UpDataStructsRpcCollection */ export interface UpDataStructsRpcCollection extends Struct { readonly owner: AccountId32; --- a/tests/src/interfaces/lookup.ts +++ b/tests/src/interfaces/lookup.ts @@ -114,11 +114,20 @@ CumulusPalletParachainSystemEvent: { _enum: { ValidationFunctionStored: 'Null', - ValidationFunctionApplied: 'u32', + ValidationFunctionApplied: { + relayChainBlockNum: 'u32', + }, ValidationFunctionDiscarded: 'Null', - UpgradeAuthorized: 'H256', - DownwardMessagesReceived: 'u32', - DownwardMessagesProcessed: '(u64,H256)' + UpgradeAuthorized: { + codeHash: 'H256', + }, + DownwardMessagesReceived: { + count: 'u32', + }, + DownwardMessagesProcessed: { + weightUsed: 'u64', + dmqHead: 'H256' + } } }, /** @@ -276,16 +285,7 @@ _enum: ['V1Ancient', 'V2'] }, /** - * Lookup68: frame_support::weights::WeightToFeeCoefficient - **/ - FrameSupportWeightsWeightToFeeCoefficient: { - coeffInteger: 'u128', - coeffFrac: 'Perbill', - negative: 'bool', - degree: 'u8' - }, - /** - * Lookup70: pallet_treasury::Proposal + * Lookup67: pallet_treasury::Proposal **/ PalletTreasuryProposal: { proposer: 'AccountId32', @@ -294,7 +294,7 @@ bond: 'u128' }, /** - * Lookup73: pallet_treasury::pallet::Call + * Lookup70: pallet_treasury::pallet::Call **/ PalletTreasuryCall: { _enum: { @@ -314,7 +314,7 @@ } }, /** - * Lookup75: pallet_treasury::pallet::Event + * Lookup72: pallet_treasury::pallet::Event **/ PalletTreasuryEvent: { _enum: { @@ -345,17 +345,17 @@ } }, /** - * Lookup78: frame_support::PalletId + * Lookup75: frame_support::PalletId **/ FrameSupportPalletId: '[u8;8]', /** - * Lookup79: pallet_treasury::pallet::Error + * Lookup76: pallet_treasury::pallet::Error **/ PalletTreasuryError: { _enum: ['InsufficientProposersBalance', 'InvalidIndex', 'TooManyApprovals', 'ProposalNotApproved'] }, /** - * Lookup80: pallet_sudo::pallet::Call + * Lookup77: pallet_sudo::pallet::Call **/ PalletSudoCall: { _enum: { @@ -379,7 +379,7 @@ } }, /** - * Lookup82: frame_system::pallet::Call + * Lookup79: frame_system::pallet::Call **/ FrameSystemCall: { _enum: { @@ -417,7 +417,7 @@ } }, /** - * Lookup85: orml_vesting::module::Call + * Lookup83: orml_vesting::module::Call **/ OrmlVestingModuleCall: { _enum: { @@ -436,7 +436,7 @@ } }, /** - * Lookup86: orml_vesting::VestingSchedule + * Lookup84: orml_vesting::VestingSchedule **/ OrmlVestingVestingSchedule: { start: 'u32', @@ -445,7 +445,7 @@ perPeriod: 'Compact' }, /** - * Lookup88: cumulus_pallet_xcmp_queue::pallet::Call + * Lookup86: cumulus_pallet_xcmp_queue::pallet::Call **/ CumulusPalletXcmpQueueCall: { _enum: { @@ -494,7 +494,7 @@ } }, /** - * Lookup89: pallet_xcm::pallet::Call + * Lookup87: pallet_xcm::pallet::Call **/ PalletXcmCall: { _enum: { @@ -548,7 +548,7 @@ } }, /** - * Lookup90: xcm::VersionedMultiLocation + * Lookup88: xcm::VersionedMultiLocation **/ XcmVersionedMultiLocation: { _enum: { @@ -557,7 +557,7 @@ } }, /** - * Lookup91: xcm::v0::multi_location::MultiLocation + * Lookup89: xcm::v0::multi_location::MultiLocation **/ XcmV0MultiLocation: { _enum: { @@ -573,7 +573,7 @@ } }, /** - * Lookup92: xcm::v0::junction::Junction + * Lookup90: xcm::v0::junction::Junction **/ XcmV0Junction: { _enum: { @@ -602,7 +602,7 @@ } }, /** - * Lookup93: xcm::v0::junction::NetworkId + * Lookup91: xcm::v0::junction::NetworkId **/ XcmV0JunctionNetworkId: { _enum: { @@ -613,7 +613,7 @@ } }, /** - * Lookup94: xcm::v0::junction::BodyId + * Lookup92: xcm::v0::junction::BodyId **/ XcmV0JunctionBodyId: { _enum: { @@ -627,7 +627,7 @@ } }, /** - * Lookup95: xcm::v0::junction::BodyPart + * Lookup93: xcm::v0::junction::BodyPart **/ XcmV0JunctionBodyPart: { _enum: { @@ -650,14 +650,14 @@ } }, /** - * Lookup96: xcm::v1::multilocation::MultiLocation + * Lookup94: xcm::v1::multilocation::MultiLocation **/ XcmV1MultiLocation: { parents: 'u8', interior: 'XcmV1MultilocationJunctions' }, /** - * Lookup97: xcm::v1::multilocation::Junctions + * Lookup95: xcm::v1::multilocation::Junctions **/ XcmV1MultilocationJunctions: { _enum: { @@ -673,7 +673,7 @@ } }, /** - * Lookup98: xcm::v1::junction::Junction + * Lookup96: xcm::v1::junction::Junction **/ XcmV1Junction: { _enum: { @@ -701,7 +701,7 @@ } }, /** - * Lookup99: xcm::VersionedXcm + * Lookup97: xcm::VersionedXcm **/ XcmVersionedXcm: { _enum: { @@ -711,7 +711,7 @@ } }, /** - * Lookup100: xcm::v0::Xcm + * Lookup98: xcm::v0::Xcm **/ XcmV0Xcm: { _enum: { @@ -765,7 +765,7 @@ } }, /** - * Lookup102: xcm::v0::multi_asset::MultiAsset + * Lookup100: xcm::v0::multi_asset::MultiAsset **/ XcmV0MultiAsset: { _enum: { @@ -804,7 +804,7 @@ } }, /** - * Lookup103: xcm::v1::multiasset::AssetInstance + * Lookup101: xcm::v1::multiasset::AssetInstance **/ XcmV1MultiassetAssetInstance: { _enum: { @@ -818,7 +818,7 @@ } }, /** - * Lookup106: xcm::v0::order::Order + * Lookup104: xcm::v0::order::Order **/ XcmV0Order: { _enum: { @@ -861,7 +861,7 @@ } }, /** - * Lookup108: xcm::v0::Response + * Lookup106: xcm::v0::Response **/ XcmV0Response: { _enum: { @@ -869,19 +869,19 @@ } }, /** - * Lookup109: xcm::v0::OriginKind + * Lookup107: xcm::v0::OriginKind **/ XcmV0OriginKind: { _enum: ['Native', 'SovereignAccount', 'Superuser', 'Xcm'] }, /** - * Lookup110: xcm::double_encoded::DoubleEncoded + * Lookup108: xcm::double_encoded::DoubleEncoded **/ XcmDoubleEncoded: { encoded: 'Bytes' }, /** - * Lookup111: xcm::v1::Xcm + * Lookup109: xcm::v1::Xcm **/ XcmV1Xcm: { _enum: { @@ -940,18 +940,18 @@ } }, /** - * Lookup112: xcm::v1::multiasset::MultiAssets + * Lookup110: xcm::v1::multiasset::MultiAssets **/ XcmV1MultiassetMultiAssets: 'Vec', /** - * Lookup114: xcm::v1::multiasset::MultiAsset + * Lookup112: xcm::v1::multiasset::MultiAsset **/ XcmV1MultiAsset: { id: 'XcmV1MultiassetAssetId', fun: 'XcmV1MultiassetFungibility' }, /** - * Lookup115: xcm::v1::multiasset::AssetId + * Lookup113: xcm::v1::multiasset::AssetId **/ XcmV1MultiassetAssetId: { _enum: { @@ -960,7 +960,7 @@ } }, /** - * Lookup116: xcm::v1::multiasset::Fungibility + * Lookup114: xcm::v1::multiasset::Fungibility **/ XcmV1MultiassetFungibility: { _enum: { @@ -969,7 +969,7 @@ } }, /** - * Lookup118: xcm::v1::order::Order + * Lookup116: xcm::v1::order::Order **/ XcmV1Order: { _enum: { @@ -1014,7 +1014,7 @@ } }, /** - * Lookup119: xcm::v1::multiasset::MultiAssetFilter + * Lookup117: xcm::v1::multiasset::MultiAssetFilter **/ XcmV1MultiassetMultiAssetFilter: { _enum: { @@ -1023,7 +1023,7 @@ } }, /** - * Lookup120: xcm::v1::multiasset::WildMultiAsset + * Lookup118: xcm::v1::multiasset::WildMultiAsset **/ XcmV1MultiassetWildMultiAsset: { _enum: { @@ -1035,13 +1035,13 @@ } }, /** - * Lookup121: xcm::v1::multiasset::WildFungibility + * Lookup119: xcm::v1::multiasset::WildFungibility **/ XcmV1MultiassetWildFungibility: { _enum: ['Fungible', 'NonFungible'] }, /** - * Lookup123: xcm::v1::Response + * Lookup121: xcm::v1::Response **/ XcmV1Response: { _enum: { @@ -1050,11 +1050,11 @@ } }, /** - * Lookup124: xcm::v2::Xcm + * Lookup122: xcm::v2::Xcm **/ XcmV2Xcm: 'Vec', /** - * Lookup126: xcm::v2::Instruction + * Lookup124: xcm::v2::Instruction **/ XcmV2Instruction: { _enum: { @@ -1152,7 +1152,7 @@ } }, /** - * Lookup127: xcm::v2::Response + * Lookup125: xcm::v2::Response **/ XcmV2Response: { _enum: { @@ -1163,7 +1163,7 @@ } }, /** - * Lookup130: xcm::v2::traits::Error + * Lookup128: xcm::v2::traits::Error **/ XcmV2TraitsError: { _enum: { @@ -1196,7 +1196,7 @@ } }, /** - * Lookup131: xcm::v2::WeightLimit + * Lookup129: xcm::v2::WeightLimit **/ XcmV2WeightLimit: { _enum: { @@ -1205,7 +1205,7 @@ } }, /** - * Lookup132: xcm::VersionedMultiAssets + * Lookup130: xcm::VersionedMultiAssets **/ XcmVersionedMultiAssets: { _enum: { @@ -1214,11 +1214,11 @@ } }, /** - * Lookup147: cumulus_pallet_xcm::pallet::Call + * Lookup145: cumulus_pallet_xcm::pallet::Call **/ CumulusPalletXcmCall: 'Null', /** - * Lookup148: cumulus_pallet_dmp_queue::pallet::Call + * Lookup146: cumulus_pallet_dmp_queue::pallet::Call **/ CumulusPalletDmpQueueCall: { _enum: { @@ -1229,7 +1229,7 @@ } }, /** - * Lookup149: pallet_inflation::pallet::Call + * Lookup147: pallet_inflation::pallet::Call **/ PalletInflationCall: { _enum: { @@ -1239,7 +1239,7 @@ } }, /** - * Lookup150: pallet_unique::Call + * Lookup148: pallet_unique::Call **/ PalletUniqueCall: { _enum: { @@ -1361,12 +1361,17 @@ }, set_collection_permissions: { collectionId: 'u32', - newLimit: 'UpDataStructsCollectionPermissions' + newLimit: 'UpDataStructsCollectionPermissions', + }, + repartition: { + collectionId: 'u32', + token: 'u32', + amount: 'u128' } } }, /** - * Lookup156: up_data_structs::CollectionMode + * Lookup154: up_data_structs::CollectionMode **/ UpDataStructsCollectionMode: { _enum: { @@ -1376,7 +1381,7 @@ } }, /** - * Lookup157: up_data_structs::CreateCollectionData + * Lookup155: up_data_structs::CreateCollectionData **/ UpDataStructsCreateCollectionData: { mode: 'UpDataStructsCollectionMode', @@ -1391,13 +1396,13 @@ properties: 'Vec' }, /** - * Lookup159: up_data_structs::AccessMode + * Lookup157: up_data_structs::AccessMode **/ UpDataStructsAccessMode: { _enum: ['Normal', 'AllowList'] }, /** - * Lookup162: up_data_structs::CollectionLimits + * Lookup160: up_data_structs::CollectionLimits **/ UpDataStructsCollectionLimits: { accountTokenOwnershipLimit: 'Option', @@ -1411,7 +1416,7 @@ transfersEnabled: 'Option' }, /** - * Lookup164: up_data_structs::SponsoringRateLimit + * Lookup162: up_data_structs::SponsoringRateLimit **/ UpDataStructsSponsoringRateLimit: { _enum: { @@ -1420,7 +1425,7 @@ } }, /** - * Lookup167: up_data_structs::CollectionPermissions + * Lookup165: up_data_structs::CollectionPermissions **/ UpDataStructsCollectionPermissions: { access: 'Option', @@ -1428,27 +1433,26 @@ nesting: 'Option' }, /** - * Lookup169: up_data_structs::NestingPermissions + * Lookup167: up_data_structs::NestingPermissions **/ UpDataStructsNestingPermissions: { tokenOwner: 'bool', collectionAdmin: 'bool', - restricted: 'Option', - permissive: 'bool' + restricted: 'Option' }, /** - * Lookup171: up_data_structs::OwnerRestrictedSet + * Lookup169: up_data_structs::OwnerRestrictedSet **/ UpDataStructsOwnerRestrictedSet: 'BTreeSet', /** - * Lookup177: up_data_structs::PropertyKeyPermission + * Lookup175: up_data_structs::PropertyKeyPermission **/ UpDataStructsPropertyKeyPermission: { key: 'Bytes', permission: 'UpDataStructsPropertyPermission' }, /** - * Lookup179: up_data_structs::PropertyPermission + * Lookup177: up_data_structs::PropertyPermission **/ UpDataStructsPropertyPermission: { mutable: 'bool', @@ -1456,14 +1460,14 @@ tokenOwner: 'bool' }, /** - * Lookup182: up_data_structs::Property + * Lookup180: up_data_structs::Property **/ UpDataStructsProperty: { key: 'Bytes', value: 'Bytes' }, /** - * Lookup185: pallet_evm::account::BasicCrossAccountIdRepr + * Lookup183: pallet_evm::account::BasicCrossAccountIdRepr **/ PalletEvmAccountBasicCrossAccountIdRepr: { _enum: { @@ -1472,7 +1476,7 @@ } }, /** - * Lookup187: up_data_structs::CreateItemData + * Lookup185: up_data_structs::CreateItemData **/ UpDataStructsCreateItemData: { _enum: { @@ -1482,26 +1486,26 @@ } }, /** - * Lookup188: up_data_structs::CreateNftData + * Lookup186: up_data_structs::CreateNftData **/ UpDataStructsCreateNftData: { properties: 'Vec' }, /** - * Lookup189: up_data_structs::CreateFungibleData + * Lookup187: up_data_structs::CreateFungibleData **/ UpDataStructsCreateFungibleData: { value: 'u128' }, /** - * Lookup190: up_data_structs::CreateReFungibleData + * Lookup188: up_data_structs::CreateReFungibleData **/ UpDataStructsCreateReFungibleData: { constData: 'Bytes', pieces: 'u128' }, /** - * Lookup195: up_data_structs::CreateItemExData> + * Lookup193: up_data_structs::CreateItemExData> **/ UpDataStructsCreateItemExData: { _enum: { @@ -1512,21 +1516,21 @@ } }, /** - * Lookup197: up_data_structs::CreateNftExData> + * Lookup195: up_data_structs::CreateNftExData> **/ UpDataStructsCreateNftExData: { properties: 'Vec', owner: 'PalletEvmAccountBasicCrossAccountIdRepr' }, /** - * Lookup204: up_data_structs::CreateRefungibleExData> + * Lookup202: up_data_structs::CreateRefungibleExData> **/ UpDataStructsCreateRefungibleExData: { constData: 'Bytes', users: 'BTreeMap' }, /** - * Lookup206: pallet_unique_scheduler::pallet::Call + * Lookup204: pallet_unique_scheduler::pallet::Call **/ PalletUniqueSchedulerCall: { _enum: { @@ -1550,7 +1554,7 @@ } }, /** - * Lookup208: frame_support::traits::schedule::MaybeHashed + * Lookup206: frame_support::traits::schedule::MaybeHashed **/ FrameSupportScheduleMaybeHashed: { _enum: { @@ -1559,15 +1563,15 @@ } }, /** - * Lookup209: pallet_template_transaction_payment::Call + * Lookup207: pallet_template_transaction_payment::Call **/ PalletTemplateTransactionPaymentCall: 'Null', /** - * Lookup210: pallet_structure::pallet::Call + * Lookup208: pallet_structure::pallet::Call **/ PalletStructureCall: 'Null', /** - * Lookup211: pallet_rmrk_core::pallet::Call + * Lookup209: pallet_rmrk_core::pallet::Call **/ PalletRmrkCoreCall: { _enum: { @@ -1587,7 +1591,7 @@ collectionId: 'u32', }, mint_nft: { - owner: 'AccountId32', + owner: 'Option', collectionId: 'u32', recipient: 'Option', royaltyAmount: 'Option', @@ -1617,12 +1621,12 @@ accept_resource: { rmrkCollectionId: 'u32', rmrkNftId: 'u32', - rmrkResourceId: 'u32', + resourceId: 'u32', }, accept_resource_removal: { rmrkCollectionId: 'u32', rmrkNftId: 'u32', - rmrkResourceId: 'u32', + resourceId: 'u32', }, set_property: { rmrkCollectionId: 'Compact', @@ -1658,7 +1662,7 @@ } }, /** - * Lookup217: rmrk_traits::resource::ResourceTypes, frame_support::storage::bounded_vec::BoundedVec> + * Lookup215: rmrk_traits::resource::ResourceTypes, frame_support::storage::bounded_vec::BoundedVec> **/ RmrkTraitsResourceResourceTypes: { _enum: { @@ -1668,7 +1672,7 @@ } }, /** - * Lookup219: rmrk_traits::resource::BasicResource> + * Lookup217: rmrk_traits::resource::BasicResource> **/ RmrkTraitsResourceBasicResource: { src: 'Option', @@ -1677,7 +1681,7 @@ thumb: 'Option' }, /** - * Lookup221: rmrk_traits::resource::ComposableResource, frame_support::storage::bounded_vec::BoundedVec> + * Lookup219: rmrk_traits::resource::ComposableResource, frame_support::storage::bounded_vec::BoundedVec> **/ RmrkTraitsResourceComposableResource: { parts: 'Vec', @@ -1688,7 +1692,7 @@ thumb: 'Option' }, /** - * Lookup222: rmrk_traits::resource::SlotResource> + * Lookup220: rmrk_traits::resource::SlotResource> **/ RmrkTraitsResourceSlotResource: { base: 'u32', @@ -1699,7 +1703,7 @@ thumb: 'Option' }, /** - * Lookup224: rmrk_traits::nft::AccountIdOrCollectionNftTuple + * Lookup222: rmrk_traits::nft::AccountIdOrCollectionNftTuple **/ RmrkTraitsNftAccountIdOrCollectionNftTuple: { _enum: { @@ -1708,7 +1712,7 @@ } }, /** - * Lookup228: pallet_rmrk_equip::pallet::Call + * Lookup226: pallet_rmrk_equip::pallet::Call **/ PalletRmrkEquipCall: { _enum: { @@ -1719,12 +1723,17 @@ }, theme_add: { baseId: 'u32', - theme: 'RmrkTraitsTheme' + theme: 'RmrkTraitsTheme', + }, + equippable: { + baseId: 'u32', + slotId: 'u32', + equippables: 'RmrkTraitsPartEquippableList' } } }, /** - * Lookup230: rmrk_traits::part::PartType, frame_support::storage::bounded_vec::BoundedVec> + * Lookup229: rmrk_traits::part::PartType, frame_support::storage::bounded_vec::BoundedVec> **/ RmrkTraitsPartPartType: { _enum: { @@ -1733,7 +1742,7 @@ } }, /** - * Lookup232: rmrk_traits::part::FixedPart> + * Lookup231: rmrk_traits::part::FixedPart> **/ RmrkTraitsPartFixedPart: { id: 'u32', @@ -1741,7 +1750,7 @@ src: 'Bytes' }, /** - * Lookup233: rmrk_traits::part::SlotPart, frame_support::storage::bounded_vec::BoundedVec> + * Lookup232: rmrk_traits::part::SlotPart, frame_support::storage::bounded_vec::BoundedVec> **/ RmrkTraitsPartSlotPart: { id: 'u32', @@ -1750,7 +1759,7 @@ z: 'u32' }, /** - * Lookup234: rmrk_traits::part::EquippableList> + * Lookup233: rmrk_traits::part::EquippableList> **/ RmrkTraitsPartEquippableList: { _enum: { @@ -1760,7 +1769,7 @@ } }, /** - * Lookup236: rmrk_traits::theme::Theme, PropertyList> + * Lookup235: rmrk_traits::theme::Theme, frame_support::storage::bounded_vec::BoundedVec>, S>> **/ RmrkTraitsTheme: { name: 'Bytes', @@ -1768,7 +1777,7 @@ inherit: 'bool' }, /** - * Lookup238: rmrk_traits::theme::ThemeProperty> + * Lookup237: rmrk_traits::theme::ThemeProperty> **/ RmrkTraitsThemeThemeProperty: { key: 'Bytes', @@ -2166,12 +2175,30 @@ **/ CumulusPalletDmpQueueEvent: { _enum: { - InvalidFormat: '[u8;32]', - UnsupportedVersion: '[u8;32]', - ExecutedDownward: '([u8;32],XcmV2TraitsOutcome)', - WeightExhausted: '([u8;32],u64,u64)', - OverweightEnqueued: '([u8;32],u64,u64)', - OverweightServiced: '(u64,u64)' + InvalidFormat: { + messageId: '[u8;32]', + }, + UnsupportedVersion: { + messageId: '[u8;32]', + }, + ExecutedDownward: { + messageId: '[u8;32]', + outcome: 'XcmV2TraitsOutcome', + }, + WeightExhausted: { + messageId: '[u8;32]', + remainingWeight: 'u64', + requiredWeight: 'u64', + }, + OverweightEnqueued: { + messageId: '[u8;32]', + overweightIndex: 'u64', + requiredWeight: 'u64', + }, + OverweightServiced: { + overweightIndex: 'u64', + weightUsed: 'u64' + } } }, /** @@ -2332,7 +2359,11 @@ _enum: { BaseCreated: { issuer: 'AccountId32', - baseId: 'u32' + baseId: 'u32', + }, + EquippablesUpdated: { + baseId: 'u32', + slotId: 'u32' } } }, @@ -2597,7 +2628,7 @@ * Lookup344: pallet_unique::Error **/ PalletUniqueError: { - _enum: ['CollectionDecimalPointLimitExceeded', 'ConfirmUnsetSponsorFail', 'EmptyArgument'] + _enum: ['CollectionDecimalPointLimitExceeded', 'ConfirmUnsetSponsorFail', 'EmptyArgument', 'RepartitionCalledOnNonRefungibleCollection'] }, /** * Lookup347: pallet_unique_scheduler::ScheduledV3, BlockNumber, opal_runtime::OriginCaller, sp_core::crypto::AccountId32> @@ -2926,7 +2957,7 @@ * Lookup393: pallet_refungible::pallet::Error **/ PalletRefungibleError: { - _enum: ['NotRefungibleDataUsedToMintFungibleCollectionToken', 'WrongRefungiblePieces', 'RefungibleDisallowsNesting', 'SettingPropertiesNotAllowed'] + _enum: ['NotRefungibleDataUsedToMintFungibleCollectionToken', 'WrongRefungiblePieces', 'RepartitionWhileNotOwningAllPieces', 'RefungibleDisallowsNesting', 'SettingPropertiesNotAllowed'] }, /** * Lookup394: pallet_nonfungible::ItemData> @@ -2935,37 +2966,43 @@ owner: 'PalletEvmAccountBasicCrossAccountIdRepr' }, /** - * Lookup396: pallet_nonfungible::pallet::Error + * Lookup396: up_data_structs::PropertyScope + **/ + UpDataStructsPropertyScope: { + _enum: ['None', 'Rmrk'] + }, + /** + * Lookup398: pallet_nonfungible::pallet::Error **/ PalletNonfungibleError: { _enum: ['NotNonfungibleDataUsedToMintFungibleCollectionToken', 'NonfungibleItemsHaveNoAmount', 'CantBurnNftWithChildren'] }, /** - * Lookup397: pallet_structure::pallet::Error + * Lookup399: pallet_structure::pallet::Error **/ PalletStructureError: { _enum: ['OuroborosDetected', 'DepthLimit', 'BreadthLimit', 'TokenNotFound'] }, /** - * Lookup398: pallet_rmrk_core::pallet::Error + * Lookup400: pallet_rmrk_core::pallet::Error **/ PalletRmrkCoreError: { - _enum: ['CorruptedCollectionType', 'NftTypeEncodeError', 'RmrkPropertyKeyIsTooLong', 'RmrkPropertyValueIsTooLong', 'UnableToDecodeRmrkData', 'CollectionNotEmpty', 'NoAvailableCollectionId', 'NoAvailableNftId', 'CollectionUnknown', 'NoPermission', 'NonTransferable', 'CollectionFullOrLocked', 'ResourceDoesntExist', 'CannotSendToDescendentOrSelf', 'CannotAcceptNonOwnedNft', 'CannotRejectNonOwnedNft', 'ResourceNotPending'] + _enum: ['CorruptedCollectionType', 'NftTypeEncodeError', 'RmrkPropertyKeyIsTooLong', 'RmrkPropertyValueIsTooLong', 'RmrkPropertyIsNotFound', 'UnableToDecodeRmrkData', 'CollectionNotEmpty', 'NoAvailableCollectionId', 'NoAvailableNftId', 'CollectionUnknown', 'NoPermission', 'NonTransferable', 'CollectionFullOrLocked', 'ResourceDoesntExist', 'CannotSendToDescendentOrSelf', 'CannotAcceptNonOwnedNft', 'CannotRejectNonOwnedNft', 'CannotRejectNonPendingNft', 'ResourceNotPending', 'NoAvailableResourceId'] }, /** - * Lookup400: pallet_rmrk_equip::pallet::Error + * Lookup402: pallet_rmrk_equip::pallet::Error **/ PalletRmrkEquipError: { - _enum: ['PermissionError', 'NoAvailableBaseId', 'NoAvailablePartId', 'BaseDoesntExist', 'NeedsDefaultThemeFirst'] + _enum: ['PermissionError', 'NoAvailableBaseId', 'NoAvailablePartId', 'BaseDoesntExist', 'NeedsDefaultThemeFirst', 'PartDoesntExist', 'NoEquippableOnFixedPart'] }, /** - * Lookup403: pallet_evm::pallet::Error + * Lookup405: pallet_evm::pallet::Error **/ PalletEvmError: { _enum: ['BalanceLow', 'FeeOverflow', 'PaymentOverflow', 'WithdrawFailed', 'GasPriceTooLow', 'InvalidNonce'] }, /** - * Lookup406: fp_rpc::TransactionStatus + * Lookup408: fp_rpc::TransactionStatus **/ FpRpcTransactionStatus: { transactionHash: 'H256', @@ -2977,11 +3014,11 @@ logsBloom: 'EthbloomBloom' }, /** - * Lookup408: ethbloom::Bloom + * Lookup410: ethbloom::Bloom **/ EthbloomBloom: '[u8;256]', /** - * Lookup410: ethereum::receipt::ReceiptV3 + * Lookup412: ethereum::receipt::ReceiptV3 **/ EthereumReceiptReceiptV3: { _enum: { @@ -2991,7 +3028,7 @@ } }, /** - * Lookup411: ethereum::receipt::EIP658ReceiptData + * Lookup413: ethereum::receipt::EIP658ReceiptData **/ EthereumReceiptEip658ReceiptData: { statusCode: 'u8', @@ -3000,7 +3037,7 @@ logs: 'Vec' }, /** - * Lookup412: ethereum::block::Block + * Lookup414: ethereum::block::Block **/ EthereumBlock: { header: 'EthereumHeader', @@ -3008,7 +3045,7 @@ ommers: 'Vec' }, /** - * Lookup413: ethereum::header::Header + * Lookup415: ethereum::header::Header **/ EthereumHeader: { parentHash: 'H256', @@ -3028,41 +3065,41 @@ nonce: 'EthereumTypesHashH64' }, /** - * Lookup414: ethereum_types::hash::H64 + * Lookup416: ethereum_types::hash::H64 **/ EthereumTypesHashH64: '[u8;8]', /** - * Lookup419: pallet_ethereum::pallet::Error + * Lookup421: pallet_ethereum::pallet::Error **/ PalletEthereumError: { _enum: ['InvalidSignature', 'PreLogExists'] }, /** - * Lookup420: pallet_evm_coder_substrate::pallet::Error + * Lookup422: pallet_evm_coder_substrate::pallet::Error **/ PalletEvmCoderSubstrateError: { _enum: ['OutOfGas', 'OutOfFund'] }, /** - * Lookup421: pallet_evm_contract_helpers::SponsoringModeT + * Lookup423: pallet_evm_contract_helpers::SponsoringModeT **/ PalletEvmContractHelpersSponsoringModeT: { _enum: ['Disabled', 'Allowlisted', 'Generous'] }, /** - * Lookup423: pallet_evm_contract_helpers::pallet::Error + * Lookup425: pallet_evm_contract_helpers::pallet::Error **/ PalletEvmContractHelpersError: { _enum: ['NoPermission'] }, /** - * Lookup424: pallet_evm_migration::pallet::Error + * Lookup426: pallet_evm_migration::pallet::Error **/ PalletEvmMigrationError: { _enum: ['AccountNotEmpty', 'AccountIsNotMigrating'] }, /** - * Lookup426: sp_runtime::MultiSignature + * Lookup428: sp_runtime::MultiSignature **/ SpRuntimeMultiSignature: { _enum: { @@ -3072,43 +3109,43 @@ } }, /** - * Lookup427: sp_core::ed25519::Signature + * Lookup429: sp_core::ed25519::Signature **/ SpCoreEd25519Signature: '[u8;64]', /** - * Lookup429: sp_core::sr25519::Signature + * Lookup431: sp_core::sr25519::Signature **/ SpCoreSr25519Signature: '[u8;64]', /** - * Lookup430: sp_core::ecdsa::Signature + * Lookup432: sp_core::ecdsa::Signature **/ SpCoreEcdsaSignature: '[u8;65]', /** - * Lookup433: frame_system::extensions::check_spec_version::CheckSpecVersion + * Lookup435: frame_system::extensions::check_spec_version::CheckSpecVersion **/ FrameSystemExtensionsCheckSpecVersion: 'Null', /** - * Lookup434: frame_system::extensions::check_genesis::CheckGenesis + * Lookup436: frame_system::extensions::check_genesis::CheckGenesis **/ FrameSystemExtensionsCheckGenesis: 'Null', /** - * Lookup437: frame_system::extensions::check_nonce::CheckNonce + * Lookup439: frame_system::extensions::check_nonce::CheckNonce **/ FrameSystemExtensionsCheckNonce: 'Compact', /** - * Lookup438: frame_system::extensions::check_weight::CheckWeight + * Lookup440: frame_system::extensions::check_weight::CheckWeight **/ FrameSystemExtensionsCheckWeight: 'Null', /** - * Lookup439: pallet_template_transaction_payment::ChargeTransactionPayment + * Lookup441: pallet_template_transaction_payment::ChargeTransactionPayment **/ PalletTemplateTransactionPaymentChargeTransactionPayment: 'Compact', /** - * Lookup440: opal_runtime::Runtime + * Lookup442: opal_runtime::Runtime **/ OpalRuntimeRuntime: 'Null', /** - * Lookup441: pallet_ethereum::FakeTransactionFinalizer + * Lookup443: pallet_ethereum::FakeTransactionFinalizer **/ PalletEthereumFakeTransactionFinalizer: 'Null' }; --- 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, CumulusPalletXcmOrigin, 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, FrameSupportDispatchRawOrigin, FrameSupportPalletId, FrameSupportScheduleLookupError, FrameSupportScheduleMaybeHashed, FrameSupportTokensMiscBalanceStatus, FrameSupportWeightsDispatchClass, FrameSupportWeightsDispatchInfo, FrameSupportWeightsPays, FrameSupportWeightsPerDispatchClassU32, FrameSupportWeightsPerDispatchClassU64, FrameSupportWeightsPerDispatchClassWeightsPerClass, FrameSupportWeightsRuntimeDbWeight, FrameSupportWeightsWeightToFeeCoefficient, FrameSystemAccountInfo, FrameSystemCall, FrameSystemError, FrameSystemEvent, FrameSystemEventRecord, FrameSystemExtensionsCheckGenesis, FrameSystemExtensionsCheckNonce, FrameSystemExtensionsCheckSpecVersion, FrameSystemExtensionsCheckWeight, FrameSystemLastRuntimeUpgradeInfo, FrameSystemLimitsBlockLength, FrameSystemLimitsBlockWeights, FrameSystemLimitsWeightsPerClass, FrameSystemPhase, OpalRuntimeOriginCaller, OpalRuntimeRuntime, OrmlVestingModuleCall, OrmlVestingModuleError, OrmlVestingModuleEvent, OrmlVestingVestingSchedule, PalletBalancesAccountData, PalletBalancesBalanceLock, PalletBalancesCall, PalletBalancesError, PalletBalancesEvent, PalletBalancesReasons, PalletBalancesReleases, PalletBalancesReserveData, PalletCommonError, PalletCommonEvent, PalletEthereumCall, PalletEthereumError, PalletEthereumEvent, PalletEthereumFakeTransactionFinalizer, PalletEthereumRawOrigin, PalletEvmAccountBasicCrossAccountIdRepr, PalletEvmCall, PalletEvmCoderSubstrateError, PalletEvmContractHelpersError, PalletEvmContractHelpersSponsoringModeT, PalletEvmError, PalletEvmEvent, PalletEvmMigrationCall, PalletEvmMigrationError, PalletFungibleError, PalletInflationCall, PalletNonfungibleError, PalletNonfungibleItemData, PalletRefungibleError, PalletRefungibleItemData, PalletRmrkCoreCall, PalletRmrkCoreError, PalletRmrkCoreEvent, PalletRmrkEquipCall, PalletRmrkEquipError, PalletRmrkEquipEvent, PalletStructureCall, PalletStructureError, PalletStructureEvent, PalletSudoCall, PalletSudoError, PalletSudoEvent, PalletTemplateTransactionPaymentCall, PalletTemplateTransactionPaymentChargeTransactionPayment, PalletTimestampCall, PalletTransactionPaymentReleases, PalletTreasuryCall, PalletTreasuryError, PalletTreasuryEvent, PalletTreasuryProposal, PalletUniqueCall, PalletUniqueError, PalletUniqueRawEvent, PalletUniqueSchedulerCall, PalletUniqueSchedulerError, PalletUniqueSchedulerEvent, PalletUniqueSchedulerScheduledV3, PalletXcmCall, PalletXcmError, PalletXcmEvent, PalletXcmOrigin, PhantomTypeUpDataStructs, PolkadotCorePrimitivesInboundDownwardMessage, PolkadotCorePrimitivesInboundHrmpMessage, PolkadotCorePrimitivesOutboundHrmpMessage, PolkadotParachainPrimitivesXcmpMessageFormat, PolkadotPrimitivesV2AbridgedHostConfiguration, PolkadotPrimitivesV2AbridgedHrmpChannel, PolkadotPrimitivesV2PersistedValidationData, PolkadotPrimitivesV2UpgradeRestriction, RmrkTraitsBaseBaseInfo, RmrkTraitsCollectionCollectionInfo, RmrkTraitsNftAccountIdOrCollectionNftTuple, RmrkTraitsNftNftChild, RmrkTraitsNftNftInfo, RmrkTraitsNftRoyaltyInfo, RmrkTraitsPartEquippableList, RmrkTraitsPartFixedPart, RmrkTraitsPartPartType, RmrkTraitsPartSlotPart, RmrkTraitsPropertyPropertyInfo, RmrkTraitsResourceBasicResource, RmrkTraitsResourceComposableResource, RmrkTraitsResourceResourceInfo, RmrkTraitsResourceResourceTypes, RmrkTraitsResourceSlotResource, RmrkTraitsTheme, RmrkTraitsThemeThemeProperty, SpCoreEcdsaSignature, SpCoreEd25519Signature, SpCoreSr25519Signature, SpCoreVoid, SpRuntimeArithmeticError, SpRuntimeDigest, SpRuntimeDigestDigestItem, SpRuntimeDispatchError, SpRuntimeModuleError, SpRuntimeMultiSignature, SpRuntimeTokenError, SpRuntimeTransactionalError, SpTrieStorageProof, SpVersionRuntimeVersion, UpDataStructsAccessMode, UpDataStructsCollection, UpDataStructsCollectionLimits, UpDataStructsCollectionMode, UpDataStructsCollectionPermissions, UpDataStructsCollectionStats, UpDataStructsCreateCollectionData, UpDataStructsCreateFungibleData, UpDataStructsCreateItemData, UpDataStructsCreateItemExData, UpDataStructsCreateNftData, UpDataStructsCreateNftExData, UpDataStructsCreateReFungibleData, UpDataStructsCreateRefungibleExData, UpDataStructsNestingPermissions, UpDataStructsOwnerRestrictedSet, UpDataStructsProperties, UpDataStructsPropertiesMapBoundedVec, UpDataStructsPropertiesMapPropertyPermission, UpDataStructsProperty, UpDataStructsPropertyKeyPermission, UpDataStructsPropertyPermission, 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'; +import type { CumulusPalletDmpQueueCall, CumulusPalletDmpQueueConfigData, CumulusPalletDmpQueueError, CumulusPalletDmpQueueEvent, CumulusPalletDmpQueuePageIndexData, CumulusPalletParachainSystemCall, CumulusPalletParachainSystemError, CumulusPalletParachainSystemEvent, CumulusPalletParachainSystemRelayStateSnapshotMessagingStateSnapshot, CumulusPalletXcmCall, CumulusPalletXcmError, CumulusPalletXcmEvent, CumulusPalletXcmOrigin, 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, FrameSupportDispatchRawOrigin, FrameSupportPalletId, FrameSupportScheduleLookupError, FrameSupportScheduleMaybeHashed, FrameSupportTokensMiscBalanceStatus, FrameSupportWeightsDispatchClass, FrameSupportWeightsDispatchInfo, FrameSupportWeightsPays, FrameSupportWeightsPerDispatchClassU32, FrameSupportWeightsPerDispatchClassU64, FrameSupportWeightsPerDispatchClassWeightsPerClass, FrameSupportWeightsRuntimeDbWeight, FrameSystemAccountInfo, FrameSystemCall, FrameSystemError, FrameSystemEvent, FrameSystemEventRecord, FrameSystemExtensionsCheckGenesis, FrameSystemExtensionsCheckNonce, FrameSystemExtensionsCheckSpecVersion, FrameSystemExtensionsCheckWeight, FrameSystemLastRuntimeUpgradeInfo, FrameSystemLimitsBlockLength, FrameSystemLimitsBlockWeights, FrameSystemLimitsWeightsPerClass, FrameSystemPhase, OpalRuntimeOriginCaller, OpalRuntimeRuntime, OrmlVestingModuleCall, OrmlVestingModuleError, OrmlVestingModuleEvent, OrmlVestingVestingSchedule, PalletBalancesAccountData, PalletBalancesBalanceLock, PalletBalancesCall, PalletBalancesError, PalletBalancesEvent, PalletBalancesReasons, PalletBalancesReleases, PalletBalancesReserveData, PalletCommonError, PalletCommonEvent, PalletEthereumCall, PalletEthereumError, PalletEthereumEvent, PalletEthereumFakeTransactionFinalizer, PalletEthereumRawOrigin, PalletEvmAccountBasicCrossAccountIdRepr, PalletEvmCall, PalletEvmCoderSubstrateError, PalletEvmContractHelpersError, PalletEvmContractHelpersSponsoringModeT, PalletEvmError, PalletEvmEvent, PalletEvmMigrationCall, PalletEvmMigrationError, PalletFungibleError, PalletInflationCall, PalletNonfungibleError, PalletNonfungibleItemData, PalletRefungibleError, PalletRefungibleItemData, PalletRmrkCoreCall, PalletRmrkCoreError, PalletRmrkCoreEvent, PalletRmrkEquipCall, PalletRmrkEquipError, PalletRmrkEquipEvent, PalletStructureCall, PalletStructureError, PalletStructureEvent, PalletSudoCall, PalletSudoError, PalletSudoEvent, PalletTemplateTransactionPaymentCall, PalletTemplateTransactionPaymentChargeTransactionPayment, PalletTimestampCall, PalletTransactionPaymentReleases, PalletTreasuryCall, PalletTreasuryError, PalletTreasuryEvent, PalletTreasuryProposal, PalletUniqueCall, PalletUniqueError, PalletUniqueRawEvent, PalletUniqueSchedulerCall, PalletUniqueSchedulerError, PalletUniqueSchedulerEvent, PalletUniqueSchedulerScheduledV3, PalletXcmCall, PalletXcmError, PalletXcmEvent, PalletXcmOrigin, PhantomTypeUpDataStructs, PolkadotCorePrimitivesInboundDownwardMessage, PolkadotCorePrimitivesInboundHrmpMessage, PolkadotCorePrimitivesOutboundHrmpMessage, PolkadotParachainPrimitivesXcmpMessageFormat, PolkadotPrimitivesV2AbridgedHostConfiguration, PolkadotPrimitivesV2AbridgedHrmpChannel, PolkadotPrimitivesV2PersistedValidationData, PolkadotPrimitivesV2UpgradeRestriction, RmrkTraitsBaseBaseInfo, RmrkTraitsCollectionCollectionInfo, RmrkTraitsNftAccountIdOrCollectionNftTuple, RmrkTraitsNftNftChild, RmrkTraitsNftNftInfo, RmrkTraitsNftRoyaltyInfo, RmrkTraitsPartEquippableList, RmrkTraitsPartFixedPart, RmrkTraitsPartPartType, RmrkTraitsPartSlotPart, RmrkTraitsPropertyPropertyInfo, RmrkTraitsResourceBasicResource, RmrkTraitsResourceComposableResource, RmrkTraitsResourceResourceInfo, RmrkTraitsResourceResourceTypes, RmrkTraitsResourceSlotResource, RmrkTraitsTheme, RmrkTraitsThemeThemeProperty, SpCoreEcdsaSignature, SpCoreEd25519Signature, SpCoreSr25519Signature, SpCoreVoid, SpRuntimeArithmeticError, SpRuntimeDigest, SpRuntimeDigestDigestItem, SpRuntimeDispatchError, SpRuntimeModuleError, SpRuntimeMultiSignature, SpRuntimeTokenError, SpRuntimeTransactionalError, SpTrieStorageProof, SpVersionRuntimeVersion, UpDataStructsAccessMode, UpDataStructsCollection, UpDataStructsCollectionLimits, UpDataStructsCollectionMode, UpDataStructsCollectionPermissions, UpDataStructsCollectionStats, UpDataStructsCreateCollectionData, UpDataStructsCreateFungibleData, UpDataStructsCreateItemData, UpDataStructsCreateItemExData, UpDataStructsCreateNftData, UpDataStructsCreateNftExData, UpDataStructsCreateReFungibleData, UpDataStructsCreateRefungibleExData, UpDataStructsNestingPermissions, UpDataStructsOwnerRestrictedSet, UpDataStructsProperties, UpDataStructsPropertiesMapBoundedVec, UpDataStructsPropertiesMapPropertyPermission, UpDataStructsProperty, UpDataStructsPropertyKeyPermission, UpDataStructsPropertyPermission, UpDataStructsPropertyScope, 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 { @@ -59,7 +59,6 @@ FrameSupportWeightsPerDispatchClassU64: FrameSupportWeightsPerDispatchClassU64; FrameSupportWeightsPerDispatchClassWeightsPerClass: FrameSupportWeightsPerDispatchClassWeightsPerClass; FrameSupportWeightsRuntimeDbWeight: FrameSupportWeightsRuntimeDbWeight; - FrameSupportWeightsWeightToFeeCoefficient: FrameSupportWeightsWeightToFeeCoefficient; FrameSystemAccountInfo: FrameSystemAccountInfo; FrameSystemCall: FrameSystemCall; FrameSystemError: FrameSystemError; @@ -204,6 +203,7 @@ UpDataStructsProperty: UpDataStructsProperty; UpDataStructsPropertyKeyPermission: UpDataStructsPropertyKeyPermission; UpDataStructsPropertyPermission: UpDataStructsPropertyPermission; + UpDataStructsPropertyScope: UpDataStructsPropertyScope; UpDataStructsRpcCollection: UpDataStructsRpcCollection; UpDataStructsSponsoringRateLimit: UpDataStructsSponsoringRateLimit; UpDataStructsSponsorshipState: UpDataStructsSponsorshipState; --- a/tests/src/interfaces/types-lookup.ts +++ b/tests/src/interfaces/types-lookup.ts @@ -108,14 +108,23 @@ export interface CumulusPalletParachainSystemEvent extends Enum { readonly isValidationFunctionStored: boolean; readonly isValidationFunctionApplied: boolean; - readonly asValidationFunctionApplied: u32; + readonly asValidationFunctionApplied: { + readonly relayChainBlockNum: u32; + } & Struct; readonly isValidationFunctionDiscarded: boolean; readonly isUpgradeAuthorized: boolean; - readonly asUpgradeAuthorized: H256; + readonly asUpgradeAuthorized: { + readonly codeHash: H256; + } & Struct; readonly isDownwardMessagesReceived: boolean; - readonly asDownwardMessagesReceived: u32; + readonly asDownwardMessagesReceived: { + readonly count: u32; + } & Struct; readonly isDownwardMessagesProcessed: boolean; - readonly asDownwardMessagesProcessed: ITuple<[u64, H256]>; + readonly asDownwardMessagesProcessed: { + readonly weightUsed: u64; + readonly dmqHead: H256; + } & Struct; readonly type: 'ValidationFunctionStored' | 'ValidationFunctionApplied' | 'ValidationFunctionDiscarded' | 'UpgradeAuthorized' | 'DownwardMessagesReceived' | 'DownwardMessagesProcessed'; } @@ -300,15 +309,7 @@ readonly type: 'V1Ancient' | 'V2'; } - /** @name FrameSupportWeightsWeightToFeeCoefficient (68) */ - export interface FrameSupportWeightsWeightToFeeCoefficient extends Struct { - readonly coeffInteger: u128; - readonly coeffFrac: Perbill; - readonly negative: bool; - readonly degree: u8; - } - - /** @name PalletTreasuryProposal (70) */ + /** @name PalletTreasuryProposal (67) */ export interface PalletTreasuryProposal extends Struct { readonly proposer: AccountId32; readonly value: u128; @@ -316,7 +317,7 @@ readonly bond: u128; } - /** @name PalletTreasuryCall (73) */ + /** @name PalletTreasuryCall (70) */ export interface PalletTreasuryCall extends Enum { readonly isProposeSpend: boolean; readonly asProposeSpend: { @@ -338,7 +339,7 @@ readonly type: 'ProposeSpend' | 'RejectProposal' | 'ApproveProposal' | 'RemoveApproval'; } - /** @name PalletTreasuryEvent (75) */ + /** @name PalletTreasuryEvent (72) */ export interface PalletTreasuryEvent extends Enum { readonly isProposed: boolean; readonly asProposed: { @@ -374,10 +375,10 @@ readonly type: 'Proposed' | 'Spending' | 'Awarded' | 'Rejected' | 'Burnt' | 'Rollover' | 'Deposit'; } - /** @name FrameSupportPalletId (78) */ + /** @name FrameSupportPalletId (75) */ export interface FrameSupportPalletId extends U8aFixed {} - /** @name PalletTreasuryError (79) */ + /** @name PalletTreasuryError (76) */ export interface PalletTreasuryError extends Enum { readonly isInsufficientProposersBalance: boolean; readonly isInvalidIndex: boolean; @@ -386,7 +387,7 @@ readonly type: 'InsufficientProposersBalance' | 'InvalidIndex' | 'TooManyApprovals' | 'ProposalNotApproved'; } - /** @name PalletSudoCall (80) */ + /** @name PalletSudoCall (77) */ export interface PalletSudoCall extends Enum { readonly isSudo: boolean; readonly asSudo: { @@ -409,7 +410,7 @@ readonly type: 'Sudo' | 'SudoUncheckedWeight' | 'SetKey' | 'SudoAs'; } - /** @name FrameSystemCall (82) */ + /** @name FrameSystemCall (79) */ export interface FrameSystemCall extends Enum { readonly isFillBlock: boolean; readonly asFillBlock: { @@ -451,7 +452,7 @@ readonly type: 'FillBlock' | 'Remark' | 'SetHeapPages' | 'SetCode' | 'SetCodeWithoutChecks' | 'SetStorage' | 'KillStorage' | 'KillPrefix' | 'RemarkWithEvent'; } - /** @name OrmlVestingModuleCall (85) */ + /** @name OrmlVestingModuleCall (83) */ export interface OrmlVestingModuleCall extends Enum { readonly isClaim: boolean; readonly isVestedTransfer: boolean; @@ -471,7 +472,7 @@ readonly type: 'Claim' | 'VestedTransfer' | 'UpdateVestingSchedules' | 'ClaimFor'; } - /** @name OrmlVestingVestingSchedule (86) */ + /** @name OrmlVestingVestingSchedule (84) */ export interface OrmlVestingVestingSchedule extends Struct { readonly start: u32; readonly period: u32; @@ -479,7 +480,7 @@ readonly perPeriod: Compact; } - /** @name CumulusPalletXcmpQueueCall (88) */ + /** @name CumulusPalletXcmpQueueCall (86) */ export interface CumulusPalletXcmpQueueCall extends Enum { readonly isServiceOverweight: boolean; readonly asServiceOverweight: { @@ -515,7 +516,7 @@ readonly type: 'ServiceOverweight' | 'SuspendXcmExecution' | 'ResumeXcmExecution' | 'UpdateSuspendThreshold' | 'UpdateDropThreshold' | 'UpdateResumeThreshold' | 'UpdateThresholdWeight' | 'UpdateWeightRestrictDecay' | 'UpdateXcmpMaxIndividualWeight'; } - /** @name PalletXcmCall (89) */ + /** @name PalletXcmCall (87) */ export interface PalletXcmCall extends Enum { readonly isSend: boolean; readonly asSend: { @@ -577,7 +578,7 @@ readonly type: 'Send' | 'TeleportAssets' | 'ReserveTransferAssets' | 'Execute' | 'ForceXcmVersion' | 'ForceDefaultXcmVersion' | 'ForceSubscribeVersionNotify' | 'ForceUnsubscribeVersionNotify' | 'LimitedReserveTransferAssets' | 'LimitedTeleportAssets'; } - /** @name XcmVersionedMultiLocation (90) */ + /** @name XcmVersionedMultiLocation (88) */ export interface XcmVersionedMultiLocation extends Enum { readonly isV0: boolean; readonly asV0: XcmV0MultiLocation; @@ -586,7 +587,7 @@ readonly type: 'V0' | 'V1'; } - /** @name XcmV0MultiLocation (91) */ + /** @name XcmV0MultiLocation (89) */ export interface XcmV0MultiLocation extends Enum { readonly isNull: boolean; readonly isX1: boolean; @@ -608,7 +609,7 @@ readonly type: 'Null' | 'X1' | 'X2' | 'X3' | 'X4' | 'X5' | 'X6' | 'X7' | 'X8'; } - /** @name XcmV0Junction (92) */ + /** @name XcmV0Junction (90) */ export interface XcmV0Junction extends Enum { readonly isParent: boolean; readonly isParachain: boolean; @@ -643,7 +644,7 @@ readonly type: 'Parent' | 'Parachain' | 'AccountId32' | 'AccountIndex64' | 'AccountKey20' | 'PalletInstance' | 'GeneralIndex' | 'GeneralKey' | 'OnlyChild' | 'Plurality'; } - /** @name XcmV0JunctionNetworkId (93) */ + /** @name XcmV0JunctionNetworkId (91) */ export interface XcmV0JunctionNetworkId extends Enum { readonly isAny: boolean; readonly isNamed: boolean; @@ -653,7 +654,7 @@ readonly type: 'Any' | 'Named' | 'Polkadot' | 'Kusama'; } - /** @name XcmV0JunctionBodyId (94) */ + /** @name XcmV0JunctionBodyId (92) */ export interface XcmV0JunctionBodyId extends Enum { readonly isUnit: boolean; readonly isNamed: boolean; @@ -667,7 +668,7 @@ readonly type: 'Unit' | 'Named' | 'Index' | 'Executive' | 'Technical' | 'Legislative' | 'Judicial'; } - /** @name XcmV0JunctionBodyPart (95) */ + /** @name XcmV0JunctionBodyPart (93) */ export interface XcmV0JunctionBodyPart extends Enum { readonly isVoice: boolean; readonly isMembers: boolean; @@ -692,13 +693,13 @@ readonly type: 'Voice' | 'Members' | 'Fraction' | 'AtLeastProportion' | 'MoreThanProportion'; } - /** @name XcmV1MultiLocation (96) */ + /** @name XcmV1MultiLocation (94) */ export interface XcmV1MultiLocation extends Struct { readonly parents: u8; readonly interior: XcmV1MultilocationJunctions; } - /** @name XcmV1MultilocationJunctions (97) */ + /** @name XcmV1MultilocationJunctions (95) */ export interface XcmV1MultilocationJunctions extends Enum { readonly isHere: boolean; readonly isX1: boolean; @@ -720,7 +721,7 @@ readonly type: 'Here' | 'X1' | 'X2' | 'X3' | 'X4' | 'X5' | 'X6' | 'X7' | 'X8'; } - /** @name XcmV1Junction (98) */ + /** @name XcmV1Junction (96) */ export interface XcmV1Junction extends Enum { readonly isParachain: boolean; readonly asParachain: Compact; @@ -754,7 +755,7 @@ readonly type: 'Parachain' | 'AccountId32' | 'AccountIndex64' | 'AccountKey20' | 'PalletInstance' | 'GeneralIndex' | 'GeneralKey' | 'OnlyChild' | 'Plurality'; } - /** @name XcmVersionedXcm (99) */ + /** @name XcmVersionedXcm (97) */ export interface XcmVersionedXcm extends Enum { readonly isV0: boolean; readonly asV0: XcmV0Xcm; @@ -765,7 +766,7 @@ readonly type: 'V0' | 'V1' | 'V2'; } - /** @name XcmV0Xcm (100) */ + /** @name XcmV0Xcm (98) */ export interface XcmV0Xcm extends Enum { readonly isWithdrawAsset: boolean; readonly asWithdrawAsset: { @@ -828,7 +829,7 @@ readonly type: 'WithdrawAsset' | 'ReserveAssetDeposit' | 'TeleportAsset' | 'QueryResponse' | 'TransferAsset' | 'TransferReserveAsset' | 'Transact' | 'HrmpNewChannelOpenRequest' | 'HrmpChannelAccepted' | 'HrmpChannelClosing' | 'RelayedFrom'; } - /** @name XcmV0MultiAsset (102) */ + /** @name XcmV0MultiAsset (100) */ export interface XcmV0MultiAsset extends Enum { readonly isNone: boolean; readonly isAll: boolean; @@ -873,7 +874,7 @@ readonly type: 'None' | 'All' | 'AllFungible' | 'AllNonFungible' | 'AllAbstractFungible' | 'AllAbstractNonFungible' | 'AllConcreteFungible' | 'AllConcreteNonFungible' | 'AbstractFungible' | 'AbstractNonFungible' | 'ConcreteFungible' | 'ConcreteNonFungible'; } - /** @name XcmV1MultiassetAssetInstance (103) */ + /** @name XcmV1MultiassetAssetInstance (101) */ export interface XcmV1MultiassetAssetInstance extends Enum { readonly isUndefined: boolean; readonly isIndex: boolean; @@ -891,7 +892,7 @@ readonly type: 'Undefined' | 'Index' | 'Array4' | 'Array8' | 'Array16' | 'Array32' | 'Blob'; } - /** @name XcmV0Order (106) */ + /** @name XcmV0Order (104) */ export interface XcmV0Order extends Enum { readonly isNull: boolean; readonly isDepositAsset: boolean; @@ -939,14 +940,14 @@ readonly type: 'Null' | 'DepositAsset' | 'DepositReserveAsset' | 'ExchangeAsset' | 'InitiateReserveWithdraw' | 'InitiateTeleport' | 'QueryHolding' | 'BuyExecution'; } - /** @name XcmV0Response (108) */ + /** @name XcmV0Response (106) */ export interface XcmV0Response extends Enum { readonly isAssets: boolean; readonly asAssets: Vec; readonly type: 'Assets'; } - /** @name XcmV0OriginKind (109) */ + /** @name XcmV0OriginKind (107) */ export interface XcmV0OriginKind extends Enum { readonly isNative: boolean; readonly isSovereignAccount: boolean; @@ -955,12 +956,12 @@ readonly type: 'Native' | 'SovereignAccount' | 'Superuser' | 'Xcm'; } - /** @name XcmDoubleEncoded (110) */ + /** @name XcmDoubleEncoded (108) */ export interface XcmDoubleEncoded extends Struct { readonly encoded: Bytes; } - /** @name XcmV1Xcm (111) */ + /** @name XcmV1Xcm (109) */ export interface XcmV1Xcm extends Enum { readonly isWithdrawAsset: boolean; readonly asWithdrawAsset: { @@ -1029,16 +1030,16 @@ readonly type: 'WithdrawAsset' | 'ReserveAssetDeposited' | 'ReceiveTeleportedAsset' | 'QueryResponse' | 'TransferAsset' | 'TransferReserveAsset' | 'Transact' | 'HrmpNewChannelOpenRequest' | 'HrmpChannelAccepted' | 'HrmpChannelClosing' | 'RelayedFrom' | 'SubscribeVersion' | 'UnsubscribeVersion'; } - /** @name XcmV1MultiassetMultiAssets (112) */ + /** @name XcmV1MultiassetMultiAssets (110) */ export interface XcmV1MultiassetMultiAssets extends Vec {} - /** @name XcmV1MultiAsset (114) */ + /** @name XcmV1MultiAsset (112) */ export interface XcmV1MultiAsset extends Struct { readonly id: XcmV1MultiassetAssetId; readonly fun: XcmV1MultiassetFungibility; } - /** @name XcmV1MultiassetAssetId (115) */ + /** @name XcmV1MultiassetAssetId (113) */ export interface XcmV1MultiassetAssetId extends Enum { readonly isConcrete: boolean; readonly asConcrete: XcmV1MultiLocation; @@ -1047,7 +1048,7 @@ readonly type: 'Concrete' | 'Abstract'; } - /** @name XcmV1MultiassetFungibility (116) */ + /** @name XcmV1MultiassetFungibility (114) */ export interface XcmV1MultiassetFungibility extends Enum { readonly isFungible: boolean; readonly asFungible: Compact; @@ -1056,7 +1057,7 @@ readonly type: 'Fungible' | 'NonFungible'; } - /** @name XcmV1Order (118) */ + /** @name XcmV1Order (116) */ export interface XcmV1Order extends Enum { readonly isNoop: boolean; readonly isDepositAsset: boolean; @@ -1106,7 +1107,7 @@ readonly type: 'Noop' | 'DepositAsset' | 'DepositReserveAsset' | 'ExchangeAsset' | 'InitiateReserveWithdraw' | 'InitiateTeleport' | 'QueryHolding' | 'BuyExecution'; } - /** @name XcmV1MultiassetMultiAssetFilter (119) */ + /** @name XcmV1MultiassetMultiAssetFilter (117) */ export interface XcmV1MultiassetMultiAssetFilter extends Enum { readonly isDefinite: boolean; readonly asDefinite: XcmV1MultiassetMultiAssets; @@ -1115,7 +1116,7 @@ readonly type: 'Definite' | 'Wild'; } - /** @name XcmV1MultiassetWildMultiAsset (120) */ + /** @name XcmV1MultiassetWildMultiAsset (118) */ export interface XcmV1MultiassetWildMultiAsset extends Enum { readonly isAll: boolean; readonly isAllOf: boolean; @@ -1126,14 +1127,14 @@ readonly type: 'All' | 'AllOf'; } - /** @name XcmV1MultiassetWildFungibility (121) */ + /** @name XcmV1MultiassetWildFungibility (119) */ export interface XcmV1MultiassetWildFungibility extends Enum { readonly isFungible: boolean; readonly isNonFungible: boolean; readonly type: 'Fungible' | 'NonFungible'; } - /** @name XcmV1Response (123) */ + /** @name XcmV1Response (121) */ export interface XcmV1Response extends Enum { readonly isAssets: boolean; readonly asAssets: XcmV1MultiassetMultiAssets; @@ -1142,10 +1143,10 @@ readonly type: 'Assets' | 'Version'; } - /** @name XcmV2Xcm (124) */ + /** @name XcmV2Xcm (122) */ export interface XcmV2Xcm extends Vec {} - /** @name XcmV2Instruction (126) */ + /** @name XcmV2Instruction (124) */ export interface XcmV2Instruction extends Enum { readonly isWithdrawAsset: boolean; readonly asWithdrawAsset: XcmV1MultiassetMultiAssets; @@ -1265,7 +1266,7 @@ readonly type: 'WithdrawAsset' | 'ReserveAssetDeposited' | 'ReceiveTeleportedAsset' | 'QueryResponse' | 'TransferAsset' | 'TransferReserveAsset' | 'Transact' | 'HrmpNewChannelOpenRequest' | 'HrmpChannelAccepted' | 'HrmpChannelClosing' | 'ClearOrigin' | 'DescendOrigin' | 'ReportError' | 'DepositAsset' | 'DepositReserveAsset' | 'ExchangeAsset' | 'InitiateReserveWithdraw' | 'InitiateTeleport' | 'QueryHolding' | 'BuyExecution' | 'RefundSurplus' | 'SetErrorHandler' | 'SetAppendix' | 'ClearError' | 'ClaimAsset' | 'Trap' | 'SubscribeVersion' | 'UnsubscribeVersion'; } - /** @name XcmV2Response (127) */ + /** @name XcmV2Response (125) */ export interface XcmV2Response extends Enum { readonly isNull: boolean; readonly isAssets: boolean; @@ -1277,7 +1278,7 @@ readonly type: 'Null' | 'Assets' | 'ExecutionResult' | 'Version'; } - /** @name XcmV2TraitsError (130) */ + /** @name XcmV2TraitsError (128) */ export interface XcmV2TraitsError extends Enum { readonly isOverflow: boolean; readonly isUnimplemented: boolean; @@ -1310,7 +1311,7 @@ readonly type: 'Overflow' | 'Unimplemented' | 'UntrustedReserveLocation' | 'UntrustedTeleportLocation' | 'MultiLocationFull' | 'MultiLocationNotInvertible' | 'BadOrigin' | 'InvalidLocation' | 'AssetNotFound' | 'FailedToTransactAsset' | 'NotWithdrawable' | 'LocationCannotHold' | 'ExceedsMaxMessageSize' | 'DestinationUnsupported' | 'Transport' | 'Unroutable' | 'UnknownClaim' | 'FailedToDecode' | 'MaxWeightInvalid' | 'NotHoldingFees' | 'TooExpensive' | 'Trap' | 'UnhandledXcmVersion' | 'WeightLimitReached' | 'Barrier' | 'WeightNotComputable'; } - /** @name XcmV2WeightLimit (131) */ + /** @name XcmV2WeightLimit (129) */ export interface XcmV2WeightLimit extends Enum { readonly isUnlimited: boolean; readonly isLimited: boolean; @@ -1318,7 +1319,7 @@ readonly type: 'Unlimited' | 'Limited'; } - /** @name XcmVersionedMultiAssets (132) */ + /** @name XcmVersionedMultiAssets (130) */ export interface XcmVersionedMultiAssets extends Enum { readonly isV0: boolean; readonly asV0: Vec; @@ -1327,10 +1328,10 @@ readonly type: 'V0' | 'V1'; } - /** @name CumulusPalletXcmCall (147) */ + /** @name CumulusPalletXcmCall (145) */ export type CumulusPalletXcmCall = Null; - /** @name CumulusPalletDmpQueueCall (148) */ + /** @name CumulusPalletDmpQueueCall (146) */ export interface CumulusPalletDmpQueueCall extends Enum { readonly isServiceOverweight: boolean; readonly asServiceOverweight: { @@ -1340,7 +1341,7 @@ readonly type: 'ServiceOverweight'; } - /** @name PalletInflationCall (149) */ + /** @name PalletInflationCall (147) */ export interface PalletInflationCall extends Enum { readonly isStartInflation: boolean; readonly asStartInflation: { @@ -1349,7 +1350,7 @@ readonly type: 'StartInflation'; } - /** @name PalletUniqueCall (150) */ + /** @name PalletUniqueCall (148) */ export interface PalletUniqueCall extends Enum { readonly isCreateCollection: boolean; readonly asCreateCollection: { @@ -1498,10 +1499,16 @@ readonly collectionId: u32; readonly newLimit: UpDataStructsCollectionPermissions; } & Struct; - readonly type: 'CreateCollection' | 'CreateCollectionEx' | 'DestroyCollection' | 'AddToAllowList' | 'RemoveFromAllowList' | 'ChangeCollectionOwner' | 'AddCollectionAdmin' | 'RemoveCollectionAdmin' | 'SetCollectionSponsor' | 'ConfirmSponsorship' | 'RemoveCollectionSponsor' | 'CreateItem' | 'CreateMultipleItems' | 'SetCollectionProperties' | 'DeleteCollectionProperties' | 'SetTokenProperties' | 'DeleteTokenProperties' | 'SetTokenPropertyPermissions' | 'CreateMultipleItemsEx' | 'SetTransfersEnabledFlag' | 'BurnItem' | 'BurnFrom' | 'Transfer' | 'Approve' | 'TransferFrom' | 'SetCollectionLimits' | 'SetCollectionPermissions'; + readonly isRepartition: boolean; + readonly asRepartition: { + readonly collectionId: u32; + readonly token: u32; + readonly amount: u128; + } & Struct; + readonly type: 'CreateCollection' | 'CreateCollectionEx' | 'DestroyCollection' | 'AddToAllowList' | 'RemoveFromAllowList' | 'ChangeCollectionOwner' | 'AddCollectionAdmin' | 'RemoveCollectionAdmin' | 'SetCollectionSponsor' | 'ConfirmSponsorship' | 'RemoveCollectionSponsor' | 'CreateItem' | 'CreateMultipleItems' | 'SetCollectionProperties' | 'DeleteCollectionProperties' | 'SetTokenProperties' | 'DeleteTokenProperties' | 'SetTokenPropertyPermissions' | 'CreateMultipleItemsEx' | 'SetTransfersEnabledFlag' | 'BurnItem' | 'BurnFrom' | 'Transfer' | 'Approve' | 'TransferFrom' | 'SetCollectionLimits' | 'SetCollectionPermissions' | 'Repartition'; } - /** @name UpDataStructsCollectionMode (156) */ + /** @name UpDataStructsCollectionMode (154) */ export interface UpDataStructsCollectionMode extends Enum { readonly isNft: boolean; readonly isFungible: boolean; @@ -1510,7 +1517,7 @@ readonly type: 'Nft' | 'Fungible' | 'ReFungible'; } - /** @name UpDataStructsCreateCollectionData (157) */ + /** @name UpDataStructsCreateCollectionData (155) */ export interface UpDataStructsCreateCollectionData extends Struct { readonly mode: UpDataStructsCollectionMode; readonly access: Option; @@ -1524,14 +1531,14 @@ readonly properties: Vec; } - /** @name UpDataStructsAccessMode (159) */ + /** @name UpDataStructsAccessMode (157) */ export interface UpDataStructsAccessMode extends Enum { readonly isNormal: boolean; readonly isAllowList: boolean; readonly type: 'Normal' | 'AllowList'; } - /** @name UpDataStructsCollectionLimits (162) */ + /** @name UpDataStructsCollectionLimits (160) */ export interface UpDataStructsCollectionLimits extends Struct { readonly accountTokenOwnershipLimit: Option; readonly sponsoredDataSize: Option; @@ -1544,7 +1551,7 @@ readonly transfersEnabled: Option; } - /** @name UpDataStructsSponsoringRateLimit (164) */ + /** @name UpDataStructsSponsoringRateLimit (162) */ export interface UpDataStructsSponsoringRateLimit extends Enum { readonly isSponsoringDisabled: boolean; readonly isBlocks: boolean; @@ -1552,44 +1559,43 @@ readonly type: 'SponsoringDisabled' | 'Blocks'; } - /** @name UpDataStructsCollectionPermissions (167) */ + /** @name UpDataStructsCollectionPermissions (165) */ export interface UpDataStructsCollectionPermissions extends Struct { readonly access: Option; readonly mintMode: Option; readonly nesting: Option; } - /** @name UpDataStructsNestingPermissions (169) */ + /** @name UpDataStructsNestingPermissions (167) */ export interface UpDataStructsNestingPermissions extends Struct { readonly tokenOwner: bool; readonly collectionAdmin: bool; readonly restricted: Option; - readonly permissive: bool; } - /** @name UpDataStructsOwnerRestrictedSet (171) */ + /** @name UpDataStructsOwnerRestrictedSet (169) */ export interface UpDataStructsOwnerRestrictedSet extends BTreeSet {} - /** @name UpDataStructsPropertyKeyPermission (177) */ + /** @name UpDataStructsPropertyKeyPermission (175) */ export interface UpDataStructsPropertyKeyPermission extends Struct { readonly key: Bytes; readonly permission: UpDataStructsPropertyPermission; } - /** @name UpDataStructsPropertyPermission (179) */ + /** @name UpDataStructsPropertyPermission (177) */ export interface UpDataStructsPropertyPermission extends Struct { readonly mutable: bool; readonly collectionAdmin: bool; readonly tokenOwner: bool; } - /** @name UpDataStructsProperty (182) */ + /** @name UpDataStructsProperty (180) */ export interface UpDataStructsProperty extends Struct { readonly key: Bytes; readonly value: Bytes; } - /** @name PalletEvmAccountBasicCrossAccountIdRepr (185) */ + /** @name PalletEvmAccountBasicCrossAccountIdRepr (183) */ export interface PalletEvmAccountBasicCrossAccountIdRepr extends Enum { readonly isSubstrate: boolean; readonly asSubstrate: AccountId32; @@ -1598,7 +1604,7 @@ readonly type: 'Substrate' | 'Ethereum'; } - /** @name UpDataStructsCreateItemData (187) */ + /** @name UpDataStructsCreateItemData (185) */ export interface UpDataStructsCreateItemData extends Enum { readonly isNft: boolean; readonly asNft: UpDataStructsCreateNftData; @@ -1609,23 +1615,23 @@ readonly type: 'Nft' | 'Fungible' | 'ReFungible'; } - /** @name UpDataStructsCreateNftData (188) */ + /** @name UpDataStructsCreateNftData (186) */ export interface UpDataStructsCreateNftData extends Struct { readonly properties: Vec; } - /** @name UpDataStructsCreateFungibleData (189) */ + /** @name UpDataStructsCreateFungibleData (187) */ export interface UpDataStructsCreateFungibleData extends Struct { readonly value: u128; } - /** @name UpDataStructsCreateReFungibleData (190) */ + /** @name UpDataStructsCreateReFungibleData (188) */ export interface UpDataStructsCreateReFungibleData extends Struct { readonly constData: Bytes; readonly pieces: u128; } - /** @name UpDataStructsCreateItemExData (195) */ + /** @name UpDataStructsCreateItemExData (193) */ export interface UpDataStructsCreateItemExData extends Enum { readonly isNft: boolean; readonly asNft: Vec; @@ -1638,19 +1644,19 @@ readonly type: 'Nft' | 'Fungible' | 'RefungibleMultipleItems' | 'RefungibleMultipleOwners'; } - /** @name UpDataStructsCreateNftExData (197) */ + /** @name UpDataStructsCreateNftExData (195) */ export interface UpDataStructsCreateNftExData extends Struct { readonly properties: Vec; readonly owner: PalletEvmAccountBasicCrossAccountIdRepr; } - /** @name UpDataStructsCreateRefungibleExData (204) */ + /** @name UpDataStructsCreateRefungibleExData (202) */ export interface UpDataStructsCreateRefungibleExData extends Struct { readonly constData: Bytes; readonly users: BTreeMap; } - /** @name PalletUniqueSchedulerCall (206) */ + /** @name PalletUniqueSchedulerCall (204) */ export interface PalletUniqueSchedulerCall extends Enum { readonly isScheduleNamed: boolean; readonly asScheduleNamed: { @@ -1675,7 +1681,7 @@ readonly type: 'ScheduleNamed' | 'CancelNamed' | 'ScheduleNamedAfter'; } - /** @name FrameSupportScheduleMaybeHashed (208) */ + /** @name FrameSupportScheduleMaybeHashed (206) */ export interface FrameSupportScheduleMaybeHashed extends Enum { readonly isValue: boolean; readonly asValue: Call; @@ -1684,13 +1690,13 @@ readonly type: 'Value' | 'Hash'; } - /** @name PalletTemplateTransactionPaymentCall (209) */ + /** @name PalletTemplateTransactionPaymentCall (207) */ export type PalletTemplateTransactionPaymentCall = Null; - /** @name PalletStructureCall (210) */ + /** @name PalletStructureCall (208) */ export type PalletStructureCall = Null; - /** @name PalletRmrkCoreCall (211) */ + /** @name PalletRmrkCoreCall (209) */ export interface PalletRmrkCoreCall extends Enum { readonly isCreateCollection: boolean; readonly asCreateCollection: { @@ -1713,7 +1719,7 @@ } & Struct; readonly isMintNft: boolean; readonly asMintNft: { - readonly owner: AccountId32; + readonly owner: Option; readonly collectionId: u32; readonly recipient: Option; readonly royaltyAmount: Option; @@ -1748,13 +1754,13 @@ readonly asAcceptResource: { readonly rmrkCollectionId: u32; readonly rmrkNftId: u32; - readonly rmrkResourceId: u32; + readonly resourceId: u32; } & Struct; readonly isAcceptResourceRemoval: boolean; readonly asAcceptResourceRemoval: { readonly rmrkCollectionId: u32; readonly rmrkNftId: u32; - readonly rmrkResourceId: u32; + readonly resourceId: u32; } & Struct; readonly isSetProperty: boolean; readonly asSetProperty: { @@ -1796,7 +1802,7 @@ readonly type: 'CreateCollection' | 'DestroyCollection' | 'ChangeCollectionIssuer' | 'LockCollection' | 'MintNft' | 'BurnNft' | 'Send' | 'AcceptNft' | 'RejectNft' | 'AcceptResource' | 'AcceptResourceRemoval' | 'SetProperty' | 'SetPriority' | 'AddBasicResource' | 'AddComposableResource' | 'AddSlotResource' | 'RemoveResource'; } - /** @name RmrkTraitsResourceResourceTypes (217) */ + /** @name RmrkTraitsResourceResourceTypes (215) */ export interface RmrkTraitsResourceResourceTypes extends Enum { readonly isBasic: boolean; readonly asBasic: RmrkTraitsResourceBasicResource; @@ -1807,7 +1813,7 @@ readonly type: 'Basic' | 'Composable' | 'Slot'; } - /** @name RmrkTraitsResourceBasicResource (219) */ + /** @name RmrkTraitsResourceBasicResource (217) */ export interface RmrkTraitsResourceBasicResource extends Struct { readonly src: Option; readonly metadata: Option; @@ -1815,7 +1821,7 @@ readonly thumb: Option; } - /** @name RmrkTraitsResourceComposableResource (221) */ + /** @name RmrkTraitsResourceComposableResource (219) */ export interface RmrkTraitsResourceComposableResource extends Struct { readonly parts: Vec; readonly base: u32; @@ -1825,7 +1831,7 @@ readonly thumb: Option; } - /** @name RmrkTraitsResourceSlotResource (222) */ + /** @name RmrkTraitsResourceSlotResource (220) */ export interface RmrkTraitsResourceSlotResource extends Struct { readonly base: u32; readonly src: Option; @@ -1835,7 +1841,7 @@ readonly thumb: Option; } - /** @name RmrkTraitsNftAccountIdOrCollectionNftTuple (224) */ + /** @name RmrkTraitsNftAccountIdOrCollectionNftTuple (222) */ export interface RmrkTraitsNftAccountIdOrCollectionNftTuple extends Enum { readonly isAccountId: boolean; readonly asAccountId: AccountId32; @@ -1844,7 +1850,7 @@ readonly type: 'AccountId' | 'CollectionAndNftTuple'; } - /** @name PalletRmrkEquipCall (228) */ + /** @name PalletRmrkEquipCall (226) */ export interface PalletRmrkEquipCall extends Enum { readonly isCreateBase: boolean; readonly asCreateBase: { @@ -1857,10 +1863,16 @@ readonly baseId: u32; readonly theme: RmrkTraitsTheme; } & Struct; - readonly type: 'CreateBase' | 'ThemeAdd'; + readonly isEquippable: boolean; + readonly asEquippable: { + readonly baseId: u32; + readonly slotId: u32; + readonly equippables: RmrkTraitsPartEquippableList; + } & Struct; + readonly type: 'CreateBase' | 'ThemeAdd' | 'Equippable'; } - /** @name RmrkTraitsPartPartType (230) */ + /** @name RmrkTraitsPartPartType (229) */ export interface RmrkTraitsPartPartType extends Enum { readonly isFixedPart: boolean; readonly asFixedPart: RmrkTraitsPartFixedPart; @@ -1869,14 +1881,14 @@ readonly type: 'FixedPart' | 'SlotPart'; } - /** @name RmrkTraitsPartFixedPart (232) */ + /** @name RmrkTraitsPartFixedPart (231) */ export interface RmrkTraitsPartFixedPart extends Struct { readonly id: u32; readonly z: u32; readonly src: Bytes; } - /** @name RmrkTraitsPartSlotPart (233) */ + /** @name RmrkTraitsPartSlotPart (232) */ export interface RmrkTraitsPartSlotPart extends Struct { readonly id: u32; readonly equippable: RmrkTraitsPartEquippableList; @@ -1884,7 +1896,7 @@ readonly z: u32; } - /** @name RmrkTraitsPartEquippableList (234) */ + /** @name RmrkTraitsPartEquippableList (233) */ export interface RmrkTraitsPartEquippableList extends Enum { readonly isAll: boolean; readonly isEmpty: boolean; @@ -1893,14 +1905,14 @@ readonly type: 'All' | 'Empty' | 'Custom'; } - /** @name RmrkTraitsTheme (236) */ + /** @name RmrkTraitsTheme (235) */ export interface RmrkTraitsTheme extends Struct { readonly name: Bytes; readonly properties: Vec; readonly inherit: bool; } - /** @name RmrkTraitsThemeThemeProperty (238) */ + /** @name RmrkTraitsThemeThemeProperty (237) */ export interface RmrkTraitsThemeThemeProperty extends Struct { readonly key: Bytes; readonly value: Bytes; @@ -2323,17 +2335,35 @@ /** @name CumulusPalletDmpQueueEvent (284) */ export interface CumulusPalletDmpQueueEvent extends Enum { readonly isInvalidFormat: boolean; - readonly asInvalidFormat: U8aFixed; + readonly asInvalidFormat: { + readonly messageId: U8aFixed; + } & Struct; readonly isUnsupportedVersion: boolean; - readonly asUnsupportedVersion: U8aFixed; + readonly asUnsupportedVersion: { + readonly messageId: U8aFixed; + } & Struct; readonly isExecutedDownward: boolean; - readonly asExecutedDownward: ITuple<[U8aFixed, XcmV2TraitsOutcome]>; + readonly asExecutedDownward: { + readonly messageId: U8aFixed; + readonly outcome: XcmV2TraitsOutcome; + } & Struct; readonly isWeightExhausted: boolean; - readonly asWeightExhausted: ITuple<[U8aFixed, u64, u64]>; + readonly asWeightExhausted: { + readonly messageId: U8aFixed; + readonly remainingWeight: u64; + readonly requiredWeight: u64; + } & Struct; readonly isOverweightEnqueued: boolean; - readonly asOverweightEnqueued: ITuple<[U8aFixed, u64, u64]>; + readonly asOverweightEnqueued: { + readonly messageId: U8aFixed; + readonly overweightIndex: u64; + readonly requiredWeight: u64; + } & Struct; readonly isOverweightServiced: boolean; - readonly asOverweightServiced: ITuple<[u64, u64]>; + readonly asOverweightServiced: { + readonly overweightIndex: u64; + readonly weightUsed: u64; + } & Struct; readonly type: 'InvalidFormat' | 'UnsupportedVersion' | 'ExecutedDownward' | 'WeightExhausted' | 'OverweightEnqueued' | 'OverweightServiced'; } @@ -2527,7 +2557,12 @@ readonly issuer: AccountId32; readonly baseId: u32; } & Struct; - readonly type: 'BaseCreated'; + readonly isEquippablesUpdated: boolean; + readonly asEquippablesUpdated: { + readonly baseId: u32; + readonly slotId: u32; + } & Struct; + readonly type: 'BaseCreated' | 'EquippablesUpdated'; } /** @name PalletEvmEvent (293) */ @@ -2814,7 +2849,8 @@ readonly isCollectionDecimalPointLimitExceeded: boolean; readonly isConfirmUnsetSponsorFail: boolean; readonly isEmptyArgument: boolean; - readonly type: 'CollectionDecimalPointLimitExceeded' | 'ConfirmUnsetSponsorFail' | 'EmptyArgument'; + readonly isRepartitionCalledOnNonRefungibleCollection: boolean; + readonly type: 'CollectionDecimalPointLimitExceeded' | 'ConfirmUnsetSponsorFail' | 'EmptyArgument' | 'RepartitionCalledOnNonRefungibleCollection'; } /** @name PalletUniqueSchedulerScheduledV3 (347) */ @@ -3067,9 +3103,10 @@ export interface PalletRefungibleError extends Enum { readonly isNotRefungibleDataUsedToMintFungibleCollectionToken: boolean; readonly isWrongRefungiblePieces: boolean; + readonly isRepartitionWhileNotOwningAllPieces: boolean; readonly isRefungibleDisallowsNesting: boolean; readonly isSettingPropertiesNotAllowed: boolean; - readonly type: 'NotRefungibleDataUsedToMintFungibleCollectionToken' | 'WrongRefungiblePieces' | 'RefungibleDisallowsNesting' | 'SettingPropertiesNotAllowed'; + readonly type: 'NotRefungibleDataUsedToMintFungibleCollectionToken' | 'WrongRefungiblePieces' | 'RepartitionWhileNotOwningAllPieces' | 'RefungibleDisallowsNesting' | 'SettingPropertiesNotAllowed'; } /** @name PalletNonfungibleItemData (394) */ @@ -3077,7 +3114,14 @@ readonly owner: PalletEvmAccountBasicCrossAccountIdRepr; } - /** @name PalletNonfungibleError (396) */ + /** @name UpDataStructsPropertyScope (396) */ + export interface UpDataStructsPropertyScope extends Enum { + readonly isNone: boolean; + readonly isRmrk: boolean; + readonly type: 'None' | 'Rmrk'; + } + + /** @name PalletNonfungibleError (398) */ export interface PalletNonfungibleError extends Enum { readonly isNotNonfungibleDataUsedToMintFungibleCollectionToken: boolean; readonly isNonfungibleItemsHaveNoAmount: boolean; @@ -3085,7 +3129,7 @@ readonly type: 'NotNonfungibleDataUsedToMintFungibleCollectionToken' | 'NonfungibleItemsHaveNoAmount' | 'CantBurnNftWithChildren'; } - /** @name PalletStructureError (397) */ + /** @name PalletStructureError (399) */ export interface PalletStructureError extends Enum { readonly isOuroborosDetected: boolean; readonly isDepthLimit: boolean; @@ -3094,12 +3138,13 @@ readonly type: 'OuroborosDetected' | 'DepthLimit' | 'BreadthLimit' | 'TokenNotFound'; } - /** @name PalletRmrkCoreError (398) */ + /** @name PalletRmrkCoreError (400) */ export interface PalletRmrkCoreError extends Enum { readonly isCorruptedCollectionType: boolean; readonly isNftTypeEncodeError: boolean; readonly isRmrkPropertyKeyIsTooLong: boolean; readonly isRmrkPropertyValueIsTooLong: boolean; + readonly isRmrkPropertyIsNotFound: boolean; readonly isUnableToDecodeRmrkData: boolean; readonly isCollectionNotEmpty: boolean; readonly isNoAvailableCollectionId: boolean; @@ -3112,21 +3157,25 @@ readonly isCannotSendToDescendentOrSelf: boolean; readonly isCannotAcceptNonOwnedNft: boolean; readonly isCannotRejectNonOwnedNft: boolean; + readonly isCannotRejectNonPendingNft: boolean; readonly isResourceNotPending: boolean; - readonly type: 'CorruptedCollectionType' | 'NftTypeEncodeError' | 'RmrkPropertyKeyIsTooLong' | 'RmrkPropertyValueIsTooLong' | 'UnableToDecodeRmrkData' | 'CollectionNotEmpty' | 'NoAvailableCollectionId' | 'NoAvailableNftId' | 'CollectionUnknown' | 'NoPermission' | 'NonTransferable' | 'CollectionFullOrLocked' | 'ResourceDoesntExist' | 'CannotSendToDescendentOrSelf' | 'CannotAcceptNonOwnedNft' | 'CannotRejectNonOwnedNft' | 'ResourceNotPending'; + readonly isNoAvailableResourceId: boolean; + readonly type: 'CorruptedCollectionType' | 'NftTypeEncodeError' | 'RmrkPropertyKeyIsTooLong' | 'RmrkPropertyValueIsTooLong' | 'RmrkPropertyIsNotFound' | 'UnableToDecodeRmrkData' | 'CollectionNotEmpty' | 'NoAvailableCollectionId' | 'NoAvailableNftId' | 'CollectionUnknown' | 'NoPermission' | 'NonTransferable' | 'CollectionFullOrLocked' | 'ResourceDoesntExist' | 'CannotSendToDescendentOrSelf' | 'CannotAcceptNonOwnedNft' | 'CannotRejectNonOwnedNft' | 'CannotRejectNonPendingNft' | 'ResourceNotPending' | 'NoAvailableResourceId'; } - /** @name PalletRmrkEquipError (400) */ + /** @name PalletRmrkEquipError (402) */ export interface PalletRmrkEquipError extends Enum { readonly isPermissionError: boolean; readonly isNoAvailableBaseId: boolean; readonly isNoAvailablePartId: boolean; readonly isBaseDoesntExist: boolean; readonly isNeedsDefaultThemeFirst: boolean; - readonly type: 'PermissionError' | 'NoAvailableBaseId' | 'NoAvailablePartId' | 'BaseDoesntExist' | 'NeedsDefaultThemeFirst'; + readonly isPartDoesntExist: boolean; + readonly isNoEquippableOnFixedPart: boolean; + readonly type: 'PermissionError' | 'NoAvailableBaseId' | 'NoAvailablePartId' | 'BaseDoesntExist' | 'NeedsDefaultThemeFirst' | 'PartDoesntExist' | 'NoEquippableOnFixedPart'; } - /** @name PalletEvmError (403) */ + /** @name PalletEvmError (405) */ export interface PalletEvmError extends Enum { readonly isBalanceLow: boolean; readonly isFeeOverflow: boolean; @@ -3137,7 +3186,7 @@ readonly type: 'BalanceLow' | 'FeeOverflow' | 'PaymentOverflow' | 'WithdrawFailed' | 'GasPriceTooLow' | 'InvalidNonce'; } - /** @name FpRpcTransactionStatus (406) */ + /** @name FpRpcTransactionStatus (408) */ export interface FpRpcTransactionStatus extends Struct { readonly transactionHash: H256; readonly transactionIndex: u32; @@ -3148,10 +3197,10 @@ readonly logsBloom: EthbloomBloom; } - /** @name EthbloomBloom (408) */ + /** @name EthbloomBloom (410) */ export interface EthbloomBloom extends U8aFixed {} - /** @name EthereumReceiptReceiptV3 (410) */ + /** @name EthereumReceiptReceiptV3 (412) */ export interface EthereumReceiptReceiptV3 extends Enum { readonly isLegacy: boolean; readonly asLegacy: EthereumReceiptEip658ReceiptData; @@ -3162,7 +3211,7 @@ readonly type: 'Legacy' | 'Eip2930' | 'Eip1559'; } - /** @name EthereumReceiptEip658ReceiptData (411) */ + /** @name EthereumReceiptEip658ReceiptData (413) */ export interface EthereumReceiptEip658ReceiptData extends Struct { readonly statusCode: u8; readonly usedGas: U256; @@ -3170,14 +3219,14 @@ readonly logs: Vec; } - /** @name EthereumBlock (412) */ + /** @name EthereumBlock (414) */ export interface EthereumBlock extends Struct { readonly header: EthereumHeader; readonly transactions: Vec; readonly ommers: Vec; } - /** @name EthereumHeader (413) */ + /** @name EthereumHeader (415) */ export interface EthereumHeader extends Struct { readonly parentHash: H256; readonly ommersHash: H256; @@ -3196,24 +3245,24 @@ readonly nonce: EthereumTypesHashH64; } - /** @name EthereumTypesHashH64 (414) */ + /** @name EthereumTypesHashH64 (416) */ export interface EthereumTypesHashH64 extends U8aFixed {} - /** @name PalletEthereumError (419) */ + /** @name PalletEthereumError (421) */ export interface PalletEthereumError extends Enum { readonly isInvalidSignature: boolean; readonly isPreLogExists: boolean; readonly type: 'InvalidSignature' | 'PreLogExists'; } - /** @name PalletEvmCoderSubstrateError (420) */ + /** @name PalletEvmCoderSubstrateError (422) */ export interface PalletEvmCoderSubstrateError extends Enum { readonly isOutOfGas: boolean; readonly isOutOfFund: boolean; readonly type: 'OutOfGas' | 'OutOfFund'; } - /** @name PalletEvmContractHelpersSponsoringModeT (421) */ + /** @name PalletEvmContractHelpersSponsoringModeT (423) */ export interface PalletEvmContractHelpersSponsoringModeT extends Enum { readonly isDisabled: boolean; readonly isAllowlisted: boolean; @@ -3221,20 +3270,20 @@ readonly type: 'Disabled' | 'Allowlisted' | 'Generous'; } - /** @name PalletEvmContractHelpersError (423) */ + /** @name PalletEvmContractHelpersError (425) */ export interface PalletEvmContractHelpersError extends Enum { readonly isNoPermission: boolean; readonly type: 'NoPermission'; } - /** @name PalletEvmMigrationError (424) */ + /** @name PalletEvmMigrationError (426) */ export interface PalletEvmMigrationError extends Enum { readonly isAccountNotEmpty: boolean; readonly isAccountIsNotMigrating: boolean; readonly type: 'AccountNotEmpty' | 'AccountIsNotMigrating'; } - /** @name SpRuntimeMultiSignature (426) */ + /** @name SpRuntimeMultiSignature (428) */ export interface SpRuntimeMultiSignature extends Enum { readonly isEd25519: boolean; readonly asEd25519: SpCoreEd25519Signature; @@ -3245,34 +3294,34 @@ readonly type: 'Ed25519' | 'Sr25519' | 'Ecdsa'; } - /** @name SpCoreEd25519Signature (427) */ + /** @name SpCoreEd25519Signature (429) */ export interface SpCoreEd25519Signature extends U8aFixed {} - /** @name SpCoreSr25519Signature (429) */ + /** @name SpCoreSr25519Signature (431) */ export interface SpCoreSr25519Signature extends U8aFixed {} - /** @name SpCoreEcdsaSignature (430) */ + /** @name SpCoreEcdsaSignature (432) */ export interface SpCoreEcdsaSignature extends U8aFixed {} - /** @name FrameSystemExtensionsCheckSpecVersion (433) */ + /** @name FrameSystemExtensionsCheckSpecVersion (435) */ export type FrameSystemExtensionsCheckSpecVersion = Null; - /** @name FrameSystemExtensionsCheckGenesis (434) */ + /** @name FrameSystemExtensionsCheckGenesis (436) */ export type FrameSystemExtensionsCheckGenesis = Null; - /** @name FrameSystemExtensionsCheckNonce (437) */ + /** @name FrameSystemExtensionsCheckNonce (439) */ export interface FrameSystemExtensionsCheckNonce extends Compact {} - /** @name FrameSystemExtensionsCheckWeight (438) */ + /** @name FrameSystemExtensionsCheckWeight (440) */ export type FrameSystemExtensionsCheckWeight = Null; - /** @name PalletTemplateTransactionPaymentChargeTransactionPayment (439) */ + /** @name PalletTemplateTransactionPaymentChargeTransactionPayment (441) */ export interface PalletTemplateTransactionPaymentChargeTransactionPayment extends Compact {} - /** @name OpalRuntimeRuntime (440) */ + /** @name OpalRuntimeRuntime (442) */ export type OpalRuntimeRuntime = Null; - /** @name PalletEthereumFakeTransactionFinalizer (441) */ + /** @name PalletEthereumFakeTransactionFinalizer (443) */ export type PalletEthereumFakeTransactionFinalizer = Null; } // declare module --- a/tests/src/refungible.test.ts +++ b/tests/src/refungible.test.ts @@ -29,6 +29,7 @@ createRefungibleToken, transfer, burnItem, + repartitionRFT, } from './util/helpers'; import chai from 'chai'; @@ -162,4 +163,27 @@ expect(await getAllowance(api, collectionId, alice, bob, tokenId)).to.be.equal(40n); }); }); + + it('Repartition', async () => { + await usingApi(async api => { + const collectionId = (await createCollection(api, alice, {mode: {type: 'ReFungible'}})).collectionId; + const tokenId = (await createRefungibleToken(api, alice, collectionId, 100n)).itemId; + + expect(await repartitionRFT(api, collectionId, alice, tokenId, 200n)).to.be.true; + expect(await getBalance(api, collectionId, alice, tokenId)).to.be.equal(200n); + + expect(await transfer(api, collectionId, tokenId, alice, bob, 110n)).to.be.true; + expect(await getBalance(api, collectionId, alice, tokenId)).to.be.equal(90n); + expect(await getBalance(api, collectionId, bob, tokenId)).to.be.equal(110n); + + await expect(repartitionRFT(api, collectionId, alice, tokenId, 80n)).to.eventually.be.rejected; + + expect(await transfer(api, collectionId, tokenId, alice, bob, 90n)).to.be.true; + expect(await getBalance(api, collectionId, alice, tokenId)).to.be.equal(0n); + expect(await getBalance(api, collectionId, bob, tokenId)).to.be.equal(200n); + + expect(await repartitionRFT(api, collectionId, bob, tokenId, 150n)).to.be.true; + await expect(transfer(api, collectionId, tokenId, bob, alice, 160n)).to.eventually.be.rejected; + }); + }); }); --- a/tests/src/util/helpers.ts +++ b/tests/src/util/helpers.ts @@ -1630,3 +1630,17 @@ return promise; }); } + +export async function repartitionRFT( + api: ApiPromise, + collectionId: number, + sender: IKeyringPair, + tokenId: number, + amount: bigint, +): Promise { + const tx = api.tx.unique.repartition(collectionId, tokenId, amount); + const events = await submitTransactionAsync(sender, tx); + const result = getGenericResult(events); + + return result.success; +}