git.delta.rocks / unique-network / refs/commits / 3db55eb8a3c0

--- a/pallets/common/src/lib.rs
+++ b/pallets/common/src/lib.rs
@@ -723,17 +723,20 @@
 		sender: T::CrossAccountId,
 		to: T::CrossAccountId,
 		data: CreateItemData,
+		nesting_budget: &dyn Budget,
 	) -> DispatchResultWithPostInfo;
 	fn create_multiple_items(
 		&self,
 		sender: T::CrossAccountId,
 		to: T::CrossAccountId,
 		data: Vec<CreateItemData>,
+		nesting_budget: &dyn Budget,
 	) -> DispatchResultWithPostInfo;
 	fn create_multiple_items_ex(
 		&self,
 		sender: T::CrossAccountId,
 		data: CreateItemExData<T::CrossAccountId>,
+		nesting_budget: &dyn Budget,
 	) -> DispatchResultWithPostInfo;
 	fn burn_item(
 		&self,
@@ -748,6 +751,7 @@
 		to: T::CrossAccountId,
 		token: TokenId,
 		amount: u128,
+		nesting_budget: &dyn Budget,
 	) -> DispatchResultWithPostInfo;
 	fn approve(
 		&self,
@@ -781,11 +785,12 @@
 		data: BoundedVec<u8, CustomDataLimit>,
 	) -> DispatchResultWithPostInfo;
 
-	fn nest_token(
+	fn check_nesting(
 		&self,
 		sender: T::CrossAccountId,
-		from: (CollectionId, TokenId),
+		from: CollectionId,
 		under: TokenId,
+		budget: &dyn Budget,
 	) -> DispatchResult;
 
 	fn account_tokens(&self, account: T::CrossAccountId) -> Vec<TokenId>;

--- a/pallets/evm-coder-substrate/src/lib.rs
+++ b/pallets/evm-coder-substrate/src/lib.rs
@@ -55,7 +55,6 @@
 
 	use frame_system::ensure_signed;
 	pub use frame_support::dispatch::DispatchResult;
-	use frame_support::{pallet_prelude::*, traits::PalletInfo};
 	use frame_system::pallet_prelude::*;
 
 	/// DispatchError is opaque, but we need to somehow extract correct error in case of OutOfGas failure

--- a/pallets/fungible/src/common.rs
+++ b/pallets/fungible/src/common.rs
@@ -17,7 +17,7 @@
 use core::marker::PhantomData;
 
 use frame_support::{dispatch::DispatchResultWithPostInfo, ensure, fail, weights::Weight, BoundedVec};
-use up_data_structs::{TokenId, CreateItemExData, budget::Budget};
+use up_data_structs::{TokenId, CollectionId, CreateItemExData, budget::Budget};
 use pallet_common::{CommonCollectionOperations, CommonWeightInfo, with_weight};
 use sp_runtime::ArithmeticError;
 use sp_std::{vec::Vec, vec};
@@ -78,10 +78,11 @@
 		sender: T::CrossAccountId,
 		to: T::CrossAccountId,
 		data: up_data_structs::CreateItemData,
+		nesting_budget: &dyn Budget,
 	) -> DispatchResultWithPostInfo {
 		match data {
 			up_data_structs::CreateItemData::Fungible(data) => with_weight(
-				<Pallet<T>>::create_item(self, &sender, (to, data.value)),
+				<Pallet<T>>::create_item(self, &sender, (to, data.value), nesting_budget),
 				<CommonWeights<T>>::create_item(),
 			),
 			_ => fail!(<Error<T>>::NotFungibleDataUsedToMintFungibleCollectionToken),
@@ -93,6 +94,7 @@
 		sender: T::CrossAccountId,
 		to: T::CrossAccountId,
 		data: Vec<up_data_structs::CreateItemData>,
+		nesting_budget: &dyn Budget,
 	) -> DispatchResultWithPostInfo {
 		let mut sum: u128 = 0;
 		for data in data {
@@ -107,7 +109,7 @@
 		}
 
 		with_weight(
-			<Pallet<T>>::create_item(self, &sender, (to, sum)),
+			<Pallet<T>>::create_item(self, &sender, (to, sum), nesting_budget),
 			<CommonWeights<T>>::create_item(),
 		)
 	}
@@ -116,6 +118,7 @@
 		&self,
 		sender: <T>::CrossAccountId,
 		data: up_data_structs::CreateItemExData<<T>::CrossAccountId>,
+		nesting_budget: &dyn Budget,
 	) -> DispatchResultWithPostInfo {
 		let weight = <CommonWeights<T>>::create_multiple_items_ex(&data);
 		let data = match data {
@@ -124,7 +127,7 @@
 		};
 
 		with_weight(
-			<Pallet<T>>::create_multiple_items(self, &sender, data.into_inner()),
+			<Pallet<T>>::create_multiple_items(self, &sender, data.into_inner(), nesting_budget),
 			weight,
 		)
 	}
