git.delta.rocks / unique-network / refs/commits / d76cc13924e4

difftreelog

Merge branch 'develop' into feature/CORE-302-ss58Format

Igor Kozyrev2022-06-08parents: #0362d33 #c557492.patch.diff
in: master

17 files changed

modifiedpallets/common/src/benchmarking.rsdiffbeforeafterboth
--- a/pallets/common/src/benchmarking.rs
+++ b/pallets/common/src/benchmarking.rs
@@ -20,8 +20,8 @@
 use frame_benchmarking::{benchmarks, account};
 use up_data_structs::{
 	CollectionMode, CreateCollectionData, CollectionId, Property, PropertyKey, PropertyValue,
-	MAX_COLLECTION_NAME_LENGTH, MAX_COLLECTION_DESCRIPTION_LENGTH, MAX_TOKEN_PREFIX_LENGTH,
-	OFFCHAIN_SCHEMA_LIMIT, CONST_ON_CHAIN_SCHEMA_LIMIT, MAX_PROPERTIES_PER_ITEM,
+	CollectionPermissions, NestingRule, MAX_COLLECTION_NAME_LENGTH,
+	MAX_COLLECTION_DESCRIPTION_LENGTH, MAX_TOKEN_PREFIX_LENGTH, MAX_PROPERTIES_PER_ITEM,
 };
 use frame_support::{
 	traits::{Currency, Get},
@@ -74,15 +74,15 @@
 }
 
 pub fn create_collection_raw<T: Config, R>(
-	owner: T::AccountId,
+	owner: T::CrossAccountId,
 	mode: CollectionMode,
 	handler: impl FnOnce(
-		T::AccountId,
+		T::CrossAccountId,
 		CreateCollectionData<T::AccountId>,
 	) -> Result<CollectionId, DispatchError>,
 	cast: impl FnOnce(CollectionHandle<T>) -> R,
 ) -> Result<R, DispatchError> {
-	T::Currency::deposit_creating(&owner, T::CollectionCreationPrice::get());
+	<T as Config>::Currency::deposit_creating(&owner.as_sub(), T::CollectionCreationPrice::get());
 	let name = create_u16_data::<MAX_COLLECTION_NAME_LENGTH>();
 	let description = create_u16_data::<MAX_COLLECTION_DESCRIPTION_LENGTH>();
 	let token_prefix = create_data::<MAX_TOKEN_PREFIX_LENGTH>();
@@ -93,13 +93,19 @@
 			name,
 			description,
 			token_prefix,
+			permissions: Some(CollectionPermissions {
+				nesting: Some(NestingRule::Permissive),
+				..Default::default()
+			}),
 			..Default::default()
 		},
 	)
 	.and_then(CollectionHandle::try_get)
 	.map(cast)
 }
