git.delta.rocks / unique-network / refs/commits / 7e808da4a3d9

difftreelog

fix revert set_allowance

Daniel Shiposha2022-06-05parent: #e099d8f.patch.diff
in: master

8 files changed

modifiedpallets/common/src/lib.rsdiffbeforeafterboth
--- a/pallets/common/src/lib.rs
+++ b/pallets/common/src/lib.rs
@@ -1298,7 +1298,6 @@
 		spender: T::CrossAccountId,
 		token: TokenId,
 		amount: u128,
-		nesting_budget: &dyn Budget,
 	) -> DispatchResultWithPostInfo;
 	fn transfer_from(
 		&self,
modifiedpallets/fungible/src/common.rsdiffbeforeafterboth
--- a/pallets/fungible/src/common.rs
+++ b/pallets/fungible/src/common.rs
@@ -226,7 +226,6 @@
 		spender: T::CrossAccountId,
 		token: TokenId,
 		amount: u128,
-		_nesting_budget: &dyn Budget,
 	) -> DispatchResultWithPostInfo {
 		ensure!(
 			token == TokenId::default(),
modifiedpallets/nonfungible/src/common.rsdiffbeforeafterboth
before · pallets/nonfungible/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 frame_support::{dispatch::DispatchResultWithPostInfo, ensure, fail, weights::Weight};20use up_data_structs::{21	TokenId, CreateItemExData, CollectionId, budget::Budget, Property, PropertyKey,22	PropertyKeyPermission, PropertyValue,23};24use pallet_common::{25	CommonCollectionOperations, CommonWeightInfo, with_weight, weights::WeightInfo as _,26};27use sp_runtime::DispatchError;28use sp_std::vec::Vec;2930use crate::{31	AccountBalance, Allowance, Config, CreateItemData, Error, NonfungibleHandle, Owned, Pallet,32	SelfWeightOf, TokenData, weights::WeightInfo, TokensMinted,33};3435pub struct CommonWeights<T: Config>(PhantomData<T>);36impl<T: Config> CommonWeightInfo<T::CrossAccountId> for CommonWeights<T> {37	fn create_item() -> Weight {38		<SelfWeightOf<T>>::create_item()39	}4041	fn create_multiple_items_ex(data: &CreateItemExData<T::CrossAccountId>) -> Weight {42		match data {43			CreateItemExData::NFT(t) => {44				<SelfWeightOf<T>>::create_multiple_items_ex(t.len() as u32)45					+ t.iter()46						.map(|t| {47							if t.properties.len() > 0 {48								Self::set_token_properties(t.properties.len() as u32)49							} else {50								051							}52						})53						.sum::<u64>()54			}55			_ => 0,56		}57	}5859	fn create_multiple_items(data: &[up_data_structs::CreateItemData]) -> Weight {60		<SelfWeightOf<T>>::create_multiple_items(data.len() as u32)61			+ data62				.iter()63				.filter_map(|t| match t {64					up_data_structs::CreateItemData::NFT(n) if n.properties.len() > 0 => {65						Some(Self::set_token_properties(n.properties.len() as u32))66					}67					_ => None,68				})69				.sum::<u64>()70	}7172	fn burn_item() -> Weight {73		<SelfWeightOf<T>>::burn_item()74	}7576	fn set_collection_properties(amount: u32) -> Weight {77		<pallet_common::SelfWeightOf<T>>::set_collection_properties(amount)78	}7980	fn delete_collection_properties(amount: u32) -> Weight {81		<pallet_common::SelfWeightOf<T>>::delete_collection_properties(amount)82	}8384	fn set_token_properties(amount: u32) -> Weight {85		<SelfWeightOf<T>>::set_token_properties(amount)86	}8788	fn delete_token_properties(amount: u32) -> Weight {89		<SelfWeightOf<T>>::delete_token_properties(amount)90	}9192	fn set_property_permissions(amount: u32) -> Weight {93		<SelfWeightOf<T>>::set_property_permissions(amount)94	}9596	fn transfer() -> Weight {97		<SelfWeightOf<T>>::transfer()98	}99100	fn approve() -> Weight {101		<SelfWeightOf<T>>::approve()102	}103104	fn transfer_from() -> Weight {105		<SelfWeightOf<T>>::transfer_from()106	}107108	fn burn_from() -> Weight {109		<SelfWeightOf<T>>::burn_from()110	}111112	fn burn_recursively_self_raw() -> Weight {113		<SelfWeightOf<T>>::burn_recursively_self_raw()114	}115116	fn burn_recursively_breadth_raw(amount: u32) -> Weight {117		<SelfWeightOf<T>>::burn_recursively_breadth_plus_self_plus_self_per_each_raw(amount)118			.saturating_sub(Self::burn_recursively_self_raw().saturating_mul(amount as u64 + 1))119	}120}121122fn map_create_data<T: Config>(123	data: up_data_structs::CreateItemData,124	to: &T::CrossAccountId,125) -> Result<CreateItemData<T>, DispatchError> {126	match data {127		up_data_structs::CreateItemData::NFT(data) => Ok(CreateItemData::<T> {128			properties: data.properties,129			owner: to.clone(),130		}),131		_ => fail!(<Error<T>>::NotNonfungibleDataUsedToMintFungibleCollectionToken),132	}133}134135impl<T: Config> CommonCollectionOperations<T> for NonfungibleHandle<T> {136	fn create_item(137		&self,138		sender: T::CrossAccountId,139		to: T::CrossAccountId,140		data: up_data_structs::CreateItemData,141		nesting_budget: &dyn Budget,142	) -> DispatchResultWithPostInfo {143		with_weight(144			<Pallet<T>>::create_item(145				self,146				&sender,147				map_create_data::<T>(data, &to)?,148				nesting_budget,149			),150			<CommonWeights<T>>::create_item(),151		)152	}153154	fn create_multiple_items(155		&self,156		sender: T::CrossAccountId,157		to: T::CrossAccountId,158		data: Vec<up_data_structs::CreateItemData>,159		nesting_budget: &dyn Budget,160	) -> DispatchResultWithPostInfo {161		let weight = <CommonWeights<T>>::create_multiple_items(&data);162		let data = data163			.into_iter()164			.map(|d| map_create_data::<T>(d, &to))165			.collect::<Result<Vec<_>, DispatchError>>()?;166167		with_weight(168			<Pallet<T>>::create_multiple_items(self, &sender, data, nesting_budget),169			weight,170		)171	}172173	fn create_multiple_items_ex(174		&self,175		sender: <T>::CrossAccountId,176		data: up_data_structs::CreateItemExData<<T>::CrossAccountId>,177		nesting_budget: &dyn Budget,178	) -> DispatchResultWithPostInfo {179		let weight = <CommonWeights<T>>::create_multiple_items_ex(&data);180		let data = match data {181			up_data_structs::CreateItemExData::NFT(nft) => nft,182			_ => fail!(Error::<T>::NotNonfungibleDataUsedToMintFungibleCollectionToken),183		};184185		with_weight(186			<Pallet<T>>::create_multiple_items(self, &sender, data.into_inner(), nesting_budget),187			weight,188		)189	}190191	fn set_collection_properties(192		&self,193		sender: T::CrossAccountId,194		properties: Vec<Property>,195	) -> DispatchResultWithPostInfo {196		let weight = <CommonWeights<T>>::set_collection_properties(properties.len() as u32);197198		with_weight(199			<Pallet<T>>::set_collection_properties(self, &sender, properties),200			weight,201		)202	}203204	fn delete_collection_properties(205		&self,206		sender: &T::CrossAccountId,207		property_keys: Vec<PropertyKey>,208	) -> DispatchResultWithPostInfo {209		let weight = <CommonWeights<T>>::delete_collection_properties(property_keys.len() as u32);210211		with_weight(212			<Pallet<T>>::delete_collection_properties(self, sender, property_keys),213			weight,214		)215	}216217	fn set_token_properties(218		&self,219		sender: T::CrossAccountId,220		token_id: TokenId,221		properties: Vec<Property>,222	) -> DispatchResultWithPostInfo {223		let weight = <CommonWeights<T>>::set_token_properties(properties.len() as u32);224225		with_weight(226			<Pallet<T>>::set_token_properties(self, &sender, token_id, properties),227			weight,228		)229	}230231	fn delete_token_properties(232		&self,233		sender: T::CrossAccountId,234		token_id: TokenId,235		property_keys: Vec<PropertyKey>,236	) -> DispatchResultWithPostInfo {237		let weight = <CommonWeights<T>>::delete_token_properties(property_keys.len() as u32);238239		with_weight(240			<Pallet<T>>::delete_token_properties(self, &sender, token_id, property_keys),241			weight,242		)243	}244245	fn set_property_permissions(246		&self,247		sender: &T::CrossAccountId,248		property_permissions: Vec<PropertyKeyPermission>,249	) -> DispatchResultWithPostInfo {250		let weight =251			<CommonWeights<T>>::set_property_permissions(property_permissions.len() as u32);252253		with_weight(254			<Pallet<T>>::set_property_permissions(self, sender, property_permissions),255			weight,256		)257	}258259	fn burn_item(260		&self,261		sender: T::CrossAccountId,262		token: TokenId,263		amount: u128,264	) -> DispatchResultWithPostInfo {265		ensure!(amount <= 1, <Error<T>>::NonfungibleItemsHaveNoAmount);266		if amount == 1 {267			with_weight(268				<Pallet<T>>::burn(self, &sender, token),269				<CommonWeights<T>>::burn_item(),270			)271		} else {272			Ok(().into())273		}274	}275276	fn burn_item_recursively(277		&self,278		sender: T::CrossAccountId,279		token: TokenId,280		self_budget: &dyn Budget,281		breadth_budget: &dyn Budget,282	) -> DispatchResultWithPostInfo {283		<Pallet<T>>::burn_recursively(self, &sender, token, self_budget, breadth_budget)284	}285286	fn transfer(287		&self,288		from: T::CrossAccountId,289		to: T::CrossAccountId,290		token: TokenId,291		amount: u128,292		nesting_budget: &dyn Budget,293	) -> DispatchResultWithPostInfo {294		ensure!(amount <= 1, <Error<T>>::NonfungibleItemsHaveNoAmount);295		if amount == 1 {296			with_weight(297				<Pallet<T>>::transfer(self, &from, &to, token, nesting_budget),298				<CommonWeights<T>>::transfer(),299			)300		} else {301			Ok(().into())302		}303	}304305	fn approve(306		&self,307		sender: T::CrossAccountId,308		spender: T::CrossAccountId,309		token: TokenId,310		amount: u128,311		nesting_budget: &dyn Budget,312	) -> DispatchResultWithPostInfo {313		ensure!(amount <= 1, <Error<T>>::NonfungibleItemsHaveNoAmount);314315		with_weight(316			if amount == 1 {317				<Pallet<T>>::set_allowance(self, &sender, token, Some(&spender), nesting_budget)318			} else {319				<Pallet<T>>::set_allowance(self, &sender, token, None, nesting_budget)320			},321			<CommonWeights<T>>::approve(),322		)323	}324325	fn transfer_from(326		&self,327		sender: T::CrossAccountId,328		from: T::CrossAccountId,329		to: T::CrossAccountId,330		token: TokenId,331		amount: u128,332		nesting_budget: &dyn Budget,333	) -> DispatchResultWithPostInfo {334		ensure!(amount <= 1, <Error<T>>::NonfungibleItemsHaveNoAmount);335336		if amount == 1 {337			with_weight(338				<Pallet<T>>::transfer_from(self, &sender, &from, &to, token, nesting_budget),339				<CommonWeights<T>>::transfer_from(),340			)341		} else {342			Ok(().into())343		}344	}345346	fn burn_from(347		&self,348		sender: T::CrossAccountId,349		from: T::CrossAccountId,350		token: TokenId,351		amount: u128,352		nesting_budget: &dyn Budget,353	) -> DispatchResultWithPostInfo {354		ensure!(amount <= 1, <Error<T>>::NonfungibleItemsHaveNoAmount);355356		if amount == 1 {357			with_weight(358				<Pallet<T>>::burn_from(self, &sender, &from, token, nesting_budget),359				<CommonWeights<T>>::burn_from(),360			)361		} else {362			Ok(().into())363		}364	}365366	fn check_nesting(367		&self,368		sender: T::CrossAccountId,369		from: (CollectionId, TokenId),370		under: TokenId,371		budget: &dyn Budget,372	) -> sp_runtime::DispatchResult {373		<Pallet<T>>::check_nesting(self, sender, from, under, budget)374	}375376	fn nest(&self, under: TokenId, to_nest: (CollectionId, TokenId)) {377		<Pallet<T>>::nest((self.id, under), to_nest);378	}379380	fn unnest(&self, under: TokenId, to_unnest: (CollectionId, TokenId)) {381		<Pallet<T>>::unnest((self.id, under), to_unnest);382	}383384	fn account_tokens(&self, account: T::CrossAccountId) -> Vec<TokenId> {385		<Owned<T>>::iter_prefix((self.id, account))386			.map(|(id, _)| id)387			.collect()388	}389390	fn collection_tokens(&self) -> Vec<TokenId> {391		<TokenData<T>>::iter_prefix((self.id,))392			.map(|(id, _)| id)393			.collect()394	}395396	fn token_exists(&self, token: TokenId) -> bool {397		<Pallet<T>>::token_exists(self, token)398	}399400	fn last_token_id(&self) -> TokenId {401		TokenId(<TokensMinted<T>>::get(self.id))402	}403404	fn token_owner(&self, token: TokenId) -> Option<T::CrossAccountId> {405		<TokenData<T>>::get((self.id, token)).map(|t| t.owner)406	}407408	fn token_property(&self, token_id: TokenId, key: &PropertyKey) -> Option<PropertyValue> {409		<Pallet<T>>::token_properties((self.id, token_id))410			.get(key)411			.cloned()412	}413414	fn token_properties(&self, token_id: TokenId, keys: Option<Vec<PropertyKey>>) -> Vec<Property> {415		let properties = <Pallet<T>>::token_properties((self.id, token_id));416417		keys.map(|keys| {418			keys.into_iter()419				.filter_map(|key| {420					properties.get(&key).map(|value| Property {421						key,422						value: value.clone(),423					})424				})425				.collect()426		})427		.unwrap_or_else(|| {428			properties429				.into_iter()430				.map(|(key, value)| Property { key, value })431				.collect()432		})433	}434435	fn total_supply(&self) -> u32 {436		<Pallet<T>>::total_supply(self)437	}438439	fn account_balance(&self, account: T::CrossAccountId) -> u32 {440		<AccountBalance<T>>::get((self.id, account))441	}442443	fn balance(&self, account: T::CrossAccountId, token: TokenId) -> u128 {444		if <TokenData<T>>::get((self.id, token))445			.map(|a| a.owner == account)446			.unwrap_or(false)447		{448			1449		} else {450			0451		}452	}453454	fn allowance(455		&self,456		sender: T::CrossAccountId,457		spender: T::CrossAccountId,458		token: TokenId,459	) -> u128 {460		if <TokenData<T>>::get((self.id, token))461			.map(|a| a.owner != sender)462			.unwrap_or(true)463		{464			0465		} else if <Allowance<T>>::get((self.id, token)) == Some(spender) {466			1467		} else {468			0469		}470	}471}
modifiedpallets/nonfungible/src/erc.rsdiffbeforeafterboth
--- a/pallets/nonfungible/src/erc.rs
+++ b/pallets/nonfungible/src/erc.rs
@@ -269,11 +269,8 @@
 		let caller = T::CrossAccountId::from_eth(caller);
 		let approved = T::CrossAccountId::from_eth(approved);
 		let token = token_id.try_into()?;
-		let budget = self
-			.recorder
-			.weight_calls_budget(<StructureWeight<T>>::find_parent());
 
-		<Pallet<T>>::set_allowance(self, &caller, token, Some(&approved), &budget)
+		<Pallet<T>>::set_allowance(self, &caller, token, Some(&approved))
 			.map_err(dispatch_to_evm::<T>)?;
 		Ok(())
 	}
modifiedpallets/nonfungible/src/lib.rsdiffbeforeafterboth
--- a/pallets/nonfungible/src/lib.rs
+++ b/pallets/nonfungible/src/lib.rs
@@ -878,7 +878,6 @@
 		sender: &T::CrossAccountId,
 		token: TokenId,
 		spender: Option<&T::CrossAccountId>,
-		nesting_budget: &dyn Budget,
 	) -> DispatchResult {
 		if collection.permissions.access() == AccessMode::AllowList {
 			collection.check_allowlist(sender)?;
@@ -890,16 +889,10 @@
 		if let Some(spender) = spender {
 			<PalletCommon<T>>::ensure_correct_receiver(spender)?;
 		}
-
-		let is_owned = <PalletStructure<T>>::check_indirectly_owned(
-			sender.clone(),
-			collection.id,
-			token,
-			None,
-			nesting_budget
-		)?;
 
-		if !is_owned {
+		let token_data =
+			<TokenData<T>>::get((collection.id, token)).ok_or(<CommonError<T>>::TokenNotFound)?;
+		if &token_data.owner != sender {
 			ensure!(
 				collection.ignores_owned_amount(sender),
 				<CommonError<T>>::CantApproveMoreThanOwned
@@ -926,9 +919,6 @@
 			// `from`, `to` checked in [`transfer`]
 			collection.check_allowlist(spender)?;
 		}
-		if <Allowance<T>>::get((collection.id, token)).as_ref() == Some(spender) {
-			return Ok(());
-		}
 		if let Some(source) = T::CrossTokenAddressMapping::address_to_token(from) {
 			// TODO: should collection owner be allowed to perform this transfer?
 			ensure!(
@@ -943,6 +933,9 @@
 			);
 			return Ok(());
 		}
+		if <Allowance<T>>::get((collection.id, token)).as_ref() == Some(spender) {
+			return Ok(());
+		}
 		ensure!(
 			collection.ignores_allowance(spender),
 			<CommonError<T>>::ApprovedValueTooLow
modifiedpallets/proxy-rmrk-core/src/lib.rsdiffbeforeafterboth
--- a/pallets/proxy-rmrk-core/src/lib.rs
+++ b/pallets/proxy-rmrk-core/src/lib.rs
@@ -414,13 +414,14 @@
 					let is_approval_required = cross_sender != spender;
 
 					if is_approval_required {
-						<PalletNft<T>>::set_allowance(
-							&collection,
-							&cross_sender,
-							nft_id,
-							Some(&spender),
-							&budget
-						).map_err(Self::map_common_err_to_proxy)?;
+						// FIXME
+						// <PalletNft<T>>::set_allowance(
+						// 	&collection,
+						// 	&cross_sender,
+						// 	nft_id,
+						// 	Some(&spender),
+						// 	&budget
+						// ).map_err(Self::map_common_err_to_proxy)?;
 
 						return Ok(());
 					}
modifiedpallets/refungible/src/common.rsdiffbeforeafterboth
--- a/pallets/refungible/src/common.rs
+++ b/pallets/refungible/src/common.rs
@@ -254,7 +254,6 @@
 		spender: T::CrossAccountId,
 		token: TokenId,
 		amount: u128,
-		_nesting_budget: &dyn Budget,
 	) -> DispatchResultWithPostInfo {
 		with_weight(
 			<Pallet<T>>::set_allowance(self, &sender, &spender, token, amount),
modifiedpallets/unique/src/lib.rsdiffbeforeafterboth
--- a/pallets/unique/src/lib.rs
+++ b/pallets/unique/src/lib.rs
@@ -815,9 +815,8 @@
 		#[transactional]
 		pub fn approve(origin, spender: T::CrossAccountId, collection_id: CollectionId, item_id: TokenId, amount: u128) -> DispatchResultWithPostInfo {
 			let sender = T::CrossAccountId::from_sub(ensure_signed(origin)?);
-			let budget = budget::Value::new(NESTING_BUDGET);
 
-			dispatch_call::<T, _>(collection_id, |d| d.approve(sender, spender, item_id, amount, &budget))
+			dispatch_call::<T, _>(collection_id, |d| d.approve(sender, spender, item_id, amount))
 		}
 
 		/// Change ownership of a NFT on behalf of the owner. See Approve method for additional information. After this method executes, the approval is removed so that the approved address will not be able to transfer this NFT again from this owner.