difftreelog
fix forbid non-1 tokenid in native fungibles (#1015)
in: master
* fix: native fungibles collection * refactor: move FungibleItemsHaveNoId to pallet-common
6 files changed
pallets/balances-adapter/src/common.rsdiffbeforeafterboth--- a/pallets/balances-adapter/src/common.rs
+++ b/pallets/balances-adapter/src/common.rs
@@ -1,9 +1,9 @@
use alloc::{vec, vec::Vec};
use core::marker::PhantomData;
-use frame_support::{fail, weights::Weight};
+use frame_support::{ensure, fail, weights::Weight};
use pallet_balances::{weights::SubstrateWeight as BalancesWeight, WeightInfo};
-use pallet_common::{CommonCollectionOperations, CommonWeightInfo};
+use pallet_common::{CommonCollectionOperations, CommonWeightInfo, Error as CommonError};
use up_data_structs::TokenId;
use crate::{Config, NativeFungibleHandle, Pallet};
@@ -77,7 +77,7 @@
_data: up_data_structs::CreateItemData,
_nesting_budget: &dyn up_data_structs::budget::Budget,
) -> frame_support::pallet_prelude::DispatchResultWithPostInfo {
- fail!(<pallet_common::Error<T>>::UnsupportedOperation);
+ fail!(<CommonError<T>>::UnsupportedOperation);
}
fn create_multiple_items(
@@ -87,7 +87,7 @@
_data: Vec<up_data_structs::CreateItemData>,
_nesting_budget: &dyn up_data_structs::budget::Budget,
) -> frame_support::pallet_prelude::DispatchResultWithPostInfo {
- fail!(<pallet_common::Error<T>>::UnsupportedOperation);
+ fail!(<CommonError<T>>::UnsupportedOperation);
}
fn create_multiple_items_ex(
@@ -96,7 +96,7 @@
_data: up_data_structs::CreateItemExData<<T>::CrossAccountId>,
_nesting_budget: &dyn up_data_structs::budget::Budget,
) -> frame_support::pallet_prelude::DispatchResultWithPostInfo {
- fail!(<pallet_common::Error<T>>::UnsupportedOperation);
+ fail!(<CommonError<T>>::UnsupportedOperation);
}
fn burn_item(
@@ -105,7 +105,7 @@
_token: TokenId,
_amount: u128,
) -> frame_support::pallet_prelude::DispatchResultWithPostInfo {
- fail!(<pallet_common::Error<T>>::UnsupportedOperation);
+ fail!(<CommonError<T>>::UnsupportedOperation);
}
fn set_collection_properties(
@@ -113,7 +113,7 @@
_sender: <T>::CrossAccountId,
_properties: Vec<up_data_structs::Property>,
) -> frame_support::pallet_prelude::DispatchResultWithPostInfo {
- fail!(<pallet_common::Error<T>>::UnsupportedOperation);
+ fail!(<CommonError<T>>::UnsupportedOperation);
}
fn delete_collection_properties(
@@ -121,7 +121,7 @@
_sender: &<T>::CrossAccountId,
_property_keys: Vec<up_data_structs::PropertyKey>,
) -> frame_support::pallet_prelude::DispatchResultWithPostInfo {
- fail!(<pallet_common::Error<T>>::UnsupportedOperation);
+ fail!(<CommonError<T>>::UnsupportedOperation);
}
fn set_token_properties(
@@ -131,7 +131,7 @@
_properties: Vec<up_data_structs::Property>,
_budget: &dyn up_data_structs::budget::Budget,
) -> frame_support::pallet_prelude::DispatchResultWithPostInfo {
- fail!(<pallet_common::Error<T>>::UnsupportedOperation);
+ fail!(<CommonError<T>>::UnsupportedOperation);
}
fn delete_token_properties(
@@ -141,7 +141,7 @@
_property_keys: Vec<up_data_structs::PropertyKey>,
_budget: &dyn up_data_structs::budget::Budget,
) -> frame_support::pallet_prelude::DispatchResultWithPostInfo {
- fail!(<pallet_common::Error<T>>::UnsupportedOperation);
+ fail!(<CommonError<T>>::UnsupportedOperation);
}
fn get_token_properties_raw(
@@ -161,18 +161,23 @@
_sender: &<T>::CrossAccountId,
_property_permissions: Vec<up_data_structs::PropertyKeyPermission>,
) -> frame_support::pallet_prelude::DispatchResultWithPostInfo {
- fail!(<pallet_common::Error<T>>::UnsupportedOperation);
+ fail!(<CommonError<T>>::UnsupportedOperation);
}
fn transfer(
&self,
sender: <T>::CrossAccountId,
to: <T>::CrossAccountId,
- _token: TokenId,
+ token: TokenId,
amount: u128,
- budget: &dyn up_data_structs::budget::Budget,
+ _budget: &dyn up_data_structs::budget::Budget,
) -> frame_support::pallet_prelude::DispatchResultWithPostInfo {
- <Pallet<T>>::transfer(self, &sender, &to, amount, budget)
+ ensure!(
+ token == TokenId::default(),
+ <CommonError<T>>::FungibleItemsHaveNoId
+ );
+
+ <Pallet<T>>::transfer(&sender, &to, amount)
}
fn approve(
@@ -182,7 +187,7 @@
_token: TokenId,
_amount: u128,
) -> frame_support::pallet_prelude::DispatchResultWithPostInfo {
- fail!(<pallet_common::Error<T>>::UnsupportedOperation);
+ fail!(<CommonError<T>>::UnsupportedOperation);
}
fn approve_from(
@@ -193,7 +198,7 @@
_token: TokenId,
_amount: u128,
) -> frame_support::pallet_prelude::DispatchResultWithPostInfo {
- fail!(<pallet_common::Error<T>>::UnsupportedOperation);
+ fail!(<CommonError<T>>::UnsupportedOperation);
}
fn transfer_from(
@@ -201,11 +206,16 @@
sender: <T>::CrossAccountId,
from: <T>::CrossAccountId,
to: <T>::CrossAccountId,
- _token: TokenId,
+ token: TokenId,
amount: u128,
budget: &dyn up_data_structs::budget::Budget,
) -> frame_support::pallet_prelude::DispatchResultWithPostInfo {
- <Pallet<T>>::transfer_from(self, &sender, &from, &to, amount, budget)
+ ensure!(
+ token == TokenId::default(),
+ <CommonError<T>>::FungibleItemsHaveNoId
+ );
+
+ <Pallet<T>>::transfer_from(&sender, &from, &to, amount, budget)
}
fn burn_from(
@@ -216,7 +226,7 @@
_amount: u128,
_budget: &dyn up_data_structs::budget::Budget,
) -> frame_support::pallet_prelude::DispatchResultWithPostInfo {
- fail!(<pallet_common::Error<T>>::UnsupportedOperation);
+ fail!(<CommonError<T>>::UnsupportedOperation);
}
fn check_nesting(
@@ -226,7 +236,7 @@
_under: TokenId,
_budget: &dyn up_data_structs::budget::Budget,
) -> frame_support::sp_runtime::DispatchResult {
- fail!(<pallet_common::Error<T>>::UnsupportedOperation);
+ fail!(<CommonError<T>>::UnsupportedOperation);
}
fn nest(&self, _under: TokenId, _to_nest: (up_data_structs::CollectionId, TokenId)) {}
@@ -332,7 +342,7 @@
_operator: <T>::CrossAccountId,
_approve: bool,
) -> frame_support::pallet_prelude::DispatchResultWithPostInfo {
- fail!(<pallet_common::Error<T>>::UnsupportedOperation);
+ fail!(<CommonError<T>>::UnsupportedOperation);
}
fn allowance_for_all(
@@ -347,6 +357,6 @@
&self,
_token: TokenId,
) -> frame_support::pallet_prelude::DispatchResultWithPostInfo {
- fail!(<pallet_common::Error<T>>::UnsupportedOperation);
+ fail!(<CommonError<T>>::UnsupportedOperation);
}
}
pallets/balances-adapter/src/erc.rsdiffbeforeafterboth--- a/pallets/balances-adapter/src/erc.rs
+++ b/pallets/balances-adapter/src/erc.rs
@@ -58,12 +58,8 @@
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, &budget)
- .map_err(|e| dispatch_to_evm::<T>(e.error))?;
+ <Pallet<T>>::transfer(&caller, &to, amount).map_err(|e| dispatch_to_evm::<T>(e.error))?;
Ok(true)
}
@@ -83,7 +79,7 @@
.recorder()
.weight_calls_budget(<StructureWeight<T>>::find_parent());
- <Pallet<T>>::transfer_from(self, &caller, &from, &to, amount, &budget)
+ <Pallet<T>>::transfer_from(&caller, &from, &to, amount, &budget)
.map_err(|e| dispatch_to_evm::<T>(e.error))?;
Ok(true)
}
@@ -106,12 +102,8 @@
let caller = T::CrossAccountId::from_eth(caller);
let to = to.into_sub_cross_account::<T>()?;
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, &budget)
- .map_err(|e| dispatch_to_evm::<T>(e.error))?;
+ <Pallet<T>>::transfer(&caller, &to, amount).map_err(|e| dispatch_to_evm::<T>(e.error))?;
Ok(true)
}
@@ -137,7 +129,7 @@
.recorder()
.weight_calls_budget(<StructureWeight<T>>::find_parent());
- <Pallet<T>>::transfer_from(self, &caller, &from, &to, amount, &budget)
+ <Pallet<T>>::transfer_from(&caller, &from, &to, amount, &budget)
.map_err(|e| dispatch_to_evm::<T>(e.error))?;
Ok(true)
pallets/balances-adapter/src/lib.rsdiffbeforeafterboth--- a/pallets/balances-adapter/src/lib.rs
+++ b/pallets/balances-adapter/src/lib.rs
@@ -155,20 +155,15 @@
Ok(Self::balance_of(from))
}
- /// Transfers the specified amount of tokens. Will check that
- /// the transfer is allowed for the token.
+ /// Transfers the specified amount of tokens.
///
- /// - `collection`: Collection that contains the token.
/// - `from`: Owner of tokens to transfer.
/// - `to`: Recepient of transfered tokens.
/// - `amount`: Amount of tokens to transfer.
- /// - `nesting_budget`: Limit for searching parents in-depth to check ownership.
pub fn transfer(
- _collection: &NativeFungibleHandle<T>,
from: &T::CrossAccountId,
to: &T::CrossAccountId,
amount: u128,
- _nesting_budget: &dyn Budget,
) -> DispatchResultWithPostInfo {
<PalletCommon<T>>::ensure_correct_receiver(to)?;
@@ -185,19 +180,18 @@
})
}
- /// Transfer NFT token from one account to another.
+ /// Transfer tokens from one account to another.
///
- /// Same as the [`Self::transfer`] but spender doesn't needs to be the owner of the token.
- /// The owner should set allowance for the spender to transfer token.
+ /// Same as the [`Self::transfer`] but the spender doesn't needs to be the direct owner of the token.
+ /// The spender must be allowed to transfer token.
+ /// If the tokens are nested in an NFT and the spender owns the NFT, the allowance is considered to be set.
///
- /// - `collection`: Collection that contains the token.
/// - `spender`: Account that spend the money.
/// - `from`: Owner of tokens to transfer.
/// - `to`: Recepient of transfered tokens.
/// - `amount`: Amount of tokens to transfer.
/// - `nesting_budget`: Limit for searching parents in-depth to check ownership.
pub fn transfer_from(
- collection: &NativeFungibleHandle<T>,
spender: &T::CrossAccountId,
from: &T::CrossAccountId,
to: &T::CrossAccountId,
@@ -208,7 +202,7 @@
if allowance < amount {
return Err(<CommonError<T>>::ApprovedValueTooLow.into());
}
- Self::transfer(collection, from, to, amount, nesting_budget)
+ Self::transfer(from, to, amount)
}
}
}
pallets/common/src/lib.rsdiffbeforeafterboth--- a/pallets/common/src/lib.rs
+++ b/pallets/common/src/lib.rs
@@ -783,6 +783,9 @@
/// The user is not an administrator.
UserIsNotCollectionAdmin,
+
+ /// Fungible tokens hold no ID, and the default value of TokenId for a fungible collection is 0.
+ FungibleItemsHaveNoId,
}
/// Storage of the count of created collections. Essentially contains the last collection ID.
pallets/fungible/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 pallet_common::{21 weights::WeightInfo as _, with_weight, CommonCollectionOperations, CommonWeightInfo,22 RefungibleExtensions, SelfWeightOf as PalletCommonWeightOf,23};24use sp_runtime::{ArithmeticError, DispatchError};25use sp_std::{vec, vec::Vec};26use up_data_structs::{27 budget::Budget, CollectionId, CreateItemData, CreateItemExData, Property, PropertyKey,28 PropertyKeyPermission, PropertyValue, TokenId, TokenOwnerError,29};3031use crate::{32 weights::WeightInfo, Allowance, Balance, Config, Error, FungibleHandle, Pallet, SelfWeightOf,33 TotalSupply,34};3536pub struct CommonWeights<T: Config>(PhantomData<T>);37impl<T: Config> CommonWeightInfo<T::CrossAccountId> for CommonWeights<T> {38 fn create_multiple_items(_data: &[CreateItemData]) -> Weight {39 // All items minted for the same user, so it works same as create_item40 <SelfWeightOf<T>>::create_item()41 }4243 fn create_multiple_items_ex(data: &CreateItemExData<T::CrossAccountId>) -> Weight {44 match data {45 CreateItemExData::Fungible(f) => {46 <SelfWeightOf<T>>::create_multiple_items_ex(f.len() as u32)47 }48 _ => Weight::zero(),49 }50 }5152 fn burn_item() -> Weight {53 <SelfWeightOf<T>>::burn_item()54 }5556 fn set_collection_properties(amount: u32) -> Weight {57 <pallet_common::SelfWeightOf<T>>::set_collection_properties(amount)58 }5960 fn set_token_properties(_amount: u32) -> Weight {61 // Error62 Weight::zero()63 }6465 fn set_token_property_permissions(_amount: u32) -> Weight {66 // Error67 Weight::zero()68 }6970 fn transfer() -> Weight {71 <SelfWeightOf<T>>::transfer_raw()72 .saturating_add(<PalletCommonWeightOf<T>>::check_accesslist().saturating_mul(2))73 }7475 fn approve() -> Weight {76 <SelfWeightOf<T>>::approve()77 }7879 fn approve_from() -> Weight {80 <SelfWeightOf<T>>::approve_from()81 }8283 fn transfer_from() -> Weight {84 Self::transfer()85 .saturating_add(<SelfWeightOf<T>>::check_allowed_raw())86 .saturating_add(<SelfWeightOf<T>>::set_allowance_unchecked_raw())87 }8889 fn burn_from() -> Weight {90 <SelfWeightOf<T>>::burn_from()91 }9293 fn set_allowance_for_all() -> Weight {94 Weight::zero()95 }9697 fn force_repair_item() -> Weight {98 Weight::zero()99 }100}101102/// Implementation of `CommonCollectionOperations` for `FungibleHandle`. It wraps FungibleHandle Pallete103/// methods and adds weight info.104impl<T: Config> CommonCollectionOperations<T> for FungibleHandle<T> {105 fn create_item(106 &self,107 sender: T::CrossAccountId,108 to: T::CrossAccountId,109 data: up_data_structs::CreateItemData,110 nesting_budget: &dyn Budget,111 ) -> DispatchResultWithPostInfo {112 match &data {113 up_data_structs::CreateItemData::Fungible(fungible_data) => with_weight(114 <Pallet<T>>::create_item(self, &sender, (to, fungible_data.value), nesting_budget),115 <CommonWeights<T>>::create_item(&data),116 ),117 _ => fail!(<Error<T>>::NotFungibleDataUsedToMintFungibleCollectionToken),118 }119 }120121 fn create_multiple_items(122 &self,123 sender: T::CrossAccountId,124 to: T::CrossAccountId,125 data: Vec<up_data_structs::CreateItemData>,126 nesting_budget: &dyn Budget,127 ) -> DispatchResultWithPostInfo {128 let mut sum: u128 = 0;129 for data in &data {130 match &data {131 up_data_structs::CreateItemData::Fungible(data) => {132 sum = sum133 .checked_add(data.value)134 .ok_or(ArithmeticError::Overflow)?;135 }136 _ => fail!(<Error<T>>::NotFungibleDataUsedToMintFungibleCollectionToken),137 }138 }139140 with_weight(141 <Pallet<T>>::create_item(self, &sender, (to, sum), nesting_budget),142 <CommonWeights<T>>::create_multiple_items(&data),143 )144 }145146 fn create_multiple_items_ex(147 &self,148 sender: <T>::CrossAccountId,149 data: up_data_structs::CreateItemExData<<T>::CrossAccountId>,150 nesting_budget: &dyn Budget,151 ) -> DispatchResultWithPostInfo {152 let weight = <CommonWeights<T>>::create_multiple_items_ex(&data);153 let data = match data {154 up_data_structs::CreateItemExData::Fungible(f) => f,155 _ => fail!(<Error<T>>::NotFungibleDataUsedToMintFungibleCollectionToken),156 };157158 with_weight(159 <Pallet<T>>::create_multiple_items(self, &sender, data.into_inner(), nesting_budget),160 weight,161 )162 }163164 fn burn_item(165 &self,166 sender: T::CrossAccountId,167 token: TokenId,168 amount: u128,169 ) -> DispatchResultWithPostInfo {170 ensure!(171 token == TokenId::default(),172 <Error<T>>::FungibleItemsHaveNoId173 );174175 with_weight(176 <Pallet<T>>::burn(self, &sender, amount),177 <CommonWeights<T>>::burn_item(),178 )179 }180181 fn transfer(182 &self,183 from: T::CrossAccountId,184 to: T::CrossAccountId,185 token: TokenId,186 amount: u128,187 nesting_budget: &dyn Budget,188 ) -> DispatchResultWithPostInfo {189 ensure!(190 token == TokenId::default(),191 <Error<T>>::FungibleItemsHaveNoId192 );193194 <Pallet<T>>::transfer(self, &from, &to, amount, nesting_budget)195 }196197 fn approve(198 &self,199 sender: T::CrossAccountId,200 spender: T::CrossAccountId,201 token: TokenId,202 amount: u128,203 ) -> DispatchResultWithPostInfo {204 ensure!(205 token == TokenId::default(),206 <Error<T>>::FungibleItemsHaveNoId207 );208209 with_weight(210 <Pallet<T>>::set_allowance(self, &sender, &spender, amount),211 <CommonWeights<T>>::approve(),212 )213 }214215 fn approve_from(216 &self,217 sender: T::CrossAccountId,218 from: T::CrossAccountId,219 to: T::CrossAccountId,220 token: TokenId,221 amount: u128,222 ) -> DispatchResultWithPostInfo {223 ensure!(224 token == TokenId::default(),225 <Error<T>>::FungibleItemsHaveNoId226 );227228 with_weight(229 <Pallet<T>>::set_allowance_from(self, &sender, &from, &to, amount),230 <CommonWeights<T>>::approve_from(),231 )232 }233234 fn transfer_from(235 &self,236 sender: T::CrossAccountId,237 from: T::CrossAccountId,238 to: T::CrossAccountId,239 token: TokenId,240 amount: u128,241 nesting_budget: &dyn Budget,242 ) -> DispatchResultWithPostInfo {243 ensure!(244 token == TokenId::default(),245 <Error<T>>::FungibleItemsHaveNoId246 );247248 <Pallet<T>>::transfer_from(self, &sender, &from, &to, amount, nesting_budget)249 }250251 fn burn_from(252 &self,253 sender: T::CrossAccountId,254 from: T::CrossAccountId,255 token: TokenId,256 amount: u128,257 nesting_budget: &dyn Budget,258 ) -> DispatchResultWithPostInfo {259 ensure!(260 token == TokenId::default(),261 <Error<T>>::FungibleItemsHaveNoId262 );263264 with_weight(265 <Pallet<T>>::burn_from(self, &sender, &from, amount, nesting_budget),266 <CommonWeights<T>>::burn_from(),267 )268 }269270 fn set_collection_properties(271 &self,272 sender: T::CrossAccountId,273 properties: Vec<Property>,274 ) -> DispatchResultWithPostInfo {275 let weight = <CommonWeights<T>>::set_collection_properties(properties.len() as u32);276277 with_weight(278 <Pallet<T>>::set_collection_properties(self, &sender, properties),279 weight,280 )281 }282283 fn delete_collection_properties(284 &self,285 sender: &T::CrossAccountId,286 property_keys: Vec<PropertyKey>,287 ) -> DispatchResultWithPostInfo {288 let weight = <CommonWeights<T>>::delete_collection_properties(property_keys.len() as u32);289290 with_weight(291 <Pallet<T>>::delete_collection_properties(self, sender, property_keys),292 weight,293 )294 }295296 fn set_token_properties(297 &self,298 _sender: T::CrossAccountId,299 _token_id: TokenId,300 _property: Vec<Property>,301 _nesting_budget: &dyn Budget,302 ) -> DispatchResultWithPostInfo {303 fail!(<Error<T>>::SettingPropertiesNotAllowed)304 }305306 fn set_token_property_permissions(307 &self,308 _sender: &T::CrossAccountId,309 _property_permissions: Vec<PropertyKeyPermission>,310 ) -> DispatchResultWithPostInfo {311 fail!(<Error<T>>::SettingPropertiesNotAllowed)312 }313314 fn delete_token_properties(315 &self,316 _sender: T::CrossAccountId,317 _token_id: TokenId,318 _property_keys: Vec<PropertyKey>,319 _nesting_budget: &dyn Budget,320 ) -> DispatchResultWithPostInfo {321 fail!(<Error<T>>::SettingPropertiesNotAllowed)322 }323324 fn get_token_properties_raw(325 &self,326 _token_id: TokenId,327 ) -> Option<up_data_structs::TokenProperties> {328 // No token properties are defined on fungibles329 None330 }331332 fn set_token_properties_raw(&self, _token_id: TokenId, _map: up_data_structs::TokenProperties) {333 // No token properties are defined on fungibles334 }335336 fn check_nesting(337 &self,338 _sender: &<T>::CrossAccountId,339 _from: (CollectionId, TokenId),340 _under: TokenId,341 _nesting_budget: &dyn Budget,342 ) -> sp_runtime::DispatchResult {343 fail!(<Error<T>>::FungibleDisallowsNesting)344 }345346 fn nest(&self, _under: TokenId, _to_nest: (CollectionId, TokenId)) {}347348 fn unnest(&self, _under: TokenId, _to_nest: (CollectionId, TokenId)) {}349350 fn collection_tokens(&self) -> Vec<TokenId> {351 vec![TokenId::default()]352 }353354 fn account_tokens(&self, account: T::CrossAccountId) -> Vec<TokenId> {355 if <Balance<T>>::get((self.id, account)) != 0 {356 vec![TokenId::default()]357 } else {358 vec![]359 }360 }361362 fn token_exists(&self, token: TokenId) -> bool {363 token == TokenId::default()364 }365366 fn last_token_id(&self) -> TokenId {367 TokenId::default()368 }369370 fn token_owner(&self, _token: TokenId) -> Result<T::CrossAccountId, TokenOwnerError> {371 Err(TokenOwnerError::MultipleOwners)372 }373374 fn check_token_indirect_owner(375 &self,376 _token: TokenId,377 _maybe_owner: &T::CrossAccountId,378 _nesting_budget: &dyn Budget,379 ) -> Result<bool, DispatchError> {380 Ok(false)381 }382383 /// Returns 10 tokens owners in no particular order.384 fn token_owners(&self, token: TokenId) -> Vec<T::CrossAccountId> {385 <Pallet<T>>::token_owners(self.id, token).unwrap_or_default()386 }387388 fn token_property(&self, _token_id: TokenId, _key: &PropertyKey) -> Option<PropertyValue> {389 None390 }391392 fn token_properties(393 &self,394 _token_id: TokenId,395 _keys: Option<Vec<PropertyKey>>,396 ) -> Vec<Property> {397 Vec::new()398 }399400 fn total_supply(&self) -> u32 {401 1402 }403404 fn account_balance(&self, account: T::CrossAccountId) -> u32 {405 if <Balance<T>>::get((self.id, account)) != 0 {406 1407 } else {408 0409 }410 }411412 fn balance(&self, account: T::CrossAccountId, token: TokenId) -> u128 {413 if token != TokenId::default() {414 return 0;415 }416 <Balance<T>>::get((self.id, account))417 }418419 fn allowance(420 &self,421 sender: T::CrossAccountId,422 spender: T::CrossAccountId,423 token: TokenId,424 ) -> u128 {425 if token != TokenId::default() {426 return 0;427 }428 <Allowance<T>>::get((self.id, sender, spender))429 }430431 fn refungible_extensions(&self) -> Option<&dyn RefungibleExtensions<T>> {432 None433 }434435 fn total_pieces(&self, token: TokenId) -> Option<u128> {436 if token != TokenId::default() {437 return None;438 }439 <TotalSupply<T>>::try_get(self.id).ok()440 }441442 fn set_allowance_for_all(443 &self,444 _owner: T::CrossAccountId,445 _operator: T::CrossAccountId,446 _approve: bool,447 ) -> DispatchResultWithPostInfo {448 fail!(<Error<T>>::SettingAllowanceForAllNotAllowed)449 }450451 fn allowance_for_all(&self, _owner: T::CrossAccountId, _operator: T::CrossAccountId) -> bool {452 false453 }454455 /// Repairs a possibly broken item.456 fn repair_item(&self, _token: TokenId) -> DispatchResultWithPostInfo {457 fail!(<Error<T>>::FungibleTokensAreAlwaysValid)458 }459}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 pallet_common::{21 weights::WeightInfo as _, with_weight, CommonCollectionOperations, CommonWeightInfo,22 Error as CommonError, RefungibleExtensions, SelfWeightOf as PalletCommonWeightOf,23};24use sp_runtime::{ArithmeticError, DispatchError};25use sp_std::{vec, vec::Vec};26use up_data_structs::{27 budget::Budget, CollectionId, CreateItemData, CreateItemExData, Property, PropertyKey,28 PropertyKeyPermission, PropertyValue, TokenId, TokenOwnerError,29};3031use crate::{32 weights::WeightInfo, Allowance, Balance, Config, Error, FungibleHandle, Pallet, SelfWeightOf,33 TotalSupply,34};3536pub struct CommonWeights<T: Config>(PhantomData<T>);37impl<T: Config> CommonWeightInfo<T::CrossAccountId> for CommonWeights<T> {38 fn create_multiple_items(_data: &[CreateItemData]) -> Weight {39 // All items minted for the same user, so it works same as create_item40 <SelfWeightOf<T>>::create_item()41 }4243 fn create_multiple_items_ex(data: &CreateItemExData<T::CrossAccountId>) -> Weight {44 match data {45 CreateItemExData::Fungible(f) => {46 <SelfWeightOf<T>>::create_multiple_items_ex(f.len() as u32)47 }48 _ => Weight::zero(),49 }50 }5152 fn burn_item() -> Weight {53 <SelfWeightOf<T>>::burn_item()54 }5556 fn set_collection_properties(amount: u32) -> Weight {57 <pallet_common::SelfWeightOf<T>>::set_collection_properties(amount)58 }5960 fn set_token_properties(_amount: u32) -> Weight {61 // Error62 Weight::zero()63 }6465 fn set_token_property_permissions(_amount: u32) -> Weight {66 // Error67 Weight::zero()68 }6970 fn transfer() -> Weight {71 <SelfWeightOf<T>>::transfer_raw()72 .saturating_add(<PalletCommonWeightOf<T>>::check_accesslist().saturating_mul(2))73 }7475 fn approve() -> Weight {76 <SelfWeightOf<T>>::approve()77 }7879 fn approve_from() -> Weight {80 <SelfWeightOf<T>>::approve_from()81 }8283 fn transfer_from() -> Weight {84 Self::transfer()85 .saturating_add(<SelfWeightOf<T>>::check_allowed_raw())86 .saturating_add(<SelfWeightOf<T>>::set_allowance_unchecked_raw())87 }8889 fn burn_from() -> Weight {90 <SelfWeightOf<T>>::burn_from()91 }9293 fn set_allowance_for_all() -> Weight {94 Weight::zero()95 }9697 fn force_repair_item() -> Weight {98 Weight::zero()99 }100}101102/// Implementation of `CommonCollectionOperations` for `FungibleHandle`. It wraps FungibleHandle Pallete103/// methods and adds weight info.104impl<T: Config> CommonCollectionOperations<T> for FungibleHandle<T> {105 fn create_item(106 &self,107 sender: T::CrossAccountId,108 to: T::CrossAccountId,109 data: up_data_structs::CreateItemData,110 nesting_budget: &dyn Budget,111 ) -> DispatchResultWithPostInfo {112 match &data {113 up_data_structs::CreateItemData::Fungible(fungible_data) => with_weight(114 <Pallet<T>>::create_item(self, &sender, (to, fungible_data.value), nesting_budget),115 <CommonWeights<T>>::create_item(&data),116 ),117 _ => fail!(<Error<T>>::NotFungibleDataUsedToMintFungibleCollectionToken),118 }119 }120121 fn create_multiple_items(122 &self,123 sender: T::CrossAccountId,124 to: T::CrossAccountId,125 data: Vec<up_data_structs::CreateItemData>,126 nesting_budget: &dyn Budget,127 ) -> DispatchResultWithPostInfo {128 let mut sum: u128 = 0;129 for data in &data {130 match &data {131 up_data_structs::CreateItemData::Fungible(data) => {132 sum = sum133 .checked_add(data.value)134 .ok_or(ArithmeticError::Overflow)?;135 }136 _ => fail!(<Error<T>>::NotFungibleDataUsedToMintFungibleCollectionToken),137 }138 }139140 with_weight(141 <Pallet<T>>::create_item(self, &sender, (to, sum), nesting_budget),142 <CommonWeights<T>>::create_multiple_items(&data),143 )144 }145146 fn create_multiple_items_ex(147 &self,148 sender: <T>::CrossAccountId,149 data: up_data_structs::CreateItemExData<<T>::CrossAccountId>,150 nesting_budget: &dyn Budget,151 ) -> DispatchResultWithPostInfo {152 let weight = <CommonWeights<T>>::create_multiple_items_ex(&data);153 let data = match data {154 up_data_structs::CreateItemExData::Fungible(f) => f,155 _ => fail!(<Error<T>>::NotFungibleDataUsedToMintFungibleCollectionToken),156 };157158 with_weight(159 <Pallet<T>>::create_multiple_items(self, &sender, data.into_inner(), nesting_budget),160 weight,161 )162 }163164 fn burn_item(165 &self,166 sender: T::CrossAccountId,167 token: TokenId,168 amount: u128,169 ) -> DispatchResultWithPostInfo {170 ensure!(171 token == TokenId::default(),172 <CommonError<T>>::FungibleItemsHaveNoId173 );174175 with_weight(176 <Pallet<T>>::burn(self, &sender, amount),177 <CommonWeights<T>>::burn_item(),178 )179 }180181 fn transfer(182 &self,183 from: T::CrossAccountId,184 to: T::CrossAccountId,185 token: TokenId,186 amount: u128,187 nesting_budget: &dyn Budget,188 ) -> DispatchResultWithPostInfo {189 ensure!(190 token == TokenId::default(),191 <CommonError<T>>::FungibleItemsHaveNoId192 );193194 <Pallet<T>>::transfer(self, &from, &to, amount, nesting_budget)195 }196197 fn approve(198 &self,199 sender: T::CrossAccountId,200 spender: T::CrossAccountId,201 token: TokenId,202 amount: u128,203 ) -> DispatchResultWithPostInfo {204 ensure!(205 token == TokenId::default(),206 <CommonError<T>>::FungibleItemsHaveNoId207 );208209 with_weight(210 <Pallet<T>>::set_allowance(self, &sender, &spender, amount),211 <CommonWeights<T>>::approve(),212 )213 }214215 fn approve_from(216 &self,217 sender: T::CrossAccountId,218 from: T::CrossAccountId,219 to: T::CrossAccountId,220 token: TokenId,221 amount: u128,222 ) -> DispatchResultWithPostInfo {223 ensure!(224 token == TokenId::default(),225 <CommonError<T>>::FungibleItemsHaveNoId226 );227228 with_weight(229 <Pallet<T>>::set_allowance_from(self, &sender, &from, &to, amount),230 <CommonWeights<T>>::approve_from(),231 )232 }233234 fn transfer_from(235 &self,236 sender: T::CrossAccountId,237 from: T::CrossAccountId,238 to: T::CrossAccountId,239 token: TokenId,240 amount: u128,241 nesting_budget: &dyn Budget,242 ) -> DispatchResultWithPostInfo {243 ensure!(244 token == TokenId::default(),245 <CommonError<T>>::FungibleItemsHaveNoId246 );247248 <Pallet<T>>::transfer_from(self, &sender, &from, &to, amount, nesting_budget)249 }250251 fn burn_from(252 &self,253 sender: T::CrossAccountId,254 from: T::CrossAccountId,255 token: TokenId,256 amount: u128,257 nesting_budget: &dyn Budget,258 ) -> DispatchResultWithPostInfo {259 ensure!(260 token == TokenId::default(),261 <CommonError<T>>::FungibleItemsHaveNoId262 );263264 with_weight(265 <Pallet<T>>::burn_from(self, &sender, &from, amount, nesting_budget),266 <CommonWeights<T>>::burn_from(),267 )268 }269270 fn set_collection_properties(271 &self,272 sender: T::CrossAccountId,273 properties: Vec<Property>,274 ) -> DispatchResultWithPostInfo {275 let weight = <CommonWeights<T>>::set_collection_properties(properties.len() as u32);276277 with_weight(278 <Pallet<T>>::set_collection_properties(self, &sender, properties),279 weight,280 )281 }282283 fn delete_collection_properties(284 &self,285 sender: &T::CrossAccountId,286 property_keys: Vec<PropertyKey>,287 ) -> DispatchResultWithPostInfo {288 let weight = <CommonWeights<T>>::delete_collection_properties(property_keys.len() as u32);289290 with_weight(291 <Pallet<T>>::delete_collection_properties(self, sender, property_keys),292 weight,293 )294 }295296 fn set_token_properties(297 &self,298 _sender: T::CrossAccountId,299 _token_id: TokenId,300 _property: Vec<Property>,301 _nesting_budget: &dyn Budget,302 ) -> DispatchResultWithPostInfo {303 fail!(<Error<T>>::SettingPropertiesNotAllowed)304 }305306 fn set_token_property_permissions(307 &self,308 _sender: &T::CrossAccountId,309 _property_permissions: Vec<PropertyKeyPermission>,310 ) -> DispatchResultWithPostInfo {311 fail!(<Error<T>>::SettingPropertiesNotAllowed)312 }313314 fn delete_token_properties(315 &self,316 _sender: T::CrossAccountId,317 _token_id: TokenId,318 _property_keys: Vec<PropertyKey>,319 _nesting_budget: &dyn Budget,320 ) -> DispatchResultWithPostInfo {321 fail!(<Error<T>>::SettingPropertiesNotAllowed)322 }323324 fn get_token_properties_raw(325 &self,326 _token_id: TokenId,327 ) -> Option<up_data_structs::TokenProperties> {328 // No token properties are defined on fungibles329 None330 }331332 fn set_token_properties_raw(&self, _token_id: TokenId, _map: up_data_structs::TokenProperties) {333 // No token properties are defined on fungibles334 }335336 fn check_nesting(337 &self,338 _sender: &<T>::CrossAccountId,339 _from: (CollectionId, TokenId),340 _under: TokenId,341 _nesting_budget: &dyn Budget,342 ) -> sp_runtime::DispatchResult {343 fail!(<Error<T>>::FungibleDisallowsNesting)344 }345346 fn nest(&self, _under: TokenId, _to_nest: (CollectionId, TokenId)) {}347348 fn unnest(&self, _under: TokenId, _to_nest: (CollectionId, TokenId)) {}349350 fn collection_tokens(&self) -> Vec<TokenId> {351 vec![TokenId::default()]352 }353354 fn account_tokens(&self, account: T::CrossAccountId) -> Vec<TokenId> {355 if <Balance<T>>::get((self.id, account)) != 0 {356 vec![TokenId::default()]357 } else {358 vec![]359 }360 }361362 fn token_exists(&self, token: TokenId) -> bool {363 token == TokenId::default()364 }365366 fn last_token_id(&self) -> TokenId {367 TokenId::default()368 }369370 fn token_owner(&self, _token: TokenId) -> Result<T::CrossAccountId, TokenOwnerError> {371 Err(TokenOwnerError::MultipleOwners)372 }373374 fn check_token_indirect_owner(375 &self,376 _token: TokenId,377 _maybe_owner: &T::CrossAccountId,378 _nesting_budget: &dyn Budget,379 ) -> Result<bool, DispatchError> {380 Ok(false)381 }382383 /// Returns 10 tokens owners in no particular order.384 fn token_owners(&self, token: TokenId) -> Vec<T::CrossAccountId> {385 <Pallet<T>>::token_owners(self.id, token).unwrap_or_default()386 }387388 fn token_property(&self, _token_id: TokenId, _key: &PropertyKey) -> Option<PropertyValue> {389 None390 }391392 fn token_properties(393 &self,394 _token_id: TokenId,395 _keys: Option<Vec<PropertyKey>>,396 ) -> Vec<Property> {397 Vec::new()398 }399400 fn total_supply(&self) -> u32 {401 1402 }403404 fn account_balance(&self, account: T::CrossAccountId) -> u32 {405 if <Balance<T>>::get((self.id, account)) != 0 {406 1407 } else {408 0409 }410 }411412 fn balance(&self, account: T::CrossAccountId, token: TokenId) -> u128 {413 if token != TokenId::default() {414 return 0;415 }416 <Balance<T>>::get((self.id, account))417 }418419 fn allowance(420 &self,421 sender: T::CrossAccountId,422 spender: T::CrossAccountId,423 token: TokenId,424 ) -> u128 {425 if token != TokenId::default() {426 return 0;427 }428 <Allowance<T>>::get((self.id, sender, spender))429 }430431 fn refungible_extensions(&self) -> Option<&dyn RefungibleExtensions<T>> {432 None433 }434435 fn total_pieces(&self, token: TokenId) -> Option<u128> {436 if token != TokenId::default() {437 return None;438 }439 <TotalSupply<T>>::try_get(self.id).ok()440 }441442 fn set_allowance_for_all(443 &self,444 _owner: T::CrossAccountId,445 _operator: T::CrossAccountId,446 _approve: bool,447 ) -> DispatchResultWithPostInfo {448 fail!(<Error<T>>::SettingAllowanceForAllNotAllowed)449 }450451 fn allowance_for_all(&self, _owner: T::CrossAccountId, _operator: T::CrossAccountId) -> bool {452 false453 }454455 /// Repairs a possibly broken item.456 fn repair_item(&self, _token: TokenId) -> DispatchResultWithPostInfo {457 fail!(<Error<T>>::FungibleTokensAreAlwaysValid)458 }459}pallets/fungible/src/lib.rsdiffbeforeafterboth--- a/pallets/fungible/src/lib.rs
+++ b/pallets/fungible/src/lib.rs
@@ -123,8 +123,6 @@
pub enum Error<T> {
/// Not Fungible item data used to mint in Fungible collection.
NotFungibleDataUsedToMintFungibleCollectionToken,
- /// Fungible tokens hold no ID, and the default value of TokenId for Fungible collection is 0.
- FungibleItemsHaveNoId,
/// Tried to set data for fungible item.
FungibleItemsDontHaveData,
/// Fungible token does not support nesting.