difftreelog
fix manage properties of nested tokens
in: master
7 files changed
pallets/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,
pallets/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)
}
pallets/nonfungible/src/common.rsdiffbeforeafterboth1// 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, RefungibleExtensions, with_weight,26 weights::WeightInfo as _,27};28use sp_runtime::DispatchError;29use sp_std::vec::Vec;3031use crate::{32 AccountBalance, Allowance, Config, CreateItemData, Error, NonfungibleHandle, Owned, Pallet,33 SelfWeightOf, TokenData, weights::WeightInfo, TokensMinted,34};3536pub struct CommonWeights<T: Config>(PhantomData<T>);37impl<T: Config> CommonWeightInfo<T::CrossAccountId> for CommonWeights<T> {38 fn create_item() -> Weight {39 <SelfWeightOf<T>>::create_item()40 }4142 fn create_multiple_items_ex(data: &CreateItemExData<T::CrossAccountId>) -> Weight {43 match data {44 CreateItemExData::NFT(t) => {45 <SelfWeightOf<T>>::create_multiple_items_ex(t.len() as u32)46 + t.iter()47 .map(|t| {48 if t.properties.len() > 0 {49 Self::set_token_properties(t.properties.len() as u32)50 } else {51 052 }53 })54 .sum::<u64>()55 }56 _ => 0,57 }58 }5960 fn create_multiple_items(data: &[up_data_structs::CreateItemData]) -> Weight {61 <SelfWeightOf<T>>::create_multiple_items(data.len() as u32)62 + data63 .iter()64 .filter_map(|t| match t {65 up_data_structs::CreateItemData::NFT(n) if n.properties.len() > 0 => {66 Some(Self::set_token_properties(n.properties.len() as u32))67 }68 _ => None,69 })70 .sum::<u64>()71 }7273 fn burn_item() -> Weight {74 <SelfWeightOf<T>>::burn_item()75 }7677 fn set_collection_properties(amount: u32) -> Weight {78 <pallet_common::SelfWeightOf<T>>::set_collection_properties(amount)79 }8081 fn delete_collection_properties(amount: u32) -> Weight {82 <pallet_common::SelfWeightOf<T>>::delete_collection_properties(amount)83 }8485 fn set_token_properties(amount: u32) -> Weight {86 <SelfWeightOf<T>>::set_token_properties(amount)87 }8889 fn delete_token_properties(amount: u32) -> Weight {90 <SelfWeightOf<T>>::delete_token_properties(amount)91 }9293 fn set_token_property_permissions(amount: u32) -> Weight {94 <SelfWeightOf<T>>::set_token_property_permissions(amount)95 }9697 fn transfer() -> Weight {98 <SelfWeightOf<T>>::transfer()99 }100101 fn approve() -> Weight {102 <SelfWeightOf<T>>::approve()103 }104105 fn transfer_from() -> Weight {106 <SelfWeightOf<T>>::transfer_from()107 }108109 fn burn_from() -> Weight {110 <SelfWeightOf<T>>::burn_from()111 }112113 fn burn_recursively_self_raw() -> Weight {114 <SelfWeightOf<T>>::burn_recursively_self_raw()115 }116117 fn burn_recursively_breadth_raw(amount: u32) -> Weight {118 <SelfWeightOf<T>>::burn_recursively_breadth_plus_self_plus_self_per_each_raw(amount)119 .saturating_sub(Self::burn_recursively_self_raw().saturating_mul(amount as u64 + 1))120 }121}122123fn map_create_data<T: Config>(124 data: up_data_structs::CreateItemData,125 to: &T::CrossAccountId,126) -> Result<CreateItemData<T>, DispatchError> {127 match data {128 up_data_structs::CreateItemData::NFT(data) => Ok(CreateItemData::<T> {129 properties: data.properties,130 owner: to.clone(),131 }),132 _ => fail!(<Error<T>>::NotNonfungibleDataUsedToMintFungibleCollectionToken),133 }134}135136impl<T: Config> CommonCollectionOperations<T> for NonfungibleHandle<T> {137 fn create_item(138 &self,139 sender: T::CrossAccountId,140 to: T::CrossAccountId,141 data: up_data_structs::CreateItemData,142 nesting_budget: &dyn Budget,143 ) -> DispatchResultWithPostInfo {144 with_weight(145 <Pallet<T>>::create_item(146 self,147 &sender,148 map_create_data::<T>(data, &to)?,149 nesting_budget,150 ),151 <CommonWeights<T>>::create_item(),152 )153 }154155 fn create_multiple_items(156 &self,157 sender: T::CrossAccountId,158 to: T::CrossAccountId,159 data: Vec<up_data_structs::CreateItemData>,160 nesting_budget: &dyn Budget,161 ) -> DispatchResultWithPostInfo {162 let weight = <CommonWeights<T>>::create_multiple_items(&data);163 let data = data164 .into_iter()165 .map(|d| map_create_data::<T>(d, &to))166 .collect::<Result<Vec<_>, DispatchError>>()?;167168 with_weight(169 <Pallet<T>>::create_multiple_items(self, &sender, data, nesting_budget),170 weight,171 )172 }173174 fn create_multiple_items_ex(175 &self,176 sender: <T>::CrossAccountId,177 data: up_data_structs::CreateItemExData<<T>::CrossAccountId>,178 nesting_budget: &dyn Budget,179 ) -> DispatchResultWithPostInfo {180 let weight = <CommonWeights<T>>::create_multiple_items_ex(&data);181 let data = match data {182 up_data_structs::CreateItemExData::NFT(nft) => nft,183 _ => fail!(Error::<T>::NotNonfungibleDataUsedToMintFungibleCollectionToken),184 };185186 with_weight(187 <Pallet<T>>::create_multiple_items(self, &sender, data.into_inner(), nesting_budget),188 weight,189 )190 }191192 fn set_collection_properties(193 &self,194 sender: T::CrossAccountId,195 properties: Vec<Property>,196 ) -> DispatchResultWithPostInfo {197 let weight = <CommonWeights<T>>::set_collection_properties(properties.len() as u32);198199 with_weight(200 <Pallet<T>>::set_collection_properties(self, &sender, properties),201 weight,202 )203 }204205 fn delete_collection_properties(206 &self,207 sender: &T::CrossAccountId,208 property_keys: Vec<PropertyKey>,209 ) -> DispatchResultWithPostInfo {210 let weight = <CommonWeights<T>>::delete_collection_properties(property_keys.len() as u32);211212 with_weight(213 <Pallet<T>>::delete_collection_properties(self, sender, property_keys),214 weight,215 )216 }217218 fn set_token_properties(219 &self,220 sender: T::CrossAccountId,221 token_id: TokenId,222 properties: Vec<Property>,223 ) -> DispatchResultWithPostInfo {224 let weight = <CommonWeights<T>>::set_token_properties(properties.len() as u32);225226 with_weight(227 <Pallet<T>>::set_token_properties(self, &sender, token_id, properties, false),228 weight,229 )230 }231232 fn delete_token_properties(233 &self,234 sender: T::CrossAccountId,235 token_id: TokenId,236 property_keys: Vec<PropertyKey>,237 ) -> DispatchResultWithPostInfo {238 let weight = <CommonWeights<T>>::delete_token_properties(property_keys.len() as u32);239240 with_weight(241 <Pallet<T>>::delete_token_properties(self, &sender, token_id, property_keys),242 weight,243 )244 }245246 fn set_token_property_permissions(247 &self,248 sender: &T::CrossAccountId,249 property_permissions: Vec<PropertyKeyPermission>,250 ) -> DispatchResultWithPostInfo {251 let weight =252 <CommonWeights<T>>::set_token_property_permissions(property_permissions.len() as u32);253254 with_weight(255 <Pallet<T>>::set_token_property_permissions(self, sender, property_permissions),256 weight,257 )258 }259260 fn burn_item(261 &self,262 sender: T::CrossAccountId,263 token: TokenId,264 amount: u128,265 ) -> DispatchResultWithPostInfo {266 ensure!(amount <= 1, <Error<T>>::NonfungibleItemsHaveNoAmount);267 if amount == 1 {268 with_weight(269 <Pallet<T>>::burn(self, &sender, token),270 <CommonWeights<T>>::burn_item(),271 )272 } else {273 Ok(().into())274 }275 }276277 fn burn_item_recursively(278 &self,279 sender: T::CrossAccountId,280 token: TokenId,281 self_budget: &dyn Budget,282 breadth_budget: &dyn Budget,283 ) -> DispatchResultWithPostInfo {284 <Pallet<T>>::burn_recursively(self, &sender, token, self_budget, breadth_budget)285 }286287 fn transfer(288 &self,289 from: T::CrossAccountId,290 to: T::CrossAccountId,291 token: TokenId,292 amount: u128,293 nesting_budget: &dyn Budget,294 ) -> DispatchResultWithPostInfo {295 ensure!(amount <= 1, <Error<T>>::NonfungibleItemsHaveNoAmount);296 if amount == 1 {297 with_weight(298 <Pallet<T>>::transfer(self, &from, &to, token, nesting_budget),299 <CommonWeights<T>>::transfer(),300 )301 } else {302 Ok(().into())303 }304 }305306 fn approve(307 &self,308 sender: T::CrossAccountId,309 spender: T::CrossAccountId,310 token: TokenId,311 amount: u128,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))318 } else {319 <Pallet<T>>::set_allowance(self, &sender, token, None)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 }471472 fn refungible_extensions(&self) -> Option<&dyn RefungibleExtensions<T>> {473 None474 }475}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, RefungibleExtensions, with_weight,26 weights::WeightInfo as _,27};28use sp_runtime::DispatchError;29use sp_std::vec::Vec;3031use crate::{32 AccountBalance, Allowance, Config, CreateItemData, Error, NonfungibleHandle, Owned, Pallet,33 SelfWeightOf, TokenData, weights::WeightInfo, TokensMinted,34};3536pub struct CommonWeights<T: Config>(PhantomData<T>);37impl<T: Config> CommonWeightInfo<T::CrossAccountId> for CommonWeights<T> {38 fn create_item() -> Weight {39 <SelfWeightOf<T>>::create_item()40 }4142 fn create_multiple_items_ex(data: &CreateItemExData<T::CrossAccountId>) -> Weight {43 match data {44 CreateItemExData::NFT(t) => {45 <SelfWeightOf<T>>::create_multiple_items_ex(t.len() as u32)46 + t.iter()47 .map(|t| {48 if t.properties.len() > 0 {49 Self::set_token_properties(t.properties.len() as u32)50 } else {51 052 }53 })54 .sum::<u64>()55 }56 _ => 0,57 }58 }5960 fn create_multiple_items(data: &[up_data_structs::CreateItemData]) -> Weight {61 <SelfWeightOf<T>>::create_multiple_items(data.len() as u32)62 + data63 .iter()64 .filter_map(|t| match t {65 up_data_structs::CreateItemData::NFT(n) if n.properties.len() > 0 => {66 Some(Self::set_token_properties(n.properties.len() as u32))67 }68 _ => None,69 })70 .sum::<u64>()71 }7273 fn burn_item() -> Weight {74 <SelfWeightOf<T>>::burn_item()75 }7677 fn set_collection_properties(amount: u32) -> Weight {78 <pallet_common::SelfWeightOf<T>>::set_collection_properties(amount)79 }8081 fn delete_collection_properties(amount: u32) -> Weight {82 <pallet_common::SelfWeightOf<T>>::delete_collection_properties(amount)83 }8485 fn set_token_properties(amount: u32) -> Weight {86 <SelfWeightOf<T>>::set_token_properties(amount)87 }8889 fn delete_token_properties(amount: u32) -> Weight {90 <SelfWeightOf<T>>::delete_token_properties(amount)91 }9293 fn set_token_property_permissions(amount: u32) -> Weight {94 <SelfWeightOf<T>>::set_token_property_permissions(amount)95 }9697 fn transfer() -> Weight {98 <SelfWeightOf<T>>::transfer()99 }100101 fn approve() -> Weight {102 <SelfWeightOf<T>>::approve()103 }104105 fn transfer_from() -> Weight {106 <SelfWeightOf<T>>::transfer_from()107 }108109 fn burn_from() -> Weight {110 <SelfWeightOf<T>>::burn_from()111 }112113 fn burn_recursively_self_raw() -> Weight {114 <SelfWeightOf<T>>::burn_recursively_self_raw()115 }116117 fn burn_recursively_breadth_raw(amount: u32) -> Weight {118 <SelfWeightOf<T>>::burn_recursively_breadth_plus_self_plus_self_per_each_raw(amount)119 .saturating_sub(Self::burn_recursively_self_raw().saturating_mul(amount as u64 + 1))120 }121}122123fn map_create_data<T: Config>(124 data: up_data_structs::CreateItemData,125 to: &T::CrossAccountId,126) -> Result<CreateItemData<T>, DispatchError> {127 match data {128 up_data_structs::CreateItemData::NFT(data) => Ok(CreateItemData::<T> {129 properties: data.properties,130 owner: to.clone(),131 }),132 _ => fail!(<Error<T>>::NotNonfungibleDataUsedToMintFungibleCollectionToken),133 }134}135136impl<T: Config> CommonCollectionOperations<T> for NonfungibleHandle<T> {137 fn create_item(138 &self,139 sender: T::CrossAccountId,140 to: T::CrossAccountId,141 data: up_data_structs::CreateItemData,142 nesting_budget: &dyn Budget,143 ) -> DispatchResultWithPostInfo {144 with_weight(145 <Pallet<T>>::create_item(146 self,147 &sender,148 map_create_data::<T>(data, &to)?,149 nesting_budget,150 ),151 <CommonWeights<T>>::create_item(),152 )153 }154155 fn create_multiple_items(156 &self,157 sender: T::CrossAccountId,158 to: T::CrossAccountId,159 data: Vec<up_data_structs::CreateItemData>,160 nesting_budget: &dyn Budget,161 ) -> DispatchResultWithPostInfo {162 let weight = <CommonWeights<T>>::create_multiple_items(&data);163 let data = data164 .into_iter()165 .map(|d| map_create_data::<T>(d, &to))166 .collect::<Result<Vec<_>, DispatchError>>()?;167168 with_weight(169 <Pallet<T>>::create_multiple_items(self, &sender, data, nesting_budget),170 weight,171 )172 }173174 fn create_multiple_items_ex(175 &self,176 sender: <T>::CrossAccountId,177 data: up_data_structs::CreateItemExData<<T>::CrossAccountId>,178 nesting_budget: &dyn Budget,179 ) -> DispatchResultWithPostInfo {180 let weight = <CommonWeights<T>>::create_multiple_items_ex(&data);181 let data = match data {182 up_data_structs::CreateItemExData::NFT(nft) => nft,183 _ => fail!(Error::<T>::NotNonfungibleDataUsedToMintFungibleCollectionToken),184 };185186 with_weight(187 <Pallet<T>>::create_multiple_items(self, &sender, data.into_inner(), nesting_budget),188 weight,189 )190 }191192 fn set_collection_properties(193 &self,194 sender: T::CrossAccountId,195 properties: Vec<Property>,196 ) -> DispatchResultWithPostInfo {197 let weight = <CommonWeights<T>>::set_collection_properties(properties.len() as u32);198199 with_weight(200 <Pallet<T>>::set_collection_properties(self, &sender, properties),201 weight,202 )203 }204205 fn delete_collection_properties(206 &self,207 sender: &T::CrossAccountId,208 property_keys: Vec<PropertyKey>,209 ) -> DispatchResultWithPostInfo {210 let weight = <CommonWeights<T>>::delete_collection_properties(property_keys.len() as u32);211212 with_weight(213 <Pallet<T>>::delete_collection_properties(self, sender, property_keys),214 weight,215 )216 }217218 fn set_token_properties(219 &self,220 sender: T::CrossAccountId,221 token_id: TokenId,222 properties: Vec<Property>,223 budget: &dyn Budget,224 ) -> DispatchResultWithPostInfo {225 let weight = <CommonWeights<T>>::set_token_properties(properties.len() as u32);226227 with_weight(228 <Pallet<T>>::set_token_properties(self, &sender, token_id, properties, false, budget),229 weight,230 )231 }232233 fn delete_token_properties(234 &self,235 sender: T::CrossAccountId,236 token_id: TokenId,237 property_keys: Vec<PropertyKey>,238 budget: &dyn Budget,239 ) -> DispatchResultWithPostInfo {240 let weight = <CommonWeights<T>>::delete_token_properties(property_keys.len() as u32);241242 with_weight(243 <Pallet<T>>::delete_token_properties(self, &sender, token_id, property_keys, budget),244 weight,245 )246 }247248 fn set_token_property_permissions(249 &self,250 sender: &T::CrossAccountId,251 property_permissions: Vec<PropertyKeyPermission>,252 ) -> DispatchResultWithPostInfo {253 let weight =254 <CommonWeights<T>>::set_token_property_permissions(property_permissions.len() as u32);255256 with_weight(257 <Pallet<T>>::set_token_property_permissions(self, sender, property_permissions),258 weight,259 )260 }261262 fn burn_item(263 &self,264 sender: T::CrossAccountId,265 token: TokenId,266 amount: u128,267 ) -> DispatchResultWithPostInfo {268 ensure!(amount <= 1, <Error<T>>::NonfungibleItemsHaveNoAmount);269 if amount == 1 {270 with_weight(271 <Pallet<T>>::burn(self, &sender, token),272 <CommonWeights<T>>::burn_item(),273 )274 } else {275 Ok(().into())276 }277 }278279 fn burn_item_recursively(280 &self,281 sender: T::CrossAccountId,282 token: TokenId,283 self_budget: &dyn Budget,284 breadth_budget: &dyn Budget,285 ) -> DispatchResultWithPostInfo {286 <Pallet<T>>::burn_recursively(self, &sender, token, self_budget, breadth_budget)287 }288289 fn transfer(290 &self,291 from: T::CrossAccountId,292 to: T::CrossAccountId,293 token: TokenId,294 amount: u128,295 nesting_budget: &dyn Budget,296 ) -> DispatchResultWithPostInfo {297 ensure!(amount <= 1, <Error<T>>::NonfungibleItemsHaveNoAmount);298 if amount == 1 {299 with_weight(300 <Pallet<T>>::transfer(self, &from, &to, token, nesting_budget),301 <CommonWeights<T>>::transfer(),302 )303 } else {304 Ok(().into())305 }306 }307308 fn approve(309 &self,310 sender: T::CrossAccountId,311 spender: T::CrossAccountId,312 token: TokenId,313 amount: u128,314 ) -> DispatchResultWithPostInfo {315 ensure!(amount <= 1, <Error<T>>::NonfungibleItemsHaveNoAmount);316317 with_weight(318 if amount == 1 {319 <Pallet<T>>::set_allowance(self, &sender, token, Some(&spender))320 } else {321 <Pallet<T>>::set_allowance(self, &sender, token, None)322 },323 <CommonWeights<T>>::approve(),324 )325 }326327 fn transfer_from(328 &self,329 sender: T::CrossAccountId,330 from: T::CrossAccountId,331 to: T::CrossAccountId,332 token: TokenId,333 amount: u128,334 nesting_budget: &dyn Budget,335 ) -> DispatchResultWithPostInfo {336 ensure!(amount <= 1, <Error<T>>::NonfungibleItemsHaveNoAmount);337338 if amount == 1 {339 with_weight(340 <Pallet<T>>::transfer_from(self, &sender, &from, &to, token, nesting_budget),341 <CommonWeights<T>>::transfer_from(),342 )343 } else {344 Ok(().into())345 }346 }347348 fn burn_from(349 &self,350 sender: T::CrossAccountId,351 from: T::CrossAccountId,352 token: TokenId,353 amount: u128,354 nesting_budget: &dyn Budget,355 ) -> DispatchResultWithPostInfo {356 ensure!(amount <= 1, <Error<T>>::NonfungibleItemsHaveNoAmount);357358 if amount == 1 {359 with_weight(360 <Pallet<T>>::burn_from(self, &sender, &from, token, nesting_budget),361 <CommonWeights<T>>::burn_from(),362 )363 } else {364 Ok(().into())365 }366 }367368 fn check_nesting(369 &self,370 sender: T::CrossAccountId,371 from: (CollectionId, TokenId),372 under: TokenId,373 budget: &dyn Budget,374 ) -> sp_runtime::DispatchResult {375 <Pallet<T>>::check_nesting(self, sender, from, under, budget)376 }377378 fn nest(&self, under: TokenId, to_nest: (CollectionId, TokenId)) {379 <Pallet<T>>::nest((self.id, under), to_nest);380 }381382 fn unnest(&self, under: TokenId, to_unnest: (CollectionId, TokenId)) {383 <Pallet<T>>::unnest((self.id, under), to_unnest);384 }385386 fn account_tokens(&self, account: T::CrossAccountId) -> Vec<TokenId> {387 <Owned<T>>::iter_prefix((self.id, account))388 .map(|(id, _)| id)389 .collect()390 }391392 fn collection_tokens(&self) -> Vec<TokenId> {393 <TokenData<T>>::iter_prefix((self.id,))394 .map(|(id, _)| id)395 .collect()396 }397398 fn token_exists(&self, token: TokenId) -> bool {399 <Pallet<T>>::token_exists(self, token)400 }401402 fn last_token_id(&self) -> TokenId {403 TokenId(<TokensMinted<T>>::get(self.id))404 }405406 fn token_owner(&self, token: TokenId) -> Option<T::CrossAccountId> {407 <TokenData<T>>::get((self.id, token)).map(|t| t.owner)408 }409410 fn token_property(&self, token_id: TokenId, key: &PropertyKey) -> Option<PropertyValue> {411 <Pallet<T>>::token_properties((self.id, token_id))412 .get(key)413 .cloned()414 }415416 fn token_properties(&self, token_id: TokenId, keys: Option<Vec<PropertyKey>>) -> Vec<Property> {417 let properties = <Pallet<T>>::token_properties((self.id, token_id));418419 keys.map(|keys| {420 keys.into_iter()421 .filter_map(|key| {422 properties.get(&key).map(|value| Property {423 key,424 value: value.clone(),425 })426 })427 .collect()428 })429 .unwrap_or_else(|| {430 properties431 .into_iter()432 .map(|(key, value)| Property { key, value })433 .collect()434 })435 }436437 fn total_supply(&self) -> u32 {438 <Pallet<T>>::total_supply(self)439 }440441 fn account_balance(&self, account: T::CrossAccountId) -> u32 {442 <AccountBalance<T>>::get((self.id, account))443 }444445 fn balance(&self, account: T::CrossAccountId, token: TokenId) -> u128 {446 if <TokenData<T>>::get((self.id, token))447 .map(|a| a.owner == account)448 .unwrap_or(false)449 {450 1451 } else {452 0453 }454 }455456 fn allowance(457 &self,458 sender: T::CrossAccountId,459 spender: T::CrossAccountId,460 token: TokenId,461 ) -> u128 {462 if <TokenData<T>>::get((self.id, token))463 .map(|a| a.owner != sender)464 .unwrap_or(true)465 {466 0467 } else if <Allowance<T>>::get((self.id, token)) == Some(spender) {468 1469 } else {470 0471 }472 }473474 fn refungible_extensions(&self) -> Option<&dyn RefungibleExtensions<T>> {475 None476 }477}pallets/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>)
}
pallets/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));
}
pallets/refungible/src/common.rsdiffbeforeafterboth--- a/pallets/refungible/src/common.rs
+++ b/pallets/refungible/src/common.rs
@@ -314,6 +314,7 @@
_sender: T::CrossAccountId,
_token_id: TokenId,
_property: Vec<Property>,
+ _budget: &dyn Budget,
) -> DispatchResultWithPostInfo {
fail!(<Error<T>>::SettingPropertiesNotAllowed)
}
@@ -331,6 +332,7 @@
_sender: T::CrossAccountId,
_token_id: TokenId,
_property_keys: Vec<PropertyKey>,
+ _budget: &dyn Budget,
) -> DispatchResultWithPostInfo {
fail!(<Error<T>>::SettingPropertiesNotAllowed)
}
pallets/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)]