@@ -152,6 +155,7 @@
 		to: T::CrossAccountId,
 		token: TokenId,
 		amount: u128,
+		nesting_budget: &dyn Budget,
 	) -> DispatchResultWithPostInfo {
 		ensure!(
 			token == TokenId::default(),
@@ -159,7 +163,7 @@
 		);
 
 		with_weight(
-			<Pallet<T>>::transfer(self, &from, &to, amount),
+			<Pallet<T>>::transfer(self, &from, &to, amount, nesting_budget),
 			<CommonWeights<T>>::transfer(),
 		)
 	}
@@ -230,11 +234,12 @@
 		fail!(<Error<T>>::FungibleItemsDontHaveData)
 	}
 
-	fn nest_token(
+	fn check_nesting(
 		&self,
 		_sender: <T>::CrossAccountId,
-		_from: (up_data_structs::CollectionId, TokenId),
+		_from: CollectionId,
 		_under: TokenId,
+		_budget: &dyn Budget,
 	) -> sp_runtime::DispatchResult {
 		fail!(<Error<T>>::FungibleDisallowsNesting)
 	}

--- a/pallets/fungible/src/erc.rs
+++ b/pallets/fungible/src/erc.rs
@@ -81,8 +81,11 @@
 		let caller = T::CrossAccountId::from_eth(caller);
 		let to = T::CrossAccountId::from_eth(to);
 		let amount = amount.try_into().map_err(|_| "amount overflow")?;
+		let budget = self
+			.recorder
+			.weight_calls_budget(<StructureWeight<T>>::find_parent());
 
-		<Pallet<T>>::transfer(self, &caller, &to, amount).map_err(|_| "transfer error")?;
+		<Pallet<T>>::transfer(self, &caller, &to, amount, &budget).map_err(|_| "transfer error")?;
 		Ok(true)
 	}
 	#[weight(<SelfWeightOf<T>>::transfer_from())]

--- a/pallets/fungible/src/lib.rs
+++ b/pallets/fungible/src/lib.rs
@@ -193,6 +193,7 @@
 		from: &T::CrossAccountId,
 		to: &T::CrossAccountId,
 		amount: u128,
