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

difftreelog

fix manage properties of nested tokens

Daniel Shiposha2022-06-30parent: #2360ffd.patch.diff
in: master

7 files changed

modifiedpallets/common/src/lib.rsdiffbeforeafterboth
--- a/pallets/common/src/lib.rs
+++ b/pallets/common/src/lib.rs
@@ -1311,12 +1311,14 @@
 		sender: T::CrossAccountId,
 		token_id: TokenId,
 		property: Vec<Property>,
+		budget: &dyn Budget,
 	) -> DispatchResultWithPostInfo;
 	fn delete_token_properties(
 		&self,
 		sender: T::CrossAccountId,
 		token_id: TokenId,
 		property_keys: Vec<PropertyKey>,
+		budget: &dyn Budget,
 	) -> DispatchResultWithPostInfo;
 	fn set_token_property_permissions(
 		&self,
modifiedpallets/fungible/src/common.rsdiffbeforeafterboth
--- a/pallets/fungible/src/common.rs
+++ b/pallets/fungible/src/common.rs
@@ -298,6 +298,7 @@
 		_sender: T::CrossAccountId,
 		_token_id: TokenId,
 		_property: Vec<Property>,
+		_budget: &dyn Budget,
 	) -> DispatchResultWithPostInfo {
 		fail!(<Error<T>>::SettingPropertiesNotAllowed)
 	}
@@ -315,6 +316,7 @@
 		_sender: T::CrossAccountId,
 		_token_id: TokenId,
 		_property_keys: Vec<PropertyKey>,
+		_budget: &dyn Budget,
 	) -> DispatchResultWithPostInfo {
 		fail!(<Error<T>>::SettingPropertiesNotAllowed)
 	}
modifiedpallets/nonfungible/src/common.rsdiffbeforeafterboth
--- a/pallets/nonfungible/src/common.rs
+++ b/pallets/nonfungible/src/common.rs
@@ -220,11 +220,12 @@
 		sender: T::CrossAccountId,
 		token_id: TokenId,
 		properties: Vec<Property>,
+		budget: &dyn Budget,
 	) -> DispatchResultWithPostInfo {
 		let weight = <CommonWeights<T>>::set_token_properties(properties.len() as u32);
 
 		with_weight(
-			<Pallet<T>>::set_token_properties(self, &sender, token_id, properties, false),
+			<Pallet<T>>::set_token_properties(self, &sender, token_id, properties, false, budget),
 			weight,
 		)
 	}
@@ -234,11 +235,12 @@
 		sender: T::CrossAccountId,
 		token_id: TokenId,
 		property_keys: Vec<PropertyKey>,
+		budget: &dyn Budget,
 	) -> DispatchResultWithPostInfo {
 		let weight = <CommonWeights<T>>::delete_token_properties(property_keys.len() as u32);
 
 		with_weight(
-			<Pallet<T>>::delete_token_properties(self, &sender, token_id, property_keys),
+			<Pallet<T>>::delete_token_properties(self, &sender, token_id, property_keys, budget),
 			weight,
 		)
 	}
modifiedpallets/nonfungible/src/erc.rsdiffbeforeafterboth
--- a/pallets/nonfungible/src/erc.rs
+++ b/pallets/nonfungible/src/erc.rs
@@ -38,6 +38,7 @@
 use crate::{
 	AccountBalance, Config, CreateItemData, NonfungibleHandle, Pallet, TokenData, TokensMinted,
 	SelfWeightOf, weights::WeightInfo, TokenProperties,
+	property_guard::PropertyGuard,
 };
 
 #[solidity_interface(name = "TokenProperties")]
@@ -82,14 +83,21 @@
 			.map_err(|_| "key too long")?;
 		let value = value.try_into().map_err(|_| "value too long")?;
 