-fn create_collection<T: Config>(owner: T::AccountId) -> Result<CollectionHandle<T>, DispatchError> {
+fn create_collection<T: Config>(
+	owner: T::CrossAccountId,
+) -> Result<CollectionHandle<T>, DispatchError> {
 	create_collection_raw(
 		owner,
 		CollectionMode::NFT,
@@ -127,7 +133,7 @@
 		bench_init!($($rest)*);
 	};
 	($name:ident: collection($owner:ident); $($rest:tt)*) => {
-		let $name = create_collection::<T>($owner.clone())?;
+		let $name = create_collection::<T>(T::CrossAccountId::from_sub($owner.clone()))?;
 		bench_init!($($rest)*);
 	};
 	($name:ident: cross; $($rest:tt)*) => {
modifiedpallets/common/src/lib.rsdiffbeforeafterboth
--- a/pallets/common/src/lib.rs
+++ b/pallets/common/src/lib.rs
@@ -1168,8 +1168,9 @@
 		);
 		Ok(new_limit)
 	}
+
 	pub fn clamp_permissions(
-		mode: CollectionMode,
+		_mode: CollectionMode,
 		old_limit: &CollectionPermissions,
 		mut new_limit: CollectionPermissions,
 	) -> Result<CollectionPermissions, DispatchError> {
@@ -1204,6 +1205,22 @@
 	fn approve() -> Weight;
 	fn transfer_from() -> Weight;
 	fn burn_from() -> Weight;
+
+	/// Differs from burn_item in case of Fungible and Refungible, as it should burn
+	/// whole users's balance
+	///
+	/// This method shouldn't be used directly, as it doesn't count breadth price, use `burn_recursively` instead
+	fn burn_recursively_self_raw() -> Weight;
+	/// Cost of iterating over `amount` children while burning, without counting child burning itself
+	///
+	/// This method shouldn't be used directly, as it doesn't count depth price, use `burn_recursively` instead
+	fn burn_recursively_breadth_raw(amount: u32) -> Weight;
+
+	fn burn_recursively(max_selfs: u32, max_breadth: u32) -> Weight {
+		Self::burn_recursively_self_raw()
+			.saturating_mul(max_selfs.max(1) as u64)
+			.saturating_add(Self::burn_recursively_breadth_raw(max_breadth))
+	}
 }
 
 pub trait CommonCollectionOperations<T: Config> {
@@ -1233,6 +1250,13 @@
 		token: TokenId,
 		amount: u128,
 	) -> DispatchResultWithPostInfo;
+	fn burn_item_recursively(
+		&self,
+		sender: T::CrossAccountId,
+		token: TokenId,
+		self_budget: &dyn Budget,
+		breadth_budget: &dyn Budget,
+	) -> DispatchResultWithPostInfo;
 	fn set_collection_properties(
 		&self,
 		sender: T::CrossAccountId,
modifiedpallets/fungible/src/benchmarking.rsdiffbeforeafterboth
--- a/pallets/fungible/src/benchmarking.rs
+++ b/pallets/fungible/src/benchmarking.rs
@@ -25,7 +25,9 @@
 
 const SEED: u32 = 1;
 
-fn create_collection<T: Config>(owner: T::AccountId) -> Result<FungibleHandle<T>, DispatchError> {
+fn create_collection<T: Config>(
+	owner: T::CrossAccountId,
+) -> Result<FungibleHandle<T>, DispatchError> {
 	create_collection_raw(
 		owner,
 		CollectionMode::Fungible(0),
modifiedpallets/fungible/src/common.rsdiffbeforeafterboth
--- a/pallets/fungible/src/common.rs
+++ b/pallets/fungible/src/common.rs
@@ -16,9 +16,10 @@
 
 use core::marker::PhantomData;
 
-use frame_support::{dispatch::DispatchResultWithPostInfo, ensure, fail, weights::Weight};
+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_structure::Error as StructureError;
 use sp_runtime::ArithmeticError;
 use sp_std::{vec::Vec, vec};
 use up_data_structs::{Property, PropertyKey, PropertyValue, PropertyKeyPermission};
@@ -91,6 +92,16 @@
 	fn burn_from() -> Weight {
 		<SelfWeightOf<T>>::burn_from()
 	}
+
+	fn burn_recursively_self_raw() -> Weight {
+		// Read to get total balance
+		Self::burn_item() + T::DbWeight::get().reads(1)
+	}
+
+	fn burn_recursively_breadth_raw(_amount: u32) -> Weight {
+		// Fungible tokens can't have children
+		0
+	}
 }
 
 impl<T: Config> CommonCollectionOperations<T> for FungibleHandle<T> {
@@ -170,6 +181,26 @@
 		)
 	}
 
+	fn burn_item_recursively(
+		&self,
+		sender: T::CrossAccountId,
+		token: TokenId,
+		self_budget: &dyn Budget,
+		_breadth_budget: &dyn Budget,
+	) -> DispatchResultWithPostInfo {
+		// Should not happen?
+		ensure!(
+			token == TokenId::default(),
+			<Error<T>>::FungibleItemsHaveNoId
+		);
+		ensure!(self_budget.consume(), <StructureError<T>>::DepthLimit,);
+
+		with_weight(
+			<Pallet<T>>::burn(self, &sender, <Balance<T>>::get((self.id, &sender))),
+			<CommonWeights<T>>::burn_recursively_self_raw(),
+		)
+	}
+
 	fn transfer(
 		&self,
 		from: T::CrossAccountId,
modifiedpallets/nonfungible/src/benchmarking.rsdiffbeforeafterboth
--- a/pallets/nonfungible/src/benchmarking.rs
+++ b/pallets/nonfungible/src/benchmarking.rs
@@ -18,12 +18,9 @@
 use crate::{Pallet, Config, NonfungibleHandle};
 
 use sp_std::prelude::*;
-use pallet_common::benchmarking::{create_collection_raw, create_data, property_key, property_value};
+use pallet_common::benchmarking::{create_collection_raw, property_key, property_value};
 use frame_benchmarking::{benchmarks, account};
-use up_data_structs::{
-	CollectionMode, MAX_ITEMS_PER_BATCH, MAX_PROPERTIES_PER_ITEM, CUSTOM_DATA_LIMIT,
-	budget::Unlimited,
-};
+use up_data_structs::{CollectionMode, MAX_ITEMS_PER_BATCH, MAX_PROPERTIES_PER_ITEM, budget::Unlimited};
 use pallet_common::bench_init;
 
 const SEED: u32 = 1;
@@ -49,7 +46,7 @@
 }
 
 fn create_collection<T: Config>(
-	owner: T::AccountId,
+	owner: T::CrossAccountId,
 ) -> Result<NonfungibleHandle<T>, DispatchError> {
 	create_collection_raw(
 		owner,
@@ -96,6 +93,26 @@
 		let item = create_max_item(&collection, &sender, burner.clone())?;
 	}: {<Pallet<T>>::burn(&collection, &burner, item)?}
 
+	burn_recursively_self_raw {
+		bench_init!{
+			owner: sub; collection: collection(owner);
+			sender: cross_from_sub(owner); burner: cross_sub;
+		};
+		let item = create_max_item(&collection, &sender, burner.clone())?;
+	}: {<Pallet<T>>::burn_recursively(&collection, &burner, item, &Unlimited, &Unlimited)}
+
+	burn_recursively_breadth_plus_self_plus_self_per_each_raw {
+		let b in 0..200;
+		bench_init!{
+			owner: sub; collection: collection(owner);
+			sender: cross_from_sub(owner); burner: cross_sub;
+		};
+		let item = create_max_item(&collection, &sender, burner.clone())?;
+		for i in 0..b {
+			create_max_item(&collection, &sender, T::CrossTokenAddressMapping::token_to_address(collection.id, item))?;
+		}
+	}: {<Pallet<T>>::burn_recursively(&collection, &burner, item, &Unlimited, &Unlimited)}
+
 	transfer {
 		bench_init!{
 			owner: sub; collection: collection(owner);
modifiedpallets/nonfungible/src/common.rsdiffbeforeafterboth
--- a/pallets/nonfungible/src/common.rs
+++ b/pallets/nonfungible/src/common.rs
@@ -108,6 +108,15 @@
 	fn burn_from() -> Weight {
 		<SelfWeightOf<T>>::burn_from()
 	}
+
+	fn burn_recursively_self_raw() -> Weight {
+		<SelfWeightOf<T>>::burn_recursively_self_raw()
+	}
+
+	fn burn_recursively_breadth_raw(amount: u32) -> Weight {
+		<SelfWeightOf<T>>::burn_recursively_breadth_plus_self_plus_self_per_each_raw(amount)
+			.saturating_sub(Self::burn_recursively_self_raw().saturating_mul(amount as u64 + 1))
+	}
 }
 
 fn map_create_data<T: Config>(
@@ -264,6 +273,16 @@
 		}
 	}
 
+	fn burn_item_recursively(
+		&self,
+		sender: T::CrossAccountId,
+		token: TokenId,
+		self_budget: &dyn Budget,
+		breadth_budget: &dyn Budget,
+	) -> DispatchResultWithPostInfo {
+		<Pallet<T>>::burn_recursively(self, &sender, token, self_budget, breadth_budget)
+	}
+
 	fn transfer(
 		&self,
 		from: T::CrossAccountId,
modifiedpallets/nonfungible/src/lib.rsdiffbeforeafterboth
after · pallets/nonfungible/src/lib.rs
1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617#![cfg_attr(not(feature = "std"), no_std)]1819use erc::ERC721Events;20use evm_coder::ToLog;21use frame_support::{22	BoundedVec, ensure, fail, transactional,23	storage::with_transaction,24	pallet_prelude::DispatchResultWithPostInfo,25	pallet_prelude::Weight,26	weights::{PostDispatchInfo, Pays},27};28use up_data_structs::{29	AccessMode, CollectionId, CustomDataLimit, TokenId, CreateCollectionData, CreateNftExData,30	mapping::TokenAddressMapping, NestingRule, budget::Budget, Property, PropertyPermission,31	PropertyKey, PropertyKeyPermission, Properties, PropertyScope, TrySetProperty, TokenChild,32};33use pallet_evm::{account::CrossAccountId, Pallet as PalletEvm};34use pallet_common::{35	Error as CommonError, Pallet as PalletCommon, Event as CommonEvent, CollectionHandle,36	eth::collection_id_to_address,37};38use pallet_structure::{Pallet as PalletStructure, Error as StructureError};39use pallet_evm_coder_substrate::{SubstrateRecorder, WithRecorder};40use sp_core::H160;41use sp_runtime::{ArithmeticError, DispatchError, DispatchResult, TransactionOutcome};42use sp_std::{vec::Vec, vec, collections::btree_map::BTreeMap, collections::btree_set::BTreeSet};43use core::ops::Deref;44use codec::{Encode, Decode, MaxEncodedLen};45use scale_info::TypeInfo;4647pub use pallet::*;48use weights::WeightInfo;49#[cfg(feature = "runtime-benchmarks")]50pub mod benchmarking;51pub mod common;52pub mod erc;53pub mod weights;5455pub type CreateItemData<T> = CreateNftExData<<T as pallet_evm::account::Config>::CrossAccountId>;56pub(crate) type SelfWeightOf<T> = <T as Config>::WeightInfo;5758#[struct_versioning::versioned(version = 2, upper)]59#[derive(Encode, Decode, TypeInfo, MaxEncodedLen)]60pub struct ItemData<CrossAccountId> {61	#[version(..2)]62	pub const_data: BoundedVec<u8, CustomDataLimit>,6364	#[version(..2)]65	pub variable_data: BoundedVec<u8, CustomDataLimit>,6667	pub owner: CrossAccountId,68}6970#[frame_support::pallet]71pub mod pallet {72	use super::*;73	use frame_support::{74		Blake2_128Concat, Twox64Concat, pallet_prelude::*, storage::Key, traits::StorageVersion,75	};76	use frame_system::pallet_prelude::*;77	use up_data_structs::{CollectionId, TokenId};78	use super::weights::WeightInfo;7980	#[pallet::error]81	pub enum Error<T> {82		/// Not Nonfungible item data used to mint in Nonfungible collection.83		NotNonfungibleDataUsedToMintFungibleCollectionToken,84		/// Used amount > 1 with NFT85		NonfungibleItemsHaveNoAmount,86		/// Unable to burn NFT with children87		CantBurnNftWithChildren,88	}8990	#[pallet::config]91	pub trait Config:92		frame_system::Config + pallet_common::Config + pallet_structure::Config + pallet_evm::Config93	{94		type WeightInfo: WeightInfo;95	}9697	const STORAGE_VERSION: StorageVersion = StorageVersion::new(1);9899	#[pallet::pallet]100	#[pallet::storage_version(STORAGE_VERSION)]101	#[pallet::generate_store(pub(super) trait Store)]102	pub struct Pallet<T>(_);103104	#[pallet::storage]105	pub type TokensMinted<T: Config> =106		StorageMap<Hasher = Twox64Concat, Key = CollectionId, Value = u32, QueryKind = ValueQuery>;107	#[pallet::storage]108	pub type TokensBurnt<T: Config> =109		StorageMap<Hasher = Twox64Concat, Key = CollectionId, Value = u32, QueryKind = ValueQuery>;110111	#[pallet::storage]112	pub type TokenData<T: Config> = StorageNMap<113		Key = (Key<Twox64Concat, CollectionId>, Key<Twox64Concat, TokenId>),114		Value = ItemData<T::CrossAccountId>,115		QueryKind = OptionQuery,116	>;117118	#[pallet::storage]119	#[pallet::getter(fn token_properties)]120	pub type TokenProperties<T: Config> = StorageNMap<121		Key = (Key<Twox64Concat, CollectionId>, Key<Twox64Concat, TokenId>),122		Value = Properties,123		QueryKind = ValueQuery,124		OnEmpty = up_data_structs::TokenProperties,125	>;126127	/// Used to enumerate tokens owned by account128	#[pallet::storage]129	pub type Owned<T: Config> = StorageNMap<130		Key = (131			Key<Twox64Concat, CollectionId>,132			Key<Blake2_128Concat, T::CrossAccountId>,133			Key<Twox64Concat, TokenId>,134		),135		Value = bool,136		QueryKind = ValueQuery,137	>;138139	/// Used to enumerate token's children140	#[pallet::storage]141	#[pallet::getter(fn token_children)]142	pub type TokenChildren<T: Config> = StorageNMap<143		Key = (144			Key<Twox64Concat, CollectionId>,145			Key<Twox64Concat, TokenId>,146			Key<Twox64Concat, (CollectionId, TokenId)>,147		),148		Value = bool,149		QueryKind = ValueQuery,150	>;151152	#[pallet::storage]153	pub type AccountBalance<T: Config> = StorageNMap<154		Key = (155			Key<Twox64Concat, CollectionId>,156			Key<Blake2_128Concat, T::CrossAccountId>,157		),158		Value = u32,159		QueryKind = ValueQuery,160	>;161162	#[pallet::storage]163	pub type Allowance<T: Config> = StorageNMap<164		Key = (Key<Twox64Concat, CollectionId>, Key<Twox64Concat, TokenId>),165		Value = T::CrossAccountId,166		QueryKind = OptionQuery,167	>;168169	#[pallet::hooks]170	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {171		fn on_runtime_upgrade() -> Weight {172			if StorageVersion::get::<Pallet<T>>() < StorageVersion::new(1) {173				let mut had_consts = BTreeSet::new();174				<TokenData<T>>::translate::<ItemDataVersion1<T::CrossAccountId>, _>(175					|(collection, token), v| {176						let mut props = vec![];177						if !v.const_data.is_empty() {178							props.push(Property {179								key: b"_old_constData".to_vec().try_into().unwrap(),180								value: v181									.const_data182									.clone()183									.into_inner()184									.try_into()185									.expect("const too long"),186							});187							had_consts.insert(collection);188						}189						if !v.variable_data.is_empty() {190							props.push(Property {191								key: b"_old_variableData".to_vec().try_into().unwrap(),192								value: v193									.variable_data194									.clone()195									.into_inner()196									.try_into()197									.expect("variable too long"),198							})199						}200						if !props.is_empty() {201							Self::set_scoped_token_properties(202								collection,203								token,204								PropertyScope::None,205								props.into_iter(),206							)207							.expect("existing token data exceeds property storage");208						}209						Some(<ItemDataVersion2<T::CrossAccountId>>::from(v))210					},211				);212				for collection in had_consts {213					<PalletCommon<T>>::set_property_permission_unchecked(214						collection,215						PropertyKeyPermission {216							key: b"_old_constData".to_vec().try_into().unwrap(),217							permission: PropertyPermission {218								mutable: false,219								collection_admin: true,220								token_owner: false,221							},222						},223					)224					.expect("failed to configure permission");225				}226			}227228			0229		}230	}231}232233pub struct NonfungibleHandle<T: Config>(pallet_common::CollectionHandle<T>);234impl<T: Config> NonfungibleHandle<T> {235	pub fn cast(inner: pallet_common::CollectionHandle<T>) -> Self {236		Self(inner)237	}238	pub fn into_inner(self) -> pallet_common::CollectionHandle<T> {239		self.0240	}241	pub fn common_mut(&mut self) -> &mut pallet_common::CollectionHandle<T> {242		&mut self.0243	}244}245impl<T: Config> WithRecorder<T> for NonfungibleHandle<T> {246	fn recorder(&self) -> &SubstrateRecorder<T> {247		self.0.recorder()248	}249	fn into_recorder(self) -> SubstrateRecorder<T> {250		self.0.into_recorder()251	}252}253impl<T: Config> Deref for NonfungibleHandle<T> {254	type Target = pallet_common::CollectionHandle<T>;255256	fn deref(&self) -> &Self::Target {257		&self.0258	}259}260261impl<T: Config> Pallet<T> {262	pub fn total_supply(collection: &NonfungibleHandle<T>) -> u32 {263		<TokensMinted<T>>::get(collection.id) - <TokensBurnt<T>>::get(collection.id)264	}265	pub fn token_exists(collection: &NonfungibleHandle<T>, token: TokenId) -> bool {266		<TokenData<T>>::contains_key((collection.id, token))267	}268269	pub fn set_scoped_token_property(270		collection_id: CollectionId,271		token_id: TokenId,272		scope: PropertyScope,273		property: Property,274	) -> DispatchResult {275		TokenProperties::<T>::try_mutate((collection_id, token_id), |properties| {276			properties.try_scoped_set(scope, property.key, property.value)277		})278		.map_err(<CommonError<T>>::from)?;279280		Ok(())281	}282283	pub fn set_scoped_token_properties(284		collection_id: CollectionId,285		token_id: TokenId,286		scope: PropertyScope,287		properties: impl Iterator<Item = Property>,288	) -> DispatchResult {289		TokenProperties::<T>::try_mutate((collection_id, token_id), |stored_properties| {290			stored_properties.try_scoped_set_from_iter(scope, properties)291		})292		.map_err(<CommonError<T>>::from)?;293294		Ok(())295	}296297	pub fn current_token_id(collection_id: CollectionId) -> TokenId {298		TokenId(<TokensMinted<T>>::get(collection_id))299	}300}301302// unchecked calls skips any permission checks303impl<T: Config> Pallet<T> {304	pub fn init_collection(305		owner: T::CrossAccountId,306		data: CreateCollectionData<T::AccountId>,307	) -> Result<CollectionId, DispatchError> {308		<PalletCommon<T>>::init_collection(owner, data)309	}310	pub fn destroy_collection(311		collection: NonfungibleHandle<T>,312		sender: &T::CrossAccountId,313	) -> DispatchResult {314		let id = collection.id;315316		if Self::collection_has_tokens(id) {317			return Err(<CommonError<T>>::CantDestroyNotEmptyCollection.into());318		}319320		// =========321322		PalletCommon::destroy_collection(collection.0, sender)?;323324		<TokenData<T>>::remove_prefix((id,), None);325		<TokenChildren<T>>::remove_prefix((id,), None);326		<Owned<T>>::remove_prefix((id,), None);327		<TokensMinted<T>>::remove(id);328		<TokensBurnt<T>>::remove(id);329		<Allowance<T>>::remove_prefix((id,), None);330		<AccountBalance<T>>::remove_prefix((id,), None);331		Ok(())332	}333334	pub fn burn(335		collection: &NonfungibleHandle<T>,336		sender: &T::CrossAccountId,337		token: TokenId,338	) -> DispatchResult {339		let token_data =340			<TokenData<T>>::get((collection.id, token)).ok_or(<CommonError<T>>::TokenNotFound)?;341		ensure!(342			&token_data.owner == sender343				|| (collection.limits.owner_can_transfer() && collection.is_owner_or_admin(sender)),344			<CommonError<T>>::NoPermission345		);346347		if collection.permissions.access() == AccessMode::AllowList {348			collection.check_allowlist(sender)?;349		}350351		if Self::token_has_children(collection.id, token) {352			return Err(<Error<T>>::CantBurnNftWithChildren.into());353		}354355		let burnt = <TokensBurnt<T>>::get(collection.id)356			.checked_add(1)357			.ok_or(ArithmeticError::Overflow)?;358359		let balance = <AccountBalance<T>>::get((collection.id, token_data.owner.clone()))360			.checked_sub(1)361			.ok_or(ArithmeticError::Overflow)?;362363		// =========364365		if balance == 0 {366			<AccountBalance<T>>::remove((collection.id, token_data.owner.clone()));367		} else {368			<AccountBalance<T>>::insert((collection.id, token_data.owner.clone()), balance);369		}370371		<PalletStructure<T>>::unnest_if_nested(&token_data.owner, collection.id, token);372373		<Owned<T>>::remove((collection.id, &token_data.owner, token));374		<TokensBurnt<T>>::insert(collection.id, burnt);375		<TokenData<T>>::remove((collection.id, token));376		<TokenProperties<T>>::remove((collection.id, token));377		let old_spender = <Allowance<T>>::take((collection.id, token));378379		if let Some(old_spender) = old_spender {380			<PalletCommon<T>>::deposit_event(CommonEvent::Approved(381				collection.id,382				token,383				token_data.owner.clone(),384				old_spender,385				0,386			));387		}388389		<PalletEvm<T>>::deposit_log(390			ERC721Events::Transfer {391				from: *token_data.owner.as_eth(),392				to: H160::default(),393				token_id: token.into(),394			}395			.to_log(collection_id_to_address(collection.id)),396		);397		<PalletCommon<T>>::deposit_event(CommonEvent::ItemDestroyed(398			collection.id,399			token,400			token_data.owner,401			1,402		));403		Ok(())404	}405406	#[transactional]407	pub fn burn_recursively(408		collection: &NonfungibleHandle<T>,409		sender: &T::CrossAccountId,410		token: TokenId,411		self_budget: &dyn Budget,412		breadth_budget: &dyn Budget,413	) -> DispatchResultWithPostInfo {414		ensure!(self_budget.consume(), <StructureError<T>>::DepthLimit,);415416		let current_token_account =417			T::CrossTokenAddressMapping::token_to_address(collection.id, token);418419		let mut weight = 0 as Weight;420421		// This method is transactional, if user in fact doesn't have permissions to remove token -422		// tokens removed here will be restored after rejected transaction423		for ((collection, token), _) in <TokenChildren<T>>::iter_prefix((collection.id, token)) {424			ensure!(breadth_budget.consume(), <StructureError<T>>::BreadthLimit,);425			let PostDispatchInfo { actual_weight, .. } =426				<PalletStructure<T>>::burn_item_recursively(427					current_token_account.clone(),428					collection,429					token,430					self_budget,431					breadth_budget,432				)?;433			if let Some(actual_weight) = actual_weight {434				weight = weight.saturating_add(actual_weight);435			}436		}437438		Self::burn(collection, sender, token)?;439		DispatchResultWithPostInfo::Ok(PostDispatchInfo {440			actual_weight: Some(weight + <SelfWeightOf<T>>::burn_item()),441			pays_fee: Pays::Yes,442		})443	}444445	pub fn set_token_property(446		collection: &NonfungibleHandle<T>,447		sender: &T::CrossAccountId,448		token_id: TokenId,449		property: Property,450	) -> DispatchResult {451		Self::check_token_change_permission(collection, sender, token_id, &property.key)?;452453		<TokenProperties<T>>::try_mutate((collection.id, token_id), |properties| {454			let property = property.clone();455			properties.try_set(property.key, property.value)456		})457		.map_err(<CommonError<T>>::from)?;458459		<PalletCommon<T>>::deposit_event(CommonEvent::TokenPropertySet(460			collection.id,461			token_id,462			property.key,463		));464465		Ok(())466	}467468	#[transactional]469	pub fn set_token_properties(470		collection: &NonfungibleHandle<T>,471		sender: &T::CrossAccountId,472		token_id: TokenId,473		properties: Vec<Property>,474	) -> DispatchResult {475		for property in properties {476			Self::set_token_property(collection, sender, token_id, property)?;477		}478479		Ok(())480	}481482	pub fn delete_token_property(483		collection: &NonfungibleHandle<T>,484		sender: &T::CrossAccountId,485		token_id: TokenId,486		property_key: PropertyKey,487	) -> DispatchResult {488		Self::check_token_change_permission(collection, sender, token_id, &property_key)?;489490		<TokenProperties<T>>::try_mutate((collection.id, token_id), |properties| {491			properties.remove(&property_key)492		})493		.map_err(<CommonError<T>>::from)?;494495		<PalletCommon<T>>::deposit_event(CommonEvent::TokenPropertyDeleted(496			collection.id,497			token_id,498			property_key,499		));500501		Ok(())502	}503504	fn check_token_change_permission(505		collection: &NonfungibleHandle<T>,506		sender: &T::CrossAccountId,507		token_id: TokenId,508		property_key: &PropertyKey,509	) -> DispatchResult {510		let permission = <PalletCommon<T>>::property_permissions(collection.id)511			.get(property_key)512			.cloned()513			.unwrap_or_else(PropertyPermission::none);514515		let token_data = <TokenData<T>>::get((collection.id, token_id))516			.ok_or(<CommonError<T>>::TokenNotFound)?;517518		let check_token_owner = || -> DispatchResult {519			ensure!(&token_data.owner == sender, <CommonError<T>>::NoPermission);520			Ok(())521		};522523		let is_property_exists = TokenProperties::<T>::get((collection.id, token_id))524			.get(property_key)525			.is_some();526527		match permission {528			PropertyPermission { mutable: false, .. } if is_property_exists => {529				Err(<CommonError<T>>::NoPermission.into())530			}531532			PropertyPermission {533				collection_admin,534				token_owner,535				..536			} => {537				let mut check_result = Err(<CommonError<T>>::NoPermission.into());538539				if collection_admin {540					check_result = collection.check_is_owner_or_admin(sender);541				}542543				if token_owner {544					check_result.or_else(|_| check_token_owner())545				} else {546					check_result547				}548			}549		}550	}551552	#[transactional]553	pub fn delete_token_properties(554		collection: &NonfungibleHandle<T>,555		sender: &T::CrossAccountId,556		token_id: TokenId,557		property_keys: Vec<PropertyKey>,558	) -> DispatchResult {559		for key in property_keys {560			Self::delete_token_property(collection, sender, token_id, key)?;561		}562563		Ok(())564	}565566	pub fn set_collection_properties(567		collection: &NonfungibleHandle<T>,568		sender: &T::CrossAccountId,569		properties: Vec<Property>,570	) -> DispatchResult {571		<PalletCommon<T>>::set_collection_properties(collection, sender, properties)572	}573574	pub fn delete_collection_properties(575		collection: &CollectionHandle<T>,576		sender: &T::CrossAccountId,577		property_keys: Vec<PropertyKey>,578	) -> DispatchResult {579		<PalletCommon<T>>::delete_collection_properties(collection, sender, property_keys)580	}581582	pub fn set_property_permissions(583		collection: &CollectionHandle<T>,584		sender: &T::CrossAccountId,585		property_permissions: Vec<PropertyKeyPermission>,586	) -> DispatchResult {587		<PalletCommon<T>>::set_property_permissions(collection, sender, property_permissions)588	}589590	pub fn set_property_permission(591		collection: &CollectionHandle<T>,592		sender: &T::CrossAccountId,593		permission: PropertyKeyPermission,594	) -> DispatchResult {595		<PalletCommon<T>>::set_property_permission(collection, sender, permission)596	}597598	pub fn transfer(599		collection: &NonfungibleHandle<T>,600		from: &T::CrossAccountId,601		to: &T::CrossAccountId,602		token: TokenId,603		nesting_budget: &dyn Budget,604	) -> DispatchResult {605		ensure!(606			collection.limits.transfers_enabled(),607			<CommonError<T>>::TransferNotAllowed608		);609610		let token_data =611			<TokenData<T>>::get((collection.id, token)).ok_or(<CommonError<T>>::TokenNotFound)?;612		// TODO: require sender to be token, owner, require admins to go through transfer_from613		ensure!(614			&token_data.owner == from615				|| (collection.limits.owner_can_transfer() && collection.is_owner_or_admin(from)),616			<CommonError<T>>::NoPermission617		);618619		if collection.permissions.access() == AccessMode::AllowList {620			collection.check_allowlist(from)?;621			collection.check_allowlist(to)?;622		}623		<PalletCommon<T>>::ensure_correct_receiver(to)?;624625		let balance_from = <AccountBalance<T>>::get((collection.id, from))626			.checked_sub(1)627			.ok_or(<CommonError<T>>::TokenValueTooLow)?;628		let balance_to = if from != to {629			let balance_to = <AccountBalance<T>>::get((collection.id, to))630				.checked_add(1)631				.ok_or(ArithmeticError::Overflow)?;632633			ensure!(634				balance_to < collection.limits.account_token_ownership_limit(),635				<CommonError<T>>::AccountTokenLimitExceeded,636			);637638			Some(balance_to)639		} else {640			None641		};642643		<PalletStructure<T>>::nest_if_sent_to_token(644			from.clone(),645			to,646			collection.id,647			token,648			nesting_budget,649		)?;650651		// =========652653		<PalletStructure<T>>::unnest_if_nested(&token_data.owner, collection.id, token);654655		<TokenData<T>>::insert(656			(collection.id, token),657			ItemData {658				owner: to.clone(),659				..token_data660			},661		);662663		if let Some(balance_to) = balance_to {664			// from != to665			if balance_from == 0 {666				<AccountBalance<T>>::remove((collection.id, from));667			} else {668				<AccountBalance<T>>::insert((collection.id, from), balance_from);669			}670			<AccountBalance<T>>::insert((collection.id, to), balance_to);671			<Owned<T>>::remove((collection.id, from, token));672			<Owned<T>>::insert((collection.id, to, token), true);673		}674		Self::set_allowance_unchecked(collection, from, token, None, true);675676		<PalletEvm<T>>::deposit_log(677			ERC721Events::Transfer {678				from: *from.as_eth(),679				to: *to.as_eth(),680				token_id: token.into(),681			}682			.to_log(collection_id_to_address(collection.id)),683		);684		<PalletCommon<T>>::deposit_event(CommonEvent::Transfer(685			collection.id,686			token,687			from.clone(),688			to.clone(),689			1,690		));691		Ok(())692	}693694	pub fn create_multiple_items(695		collection: &NonfungibleHandle<T>,696		sender: &T::CrossAccountId,697		data: Vec<CreateItemData<T>>,698		nesting_budget: &dyn Budget,699	) -> DispatchResult {700		if !collection.is_owner_or_admin(sender) {701			ensure!(702				collection.permissions.mint_mode(),703				<CommonError<T>>::PublicMintingNotAllowed704			);705			collection.check_allowlist(sender)?;706707			for item in data.iter() {708				collection.check_allowlist(&item.owner)?;709			}710		}711712		for data in data.iter() {713			<PalletCommon<T>>::ensure_correct_receiver(&data.owner)?;714		}715716		let first_token = <TokensMinted<T>>::get(collection.id);717		let tokens_minted = first_token718			.checked_add(data.len() as u32)719			.ok_or(ArithmeticError::Overflow)?;720		ensure!(721			tokens_minted <= collection.limits.token_limit(),722			<CommonError<T>>::CollectionTokenLimitExceeded723		);724725		let mut balances = BTreeMap::new();726		for data in &data {727			let balance = balances728				.entry(&data.owner)729				.or_insert_with(|| <AccountBalance<T>>::get((collection.id, &data.owner)));730			*balance = balance.checked_add(1).ok_or(ArithmeticError::Overflow)?;731732			ensure!(733				*balance <= collection.limits.account_token_ownership_limit(),734				<CommonError<T>>::AccountTokenLimitExceeded,735			);736		}737738		for (i, data) in data.iter().enumerate() {739			let token = TokenId(first_token + i as u32 + 1);740741			<PalletStructure<T>>::check_nesting(742				sender.clone(),743				&data.owner,744				collection.id,745				token,746				nesting_budget,747			)?;748		}749750		// =========751752		with_transaction(|| {753			for (i, data) in data.iter().enumerate() {754				let token = first_token + i as u32 + 1;755756				<TokenData<T>>::insert(757					(collection.id, token),758					ItemData {759						// const_data: data.const_data.clone(),760						owner: data.owner.clone(),761					},762				);763764				<PalletStructure<T>>::nest_if_sent_to_token_unchecked(765					&data.owner,766					collection.id,767					TokenId(token),768				);769770				if let Err(e) = Self::set_token_properties(771					collection,772					sender,773					TokenId(token),774					data.properties.clone().into_inner(),775				) {776					return TransactionOutcome::Rollback(Err(e));777				}778			}779			TransactionOutcome::Commit(Ok(()))780		})?;781782		<TokensMinted<T>>::insert(collection.id, tokens_minted);783		for (account, balance) in balances {784			<AccountBalance<T>>::insert((collection.id, account), balance);785		}786		for (i, data) in data.into_iter().enumerate() {787			let token = first_token + i as u32 + 1;788			<Owned<T>>::insert((collection.id, &data.owner, token), true);789790			<PalletEvm<T>>::deposit_log(791				ERC721Events::Transfer {792					from: H160::default(),793					to: *data.owner.as_eth(),794					token_id: token.into(),795				}796				.to_log(collection_id_to_address(collection.id)),797			);798			<PalletCommon<T>>::deposit_event(CommonEvent::ItemCreated(799				collection.id,800				TokenId(token),801				data.owner.clone(),802				1,803			));804		}805		Ok(())806	}807808	pub fn set_allowance_unchecked(809		collection: &NonfungibleHandle<T>,810		sender: &T::CrossAccountId,811		token: TokenId,812		spender: Option<&T::CrossAccountId>,813		assume_implicit_eth: bool,814	) {815		if let Some(spender) = spender {816			let old_spender = <Allowance<T>>::get((collection.id, token));817			<Allowance<T>>::insert((collection.id, token), spender);818			// In ERC721 there is only one possible approved user of token, so we set819			// approved user to spender820			<PalletEvm<T>>::deposit_log(821				ERC721Events::Approval {822					owner: *sender.as_eth(),823					approved: *spender.as_eth(),824					token_id: token.into(),825				}826				.to_log(collection_id_to_address(collection.id)),827			);828			// In Unique chain, any token can have any amount of approved users, so we need to829			// set allowance of old owner to 0, and allowance of new owner to 1830			if old_spender.as_ref() != Some(spender) {831				if let Some(old_owner) = old_spender {832					<PalletCommon<T>>::deposit_event(CommonEvent::Approved(833						collection.id,834						token,835						sender.clone(),836						old_owner,837						0,838					));839				}840				<PalletCommon<T>>::deposit_event(CommonEvent::Approved(841					collection.id,842					token,843					sender.clone(),844					spender.clone(),845					1,846				));847			}848		} else {849			let old_spender = <Allowance<T>>::take((collection.id, token));850			if !assume_implicit_eth {851				// In ERC721 there is only one possible approved user of token, so we set852				// approved user to zero address853				<PalletEvm<T>>::deposit_log(854					ERC721Events::Approval {855						owner: *sender.as_eth(),856						approved: H160::default(),857						token_id: token.into(),858					}859					.to_log(collection_id_to_address(collection.id)),860				);861			}862			// In Unique chain, any token can have any amount of approved users, so we need to863			// set allowance of old owner to 0864			if let Some(old_spender) = old_spender {865				<PalletCommon<T>>::deposit_event(CommonEvent::Approved(866					collection.id,867					token,868					sender.clone(),869					old_spender,870					0,871				));872			}873		}874	}875876	pub fn set_allowance(877		collection: &NonfungibleHandle<T>,878		sender: &T::CrossAccountId,879		token: TokenId,880		spender: Option<&T::CrossAccountId>,881	) -> DispatchResult {882		if collection.permissions.access() == AccessMode::AllowList {883			collection.check_allowlist(sender)?;884			if let Some(spender) = spender {885				collection.check_allowlist(spender)?;886			}887		}888889		if let Some(spender) = spender {890			<PalletCommon<T>>::ensure_correct_receiver(spender)?;891		}892		let token_data =893			<TokenData<T>>::get((collection.id, token)).ok_or(<CommonError<T>>::TokenNotFound)?;894		if &token_data.owner != sender {895			ensure!(896				collection.ignores_owned_amount(sender),897				<CommonError<T>>::CantApproveMoreThanOwned898			);899		}900901		// =========902903		Self::set_allowance_unchecked(collection, sender, token, spender, false);904		Ok(())905	}906907	fn check_allowed(908		collection: &NonfungibleHandle<T>,909		spender: &T::CrossAccountId,910		from: &T::CrossAccountId,911		token: TokenId,912		nesting_budget: &dyn Budget,913	) -> DispatchResult {914		if spender.conv_eq(from) {915			return Ok(());916		}917		if collection.permissions.access() == AccessMode::AllowList {918			// `from`, `to` checked in [`transfer`]919			collection.check_allowlist(spender)?;920		}921		if let Some(source) = T::CrossTokenAddressMapping::address_to_token(from) {922			// TODO: should collection owner be allowed to perform this transfer?923			ensure!(924				<PalletStructure<T>>::check_indirectly_owned(925					spender.clone(),926					source.0,927					source.1,928					None,929					nesting_budget930				)?,931				<CommonError<T>>::ApprovedValueTooLow,932			);933			return Ok(());934		}935		if <Allowance<T>>::get((collection.id, token)).as_ref() == Some(spender) {936			return Ok(());937		}938		ensure!(939			collection.ignores_allowance(spender),940			<CommonError<T>>::ApprovedValueTooLow941		);942		Ok(())943	}944945	pub fn transfer_from(946		collection: &NonfungibleHandle<T>,947		spender: &T::CrossAccountId,948		from: &T::CrossAccountId,949		to: &T::CrossAccountId,950		token: TokenId,951		nesting_budget: &dyn Budget,952	) -> DispatchResult {953		Self::check_allowed(collection, spender, from, token, nesting_budget)?;954955		// =========956957		// Allowance is reset in [`transfer`]958		Self::transfer(collection, from, to, token, nesting_budget)959	}960961	pub fn burn_from(962		collection: &NonfungibleHandle<T>,963		spender: &T::CrossAccountId,964		from: &T::CrossAccountId,965		token: TokenId,966		nesting_budget: &dyn Budget,967	) -> DispatchResult {968		Self::check_allowed(collection, spender, from, token, nesting_budget)?;969970		// =========971972		Self::burn(collection, from, token)973	}974975	pub fn check_nesting(976		handle: &NonfungibleHandle<T>,977		sender: T::CrossAccountId,978		from: (CollectionId, TokenId),979		under: TokenId,980		nesting_budget: &dyn Budget,981	) -> DispatchResult {982		fn ensure_sender_allowed<T: Config>(983			collection: CollectionId,984			token: TokenId,985			for_nest: (CollectionId, TokenId),986			sender: T::CrossAccountId,987			budget: &dyn Budget,988		) -> DispatchResult {989			ensure!(990				<PalletStructure<T>>::check_indirectly_owned(991					sender,992					collection,993					token,994					Some(for_nest),995					budget996				)?,997				<CommonError<T>>::OnlyOwnerAllowedToNest,998			);999			Ok(())1000		}1001		match handle.permissions.nesting() {1002			NestingRule::Disabled => fail!(<CommonError<T>>::NestingIsDisabled),1003			NestingRule::Owner => {1004				ensure_sender_allowed::<T>(handle.id, under, from, sender, nesting_budget)?1005			}1006			NestingRule::OwnerRestricted(whitelist) => {1007				ensure!(1008					whitelist.contains(&from.0),1009					<CommonError<T>>::SourceCollectionIsNotAllowedToNest1010				);1011				ensure_sender_allowed::<T>(handle.id, under, from, sender, nesting_budget)?1012			}1013			NestingRule::Permissive => {}1014		}1015		Ok(())1016	}10171018	fn nest(under: (CollectionId, TokenId), to_nest: (CollectionId, TokenId)) {1019		<TokenChildren<T>>::insert((under.0, under.1, (to_nest.0, to_nest.1)), true);1020	}10211022	fn unnest(under: (CollectionId, TokenId), to_unnest: (CollectionId, TokenId)) {1023		<TokenChildren<T>>::remove((under.0, under.1, to_unnest));1024	}10251026	fn collection_has_tokens(collection_id: CollectionId) -> bool {1027		<TokenData<T>>::iter_prefix((collection_id,))1028			.next()1029			.is_some()1030	}10311032	fn token_has_children(collection_id: CollectionId, token_id: TokenId) -> bool {1033		<TokenChildren<T>>::iter_prefix((collection_id, token_id))1034			.next()1035			.is_some()1036	}10371038	pub fn token_children_ids(collection_id: CollectionId, token_id: TokenId) -> Vec<TokenChild> {1039		<TokenChildren<T>>::iter_prefix((collection_id, token_id))1040			.map(|((child_collection_id, child_id), _)| TokenChild {1041				collection: child_collection_id,1042				token: child_id,1043			})1044			.collect()1045	}10461047	/// Delegated to `create_multiple_items`1048	pub fn create_item(1049		collection: &NonfungibleHandle<T>,1050		sender: &T::CrossAccountId,1051		data: CreateItemData<T>,1052		nesting_budget: &dyn Budget,1053	) -> DispatchResult {1054		Self::create_multiple_items(collection, sender, vec![data], nesting_budget)1055	}1056}
modifiedpallets/nonfungible/src/weights.rsdiffbeforeafterboth
--- a/pallets/nonfungible/src/weights.rs
+++ b/pallets/nonfungible/src/weights.rs
@@ -36,6 +36,8 @@
 	fn create_multiple_items(b: u32, ) -> Weight;
 	fn create_multiple_items_ex(b: u32, ) -> Weight;
 	fn burn_item() -> Weight;
+	fn burn_recursively_self_raw() -> Weight;
+	fn burn_recursively_breadth_plus_self_plus_self_per_each_raw(b: u32, ) -> Weight;
 	fn transfer() -> Weight;
 	fn approve() -> Weight;
 	fn transfer_from() -> Weight;
@@ -92,7 +94,35 @@
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(4 as Weight))
 	}
-
+	// Storage: Nonfungible TokenChildren (r:1 w:0)
+	// Storage: Nonfungible TokenData (r:1 w:1)
+	// Storage: Nonfungible TokensBurnt (r:1 w:1)
+	// Storage: Nonfungible AccountBalance (r:1 w:1)
+	// Storage: Nonfungible Allowance (r:1 w:0)
+	// Storage: Nonfungible Owned (r:0 w:1)
+	// Storage: Nonfungible TokenProperties (r:0 w:1)
+	fn burn_recursively_self_raw() -> Weight {
+		(86_136_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(5 as Weight))
+			.saturating_add(T::DbWeight::get().writes(5 as Weight))
+	}
+	// Storage: Nonfungible TokenChildren (r:1 w:0)
+	// Storage: Nonfungible TokenData (r:1 w:1)
+	// Storage: Nonfungible TokensBurnt (r:1 w:1)
+	// Storage: Nonfungible AccountBalance (r:1 w:1)
+	// Storage: Nonfungible Allowance (r:1 w:0)
+	// Storage: Nonfungible Owned (r:0 w:1)
+	// Storage: Nonfungible TokenProperties (r:0 w:1)
+	// Storage: Common CollectionById (r:1 w:0)
+	fn burn_recursively_breadth_plus_self_plus_self_per_each_raw(b: u32, ) -> Weight {
+		(0 as Weight)
+			// Standard Error: 42_828_000
+			.saturating_add((381_478_000 as Weight).saturating_mul(b as Weight))
+			.saturating_add(T::DbWeight::get().reads(6 as Weight))
+			.saturating_add(T::DbWeight::get().reads((4 as Weight).saturating_mul(b as Weight)))
+			.saturating_add(T::DbWeight::get().writes(5 as Weight))
+			.saturating_add(T::DbWeight::get().writes((4 as Weight).saturating_mul(b as Weight)))
+	}
 	// Storage: Nonfungible TokenData (r:1 w:1)
 	// Storage: Nonfungible AccountBalance (r:2 w:2)
 	// Storage: Nonfungible Allowance (r:1 w:0)
@@ -204,7 +234,35 @@
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
 	}
-
+	// Storage: Nonfungible TokenChildren (r:1 w:0)
+	// Storage: Nonfungible TokenData (r:1 w:1)
+	// Storage: Nonfungible TokensBurnt (r:1 w:1)
+	// Storage: Nonfungible AccountBalance (r:1 w:1)
+	// Storage: Nonfungible Allowance (r:1 w:0)
+	// Storage: Nonfungible Owned (r:0 w:1)
+	// Storage: Nonfungible TokenProperties (r:0 w:1)
+	fn burn_recursively_self_raw() -> Weight {
+		(86_136_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(5 as Weight))
+	}
+	// Storage: Nonfungible TokenChildren (r:1 w:0)
+	// Storage: Nonfungible TokenData (r:1 w:1)
+	// Storage: Nonfungible TokensBurnt (r:1 w:1)
+	// Storage: Nonfungible AccountBalance (r:1 w:1)
+	// Storage: Nonfungible Allowance (r:1 w:0)
+	// Storage: Nonfungible Owned (r:0 w:1)
+	// Storage: Nonfungible TokenProperties (r:0 w:1)
+	// Storage: Common CollectionById (r:1 w:0)
+	fn burn_recursively_breadth_plus_self_plus_self_per_each_raw(b: u32, ) -> Weight {
+		(0 as Weight)
+			// Standard Error: 42_828_000
+			.saturating_add((381_478_000 as Weight).saturating_mul(b as Weight))
+			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
+			.saturating_add(RocksDbWeight::get().reads((4 as Weight).saturating_mul(b as Weight)))
+			.saturating_add(RocksDbWeight::get().writes(5 as Weight))
+			.saturating_add(RocksDbWeight::get().writes((4 as Weight).saturating_mul(b as Weight)))
+	}
 	// Storage: Nonfungible TokenData (r:1 w:1)
 	// Storage: Nonfungible AccountBalance (r:2 w:2)
 	// Storage: Nonfungible Allowance (r:1 w:0)
modifiedpallets/refungible/src/benchmarking.rsdiffbeforeafterboth
--- a/pallets/refungible/src/benchmarking.rs
+++ b/pallets/refungible/src/benchmarking.rs
@@ -50,7 +50,9 @@
 	Ok(TokenId(<TokensMinted<T>>::get(&collection.id)))
 }
 
-fn create_collection<T: Config>(owner: T::AccountId) -> Result<RefungibleHandle<T>, DispatchError> {
+fn create_collection<T: Config>(
+	owner: T::CrossAccountId,
+) -> Result<RefungibleHandle<T>, DispatchError> {
 	create_collection_raw(
 		owner,
 		CollectionMode::NFT,
modifiedpallets/refungible/src/common.rsdiffbeforeafterboth
--- a/pallets/refungible/src/common.rs
+++ b/pallets/refungible/src/common.rs
@@ -17,12 +17,13 @@
 use core::marker::PhantomData;
 
 use sp_std::collections::btree_map::BTreeMap;
-use frame_support::{dispatch::DispatchResultWithPostInfo, fail, weights::Weight};
+use frame_support::{dispatch::DispatchResultWithPostInfo, ensure, fail, weights::Weight, traits::Get};
 use up_data_structs::{
 	CollectionId, TokenId, CreateItemExData, CreateRefungibleExData, budget::Budget, Property,
 	PropertyKey, PropertyValue, PropertyKeyPermission, CreateItemData,
 };
 use pallet_common::{CommonCollectionOperations, CommonWeightInfo, with_weight};
+use pallet_structure::Error as StructureError;
 use sp_runtime::DispatchError;
 use sp_std::{vec::Vec, vec};
 
@@ -113,6 +114,15 @@
 	fn burn_from() -> Weight {
 		<SelfWeightOf<T>>::burn_from()
 	}
+
+	fn burn_recursively_self_raw() -> Weight {
+		// Read to get total balance
+		Self::burn_item() + T::DbWeight::get().reads(1)
+	}
+	fn burn_recursively_breadth_raw(_amount: u32) -> Weight {
+		// Refungible token can't have children
+		0
+	}
 }
 
 fn map_create_data<T: Config>(
@@ -205,6 +215,25 @@
 		)
 	}
 
+	fn burn_item_recursively(
+		&self,
+		sender: T::CrossAccountId,
+		token: TokenId,
+		self_budget: &dyn Budget,
+		_breadth_budget: &dyn Budget,
+	) -> DispatchResultWithPostInfo {
+		ensure!(self_budget.consume(), <StructureError<T>>::DepthLimit,);
+		with_weight(
+			<Pallet<T>>::burn(
+				self,
+				&sender,
+				token,
+				<Balance<T>>::get((self.id, token, &sender)),
+			),
+			<CommonWeights<T>>::burn_recursively_self_raw(),
+		)
+	}
+
 	fn transfer(
 		&self,
 		from: T::CrossAccountId,
modifiedpallets/scheduler/src/lib.rsdiffbeforeafterboth
--- a/pallets/scheduler/src/lib.rs
+++ b/pallets/scheduler/src/lib.rs
@@ -60,8 +60,9 @@
 // Ensure we're `no_std` when compiling for Wasm.
 #![cfg_attr(not(feature = "std"), no_std)]
 
-#[cfg(feature = "runtime-benchmarks")]
-mod benchmarking;
+// FIXME
+// #[cfg(feature = "runtime-benchmarks")]
+// mod benchmarking;
 
 pub mod weights;
 
modifiedpallets/structure/src/benchmarking.rsdiffbeforeafterboth
--- a/pallets/structure/src/benchmarking.rs
+++ b/pallets/structure/src/benchmarking.rs
@@ -5,6 +5,7 @@
 use up_data_structs::{
 	CreateCollectionData, CollectionMode, CreateItemData, CreateNftData, budget::Unlimited,
 };
+use pallet_common::Config as CommonConfig;
 use pallet_evm::account::CrossAccountId;
 
 const SEED: u32 = 1;
@@ -14,8 +15,8 @@
 		let caller: T::AccountId = account("caller", 0, SEED);
 		let caller_cross = T::CrossAccountId::from_sub(caller.clone());
 
-		T::Currency::deposit_creating(&caller, T::CollectionCreationPrice::get());
-		T::CollectionDispatch::create(caller, CreateCollectionData {
+		<T as CommonConfig>::Currency::deposit_creating(&caller, T::CollectionCreationPrice::get());
+		T::CollectionDispatch::create(caller_cross.clone(), CreateCollectionData {
 			mode: CollectionMode::NFT,
 			..Default::default()
 		})?;
modifiedpallets/structure/src/lib.rsdiffbeforeafterboth
--- a/pallets/structure/src/lib.rs
+++ b/pallets/structure/src/lib.rs
@@ -3,7 +3,7 @@
 use pallet_common::CommonCollectionOperations;
 use sp_std::collections::btree_set::BTreeSet;
 
-use frame_support::dispatch::{DispatchError, DispatchResult};
+use frame_support::dispatch::{DispatchError, DispatchResult, DispatchResultWithPostInfo};
 use frame_support::fail;
 pub use pallet::*;
 use pallet_common::{dispatch::CollectionDispatch, CollectionHandle};
@@ -29,6 +29,8 @@
 		OuroborosDetected,
 		/// While searched for owner, encountered depth limit
 		DepthLimit,
+		/// While iterating over children, encountered breadth limit
+		BreadthLimit,
 		/// While searched for owner, found token owner by not-yet-existing token
 		TokenNotFound,
 	}
@@ -184,6 +186,19 @@
 		Err(<Error<T>>::DepthLimit.into())
 	}
 
+	pub fn burn_item_recursively(
+		from: T::CrossAccountId,
+		collection: CollectionId,
+		token: TokenId,
+		self_budget: &dyn Budget,
+		breadth_budget: &dyn Budget,
+	) -> DispatchResultWithPostInfo {
+		let handle = <CollectionHandle<T>>::try_get(collection)?;
+		let dispatch = T::CollectionDispatch::dispatch(handle);
+		let dispatch = dispatch.as_dyn();
+		dispatch.burn_item_recursively(from.clone(), token, self_budget, breadth_budget)
+	}
+
 	pub fn check_nesting(
 		from: T::CrossAccountId,
 		under: &T::CrossAccountId,
modifiedpallets/unique/src/benchmarking.rsdiffbeforeafterboth
--- a/pallets/unique/src/benchmarking.rs
+++ b/pallets/unique/src/benchmarking.rs
@@ -22,7 +22,10 @@
 use frame_support::traits::{tokens::currency::Currency, Get};
 use frame_benchmarking::{benchmarks, account};
 use sp_runtime::DispatchError;
-use pallet_common::benchmarking::{create_data, create_var_data, create_u16_data};
+use pallet_common::{
+	Config as CommonConfig,
+	benchmarking::{create_data, create_u16_data},
+};
 
 const SEED: u32 = 1;
 
@@ -30,7 +33,7 @@
 	owner: T::AccountId,
 	mode: CollectionMode,
 ) -> Result<CollectionId, DispatchError> {
-	T::Currency::deposit_creating(&owner, T::CollectionCreationPrice::get());
+	<T as CommonConfig>::Currency::deposit_creating(&owner, T::CollectionCreationPrice::get());
 	let col_name = create_u16_data::<MAX_COLLECTION_NAME_LENGTH>();
 	let col_desc = create_u16_data::<MAX_COLLECTION_DESCRIPTION_LENGTH>();
 	let token_prefix = create_data::<MAX_TOKEN_PREFIX_LENGTH>();
@@ -54,7 +57,7 @@
 		let token_prefix = create_data::<MAX_TOKEN_PREFIX_LENGTH>();
 		let mode: CollectionMode = CollectionMode::NFT;
 		let caller: T::AccountId = account("caller", 0, SEED);
-		T::Currency::deposit_creating(&caller, T::CollectionCreationPrice::get());
+		<T as CommonConfig>::Currency::deposit_creating(&caller, T::CollectionCreationPrice::get());
 	}: _(RawOrigin::Signed(caller.clone()), col_name.clone(), col_desc.clone(), token_prefix.clone(), mode)
 	verify {
 		assert_eq!(<pallet_common::CollectionById<T>>::get(CollectionId(1)).unwrap().owner, caller);
@@ -77,16 +80,6 @@
 		let collection = create_nft_collection::<T>(caller.clone())?;
 		<Pallet<T>>::add_to_allow_list(RawOrigin::Signed(caller.clone()).into(), collection, T::CrossAccountId::from_sub(allowlist_account.clone()))?;
 	}: _(RawOrigin::Signed(caller.clone()), collection, T::CrossAccountId::from_sub(allowlist_account))
-
-	set_public_access_mode {
-		let caller: T::AccountId = account("caller", 0, SEED);
-		let collection = create_nft_collection::<T>(caller.clone())?;
-	}: _(RawOrigin::Signed(caller.clone()), collection, AccessMode::AllowList)
-
-	set_mint_permission {
-		let caller: T::AccountId = account("caller", 0, SEED);
-		let collection = create_nft_collection::<T>(caller.clone())?;
-	}: _(RawOrigin::Signed(caller.clone()), collection, true)
 
 	change_collection_owner {
 		let caller: T::AccountId = account("caller", 0, SEED);
@@ -145,7 +138,6 @@
 			owner_can_transfer: Some(true),
 			sponsored_data_rate_limit: None,
 			transfers_enabled: Some(true),
-			nesting_rule: None,
 		};
 	}: set_collection_limits(RawOrigin::Signed(caller.clone()), collection, cl)
 }
modifiedprimitives/data-structs/src/lib.rsdiffbeforeafterboth
--- a/primitives/data-structs/src/lib.rs
+++ b/primitives/data-structs/src/lib.rs
@@ -469,6 +469,8 @@
 		#[derivative(Debug(format_with = "bounded::set_debug"))]
 		BoundedBTreeSet<CollectionId, ConstU32<16>>,
 	),