+		nesting_budget: &dyn Budget,
 	) -> DispatchResult {
 		ensure!(
 			collection.limits.transfers_enabled(),
@@ -222,12 +223,12 @@
 			let handle = <CollectionHandle<T>>::try_get(target.0)?;
 			let dispatch = T::CollectionDispatch::dispatch(handle);
 			let dispatch = dispatch.as_dyn();
-
-			// =========
 
-			dispatch.nest_token(from.clone(), (collection.id, TokenId::default()), target.1)?;
+			dispatch.check_nesting(from.clone(), collection.id, target.1, nesting_budget)?;
 		}
 
+		// =========
+
 		if let Some(balance_to) = balance_to {
 			// from != to
 			if balance_from == 0 {
@@ -257,6 +258,7 @@
 		collection: &FungibleHandle<T>,
 		sender: &T::CrossAccountId,
 		data: BTreeMap<T::CrossAccountId, u128>,
+		nesting_budget: &dyn Budget,
 	) -> DispatchResult {
 		if !collection.is_owner_or_admin(sender) {
 			ensure!(
@@ -285,6 +287,16 @@
 				.ok_or(ArithmeticError::Overflow)?;
 		}
 
+		for (to, _) in balances.iter() {
+			if let Some(target) = T::CrossTokenAddressMapping::address_to_token(to) {
+				let handle = <CollectionHandle<T>>::try_get(target.0)?;
+				let dispatch = T::CollectionDispatch::dispatch(handle);
+				let dispatch = dispatch.as_dyn();
+
+				dispatch.check_nesting(sender.clone(), collection.id, target.1, nesting_budget)?;
+			}
+		}
+
 		// =========
 
 		<TotalSupply<T>>::insert(collection.id, total_supply);
@@ -407,7 +419,7 @@
 
 		// =========
 
-		Self::transfer(collection, from, to, amount)?;
+		Self::transfer(collection, from, to, amount, nesting_budget)?;
 		if let Some(allowance) = allowance {
 			Self::set_allowance_unchecked(collection, from, spender, allowance);
 		}
@@ -437,7 +449,13 @@
 		collection: &FungibleHandle<T>,
 		sender: &T::CrossAccountId,
 		data: CreateItemData<T>,
+		nesting_budget: &dyn Budget,
 	) -> DispatchResult {
-		Self::create_multiple_items(collection, sender, [(data.0, data.1)].into_iter().collect())
+		Self::create_multiple_items(
+			collection,
+			sender,
+			[(data.0, data.1)].into_iter().collect(),
+			nesting_budget,
+		)
 	}
 }

--- a/pallets/nonfungible/src/common.rs
+++ b/pallets/nonfungible/src/common.rs
@@ -89,9 +89,15 @@
 		sender: T::CrossAccountId,
 		to: T::CrossAccountId,
 		data: up_data_structs::CreateItemData,
+		nesting_budget: &dyn Budget,
 	) -> DispatchResultWithPostInfo {
 		with_weight(
-			<Pallet<T>>::create_item(self, &sender, map_create_data::<T>(data, &to)?),
+			<Pallet<T>>::create_item(
+				self,
+				&sender,
+				map_create_data::<T>(data, &to)?,
+				nesting_budget,
+			),
 			<CommonWeights<T>>::create_item(),
 		)
 	}
@@ -101,6 +107,7 @@
 		sender: T::CrossAccountId,
 		to: T::CrossAccountId,
 		data: Vec<up_data_structs::CreateItemData>,
+		nesting_budget: &dyn Budget,
 	) -> DispatchResultWithPostInfo {
 		let data = data
 			.into_iter()
@@ -109,7 +116,7 @@
 
 		let amount = data.len();
 		with_weight(
-			<Pallet<T>>::create_multiple_items(self, &sender, data),
+			<Pallet<T>>::create_multiple_items(self, &sender, data, nesting_budget),
 			<CommonWeights<T>>::create_multiple_items(amount as u32),
 		)
 	}
@@ -118,6 +125,7 @@
 		&self,
 		sender: <T>::CrossAccountId,
 		data: up_data_structs::CreateItemExData<<T>::CrossAccountId>,
+		nesting_budget: &dyn Budget,
 	) -> DispatchResultWithPostInfo {
 		let weight = <CommonWeights<T>>::create_multiple_items_ex(&data);
 		let data = match data {
@@ -126,7 +134,7 @@
 		};
 
 		with_weight(
-			<Pallet<T>>::create_multiple_items(self, &sender, data.into_inner()),
+			<Pallet<T>>::create_multiple_items(self, &sender, data.into_inner(), nesting_budget),
 			weight,
 		)
 	}
@@ -154,11 +162,12 @@
 		to: T::CrossAccountId,
 		token: TokenId,
 		amount: u128,
+		nesting_budget: &dyn Budget,
 	) -> DispatchResultWithPostInfo {
 		ensure!(amount <= 1, <Error<T>>::NonfungibleItemsHaveNoAmount);
 		if amount == 1 {
 			with_weight(
-				<Pallet<T>>::transfer(self, &from, &to, token),
+				<Pallet<T>>::transfer(self, &from, &to, token, nesting_budget),
 				<CommonWeights<T>>::transfer(),
 			)
 		} else {
@@ -239,13 +248,14 @@
 		)
 	}
 
