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

difftreelog

feat nest on create/transfer

Yaroslav Bolyukin2022-04-07parent: #b69837d.patch.diff
in: master

12 files changed

modifiedpallets/common/src/lib.rsdiffbeforeafterboth
--- 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>;
modifiedpallets/evm-coder-substrate/src/lib.rsdiffbeforeafterboth
--- 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
modifiedpallets/fungible/src/common.rsdiffbeforeafterboth
--- 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)
 	}
modifiedpallets/fungible/src/erc.rsdiffbeforeafterboth
--- 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())]
modifiedpallets/fungible/src/lib.rsdiffbeforeafterboth
--- 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,
+		)
 	}
 }
modifiedpallets/nonfungible/src/common.rsdiffbeforeafterboth
--- 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> {
modifiedpallets/nonfungible/src/erc.rsdiffbeforeafterboth
--- 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)
 	}
 }
modifiedpallets/nonfungible/src/lib.rsdiffbeforeafterboth
--- 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)
 	}
 }
modifiedpallets/refungible/src/common.rsdiffbeforeafterboth
--- 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)
 	}
modifiedpallets/refungible/src/lib.rsdiffbeforeafterboth
before · pallets/refungible/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 frame_support::{ensure, BoundedVec};20use up_data_structs::{21	AccessMode, CollectionId, CustomDataLimit, MAX_REFUNGIBLE_PIECES, TokenId,22	CreateCollectionData, CreateRefungibleExData, mapping::TokenAddressMapping, budget::Budget,23};24use pallet_evm::account::CrossAccountId;25use pallet_common::{26	Error as CommonError, Event as CommonEvent, Pallet as PalletCommon,27	CollectionHandle, dispatch::CollectionDispatch,28};29use pallet_structure::Pallet as PalletStructure;30use sp_runtime::{ArithmeticError, DispatchError, DispatchResult};31use sp_std::{vec::Vec, vec, collections::btree_map::BTreeMap};32use core::ops::Deref;33use codec::{Encode, Decode, MaxEncodedLen};34use scale_info::TypeInfo;3536pub use pallet::*;37#[cfg(feature = "runtime-benchmarks")]38pub mod benchmarking;39pub mod common;40pub mod erc;41pub mod weights;42pub(crate) type SelfWeightOf<T> = <T as Config>::WeightInfo;4344#[derive(Encode, Decode, Default, TypeInfo, MaxEncodedLen)]45pub struct ItemData {46	pub const_data: BoundedVec<u8, CustomDataLimit>,47	pub variable_data: BoundedVec<u8, CustomDataLimit>,48}4950#[frame_support::pallet]51pub mod pallet {52	use super::*;53	use frame_support::{Blake2_128, Blake2_128Concat, Twox64Concat, pallet_prelude::*, storage::Key};54	use up_data_structs::{CollectionId, TokenId};55	use super::weights::WeightInfo;5657	#[pallet::error]58	pub enum Error<T> {59		/// Not Refungible item data used to mint in Refungible collection.60		NotRefungibleDataUsedToMintFungibleCollectionToken,61		/// Maximum refungibility exceeded62		WrongRefungiblePieces,63		/// Refungible token can't nest other tokens64		RefungibleDisallowsNesting,65	}6667	#[pallet::config]68	pub trait Config:69		frame_system::Config + pallet_common::Config + pallet_structure::Config70	{71		type WeightInfo: WeightInfo;72	}7374	#[pallet::pallet]75	#[pallet::generate_store(pub(super) trait Store)]76	pub struct Pallet<T>(_);7778	#[pallet::storage]79	pub type TokensMinted<T: Config> =80		StorageMap<Hasher = Twox64Concat, Key = CollectionId, Value = u32, QueryKind = ValueQuery>;81	#[pallet::storage]82	pub type TokensBurnt<T: Config> =83		StorageMap<Hasher = Twox64Concat, Key = CollectionId, Value = u32, QueryKind = ValueQuery>;8485	#[pallet::storage]86	pub type TokenData<T: Config> = StorageNMap<87		Key = (Key<Twox64Concat, CollectionId>, Key<Twox64Concat, TokenId>),88		Value = ItemData,89		QueryKind = ValueQuery,90	>;9192	#[pallet::storage]93	pub type TotalSupply<T: Config> = StorageNMap<94		Key = (Key<Twox64Concat, CollectionId>, Key<Twox64Concat, TokenId>),95		Value = u128,96		QueryKind = ValueQuery,97	>;9899	/// Used to enumerate tokens owned by account100	#[pallet::storage]101	pub type Owned<T: Config> = StorageNMap<102		Key = (103			Key<Twox64Concat, CollectionId>,104			Key<Blake2_128Concat, T::CrossAccountId>,105			Key<Twox64Concat, TokenId>,106		),107		Value = bool,108		QueryKind = ValueQuery,109	>;110111	#[pallet::storage]112	pub type AccountBalance<T: Config> = StorageNMap<113		Key = (114			Key<Twox64Concat, CollectionId>,115			// Owner116			Key<Blake2_128Concat, T::CrossAccountId>,117		),118		Value = u32,119		QueryKind = ValueQuery,120	>;121122	#[pallet::storage]123	pub type Balance<T: Config> = StorageNMap<124		Key = (125			Key<Twox64Concat, CollectionId>,126			Key<Twox64Concat, TokenId>,127			// Owner128			Key<Blake2_128Concat, T::CrossAccountId>,129		),130		Value = u128,131		QueryKind = ValueQuery,132	>;133134	#[pallet::storage]135	pub type Allowance<T: Config> = StorageNMap<136		Key = (137			Key<Twox64Concat, CollectionId>,138			Key<Twox64Concat, TokenId>,139			// Owner140			Key<Blake2_128, T::CrossAccountId>,141			// Spender142			Key<Blake2_128Concat, T::CrossAccountId>,143		),144		Value = u128,145		QueryKind = ValueQuery,146	>;147}148149pub struct RefungibleHandle<T: Config>(pallet_common::CollectionHandle<T>);150impl<T: Config> RefungibleHandle<T> {151	pub fn cast(inner: pallet_common::CollectionHandle<T>) -> Self {152		Self(inner)153	}154	pub fn into_inner(self) -> pallet_common::CollectionHandle<T> {155		self.0156	}157}158impl<T: Config> Deref for RefungibleHandle<T> {159	type Target = pallet_common::CollectionHandle<T>;160161	fn deref(&self) -> &Self::Target {162		&self.0163	}164}165166impl<T: Config> Pallet<T> {167	pub fn total_supply(collection: &RefungibleHandle<T>) -> u32 {168		<TokensMinted<T>>::get(collection.id) - <TokensBurnt<T>>::get(collection.id)169	}170	pub fn token_exists(collection: &RefungibleHandle<T>, token: TokenId) -> bool {171		<TotalSupply<T>>::contains_key((collection.id, token))172	}173}174175// unchecked calls skips any permission checks176impl<T: Config> Pallet<T> {177	pub fn init_collection(178		owner: T::AccountId,179		data: CreateCollectionData<T::AccountId>,180	) -> Result<CollectionId, DispatchError> {181		<PalletCommon<T>>::init_collection(owner, data)182	}183	pub fn destroy_collection(184		collection: RefungibleHandle<T>,185		sender: &T::CrossAccountId,186	) -> DispatchResult {187		let id = collection.id;188189		// =========190191		PalletCommon::destroy_collection(collection.0, sender)?;192193		<TokensMinted<T>>::remove(id);194		<TokensBurnt<T>>::remove(id);195		<TokenData<T>>::remove_prefix((id,), None);196		<TotalSupply<T>>::remove_prefix((id,), None);197		<Balance<T>>::remove_prefix((id,), None);198		<Allowance<T>>::remove_prefix((id,), None);199		<Owned<T>>::remove_prefix((id,), None);200		<AccountBalance<T>>::remove_prefix((id,), None);201		Ok(())202	}203204	pub fn burn_token(collection: &RefungibleHandle<T>, token_id: TokenId) -> DispatchResult {205		let burnt = <TokensBurnt<T>>::get(collection.id)206			.checked_add(1)207			.ok_or(ArithmeticError::Overflow)?;208209		<TokensBurnt<T>>::insert(collection.id, burnt);210		<TokenData<T>>::remove((collection.id, token_id));211		<TotalSupply<T>>::remove((collection.id, token_id));212		<Balance<T>>::remove_prefix((collection.id, token_id), None);213		<Allowance<T>>::remove_prefix((collection.id, token_id), None);214		// TODO: ERC721 transfer event215		Ok(())216	}217218	pub fn burn(219		collection: &RefungibleHandle<T>,220		owner: &T::CrossAccountId,221		token: TokenId,222		amount: u128,223	) -> DispatchResult {224		let total_supply = <TotalSupply<T>>::get((collection.id, token))225			.checked_sub(amount)226			.ok_or(<CommonError<T>>::TokenValueTooLow)?;227228		// This was probally last owner of this token?229		if total_supply == 0 {230			// Ensure user actually owns this amount231			ensure!(232				<Balance<T>>::get((collection.id, token, owner)) == amount,233				<CommonError<T>>::TokenValueTooLow234			);235			let account_balance = <AccountBalance<T>>::get((collection.id, owner))236				.checked_sub(1)237				// Should not occur238				.ok_or(ArithmeticError::Underflow)?;239240			// =========241242			<Owned<T>>::remove((collection.id, owner, token));243			<AccountBalance<T>>::insert((collection.id, owner), account_balance);244			Self::burn_token(collection, token)?;245			<PalletCommon<T>>::deposit_event(CommonEvent::ItemDestroyed(246				collection.id,247				token,248				owner.clone(),249				amount,250			));251			return Ok(());252		}253254		let balance = <Balance<T>>::get((collection.id, token, owner))255			.checked_sub(amount)256			.ok_or(<CommonError<T>>::TokenValueTooLow)?;257		let account_balance = if balance == 0 {258			<AccountBalance<T>>::get((collection.id, owner))259				.checked_sub(1)260				// Should not occur261				.ok_or(ArithmeticError::Underflow)?262		} else {263			0264		};265266		// =========267268		if balance == 0 {269			<Owned<T>>::remove((collection.id, owner, token));270			<Balance<T>>::remove((collection.id, token, owner));271			<AccountBalance<T>>::insert((collection.id, owner), account_balance);272		} else {273			<Balance<T>>::insert((collection.id, token, owner), balance);274		}275		<TotalSupply<T>>::insert((collection.id, token), total_supply);276		// TODO: ERC20 transfer event277		<PalletCommon<T>>::deposit_event(CommonEvent::ItemDestroyed(278			collection.id,279			token,280			owner.clone(),281			amount,282		));283		Ok(())284	}285286	pub fn transfer(287		collection: &RefungibleHandle<T>,288		from: &T::CrossAccountId,289		to: &T::CrossAccountId,290		token: TokenId,291		amount: u128,292	) -> DispatchResult {293		ensure!(294			collection.limits.transfers_enabled(),295			<CommonError<T>>::TransferNotAllowed296		);297298		if collection.access == AccessMode::AllowList {299			collection.check_allowlist(from)?;300			collection.check_allowlist(to)?;301		}302		<PalletCommon<T>>::ensure_correct_receiver(to)?;303304		let balance_from = <Balance<T>>::get((collection.id, token, from))305			.checked_sub(amount)306			.ok_or(<CommonError<T>>::TokenValueTooLow)?;307		let mut create_target = false;308		let from_to_differ = from != to;309		let balance_to = if from != to {310			let old_balance = <Balance<T>>::get((collection.id, token, to));311			if old_balance == 0 {312				create_target = true;313			}314			Some(315				old_balance316					.checked_add(amount)317					.ok_or(ArithmeticError::Overflow)?,318			)319		} else {320			None321		};322323		let account_balance_from = if balance_from == 0 {324			Some(325				<AccountBalance<T>>::get((collection.id, from))326					.checked_sub(1)327					// Should not occur328					.ok_or(ArithmeticError::Underflow)?,329			)330		} else {331			None332		};333		// Account data is created in token, AccountBalance should be increased334		// But only if from != to as we shouldn't check overflow in this case335		let account_balance_to = if create_target && from_to_differ {336			let account_balance_to = <AccountBalance<T>>::get((collection.id, to))337				.checked_add(1)338				.ok_or(ArithmeticError::Overflow)?;339			ensure!(340				account_balance_to < collection.limits.account_token_ownership_limit(),341				<CommonError<T>>::AccountTokenLimitExceeded,342			);343344			Some(account_balance_to)345		} else {346			None347		};348349		if let Some(target) = T::CrossTokenAddressMapping::address_to_token(to) {350			let handle = <CollectionHandle<T>>::try_get(target.0)?;351			let dispatch = T::CollectionDispatch::dispatch(handle);352			let dispatch = dispatch.as_dyn();353354			// =========355356			dispatch.nest_token(from.clone(), (collection.id, token), target.1)?;357		}358359		if let Some(balance_to) = balance_to {360			// from != to361			if balance_from == 0 {362				<Balance<T>>::remove((collection.id, token, from));363			} else {364				<Balance<T>>::insert((collection.id, token, from), balance_from);365			}366			<Balance<T>>::insert((collection.id, token, to), balance_to);367			if let Some(account_balance_from) = account_balance_from {368				<AccountBalance<T>>::insert((collection.id, from), account_balance_from);369				<Owned<T>>::remove((collection.id, from, token));370			}371			if let Some(account_balance_to) = account_balance_to {372				<AccountBalance<T>>::insert((collection.id, to), account_balance_to);373				<Owned<T>>::insert((collection.id, to, token), true);374			}375		}376377		// TODO: ERC20 transfer event378		<PalletCommon<T>>::deposit_event(CommonEvent::Transfer(379			collection.id,380			token,381			from.clone(),382			to.clone(),383			amount,384		));385		Ok(())386	}387388	pub fn create_multiple_items(389		collection: &RefungibleHandle<T>,390		sender: &T::CrossAccountId,391		data: Vec<CreateRefungibleExData<T::CrossAccountId>>,392	) -> DispatchResult {393		if !collection.is_owner_or_admin(sender) {394			ensure!(395				collection.mint_mode,396				<CommonError<T>>::PublicMintingNotAllowed397			);398			collection.check_allowlist(sender)?;399400			for item in data.iter() {401				for user in item.users.keys() {402					collection.check_allowlist(user)?;403				}404			}405		}406407		for item in data.iter() {408			for (owner, _) in item.users.iter() {409				<PalletCommon<T>>::ensure_correct_receiver(owner)?;410			}411		}412413		// Total pieces per tokens414		let totals = data415			.iter()416			.map(|data| {417				Ok(data418					.users419					.iter()420					.map(|u| u.1)421					.try_fold(0u128, |acc, v| acc.checked_add(*v))422					.ok_or(ArithmeticError::Overflow)?)423			})424			.collect::<Result<Vec<_>, DispatchError>>()?;425		for total in &totals {426			ensure!(427				*total <= MAX_REFUNGIBLE_PIECES,428				<Error<T>>::WrongRefungiblePieces429			);430		}431432		let first_token_id = <TokensMinted<T>>::get(collection.id);433		let tokens_minted = first_token_id434			.checked_add(data.len() as u32)435			.ok_or(ArithmeticError::Overflow)?;436		ensure!(437			tokens_minted < collection.limits.token_limit(),438			<CommonError<T>>::CollectionTokenLimitExceeded439		);440441		let mut balances = BTreeMap::new();442		for data in &data {443			for owner in data.users.keys() {444				let balance = balances445					.entry(owner)446					.or_insert_with(|| <AccountBalance<T>>::get((collection.id, owner)));447				*balance = balance.checked_add(1).ok_or(ArithmeticError::Overflow)?;448449				ensure!(450					*balance <= collection.limits.account_token_ownership_limit(),451					<CommonError<T>>::AccountTokenLimitExceeded,452				);453			}454		}455456		// =========457458		<TokensMinted<T>>::insert(collection.id, tokens_minted);459		for (account, balance) in balances {460			<AccountBalance<T>>::insert((collection.id, account), balance);461		}462		for (i, token) in data.into_iter().enumerate() {463			let token_id = first_token_id + i as u32 + 1;464			<TotalSupply<T>>::insert((collection.id, token_id), totals[i]);465466			<TokenData<T>>::insert(467				(collection.id, token_id),468				ItemData {469					const_data: token.const_data,470					variable_data: token.variable_data,471				},472			);473			for (user, amount) in token.users.into_iter() {474				if amount == 0 {475					continue;476				}477				<Balance<T>>::insert((collection.id, token_id, &user), amount);478				<Owned<T>>::insert((collection.id, &user, TokenId(token_id)), true);479				// TODO: ERC20 transfer event480				<PalletCommon<T>>::deposit_event(CommonEvent::ItemCreated(481					collection.id,482					TokenId(token_id),483					user,484					amount,485				));486			}487		}488		Ok(())489	}490491	pub fn set_allowance_unchecked(492		collection: &RefungibleHandle<T>,493		sender: &T::CrossAccountId,494		spender: &T::CrossAccountId,495		token: TokenId,496		amount: u128,497	) {498		if amount == 0 {499			<Allowance<T>>::remove((collection.id, token, sender, spender));500		} else {501			<Allowance<T>>::insert((collection.id, token, sender, spender), amount);502		}503		// TODO: ERC20 approval event504		<PalletCommon<T>>::deposit_event(CommonEvent::Approved(505			collection.id,506			token,507			sender.clone(),508			spender.clone(),509			amount,510		))511	}512513	pub fn set_allowance(514		collection: &RefungibleHandle<T>,515		sender: &T::CrossAccountId,516		spender: &T::CrossAccountId,517		token: TokenId,518		amount: u128,519	) -> DispatchResult {520		if collection.access == AccessMode::AllowList {521			collection.check_allowlist(sender)?;522			collection.check_allowlist(spender)?;523		}524525		<PalletCommon<T>>::ensure_correct_receiver(spender)?;526527		if <Balance<T>>::get((collection.id, token, sender)) < amount {528			ensure!(529				collection.ignores_owned_amount(sender) && Self::token_exists(collection, token),530				<CommonError<T>>::CantApproveMoreThanOwned531			);532		}533534		// =========535536		Self::set_allowance_unchecked(collection, sender, spender, token, amount);537		Ok(())538	}539540	/// Returns allowance, which should be set after transaction541	fn check_allowed(542		collection: &RefungibleHandle<T>,543		spender: &T::CrossAccountId,544		from: &T::CrossAccountId,545		token: TokenId,546		amount: u128,547		nesting_budget: &dyn Budget,548	) -> Result<Option<u128>, DispatchError> {549		if spender.conv_eq(from) {550			return Ok(None);551		}552		if collection.access == AccessMode::AllowList {553			// `from`, `to` checked in [`transfer`]554			collection.check_allowlist(spender)?;555		}556		if let Some(source) = T::CrossTokenAddressMapping::address_to_token(from) {557			// TODO: should collection owner be allowed to perform this transfer?558			ensure!(559				<PalletStructure<T>>::indirectly_owned(560					spender.clone(),561					source.0,562					source.1,563					nesting_budget564				)?,565				<CommonError<T>>::ApprovedValueTooLow,566			);567			return Ok(None);568		}569		let allowance =570			<Allowance<T>>::get((collection.id, token, from, &spender)).checked_sub(amount);571		if allowance.is_none() {572			ensure!(573				collection.ignores_allowance(spender),574				<CommonError<T>>::ApprovedValueTooLow575			);576		}577		Ok(allowance)578	}579580	pub fn transfer_from(581		collection: &RefungibleHandle<T>,582		spender: &T::CrossAccountId,583		from: &T::CrossAccountId,584		to: &T::CrossAccountId,585		token: TokenId,586		amount: u128,587		nesting_budget: &dyn Budget,588	) -> DispatchResult {589		let allowance =590			Self::check_allowed(collection, spender, from, token, amount, nesting_budget)?;591592		// =========593594		Self::transfer(collection, from, to, token, amount)?;595		if let Some(allowance) = allowance {596			Self::set_allowance_unchecked(collection, from, spender, token, allowance);597		}598		Ok(())599	}600601	pub fn burn_from(602		collection: &RefungibleHandle<T>,603		spender: &T::CrossAccountId,604		from: &T::CrossAccountId,605		token: TokenId,606		amount: u128,607		nesting_budget: &dyn Budget,608	) -> DispatchResult {609		let allowance =610			Self::check_allowed(collection, spender, from, token, amount, nesting_budget)?;611612		// =========613614		Self::burn(collection, from, token, amount)?;615		if let Some(allowance) = allowance {616			Self::set_allowance_unchecked(collection, from, spender, token, allowance);617		}618		Ok(())619	}620621	pub fn set_variable_metadata(622		collection: &RefungibleHandle<T>,623		sender: &T::CrossAccountId,624		token: TokenId,625		data: BoundedVec<u8, CustomDataLimit>,626	) -> DispatchResult {627		collection.check_can_update_meta(628			sender,629			&T::CrossAccountId::from_sub(collection.owner.clone()),630		)?;631632		let token_data = <TokenData<T>>::get((collection.id, token));633634		// =========635636		<TokenData<T>>::insert(637			(collection.id, token),638			ItemData {639				variable_data: data,640				..token_data641			},642		);643		Ok(())644	}645646	/// Delegated to `create_multiple_items`647	pub fn create_item(648		collection: &RefungibleHandle<T>,649		sender: &T::CrossAccountId,650		data: CreateRefungibleExData<T::CrossAccountId>,651	) -> DispatchResult {652		Self::create_multiple_items(collection, sender, vec![data])653	}654}
modifiedpallets/structure/src/lib.rsdiffbeforeafterboth
--- a/pallets/structure/src/lib.rs
+++ b/pallets/structure/src/lib.rs
@@ -19,7 +19,6 @@
 	use frame_support::Parameter;
 	use frame_support::dispatch::{GetDispatchInfo, UnfilteredDispatchable};
 	use frame_support::pallet_prelude::*;