+	/// Used for tests
+	Permissive,
 }
 
 #[derive(Encode, Decode, Debug, Clone, Copy, PartialEq, TypeInfo, MaxEncodedLen)]
modifiedruntime/common/src/weights.rsdiffbeforeafterboth
--- a/runtime/common/src/weights.rs
+++ b/runtime/common/src/weights.rs
@@ -89,4 +89,12 @@
 	fn burn_from() -> Weight {
 		dispatch_weight::<T>() + max_weight_of!(burn_from())
 	}
+
+	fn burn_recursively_self_raw() -> Weight {
+		max_weight_of!(burn_recursively_self_raw())
+	}
+
+	fn burn_recursively_breadth_raw(amount: u32) -> Weight {
+		max_weight_of!(burn_recursively_breadth_raw(amount))
+	}
 }
modifiedruntime/unique/src/lib.rsdiffbeforeafterboth
--- a/runtime/unique/src/lib.rs
+++ b/runtime/unique/src/lib.rs
@@ -73,6 +73,7 @@
 	CollectionId, TokenId, TokenData, Property, PropertyKeyPermission, CollectionLimits,
 	CollectionStats, RpcCollection,
 	mapping::{EvmTokenAddressMapping, CrossTokenAddressMapping},
+	TokenChild,
 };
 
 // use pallet_contracts::weights::WeightInfo;