-	fn nest_token(
+	fn check_nesting(
 		&self,
 		sender: T::CrossAccountId,
-		(from, _): (CollectionId, TokenId),
+		from: CollectionId,
 		under: TokenId,
+		budget: &dyn Budget,
 	) -> sp_runtime::DispatchResult {
-		<Pallet<T>>::nest_token(self, sender, from, under)
+		<Pallet<T>>::check_nesting(self, sender, from, under, budget)
 	}
 
 	fn account_tokens(&self, account: T::CrossAccountId) -> Vec<TokenId> {

--- a/pallets/nonfungible/src/erc.rs
+++ b/pallets/nonfungible/src/erc.rs
@@ -256,6 +256,10 @@
 		let caller = T::CrossAccountId::from_eth(caller);
 		let to = T::CrossAccountId::from_eth(to);
 		let token_id: u32 = token_id.try_into()?;
+		let budget = self
+			.recorder
+			.weight_calls_budget(<StructureWeight<T>>::find_parent());
+
 		if <TokensMinted<T>>::get(self.id)
 			.checked_add(1)
 			.ok_or("item id overflow")?
@@ -272,6 +276,7 @@
 				variable_data: BoundedVec::default(),
 				owner: to,
 			},
+			&budget,
 		)
 		.map_err(dispatch_to_evm::<T>)?;
 
@@ -296,6 +301,10 @@
 		let caller = T::CrossAccountId::from_eth(caller);
 		let to = T::CrossAccountId::from_eth(to);
 		let token_id: u32 = token_id.try_into().map_err(|_| "amount overflow")?;
+		let budget = self
+			.recorder
+			.weight_calls_budget(<StructureWeight<T>>::find_parent());
+
 		if <TokensMinted<T>>::get(self.id)
 			.checked_add(1)
 			.ok_or("item id overflow")?
@@ -314,6 +323,7 @@
 				variable_data: BoundedVec::default(),
 				owner: to,
 			},
+			&budget,
 		)
 		.map_err(dispatch_to_evm::<T>)?;
 		Ok(true)
@@ -338,8 +348,11 @@
 		let caller = T::CrossAccountId::from_eth(caller);
 		let to = T::CrossAccountId::from_eth(to);
 		let token = token_id.try_into()?;
+		let budget = self
+			.recorder
+			.weight_calls_budget(<StructureWeight<T>>::find_parent());
 
-		<Pallet<T>>::transfer(self, &caller, &to, token).map_err(dispatch_to_evm::<T>)?;
+		<Pallet<T>>::transfer(self, &caller, &to, token, &budget).map_err(dispatch_to_evm::<T>)?;
 		Ok(())
 	}
 
@@ -409,6 +422,9 @@
 		let mut expected_index = <TokensMinted<T>>::get(self.id)
 			.checked_add(1)
 			.ok_or("item id overflow")?;
+		let budget = self
+			.recorder
+			.weight_calls_budget(<StructureWeight<T>>::find_parent());
 
 		let total_tokens = token_ids.len();
 		for id in token_ids.into_iter() {
@@ -426,7 +442,8 @@
 			})
 			.collect();
 
-		<Pallet<T>>::create_multiple_items(self, &caller, data).map_err(dispatch_to_evm::<T>)?;
+		<Pallet<T>>::create_multiple_items(self, &caller, data, &budget)
+			.map_err(dispatch_to_evm::<T>)?;
 		Ok(true)
 	}
 
@@ -447,6 +464,9 @@
 		let mut expected_index = <TokensMinted<T>>::get(self.id)
 			.checked_add(1)
 			.ok_or("item id overflow")?;
+		let budget = self
+			.recorder
+			.weight_calls_budget(<StructureWeight<T>>::find_parent());
 
 		let mut data = Vec::with_capacity(tokens.len());
 		for (id, token_uri) in tokens {
@@ -465,7 +485,8 @@
 			});
 		}
 