-		<Pallet<T>>::set_token_property(
+		let is_token_create = false;
+		let budget = self
+			.recorder
+			.weight_calls_budget(<StructureWeight<T>>::find_parent());
+
+		let mut guard = PropertyGuard::new(
+			&caller,
 			self,
-			&caller,
 			TokenId(token_id),
-			Property { key, value },
-			false,
-		)
-		.map_err(dispatch_to_evm::<T>)
+			is_token_create,
+			&budget,
+		);
+
+		<Pallet<T>>::set_token_property(Property { key, value }, &mut guard)
+			.map_err(dispatch_to_evm::<T>)
 	}
 
 	fn delete_property(&mut self, token_id: uint256, caller: caller, key: string) -> Result<()> {
@@ -99,7 +107,20 @@
 			.try_into()
 			.map_err(|_| "key too long")?;
 
-		<Pallet<T>>::delete_token_property(self, &caller, TokenId(token_id), key)
+		let is_token_create = false;
+		let budget = self
+			.recorder
+			.weight_calls_budget(<StructureWeight<T>>::find_parent());
+
+		let mut guard = PropertyGuard::new(
+			&caller,
+			self,
+			TokenId(token_id),
+			is_token_create,
+			&budget,
+		);
+
+		<Pallet<T>>::delete_token_property(key, &mut guard)
 			.map_err(dispatch_to_evm::<T>)
 	}
 
modifiedpallets/nonfungible/src/lib.rsdiffbeforeafterboth
--- a/pallets/nonfungible/src/lib.rs
+++ b/pallets/nonfungible/src/lib.rs
@@ -52,6 +52,10 @@
 pub mod erc;
 pub mod weights;
 
+mod property_guard;
+
+use property_guard::*;
+
 pub type CreateItemData<T> = CreateNftExData<<T as pallet_evm::account::Config>::CrossAccountId>;
 pub(crate) type SelfWeightOf<T> = <T as Config>::WeightInfo;
 
@@ -484,30 +488,18 @@
 		})
 	}
 