-	use frame_system::pallet_prelude::*;
 
 	use super::*;
 
modifiedpallets/unique/src/lib.rsdiffbeforeafterboth
--- a/pallets/unique/src/lib.rs
+++ b/pallets/unique/src/lib.rs
@@ -693,8 +693,9 @@
 		#[transactional]
 		pub fn create_item(origin, collection_id: CollectionId, owner: T::CrossAccountId, data: CreateItemData) -> DispatchResultWithPostInfo {
 			let sender = T::CrossAccountId::from_sub(ensure_signed(origin)?);
+			let budget = budget::Value::new(2);
 
-			dispatch_call::<T, _>(collection_id, |d| d.create_item(sender, owner, data))
+			dispatch_call::<T, _>(collection_id, |d| d.create_item(sender, owner, data, &budget))
 		}
 
 		/// This method creates multiple items in a collection created with CreateCollection method.
@@ -720,16 +721,18 @@
 		pub fn create_multiple_items(origin, collection_id: CollectionId, owner: T::CrossAccountId, items_data: Vec<CreateItemData>) -> DispatchResultWithPostInfo {
 			ensure!(!items_data.is_empty(), Error::<T>::EmptyArgument);
 			let sender = T::CrossAccountId::from_sub(ensure_signed(origin)?);
+			let budget = budget::Value::new(2);
 
-			dispatch_call::<T, _>(collection_id, |d| d.create_multiple_items(sender, owner, items_data))
+			dispatch_call::<T, _>(collection_id, |d| d.create_multiple_items(sender, owner, items_data, &budget))
 		}
 
 		#[weight = <CommonWeights<T>>::create_multiple_items_ex(&data)]
 		#[transactional]
 		pub fn create_multiple_items_ex(origin, collection_id: CollectionId, data: CreateItemExData<T::CrossAccountId>) -> DispatchResultWithPostInfo {
 			let sender = T::CrossAccountId::from_sub(ensure_signed(origin)?);
+			let budget = budget::Value::new(2);
 
-			dispatch_call::<T, _>(collection_id, |d| d.create_multiple_items_ex(sender, data))
+			dispatch_call::<T, _>(collection_id, |d| d.create_multiple_items_ex(sender, data, &budget))
 		}
 
 		// TODO! transaction weight
@@ -839,8 +842,9 @@
 		#[transactional]
 		pub fn transfer(origin, recipient: T::CrossAccountId, collection_id: CollectionId, item_id: TokenId, value: u128) -> DispatchResultWithPostInfo {
 			let sender = T::CrossAccountId::from_sub(ensure_signed(origin)?);
+			let budget = budget::Value::new(2);
 
-			dispatch_call::<T, _>(collection_id, |d| d.transfer(sender, recipient, item_id, value))
+			dispatch_call::<T, _>(collection_id, |d| d.transfer(sender, recipient, item_id, value, &budget))
 		}
 
 		/// Set, change, or remove approved address to transfer the ownership of the NFT.