-		<Pallet<T>>::create_multiple_items(self, &caller, data).map_err(dispatch_to_evm::<T>)?;
+		<Pallet<T>>::create_multiple_items(self, &caller, data, &budget)
+			.map_err(dispatch_to_evm::<T>)?;
 		Ok(true)
 	}
 }

--- a/pallets/nonfungible/src/lib.rs
+++ b/pallets/nonfungible/src/lib.rs
@@ -251,6 +251,7 @@
 		from: &T::CrossAccountId,
 		to: &T::CrossAccountId,
 		token: TokenId,
+		nesting_budget: &dyn Budget,
 	) -> DispatchResult {
 		ensure!(
 			collection.limits.transfers_enabled(),
@@ -294,12 +295,12 @@
 			let handle = <CollectionHandle<T>>::try_get(target.0)?;
 			let dispatch = T::CollectionDispatch::dispatch(handle);
 			let dispatch = dispatch.as_dyn();
-
-			// =========
 
-			dispatch.nest_token(from.clone(), (collection.id, token), target.1)?;
+			dispatch.check_nesting(from.clone(), collection.id, target.1, nesting_budget)?;
 		}
 
+		// =========
+
 		<TokenData<T>>::insert(
 			(collection.id, token),
 			ItemData {
@@ -340,6 +341,7 @@
 		collection: &NonfungibleHandle<T>,
 		sender: &T::CrossAccountId,
 		data: Vec<CreateItemData<T>>,
+		nesting_budget: &dyn Budget,
 	) -> DispatchResult {
 		if !collection.is_owner_or_admin(sender) {
 			ensure!(
@@ -379,6 +381,16 @@
 			);
 		}
 
+		for (to, _) in balances.iter() {
+			if let Some(target) = T::CrossTokenAddressMapping::address_to_token(to) {
+				let handle = <CollectionHandle<T>>::try_get(target.0)?;
+				let dispatch = T::CollectionDispatch::dispatch(handle);
+				let dispatch = dispatch.as_dyn();
+
+				dispatch.check_nesting(sender.clone(), collection.id, target.1, nesting_budget)?;
+			}
+		}
+
 		// =========
 
 		<TokensMinted<T>>::insert(collection.id, tokens_minted);
@@ -556,7 +568,7 @@
 		// =========
 
 		// Allowance is reset in [`transfer`]
-		Self::transfer(collection, from, to, token)
+		Self::transfer(collection, from, to, token, nesting_budget)
 	}
 
 	pub fn burn_from(
@@ -595,35 +607,34 @@
 		Ok(())
 	}
 
-	pub fn nest_token(
+	pub fn check_nesting(
 		handle: &NonfungibleHandle<T>,
 		sender: T::CrossAccountId,
 		from: CollectionId,
 		under: TokenId,
+		nesting_budget: &dyn Budget,
 	) -> DispatchResult {
 		fn ensure_sender_allowed<T: Config>(
 			collection: CollectionId,
 			token: TokenId,
 			sender: T::CrossAccountId,
+			budget: &dyn Budget,
 		) -> DispatchResult {
 			ensure!(
-				<TokenData<T>>::get((collection, token))
-					.ok_or(<CommonError<T>>::TokenNotFound)?
-					.owner
-					.conv_eq(&sender),
+				<PalletStructure<T>>::indirectly_owned(sender, collection, token, budget)?,
 				<CommonError<T>>::OnlyOwnerAllowedToNest,
 			);
 			Ok(())
 		}
 		match handle.limits.nesting_rule() {
 			NestingRule::Disabled => fail!(<CommonError<T>>::NestingIsDisabled),
-			NestingRule::Owner => ensure_sender_allowed::<T>(from, under, sender)?,
+			NestingRule::Owner => ensure_sender_allowed::<T>(from, under, sender, nesting_budget)?,
 			NestingRule::OwnerRestricted(whitelist) => {
 				ensure!(
 					whitelist.contains(&from),
 					<CommonError<T>>::SourceCollectionIsNotAllowedToNest
 				);
-				ensure_sender_allowed::<T>(from, under, sender)?
+				ensure_sender_allowed::<T>(from, under, sender, nesting_budget)?
 			}
 		}
 		Ok(())
@@ -634,7 +645,8 @@
 		collection: &NonfungibleHandle<T>,
 		sender: &T::CrossAccountId,
 		data: CreateItemData<T>,
+		nesting_budget: &dyn Budget,
 	) -> DispatchResult {
-		Self::create_multiple_items(collection, sender, vec![data])
+		Self::create_multiple_items(collection, sender, vec![data], nesting_budget)
 	}
 }

--- a/pallets/refungible/src/common.rs
+++ b/pallets/refungible/src/common.rs
@@ -19,7 +19,8 @@
 use sp_std::collections::btree_map::BTreeMap;
 use frame_support::{dispatch::DispatchResultWithPostInfo, fail, weights::Weight, BoundedVec};
 use up_data_structs::{
-	TokenId, CustomDataLimit, CreateItemExData, CreateRefungibleExData, budget::Budget,
+	CollectionId, TokenId, CustomDataLimit, CreateItemExData, CreateRefungibleExData,
+	budget::Budget,
 };
 use pallet_common::{CommonCollectionOperations, CommonWeightInfo, with_weight};
 use sp_runtime::DispatchError;
@@ -120,9 +121,15 @@
 		sender: T::CrossAccountId,
 		to: T::CrossAccountId,
 		data: up_data_structs::CreateItemData,
+		nesting_budget: &dyn Budget,
 	) -> DispatchResultWithPostInfo {
 		with_weight(
-			<Pallet<T>>::create_item(self, &sender, map_create_data::<T>(data, &to)?),
+			<Pallet<T>>::create_item(
+				self,
+				&sender,
+				map_create_data::<T>(data, &to)?,
+				nesting_budget,
+			),
 			<CommonWeights<T>>::create_item(),
 		)
 	}
@@ -132,6 +139,7 @@
 		sender: T::CrossAccountId,
 		to: T::CrossAccountId,
 		data: Vec<up_data_structs::CreateItemData>,
+		nesting_budget: &dyn Budget,
 	) -> DispatchResultWithPostInfo {
 		let data = data
 			.into_iter()
@@ -140,7 +148,7 @@
 
 		let amount = data.len();
 		with_weight(
-			<Pallet<T>>::create_multiple_items(self, &sender, data),
+			<Pallet<T>>::create_multiple_items(self, &sender, data, nesting_budget),
 			<CommonWeights<T>>::create_multiple_items(amount as u32),
 		)
 	}