-	pub fn set_token_property(
-		collection: &NonfungibleHandle<T>,
-		sender: &T::CrossAccountId,
-		token_id: TokenId,
-		property: Property,
-		is_token_create: bool,
-	) -> DispatchResult {
-		Self::check_token_change_permission(
-			collection,
-			sender,
-			token_id,
-			&property.key,
-			is_token_create,
-		)?;
+	pub fn set_token_property(property: Property, guard: &mut PropertyGuard<'_, T>) -> DispatchResult {
+		Self::check_token_change_permission(&property.key, guard)?;
 
-		<TokenProperties<T>>::try_mutate((collection.id, token_id), |properties| {
+		<TokenProperties<T>>::try_mutate((guard.collection.id, guard.token), |properties| {
 			let property = property.clone();
 			properties.try_set(property.key, property.value)
 		})
 		.map_err(<CommonError<T>>::from)?;
 
 		<PalletCommon<T>>::deposit_event(CommonEvent::TokenPropertySet(
-			collection.id,
-			token_id,
+			guard.collection.id,
+			guard.token,
 			property.key,
 		));
 
@@ -521,57 +513,47 @@
 		token_id: TokenId,
 		properties: Vec<Property>,
 		is_token_create: bool,
+		nesting_budget: &dyn Budget,
 	) -> DispatchResult {
+		let mut guard = PropertyGuard::new(
+			sender,
+			collection,
+			token_id,
+			is_token_create,
+			nesting_budget,
+		);
+
 		for property in properties {
-			Self::set_token_property(collection, sender, token_id, property, is_token_create)?;
+			Self::set_token_property(property, &mut guard)?;
 		}
 
 		Ok(())
 	}
 
-	pub fn delete_token_property(
-		collection: &NonfungibleHandle<T>,
-		sender: &T::CrossAccountId,
-		token_id: TokenId,
-		property_key: PropertyKey,
-	) -> DispatchResult {
-		Self::check_token_change_permission(collection, sender, token_id, &property_key, false)?;
+	pub fn delete_token_property(property_key: PropertyKey, guard: &mut PropertyGuard<'_, T>) -> DispatchResult {
+		Self::check_token_change_permission(&property_key, guard)?;
 
-		<TokenProperties<T>>::try_mutate((collection.id, token_id), |properties| {
+		<TokenProperties<T>>::try_mutate((guard.collection.id, guard.token), |properties| {
 			properties.remove(&property_key)
 		})
 		.map_err(<CommonError<T>>::from)?;
 
 		<PalletCommon<T>>::deposit_event(CommonEvent::TokenPropertyDeleted(
-			collection.id,
-			token_id,
+			guard.collection.id,
+			guard.token,
 			property_key,
 		));
 
 		Ok(())
 	}
 
-	fn check_token_change_permission(
-		collection: &NonfungibleHandle<T>,
-		sender: &T::CrossAccountId,
-		token_id: TokenId,
-		property_key: &PropertyKey,
-		is_token_create: bool,
-	) -> DispatchResult {
-		let permission = <PalletCommon<T>>::property_permissions(collection.id)
+	fn check_token_change_permission(property_key: &PropertyKey, guard: &mut PropertyGuard<'_, T>) -> DispatchResult {
+		let permission = <PalletCommon<T>>::property_permissions(guard.collection.id)
 			.get(property_key)
 			.cloned()
 			.unwrap_or_else(PropertyPermission::none);
 
-		let token_data = <TokenData<T>>::get((collection.id, token_id))
-			.ok_or(<CommonError<T>>::TokenNotFound)?;
-
-		let check_token_owner = || -> DispatchResult {
-			ensure!(&token_data.owner == sender, <CommonError<T>>::NoPermission);
-			Ok(())
-		};
-
-		let is_property_exists = TokenProperties::<T>::get((collection.id, token_id))
+		let is_property_exists = TokenProperties::<T>::get((guard.collection.id, guard.token))
 			.get(property_key)
 			.is_some();
 
@@ -586,18 +568,18 @@
 				..
 			} => {
 				//TODO: investigate threats during public minting.
-				if is_token_create && (collection_admin || token_owner) {
+				if guard.is_token_create && (collection_admin || token_owner) {
 					return Ok(());
 				}
 
 				let mut check_result = Err(<CommonError<T>>::NoPermission.into());
 
 				if collection_admin {
-					check_result = collection.check_is_owner_or_admin(sender);
+					check_result = guard.check_collection_admin();
 				}
 
 				if token_owner {
-					check_result.or_else(|_| check_token_owner())
+					check_result.or_else(|_| guard.check_token_owner())
 				} else {
 					check_result
 				}
@@ -611,9 +593,20 @@
 		sender: &T::CrossAccountId,
 		token_id: TokenId,
 		property_keys: Vec<PropertyKey>,
+		nesting_budget: &dyn Budget,
 	) -> DispatchResult {
+		let is_token_create = false;
+
+		let mut guard = PropertyGuard::new(
+			sender,
+			collection,
+			token_id,
+			is_token_create,
+			nesting_budget,
+		);
+
 		for key in property_keys {
-			Self::delete_token_property(collection, sender, token_id, key)?;
+			Self::delete_token_property(key, &mut guard)?;
 		}
 
 		Ok(())
@@ -829,6 +822,7 @@
 					TokenId(token),
 					data.properties.clone().into_inner(),
 					true,
+					nesting_budget,
 				) {
 					return TransactionOutcome::Rollback(Err(e));
 				}
modifiedpallets/refungible/src/common.rsdiffbeforeafterboth
before · pallets/refungible/src/common.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/>.1617use core::marker::PhantomData;1819use sp_std::collections::btree_map::BTreeMap;20use frame_support::{dispatch::DispatchResultWithPostInfo, ensure, fail, weights::Weight, traits::Get};21use up_data_structs::{22	CollectionId, TokenId, CreateItemExData, CreateRefungibleExData, budget::Budget, Property,23	PropertyKey, PropertyValue, PropertyKeyPermission, CreateItemData,24};25use pallet_common::{CommonCollectionOperations, CommonWeightInfo, RefungibleExtensions, with_weight};26use pallet_structure::Error as StructureError;27use sp_runtime::{DispatchError};28use sp_std::{vec::Vec, vec};2930use crate::{31	AccountBalance, Allowance, Balance, Config, Error, Owned, Pallet, RefungibleHandle,32	SelfWeightOf, TokenData, weights::WeightInfo, TokensMinted,33};3435macro_rules! max_weight_of {36	($($method:ident ($($args:tt)*)),*) => {37		038		$(39			.max(<SelfWeightOf<T>>::$method($($args)*))40		)*41	};42}4344pub struct CommonWeights<T: Config>(PhantomData<T>);45impl<T: Config> CommonWeightInfo<T::CrossAccountId> for CommonWeights<T> {46	fn create_item() -> Weight {47		<SelfWeightOf<T>>::create_item()48	}4950	fn create_multiple_items(data: &[CreateItemData]) -> Weight {51		<SelfWeightOf<T>>::create_multiple_items(data.len() as u32)52	}5354	fn create_multiple_items_ex(call: &CreateItemExData<T::CrossAccountId>) -> Weight {55		match call {56			CreateItemExData::RefungibleMultipleOwners(i) => {57				<SelfWeightOf<T>>::create_multiple_items_ex_multiple_owners(i.users.len() as u32)58			}59			CreateItemExData::RefungibleMultipleItems(i) => {60				<SelfWeightOf<T>>::create_multiple_items_ex_multiple_items(i.len() as u32)61			}62			_ => 0,63		}64	}6566	fn burn_item() -> Weight {67		max_weight_of!(burn_item_partial(), burn_item_fully())68	}6970	fn set_collection_properties(_amount: u32) -> Weight {71		// Error72		073	}7475	fn delete_collection_properties(_amount: u32) -> Weight {76		// Error77		078	}7980	fn set_token_properties(_amount: u32) -> Weight {81		// Error82		083	}8485	fn delete_token_properties(_amount: u32) -> Weight {86		// Error87		088	}8990	fn set_token_property_permissions(_amount: u32) -> Weight {91		// Error92		093	}9495	fn transfer() -> Weight {96		max_weight_of!(97			transfer_normal(),98			transfer_creating(),99			transfer_removing(),100			transfer_creating_removing()101		)102	}103104	fn approve() -> Weight {105		<SelfWeightOf<T>>::approve()106	}107108	fn transfer_from() -> Weight {109		max_weight_of!(110			transfer_from_normal(),111			transfer_from_creating(),112			transfer_from_removing(),113			transfer_from_creating_removing()114		)115	}116117	fn burn_from() -> Weight {118		<SelfWeightOf<T>>::burn_from()119	}120121	fn burn_recursively_self_raw() -> Weight {122		// Read to get total balance123		Self::burn_item() + T::DbWeight::get().reads(1)124	}125	fn burn_recursively_breadth_raw(_amount: u32) -> Weight {126		// Refungible token can't have children127		0128	}129}130131fn map_create_data<T: Config>(132	data: up_data_structs::CreateItemData,133	to: &T::CrossAccountId,134) -> Result<CreateRefungibleExData<T::CrossAccountId>, DispatchError> {135	match data {136		up_data_structs::CreateItemData::ReFungible(data) => Ok(CreateRefungibleExData {137			const_data: data.const_data,138			users: {139				let mut out = BTreeMap::new();140				out.insert(to.clone(), data.pieces);141				out.try_into().expect("limit > 0")142			},143		}),144		_ => fail!(<Error<T>>::NotRefungibleDataUsedToMintFungibleCollectionToken),145	}146}147148impl<T: Config> CommonCollectionOperations<T> for RefungibleHandle<T> {149	fn create_item(150		&self,151		sender: T::CrossAccountId,152		to: T::CrossAccountId,153		data: up_data_structs::CreateItemData,154		nesting_budget: &dyn Budget,155	) -> DispatchResultWithPostInfo {156		with_weight(157			<Pallet<T>>::create_item(158				self,159				&sender,160				map_create_data::<T>(data, &to)?,161				nesting_budget,162			),163			<CommonWeights<T>>::create_item(),164		)165	}166167	fn create_multiple_items(168		&self,169		sender: T::CrossAccountId,170		to: T::CrossAccountId,171		data: Vec<up_data_structs::CreateItemData>,172		nesting_budget: &dyn Budget,173	) -> DispatchResultWithPostInfo {174		let weight = <CommonWeights<T>>::create_multiple_items(&data);175		let data = data176			.into_iter()177			.map(|d| map_create_data::<T>(d, &to))178			.collect::<Result<Vec<_>, DispatchError>>()?;179180		with_weight(181			<Pallet<T>>::create_multiple_items(self, &sender, data, nesting_budget),182			weight,183		)184	}185186	fn create_multiple_items_ex(187		&self,188		sender: <T>::CrossAccountId,189		data: CreateItemExData<T::CrossAccountId>,190		nesting_budget: &dyn Budget,191	) -> DispatchResultWithPostInfo {192		let weight = <CommonWeights<T>>::create_multiple_items_ex(&data);193		let data = match data {194			CreateItemExData::RefungibleMultipleOwners(r) => vec![r],195			CreateItemExData::RefungibleMultipleItems(r)196				if r.iter().all(|i| i.users.len() == 1) =>197			{198				r.into_inner()199			}200			_ => fail!(<Error<T>>::NotRefungibleDataUsedToMintFungibleCollectionToken),201		};202203		with_weight(204			<Pallet<T>>::create_multiple_items(self, &sender, data, nesting_budget),205			weight,206		)207	}208209	fn burn_item(210		&self,211		sender: T::CrossAccountId,212		token: TokenId,213		amount: u128,214	) -> DispatchResultWithPostInfo {215		with_weight(216			<Pallet<T>>::burn(self, &sender, token, amount),217			<CommonWeights<T>>::burn_item(),218		)219	}220221	fn burn_item_recursively(222		&self,223		sender: T::CrossAccountId,224		token: TokenId,225		self_budget: &dyn Budget,226		_breadth_budget: &dyn Budget,227	) -> DispatchResultWithPostInfo {228		ensure!(self_budget.consume(), <StructureError<T>>::DepthLimit,);229		with_weight(230			<Pallet<T>>::burn(231				self,232				&sender,233				token,234				<Balance<T>>::get((self.id, token, &sender)),235			),236			<CommonWeights<T>>::burn_recursively_self_raw(),237		)238	}239240	fn transfer(241		&self,242		from: T::CrossAccountId,243		to: T::CrossAccountId,244		token: TokenId,245		amount: u128,246		nesting_budget: &dyn Budget,247	) -> DispatchResultWithPostInfo {248		with_weight(249			<Pallet<T>>::transfer(self, &from, &to, token, amount, nesting_budget),250			<CommonWeights<T>>::transfer(),251		)252	}253254	fn approve(255		&self,256		sender: T::CrossAccountId,257		spender: T::CrossAccountId,258		token: TokenId,259		amount: u128,260	) -> DispatchResultWithPostInfo {261		with_weight(262			<Pallet<T>>::set_allowance(self, &sender, &spender, token, amount),263			<CommonWeights<T>>::approve(),264		)265	}266267	fn transfer_from(268		&self,269		sender: T::CrossAccountId,270		from: T::CrossAccountId,271		to: T::CrossAccountId,272		token: TokenId,273		amount: u128,274		nesting_budget: &dyn Budget,275	) -> DispatchResultWithPostInfo {276		with_weight(277			<Pallet<T>>::transfer_from(self, &sender, &from, &to, token, amount, nesting_budget),278			<CommonWeights<T>>::transfer_from(),279		)280	}281282	fn burn_from(283		&self,284		sender: T::CrossAccountId,285		from: T::CrossAccountId,286		token: TokenId,287		amount: u128,288		nesting_budget: &dyn Budget,289	) -> DispatchResultWithPostInfo {290		with_weight(291			<Pallet<T>>::burn_from(self, &sender, &from, token, amount, nesting_budget),292			<CommonWeights<T>>::burn_from(),293		)294	}295296	fn set_collection_properties(297		&self,298		_sender: T::CrossAccountId,299		_property: Vec<Property>,300	) -> DispatchResultWithPostInfo {301		fail!(<Error<T>>::SettingPropertiesNotAllowed)302	}303304	fn delete_collection_properties(305		&self,306		_sender: &T::CrossAccountId,307		_property_keys: Vec<PropertyKey>,308	) -> DispatchResultWithPostInfo {309		fail!(<Error<T>>::SettingPropertiesNotAllowed)310	}311312	fn set_token_properties(313		&self,314		_sender: T::CrossAccountId,315		_token_id: TokenId,316		_property: Vec<Property>,317	) -> DispatchResultWithPostInfo {318		fail!(<Error<T>>::SettingPropertiesNotAllowed)319	}320321	fn set_token_property_permissions(322		&self,323		_sender: &T::CrossAccountId,324		_property_permissions: Vec<PropertyKeyPermission>,325	) -> DispatchResultWithPostInfo {326		fail!(<Error<T>>::SettingPropertiesNotAllowed)327	}328329	fn delete_token_properties(330		&self,331		_sender: T::CrossAccountId,332		_token_id: TokenId,333		_property_keys: Vec<PropertyKey>,334	) -> DispatchResultWithPostInfo {335		fail!(<Error<T>>::SettingPropertiesNotAllowed)336	}337338	fn check_nesting(339		&self,340		_sender: <T>::CrossAccountId,341		_from: (CollectionId, TokenId),342		_under: TokenId,343		_budget: &dyn Budget,344	) -> sp_runtime::DispatchResult {345		fail!(<Error<T>>::RefungibleDisallowsNesting)346	}347348	fn nest(&self, _under: TokenId, _to_nest: (CollectionId, TokenId)) {}349350	fn unnest(&self, _under: TokenId, _to_nest: (CollectionId, TokenId)) {}351352	fn account_tokens(&self, account: T::CrossAccountId) -> Vec<TokenId> {353		<Owned<T>>::iter_prefix((self.id, account))354			.map(|(id, _)| id)355			.collect()356	}357358	fn collection_tokens(&self) -> Vec<TokenId> {359		<TokenData<T>>::iter_prefix((self.id,))360			.map(|(id, _)| id)361			.collect()362	}363364	fn token_exists(&self, token: TokenId) -> bool {365		<Pallet<T>>::token_exists(self, token)366	}367368	fn last_token_id(&self) -> TokenId {369		TokenId(<TokensMinted<T>>::get(self.id))370	}371372	fn token_owner(&self, _token: TokenId) -> Option<T::CrossAccountId> {373		None374	}375376	fn token_property(&self, _token_id: TokenId, _key: &PropertyKey) -> Option<PropertyValue> {377		None378	}379380	fn token_properties(381		&self,382		_token_id: TokenId,383		_keys: Option<Vec<PropertyKey>>,384	) -> Vec<Property> {385		Vec::new()386	}387388	fn total_supply(&self) -> u32 {389		<Pallet<T>>::total_supply(self)390	}391392	fn account_balance(&self, account: T::CrossAccountId) -> u32 {393		<AccountBalance<T>>::get((self.id, account))394	}395396	fn balance(&self, account: T::CrossAccountId, token: TokenId) -> u128 {397		<Balance<T>>::get((self.id, token, account))398	}399400	fn allowance(401		&self,402		sender: T::CrossAccountId,403		spender: T::CrossAccountId,404		token: TokenId,405	) -> u128 {406		<Allowance<T>>::get((self.id, token, sender, spender))407	}408409	fn refungible_extensions(&self) -> Option<&dyn RefungibleExtensions<T>> {410		Some(self)411	}412}413414impl<T: Config> RefungibleExtensions<T> for RefungibleHandle<T> {415	fn repartition(416		&self,417		owner: &T::CrossAccountId,418		token: TokenId,419		amount: u128,420	) -> DispatchResultWithPostInfo {421		with_weight(422			<Pallet<T>>::repartition(self, owner, token, amount),423			<SelfWeightOf<T>>::repartition_item(),424		)425	}426}
modifiedpallets/unique/src/lib.rsdiffbeforeafterboth
--- a/pallets/unique/src/lib.rs
+++ b/pallets/unique/src/lib.rs
@@ -654,8 +654,9 @@
 			ensure!(!properties.is_empty(), Error::<T>::EmptyArgument);
 
 			let sender = T::CrossAccountId::from_sub(ensure_signed(origin)?);
+			let budget = budget::Value::new(NESTING_BUDGET);
 
-			dispatch_tx::<T, _>(collection_id, |d| d.set_token_properties(sender, token_id, properties))
+			dispatch_tx::<T, _>(collection_id, |d| d.set_token_properties(sender, token_id, properties, &budget))
 		}
 
 		#[weight = T::CommonWeightInfo::delete_token_properties(property_keys.len() as u32)]
@@ -669,8 +670,9 @@
 			ensure!(!property_keys.is_empty(), Error::<T>::EmptyArgument);
 
 			let sender = T::CrossAccountId::from_sub(ensure_signed(origin)?);
+			let budget = budget::Value::new(NESTING_BUDGET);
 
-			dispatch_tx::<T, _>(collection_id, |d| d.delete_token_properties(sender, token_id, property_keys))
+			dispatch_tx::<T, _>(collection_id, |d| d.delete_token_properties(sender, token_id, property_keys, &budget))
 		}
 
 		#[weight = T::CommonWeightInfo::set_token_property_permissions(property_permissions.len() as u32)]