difftreelog
refactor move foreign flag to collection struct
in: master
9 files changed
Cargo.lockdiffbeforeafterboth--- a/Cargo.lock
+++ b/Cargo.lock
@@ -697,6 +697,26 @@
]
[[package]]
+name = "bondrewd"
+version = "0.1.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d1660fac8d3acced44dac64453fafedf5aab2de196b932c727e63e4ae42d1cc"
+dependencies = [
+ "bondrewd-derive",
+]
+
+[[package]]
+name = "bondrewd-derive"
+version = "0.3.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "723da0dee1eef38edc021b0793f892bdc024500c6a5b0727a2efe16f0e0a6977"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
name = "bounded-vec"
version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -5892,6 +5912,7 @@
name = "pallet-foreign-assets"
version = "0.1.0"
dependencies = [
+ "frame-benchmarking",
"frame-support",
"frame-system",
"hex",
@@ -6600,7 +6621,7 @@
[[package]]
name = "pallet-unique"
-version = "0.1.4"
+version = "0.2.0"
dependencies = [
"ethereum",
"evm-coder",
@@ -12634,6 +12655,7 @@
name = "up-data-structs"
version = "0.2.2"
dependencies = [
+ "bondrewd",
"derivative",
"frame-support",
"frame-system",
pallets/common/src/lib.rsdiffbeforeafterboth--- a/pallets/common/src/lib.rs
+++ b/pallets/common/src/lib.rs
@@ -70,6 +70,7 @@
COLLECTION_NUMBER_LIMIT,
Collection,
RpcCollection,
+ CollectionFlags,
CollectionId,
CreateItemData,
MAX_TOKEN_PREFIX_LENGTH,
@@ -252,9 +253,9 @@
}
/// Checks that the collection was created with, and must be operated upon through **Unique API**.
- /// Now check only the `external_collection` flag and if it's **true**, then return [`Error::CollectionIsExternal`] error.
+ /// Now check only the `external` flag and if it's **true**, then return [`Error::CollectionIsExternal`] error.
pub fn check_is_internal(&self) -> DispatchResult {
- if self.external_collection {
+ if self.flags.external {
return Err(<Error<T>>::CollectionIsExternal)?;
}
@@ -262,9 +263,9 @@
}
/// Checks that the collection was created with, and must be operated upon through an **assimilated API**.
- /// Now check only the `external_collection` flag and if it's **false**, then return [`Error::CollectionIsInternal`] error.
+ /// Now check only the `external` flag and if it's **false**, then return [`Error::CollectionIsInternal`] error.
pub fn check_is_external(&self) -> DispatchResult {
- if !self.external_collection {
+ if !self.flags.external {
return Err(<Error<T>>::CollectionIsInternal)?;
}
@@ -345,7 +346,7 @@
use frame_support::{Blake2_128Concat, pallet_prelude::*, storage::Key, traits::StorageVersion};
use frame_system::pallet_prelude::*;
use frame_support::traits::Currency;
- use up_data_structs::{TokenId, mapping::TokenAddressMapping};
+ use up_data_structs::{TokenId, mapping::TokenAddressMapping, CollectionFlags};
use scale_info::TypeInfo;
use weights::WeightInfo;
@@ -792,7 +793,7 @@
sponsorship,
limits,
permissions,
- external_collection,
+ flags,
} = <CollectionById<T>>::get(collection)?;
let token_property_permissions = <CollectionPropertyPermissions<T>>::get(collection)
@@ -822,7 +823,8 @@
permissions,
token_property_permissions,
properties,
- read_only: external_collection,
+ read_only: flags.external,
+ foreign: flags.foreign,
})
}
}
@@ -861,11 +863,11 @@
///
/// * `owner` - The owner of the collection.
/// * `data` - Description of the created collection.
- /// * `is_external` - Marks that collection managet by not "Unique network".
+ /// * `flags` - Extra flags to store.
pub fn init_collection(
owner: T::CrossAccountId,
data: CreateCollectionData<T::AccountId>,
- is_external: bool,
+ flags: CollectionFlags,
) -> Result<CollectionId, DispatchError> {
{
ensure!(
@@ -909,7 +911,7 @@
Self::clamp_permissions(data.mode.clone(), &Default::default(), permissions)
})
.unwrap_or_else(|| Ok(CollectionPermissions::default()))?,
- external_collection: is_external,
+ flags,
};
let mut collection_properties = up_data_structs::CollectionProperties::get();
pallets/fungible/src/lib.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/>.1617//! # Fungible Pallet18//!19//! The Fungible pallet provides functionality for dealing with fungible assets.20//!21//! - [`CreateItemData`]22//! - [`Config`]23//! - [`FungibleHandle`]24//! - [`Pallet`]25//! - [`TotalSupply`]26//! - [`Balance`]27//! - [`Allowance`]28//! - [`Error`]29//!30//! ## Fungible tokens31//!32//! Fungible tokens or assets are divisible and non-unique. For instance,33//! fiat currencies like the dollar are fungible: A $1 bill34//! in New York City has the same value as a $1 bill in Miami.35//! A fungible token can also be a cryptocurrency like Bitcoin: 1 BTC is worth 1 BTC,36//! no matter where it is issued. Thus, the fungibility refers to a specific currency’s37//! ability to maintain one standard value. As well, it needs to have uniform acceptance.38//! This means that a currency’s history should not be able to affect its value,39//! and this is due to the fact that each piece that is a part of the currency is equal40//! in value when compared to every other piece of that exact same currency.41//! In the world of cryptocurrencies, this is essentially a coin or a token42//! that can be replaced by another identical coin or token, and they are43//! both mutually interchangeable. A popular implementation of fungible tokens is44//! the ERC-20 token standard.45//!46//! ### ERC-2047//!48//! The [ERC-20](https://ethereum.org/en/developers/docs/standards/tokens/erc-20/) (Ethereum Request for Comments 20), proposed by Fabian Vogelsteller in November 2015,49//! is a Token Standard that implements an API for tokens within Smart Contracts.50//!51//! Example functionalities ERC-20 provides:52//!53//! * transfer tokens from one account to another54//! * get the current token balance of an account55//! * get the total supply of the token available on the network56//! * approve whether an amount of token from an account can be spent by a third-party account57//!58//! ## Overview59//!60//! The module provides functionality for asset management of fungible asset, supports ERC-20 standart, includes:61//!62//! * Asset Issuance63//! * Asset Transferal64//! * Asset Destruction65//! * Delegated Asset Transfers66//!67//! **NOTE:** The created fungible asset always has `token_id` = 0.68//! So `tokenA` and `tokenB` will have different `collection_id`.69//!70//! ### Implementations71//!72//! The Fungible pallet provides implementations for the following traits.73//!74//! - [`WithRecorder`](pallet_evm_coder_substrate::WithRecorder): Trait for EVM support75//! - [`CommonCollectionOperations`](pallet_common::CommonCollectionOperations): Functions for dealing with collections76//! - [`CommonWeightInfo`](pallet_common::CommonWeightInfo): Functions for retrieval of transaction weight77//! - [`CommonEvmHandler`](pallet_common::erc::CommonEvmHandler): Function for handling EVM runtime calls7879#![cfg_attr(not(feature = "std"), no_std)]8081use core::ops::Deref;82use evm_coder::ToLog;83use frame_support::{ensure};84use pallet_evm::account::CrossAccountId;85use up_data_structs::{86 AccessMode, CollectionId, TokenId, CreateCollectionData, mapping::TokenAddressMapping,87 budget::Budget,88};89use pallet_common::{90 Error as CommonError, Event as CommonEvent, Pallet as PalletCommon,91 eth::collection_id_to_address,92};93use pallet_evm::Pallet as PalletEvm;94use pallet_structure::Pallet as PalletStructure;95use pallet_evm_coder_substrate::WithRecorder;96use sp_core::H160;97use sp_runtime::{ArithmeticError, DispatchError, DispatchResult};98use sp_std::{collections::btree_map::BTreeMap, vec::Vec};99100pub use pallet::*;101102use crate::erc::ERC20Events;103#[cfg(feature = "runtime-benchmarks")]104pub mod benchmarking;105pub mod common;106pub mod erc;107pub mod weights;108109pub type CreateItemData<T> = (<T as pallet_evm::account::Config>::CrossAccountId, u128);110pub(crate) type SelfWeightOf<T> = <T as Config>::WeightInfo;111112#[frame_support::pallet]113pub mod pallet {114 use frame_support::{Blake2_128, Blake2_128Concat, Twox64Concat, pallet_prelude::*, storage::Key};115 use up_data_structs::CollectionId;116 use super::weights::WeightInfo;117118 #[pallet::error]119 pub enum Error<T> {120 /// Not Fungible item data used to mint in Fungible collection.121 NotFungibleDataUsedToMintFungibleCollectionToken,122 /// Fungible tokens hold no ID, and the default value of TokenId for Fungible collection is 0.123 FungibleItemsHaveNoId,124 /// Tried to set data for fungible item.125 FungibleItemsDontHaveData,126 /// Fungible token does not support nesting.127 FungibleDisallowsNesting,128 /// Setting item properties is not allowed.129 SettingPropertiesNotAllowed,130 }131132 #[pallet::config]133 pub trait Config:134 frame_system::Config + pallet_common::Config + pallet_structure::Config + pallet_evm::Config135 {136 type WeightInfo: WeightInfo;137 }138139 #[pallet::pallet]140 #[pallet::generate_store(pub(super) trait Store)]141 pub struct Pallet<T>(_);142143 /// Total amount of fungible tokens inside a collection.144 #[pallet::storage]145 pub type TotalSupply<T: Config> =146 StorageMap<Hasher = Twox64Concat, Key = CollectionId, Value = u128, QueryKind = ValueQuery>;147148 /// Amount of tokens owned by an account inside a collection.149 #[pallet::storage]150 pub type Balance<T: Config> = StorageNMap<151 Key = (152 Key<Twox64Concat, CollectionId>,153 Key<Blake2_128Concat, T::CrossAccountId>,154 ),155 Value = u128,156 QueryKind = ValueQuery,157 >;158159 /// Storage for assets delegated to a limited extent to other users.160 #[pallet::storage]161 pub type Allowance<T: Config> = StorageNMap<162 Key = (163 Key<Twox64Concat, CollectionId>,164 Key<Blake2_128, T::CrossAccountId>,165 Key<Blake2_128Concat, T::CrossAccountId>,166 ),167 Value = u128,168 QueryKind = ValueQuery,169 >;170171 /// Foreign collection flag172 #[pallet::storage]173 pub type ForeignCollection<T: Config> =174 StorageMap<Hasher = Twox64Concat, Key = CollectionId, Value = bool, QueryKind = ValueQuery>;175}176177/// Wrapper around untyped collection handle, asserting inner collection is of fungible type.178/// Required for interaction with Fungible collections, type safety and implementation [`solidity_interface`][`evm_coder::solidity_interface`].179pub struct FungibleHandle<T: Config>(pallet_common::CollectionHandle<T>);180181/// Implementation of methods required for dispatching during runtime.182impl<T: Config> FungibleHandle<T> {183 /// Casts [`CollectionHandle`][`pallet_common::CollectionHandle`] into [`FungibleHandle`].184 pub fn cast(inner: pallet_common::CollectionHandle<T>) -> Self {185 Self(inner)186 }187188 /// Casts [`FungibleHandle`] into [`CollectionHandle`][`pallet_common::CollectionHandle`].189 pub fn into_inner(self) -> pallet_common::CollectionHandle<T> {190 self.0191 }192 /// Returns a mutable reference to the internal [`CollectionHandle`][`pallet_common::CollectionHandle`].193 pub fn common_mut(&mut self) -> &mut pallet_common::CollectionHandle<T> {194 &mut self.0195 }196}197impl<T: Config> WithRecorder<T> for FungibleHandle<T> {198 fn recorder(&self) -> &pallet_evm_coder_substrate::SubstrateRecorder<T> {199 self.0.recorder()200 }201 fn into_recorder(self) -> pallet_evm_coder_substrate::SubstrateRecorder<T> {202 self.0.into_recorder()203 }204}205impl<T: Config> Deref for FungibleHandle<T> {206 type Target = pallet_common::CollectionHandle<T>;207208 fn deref(&self) -> &Self::Target {209 &self.0210 }211}212213/// Pallet implementation for fungible assets214impl<T: Config> Pallet<T> {215 /// Initializes the collection. Returns [CollectionId] on success, [DispatchError] otherwise.216 pub fn init_collection(217 owner: T::CrossAccountId,218 data: CreateCollectionData<T::AccountId>,219 ) -> Result<CollectionId, DispatchError> {220 <PalletCommon<T>>::init_collection(owner, data, false)221 }222223 /// Initializes the collection with ForeignCollection flag. Returns [CollectionId] on success, [DispatchError] otherwise.224 pub fn init_foreign_collection(225 owner: T::CrossAccountId,226 data: CreateCollectionData<T::AccountId>,227 ) -> Result<CollectionId, DispatchError> {228 let id = <PalletCommon<T>>::init_collection(owner, data, false)?;229 <ForeignCollection<T>>::insert(id, true);230 Ok(id)231 }232233 /// Destroys a collection.234 pub fn destroy_collection(235 collection: FungibleHandle<T>,236 sender: &T::CrossAccountId,237 ) -> DispatchResult {238 let id = collection.id;239240 if Self::collection_has_tokens(id) {241 return Err(<CommonError<T>>::CantDestroyNotEmptyCollection.into());242 }243244 // =========245246 PalletCommon::destroy_collection(collection.0, sender)?;247248 <ForeignCollection<T>>::remove(id);249 <TotalSupply<T>>::remove(id);250 let _ = <Balance<T>>::clear_prefix((id,), u32::MAX, None);251 let _ = <Allowance<T>>::clear_prefix((id,), u32::MAX, None);252 Ok(())253 }254255 ///Checks if collection has tokens. Return `true` if it has.256 fn collection_has_tokens(collection_id: CollectionId) -> bool {257 <TotalSupply<T>>::get(collection_id) != 0258 }259260 /// Burns the specified amount of the token. If the token balance261 /// or total supply is less than the given value,262 /// it will return [DispatchError].263 pub fn burn(264 collection: &FungibleHandle<T>,265 owner: &T::CrossAccountId,266 amount: u128,267 ) -> DispatchResult {268 let total_supply = <TotalSupply<T>>::get(collection.id)269 .checked_sub(amount)270 .ok_or(<CommonError<T>>::TokenValueTooLow)?;271272 let balance = <Balance<T>>::get((collection.id, owner))273 .checked_sub(amount)274 .ok_or(<CommonError<T>>::TokenValueTooLow)?;275276 // Foreign collection check277 ensure!(278 !<ForeignCollection<T>>::get(collection.id),279 <CommonError<T>>::NoPermission280 );281282 if collection.permissions.access() == AccessMode::AllowList {283 collection.check_allowlist(owner)?;284 }285286 // =========287288 if balance == 0 {289 <Balance<T>>::remove((collection.id, owner));290 <PalletStructure<T>>::unnest_if_nested(owner, collection.id, TokenId::default());291 } else {292 <Balance<T>>::insert((collection.id, owner), balance);293 }294 <TotalSupply<T>>::insert(collection.id, total_supply);295296 <PalletEvm<T>>::deposit_log(297 ERC20Events::Transfer {298 from: *owner.as_eth(),299 to: H160::default(),300 value: amount.into(),301 }302 .to_log(collection_id_to_address(collection.id)),303 );304 <PalletCommon<T>>::deposit_event(CommonEvent::ItemDestroyed(305 collection.id,306 TokenId::default(),307 owner.clone(),308 amount,309 ));310 Ok(())311 }312313 /// Burns the specified amount of the token.314 pub fn burn_foreign(315 collection: &FungibleHandle<T>,316 owner: &T::CrossAccountId,317 amount: u128,318 ) -> DispatchResult {319 let total_supply = <TotalSupply<T>>::get(collection.id)320 .checked_sub(amount)321 .ok_or(<CommonError<T>>::TokenValueTooLow)?;322323 let balance = <Balance<T>>::get((collection.id, owner))324 .checked_sub(amount)325 .ok_or(<CommonError<T>>::TokenValueTooLow)?;326 // =========327328 if balance == 0 {329 <Balance<T>>::remove((collection.id, owner));330 <PalletStructure<T>>::unnest_if_nested(owner, collection.id, TokenId::default());331 } else {332 <Balance<T>>::insert((collection.id, owner), balance);333 }334 <TotalSupply<T>>::insert(collection.id, total_supply);335336 <PalletEvm<T>>::deposit_log(337 ERC20Events::Transfer {338 from: *owner.as_eth(),339 to: H160::default(),340 value: amount.into(),341 }342 .to_log(collection_id_to_address(collection.id)),343 );344 <PalletCommon<T>>::deposit_event(CommonEvent::ItemDestroyed(345 collection.id,346 TokenId::default(),347 owner.clone(),348 amount,349 ));350 Ok(())351 }352353 /// Transfers the specified amount of tokens. Will check that354 /// the transfer is allowed for the token.355 ///356 /// - `from`: Owner of tokens to transfer.357 /// - `to`: Recepient of transfered tokens.358 /// - `amount`: Amount of tokens to transfer.359 /// - `collection`: Collection that contains the token360 pub fn transfer(361 collection: &FungibleHandle<T>,362 from: &T::CrossAccountId,363 to: &T::CrossAccountId,364 amount: u128,365 nesting_budget: &dyn Budget,366 ) -> DispatchResult {367 ensure!(368 collection.limits.transfers_enabled(),369 <CommonError<T>>::TransferNotAllowed,370 );371372 if collection.permissions.access() == AccessMode::AllowList {373 collection.check_allowlist(from)?;374 collection.check_allowlist(to)?;375 }376 <PalletCommon<T>>::ensure_correct_receiver(to)?;377378 let balance_from = <Balance<T>>::get((collection.id, from))379 .checked_sub(amount)380 .ok_or(<CommonError<T>>::TokenValueTooLow)?;381 let balance_to = if from != to {382 Some(383 <Balance<T>>::get((collection.id, to))384 .checked_add(amount)385 .ok_or(ArithmeticError::Overflow)?,386 )387 } else {388 None389 };390391 // =========392393 <PalletStructure<T>>::nest_if_sent_to_token(394 from.clone(),395 to,396 collection.id,397 TokenId::default(),398 nesting_budget,399 )?;400401 if let Some(balance_to) = balance_to {402 // from != to403 if balance_from == 0 {404 <Balance<T>>::remove((collection.id, from));405 <PalletStructure<T>>::unnest_if_nested(from, collection.id, TokenId::default());406 } else {407 <Balance<T>>::insert((collection.id, from), balance_from);408 }409 <Balance<T>>::insert((collection.id, to), balance_to);410 }411412 <PalletEvm<T>>::deposit_log(413 ERC20Events::Transfer {414 from: *from.as_eth(),415 to: *to.as_eth(),416 value: amount.into(),417 }418 .to_log(collection_id_to_address(collection.id)),419 );420 <PalletCommon<T>>::deposit_event(CommonEvent::Transfer(421 collection.id,422 TokenId::default(),423 from.clone(),424 to.clone(),425 amount,426 ));427 Ok(())428 }429430 /// Minting tokens for multiple IDs.431 /// It is a utility function used in [`create_multiple_items`][`Pallet::create_multiple_items`]432 /// and [`create_multiple_items_foreign`][`Pallet::create_multiple_items_foreign`]433 pub fn create_multiple_items_common(434 collection: &FungibleHandle<T>,435 sender: &T::CrossAccountId,436 data: BTreeMap<T::CrossAccountId, u128>,437 nesting_budget: &dyn Budget,438 ) -> DispatchResult {439 let total_supply = data440 .iter()441 .map(|(_, v)| *v)442 .try_fold(<TotalSupply<T>>::get(collection.id), |acc, v| {443 acc.checked_add(v)444 })445 .ok_or(ArithmeticError::Overflow)?;446447 for (to, _) in data.iter() {448 <PalletStructure<T>>::check_nesting(449 sender.clone(),450 to,451 collection.id,452 TokenId::default(),453 nesting_budget,454 )?;455 }456457 let updated_balances = data458 .into_iter()459 .map(|(user, amount)| {460 let updated_balance = <Balance<T>>::get((collection.id, &user))461 .checked_add(amount)462 .ok_or(ArithmeticError::Overflow)?;463 Ok((user, amount, updated_balance))464 })465 .collect::<Result<Vec<_>, DispatchError>>()?;466467 // =========468469 <TotalSupply<T>>::insert(collection.id, total_supply);470 for (user, amount, updated_balance) in updated_balances {471 <Balance<T>>::insert((collection.id, &user), updated_balance);472 <PalletStructure<T>>::nest_if_sent_to_token_unchecked(473 &user,474 collection.id,475 TokenId::default(),476 );477 <PalletEvm<T>>::deposit_log(478 ERC20Events::Transfer {479 from: H160::default(),480 to: *user.as_eth(),481 value: amount.into(),482 }483 .to_log(collection_id_to_address(collection.id)),484 );485 <PalletCommon<T>>::deposit_event(CommonEvent::ItemCreated(486 collection.id,487 TokenId::default(),488 user.clone(),489 amount,490 ));491 }492493 Ok(())494 }495496 /// Minting tokens for multiple IDs.497 /// See [`create_item`][`Pallet::create_item`] for more details.498 pub fn create_multiple_items(499 collection: &FungibleHandle<T>,500 sender: &T::CrossAccountId,501 data: BTreeMap<T::CrossAccountId, u128>,502 nesting_budget: &dyn Budget,503 ) -> DispatchResult {504 // Foreign collection check505 ensure!(506 !<ForeignCollection<T>>::get(collection.id),507 <CommonError<T>>::NoPermission508 );509510 if !collection.is_owner_or_admin(sender) {511 ensure!(512 collection.permissions.mint_mode(),513 <CommonError<T>>::PublicMintingNotAllowed514 );515 collection.check_allowlist(sender)?;516517 for (owner, _) in data.iter() {518 collection.check_allowlist(owner)?;519 }520 }521522 Self::create_multiple_items_common(collection, sender, data, nesting_budget)523 }524525 /// Minting tokens for multiple IDs.526 /// See [`create_item_foreign`][`Pallet::create_item_foreign`] for more details.527 pub fn create_multiple_items_foreign(528 collection: &FungibleHandle<T>,529 sender: &T::CrossAccountId,530 data: BTreeMap<T::CrossAccountId, u128>,531 nesting_budget: &dyn Budget,532 ) -> DispatchResult {533 Self::create_multiple_items_common(collection, sender, data, nesting_budget)534 }535536 fn set_allowance_unchecked(537 collection: &FungibleHandle<T>,538 owner: &T::CrossAccountId,539 spender: &T::CrossAccountId,540 amount: u128,541 ) {542 if amount == 0 {543 <Allowance<T>>::remove((collection.id, owner, spender));544 } else {545 <Allowance<T>>::insert((collection.id, owner, spender), amount);546 }547548 <PalletEvm<T>>::deposit_log(549 ERC20Events::Approval {550 owner: *owner.as_eth(),551 spender: *spender.as_eth(),552 value: amount.into(),553 }554 .to_log(collection_id_to_address(collection.id)),555 );556 <PalletCommon<T>>::deposit_event(CommonEvent::Approved(557 collection.id,558 TokenId(0),559 owner.clone(),560 spender.clone(),561 amount,562 ));563 }564565 /// Set allowance for the spender to `transfer` or `burn` owner's tokens.566 ///567 /// - `collection`: Collection that contains the token568 /// - `owner`: Owner of tokens that sets the allowance.569 /// - `spender`: Recipient of the allowance rights.570 /// - `amount`: Amount of tokens the spender is allowed to `transfer` or `burn`.571 pub fn set_allowance(572 collection: &FungibleHandle<T>,573 owner: &T::CrossAccountId,574 spender: &T::CrossAccountId,575 amount: u128,576 ) -> DispatchResult {577 if collection.permissions.access() == AccessMode::AllowList {578 collection.check_allowlist(owner)?;579 collection.check_allowlist(spender)?;580 }581582 if <Balance<T>>::get((collection.id, owner)) < amount {583 ensure!(584 collection.ignores_owned_amount(owner),585 <CommonError<T>>::CantApproveMoreThanOwned586 );587 }588589 // =========590591 Self::set_allowance_unchecked(collection, owner, spender, amount);592 Ok(())593 }594595 /// Checks if a non-owner has (enough) allowance from the owner to perform operations on the tokens.596 /// Returns the expected remaining allowance - it should be set manually if the transaction proceeds.597 ///598 /// - `collection`: Collection that contains the token.599 /// - `spender`: CrossAccountId who has the allowance rights.600 /// - `from`: The owner of the tokens who sets the allowance.601 /// - `amount`: Amount of tokens by which the allowance sholud be reduced.602 fn check_allowed(603 collection: &FungibleHandle<T>,604 spender: &T::CrossAccountId,605 from: &T::CrossAccountId,606 amount: u128,607 nesting_budget: &dyn Budget,608 ) -> Result<Option<u128>, DispatchError> {609 if spender.conv_eq(from) {610 return Ok(None);611 }612 if collection.permissions.access() == AccessMode::AllowList {613 // `from`, `to` checked in [`transfer`]614 collection.check_allowlist(spender)?;615 }616 if let Some(source) = T::CrossTokenAddressMapping::address_to_token(from) {617 // TODO: should collection owner be allowed to perform this transfer?618 ensure!(619 <PalletStructure<T>>::check_indirectly_owned(620 spender.clone(),621 source.0,622 source.1,623 None,624 nesting_budget625 )?,626 <CommonError<T>>::ApprovedValueTooLow,627 );628 return Ok(None);629 }630 let allowance = <Allowance<T>>::get((collection.id, from, spender)).checked_sub(amount);631 if allowance.is_none() {632 ensure!(633 collection.ignores_allowance(spender),634 <CommonError<T>>::ApprovedValueTooLow635 );636 }637638 Ok(allowance)639 }640641 /// Transfer fungible tokens from one account to another.642 /// Same as the [`transfer`][`Pallet::transfer`] but spender doesn't needs to be an owner of the token pieces.643 /// The owner should set allowance for the spender to transfer pieces.644 /// See [`set_allowance`][`Pallet::set_allowance`] for more details.645646 pub fn transfer_from(647 collection: &FungibleHandle<T>,648 spender: &T::CrossAccountId,649 from: &T::CrossAccountId,650 to: &T::CrossAccountId,651 amount: u128,652 nesting_budget: &dyn Budget,653 ) -> DispatchResult {654 let allowance = Self::check_allowed(collection, spender, from, amount, nesting_budget)?;655656 // =========657658 Self::transfer(collection, from, to, amount, nesting_budget)?;659 if let Some(allowance) = allowance {660 Self::set_allowance_unchecked(collection, from, spender, allowance);661 }662 Ok(())663 }664665 /// Burn fungible tokens from the account.666 ///667 /// Same as the [`burn`][`Pallet::burn`] but spender doesn't need to be an owner of the tokens. The `from` should668 /// set allowance for the spender to burn tokens.669 /// See [`set_allowance`][`Pallet::set_allowance`] for more details.670 pub fn burn_from(671 collection: &FungibleHandle<T>,672 spender: &T::CrossAccountId,673 from: &T::CrossAccountId,674 amount: u128,675 nesting_budget: &dyn Budget,676 ) -> DispatchResult {677 let allowance = Self::check_allowed(collection, spender, from, amount, nesting_budget)?;678679 // =========680681 Self::burn(collection, from, amount)?;682 if let Some(allowance) = allowance {683 Self::set_allowance_unchecked(collection, from, spender, allowance);684 }685 Ok(())686 }687688 /// Creates fungible token.689 ///690 /// The sender should be the owner/admin of the collection or collection should be configured691 /// to allow public minting.692 ///693 /// - `data`: Contains user who will become the owners of the tokens and amount694 /// of tokens he will receive.695 pub fn create_item(696 collection: &FungibleHandle<T>,697 sender: &T::CrossAccountId,698 data: CreateItemData<T>,699 nesting_budget: &dyn Budget,700 ) -> DispatchResult {701 Self::create_multiple_items(702 collection,703 sender,704 [(data.0, data.1)].into_iter().collect(),705 nesting_budget,706 )707 }708709 /// Creates fungible token.710 ///711 /// - `data`: Contains user who will become the owners of the tokens and amount712 /// of tokens he will receive.713 pub fn create_item_foreign(714 collection: &FungibleHandle<T>,715 sender: &T::CrossAccountId,716 data: CreateItemData<T>,717 nesting_budget: &dyn Budget,718 ) -> DispatchResult {719 Self::create_multiple_items_foreign(720 collection,721 sender,722 [(data.0, data.1)].into_iter().collect(),723 nesting_budget,724 )725 }726727 /// Returns 10 tokens owners in no particular order728 ///729 /// There is no direct way to get token holders in ascending order,730 /// since `iter_prefix` returns values in no particular order.731 /// Therefore, getting the 10 largest holders with a large value of holders732 /// can lead to impact memory allocation + sorting with `n * log (n)`.733 pub fn token_owners(734 collection: CollectionId,735 _token: TokenId,736 ) -> Option<Vec<T::CrossAccountId>> {737 let res: Vec<T::CrossAccountId> = <Balance<T>>::iter_prefix((collection,))738 .map(|(owner, _amount)| owner)739 .take(10)740 .collect();741742 if res.is_empty() {743 None744 } else {745 Some(res)746 }747 }748}pallets/nonfungible/src/lib.rsdiffbeforeafterboth--- a/pallets/nonfungible/src/lib.rs
+++ b/pallets/nonfungible/src/lib.rs
@@ -100,10 +100,10 @@
weights::{PostDispatchInfo, Pays},
};
use up_data_structs::{
- AccessMode, CollectionId, CustomDataLimit, TokenId, CreateCollectionData, CreateNftExData,
- mapping::TokenAddressMapping, budget::Budget, Property, PropertyPermission, PropertyKey,
- PropertyValue, PropertyKeyPermission, Properties, PropertyScope, TrySetProperty, TokenChild,
- AuxPropertyValue,
+ AccessMode, CollectionId, CollectionFlags, CustomDataLimit, TokenId, CreateCollectionData,
+ CreateNftExData, mapping::TokenAddressMapping, budget::Budget, Property, PropertyPermission,
+ PropertyKey, PropertyValue, PropertyKeyPermission, Properties, PropertyScope, TrySetProperty,
+ TokenChild, AuxPropertyValue,
};
use pallet_evm::{account::CrossAccountId, Pallet as PalletEvm};
use pallet_common::{
@@ -408,7 +408,14 @@
data: CreateCollectionData<T::AccountId>,
is_external: bool,
) -> Result<CollectionId, DispatchError> {
- <PalletCommon<T>>::init_collection(owner, data, is_external)
+ <PalletCommon<T>>::init_collection(
+ owner,
+ data,
+ CollectionFlags {
+ external: is_external,
+ ..Default::default()
+ },
+ )
}
/// Destroy NFT collection
pallets/refungible/src/lib.rsdiffbeforeafterboth--- a/pallets/refungible/src/lib.rs
+++ b/pallets/refungible/src/lib.rs
@@ -112,10 +112,10 @@
use sp_runtime::{ArithmeticError, DispatchError, DispatchResult, TransactionOutcome};
use sp_std::{vec::Vec, vec, collections::btree_map::BTreeMap};
use up_data_structs::{
- AccessMode, budget::Budget, CollectionId, CollectionMode, CollectionPropertiesVec,
- CreateCollectionData, CustomDataLimit, mapping::TokenAddressMapping, MAX_ITEMS_PER_BATCH,
- MAX_REFUNGIBLE_PIECES, Property, PropertyKey, PropertyKeyPermission, PropertyPermission,
- PropertyScope, PropertyValue, TokenId, TrySetProperty,
+ AccessMode, budget::Budget, CollectionId, CollectionMode, CollectionFlags,
+ CollectionPropertiesVec, CreateCollectionData, CustomDataLimit, mapping::TokenAddressMapping,
+ MAX_ITEMS_PER_BATCH, MAX_REFUNGIBLE_PIECES, Property, PropertyKey, PropertyKeyPermission,
+ PropertyPermission, PropertyScope, PropertyValue, TokenId, TrySetProperty,
};
use frame_support::BoundedBTreeMap;
use derivative::Derivative;
@@ -375,7 +375,7 @@
owner: T::CrossAccountId,
data: CreateCollectionData<T::AccountId>,
) -> Result<CollectionId, DispatchError> {
- <PalletCommon<T>>::init_collection(owner, data, false)
+ <PalletCommon<T>>::init_collection(owner, data, CollectionFlags::default())
}
/// Destroy RFT collection
primitives/data-structs/Cargo.tomldiffbeforeafterboth--- a/primitives/data-structs/Cargo.toml
+++ b/primitives/data-structs/Cargo.toml
@@ -27,6 +27,7 @@
struct-versioning = { path = "../../crates/struct-versioning" }
pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.27-fee-limit" }
rmrk-traits = { default-features = false, path = "../rmrk-traits" }
+bondrewd = { version = "0.1.14", features = ["derive"], default-features = false }
[features]
default = ["std"]
primitives/data-structs/src/bondrewd_codec.rsdiffbeforeafterboth--- /dev/null
+++ b/primitives/data-structs/src/bondrewd_codec.rs
@@ -0,0 +1,31 @@
+//! Integration between bondrewd and parity scale codec
+//! Maybe we can move it to scale-codec itself in future?
+
+#[macro_export]
+macro_rules! bondrewd_codec {
+ ($T:ty) => {
+ impl Encode for $T {
+ fn encode_to<O: codec::Output + ?Sized>(&self, dest: &mut O) {
+ dest.write(&self.into_bytes())
+ }
+ }
+ impl codec::Decode for $T {
+ fn decode<I: codec::Input + ?Sized>(from: &mut I) -> Result<Self, codec::Error> {
+ let mut bytes = [0; Self::BYTE_SIZE];
+ from.read(&mut bytes)?;
+ Ok(Self::from_bytes(bytes))
+ }
+ }
+ impl MaxEncodedLen for $T {
+ fn max_encoded_len() -> usize {
+ Self::BYTE_SIZE
+ }
+ }
+ impl TypeInfo for $T {
+ type Identity = [u8; Self::BYTE_SIZE];
+ fn type_info() -> scale_info::Type {
+ <[u8; Self::BYTE_SIZE] as TypeInfo>::type_info()
+ }
+ }
+ };
+}
primitives/data-structs/src/lib.rsdiffbeforeafterboth--- a/primitives/data-structs/src/lib.rs
+++ b/primitives/data-structs/src/lib.rs
@@ -36,6 +36,7 @@
use sp_core::U256;
use sp_runtime::{ArithmeticError, sp_std::prelude::Vec, Permill};
use codec::{Decode, Encode, EncodeLike, MaxEncodedLen};
+use bondrewd::Bitfields;
use frame_support::{BoundedVec, traits::ConstU32};
use derivative::Derivative;
use scale_info::TypeInfo;
@@ -54,6 +55,7 @@
FixedPart as RmrkFixedPart, SlotPart as RmrkSlotPart,
};
+mod bondrewd_codec;
mod bounded;
pub mod budget;
pub mod mapping;
@@ -357,6 +359,21 @@
pub type CollectionDescription = BoundedVec<u16, ConstU32<MAX_COLLECTION_DESCRIPTION_LENGTH>>;
pub type CollectionTokenPrefix = BoundedVec<u8, ConstU32<MAX_TOKEN_PREFIX_LENGTH>>;
+#[derive(Bitfields, Clone, Copy, PartialEq, Eq, Debug, Default)]
+#[bondrewd(enforce_bytes = 1)]
+pub struct CollectionFlags {
+ /// Tokens in foreign collections can be transferred, but not burnt
+ #[bondrewd(bits = "0..1")]
+ pub foreign: bool,
+ /// External collections can't be managed using `unique` api
+ #[bondrewd(bits = "7..8")]
+ pub external: bool,
+
+ #[bondrewd(reserve, bits = "1..7")]
+ pub reserved: u8,
+}
+bondrewd_codec!(CollectionFlags);
+
/// Base structure for represent collection.
///
/// Used to provide basic functionality for all types of collections.
@@ -404,9 +421,8 @@
#[version(2.., upper(Default::default()))]
pub permissions: CollectionPermissions,
- /// Marks that this collection is not "unique", and managed from external.
- #[version(2.., upper(false))]
- pub external_collection: bool,
+ #[version(2.., upper(Default::default()))]
+ pub flags: CollectionFlags,
#[version(..2)]
pub variable_on_chain_schema: BoundedVec<u8, ConstU32<VARIABLE_ON_CHAIN_SCHEMA_LIMIT>>,
@@ -454,6 +470,9 @@
/// Is collection read only.
pub read_only: bool,
+
+ /// Is collection is foreign.
+ pub foreign: bool,
}
/// Data used for create collection.
primitives/data-structs/src/migration.rsdiffbeforeafterboth--- a/primitives/data-structs/src/migration.rs
+++ b/primitives/data-structs/src/migration.rs
@@ -38,3 +38,26 @@
test_to_option(SponsoringRateLimit::SponsoringDisabled);
test_to_option(SponsoringRateLimit::Blocks(10));
}
+
+#[test]
+fn collection_flags_have_same_encoding_as_bool() {
+ use crate::CollectionFlags;
+ use codec::Encode;
+
+ assert_eq!(
+ true.encode(),
+ CollectionFlags {
+ external: true,
+ ..Default::default()
+ }
+ .encode()
+ );
+ assert_eq!(
+ false.encode(),
+ CollectionFlags {
+ external: false,
+ ..Default::default()
+ }
+ .encode()
+ );
+}