@@ -149,6 +157,7 @@
 		&self,
 		sender: <T>::CrossAccountId,
 		data: CreateItemExData<T::CrossAccountId>,
+		nesting_budget: &dyn Budget,
 	) -> DispatchResultWithPostInfo {
 		let weight = <CommonWeights<T>>::create_multiple_items_ex(&data);
 		let data = match data {
@@ -162,7 +171,7 @@
 		};
 
 		with_weight(
-			<Pallet<T>>::create_multiple_items(self, &sender, data),
+			<Pallet<T>>::create_multiple_items(self, &sender, data, nesting_budget),
 			weight,
 		)
 	}
@@ -185,9 +194,10 @@
 		to: T::CrossAccountId,
 		token: TokenId,
 		amount: u128,
+		nesting_budget: &dyn Budget,
 	) -> DispatchResultWithPostInfo {
 		with_weight(
-			<Pallet<T>>::transfer(self, &from, &to, token, amount),
+			<Pallet<T>>::transfer(self, &from, &to, token, amount, nesting_budget),
 			<CommonWeights<T>>::transfer(),
 		)
 	}
@@ -247,11 +257,12 @@
 		)
 	}
 
-	fn nest_token(
+	fn check_nesting(
 		&self,
 		_sender: <T>::CrossAccountId,
-		_from: (up_data_structs::CollectionId, TokenId),
+		_from: CollectionId,
 		_under: TokenId,
+		_budget: &dyn Budget,
 	) -> sp_runtime::DispatchResult {
 		fail!(<Error<T>>::RefungibleDisallowsNesting)
 	}