difftreelog
feat add conditional supportInterface for ERC721Metadata
in: master
29 files changed
pallets/common/src/erc.rsdiffbeforeafterboth--- a/pallets/common/src/erc.rs
+++ b/pallets/common/src/erc.rs
@@ -684,6 +684,11 @@
pub fn parent_nft() -> up_data_structs::PropertyKey {
property_key_from_bytes(b"parentNft").expect(EXPECT_CONVERT_ERROR)
}
+
+ /// Key "parentNft".
+ pub fn erc721_metadata() -> up_data_structs::PropertyKey {
+ property_key_from_bytes(b"ERC721Metadata").expect(EXPECT_CONVERT_ERROR)
+ }
}
/// Values.
@@ -693,10 +698,21 @@
/// Value "ERC721Metadata".
pub const ERC721_METADATA: &[u8] = b"ERC721Metadata";
+ /// Value "1" ERC721 metadata supported.
+ pub const ERC721_METADATA_SUPPORTED: &[u8] = b"1";
+
+ /// Value "0" ERC721 metadata supported.
+ pub const ERC721_METADATA_UNSUPPORTED: &[u8] = b"0";
+
/// Value for [`ERC721_METADATA`].
pub fn erc721() -> up_data_structs::PropertyValue {
property_value_from_bytes(ERC721_METADATA).expect(EXPECT_CONVERT_ERROR)
}
+
+ /// Value for [`ERC721_METADATA`].
+ pub fn erc721_metadata_supported() -> up_data_structs::PropertyValue {
+ property_value_from_bytes(ERC721_METADATA_SUPPORTED).expect(EXPECT_CONVERT_ERROR)
+ }
}
/// Convert `byte` to [`PropertyKey`].
pallets/nonfungible/src/erc.rsdiffbeforeafterboth--- a/pallets/nonfungible/src/erc.rs
+++ b/pallets/nonfungible/src/erc.rs
@@ -232,7 +232,7 @@
if !url.is_empty() {
return Ok(url);
}
- } else if !is_erc721_metadata_compatible::<T>(self.id) {
+ } else if !self.supports_metadata() {
return Err("tokenURI not set".into());
}
@@ -548,17 +548,6 @@
}
Err("Property tokenURI not found".into())
-}
-
-fn is_erc721_metadata_compatible<T: Config>(collection_id: CollectionId) -> bool {
- if let Some(shema_name) =
- pallet_common::Pallet::<T>::get_collection_property(collection_id, &key::schema_name())
- {
- let shema_name = shema_name.into_inner();
- shema_name == property_value::ERC721_METADATA
- } else {
- false
- }
}
fn get_token_permission<T: Config>(
@@ -577,16 +566,6 @@
Ok(a)
}
-fn has_token_permission<T: Config>(collection_id: CollectionId, key: &PropertyKey) -> bool {
- if let Ok(token_property_permissions) =
- CollectionPropertyPermissions::<T>::try_get(collection_id)
- {
- return token_property_permissions.contains_key(key);
- }
-
- false
-}
-
/// @title Unique extensions for ERC721.
#[solidity_interface(name = ERC721UniqueExtensions)]
impl<T: Config> NonfungibleHandle<T> {
@@ -731,7 +710,7 @@
name = UniqueNFT,
is(
ERC721,
- ERC721Metadata,
+ ERC721Metadata(if(this.supports_metadata())),
ERC721Enumerable,
ERC721UniqueExtensions,
ERC721Mintable,
pallets/nonfungible/src/lib.rsdiffbeforeafterboth--- a/pallets/nonfungible/src/lib.rs
+++ b/pallets/nonfungible/src/lib.rs
@@ -108,6 +108,7 @@
use pallet_evm::{account::CrossAccountId, Pallet as PalletEvm};
use pallet_common::{
Error as CommonError, Pallet as PalletCommon, Event as CommonEvent, CollectionHandle,
+ erc::static_property::{key, value},
eth::collection_id_to_address,
};
use pallet_structure::{Pallet as PalletStructure, Error as StructureError};
@@ -295,6 +296,19 @@
&mut self.0
}
}
+
+impl<T: Config> NonfungibleHandle<T> {
+ pub fn supports_metadata(&self) -> bool {
+ if let Some(erc721_metadata) =
+ pallet_common::Pallet::<T>::get_collection_property(self.id, &key::erc721_metadata())
+ {
+ *erc721_metadata.into_inner() == *value::ERC721_METADATA_SUPPORTED
+ } else {
+ false
+ }
+ }
+}
+
impl<T: Config> WithRecorder<T> for NonfungibleHandle<T> {
fn recorder(&self) -> &SubstrateRecorder<T> {
self.0.recorder()
pallets/refungible/src/erc.rsdiffbeforeafterboth--- a/pallets/refungible/src/erc.rs
+++ b/pallets/refungible/src/erc.rs
@@ -228,7 +228,7 @@
if !url.is_empty() {
return Ok(url);
}
- } else if !is_erc721_metadata_compatible::<T>(self.id) {
+ } else if !self.supports_metadata() {
return Err("tokenURI not set".into());
}
@@ -578,17 +578,6 @@
Err("Property tokenURI not found".into())
}
-fn is_erc721_metadata_compatible<T: Config>(collection_id: CollectionId) -> bool {
- if let Some(shema_name) =
- pallet_common::Pallet::<T>::get_collection_property(collection_id, &key::schema_name())
- {
- let shema_name = shema_name.into_inner();
- shema_name == property_value::ERC721_METADATA
- } else {
- false
- }
-}
-
fn get_token_permission<T: Config>(
collection_id: CollectionId,
key: &PropertyKey,
@@ -780,7 +769,7 @@
name = UniqueRefungible,
is(
ERC721,
- ERC721Metadata,
+ ERC721Metadata(if(this.supports_metadata())),
ERC721Enumerable,
ERC721UniqueExtensions,
ERC721Mintable,
pallets/refungible/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//! # Refungible Pallet18//!19//! The Refungible pallet provides functionality for handling refungible collections and tokens.20//!21//! - [`Config`]22//! - [`RefungibleHandle`]23//! - [`Pallet`]24//! - [`CommonWeights`](common::CommonWeights)25//!26//! ## Overview27//!28//! The Refungible pallet provides functions for:29//!30//! - RFT collection creation and removal31//! - Minting and burning of RFT tokens32//! - Partition and repartition of RFT tokens33//! - Retrieving number of pieces of RFT token34//! - Retrieving account balances35//! - Transfering RFT token pieces36//! - Burning RFT token pieces37//! - Setting and checking allowance for RFT tokens38//!39//! ### Terminology40//!41//! - **RFT token:** Non fungible token that was partitioned to pieces. If an account owns all42//! of the RFT token pieces than it owns the RFT token and can repartition it.43//!44//! - **RFT Collection:** A collection of RFT tokens. All RFT tokens are part of a collection.45//! Each collection has its own settings and set of permissions.46//!47//! - **RFT token piece:** A fungible part of an RFT token.48//!49//! - **Balance:** RFT token pieces owned by an account50//!51//! - **Allowance:** Maximum number of RFT token pieces that one account is allowed to52//! transfer from the balance of another account53//!54//! - **Burning:** The process of “deleting” a token from a collection or removing token pieces from55//! an account balance.56//!57//! ### Implementations58//!59//! The Refungible pallet provides implementations for the following traits. If these traits provide60//! the functionality that you need, then you can avoid coupling with the Refungible pallet.61//!62//! - [`CommonWeightInfo`](pallet_common::CommonWeightInfo): Functions for retrieval of transaction weight63//! - [`CommonCollectionOperations`](pallet_common::CommonCollectionOperations): Functions for dealing64//! with collections65//! - [`RefungibleExtensions`](pallet_common::RefungibleExtensions): Functions specific for refungible66//! collection67//!68//! ## Interface69//!70//! ### Dispatchable Functions71//!72//! - `init_collection` - Create RFT collection. RFT collection can be configured to allow or deny access for73//! some accounts.74//! - `destroy_collection` - Destroy exising RFT collection. There should be no tokens in the collection.75//! - `burn` - Burn some amount of RFT token pieces owned by account. Burns the RFT token if no pieces left.76//! - `transfer` - Transfer some amount of RFT token pieces. Transfers should be enabled for RFT collection.77//! Nests the RFT token if RFT token pieces are sent to another token.78//! - `create_item` - Mint RFT token in collection. Sender should have permission to mint tokens.79//! - `set_allowance` - Set allowance for another account to transfer balance from sender's account.80//! - `repartition` - Repartition token to selected number of pieces. Sender should own all existing pieces.81//!82//! ## Assumptions83//!84//! * Total number of pieces for one token shouldn't exceed `up_data_structs::MAX_REFUNGIBLE_PIECES`.85//! * Total number of tokens of all types shouldn't be greater than `up_data_structs::MAX_TOKEN_PREFIX_LENGTH`.86//! * Sender should be in collection's allow list to perform operations on tokens.8788#![cfg_attr(not(feature = "std"), no_std)]8990use crate::erc_token::ERC20Events;91use crate::erc::ERC721Events;9293use codec::{Encode, Decode, MaxEncodedLen};94use core::ops::Deref;95use evm_coder::ToLog;96use frame_support::{97 BoundedVec, ensure, fail, storage::with_transaction, transactional, pallet_prelude::ConstU32,98};99use pallet_evm::{account::CrossAccountId, Pallet as PalletEvm};100use pallet_evm_coder_substrate::WithRecorder;101use pallet_common::{102 CommonCollectionOperations, Error as CommonError, eth::collection_id_to_address,103 Event as CommonEvent, Pallet as PalletCommon,104};105use pallet_structure::Pallet as PalletStructure;106use scale_info::TypeInfo;107use sp_core::H160;108use sp_runtime::{ArithmeticError, DispatchError, DispatchResult, TransactionOutcome};109use sp_std::{vec::Vec, vec, collections::btree_map::BTreeMap};110use up_data_structs::{111 AccessMode, budget::Budget, CollectionId, CollectionFlags, CollectionPropertiesVec,112 CreateCollectionData, CustomDataLimit, mapping::TokenAddressMapping, MAX_ITEMS_PER_BATCH,113 MAX_REFUNGIBLE_PIECES, Property, PropertyKey, PropertyKeyPermission, PropertyPermission,114 PropertyScope, PropertyValue, TokenId, TrySetProperty,115};116use frame_support::BoundedBTreeMap;117use derivative::Derivative;118119pub use pallet::*;120#[cfg(feature = "runtime-benchmarks")]121pub mod benchmarking;122pub mod common;123pub mod erc;124pub mod erc_token;125pub mod weights;126127#[derive(Derivative, Clone)]128pub struct CreateItemData<CrossAccountId> {129 #[derivative(Debug(format_with = "bounded::map_debug"))]130 pub users: BoundedBTreeMap<CrossAccountId, u128, ConstU32<MAX_ITEMS_PER_BATCH>>,131 #[derivative(Debug(format_with = "bounded::vec_debug"))]132 pub properties: CollectionPropertiesVec,133}134pub(crate) type SelfWeightOf<T> = <T as Config>::WeightInfo;135136/// Token data, stored independently from other data used to describe it137/// for the convenience of database access. Notably contains the token metadata.138#[struct_versioning::versioned(version = 2, upper)]139#[derive(Encode, Decode, Default, TypeInfo, MaxEncodedLen)]140#[deprecated(since = "0.2.0", note = "ItemData is no more contains usefull data")]141pub struct ItemData {142 pub const_data: BoundedVec<u8, CustomDataLimit>,143144 #[version(..2)]145 pub variable_data: BoundedVec<u8, CustomDataLimit>,146}147148#[frame_support::pallet]149pub mod pallet {150 use super::*;151 use frame_support::{152 Blake2_128, Blake2_128Concat, Twox64Concat, pallet_prelude::*, storage::Key,153 traits::StorageVersion,154 };155 use frame_system::pallet_prelude::*;156 use up_data_structs::{CollectionId, TokenId};157 use super::weights::WeightInfo;158159 #[pallet::error]160 pub enum Error<T> {161 /// Not Refungible item data used to mint in Refungible collection.162 NotRefungibleDataUsedToMintFungibleCollectionToken,163 /// Maximum refungibility exceeded.164 WrongRefungiblePieces,165 /// Refungible token can't be repartitioned by user who isn't owns all pieces.166 RepartitionWhileNotOwningAllPieces,167 /// Refungible token can't nest other tokens.168 RefungibleDisallowsNesting,169 /// Setting item properties is not allowed.170 SettingPropertiesNotAllowed,171 }172173 #[pallet::config]174 pub trait Config:175 frame_system::Config + pallet_common::Config + pallet_structure::Config176 {177 type WeightInfo: WeightInfo;178 }179180 const STORAGE_VERSION: StorageVersion = StorageVersion::new(2);181182 #[pallet::pallet]183 #[pallet::storage_version(STORAGE_VERSION)]184 #[pallet::generate_store(pub(super) trait Store)]185 pub struct Pallet<T>(_);186187 /// Total amount of minted tokens in a collection.188 #[pallet::storage]189 pub type TokensMinted<T: Config> =190 StorageMap<Hasher = Twox64Concat, Key = CollectionId, Value = u32, QueryKind = ValueQuery>;191192 /// Amount of tokens burnt in a collection.193 #[pallet::storage]194 pub type TokensBurnt<T: Config> =195 StorageMap<Hasher = Twox64Concat, Key = CollectionId, Value = u32, QueryKind = ValueQuery>;196197 /// Token data, used to partially describe a token.198 // TODO: remove199 #[pallet::storage]200 #[deprecated(since = "0.2.0", note = "ItemData is no more contains usefull data")]201 pub type TokenData<T: Config> = StorageNMap<202 Key = (Key<Twox64Concat, CollectionId>, Key<Twox64Concat, TokenId>),203 Value = ItemData,204 QueryKind = ValueQuery,205 >;206207 /// Amount of pieces a refungible token is split into.208 #[pallet::storage]209 #[pallet::getter(fn token_properties)]210 pub type TokenProperties<T: Config> = StorageNMap<211 Key = (Key<Twox64Concat, CollectionId>, Key<Twox64Concat, TokenId>),212 Value = up_data_structs::Properties,213 QueryKind = ValueQuery,214 OnEmpty = up_data_structs::TokenProperties,215 >;216217 /// Total amount of pieces for token218 #[pallet::storage]219 pub type TotalSupply<T: Config> = StorageNMap<220 Key = (Key<Twox64Concat, CollectionId>, Key<Twox64Concat, TokenId>),221 Value = u128,222 QueryKind = ValueQuery,223 >;224225 /// Used to enumerate tokens owned by account.226 #[pallet::storage]227 pub type Owned<T: Config> = StorageNMap<228 Key = (229 Key<Twox64Concat, CollectionId>,230 Key<Blake2_128Concat, T::CrossAccountId>,231 Key<Twox64Concat, TokenId>,232 ),233 Value = bool,234 QueryKind = ValueQuery,235 >;236237 /// Amount of tokens (not pieces) partially owned by an account within a collection.238 #[pallet::storage]239 pub type AccountBalance<T: Config> = StorageNMap<240 Key = (241 Key<Twox64Concat, CollectionId>,242 // Owner243 Key<Blake2_128Concat, T::CrossAccountId>,244 ),245 Value = u32,246 QueryKind = ValueQuery,247 >;248249 /// Amount of token pieces owned by account.250 #[pallet::storage]251 pub type Balance<T: Config> = StorageNMap<252 Key = (253 Key<Twox64Concat, CollectionId>,254 Key<Twox64Concat, TokenId>,255 // Owner256 Key<Blake2_128Concat, T::CrossAccountId>,257 ),258 Value = u128,259 QueryKind = ValueQuery,260 >;261262 /// Allowance set by a token owner for another user to perform one of certain transactions on a number of pieces of a token.263 #[pallet::storage]264 pub type Allowance<T: Config> = StorageNMap<265 Key = (266 Key<Twox64Concat, CollectionId>,267 Key<Twox64Concat, TokenId>,268 // Owner269 Key<Blake2_128, T::CrossAccountId>,270 // Spender271 Key<Blake2_128Concat, T::CrossAccountId>,272 ),273 Value = u128,274 QueryKind = ValueQuery,275 >;276277 #[pallet::hooks]278 impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {279 fn on_runtime_upgrade() -> Weight {280 let storage_version = StorageVersion::get::<Pallet<T>>();281 if storage_version < StorageVersion::new(2) {282 <TokenData<T>>::remove_all(None);283 }284 StorageVersion::new(2).put::<Pallet<T>>();285286 Weight::zero()287 }288 }289}290291pub struct RefungibleHandle<T: Config>(pallet_common::CollectionHandle<T>);292impl<T: Config> RefungibleHandle<T> {293 pub fn cast(inner: pallet_common::CollectionHandle<T>) -> Self {294 Self(inner)295 }296 pub fn into_inner(self) -> pallet_common::CollectionHandle<T> {297 self.0298 }299 pub fn common_mut(&mut self) -> &mut pallet_common::CollectionHandle<T> {300 &mut self.0301 }302}303304impl<T: Config> Deref for RefungibleHandle<T> {305 type Target = pallet_common::CollectionHandle<T>;306307 fn deref(&self) -> &Self::Target {308 &self.0309 }310}311312impl<T: Config> WithRecorder<T> for RefungibleHandle<T> {313 fn recorder(&self) -> &pallet_evm_coder_substrate::SubstrateRecorder<T> {314 self.0.recorder()315 }316 fn into_recorder(self) -> pallet_evm_coder_substrate::SubstrateRecorder<T> {317 self.0.into_recorder()318 }319}320321impl<T: Config> Pallet<T> {322 /// Get number of RFT tokens in collection323 pub fn total_supply(collection: &RefungibleHandle<T>) -> u32 {324 <TokensMinted<T>>::get(collection.id) - <TokensBurnt<T>>::get(collection.id)325 }326327 /// Check that RFT token exists328 ///329 /// - `token`: Token ID.330 pub fn token_exists(collection: &RefungibleHandle<T>, token: TokenId) -> bool {331 <TotalSupply<T>>::contains_key((collection.id, token))332 }333334 pub fn set_scoped_token_property(335 collection_id: CollectionId,336 token_id: TokenId,337 scope: PropertyScope,338 property: Property,339 ) -> DispatchResult {340 TokenProperties::<T>::try_mutate((collection_id, token_id), |properties| {341 properties.try_scoped_set(scope, property.key, property.value)342 })343 .map_err(<CommonError<T>>::from)?;344345 Ok(())346 }347348 pub fn set_scoped_token_properties(349 collection_id: CollectionId,350 token_id: TokenId,351 scope: PropertyScope,352 properties: impl Iterator<Item = Property>,353 ) -> DispatchResult {354 TokenProperties::<T>::try_mutate((collection_id, token_id), |stored_properties| {355 stored_properties.try_scoped_set_from_iter(scope, properties)356 })357 .map_err(<CommonError<T>>::from)?;358359 Ok(())360 }361}362363// unchecked calls skips any permission checks364impl<T: Config> Pallet<T> {365 /// Create RFT collection366 ///367 /// `init_collection` will take non-refundable deposit for collection creation.368 ///369 /// - `data`: Contains settings for collection limits and permissions.370 pub fn init_collection(371 owner: T::CrossAccountId,372 payer: T::CrossAccountId,373 data: CreateCollectionData<T::AccountId>,374 ) -> Result<CollectionId, DispatchError> {375 <PalletCommon<T>>::init_collection(owner, payer, data, CollectionFlags::default())376 }377378 /// Destroy RFT collection379 ///380 /// `destroy_collection` will throw error if collection contains any tokens.381 /// Only owner can destroy collection.382 pub fn destroy_collection(383 collection: RefungibleHandle<T>,384 sender: &T::CrossAccountId,385 ) -> DispatchResult {386 let id = collection.id;387388 if Self::collection_has_tokens(id) {389 return Err(<CommonError<T>>::CantDestroyNotEmptyCollection.into());390 }391392 // =========393394 PalletCommon::destroy_collection(collection.0, sender)?;395396 <TokensMinted<T>>::remove(id);397 <TokensBurnt<T>>::remove(id);398 let _ = <TotalSupply<T>>::clear_prefix((id,), u32::MAX, None);399 let _ = <Balance<T>>::clear_prefix((id,), u32::MAX, None);400 let _ = <Allowance<T>>::clear_prefix((id,), u32::MAX, None);401 let _ = <Owned<T>>::clear_prefix((id,), u32::MAX, None);402 let _ = <AccountBalance<T>>::clear_prefix((id,), u32::MAX, None);403 Ok(())404 }405406 fn collection_has_tokens(collection_id: CollectionId) -> bool {407 <TotalSupply<T>>::iter_prefix((collection_id,))408 .next()409 .is_some()410 }411412 pub fn burn_token_unchecked(413 collection: &RefungibleHandle<T>,414 owner: &T::CrossAccountId,415 token_id: TokenId,416 ) -> DispatchResult {417 let burnt = <TokensBurnt<T>>::get(collection.id)418 .checked_add(1)419 .ok_or(ArithmeticError::Overflow)?;420421 <TokensBurnt<T>>::insert(collection.id, burnt);422 <TokenProperties<T>>::remove((collection.id, token_id));423 <TotalSupply<T>>::remove((collection.id, token_id));424 let _ = <Balance<T>>::clear_prefix((collection.id, token_id), u32::MAX, None);425 let _ = <Allowance<T>>::clear_prefix((collection.id, token_id), u32::MAX, None);426 <PalletEvm<T>>::deposit_log(427 ERC721Events::Transfer {428 from: *owner.as_eth(),429 to: H160::default(),430 token_id: token_id.into(),431 }432 .to_log(collection_id_to_address(collection.id)),433 );434 Ok(())435 }436437 /// Burn RFT token pieces438 ///439 /// `burn` will decrease total amount of token pieces and amount owned by sender.440 /// `burn` can be called even if there are multiple owners of the RFT token.441 /// If sender wouldn't have any pieces left after `burn` than she will stop being442 /// one of the owners of the token. If there is no account that owns any pieces of443 /// the token than token will be burned too.444 ///445 /// - `amount`: Amount of token pieces to burn.446 /// - `token`: Token who's pieces should be burned447 /// - `collection`: Collection that contains the token448 pub fn burn(449 collection: &RefungibleHandle<T>,450 owner: &T::CrossAccountId,451 token: TokenId,452 amount: u128,453 ) -> DispatchResult {454 let total_supply = <TotalSupply<T>>::get((collection.id, token))455 .checked_sub(amount)456 .ok_or(<CommonError<T>>::TokenValueTooLow)?;457458 // This was probally last owner of this token?459 if total_supply == 0 {460 // Ensure user actually owns this amount461 ensure!(462 <Balance<T>>::get((collection.id, token, owner)) == amount,463 <CommonError<T>>::TokenValueTooLow464 );465 let account_balance = <AccountBalance<T>>::get((collection.id, owner))466 .checked_sub(1)467 // Should not occur468 .ok_or(ArithmeticError::Underflow)?;469470 // =========471472 <Owned<T>>::remove((collection.id, owner, token));473 <PalletStructure<T>>::unnest_if_nested(owner, collection.id, token);474 <AccountBalance<T>>::insert((collection.id, owner), account_balance);475 Self::burn_token_unchecked(collection, owner, token)?;476 <PalletEvm<T>>::deposit_log(477 ERC20Events::Transfer {478 from: *owner.as_eth(),479 to: H160::default(),480 value: amount.into(),481 }482 .to_log(collection_id_to_address(collection.id)),483 );484 <PalletCommon<T>>::deposit_event(CommonEvent::ItemDestroyed(485 collection.id,486 token,487 owner.clone(),488 amount,489 ));490 return Ok(());491 }492493 let balance = <Balance<T>>::get((collection.id, token, owner))494 .checked_sub(amount)495 .ok_or(<CommonError<T>>::TokenValueTooLow)?;496 let account_balance = if balance == 0 {497 <AccountBalance<T>>::get((collection.id, owner))498 .checked_sub(1)499 // Should not occur500 .ok_or(ArithmeticError::Underflow)?501 } else {502 0503 };504505 // =========506507 if balance == 0 {508 <Owned<T>>::remove((collection.id, owner, token));509 <PalletStructure<T>>::unnest_if_nested(owner, collection.id, token);510 <Balance<T>>::remove((collection.id, token, owner));511 <AccountBalance<T>>::insert((collection.id, owner), account_balance);512513 if let Some(user) = Self::token_owner(collection.id, token) {514 <PalletEvm<T>>::deposit_log(515 ERC721Events::Transfer {516 from: erc::ADDRESS_FOR_PARTIALLY_OWNED_TOKENS,517 to: *user.as_eth(),518 token_id: token.into(),519 }520 .to_log(collection_id_to_address(collection.id)),521 );522 }523 } else {524 <Balance<T>>::insert((collection.id, token, owner), balance);525 }526 <TotalSupply<T>>::insert((collection.id, token), total_supply);527528 <PalletEvm<T>>::deposit_log(529 ERC20Events::Transfer {530 from: *owner.as_eth(),531 to: H160::default(),532 value: amount.into(),533 }534 .to_log(T::EvmTokenAddressMapping::token_to_address(535 collection.id,536 token,537 )),538 );539 <PalletCommon<T>>::deposit_event(CommonEvent::ItemDestroyed(540 collection.id,541 token,542 owner.clone(),543 amount,544 ));545 Ok(())546 }547548 #[transactional]549 fn modify_token_properties(550 collection: &RefungibleHandle<T>,551 sender: &T::CrossAccountId,552 token_id: TokenId,553 properties: impl Iterator<Item = (PropertyKey, Option<PropertyValue>)>,554 is_token_create: bool,555 nesting_budget: &dyn Budget,556 ) -> DispatchResult {557 let is_collection_admin = || collection.is_owner_or_admin(sender);558 let is_token_owner = || -> Result<bool, DispatchError> {559 let balance = collection.balance(sender.clone(), token_id);560 let total_pieces: u128 =561 Self::total_pieces(collection.id, token_id).unwrap_or(u128::MAX);562 if balance != total_pieces {563 return Ok(false);564 }565566 let is_bundle_owner = <PalletStructure<T>>::check_indirectly_owned(567 sender.clone(),568 collection.id,569 token_id,570 None,571 nesting_budget,572 )?;573574 Ok(is_bundle_owner)575 };576577 for (key, value) in properties {578 let permission = <PalletCommon<T>>::property_permissions(collection.id)579 .get(&key)580 .cloned()581 .unwrap_or_else(PropertyPermission::none);582583 let is_property_exists = TokenProperties::<T>::get((collection.id, token_id))584 .get(&key)585 .is_some();586587 match permission {588 PropertyPermission { mutable: false, .. } if is_property_exists => {589 return Err(<CommonError<T>>::NoPermission.into());590 }591592 PropertyPermission {593 collection_admin,594 token_owner,595 ..596 } => {597 //TODO: investigate threats during public minting.598 let is_token_create =599 is_token_create && (collection_admin || token_owner) && value.is_some();600 if !(is_token_create601 || (collection_admin && is_collection_admin())602 || (token_owner && is_token_owner()?))603 {604 fail!(<CommonError<T>>::NoPermission);605 }606 }607 }608609 match value {610 Some(value) => {611 <TokenProperties<T>>::try_mutate((collection.id, token_id), |properties| {612 properties.try_set(key.clone(), value)613 })614 .map_err(<CommonError<T>>::from)?;615616 <PalletCommon<T>>::deposit_event(CommonEvent::TokenPropertySet(617 collection.id,618 token_id,619 key,620 ));621 }622 None => {623 <TokenProperties<T>>::try_mutate((collection.id, token_id), |properties| {624 properties.remove(&key)625 })626 .map_err(<CommonError<T>>::from)?;627628 <PalletCommon<T>>::deposit_event(CommonEvent::TokenPropertyDeleted(629 collection.id,630 token_id,631 key,632 ));633 }634 }635 }636637 Ok(())638 }639640 pub fn set_token_properties(641 collection: &RefungibleHandle<T>,642 sender: &T::CrossAccountId,643 token_id: TokenId,644 properties: impl Iterator<Item = Property>,645 is_token_create: bool,646 nesting_budget: &dyn Budget,647 ) -> DispatchResult {648 Self::modify_token_properties(649 collection,650 sender,651 token_id,652 properties.map(|p| (p.key, Some(p.value))),653 is_token_create,654 nesting_budget,655 )656 }657658 pub fn set_token_property(659 collection: &RefungibleHandle<T>,660 sender: &T::CrossAccountId,661 token_id: TokenId,662 property: Property,663 nesting_budget: &dyn Budget,664 ) -> DispatchResult {665 let is_token_create = false;666667 Self::set_token_properties(668 collection,669 sender,670 token_id,671 [property].into_iter(),672 is_token_create,673 nesting_budget,674 )675 }676677 pub fn delete_token_properties(678 collection: &RefungibleHandle<T>,679 sender: &T::CrossAccountId,680 token_id: TokenId,681 property_keys: impl Iterator<Item = PropertyKey>,682 nesting_budget: &dyn Budget,683 ) -> DispatchResult {684 let is_token_create = false;685686 Self::modify_token_properties(687 collection,688 sender,689 token_id,690 property_keys.into_iter().map(|key| (key, None)),691 is_token_create,692 nesting_budget,693 )694 }695696 pub fn delete_token_property(697 collection: &RefungibleHandle<T>,698 sender: &T::CrossAccountId,699 token_id: TokenId,700 property_key: PropertyKey,701 nesting_budget: &dyn Budget,702 ) -> DispatchResult {703 Self::delete_token_properties(704 collection,705 sender,706 token_id,707 [property_key].into_iter(),708 nesting_budget,709 )710 }711712 /// Transfer RFT token pieces from one account to another.713 ///714 /// If the sender is no longer owns any pieces after the `transfer` than she stops being an owner of the token.715 ///716 /// - `from`: Owner of token pieces to transfer.717 /// - `to`: Recepient of transfered token pieces.718 /// - `amount`: Amount of token pieces to transfer.719 /// - `token`: Token whos pieces should be transfered720 /// - `collection`: Collection that contains the token721 pub fn transfer(722 collection: &RefungibleHandle<T>,723 from: &T::CrossAccountId,724 to: &T::CrossAccountId,725 token: TokenId,726 amount: u128,727 nesting_budget: &dyn Budget,728 ) -> DispatchResult {729 ensure!(730 collection.limits.transfers_enabled(),731 <CommonError<T>>::TransferNotAllowed732 );733734 if collection.permissions.access() == AccessMode::AllowList {735 collection.check_allowlist(from)?;736 collection.check_allowlist(to)?;737 }738 <PalletCommon<T>>::ensure_correct_receiver(to)?;739740 let initial_balance_from = <Balance<T>>::get((collection.id, token, from));741 let updated_balance_from = initial_balance_from742 .checked_sub(amount)743 .ok_or(<CommonError<T>>::TokenValueTooLow)?;744 let mut create_target = false;745 let from_to_differ = from != to;746 let updated_balance_to = if from != to {747 let old_balance = <Balance<T>>::get((collection.id, token, to));748 if old_balance == 0 {749 create_target = true;750 }751 Some(752 old_balance753 .checked_add(amount)754 .ok_or(ArithmeticError::Overflow)?,755 )756 } else {757 None758 };759760 let account_balance_from = if updated_balance_from == 0 {761 Some(762 <AccountBalance<T>>::get((collection.id, from))763 .checked_sub(1)764 // Should not occur765 .ok_or(ArithmeticError::Underflow)?,766 )767 } else {768 None769 };770 // Account data is created in token, AccountBalance should be increased771 // But only if from != to as we shouldn't check overflow in this case772 let account_balance_to = if create_target && from_to_differ {773 let account_balance_to = <AccountBalance<T>>::get((collection.id, to))774 .checked_add(1)775 .ok_or(ArithmeticError::Overflow)?;776 ensure!(777 account_balance_to < collection.limits.account_token_ownership_limit(),778 <CommonError<T>>::AccountTokenLimitExceeded,779 );780781 Some(account_balance_to)782 } else {783 None784 };785786 // =========787788 <PalletStructure<T>>::nest_if_sent_to_token(789 from.clone(),790 to,791 collection.id,792 token,793 nesting_budget,794 )?;795796 if let Some(updated_balance_to) = updated_balance_to {797 // from != to798 if updated_balance_from == 0 {799 <Balance<T>>::remove((collection.id, token, from));800 <PalletStructure<T>>::unnest_if_nested(from, collection.id, token);801 } else {802 <Balance<T>>::insert((collection.id, token, from), updated_balance_from);803 }804 <Balance<T>>::insert((collection.id, token, to), updated_balance_to);805 if let Some(account_balance_from) = account_balance_from {806 <AccountBalance<T>>::insert((collection.id, from), account_balance_from);807 <Owned<T>>::remove((collection.id, from, token));808 }809 if let Some(account_balance_to) = account_balance_to {810 <AccountBalance<T>>::insert((collection.id, to), account_balance_to);811 <Owned<T>>::insert((collection.id, to, token), true);812 }813 }814815 <PalletEvm<T>>::deposit_log(816 ERC20Events::Transfer {817 from: *from.as_eth(),818 to: *to.as_eth(),819 value: amount.into(),820 }821 .to_log(T::EvmTokenAddressMapping::token_to_address(822 collection.id,823 token,824 )),825 );826827 <PalletCommon<T>>::deposit_event(CommonEvent::Transfer(828 collection.id,829 token,830 from.clone(),831 to.clone(),832 amount,833 ));834835 let total_supply = <TotalSupply<T>>::get((collection.id, token));836837 if amount == total_supply {838 // if token was fully owned by `from` and will be fully owned by `to` after transfer839 <PalletEvm<T>>::deposit_log(840 ERC721Events::Transfer {841 from: *from.as_eth(),842 to: *to.as_eth(),843 token_id: token.into(),844 }845 .to_log(collection_id_to_address(collection.id)),846 );847 } else if let Some(updated_balance_to) = updated_balance_to {848 // if `from` not equals `to`. This condition is needed to avoid sending event849 // when `from` fully owns token and sends part of token pieces to itself.850 if initial_balance_from == total_supply {851 // if token was fully owned by `from` and will be only partially owned by `to`852 // and `from` after transfer853 <PalletEvm<T>>::deposit_log(854 ERC721Events::Transfer {855 from: *from.as_eth(),856 to: erc::ADDRESS_FOR_PARTIALLY_OWNED_TOKENS,857 token_id: token.into(),858 }859 .to_log(collection_id_to_address(collection.id)),860 );861 } else if updated_balance_to == total_supply {862 // if token was partially owned by `from` and will be fully owned by `to` after transfer863 <PalletEvm<T>>::deposit_log(864 ERC721Events::Transfer {865 from: erc::ADDRESS_FOR_PARTIALLY_OWNED_TOKENS,866 to: *to.as_eth(),867 token_id: token.into(),868 }869 .to_log(collection_id_to_address(collection.id)),870 );871 }872 }873874 Ok(())875 }876877 /// Batched operation to create multiple RFT tokens.878 ///879 /// Same as `create_item` but creates multiple tokens.880 ///881 /// - `data`: Same as 'data` in `create_item` but contains data for multiple tokens.882 pub fn create_multiple_items(883 collection: &RefungibleHandle<T>,884 sender: &T::CrossAccountId,885 data: Vec<CreateItemData<T::CrossAccountId>>,886 nesting_budget: &dyn Budget,887 ) -> DispatchResult {888 if !collection.is_owner_or_admin(sender) {889 ensure!(890 collection.permissions.mint_mode(),891 <CommonError<T>>::PublicMintingNotAllowed892 );893 collection.check_allowlist(sender)?;894895 for item in data.iter() {896 for user in item.users.keys() {897 collection.check_allowlist(user)?;898 }899 }900 }901902 for item in data.iter() {903 for (owner, _) in item.users.iter() {904 <PalletCommon<T>>::ensure_correct_receiver(owner)?;905 }906 }907908 // Total pieces per tokens909 let totals = data910 .iter()911 .map(|data| {912 Ok(data913 .users914 .iter()915 .map(|u| u.1)916 .try_fold(0u128, |acc, v| acc.checked_add(*v))917 .ok_or(ArithmeticError::Overflow)?)918 })919 .collect::<Result<Vec<_>, DispatchError>>()?;920 for total in &totals {921 ensure!(922 *total <= MAX_REFUNGIBLE_PIECES,923 <Error<T>>::WrongRefungiblePieces924 );925 }926927 let first_token_id = <TokensMinted<T>>::get(collection.id);928 let tokens_minted = first_token_id929 .checked_add(data.len() as u32)930 .ok_or(ArithmeticError::Overflow)?;931 ensure!(932 tokens_minted < collection.limits.token_limit(),933 <CommonError<T>>::CollectionTokenLimitExceeded934 );935936 let mut balances = BTreeMap::new();937 for data in &data {938 for owner in data.users.keys() {939 let balance = balances940 .entry(owner)941 .or_insert_with(|| <AccountBalance<T>>::get((collection.id, owner)));942 *balance = balance.checked_add(1).ok_or(ArithmeticError::Overflow)?;943944 ensure!(945 *balance <= collection.limits.account_token_ownership_limit(),946 <CommonError<T>>::AccountTokenLimitExceeded,947 );948 }949 }950951 for (i, token) in data.iter().enumerate() {952 let token_id = TokenId(first_token_id + i as u32 + 1);953 for (to, _) in token.users.iter() {954 <PalletStructure<T>>::check_nesting(955 sender.clone(),956 to,957 collection.id,958 token_id,959 nesting_budget,960 )?;961 }962 }963964 // =========965966 with_transaction(|| {967 for (i, data) in data.iter().enumerate() {968 let token_id = first_token_id + i as u32 + 1;969 <TotalSupply<T>>::insert((collection.id, token_id), totals[i]);970971 for (user, amount) in data.users.iter() {972 if *amount == 0 {973 continue;974 }975 <Balance<T>>::insert((collection.id, token_id, &user), amount);976 <Owned<T>>::insert((collection.id, &user, TokenId(token_id)), true);977 <PalletStructure<T>>::nest_if_sent_to_token_unchecked(978 user,979 collection.id,980 TokenId(token_id),981 );982 }983984 if let Err(e) = Self::set_token_properties(985 collection,986 sender,987 TokenId(token_id),988 data.properties.clone().into_iter(),989 true,990 nesting_budget,991 ) {992 return TransactionOutcome::Rollback(Err(e));993 }994 }995 TransactionOutcome::Commit(Ok(()))996 })?;997998 <TokensMinted<T>>::insert(collection.id, tokens_minted);9991000 for (account, balance) in balances {1001 <AccountBalance<T>>::insert((collection.id, account), balance);1002 }10031004 for (i, token) in data.into_iter().enumerate() {1005 let token_id = first_token_id + i as u32 + 1;10061007 let receivers = token1008 .users1009 .into_iter()1010 .filter(|(_, amount)| *amount > 0)1011 .collect::<Vec<_>>();10121013 if let [(user, _)] = receivers.as_slice() {1014 // if there is exactly one receiver1015 <PalletEvm<T>>::deposit_log(1016 ERC721Events::Transfer {1017 from: H160::default(),1018 to: *user.as_eth(),1019 token_id: token_id.into(),1020 }1021 .to_log(collection_id_to_address(collection.id)),1022 );1023 } else if let [_, ..] = receivers.as_slice() {1024 // if there is more than one receiver1025 <PalletEvm<T>>::deposit_log(1026 ERC721Events::Transfer {1027 from: H160::default(),1028 to: erc::ADDRESS_FOR_PARTIALLY_OWNED_TOKENS,1029 token_id: token_id.into(),1030 }1031 .to_log(collection_id_to_address(collection.id)),1032 );1033 }10341035 for (user, amount) in receivers.into_iter() {1036 <PalletEvm<T>>::deposit_log(1037 ERC20Events::Transfer {1038 from: H160::default(),1039 to: *user.as_eth(),1040 value: amount.into(),1041 }1042 .to_log(T::EvmTokenAddressMapping::token_to_address(1043 collection.id,1044 TokenId(token_id),1045 )),1046 );1047 <PalletCommon<T>>::deposit_event(CommonEvent::ItemCreated(1048 collection.id,1049 TokenId(token_id),1050 user,1051 amount,1052 ));1053 }1054 }1055 Ok(())1056 }10571058 pub fn set_allowance_unchecked(1059 collection: &RefungibleHandle<T>,1060 sender: &T::CrossAccountId,1061 spender: &T::CrossAccountId,1062 token: TokenId,1063 amount: u128,1064 ) {1065 if amount == 0 {1066 <Allowance<T>>::remove((collection.id, token, sender, spender));1067 } else {1068 <Allowance<T>>::insert((collection.id, token, sender, spender), amount);1069 }10701071 <PalletEvm<T>>::deposit_log(1072 ERC20Events::Approval {1073 owner: *sender.as_eth(),1074 spender: *spender.as_eth(),1075 value: amount.into(),1076 }1077 .to_log(T::EvmTokenAddressMapping::token_to_address(1078 collection.id,1079 token,1080 )),1081 );1082 <PalletCommon<T>>::deposit_event(CommonEvent::Approved(1083 collection.id,1084 token,1085 sender.clone(),1086 spender.clone(),1087 amount,1088 ))1089 }10901091 /// Set allowance for the spender to `transfer` or `burn` sender's token pieces.1092 ///1093 /// - `amount`: Amount of token pieces the spender is allowed to `transfer` or `burn.1094 pub fn set_allowance(1095 collection: &RefungibleHandle<T>,1096 sender: &T::CrossAccountId,1097 spender: &T::CrossAccountId,1098 token: TokenId,1099 amount: u128,1100 ) -> DispatchResult {1101 if collection.permissions.access() == AccessMode::AllowList {1102 collection.check_allowlist(sender)?;1103 collection.check_allowlist(spender)?;1104 }11051106 <PalletCommon<T>>::ensure_correct_receiver(spender)?;11071108 if <Balance<T>>::get((collection.id, token, sender)) < amount {1109 ensure!(1110 collection.ignores_owned_amount(sender) && Self::token_exists(collection, token),1111 <CommonError<T>>::CantApproveMoreThanOwned1112 );1113 }11141115 // =========11161117 Self::set_allowance_unchecked(collection, sender, spender, token, amount);1118 Ok(())1119 }11201121 /// Returns allowance, which should be set after transaction1122 fn check_allowed(1123 collection: &RefungibleHandle<T>,1124 spender: &T::CrossAccountId,1125 from: &T::CrossAccountId,1126 token: TokenId,1127 amount: u128,1128 nesting_budget: &dyn Budget,1129 ) -> Result<Option<u128>, DispatchError> {1130 if spender.conv_eq(from) {1131 return Ok(None);1132 }1133 if collection.permissions.access() == AccessMode::AllowList {1134 // `from`, `to` checked in [`transfer`]1135 collection.check_allowlist(spender)?;1136 }1137 if let Some(source) = T::CrossTokenAddressMapping::address_to_token(from) {1138 // TODO: should collection owner be allowed to perform this transfer?1139 ensure!(1140 <PalletStructure<T>>::check_indirectly_owned(1141 spender.clone(),1142 source.0,1143 source.1,1144 None,1145 nesting_budget1146 )?,1147 <CommonError<T>>::ApprovedValueTooLow,1148 );1149 return Ok(None);1150 }1151 let allowance =1152 <Allowance<T>>::get((collection.id, token, from, &spender)).checked_sub(amount);1153 if allowance.is_none() {1154 ensure!(1155 collection.ignores_allowance(spender),1156 <CommonError<T>>::ApprovedValueTooLow1157 );1158 }1159 Ok(allowance)1160 }11611162 /// Transfer RFT token pieces from one account to another.1163 ///1164 /// Same as the [`transfer`] but spender doesn't needs to be an owner of the token pieces.1165 /// The owner should set allowance for the spender to transfer pieces.1166 ///1167 /// [`transfer`]: struct.Pallet.html#method.transfer1168 pub fn transfer_from(1169 collection: &RefungibleHandle<T>,1170 spender: &T::CrossAccountId,1171 from: &T::CrossAccountId,1172 to: &T::CrossAccountId,1173 token: TokenId,1174 amount: u128,1175 nesting_budget: &dyn Budget,1176 ) -> DispatchResult {1177 let allowance =1178 Self::check_allowed(collection, spender, from, token, amount, nesting_budget)?;11791180 // =========11811182 Self::transfer(collection, from, to, token, amount, nesting_budget)?;1183 if let Some(allowance) = allowance {1184 Self::set_allowance_unchecked(collection, from, spender, token, allowance);1185 }1186 Ok(())1187 }11881189 /// Burn RFT token pieces from the account.1190 ///1191 /// Same as the [`burn`] but spender doesn't need to be an owner of the token pieces. The owner should1192 /// set allowance for the spender to burn pieces1193 ///1194 /// [`burn`]: struct.Pallet.html#method.burn1195 pub fn burn_from(1196 collection: &RefungibleHandle<T>,1197 spender: &T::CrossAccountId,1198 from: &T::CrossAccountId,1199 token: TokenId,1200 amount: u128,1201 nesting_budget: &dyn Budget,1202 ) -> DispatchResult {1203 let allowance =1204 Self::check_allowed(collection, spender, from, token, amount, nesting_budget)?;12051206 // =========12071208 Self::burn(collection, from, token, amount)?;1209 if let Some(allowance) = allowance {1210 Self::set_allowance_unchecked(collection, from, spender, token, allowance);1211 }1212 Ok(())1213 }12141215 /// Create RFT token.1216 ///1217 /// The sender should be the owner/admin of the collection or collection should be configured1218 /// to allow public minting.1219 ///1220 /// - `data`: Contains list of users who will become the owners of the token pieces and amount1221 /// of token pieces they will receive.1222 pub fn create_item(1223 collection: &RefungibleHandle<T>,1224 sender: &T::CrossAccountId,1225 data: CreateItemData<T::CrossAccountId>,1226 nesting_budget: &dyn Budget,1227 ) -> DispatchResult {1228 Self::create_multiple_items(collection, sender, vec![data], nesting_budget)1229 }12301231 /// Repartition RFT token.1232 ///1233 /// `repartition` will set token balance of the sender and total amount of token pieces.1234 /// Sender should own all of the token pieces. `repartition' could be done even if some1235 /// token pieces were burned before.1236 ///1237 /// - `amount`: Total amount of token pieces that the token will have after `repartition`.1238 pub fn repartition(1239 collection: &RefungibleHandle<T>,1240 owner: &T::CrossAccountId,1241 token: TokenId,1242 amount: u128,1243 ) -> DispatchResult {1244 ensure!(1245 amount <= MAX_REFUNGIBLE_PIECES,1246 <Error<T>>::WrongRefungiblePieces1247 );1248 ensure!(amount > 0, <CommonError<T>>::TokenValueTooLow);1249 // Ensure user owns all pieces1250 let total_pieces = Self::total_pieces(collection.id, token).unwrap_or(u128::MAX);1251 let balance = <Balance<T>>::get((collection.id, token, owner));1252 ensure!(1253 total_pieces == balance,1254 <Error<T>>::RepartitionWhileNotOwningAllPieces1255 );12561257 <Balance<T>>::insert((collection.id, token, owner), amount);1258 <TotalSupply<T>>::insert((collection.id, token), amount);12591260 if amount > total_pieces {1261 let mint_amount = amount - total_pieces;1262 <PalletEvm<T>>::deposit_log(1263 ERC20Events::Transfer {1264 from: H160::default(),1265 to: *owner.as_eth(),1266 value: mint_amount.into(),1267 }1268 .to_log(T::EvmTokenAddressMapping::token_to_address(1269 collection.id,1270 token,1271 )),1272 );1273 <PalletCommon<T>>::deposit_event(CommonEvent::ItemCreated(1274 collection.id,1275 token,1276 owner.clone(),1277 mint_amount,1278 ));1279 } else if total_pieces > amount {1280 let burn_amount = total_pieces - amount;1281 <PalletEvm<T>>::deposit_log(1282 ERC20Events::Transfer {1283 from: *owner.as_eth(),1284 to: H160::default(),1285 value: burn_amount.into(),1286 }1287 .to_log(T::EvmTokenAddressMapping::token_to_address(1288 collection.id,1289 token,1290 )),1291 );1292 <PalletCommon<T>>::deposit_event(CommonEvent::ItemDestroyed(1293 collection.id,1294 token,1295 owner.clone(),1296 burn_amount,1297 ));1298 }12991300 Ok(())1301 }13021303 fn token_owner(collection_id: CollectionId, token_id: TokenId) -> Option<T::CrossAccountId> {1304 let mut owner = None;1305 let mut count = 0;1306 for key in Balance::<T>::iter_key_prefix((collection_id, token_id)) {1307 count += 1;1308 if count > 1 {1309 return None;1310 }1311 owner = Some(key);1312 }1313 owner1314 }13151316 fn total_pieces(collection_id: CollectionId, token_id: TokenId) -> Option<u128> {1317 <TotalSupply<T>>::try_get((collection_id, token_id)).ok()1318 }13191320 pub fn set_collection_properties(1321 collection: &RefungibleHandle<T>,1322 sender: &T::CrossAccountId,1323 properties: Vec<Property>,1324 ) -> DispatchResult {1325 <PalletCommon<T>>::set_collection_properties(collection, sender, properties)1326 }13271328 pub fn delete_collection_properties(1329 collection: &RefungibleHandle<T>,1330 sender: &T::CrossAccountId,1331 property_keys: Vec<PropertyKey>,1332 ) -> DispatchResult {1333 <PalletCommon<T>>::delete_collection_properties(collection, sender, property_keys)1334 }13351336 pub fn set_token_property_permissions(1337 collection: &RefungibleHandle<T>,1338 sender: &T::CrossAccountId,1339 property_permissions: Vec<PropertyKeyPermission>,1340 ) -> DispatchResult {1341 <PalletCommon<T>>::set_token_property_permissions(collection, sender, property_permissions)1342 }13431344 pub fn set_scoped_token_property_permissions(1345 collection: &RefungibleHandle<T>,1346 sender: &T::CrossAccountId,1347 scope: PropertyScope,1348 property_permissions: Vec<PropertyKeyPermission>,1349 ) -> DispatchResult {1350 <PalletCommon<T>>::set_scoped_token_property_permissions(1351 collection,1352 sender,1353 scope,1354 property_permissions,1355 )1356 }13571358 /// Returns 10 token in no particular order.1359 ///1360 /// There is no direct way to get token holders in ascending order,1361 /// since `iter_prefix` returns values in no particular order.1362 /// Therefore, getting the 10 largest holders with a large value of holders1363 /// can lead to impact memory allocation + sorting with `n * log (n)`.1364 pub fn token_owners(1365 collection_id: CollectionId,1366 token: TokenId,1367 ) -> Option<Vec<T::CrossAccountId>> {1368 let res: Vec<T::CrossAccountId> = <Balance<T>>::iter_prefix((collection_id, token))1369 .map(|(owner, _amount)| owner)1370 .take(10)1371 .collect();13721373 if res.is_empty() {1374 None1375 } else {1376 Some(res)1377 }1378 }1379}1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617//! # Refungible Pallet18//!19//! The Refungible pallet provides functionality for handling refungible collections and tokens.20//!21//! - [`Config`]22//! - [`RefungibleHandle`]23//! - [`Pallet`]24//! - [`CommonWeights`](common::CommonWeights)25//!26//! ## Overview27//!28//! The Refungible pallet provides functions for:29//!30//! - RFT collection creation and removal31//! - Minting and burning of RFT tokens32//! - Partition and repartition of RFT tokens33//! - Retrieving number of pieces of RFT token34//! - Retrieving account balances35//! - Transfering RFT token pieces36//! - Burning RFT token pieces37//! - Setting and checking allowance for RFT tokens38//!39//! ### Terminology40//!41//! - **RFT token:** Non fungible token that was partitioned to pieces. If an account owns all42//! of the RFT token pieces than it owns the RFT token and can repartition it.43//!44//! - **RFT Collection:** A collection of RFT tokens. All RFT tokens are part of a collection.45//! Each collection has its own settings and set of permissions.46//!47//! - **RFT token piece:** A fungible part of an RFT token.48//!49//! - **Balance:** RFT token pieces owned by an account50//!51//! - **Allowance:** Maximum number of RFT token pieces that one account is allowed to52//! transfer from the balance of another account53//!54//! - **Burning:** The process of “deleting” a token from a collection or removing token pieces from55//! an account balance.56//!57//! ### Implementations58//!59//! The Refungible pallet provides implementations for the following traits. If these traits provide60//! the functionality that you need, then you can avoid coupling with the Refungible pallet.61//!62//! - [`CommonWeightInfo`](pallet_common::CommonWeightInfo): Functions for retrieval of transaction weight63//! - [`CommonCollectionOperations`](pallet_common::CommonCollectionOperations): Functions for dealing64//! with collections65//! - [`RefungibleExtensions`](pallet_common::RefungibleExtensions): Functions specific for refungible66//! collection67//!68//! ## Interface69//!70//! ### Dispatchable Functions71//!72//! - `init_collection` - Create RFT collection. RFT collection can be configured to allow or deny access for73//! some accounts.74//! - `destroy_collection` - Destroy exising RFT collection. There should be no tokens in the collection.75//! - `burn` - Burn some amount of RFT token pieces owned by account. Burns the RFT token if no pieces left.76//! - `transfer` - Transfer some amount of RFT token pieces. Transfers should be enabled for RFT collection.77//! Nests the RFT token if RFT token pieces are sent to another token.78//! - `create_item` - Mint RFT token in collection. Sender should have permission to mint tokens.79//! - `set_allowance` - Set allowance for another account to transfer balance from sender's account.80//! - `repartition` - Repartition token to selected number of pieces. Sender should own all existing pieces.81//!82//! ## Assumptions83//!84//! * Total number of pieces for one token shouldn't exceed `up_data_structs::MAX_REFUNGIBLE_PIECES`.85//! * Total number of tokens of all types shouldn't be greater than `up_data_structs::MAX_TOKEN_PREFIX_LENGTH`.86//! * Sender should be in collection's allow list to perform operations on tokens.8788#![cfg_attr(not(feature = "std"), no_std)]8990use crate::erc_token::ERC20Events;91use crate::erc::ERC721Events;9293use codec::{Encode, Decode, MaxEncodedLen};94use core::ops::Deref;95use derivative::Derivative;96use evm_coder::ToLog;97use frame_support::{98 BoundedBTreeMap, BoundedVec, ensure, fail, storage::with_transaction, transactional,99 pallet_prelude::ConstU32,100};101use pallet_evm::{account::CrossAccountId, Pallet as PalletEvm};102use pallet_evm_coder_substrate::WithRecorder;103use pallet_common::{104 CommonCollectionOperations,105 erc::static_property::{key, value},106 Error as CommonError,107 eth::collection_id_to_address,108 Event as CommonEvent, Pallet as PalletCommon,109};110use pallet_structure::Pallet as PalletStructure;111use scale_info::TypeInfo;112use sp_core::H160;113use sp_runtime::{ArithmeticError, DispatchError, DispatchResult, TransactionOutcome};114use sp_std::{vec::Vec, vec, collections::btree_map::BTreeMap};115use up_data_structs::{116 AccessMode, budget::Budget, CollectionId, CollectionFlags, CollectionPropertiesVec,117 CreateCollectionData, CustomDataLimit, mapping::TokenAddressMapping, MAX_ITEMS_PER_BATCH,118 MAX_REFUNGIBLE_PIECES, Property, PropertyKey, PropertyKeyPermission, PropertyPermission,119 PropertyScope, PropertyValue, TokenId, TrySetProperty,120};121122pub use pallet::*;123#[cfg(feature = "runtime-benchmarks")]124pub mod benchmarking;125pub mod common;126pub mod erc;127pub mod erc_token;128pub mod weights;129130#[derive(Derivative, Clone)]131pub struct CreateItemData<CrossAccountId> {132 #[derivative(Debug(format_with = "bounded::map_debug"))]133 pub users: BoundedBTreeMap<CrossAccountId, u128, ConstU32<MAX_ITEMS_PER_BATCH>>,134 #[derivative(Debug(format_with = "bounded::vec_debug"))]135 pub properties: CollectionPropertiesVec,136}137pub(crate) type SelfWeightOf<T> = <T as Config>::WeightInfo;138139/// Token data, stored independently from other data used to describe it140/// for the convenience of database access. Notably contains the token metadata.141#[struct_versioning::versioned(version = 2, upper)]142#[derive(Encode, Decode, Default, TypeInfo, MaxEncodedLen)]143#[deprecated(since = "0.2.0", note = "ItemData is no more contains usefull data")]144pub struct ItemData {145 pub const_data: BoundedVec<u8, CustomDataLimit>,146147 #[version(..2)]148 pub variable_data: BoundedVec<u8, CustomDataLimit>,149}150151#[frame_support::pallet]152pub mod pallet {153 use super::*;154 use frame_support::{155 Blake2_128, Blake2_128Concat, Twox64Concat, pallet_prelude::*, storage::Key,156 traits::StorageVersion,157 };158 use frame_system::pallet_prelude::*;159 use up_data_structs::{CollectionId, TokenId};160 use super::weights::WeightInfo;161162 #[pallet::error]163 pub enum Error<T> {164 /// Not Refungible item data used to mint in Refungible collection.165 NotRefungibleDataUsedToMintFungibleCollectionToken,166 /// Maximum refungibility exceeded.167 WrongRefungiblePieces,168 /// Refungible token can't be repartitioned by user who isn't owns all pieces.169 RepartitionWhileNotOwningAllPieces,170 /// Refungible token can't nest other tokens.171 RefungibleDisallowsNesting,172 /// Setting item properties is not allowed.173 SettingPropertiesNotAllowed,174 }175176 #[pallet::config]177 pub trait Config:178 frame_system::Config + pallet_common::Config + pallet_structure::Config179 {180 type WeightInfo: WeightInfo;181 }182183 const STORAGE_VERSION: StorageVersion = StorageVersion::new(2);184185 #[pallet::pallet]186 #[pallet::storage_version(STORAGE_VERSION)]187 #[pallet::generate_store(pub(super) trait Store)]188 pub struct Pallet<T>(_);189190 /// Total amount of minted tokens in a collection.191 #[pallet::storage]192 pub type TokensMinted<T: Config> =193 StorageMap<Hasher = Twox64Concat, Key = CollectionId, Value = u32, QueryKind = ValueQuery>;194195 /// Amount of tokens burnt in a collection.196 #[pallet::storage]197 pub type TokensBurnt<T: Config> =198 StorageMap<Hasher = Twox64Concat, Key = CollectionId, Value = u32, QueryKind = ValueQuery>;199200 /// Token data, used to partially describe a token.201 // TODO: remove202 #[pallet::storage]203 #[deprecated(since = "0.2.0", note = "ItemData is no more contains usefull data")]204 pub type TokenData<T: Config> = StorageNMap<205 Key = (Key<Twox64Concat, CollectionId>, Key<Twox64Concat, TokenId>),206 Value = ItemData,207 QueryKind = ValueQuery,208 >;209210 /// Amount of pieces a refungible token is split into.211 #[pallet::storage]212 #[pallet::getter(fn token_properties)]213 pub type TokenProperties<T: Config> = StorageNMap<214 Key = (Key<Twox64Concat, CollectionId>, Key<Twox64Concat, TokenId>),215 Value = up_data_structs::Properties,216 QueryKind = ValueQuery,217 OnEmpty = up_data_structs::TokenProperties,218 >;219220 /// Total amount of pieces for token221 #[pallet::storage]222 pub type TotalSupply<T: Config> = StorageNMap<223 Key = (Key<Twox64Concat, CollectionId>, Key<Twox64Concat, TokenId>),224 Value = u128,225 QueryKind = ValueQuery,226 >;227228 /// Used to enumerate tokens owned by account.229 #[pallet::storage]230 pub type Owned<T: Config> = StorageNMap<231 Key = (232 Key<Twox64Concat, CollectionId>,233 Key<Blake2_128Concat, T::CrossAccountId>,234 Key<Twox64Concat, TokenId>,235 ),236 Value = bool,237 QueryKind = ValueQuery,238 >;239240 /// Amount of tokens (not pieces) partially owned by an account within a collection.241 #[pallet::storage]242 pub type AccountBalance<T: Config> = StorageNMap<243 Key = (244 Key<Twox64Concat, CollectionId>,245 // Owner246 Key<Blake2_128Concat, T::CrossAccountId>,247 ),248 Value = u32,249 QueryKind = ValueQuery,250 >;251252 /// Amount of token pieces owned by account.253 #[pallet::storage]254 pub type Balance<T: Config> = StorageNMap<255 Key = (256 Key<Twox64Concat, CollectionId>,257 Key<Twox64Concat, TokenId>,258 // Owner259 Key<Blake2_128Concat, T::CrossAccountId>,260 ),261 Value = u128,262 QueryKind = ValueQuery,263 >;264265 /// Allowance set by a token owner for another user to perform one of certain transactions on a number of pieces of a token.266 #[pallet::storage]267 pub type Allowance<T: Config> = StorageNMap<268 Key = (269 Key<Twox64Concat, CollectionId>,270 Key<Twox64Concat, TokenId>,271 // Owner272 Key<Blake2_128, T::CrossAccountId>,273 // Spender274 Key<Blake2_128Concat, T::CrossAccountId>,275 ),276 Value = u128,277 QueryKind = ValueQuery,278 >;279280 #[pallet::hooks]281 impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {282 fn on_runtime_upgrade() -> Weight {283 let storage_version = StorageVersion::get::<Pallet<T>>();284 if storage_version < StorageVersion::new(2) {285 <TokenData<T>>::remove_all(None);286 }287 StorageVersion::new(2).put::<Pallet<T>>();288289 Weight::zero()290 }291 }292}293294pub struct RefungibleHandle<T: Config>(pallet_common::CollectionHandle<T>);295impl<T: Config> RefungibleHandle<T> {296 pub fn cast(inner: pallet_common::CollectionHandle<T>) -> Self {297 Self(inner)298 }299 pub fn into_inner(self) -> pallet_common::CollectionHandle<T> {300 self.0301 }302 pub fn common_mut(&mut self) -> &mut pallet_common::CollectionHandle<T> {303 &mut self.0304 }305}306307impl<T: Config> RefungibleHandle<T> {308 pub fn supports_metadata(&self) -> bool {309 if let Some(erc721_metadata) =310 pallet_common::Pallet::<T>::get_collection_property(self.id, &key::erc721_metadata())311 {312 *erc721_metadata.into_inner() == *value::ERC721_METADATA_SUPPORTED313 } else {314 false315 }316 }317}318319impl<T: Config> Deref for RefungibleHandle<T> {320 type Target = pallet_common::CollectionHandle<T>;321322 fn deref(&self) -> &Self::Target {323 &self.0324 }325}326327impl<T: Config> WithRecorder<T> for RefungibleHandle<T> {328 fn recorder(&self) -> &pallet_evm_coder_substrate::SubstrateRecorder<T> {329 self.0.recorder()330 }331 fn into_recorder(self) -> pallet_evm_coder_substrate::SubstrateRecorder<T> {332 self.0.into_recorder()333 }334}335336impl<T: Config> Pallet<T> {337 /// Get number of RFT tokens in collection338 pub fn total_supply(collection: &RefungibleHandle<T>) -> u32 {339 <TokensMinted<T>>::get(collection.id) - <TokensBurnt<T>>::get(collection.id)340 }341342 /// Check that RFT token exists343 ///344 /// - `token`: Token ID.345 pub fn token_exists(collection: &RefungibleHandle<T>, token: TokenId) -> bool {346 <TotalSupply<T>>::contains_key((collection.id, token))347 }348349 pub fn set_scoped_token_property(350 collection_id: CollectionId,351 token_id: TokenId,352 scope: PropertyScope,353 property: Property,354 ) -> DispatchResult {355 TokenProperties::<T>::try_mutate((collection_id, token_id), |properties| {356 properties.try_scoped_set(scope, property.key, property.value)357 })358 .map_err(<CommonError<T>>::from)?;359360 Ok(())361 }362363 pub fn set_scoped_token_properties(364 collection_id: CollectionId,365 token_id: TokenId,366 scope: PropertyScope,367 properties: impl Iterator<Item = Property>,368 ) -> DispatchResult {369 TokenProperties::<T>::try_mutate((collection_id, token_id), |stored_properties| {370 stored_properties.try_scoped_set_from_iter(scope, properties)371 })372 .map_err(<CommonError<T>>::from)?;373374 Ok(())375 }376}377378// unchecked calls skips any permission checks379impl<T: Config> Pallet<T> {380 /// Create RFT collection381 ///382 /// `init_collection` will take non-refundable deposit for collection creation.383 ///384 /// - `data`: Contains settings for collection limits and permissions.385 pub fn init_collection(386 owner: T::CrossAccountId,387 payer: T::CrossAccountId,388 data: CreateCollectionData<T::AccountId>,389 ) -> Result<CollectionId, DispatchError> {390 <PalletCommon<T>>::init_collection(owner, payer, data, CollectionFlags::default())391 }392393 /// Destroy RFT collection394 ///395 /// `destroy_collection` will throw error if collection contains any tokens.396 /// Only owner can destroy collection.397 pub fn destroy_collection(398 collection: RefungibleHandle<T>,399 sender: &T::CrossAccountId,400 ) -> DispatchResult {401 let id = collection.id;402403 if Self::collection_has_tokens(id) {404 return Err(<CommonError<T>>::CantDestroyNotEmptyCollection.into());405 }406407 // =========408409 PalletCommon::destroy_collection(collection.0, sender)?;410411 <TokensMinted<T>>::remove(id);412 <TokensBurnt<T>>::remove(id);413 let _ = <TotalSupply<T>>::clear_prefix((id,), u32::MAX, None);414 let _ = <Balance<T>>::clear_prefix((id,), u32::MAX, None);415 let _ = <Allowance<T>>::clear_prefix((id,), u32::MAX, None);416 let _ = <Owned<T>>::clear_prefix((id,), u32::MAX, None);417 let _ = <AccountBalance<T>>::clear_prefix((id,), u32::MAX, None);418 Ok(())419 }420421 fn collection_has_tokens(collection_id: CollectionId) -> bool {422 <TotalSupply<T>>::iter_prefix((collection_id,))423 .next()424 .is_some()425 }426427 pub fn burn_token_unchecked(428 collection: &RefungibleHandle<T>,429 owner: &T::CrossAccountId,430 token_id: TokenId,431 ) -> DispatchResult {432 let burnt = <TokensBurnt<T>>::get(collection.id)433 .checked_add(1)434 .ok_or(ArithmeticError::Overflow)?;435436 <TokensBurnt<T>>::insert(collection.id, burnt);437 <TokenProperties<T>>::remove((collection.id, token_id));438 <TotalSupply<T>>::remove((collection.id, token_id));439 let _ = <Balance<T>>::clear_prefix((collection.id, token_id), u32::MAX, None);440 let _ = <Allowance<T>>::clear_prefix((collection.id, token_id), u32::MAX, None);441 <PalletEvm<T>>::deposit_log(442 ERC721Events::Transfer {443 from: *owner.as_eth(),444 to: H160::default(),445 token_id: token_id.into(),446 }447 .to_log(collection_id_to_address(collection.id)),448 );449 Ok(())450 }451452 /// Burn RFT token pieces453 ///454 /// `burn` will decrease total amount of token pieces and amount owned by sender.455 /// `burn` can be called even if there are multiple owners of the RFT token.456 /// If sender wouldn't have any pieces left after `burn` than she will stop being457 /// one of the owners of the token. If there is no account that owns any pieces of458 /// the token than token will be burned too.459 ///460 /// - `amount`: Amount of token pieces to burn.461 /// - `token`: Token who's pieces should be burned462 /// - `collection`: Collection that contains the token463 pub fn burn(464 collection: &RefungibleHandle<T>,465 owner: &T::CrossAccountId,466 token: TokenId,467 amount: u128,468 ) -> DispatchResult {469 let total_supply = <TotalSupply<T>>::get((collection.id, token))470 .checked_sub(amount)471 .ok_or(<CommonError<T>>::TokenValueTooLow)?;472473 // This was probally last owner of this token?474 if total_supply == 0 {475 // Ensure user actually owns this amount476 ensure!(477 <Balance<T>>::get((collection.id, token, owner)) == amount,478 <CommonError<T>>::TokenValueTooLow479 );480 let account_balance = <AccountBalance<T>>::get((collection.id, owner))481 .checked_sub(1)482 // Should not occur483 .ok_or(ArithmeticError::Underflow)?;484485 // =========486487 <Owned<T>>::remove((collection.id, owner, token));488 <PalletStructure<T>>::unnest_if_nested(owner, collection.id, token);489 <AccountBalance<T>>::insert((collection.id, owner), account_balance);490 Self::burn_token_unchecked(collection, owner, token)?;491 <PalletEvm<T>>::deposit_log(492 ERC20Events::Transfer {493 from: *owner.as_eth(),494 to: H160::default(),495 value: amount.into(),496 }497 .to_log(collection_id_to_address(collection.id)),498 );499 <PalletCommon<T>>::deposit_event(CommonEvent::ItemDestroyed(500 collection.id,501 token,502 owner.clone(),503 amount,504 ));505 return Ok(());506 }507508 let balance = <Balance<T>>::get((collection.id, token, owner))509 .checked_sub(amount)510 .ok_or(<CommonError<T>>::TokenValueTooLow)?;511 let account_balance = if balance == 0 {512 <AccountBalance<T>>::get((collection.id, owner))513 .checked_sub(1)514 // Should not occur515 .ok_or(ArithmeticError::Underflow)?516 } else {517 0518 };519520 // =========521522 if balance == 0 {523 <Owned<T>>::remove((collection.id, owner, token));524 <PalletStructure<T>>::unnest_if_nested(owner, collection.id, token);525 <Balance<T>>::remove((collection.id, token, owner));526 <AccountBalance<T>>::insert((collection.id, owner), account_balance);527528 if let Some(user) = Self::token_owner(collection.id, token) {529 <PalletEvm<T>>::deposit_log(530 ERC721Events::Transfer {531 from: erc::ADDRESS_FOR_PARTIALLY_OWNED_TOKENS,532 to: *user.as_eth(),533 token_id: token.into(),534 }535 .to_log(collection_id_to_address(collection.id)),536 );537 }538 } else {539 <Balance<T>>::insert((collection.id, token, owner), balance);540 }541 <TotalSupply<T>>::insert((collection.id, token), total_supply);542543 <PalletEvm<T>>::deposit_log(544 ERC20Events::Transfer {545 from: *owner.as_eth(),546 to: H160::default(),547 value: amount.into(),548 }549 .to_log(T::EvmTokenAddressMapping::token_to_address(550 collection.id,551 token,552 )),553 );554 <PalletCommon<T>>::deposit_event(CommonEvent::ItemDestroyed(555 collection.id,556 token,557 owner.clone(),558 amount,559 ));560 Ok(())561 }562563 #[transactional]564 fn modify_token_properties(565 collection: &RefungibleHandle<T>,566 sender: &T::CrossAccountId,567 token_id: TokenId,568 properties: impl Iterator<Item = (PropertyKey, Option<PropertyValue>)>,569 is_token_create: bool,570 nesting_budget: &dyn Budget,571 ) -> DispatchResult {572 let is_collection_admin = || collection.is_owner_or_admin(sender);573 let is_token_owner = || -> Result<bool, DispatchError> {574 let balance = collection.balance(sender.clone(), token_id);575 let total_pieces: u128 =576 Self::total_pieces(collection.id, token_id).unwrap_or(u128::MAX);577 if balance != total_pieces {578 return Ok(false);579 }580581 let is_bundle_owner = <PalletStructure<T>>::check_indirectly_owned(582 sender.clone(),583 collection.id,584 token_id,585 None,586 nesting_budget,587 )?;588589 Ok(is_bundle_owner)590 };591592 for (key, value) in properties {593 let permission = <PalletCommon<T>>::property_permissions(collection.id)594 .get(&key)595 .cloned()596 .unwrap_or_else(PropertyPermission::none);597598 let is_property_exists = TokenProperties::<T>::get((collection.id, token_id))599 .get(&key)600 .is_some();601602 match permission {603 PropertyPermission { mutable: false, .. } if is_property_exists => {604 return Err(<CommonError<T>>::NoPermission.into());605 }606607 PropertyPermission {608 collection_admin,609 token_owner,610 ..611 } => {612 //TODO: investigate threats during public minting.613 let is_token_create =614 is_token_create && (collection_admin || token_owner) && value.is_some();615 if !(is_token_create616 || (collection_admin && is_collection_admin())617 || (token_owner && is_token_owner()?))618 {619 fail!(<CommonError<T>>::NoPermission);620 }621 }622 }623624 match value {625 Some(value) => {626 <TokenProperties<T>>::try_mutate((collection.id, token_id), |properties| {627 properties.try_set(key.clone(), value)628 })629 .map_err(<CommonError<T>>::from)?;630631 <PalletCommon<T>>::deposit_event(CommonEvent::TokenPropertySet(632 collection.id,633 token_id,634 key,635 ));636 }637 None => {638 <TokenProperties<T>>::try_mutate((collection.id, token_id), |properties| {639 properties.remove(&key)640 })641 .map_err(<CommonError<T>>::from)?;642643 <PalletCommon<T>>::deposit_event(CommonEvent::TokenPropertyDeleted(644 collection.id,645 token_id,646 key,647 ));648 }649 }650 }651652 Ok(())653 }654655 pub fn set_token_properties(656 collection: &RefungibleHandle<T>,657 sender: &T::CrossAccountId,658 token_id: TokenId,659 properties: impl Iterator<Item = Property>,660 is_token_create: bool,661 nesting_budget: &dyn Budget,662 ) -> DispatchResult {663 Self::modify_token_properties(664 collection,665 sender,666 token_id,667 properties.map(|p| (p.key, Some(p.value))),668 is_token_create,669 nesting_budget,670 )671 }672673 pub fn set_token_property(674 collection: &RefungibleHandle<T>,675 sender: &T::CrossAccountId,676 token_id: TokenId,677 property: Property,678 nesting_budget: &dyn Budget,679 ) -> DispatchResult {680 let is_token_create = false;681682 Self::set_token_properties(683 collection,684 sender,685 token_id,686 [property].into_iter(),687 is_token_create,688 nesting_budget,689 )690 }691692 pub fn delete_token_properties(693 collection: &RefungibleHandle<T>,694 sender: &T::CrossAccountId,695 token_id: TokenId,696 property_keys: impl Iterator<Item = PropertyKey>,697 nesting_budget: &dyn Budget,698 ) -> DispatchResult {699 let is_token_create = false;700701 Self::modify_token_properties(702 collection,703 sender,704 token_id,705 property_keys.into_iter().map(|key| (key, None)),706 is_token_create,707 nesting_budget,708 )709 }710711 pub fn delete_token_property(712 collection: &RefungibleHandle<T>,713 sender: &T::CrossAccountId,714 token_id: TokenId,715 property_key: PropertyKey,716 nesting_budget: &dyn Budget,717 ) -> DispatchResult {718 Self::delete_token_properties(719 collection,720 sender,721 token_id,722 [property_key].into_iter(),723 nesting_budget,724 )725 }726727 /// Transfer RFT token pieces from one account to another.728 ///729 /// If the sender is no longer owns any pieces after the `transfer` than she stops being an owner of the token.730 ///731 /// - `from`: Owner of token pieces to transfer.732 /// - `to`: Recepient of transfered token pieces.733 /// - `amount`: Amount of token pieces to transfer.734 /// - `token`: Token whos pieces should be transfered735 /// - `collection`: Collection that contains the token736 pub fn transfer(737 collection: &RefungibleHandle<T>,738 from: &T::CrossAccountId,739 to: &T::CrossAccountId,740 token: TokenId,741 amount: u128,742 nesting_budget: &dyn Budget,743 ) -> DispatchResult {744 ensure!(745 collection.limits.transfers_enabled(),746 <CommonError<T>>::TransferNotAllowed747 );748749 if collection.permissions.access() == AccessMode::AllowList {750 collection.check_allowlist(from)?;751 collection.check_allowlist(to)?;752 }753 <PalletCommon<T>>::ensure_correct_receiver(to)?;754755 let initial_balance_from = <Balance<T>>::get((collection.id, token, from));756 let updated_balance_from = initial_balance_from757 .checked_sub(amount)758 .ok_or(<CommonError<T>>::TokenValueTooLow)?;759 let mut create_target = false;760 let from_to_differ = from != to;761 let updated_balance_to = if from != to {762 let old_balance = <Balance<T>>::get((collection.id, token, to));763 if old_balance == 0 {764 create_target = true;765 }766 Some(767 old_balance768 .checked_add(amount)769 .ok_or(ArithmeticError::Overflow)?,770 )771 } else {772 None773 };774775 let account_balance_from = if updated_balance_from == 0 {776 Some(777 <AccountBalance<T>>::get((collection.id, from))778 .checked_sub(1)779 // Should not occur780 .ok_or(ArithmeticError::Underflow)?,781 )782 } else {783 None784 };785 // Account data is created in token, AccountBalance should be increased786 // But only if from != to as we shouldn't check overflow in this case787 let account_balance_to = if create_target && from_to_differ {788 let account_balance_to = <AccountBalance<T>>::get((collection.id, to))789 .checked_add(1)790 .ok_or(ArithmeticError::Overflow)?;791 ensure!(792 account_balance_to < collection.limits.account_token_ownership_limit(),793 <CommonError<T>>::AccountTokenLimitExceeded,794 );795796 Some(account_balance_to)797 } else {798 None799 };800801 // =========802803 <PalletStructure<T>>::nest_if_sent_to_token(804 from.clone(),805 to,806 collection.id,807 token,808 nesting_budget,809 )?;810811 if let Some(updated_balance_to) = updated_balance_to {812 // from != to813 if updated_balance_from == 0 {814 <Balance<T>>::remove((collection.id, token, from));815 <PalletStructure<T>>::unnest_if_nested(from, collection.id, token);816 } else {817 <Balance<T>>::insert((collection.id, token, from), updated_balance_from);818 }819 <Balance<T>>::insert((collection.id, token, to), updated_balance_to);820 if let Some(account_balance_from) = account_balance_from {821 <AccountBalance<T>>::insert((collection.id, from), account_balance_from);822 <Owned<T>>::remove((collection.id, from, token));823 }824 if let Some(account_balance_to) = account_balance_to {825 <AccountBalance<T>>::insert((collection.id, to), account_balance_to);826 <Owned<T>>::insert((collection.id, to, token), true);827 }828 }829830 <PalletEvm<T>>::deposit_log(831 ERC20Events::Transfer {832 from: *from.as_eth(),833 to: *to.as_eth(),834 value: amount.into(),835 }836 .to_log(T::EvmTokenAddressMapping::token_to_address(837 collection.id,838 token,839 )),840 );841842 <PalletCommon<T>>::deposit_event(CommonEvent::Transfer(843 collection.id,844 token,845 from.clone(),846 to.clone(),847 amount,848 ));849850 let total_supply = <TotalSupply<T>>::get((collection.id, token));851852 if amount == total_supply {853 // if token was fully owned by `from` and will be fully owned by `to` after transfer854 <PalletEvm<T>>::deposit_log(855 ERC721Events::Transfer {856 from: *from.as_eth(),857 to: *to.as_eth(),858 token_id: token.into(),859 }860 .to_log(collection_id_to_address(collection.id)),861 );862 } else if let Some(updated_balance_to) = updated_balance_to {863 // if `from` not equals `to`. This condition is needed to avoid sending event864 // when `from` fully owns token and sends part of token pieces to itself.865 if initial_balance_from == total_supply {866 // if token was fully owned by `from` and will be only partially owned by `to`867 // and `from` after transfer868 <PalletEvm<T>>::deposit_log(869 ERC721Events::Transfer {870 from: *from.as_eth(),871 to: erc::ADDRESS_FOR_PARTIALLY_OWNED_TOKENS,872 token_id: token.into(),873 }874 .to_log(collection_id_to_address(collection.id)),875 );876 } else if updated_balance_to == total_supply {877 // if token was partially owned by `from` and will be fully owned by `to` after transfer878 <PalletEvm<T>>::deposit_log(879 ERC721Events::Transfer {880 from: erc::ADDRESS_FOR_PARTIALLY_OWNED_TOKENS,881 to: *to.as_eth(),882 token_id: token.into(),883 }884 .to_log(collection_id_to_address(collection.id)),885 );886 }887 }888889 Ok(())890 }891892 /// Batched operation to create multiple RFT tokens.893 ///894 /// Same as `create_item` but creates multiple tokens.895 ///896 /// - `data`: Same as 'data` in `create_item` but contains data for multiple tokens.897 pub fn create_multiple_items(898 collection: &RefungibleHandle<T>,899 sender: &T::CrossAccountId,900 data: Vec<CreateItemData<T::CrossAccountId>>,901 nesting_budget: &dyn Budget,902 ) -> DispatchResult {903 if !collection.is_owner_or_admin(sender) {904 ensure!(905 collection.permissions.mint_mode(),906 <CommonError<T>>::PublicMintingNotAllowed907 );908 collection.check_allowlist(sender)?;909910 for item in data.iter() {911 for user in item.users.keys() {912 collection.check_allowlist(user)?;913 }914 }915 }916917 for item in data.iter() {918 for (owner, _) in item.users.iter() {919 <PalletCommon<T>>::ensure_correct_receiver(owner)?;920 }921 }922923 // Total pieces per tokens924 let totals = data925 .iter()926 .map(|data| {927 Ok(data928 .users929 .iter()930 .map(|u| u.1)931 .try_fold(0u128, |acc, v| acc.checked_add(*v))932 .ok_or(ArithmeticError::Overflow)?)933 })934 .collect::<Result<Vec<_>, DispatchError>>()?;935 for total in &totals {936 ensure!(937 *total <= MAX_REFUNGIBLE_PIECES,938 <Error<T>>::WrongRefungiblePieces939 );940 }941942 let first_token_id = <TokensMinted<T>>::get(collection.id);943 let tokens_minted = first_token_id944 .checked_add(data.len() as u32)945 .ok_or(ArithmeticError::Overflow)?;946 ensure!(947 tokens_minted < collection.limits.token_limit(),948 <CommonError<T>>::CollectionTokenLimitExceeded949 );950951 let mut balances = BTreeMap::new();952 for data in &data {953 for owner in data.users.keys() {954 let balance = balances955 .entry(owner)956 .or_insert_with(|| <AccountBalance<T>>::get((collection.id, owner)));957 *balance = balance.checked_add(1).ok_or(ArithmeticError::Overflow)?;958959 ensure!(960 *balance <= collection.limits.account_token_ownership_limit(),961 <CommonError<T>>::AccountTokenLimitExceeded,962 );963 }964 }965966 for (i, token) in data.iter().enumerate() {967 let token_id = TokenId(first_token_id + i as u32 + 1);968 for (to, _) in token.users.iter() {969 <PalletStructure<T>>::check_nesting(970 sender.clone(),971 to,972 collection.id,973 token_id,974 nesting_budget,975 )?;976 }977 }978979 // =========980981 with_transaction(|| {982 for (i, data) in data.iter().enumerate() {983 let token_id = first_token_id + i as u32 + 1;984 <TotalSupply<T>>::insert((collection.id, token_id), totals[i]);985986 for (user, amount) in data.users.iter() {987 if *amount == 0 {988 continue;989 }990 <Balance<T>>::insert((collection.id, token_id, &user), amount);991 <Owned<T>>::insert((collection.id, &user, TokenId(token_id)), true);992 <PalletStructure<T>>::nest_if_sent_to_token_unchecked(993 user,994 collection.id,995 TokenId(token_id),996 );997 }998999 if let Err(e) = Self::set_token_properties(1000 collection,1001 sender,1002 TokenId(token_id),1003 data.properties.clone().into_iter(),1004 true,1005 nesting_budget,1006 ) {1007 return TransactionOutcome::Rollback(Err(e));1008 }1009 }1010 TransactionOutcome::Commit(Ok(()))1011 })?;10121013 <TokensMinted<T>>::insert(collection.id, tokens_minted);10141015 for (account, balance) in balances {1016 <AccountBalance<T>>::insert((collection.id, account), balance);1017 }10181019 for (i, token) in data.into_iter().enumerate() {1020 let token_id = first_token_id + i as u32 + 1;10211022 let receivers = token1023 .users1024 .into_iter()1025 .filter(|(_, amount)| *amount > 0)1026 .collect::<Vec<_>>();10271028 if let [(user, _)] = receivers.as_slice() {1029 // if there is exactly one receiver1030 <PalletEvm<T>>::deposit_log(1031 ERC721Events::Transfer {1032 from: H160::default(),1033 to: *user.as_eth(),1034 token_id: token_id.into(),1035 }1036 .to_log(collection_id_to_address(collection.id)),1037 );1038 } else if let [_, ..] = receivers.as_slice() {1039 // if there is more than one receiver1040 <PalletEvm<T>>::deposit_log(1041 ERC721Events::Transfer {1042 from: H160::default(),1043 to: erc::ADDRESS_FOR_PARTIALLY_OWNED_TOKENS,1044 token_id: token_id.into(),1045 }1046 .to_log(collection_id_to_address(collection.id)),1047 );1048 }10491050 for (user, amount) in receivers.into_iter() {1051 <PalletEvm<T>>::deposit_log(1052 ERC20Events::Transfer {1053 from: H160::default(),1054 to: *user.as_eth(),1055 value: amount.into(),1056 }1057 .to_log(T::EvmTokenAddressMapping::token_to_address(1058 collection.id,1059 TokenId(token_id),1060 )),1061 );1062 <PalletCommon<T>>::deposit_event(CommonEvent::ItemCreated(1063 collection.id,1064 TokenId(token_id),1065 user,1066 amount,1067 ));1068 }1069 }1070 Ok(())1071 }10721073 pub fn set_allowance_unchecked(1074 collection: &RefungibleHandle<T>,1075 sender: &T::CrossAccountId,1076 spender: &T::CrossAccountId,1077 token: TokenId,1078 amount: u128,1079 ) {1080 if amount == 0 {1081 <Allowance<T>>::remove((collection.id, token, sender, spender));1082 } else {1083 <Allowance<T>>::insert((collection.id, token, sender, spender), amount);1084 }10851086 <PalletEvm<T>>::deposit_log(1087 ERC20Events::Approval {1088 owner: *sender.as_eth(),1089 spender: *spender.as_eth(),1090 value: amount.into(),1091 }1092 .to_log(T::EvmTokenAddressMapping::token_to_address(1093 collection.id,1094 token,1095 )),1096 );1097 <PalletCommon<T>>::deposit_event(CommonEvent::Approved(1098 collection.id,1099 token,1100 sender.clone(),1101 spender.clone(),1102 amount,1103 ))1104 }11051106 /// Set allowance for the spender to `transfer` or `burn` sender's token pieces.1107 ///1108 /// - `amount`: Amount of token pieces the spender is allowed to `transfer` or `burn.1109 pub fn set_allowance(1110 collection: &RefungibleHandle<T>,1111 sender: &T::CrossAccountId,1112 spender: &T::CrossAccountId,1113 token: TokenId,1114 amount: u128,1115 ) -> DispatchResult {1116 if collection.permissions.access() == AccessMode::AllowList {1117 collection.check_allowlist(sender)?;1118 collection.check_allowlist(spender)?;1119 }11201121 <PalletCommon<T>>::ensure_correct_receiver(spender)?;11221123 if <Balance<T>>::get((collection.id, token, sender)) < amount {1124 ensure!(1125 collection.ignores_owned_amount(sender) && Self::token_exists(collection, token),1126 <CommonError<T>>::CantApproveMoreThanOwned1127 );1128 }11291130 // =========11311132 Self::set_allowance_unchecked(collection, sender, spender, token, amount);1133 Ok(())1134 }11351136 /// Returns allowance, which should be set after transaction1137 fn check_allowed(1138 collection: &RefungibleHandle<T>,1139 spender: &T::CrossAccountId,1140 from: &T::CrossAccountId,1141 token: TokenId,1142 amount: u128,1143 nesting_budget: &dyn Budget,1144 ) -> Result<Option<u128>, DispatchError> {1145 if spender.conv_eq(from) {1146 return Ok(None);1147 }1148 if collection.permissions.access() == AccessMode::AllowList {1149 // `from`, `to` checked in [`transfer`]1150 collection.check_allowlist(spender)?;1151 }1152 if let Some(source) = T::CrossTokenAddressMapping::address_to_token(from) {1153 // TODO: should collection owner be allowed to perform this transfer?1154 ensure!(1155 <PalletStructure<T>>::check_indirectly_owned(1156 spender.clone(),1157 source.0,1158 source.1,1159 None,1160 nesting_budget1161 )?,1162 <CommonError<T>>::ApprovedValueTooLow,1163 );1164 return Ok(None);1165 }1166 let allowance =1167 <Allowance<T>>::get((collection.id, token, from, &spender)).checked_sub(amount);1168 if allowance.is_none() {1169 ensure!(1170 collection.ignores_allowance(spender),1171 <CommonError<T>>::ApprovedValueTooLow1172 );1173 }1174 Ok(allowance)1175 }11761177 /// Transfer RFT token pieces from one account to another.1178 ///1179 /// Same as the [`transfer`] but spender doesn't needs to be an owner of the token pieces.1180 /// The owner should set allowance for the spender to transfer pieces.1181 ///1182 /// [`transfer`]: struct.Pallet.html#method.transfer1183 pub fn transfer_from(1184 collection: &RefungibleHandle<T>,1185 spender: &T::CrossAccountId,1186 from: &T::CrossAccountId,1187 to: &T::CrossAccountId,1188 token: TokenId,1189 amount: u128,1190 nesting_budget: &dyn Budget,1191 ) -> DispatchResult {1192 let allowance =1193 Self::check_allowed(collection, spender, from, token, amount, nesting_budget)?;11941195 // =========11961197 Self::transfer(collection, from, to, token, amount, nesting_budget)?;1198 if let Some(allowance) = allowance {1199 Self::set_allowance_unchecked(collection, from, spender, token, allowance);1200 }1201 Ok(())1202 }12031204 /// Burn RFT token pieces from the account.1205 ///1206 /// Same as the [`burn`] but spender doesn't need to be an owner of the token pieces. The owner should1207 /// set allowance for the spender to burn pieces1208 ///1209 /// [`burn`]: struct.Pallet.html#method.burn1210 pub fn burn_from(1211 collection: &RefungibleHandle<T>,1212 spender: &T::CrossAccountId,1213 from: &T::CrossAccountId,1214 token: TokenId,1215 amount: u128,1216 nesting_budget: &dyn Budget,1217 ) -> DispatchResult {1218 let allowance =1219 Self::check_allowed(collection, spender, from, token, amount, nesting_budget)?;12201221 // =========12221223 Self::burn(collection, from, token, amount)?;1224 if let Some(allowance) = allowance {1225 Self::set_allowance_unchecked(collection, from, spender, token, allowance);1226 }1227 Ok(())1228 }12291230 /// Create RFT token.1231 ///1232 /// The sender should be the owner/admin of the collection or collection should be configured1233 /// to allow public minting.1234 ///1235 /// - `data`: Contains list of users who will become the owners of the token pieces and amount1236 /// of token pieces they will receive.1237 pub fn create_item(1238 collection: &RefungibleHandle<T>,1239 sender: &T::CrossAccountId,1240 data: CreateItemData<T::CrossAccountId>,1241 nesting_budget: &dyn Budget,1242 ) -> DispatchResult {1243 Self::create_multiple_items(collection, sender, vec![data], nesting_budget)1244 }12451246 /// Repartition RFT token.1247 ///1248 /// `repartition` will set token balance of the sender and total amount of token pieces.1249 /// Sender should own all of the token pieces. `repartition' could be done even if some1250 /// token pieces were burned before.1251 ///1252 /// - `amount`: Total amount of token pieces that the token will have after `repartition`.1253 pub fn repartition(1254 collection: &RefungibleHandle<T>,1255 owner: &T::CrossAccountId,1256 token: TokenId,1257 amount: u128,1258 ) -> DispatchResult {1259 ensure!(1260 amount <= MAX_REFUNGIBLE_PIECES,1261 <Error<T>>::WrongRefungiblePieces1262 );1263 ensure!(amount > 0, <CommonError<T>>::TokenValueTooLow);1264 // Ensure user owns all pieces1265 let total_pieces = Self::total_pieces(collection.id, token).unwrap_or(u128::MAX);1266 let balance = <Balance<T>>::get((collection.id, token, owner));1267 ensure!(1268 total_pieces == balance,1269 <Error<T>>::RepartitionWhileNotOwningAllPieces1270 );12711272 <Balance<T>>::insert((collection.id, token, owner), amount);1273 <TotalSupply<T>>::insert((collection.id, token), amount);12741275 if amount > total_pieces {1276 let mint_amount = amount - total_pieces;1277 <PalletEvm<T>>::deposit_log(1278 ERC20Events::Transfer {1279 from: H160::default(),1280 to: *owner.as_eth(),1281 value: mint_amount.into(),1282 }1283 .to_log(T::EvmTokenAddressMapping::token_to_address(1284 collection.id,1285 token,1286 )),1287 );1288 <PalletCommon<T>>::deposit_event(CommonEvent::ItemCreated(1289 collection.id,1290 token,1291 owner.clone(),1292 mint_amount,1293 ));1294 } else if total_pieces > amount {1295 let burn_amount = total_pieces - amount;1296 <PalletEvm<T>>::deposit_log(1297 ERC20Events::Transfer {1298 from: *owner.as_eth(),1299 to: H160::default(),1300 value: burn_amount.into(),1301 }1302 .to_log(T::EvmTokenAddressMapping::token_to_address(1303 collection.id,1304 token,1305 )),1306 );1307 <PalletCommon<T>>::deposit_event(CommonEvent::ItemDestroyed(1308 collection.id,1309 token,1310 owner.clone(),1311 burn_amount,1312 ));1313 }13141315 Ok(())1316 }13171318 fn token_owner(collection_id: CollectionId, token_id: TokenId) -> Option<T::CrossAccountId> {1319 let mut owner = None;1320 let mut count = 0;1321 for key in Balance::<T>::iter_key_prefix((collection_id, token_id)) {1322 count += 1;1323 if count > 1 {1324 return None;1325 }1326 owner = Some(key);1327 }1328 owner1329 }13301331 fn total_pieces(collection_id: CollectionId, token_id: TokenId) -> Option<u128> {1332 <TotalSupply<T>>::try_get((collection_id, token_id)).ok()1333 }13341335 pub fn set_collection_properties(1336 collection: &RefungibleHandle<T>,1337 sender: &T::CrossAccountId,1338 properties: Vec<Property>,1339 ) -> DispatchResult {1340 <PalletCommon<T>>::set_collection_properties(collection, sender, properties)1341 }13421343 pub fn delete_collection_properties(1344 collection: &RefungibleHandle<T>,1345 sender: &T::CrossAccountId,1346 property_keys: Vec<PropertyKey>,1347 ) -> DispatchResult {1348 <PalletCommon<T>>::delete_collection_properties(collection, sender, property_keys)1349 }13501351 pub fn set_token_property_permissions(1352 collection: &RefungibleHandle<T>,1353 sender: &T::CrossAccountId,1354 property_permissions: Vec<PropertyKeyPermission>,1355 ) -> DispatchResult {1356 <PalletCommon<T>>::set_token_property_permissions(collection, sender, property_permissions)1357 }13581359 pub fn set_scoped_token_property_permissions(1360 collection: &RefungibleHandle<T>,1361 sender: &T::CrossAccountId,1362 scope: PropertyScope,1363 property_permissions: Vec<PropertyKeyPermission>,1364 ) -> DispatchResult {1365 <PalletCommon<T>>::set_scoped_token_property_permissions(1366 collection,1367 sender,1368 scope,1369 property_permissions,1370 )1371 }13721373 /// Returns 10 token in no particular order.1374 ///1375 /// There is no direct way to get token holders in ascending order,1376 /// since `iter_prefix` returns values in no particular order.1377 /// Therefore, getting the 10 largest holders with a large value of holders1378 /// can lead to impact memory allocation + sorting with `n * log (n)`.1379 pub fn token_owners(1380 collection_id: CollectionId,1381 token: TokenId,1382 ) -> Option<Vec<T::CrossAccountId>> {1383 let res: Vec<T::CrossAccountId> = <Balance<T>>::iter_prefix((collection_id, token))1384 .map(|(owner, _amount)| owner)1385 .take(10)1386 .collect();13871388 if res.is_empty() {1389 None1390 } else {1391 Some(res)1392 }1393 }1394}pallets/unique/src/eth/mod.rsdiffbeforeafterboth--- a/pallets/unique/src/eth/mod.rs
+++ b/pallets/unique/src/eth/mod.rs
@@ -130,6 +130,13 @@
})
.map_err(|e| Error::Revert(format!("{:?}", e)))?;
+ properties
+ .try_push(up_data_structs::Property {
+ key: key::erc721_metadata(),
+ value: property_value::erc721_metadata_supported(),
+ })
+ .map_err(|e| Error::Revert(format!("{:?}", e)))?;
+
if !base_uri_value.is_empty() {
properties
.try_push(up_data_structs::Property {
@@ -212,7 +219,8 @@
/// @param tokenPrefix Token prefix to represent the collection tokens in UI and user applications
/// @return address Address of the newly created collection
#[weight(<SelfWeightOf<T>>::create_collection())]
- fn create_nonfungible_collection(
+ #[solidity(rename_selector = "createNFTCollection")]
+ fn create_nft_collection(
&mut self,
caller: caller,
value: value,
@@ -239,9 +247,26 @@
let address = pallet_common::eth::collection_id_to_address(collection_id);
Ok(address)
}
+ /// Create an NFT collection
+ /// @param name Name of the collection
+ /// @param description Informative description of the collection
+ /// @param tokenPrefix Token prefix to represent the collection tokens in UI and user applications
+ /// @return address Address of the newly created collection
+ #[weight(<SelfWeightOf<T>>::create_collection())]
+ #[deprecated(note = "mathod was renamed to `create_nft_collection`, prefer it instead")]
+ fn create_nonfungible_collection(
+ &mut self,
+ caller: caller,
+ value: value,
+ name: string,
+ description: string,
+ token_prefix: string,
+ ) -> Result<address> {
+ self.create_nft_collection(caller, value, name, description, token_prefix)
+ }
#[weight(<SelfWeightOf<T>>::create_collection())]
- #[solidity(rename_selector = "createERC721MetadataCompatibleCollection")]
+ #[solidity(rename_selector = "createERC721MetadataNFTCollection")]
fn create_nonfungible_collection_with_properties(
&mut self,
caller: caller,
@@ -273,6 +298,27 @@
#[weight(<SelfWeightOf<T>>::create_collection())]
#[solidity(rename_selector = "createRFTCollection")]
+ fn create_rft_collection(
+ &mut self,
+ caller: caller,
+ value: value,
+ name: string,
+ description: string,
+ token_prefix: string,
+ ) -> Result<address> {
+ create_refungible_collection_internal::<T>(
+ caller,
+ value,
+ name,
+ description,
+ token_prefix,
+ Default::default(),
+ false,
+ )
+ }
+
+ #[weight(<SelfWeightOf<T>>::create_collection())]
+ #[deprecated(note = "mathod was renamed to `create_rft_collection`, prefer it instead")]
fn create_refungible_collection(
&mut self,
caller: caller,
@@ -293,7 +339,7 @@
}
#[weight(<SelfWeightOf<T>>::create_collection())]
- #[solidity(rename_selector = "createERC721MetadataCompatibleRFTCollection")]
+ #[solidity(rename_selector = "createERC721MetadataRFTCollection")]
fn create_refungible_collection_with_properties(
&mut self,
caller: caller,
pallets/unique/src/eth/stubs/CollectionHelpers.rawdiffbeforeafterbothbinary blob — no preview
pallets/unique/src/eth/stubs/CollectionHelpers.soldiffbeforeafterboth--- a/pallets/unique/src/eth/stubs/CollectionHelpers.sol
+++ b/pallets/unique/src/eth/stubs/CollectionHelpers.sol
@@ -23,13 +23,33 @@
}
/// @title Contract, which allows users to operate with collections
-/// @dev the ERC-165 identifier for this interface is 0x5ad4f440
+/// @dev the ERC-165 identifier for this interface is 0xf62c7aa9
contract CollectionHelpers is Dummy, ERC165, CollectionHelpersEvents {
/// Create an NFT collection
/// @param name Name of the collection
/// @param description Informative description of the collection
/// @param tokenPrefix Token prefix to represent the collection tokens in UI and user applications
/// @return address Address of the newly created collection
+ /// @dev EVM selector for this function is: 0x844af658,
+ /// or in textual repr: createNFTCollection(string,string,string)
+ function createNFTCollection(
+ string memory name,
+ string memory description,
+ string memory tokenPrefix
+ ) public payable returns (address) {
+ require(false, stub_error);
+ name;
+ description;
+ tokenPrefix;
+ dummy = 0;
+ return 0x0000000000000000000000000000000000000000;
+ }
+
+ /// Create an NFT collection
+ /// @param name Name of the collection
+ /// @param description Informative description of the collection
+ /// @param tokenPrefix Token prefix to represent the collection tokens in UI and user applications
+ /// @return address Address of the newly created collection
/// @dev EVM selector for this function is: 0xe34a6844,
/// or in textual repr: createNonfungibleCollection(string,string,string)
function createNonfungibleCollection(
@@ -45,9 +65,9 @@
return 0x0000000000000000000000000000000000000000;
}
- /// @dev EVM selector for this function is: 0xa634a5f9,
- /// or in textual repr: createERC721MetadataCompatibleCollection(string,string,string,string)
- function createERC721MetadataCompatibleCollection(
+ /// @dev EVM selector for this function is: 0xd1df968c,
+ /// or in textual repr: createERC721MetadataNFTCollection(string,string,string,string)
+ function createERC721MetadataNFTCollection(
string memory name,
string memory description,
string memory tokenPrefix,
@@ -77,9 +97,24 @@
return 0x0000000000000000000000000000000000000000;
}
- /// @dev EVM selector for this function is: 0xa5596388,
- /// or in textual repr: createERC721MetadataCompatibleRFTCollection(string,string,string,string)
- function createERC721MetadataCompatibleRFTCollection(
+ /// @dev EVM selector for this function is: 0x44a68ad5,
+ /// or in textual repr: createRefungibleCollection(string,string,string)
+ function createRefungibleCollection(
+ string memory name,
+ string memory description,
+ string memory tokenPrefix
+ ) public payable returns (address) {
+ require(false, stub_error);
+ name;
+ description;
+ tokenPrefix;
+ dummy = 0;
+ return 0x0000000000000000000000000000000000000000;
+ }
+
+ /// @dev EVM selector for this function is: 0xbea6a299,
+ /// or in textual repr: createERC721MetadataRFTCollection(string,string,string,string)
+ function createERC721MetadataRFTCollection(
string memory name,
string memory description,
string memory tokenPrefix,
tests/src/deprecated-helpers/eth/helpers.tsdiffbeforeafterboth--- a/tests/src/deprecated-helpers/eth/helpers.ts
+++ b/tests/src/deprecated-helpers/eth/helpers.ts
@@ -150,10 +150,10 @@
}
-export async function createNonfungibleCollection(api: ApiPromise, web3: Web3, owner: string) {
+export async function createNFTCollection(api: ApiPromise, web3: Web3, owner: string) {
const collectionHelper = evmCollectionHelpers(web3, owner);
const result = await collectionHelper.methods
- .createNonfungibleCollection('A', 'B', 'C')
+ .createNFTCollection('A', 'B', 'C')
.send({value: Number(2n * UNIQUE)});
return await getCollectionAddressFromResult(api, result);
}
tests/src/deprecated-helpers/helpers.tsdiffbeforeafterboth--- a/tests/src/deprecated-helpers/helpers.ts
+++ b/tests/src/deprecated-helpers/helpers.ts
@@ -433,6 +433,7 @@
mode: {type: 'NFT'},
name: 'name',
tokenPrefix: 'prefix',
+ properties: [{key: 'ERC721Metadata', value: '1'}],
};
export async function
@@ -441,7 +442,7 @@
sender: IKeyringPair,
params: Partial<CreateCollectionParams> = {},
): Promise<CreateCollectionResult> {
- const {name, description, mode, tokenPrefix} = {...defaultCreateCollectionParams, ...params};
+ const {name, description, mode, tokenPrefix, properties} = {...defaultCreateCollectionParams, ...params};
let modeprm = {};
if (mode.type === 'NFT') {
@@ -457,6 +458,7 @@
description: strToUTF16(description),
tokenPrefix: strToUTF16(tokenPrefix),
mode: modeprm as any,
+ properties,
});
const events = await executeTransaction(api, sender, tx);
return getCreateCollectionResult(events);
tests/src/eth/allowlist.test.tsdiffbeforeafterboth--- a/tests/src/eth/allowlist.test.ts
+++ b/tests/src/eth/allowlist.test.ts
@@ -78,7 +78,7 @@
const owner = await helper.eth.createAccountWithBalance(donor);
const user = helper.eth.createAccount();
- const {collectionAddress} = await helper.eth.createNonfungibleCollection(owner, 'A', 'B', 'C');
+ const {collectionAddress} = await helper.eth.createNFTCollection(owner, 'A', 'B', 'C');
const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);
expect(await collectionEvm.methods.allowed(user).call({from: owner})).to.be.false;
@@ -94,7 +94,7 @@
// const owner = await helper.eth.createAccountWithBalance(donor);
// const user = donor;
- // const {collectionAddress, collectionId} = await helper.eth.createNonfungibleCollection(owner, 'A', 'B', 'C');
+ // const {collectionAddress, collectionId} = await helper.eth.createNFTCollection(owner, 'A', 'B', 'C');
// const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);
// expect(await helper.collection.allowed(collectionId, {Substrate: user.address})).to.be.false;
@@ -110,7 +110,7 @@
const notOwner = await helper.eth.createAccountWithBalance(donor);
const user = helper.eth.createAccount();
- const {collectionAddress} = await helper.eth.createNonfungibleCollection(owner, 'A', 'B', 'C');
+ const {collectionAddress} = await helper.eth.createNFTCollection(owner, 'A', 'B', 'C');
const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);
expect(await collectionEvm.methods.allowed(user).call({from: owner})).to.be.false;
@@ -129,7 +129,7 @@
// const notOwner = await helper.eth.createAccountWithBalance(donor);
// const user = donor;
- // const {collectionAddress, collectionId} = await helper.eth.createNonfungibleCollection(owner, 'A', 'B', 'C');
+ // const {collectionAddress, collectionId} = await helper.eth.createNFTCollection(owner, 'A', 'B', 'C');
// const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);
// expect(await helper.collection.allowed(collectionId, {Substrate: user.address})).to.be.false;
tests/src/eth/api/CollectionHelpers.soldiffbeforeafterboth--- a/tests/src/eth/api/CollectionHelpers.sol
+++ b/tests/src/eth/api/CollectionHelpers.sol
@@ -18,13 +18,26 @@
}
/// @title Contract, which allows users to operate with collections
-/// @dev the ERC-165 identifier for this interface is 0x5ad4f440
+/// @dev the ERC-165 identifier for this interface is 0xf62c7aa9
interface CollectionHelpers is Dummy, ERC165, CollectionHelpersEvents {
/// Create an NFT collection
/// @param name Name of the collection
/// @param description Informative description of the collection
/// @param tokenPrefix Token prefix to represent the collection tokens in UI and user applications
/// @return address Address of the newly created collection
+ /// @dev EVM selector for this function is: 0x844af658,
+ /// or in textual repr: createNFTCollection(string,string,string)
+ function createNFTCollection(
+ string memory name,
+ string memory description,
+ string memory tokenPrefix
+ ) external payable returns (address);
+
+ /// Create an NFT collection
+ /// @param name Name of the collection
+ /// @param description Informative description of the collection
+ /// @param tokenPrefix Token prefix to represent the collection tokens in UI and user applications
+ /// @return address Address of the newly created collection
/// @dev EVM selector for this function is: 0xe34a6844,
/// or in textual repr: createNonfungibleCollection(string,string,string)
function createNonfungibleCollection(
@@ -33,9 +46,9 @@
string memory tokenPrefix
) external payable returns (address);
- /// @dev EVM selector for this function is: 0xa634a5f9,
- /// or in textual repr: createERC721MetadataCompatibleCollection(string,string,string,string)
- function createERC721MetadataCompatibleCollection(
+ /// @dev EVM selector for this function is: 0xd1df968c,
+ /// or in textual repr: createERC721MetadataNFTCollection(string,string,string,string)
+ function createERC721MetadataNFTCollection(
string memory name,
string memory description,
string memory tokenPrefix,
@@ -50,9 +63,17 @@
string memory tokenPrefix
) external payable returns (address);
- /// @dev EVM selector for this function is: 0xa5596388,
- /// or in textual repr: createERC721MetadataCompatibleRFTCollection(string,string,string,string)
- function createERC721MetadataCompatibleRFTCollection(
+ /// @dev EVM selector for this function is: 0x44a68ad5,
+ /// or in textual repr: createRefungibleCollection(string,string,string)
+ function createRefungibleCollection(
+ string memory name,
+ string memory description,
+ string memory tokenPrefix
+ ) external payable returns (address);
+
+ /// @dev EVM selector for this function is: 0xbea6a299,
+ /// or in textual repr: createERC721MetadataRFTCollection(string,string,string,string)
+ function createERC721MetadataRFTCollection(
string memory name,
string memory description,
string memory tokenPrefix,
tests/src/eth/collectionAdmin.test.tsdiffbeforeafterboth--- a/tests/src/eth/collectionAdmin.test.ts
+++ b/tests/src/eth/collectionAdmin.test.ts
@@ -38,7 +38,7 @@
itEth('Add admin by owner', async ({helper}) => {
const owner = await helper.eth.createAccountWithBalance(donor);
- const {collectionAddress, collectionId} = await helper.eth.createNonfungibleCollection(owner, 'A', 'B', 'C');
+ const {collectionAddress, collectionId} = await helper.eth.createNFTCollection(owner, 'A', 'B', 'C');
const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);
const newAdmin = helper.eth.createAccount();
@@ -51,7 +51,7 @@
itEth.skip('Add substrate admin by owner', async ({helper}) => {
const owner = await helper.eth.createAccountWithBalance(donor);
- const {collectionAddress, collectionId} = await helper.eth.createNonfungibleCollection(owner, 'A', 'B', 'C');
+ const {collectionAddress, collectionId} = await helper.eth.createNFTCollection(owner, 'A', 'B', 'C');
const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);
const [newAdmin] = await helper.arrange.createAccounts([10n], donor);
@@ -64,7 +64,7 @@
itEth('Verify owner or admin', async ({helper}) => {
const owner = await helper.eth.createAccountWithBalance(donor);
- const {collectionAddress} = await helper.eth.createNonfungibleCollection(owner, 'A', 'B', 'C');
+ const {collectionAddress} = await helper.eth.createNFTCollection(owner, 'A', 'B', 'C');
const newAdmin = helper.eth.createAccount();
const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);
@@ -75,7 +75,7 @@
itEth('(!negative tests!) Add admin by ADMIN is not allowed', async ({helper}) => {
const owner = await helper.eth.createAccountWithBalance(donor);
- const {collectionAddress, collectionId} = await helper.eth.createNonfungibleCollection(owner, 'A', 'B', 'C');
+ const {collectionAddress, collectionId} = await helper.eth.createNFTCollection(owner, 'A', 'B', 'C');
const admin = await helper.eth.createAccountWithBalance(donor);
const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);
@@ -93,7 +93,7 @@
itEth('(!negative tests!) Add admin by USER is not allowed', async ({helper}) => {
const owner = await helper.eth.createAccountWithBalance(donor);
- const {collectionAddress, collectionId} = await helper.eth.createNonfungibleCollection(owner, 'A', 'B', 'C');
+ const {collectionAddress, collectionId} = await helper.eth.createNFTCollection(owner, 'A', 'B', 'C');
const notAdmin = await helper.eth.createAccountWithBalance(donor);
const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);
@@ -108,7 +108,7 @@
itEth.skip('(!negative tests!) Add substrate admin by ADMIN is not allowed', async ({helper}) => {
const owner = await helper.eth.createAccountWithBalance(donor);
- const {collectionAddress, collectionId} = await helper.eth.createNonfungibleCollection(owner, 'A', 'B', 'C');
+ const {collectionAddress, collectionId} = await helper.eth.createNFTCollection(owner, 'A', 'B', 'C');
const admin = await helper.eth.createAccountWithBalance(donor);
const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);
@@ -126,7 +126,7 @@
itEth.skip('(!negative tests!) Add substrate admin by USER is not allowed', async ({helper}) => {
const owner = await helper.eth.createAccountWithBalance(donor);
- const {collectionAddress, collectionId} = await helper.eth.createNonfungibleCollection(owner, 'A', 'B', 'C');
+ const {collectionAddress, collectionId} = await helper.eth.createNFTCollection(owner, 'A', 'B', 'C');
const notAdmin0 = await helper.eth.createAccountWithBalance(donor);
const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);
@@ -150,7 +150,7 @@
itEth('Remove admin by owner', async ({helper}) => {
const owner = await helper.eth.createAccountWithBalance(donor);
- const {collectionAddress, collectionId} = await helper.eth.createNonfungibleCollection(owner, 'A', 'B', 'C');
+ const {collectionAddress, collectionId} = await helper.eth.createNFTCollection(owner, 'A', 'B', 'C');
const newAdmin = helper.eth.createAccount();
const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);
@@ -170,7 +170,7 @@
itEth.skip('Remove substrate admin by owner', async ({helper}) => {
const owner = await helper.eth.createAccountWithBalance(donor);
- const {collectionAddress, collectionId} = await helper.eth.createNonfungibleCollection(owner, 'A', 'B', 'C');
+ const {collectionAddress, collectionId} = await helper.eth.createNFTCollection(owner, 'A', 'B', 'C');
const [newAdmin] = await helper.arrange.createAccounts([10n], donor);
const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);
@@ -188,7 +188,7 @@
itEth('(!negative tests!) Remove admin by ADMIN is not allowed', async ({helper}) => {
const owner = await helper.eth.createAccountWithBalance(donor);
- const {collectionAddress, collectionId} = await helper.eth.createNonfungibleCollection(owner, 'A', 'B', 'C');
+ const {collectionAddress, collectionId} = await helper.eth.createNFTCollection(owner, 'A', 'B', 'C');
const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);
@@ -210,7 +210,7 @@
itEth('(!negative tests!) Remove admin by USER is not allowed', async ({helper}) => {
const owner = await helper.eth.createAccountWithBalance(donor);
- const {collectionAddress, collectionId} = await helper.eth.createNonfungibleCollection(owner, 'A', 'B', 'C');
+ const {collectionAddress, collectionId} = await helper.eth.createNFTCollection(owner, 'A', 'B', 'C');
const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);
@@ -230,7 +230,7 @@
itEth.skip('(!negative tests!) Remove substrate admin by ADMIN is not allowed', async ({helper}) => {
const owner = await helper.eth.createAccountWithBalance(donor);
- const {collectionAddress, collectionId} = await helper.eth.createNonfungibleCollection(owner, 'A', 'B', 'C');
+ const {collectionAddress, collectionId} = await helper.eth.createNFTCollection(owner, 'A', 'B', 'C');
const [adminSub] = await helper.arrange.createAccounts([10n], donor);
const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);
@@ -250,7 +250,7 @@
itEth.skip('(!negative tests!) Remove substrate admin by USER is not allowed', async ({helper}) => {
const owner = await helper.eth.createAccountWithBalance(donor);
- const {collectionAddress, collectionId} = await helper.eth.createNonfungibleCollection(owner, 'A', 'B', 'C');
+ const {collectionAddress, collectionId} = await helper.eth.createNFTCollection(owner, 'A', 'B', 'C');
const [adminSub] = await helper.arrange.createAccounts([10n], donor);
const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);
@@ -279,7 +279,7 @@
itEth('Change owner', async ({helper}) => {
const owner = await helper.eth.createAccountWithBalance(donor);
const newOwner = await helper.eth.createAccountWithBalance(donor);
- const {collectionAddress} = await helper.eth.createNonfungibleCollection(owner, 'A', 'B', 'C');
+ const {collectionAddress} = await helper.eth.createNFTCollection(owner, 'A', 'B', 'C');
const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);
await collectionEvm.methods.setOwner(newOwner).send();
@@ -291,7 +291,7 @@
itEth('change owner call fee', async ({helper}) => {
const owner = await helper.eth.createAccountWithBalance(donor);
const newOwner = await helper.eth.createAccountWithBalance(donor);
- const {collectionAddress} = await helper.eth.createNonfungibleCollection(owner, 'A', 'B', 'C');
+ const {collectionAddress} = await helper.eth.createNFTCollection(owner, 'A', 'B', 'C');
const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);
const cost = await recordEthFee(helper, owner, () => collectionEvm.methods.setOwner(newOwner).send());
expect(cost < BigInt(0.2 * Number(helper.balance.getOneTokenNominal())));
@@ -301,7 +301,7 @@
itEth('(!negative tests!) call setOwner by non owner', async ({helper}) => {
const owner = await helper.eth.createAccountWithBalance(donor);
const newOwner = await helper.eth.createAccountWithBalance(donor);
- const {collectionAddress} = await helper.eth.createNonfungibleCollection(owner, 'A', 'B', 'C');
+ const {collectionAddress} = await helper.eth.createNFTCollection(owner, 'A', 'B', 'C');
const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);
await expect(collectionEvm.methods.setOwner(newOwner).send({from: newOwner})).to.be.rejected;
@@ -321,7 +321,7 @@
itEth.skip('Change owner', async ({helper}) => {
const owner = await helper.eth.createAccountWithBalance(donor);
const [newOwner] = await helper.arrange.createAccounts([10n], donor);
- const {collectionAddress} = await helper.eth.createNonfungibleCollection(owner, 'A', 'B', 'C');
+ const {collectionAddress} = await helper.eth.createNFTCollection(owner, 'A', 'B', 'C');
const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);
expect(await collectionEvm.methods.isOwnerOrAdmin(owner).call()).to.be.true;
@@ -336,7 +336,7 @@
itEth.skip('change owner call fee', async ({helper}) => {
const owner = await helper.eth.createAccountWithBalance(donor);
const [newOwner] = await helper.arrange.createAccounts([10n], donor);
- const {collectionAddress} = await helper.eth.createNonfungibleCollection(owner, 'A', 'B', 'C');
+ const {collectionAddress} = await helper.eth.createNFTCollection(owner, 'A', 'B', 'C');
const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);
const cost = await recordEthFee(helper, owner, () => collectionEvm.methods.setOwnerSubstrate(newOwner.addressRaw).send());
@@ -348,7 +348,7 @@
const owner = await helper.eth.createAccountWithBalance(donor);
const otherReceiver = await helper.eth.createAccountWithBalance(donor);
const [newOwner] = await helper.arrange.createAccounts([10n], donor);
- const {collectionAddress} = await helper.eth.createNonfungibleCollection(owner, 'A', 'B', 'C');
+ const {collectionAddress} = await helper.eth.createNFTCollection(owner, 'A', 'B', 'C');
const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);
await expect(collectionEvm.methods.setOwnerSubstrate(newOwner.addressRaw).send({from: otherReceiver})).to.be.rejected;
tests/src/eth/collectionHelpersAbi.jsondiffbeforeafterboth--- a/tests/src/eth/collectionHelpersAbi.json
+++ b/tests/src/eth/collectionHelpersAbi.json
@@ -32,7 +32,7 @@
{ "internalType": "string", "name": "tokenPrefix", "type": "string" },
{ "internalType": "string", "name": "baseUri", "type": "string" }
],
- "name": "createERC721MetadataCompatibleCollection",
+ "name": "createERC721MetadataNFTCollection",
"outputs": [{ "internalType": "address", "name": "", "type": "address" }],
"stateMutability": "payable",
"type": "function"
@@ -44,7 +44,18 @@
{ "internalType": "string", "name": "tokenPrefix", "type": "string" },
{ "internalType": "string", "name": "baseUri", "type": "string" }
],
- "name": "createERC721MetadataCompatibleRFTCollection",
+ "name": "createERC721MetadataRFTCollection",
+ "outputs": [{ "internalType": "address", "name": "", "type": "address" }],
+ "stateMutability": "payable",
+ "type": "function"
+ },
+ {
+ "inputs": [
+ { "internalType": "string", "name": "name", "type": "string" },
+ { "internalType": "string", "name": "description", "type": "string" },
+ { "internalType": "string", "name": "tokenPrefix", "type": "string" }
+ ],
+ "name": "createNFTCollection",
"outputs": [{ "internalType": "address", "name": "", "type": "address" }],
"stateMutability": "payable",
"type": "function"
@@ -73,6 +84,17 @@
},
{
"inputs": [
+ { "internalType": "string", "name": "name", "type": "string" },
+ { "internalType": "string", "name": "description", "type": "string" },
+ { "internalType": "string", "name": "tokenPrefix", "type": "string" }
+ ],
+ "name": "createRefungibleCollection",
+ "outputs": [{ "internalType": "address", "name": "", "type": "address" }],
+ "stateMutability": "payable",
+ "type": "function"
+ },
+ {
+ "inputs": [
{
"internalType": "address",
"name": "collectionAddress",
tests/src/eth/collectionProperties.test.tsdiffbeforeafterboth--- a/tests/src/eth/collectionProperties.test.ts
+++ b/tests/src/eth/collectionProperties.test.ts
@@ -24,7 +24,7 @@
const raw = (await collection.getData())?.raw;
- expect(raw.properties[0].value).to.equal('testValue');
+ expect(raw.properties[1].value).to.equal('testValue');
});
itEth('Can be deleted', async({helper}) => {
@@ -54,3 +54,46 @@
expect(value).to.equal(helper.getWeb3().utils.toHex('testValue'));
});
});
+
+describe('Supports ERC721Metadata', () => {
+ let donor: IKeyringPair;
+
+ before(async function() {
+ await usingEthPlaygrounds(async (_helper, privateKey) => {
+ donor = privateKey('//Alice');
+ });
+ });
+
+ itEth('ERC721Metadata property can be set for NFT collection', async({helper}) => {
+ const caller = await helper.eth.createAccountWithBalance(donor);
+ const collection = await helper.nft.mintCollection(donor, {name: 'col', description: 'descr', tokenPrefix: 'COL'});
+
+ await collection.addAdmin(donor, {Ethereum: caller});
+ const contract = helper.ethNativeContract.collectionById(collection.collectionId, 'nft', caller);
+
+ await contract.methods.setCollectionProperty('ERC721Metadata', Buffer.from('1')).send({from: caller});
+
+ expect(await contract.methods.supportsInterface('0x5b5e139f').call()).to.be.true;
+
+ await contract.methods.setCollectionProperty('ERC721Metadata', Buffer.from('0')).send({from: caller});
+
+ expect(await contract.methods.supportsInterface('0x5b5e139f').call()).to.be.false;
+ });
+
+ itEth('ERC721Metadata property can be set for RFT collection', async({helper}) => {
+ const caller = await helper.eth.createAccountWithBalance(donor);
+ const collection = await helper.rft.mintCollection(donor, {name: 'col', description: 'descr', tokenPrefix: 'COL'});
+
+ await collection.addAdmin(donor, {Ethereum: caller});
+
+ const contract = helper.ethNativeContract.collectionById(collection.collectionId, 'nft', caller);
+
+ await contract.methods.setCollectionProperty('ERC721Metadata', Buffer.from('1')).send({from: caller});
+
+ expect(await contract.methods.supportsInterface('0x5b5e139f').call()).to.be.true;
+
+ await contract.methods.setCollectionProperty('ERC721Metadata', Buffer.from('0')).send({from: caller});
+
+ expect(await contract.methods.supportsInterface('0x5b5e139f').call()).to.be.false;
+ });
+});
tests/src/eth/collectionSponsoring.test.tsdiffbeforeafterboth--- a/tests/src/eth/collectionSponsoring.test.ts
+++ b/tests/src/eth/collectionSponsoring.test.ts
@@ -54,7 +54,7 @@
// itWeb3('Set substrate sponsor', async ({api, web3, privateKeyWrapper}) => {
// const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);
// const collectionHelpers = evmCollectionHelpers(web3, owner);
- // let result = await collectionHelpers.methods.createNonfungibleCollection('Sponsor collection', '1', '1').send();
+ // let result = await collectionHelpers.methods.createNFTCollection('Sponsor collection', '1', '1').send();
// const {collectionIdAddress, collectionId} = await getCollectionAddressFromResult(api, result);
// const sponsor = privateKeyWrapper('//Alice');
// const collectionEvm = evmCollection(web3, owner, collectionIdAddress);
@@ -75,7 +75,7 @@
const owner = await helper.eth.createAccountWithBalance(donor);
const collectionHelpers = helper.ethNativeContract.collectionHelpers(owner);
- let result = await collectionHelpers.methods.createNonfungibleCollection('Sponsor collection', '1', '1').send({value: Number(2n * nominal)});
+ let result = await collectionHelpers.methods.createNFTCollection('Sponsor collection', '1', '1').send({value: Number(2n * nominal)});
const collectionIdAddress = helper.ethAddress.normalizeAddress(result.events.CollectionCreated.returnValues.collectionId);
const sponsor = await helper.eth.createAccountWithBalance(donor);
const collectionEvm = helper.ethNativeContract.collection(collectionIdAddress, 'nft', owner);
@@ -97,7 +97,7 @@
const owner = await helper.eth.createAccountWithBalance(donor);
const collectionHelpers = helper.ethNativeContract.collectionHelpers(owner);
- let result = await collectionHelpers.methods.createNonfungibleCollection('Sponsor collection', '1', '1').send({value: Number(2n * nominal)});
+ let result = await collectionHelpers.methods.createERC721MetadataNFTCollection('Sponsor collection', '1', '1', '').send({value: Number(2n * nominal)});
const collectionIdAddress = helper.ethAddress.normalizeAddress(result.events.CollectionCreated.returnValues.collectionId);
const collectionId = helper.ethAddress.extractCollectionId(collectionIdAddress);
const collection = helper.nft.getCollectionObject(collectionId);
@@ -167,7 +167,7 @@
// itWeb3('Sponsoring collection from substrate address via access list', async ({api, web3, privateKeyWrapper}) => {
// const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);
// const collectionHelpers = evmCollectionHelpers(web3, owner);
- // const result = await collectionHelpers.methods.createNonfungibleCollection('Sponsor collection', '1', '1').send();
+ // const result = await collectionHelpers.methods.createERC721MetadataNFTCollection('Sponsor collection', '1', '1', '').send();
// const {collectionIdAddress, collectionId} = await getCollectionAddressFromResult(api, result);
// const sponsor = privateKeyWrapper('//Alice');
// const collectionEvm = evmCollection(web3, owner, collectionIdAddress);
@@ -223,7 +223,7 @@
const owner = await helper.eth.createAccountWithBalance(donor);
const collectionHelpers = helper.ethNativeContract.collectionHelpers(owner);
- let result = await collectionHelpers.methods.createNonfungibleCollection('Sponsor collection', '1', '1').send({value: Number(2n * nominal)});
+ let result = await collectionHelpers.methods.createERC721MetadataNFTCollection('Sponsor collection', '1', '1', '').send({value: Number(2n * nominal)});
const collectionIdAddress = helper.ethAddress.normalizeAddress(result.events.CollectionCreated.returnValues.collectionId);
const collectionId = helper.ethAddress.extractCollectionId(collectionIdAddress);
const collection = helper.nft.getCollectionObject(collectionId);
tests/src/eth/createNFTCollection.test.tsdiffbeforeafterboth--- a/tests/src/eth/createNFTCollection.test.ts
+++ b/tests/src/eth/createNFTCollection.test.ts
@@ -37,7 +37,7 @@
// todo:playgrounds this might fail when in async environment.
const collectionCountBefore = +(await helper.callRpc('api.rpc.unique.collectionStats')).created;
- const {collectionId} = await helper.eth.createNonfungibleCollection(owner, name, description, prefix);
+ const {collectionId} = await helper.eth.createNFTCollection(owner, name, description, prefix);
const collectionCountAfter = +(await helper.callRpc('api.rpc.unique.collectionStats')).created;
const collection = helper.nft.getCollectionObject(collectionId);
@@ -64,7 +64,7 @@
.call()).to.be.false;
await collectionHelpers.methods
- .createNonfungibleCollection('A', 'A', 'A')
+ .createNFTCollection('A', 'A', 'A')
.send({value: Number(2n * helper.balance.getOneTokenNominal())});
expect(await collectionHelpers.methods
@@ -76,7 +76,7 @@
const owner = await helper.eth.createAccountWithBalance(donor);
const sponsor = await helper.eth.createAccountWithBalance(donor);
const ss58Format = helper.chain.getChainProperties().ss58Format;
- const {collectionId, collectionAddress} = await helper.eth.createNonfungibleCollection(owner, 'Sponsor', 'absolutely anything', 'ROC');
+ const {collectionId, collectionAddress} = await helper.eth.createNFTCollection(owner, 'Sponsor', 'absolutely anything', 'ROC');
const collection = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);
await collection.methods.setCollectionSponsor(sponsor).send();
@@ -95,7 +95,7 @@
itEth('Set limits', async ({helper}) => {
const owner = await helper.eth.createAccountWithBalance(donor);
- const {collectionId, collectionAddress} = await helper.eth.createNonfungibleCollection(owner, 'Limits', 'absolutely anything', 'FLO');
+ const {collectionId, collectionAddress} = await helper.eth.createNFTCollection(owner, 'Limits', 'absolutely anything', 'FLO');
const limits = {
accountTokenOwnershipLimit: 1000,
sponsoredDataSize: 1024,
@@ -138,7 +138,7 @@
.methods.isCollectionExist(collectionAddressForNonexistentCollection).call())
.to.be.false;
- const {collectionAddress} = await helper.eth.createNonfungibleCollection(owner, 'Exister', 'absolutely anything', 'EVC');
+ const {collectionAddress} = await helper.eth.createNFTCollection(owner, 'Exister', 'absolutely anything', 'EVC');
expect(await helper.ethNativeContract.collectionHelpers(collectionAddress)
.methods.isCollectionExist(collectionAddress).call())
.to.be.true;
@@ -166,7 +166,7 @@
const tokenPrefix = 'A';
await expect(collectionHelper.methods
- .createNonfungibleCollection(collectionName, description, tokenPrefix)
+ .createNFTCollection(collectionName, description, tokenPrefix)
.call({value: Number(2n * nominal)})).to.be.rejectedWith('name is too long. Max length is ' + MAX_NAME_LENGTH);
}
@@ -176,7 +176,7 @@
const description = 'A'.repeat(MAX_DESCRIPTION_LENGTH + 1);
const tokenPrefix = 'A';
await expect(collectionHelper.methods
- .createNonfungibleCollection(collectionName, description, tokenPrefix)
+ .createNFTCollection(collectionName, description, tokenPrefix)
.call({value: Number(2n * nominal)})).to.be.rejectedWith('description is too long. Max length is ' + MAX_DESCRIPTION_LENGTH);
}
{
@@ -185,7 +185,7 @@
const description = 'A';
const tokenPrefix = 'A'.repeat(MAX_TOKEN_PREFIX_LENGTH + 1);
await expect(collectionHelper.methods
- .createNonfungibleCollection(collectionName, description, tokenPrefix)
+ .createNFTCollection(collectionName, description, tokenPrefix)
.call({value: Number(2n * nominal)})).to.be.rejectedWith('token_prefix is too long. Max length is ' + MAX_TOKEN_PREFIX_LENGTH);
}
});
@@ -194,14 +194,14 @@
const owner = await helper.eth.createAccountWithBalance(donor);
const collectionHelper = helper.ethNativeContract.collectionHelpers(owner);
await expect(collectionHelper.methods
- .createNonfungibleCollection('Peasantry', 'absolutely anything', 'CVE')
+ .createNFTCollection('Peasantry', 'absolutely anything', 'CVE')
.call({value: Number(1n * nominal)})).to.be.rejectedWith('Sent amount not equals to collection creation price (2000000000000000000)');
});
itEth('(!negative test!) Check owner', async ({helper}) => {
const owner = await helper.eth.createAccountWithBalance(donor);
const malfeasant = helper.eth.createAccount();
- const {collectionAddress} = await helper.eth.createNonfungibleCollection(owner, 'Transgressed', 'absolutely anything', 'COR');
+ const {collectionAddress} = await helper.eth.createNFTCollection(owner, 'Transgressed', 'absolutely anything', 'COR');
const malfeasantCollection = helper.ethNativeContract.collection(collectionAddress, 'nft', malfeasant);
const EXPECTED_ERROR = 'NoPermission';
{
@@ -224,7 +224,7 @@
itEth('(!negative test!) Set limits', async ({helper}) => {
const owner = await helper.eth.createAccountWithBalance(donor);
- const {collectionAddress} = await helper.eth.createNonfungibleCollection(owner, 'Limits', 'absolutely anything', 'OLF');
+ const {collectionAddress} = await helper.eth.createNFTCollection(owner, 'Limits', 'absolutely anything', 'OLF');
const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);
await expect(collectionEvm.methods
.setCollectionLimit('badLimit', 'true')
tests/src/eth/createRFTCollection.test.tsdiffbeforeafterboth--- a/tests/src/eth/createRFTCollection.test.ts
+++ b/tests/src/eth/createRFTCollection.test.ts
@@ -39,7 +39,7 @@
// todo:playgrounds this might fail when in async environment.
const collectionCountBefore = +(await helper.callRpc('api.rpc.unique.collectionStats')).created;
- const {collectionId} = await helper.eth.createRefungibleCollection(owner, name, description, prefix);
+ const {collectionId} = await helper.eth.createRFTCollection(owner, name, description, prefix);
const collectionCountAfter = +(await helper.callRpc('api.rpc.unique.collectionStats')).created;
const data = (await helper.rft.getData(collectionId))!;
@@ -77,7 +77,7 @@
const owner = await helper.eth.createAccountWithBalance(donor);
const sponsor = await helper.eth.createAccountWithBalance(donor);
const ss58Format = helper.chain.getChainProperties().ss58Format;
- const {collectionId, collectionAddress} = await helper.eth.createRefungibleCollection(owner, 'Sponsor', 'absolutely anything', 'ENVY');
+ const {collectionId, collectionAddress} = await helper.eth.createRFTCollection(owner, 'Sponsor', 'absolutely anything', 'ENVY');
const collection = helper.ethNativeContract.collection(collectionAddress, 'rft', owner);
await collection.methods.setCollectionSponsor(sponsor).send();
@@ -96,7 +96,7 @@
itEth('Set limits', async ({helper}) => {
const owner = await helper.eth.createAccountWithBalance(donor);
- const {collectionId, collectionAddress} = await helper.eth.createRefungibleCollection(owner, 'Limits', 'absolutely anything', 'INSI');
+ const {collectionId, collectionAddress} = await helper.eth.createRFTCollection(owner, 'Limits', 'absolutely anything', 'INSI');
const limits = {
accountTokenOwnershipLimit: 1000,
sponsoredDataSize: 1024,
@@ -139,7 +139,7 @@
.methods.isCollectionExist(collectionAddressForNonexistentCollection).call())
.to.be.false;
- const {collectionAddress} = await helper.eth.createRefungibleCollection(owner, 'Exister', 'absolutely anything', 'WIWT');
+ const {collectionAddress} = await helper.eth.createRFTCollection(owner, 'Exister', 'absolutely anything', 'WIWT');
expect(await helper.ethNativeContract.collectionHelpers(collectionAddress)
.methods.isCollectionExist(collectionAddress).call())
.to.be.true;
@@ -202,7 +202,7 @@
itEth('(!negative test!) Check owner', async ({helper}) => {
const owner = await helper.eth.createAccountWithBalance(donor);
const peasant = helper.eth.createAccount();
- const {collectionAddress} = await helper.eth.createRefungibleCollection(owner, 'Transgressed', 'absolutely anything', 'YVNE');
+ const {collectionAddress} = await helper.eth.createRFTCollection(owner, 'Transgressed', 'absolutely anything', 'YVNE');
const peasantCollection = helper.ethNativeContract.collection(collectionAddress, 'rft', peasant);
const EXPECTED_ERROR = 'NoPermission';
{
@@ -225,7 +225,7 @@
itEth('(!negative test!) Set limits', async ({helper}) => {
const owner = await helper.eth.createAccountWithBalance(donor);
- const {collectionAddress} = await helper.eth.createRefungibleCollection(owner, 'Limits', 'absolutely anything', 'ISNI');
+ const {collectionAddress} = await helper.eth.createRFTCollection(owner, 'Limits', 'absolutely anything', 'ISNI');
const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'rft', owner);
await expect(collectionEvm.methods
.setCollectionLimit('badLimit', 'true')
tests/src/eth/evmCoder.test.tsdiffbeforeafterboth--- a/tests/src/eth/evmCoder.test.ts
+++ b/tests/src/eth/evmCoder.test.ts
@@ -65,7 +65,7 @@
itEth('Call non-existing function', async ({helper}) => {
const owner = await helper.eth.createAccountWithBalance(donor);
- const collection = await helper.eth.createNonfungibleCollection(owner, 'EVMCODER', '', 'TEST');
+ const collection = await helper.eth.createNFTCollection(owner, 'EVMCODER', '', 'TEST');
const contract = await helper.ethContract.deployByCode(owner, 'Test', getContractSource(collection.collectionAddress, '0x1bfed5D614b886b9Ab2eA4CBAc22A96B7EC29c9c'));
const testContract = await helper.ethContract.deployByCode(owner, 'Test', getContractSource(collection.collectionAddress, contract.options.address));
{
tests/src/eth/fractionalizer/fractionalizer.test.tsdiffbeforeafterboth--- a/tests/src/eth/fractionalizer/fractionalizer.test.ts
+++ b/tests/src/eth/fractionalizer/fractionalizer.test.ts
@@ -62,7 +62,7 @@
const mintRFTToken = async (helper: EthUniqueHelper, owner: string, fractionalizer: Contract, amount: bigint): Promise<{
nftCollectionAddress: string, nftTokenId: number, rftTokenAddress: string
}> => {
- const nftCollection = await helper.eth.createNonfungibleCollection(owner, 'nft', 'NFT collection', 'NFT');
+ const nftCollection = await helper.eth.createNFTCollection(owner, 'nft', 'NFT collection', 'NFT');
const nftContract = helper.ethNativeContract.collection(nftCollection.collectionAddress, 'nft', owner);
const nftTokenId = await nftContract.methods.nextTokenId().call();
await nftContract.methods.mint(owner, nftTokenId).send({from: owner});
@@ -92,7 +92,7 @@
itEth('Set RFT collection', async ({helper}) => {
const owner = await helper.eth.createAccountWithBalance(donor, 10n);
const fractionalizer = await deployContract(helper, owner);
- const rftCollection = await helper.eth.createRefungibleCollection(owner, 'rft', 'RFT collection', 'RFT');
+ const rftCollection = await helper.eth.createRFTCollection(owner, 'rft', 'RFT collection', 'RFT');
const rftContract = helper.ethNativeContract.collection(rftCollection.collectionAddress, 'rft', owner);
await rftContract.methods.addCollectionAdmin(fractionalizer.options.address).send({from: owner});
@@ -121,7 +121,7 @@
itEth('Set Allowlist', async ({helper}) => {
const owner = await helper.eth.createAccountWithBalance(donor, 20n);
const {contract: fractionalizer} = await initContract(helper, owner);
- const nftCollection = await helper.eth.createNonfungibleCollection(owner, 'nft', 'NFT collection', 'NFT');
+ const nftCollection = await helper.eth.createNFTCollection(owner, 'nft', 'NFT collection', 'NFT');
const result1 = await fractionalizer.methods.setNftCollectionIsAllowed(nftCollection.collectionAddress, true).send({from: owner});
expect(result1.events).to.be.like({
@@ -146,7 +146,7 @@
itEth('NFT to RFT', async ({helper}) => {
const owner = await helper.eth.createAccountWithBalance(donor, 20n);
- const nftCollection = await helper.eth.createNonfungibleCollection(owner, 'nft', 'NFT collection', 'NFT');
+ const nftCollection = await helper.eth.createNFTCollection(owner, 'nft', 'NFT collection', 'NFT');
const nftContract = helper.ethNativeContract.collection(nftCollection.collectionAddress, 'nft', owner);
const nftTokenId = await nftContract.methods.nextTokenId().call();
await nftContract.methods.mint(owner, nftTokenId).send({from: owner});
@@ -231,7 +231,7 @@
itEth('call setRFTCollection twice', async ({helper}) => {
const owner = await helper.eth.createAccountWithBalance(donor, 20n);
- const rftCollection = await helper.eth.createRefungibleCollection(owner, 'rft', 'RFT collection', 'RFT');
+ const rftCollection = await helper.eth.createRFTCollection(owner, 'rft', 'RFT collection', 'RFT');
const refungibleContract = helper.ethNativeContract.collection(rftCollection.collectionAddress, 'rft', owner);
const fractionalizer = await deployContract(helper, owner);
@@ -244,7 +244,7 @@
itEth('call setRFTCollection with NFT collection', async ({helper}) => {
const owner = await helper.eth.createAccountWithBalance(donor, 20n);
- const nftCollection = await helper.eth.createNonfungibleCollection(owner, 'nft', 'NFT collection', 'NFT');
+ const nftCollection = await helper.eth.createNFTCollection(owner, 'nft', 'NFT collection', 'NFT');
const nftContract = helper.ethNativeContract.collection(nftCollection.collectionAddress, 'nft', owner);
const fractionalizer = await deployContract(helper, owner);
@@ -257,7 +257,7 @@
itEth('call setRFTCollection while not collection admin', async ({helper}) => {
const owner = await helper.eth.createAccountWithBalance(donor, 20n);
const fractionalizer = await deployContract(helper, owner);
- const rftCollection = await helper.eth.createRefungibleCollection(owner, 'rft', 'RFT collection', 'RFT');
+ const rftCollection = await helper.eth.createRFTCollection(owner, 'rft', 'RFT collection', 'RFT');
await expect(fractionalizer.methods.setRFTCollection(rftCollection.collectionAddress).call())
.to.be.rejectedWith(/Fractionalizer contract should be an admin of the collection$/g);
@@ -278,7 +278,7 @@
itEth('call nft2rft without setting RFT collection for contract', async ({helper}) => {
const owner = await helper.eth.createAccountWithBalance(donor, 20n);
- const nftCollection = await helper.eth.createNonfungibleCollection(owner, 'nft', 'NFT collection', 'NFT');
+ const nftCollection = await helper.eth.createNFTCollection(owner, 'nft', 'NFT collection', 'NFT');
const nftContract = helper.ethNativeContract.collection(nftCollection.collectionAddress, 'nft', owner);
const nftTokenId = await nftContract.methods.nextTokenId().call();
await nftContract.methods.mint(owner, nftTokenId).send({from: owner});
@@ -293,7 +293,7 @@
const owner = await helper.eth.createAccountWithBalance(donor, 20n);
const nftOwner = await helper.eth.createAccountWithBalance(donor, 10n);
- const nftCollection = await helper.eth.createNonfungibleCollection(owner, 'nft', 'NFT collection', 'NFT');
+ const nftCollection = await helper.eth.createNFTCollection(owner, 'nft', 'NFT collection', 'NFT');
const nftContract = helper.ethNativeContract.collection(nftCollection.collectionAddress, 'nft', owner);
const nftTokenId = await nftContract.methods.nextTokenId().call();
await nftContract.methods.mint(owner, nftTokenId).send({from: owner});
@@ -310,7 +310,7 @@
itEth('call nft2rft while not in list of allowed accounts', async ({helper}) => {
const owner = await helper.eth.createAccountWithBalance(donor, 20n);
- const nftCollection = await helper.eth.createNonfungibleCollection(owner, 'nft', 'NFT collection', 'NFT');
+ const nftCollection = await helper.eth.createNFTCollection(owner, 'nft', 'NFT collection', 'NFT');
const nftContract = helper.ethNativeContract.collection(nftCollection.collectionAddress, 'nft', owner);
const nftTokenId = await nftContract.methods.nextTokenId().call();
await nftContract.methods.mint(owner, nftTokenId).send({from: owner});
@@ -325,7 +325,7 @@
itEth('call nft2rft while fractionalizer doesnt have approval for nft token', async ({helper}) => {
const owner = await helper.eth.createAccountWithBalance(donor, 20n);
- const nftCollection = await helper.eth.createNonfungibleCollection(owner, 'nft', 'NFT collection', 'NFT');
+ const nftCollection = await helper.eth.createNFTCollection(owner, 'nft', 'NFT collection', 'NFT');
const nftContract = helper.ethNativeContract.collection(nftCollection.collectionAddress, 'nft', owner);
const nftTokenId = await nftContract.methods.nextTokenId().call();
await nftContract.methods.mint(owner, nftTokenId).send({from: owner});
@@ -341,7 +341,7 @@
const owner = await helper.eth.createAccountWithBalance(donor, 20n);
const fractionalizer = await deployContract(helper, owner);
- const rftCollection = await helper.eth.createRefungibleCollection(owner, 'rft', 'RFT collection', 'RFT');
+ const rftCollection = await helper.eth.createRFTCollection(owner, 'rft', 'RFT collection', 'RFT');
const refungibleContract = helper.ethNativeContract.collection(rftCollection.collectionAddress, 'rft', owner);
const rftTokenId = await refungibleContract.methods.nextTokenId().call();
await refungibleContract.methods.mint(owner, rftTokenId).send({from: owner});
@@ -354,7 +354,7 @@
const owner = await helper.eth.createAccountWithBalance(donor, 20n);
const {contract: fractionalizer} = await initContract(helper, owner);
- const rftCollection = await helper.eth.createRefungibleCollection(owner, 'rft', 'RFT collection', 'RFT');
+ const rftCollection = await helper.eth.createRFTCollection(owner, 'rft', 'RFT collection', 'RFT');
const refungibleContract = helper.ethNativeContract.collection(rftCollection.collectionAddress, 'rft', owner);
const rftTokenId = await refungibleContract.methods.nextTokenId().call();
await refungibleContract.methods.mint(owner, rftTokenId).send({from: owner});
@@ -365,7 +365,7 @@
itEth('call rft2nft for RFT token that was not minted by fractionalizer contract', async ({helper}) => {
const owner = await helper.eth.createAccountWithBalance(donor, 20n);
- const rftCollection = await helper.eth.createRefungibleCollection(owner, 'rft', 'RFT collection', 'RFT');
+ const rftCollection = await helper.eth.createRFTCollection(owner, 'rft', 'RFT collection', 'RFT');
const refungibleContract = helper.ethNativeContract.collection(rftCollection.collectionAddress, 'rft', owner);
const fractionalizer = await deployContract(helper, owner);
@@ -432,7 +432,7 @@
await fractionalizer.methods.setRFTCollection(rftCollectionAddress).send({from: owner});
await helper.executeExtrinsic(donor, 'api.tx.unique.setTransfersEnabledFlag', [rftCollection.collectionId, false], true);
- const nftCollection = await helper.eth.createNonfungibleCollection(owner, 'nft', 'NFT collection', 'NFT');
+ const nftCollection = await helper.eth.createNFTCollection(owner, 'nft', 'NFT collection', 'NFT');
const nftContract = helper.ethNativeContract.collection(nftCollection.collectionAddress, 'nft', owner);
const nftTokenId = await nftContract.methods.nextTokenId().call();
await nftContract.methods.mint(owner, nftTokenId).send({from: owner});
tests/src/eth/nesting/nest.test.tsdiffbeforeafterboth--- a/tests/src/eth/nesting/nest.test.ts
+++ b/tests/src/eth/nesting/nest.test.ts
@@ -7,7 +7,7 @@
helper: EthUniqueHelper,
owner: string,
): Promise<{ collectionId: number, collectionAddress: string, contract: Contract }> => {
- const {collectionAddress, collectionId} = await helper.eth.createNonfungibleCollection(owner, 'A', 'B', 'C');
+ const {collectionAddress, collectionId} = await helper.eth.createNFTCollection(owner, 'A', 'B', 'C');
const contract = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);
await contract.methods.setCollectionNesting(true).send({from: owner});
tests/src/eth/nonFungible.test.tsdiffbeforeafterboth--- a/tests/src/eth/nonFungible.test.ts
+++ b/tests/src/eth/nonFungible.test.ts
@@ -84,7 +84,7 @@
const receiver = helper.eth.createAccount();
const collectionHelper = helper.ethNativeContract.collectionHelpers(owner);
- let result = await collectionHelper.methods.createERC721MetadataCompatibleCollection('Mint collection', 'a', 'b', tokenPrefix).send({value: Number(2n * helper.balance.getOneTokenNominal())});
+ let result = await collectionHelper.methods.createERC721MetadataNFTCollection('Mint collection', 'a', 'b', tokenPrefix).send({value: Number(2n * helper.balance.getOneTokenNominal())});
const collectionAddress = helper.ethAddress.normalizeAddress(result.events.CollectionCreated.returnValues.collectionId);
const contract = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);
@@ -146,7 +146,7 @@
const owner = await helper.eth.createAccountWithBalance(donor);
const receiver = helper.eth.createAccount();
- const {collectionAddress} = await helper.eth.createNonfungibleCollection(owner, 'Minty', '6', '6');
+ const {collectionAddress} = await helper.eth.createERC721MetadataNFTCollection(owner, 'Mint collection', '6', '6', '');
const contract = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);
const nextTokenId = await contract.methods.nextTokenId().call();
tests/src/eth/payable.test.tsdiffbeforeafterboth--- a/tests/src/eth/payable.test.ts
+++ b/tests/src/eth/payable.test.ts
@@ -146,7 +146,7 @@
const caller = await helper.eth.createAccountWithBalance(donor);
const contract = await deployProxyContract(helper, deployer);
- const collectionAddress = (await contract.methods.createNonfungibleCollection().send({from: caller, value: Number(CONTRACT_BALANCE)})).events.CollectionCreated.returnValues.collection;
+ const collectionAddress = (await contract.methods.createNFTCollection().send({from: caller, value: Number(CONTRACT_BALANCE)})).events.CollectionCreated.returnValues.collection;
const initialCallerBalance = await helper.balance.getEthereum(caller);
const initialContractBalance = await helper.balance.getEthereum(contract.options.address);
await contract.methods.mintNftToken(collectionAddress).send({from: caller});
@@ -164,7 +164,7 @@
const initialCallerBalance = await helper.balance.getEthereum(caller);
const initialContractBalance = await helper.balance.getEthereum(contract.options.address);
- await contract.methods.createNonfungibleCollection().send({from: caller, value: Number(CONTRACT_BALANCE)});
+ await contract.methods.createNFTCollection().send({from: caller, value: Number(CONTRACT_BALANCE)});
const finalCallerBalance = await helper.balance.getEthereum(caller);
const finalContractBalance = await helper.balance.getEthereum(contract.options.address);
expect(finalCallerBalance < initialCallerBalance).to.be.true;
@@ -177,8 +177,8 @@
const caller = await helper.eth.createAccountWithBalance(donor);
const collectionHelper = helper.ethNativeContract.collectionHelpers(caller);
- await expect(collectionHelper.methods.createNonfungibleCollection('A', 'B', 'C').call({value: Number(SMALL_FEE)})).to.be.rejectedWith('Sent amount not equals to collection creation price (2000000000000000000)');
- await expect(collectionHelper.methods.createNonfungibleCollection('A', 'B', 'C').call({value: Number(BIG_FEE)})).to.be.rejectedWith('Sent amount not equals to collection creation price (2000000000000000000)');
+ await expect(collectionHelper.methods.createNFTCollection('A', 'B', 'C').call({value: Number(SMALL_FEE)})).to.be.rejectedWith('Sent amount not equals to collection creation price (2000000000000000000)');
+ await expect(collectionHelper.methods.createNFTCollection('A', 'B', 'C').call({value: Number(BIG_FEE)})).to.be.rejectedWith('Sent amount not equals to collection creation price (2000000000000000000)');
});
itEth('Negative test: call createRFTCollection with wrong fee', async({helper}) => {
@@ -227,9 +227,9 @@
InnerContract(innerContract).flip();
}
- function createNonfungibleCollection() external payable {
+ function createNFTCollection() external payable {
address collectionHelpers = 0x6C4E9fE1AE37a41E93CEE429e8E1881aBdcbb54F;
- address nftCollection = CollectionHelpers(collectionHelpers).createNonfungibleCollection{value: msg.value}("A", "B", "C");
+ address nftCollection = CollectionHelpers(collectionHelpers).createNFTCollection{value: msg.value}("A", "B", "C");
emit CollectionCreated(nftCollection);
}
tests/src/eth/proxy/nonFungibleProxy.test.tsdiffbeforeafterboth--- a/tests/src/eth/proxy/nonFungibleProxy.test.ts
+++ b/tests/src/eth/proxy/nonFungibleProxy.test.ts
@@ -101,7 +101,7 @@
itEth('Can perform mint()', async ({helper}) => {
const owner = await helper.eth.createAccountWithBalance(donor);
- const {collectionAddress} = await helper.eth.createNonfungibleCollection(owner, 'A', 'A', 'A');
+ const {collectionAddress} = await helper.eth.createERC721MetadataNFTCollection(owner, 'A', 'A', 'A', '');
const caller = await helper.eth.createAccountWithBalance(donor);
const receiver = helper.eth.createAccount();
tests/src/eth/reFungible.test.tsdiffbeforeafterboth--- a/tests/src/eth/reFungible.test.ts
+++ b/tests/src/eth/reFungible.test.ts
@@ -31,7 +31,7 @@
itEth('totalSupply', async ({helper}) => {
const caller = await helper.eth.createAccountWithBalance(donor);
- const {collectionAddress} = await helper.eth.createRefungibleCollection(caller, 'TotalSupply', '6', '6');
+ const {collectionAddress} = await helper.eth.createRFTCollection(caller, 'TotalSupply', '6', '6');
const contract = helper.ethNativeContract.collection(collectionAddress, 'rft', caller);
const nextTokenId = await contract.methods.nextTokenId().call();
await contract.methods.mint(caller, nextTokenId).send();
@@ -41,7 +41,7 @@
itEth('balanceOf', async ({helper}) => {
const caller = await helper.eth.createAccountWithBalance(donor);
- const {collectionAddress} = await helper.eth.createRefungibleCollection(caller, 'BalanceOf', '6', '6');
+ const {collectionAddress} = await helper.eth.createRFTCollection(caller, 'BalanceOf', '6', '6');
const contract = helper.ethNativeContract.collection(collectionAddress, 'rft', caller);
{
@@ -63,7 +63,7 @@
itEth('ownerOf', async ({helper}) => {
const caller = await helper.eth.createAccountWithBalance(donor);
- const {collectionAddress} = await helper.eth.createRefungibleCollection(caller, 'OwnerOf', '6', '6');
+ const {collectionAddress} = await helper.eth.createRFTCollection(caller, 'OwnerOf', '6', '6');
const contract = helper.ethNativeContract.collection(collectionAddress, 'rft', caller);
const tokenId = await contract.methods.nextTokenId().call();
@@ -76,7 +76,7 @@
itEth('ownerOf after burn', async ({helper}) => {
const caller = await helper.eth.createAccountWithBalance(donor);
const receiver = helper.eth.createAccount();
- const {collectionId, collectionAddress} = await helper.eth.createRefungibleCollection(caller, 'OwnerOf-AfterBurn', '6', '6');
+ const {collectionId, collectionAddress} = await helper.eth.createRFTCollection(caller, 'OwnerOf-AfterBurn', '6', '6');
const contract = helper.ethNativeContract.collection(collectionAddress, 'rft', caller);
const tokenId = await contract.methods.nextTokenId().call();
@@ -95,7 +95,7 @@
itEth('ownerOf for partial ownership', async ({helper}) => {
const caller = await helper.eth.createAccountWithBalance(donor);
const receiver = helper.eth.createAccount();
- const {collectionId, collectionAddress} = await helper.eth.createRefungibleCollection(caller, 'Partial-OwnerOf', '6', '6');
+ const {collectionId, collectionAddress} = await helper.eth.createRFTCollection(caller, 'Partial-OwnerOf', '6', '6');
const contract = helper.ethNativeContract.collection(collectionAddress, 'rft', caller);
const tokenId = await contract.methods.nextTokenId().call();
@@ -124,7 +124,7 @@
itEth('Can perform mint()', async ({helper}) => {
const owner = await helper.eth.createAccountWithBalance(donor);
const receiver = helper.eth.createAccount();
- const {collectionAddress} = await helper.eth.createRefungibleCollection(owner, 'Minty', '6', '6');
+ const {collectionAddress} = await helper.eth.createERC721MetadataRFTCollection(owner, 'Minty', '6', '6', '');
const contract = helper.ethNativeContract.collection(collectionAddress, 'rft', owner);
const nextTokenId = await contract.methods.nextTokenId().call();
@@ -147,7 +147,7 @@
itEth('Can perform mintBulk()', async ({helper}) => {
const owner = await helper.eth.createAccountWithBalance(donor);
const receiver = helper.eth.createAccount();
- const {collectionAddress} = await helper.eth.createRefungibleCollection(owner, 'MintBulky', '6', '6');
+ const {collectionAddress} = await helper.eth.createERC721MetadataRFTCollection(owner, 'MintBulky', '6', '6', '');
const contract = helper.ethNativeContract.collection(collectionAddress, 'rft', owner);
{
@@ -179,7 +179,7 @@
itEth('Can perform burn()', async ({helper}) => {
const caller = await helper.eth.createAccountWithBalance(donor);
- const {collectionAddress} = await helper.eth.createRefungibleCollection(caller, 'Burny', '6', '6');
+ const {collectionAddress} = await helper.eth.createRFTCollection(caller, 'Burny', '6', '6');
const contract = helper.ethNativeContract.collection(collectionAddress, 'rft', caller);
const tokenId = await contract.methods.nextTokenId().call();
@@ -197,7 +197,7 @@
itEth('Can perform transferFrom()', async ({helper}) => {
const caller = await helper.eth.createAccountWithBalance(donor);
const receiver = helper.eth.createAccount();
- const {collectionId, collectionAddress} = await helper.eth.createRefungibleCollection(caller, 'TransferFromy', '6', '6');
+ const {collectionId, collectionAddress} = await helper.eth.createRFTCollection(caller, 'TransferFromy', '6', '6');
const contract = helper.ethNativeContract.collection(collectionAddress, 'rft', caller);
const tokenId = await contract.methods.nextTokenId().call();
@@ -241,7 +241,7 @@
itEth('Can perform transfer()', async ({helper}) => {
const caller = await helper.eth.createAccountWithBalance(donor);
const receiver = helper.eth.createAccount();
- const {collectionAddress} = await helper.eth.createRefungibleCollection(caller, 'Transferry', '6', '6');
+ const {collectionAddress} = await helper.eth.createRFTCollection(caller, 'Transferry', '6', '6');
const contract = helper.ethNativeContract.collection(collectionAddress, 'rft', caller);
const tokenId = await contract.methods.nextTokenId().call();
@@ -271,7 +271,7 @@
itEth('transfer event on transfer from partial ownership to full ownership', async ({helper}) => {
const caller = await helper.eth.createAccountWithBalance(donor);
const receiver = helper.eth.createAccount();
- const {collectionId, collectionAddress} = await helper.eth.createRefungibleCollection(caller, 'Transferry-Partial-to-Full', '6', '6');
+ const {collectionId, collectionAddress} = await helper.eth.createRFTCollection(caller, 'Transferry-Partial-to-Full', '6', '6');
const contract = helper.ethNativeContract.collection(collectionAddress, 'rft', caller);
const tokenId = await contract.methods.nextTokenId().call();
@@ -298,7 +298,7 @@
itEth('transfer event on transfer from full ownership to partial ownership', async ({helper}) => {
const caller = await helper.eth.createAccountWithBalance(donor);
const receiver = helper.eth.createAccount();
- const {collectionId, collectionAddress} = await helper.eth.createRefungibleCollection(caller, 'Transferry-Full-to-Partial', '6', '6');
+ const {collectionId, collectionAddress} = await helper.eth.createRFTCollection(caller, 'Transferry-Full-to-Partial', '6', '6');
const contract = helper.ethNativeContract.collection(collectionAddress, 'rft', caller);
const tokenId = await contract.methods.nextTokenId().call();
@@ -336,7 +336,7 @@
itEth('transferFrom() call fee is less than 0.2UNQ', async ({helper}) => {
const caller = await helper.eth.createAccountWithBalance(donor);
const receiver = helper.eth.createAccount();
- const {collectionAddress} = await helper.eth.createRefungibleCollection(caller, 'Feeful-Transfer-From', '6', '6');
+ const {collectionAddress} = await helper.eth.createRFTCollection(caller, 'Feeful-Transfer-From', '6', '6');
const contract = helper.ethNativeContract.collection(collectionAddress, 'rft', caller);
const tokenId = await contract.methods.nextTokenId().call();
@@ -350,7 +350,7 @@
itEth('transfer() call fee is less than 0.2UNQ', async ({helper}) => {
const caller = await helper.eth.createAccountWithBalance(donor);
const receiver = helper.eth.createAccount();
- const {collectionAddress} = await helper.eth.createRefungibleCollection(caller, 'Feeful-Transfer', '6', '6');
+ const {collectionAddress} = await helper.eth.createRFTCollection(caller, 'Feeful-Transfer', '6', '6');
const contract = helper.ethNativeContract.collection(collectionAddress, 'rft', caller);
const tokenId = await contract.methods.nextTokenId().call();
@@ -386,8 +386,8 @@
itEth('Returns symbol name', async ({helper}) => {
const caller = await helper.eth.createAccountWithBalance(donor);
- const {collectionAddress} = await helper.eth.createRefungibleCollection(caller, 'Leviathan', '', '12');
- const contract = helper.ethNativeContract.collection(collectionAddress, 'rft', caller);
+ const {collectionId} = await helper.rft.mintCollection(alice, {name: 'Leviathan', tokenPrefix: '12'});
+ const contract = helper.ethNativeContract.collectionById(collectionId, 'rft', caller);
const symbol = await contract.methods.symbol().call();
expect(symbol).to.equal('12');
});
tests/src/eth/reFungibleToken.test.tsdiffbeforeafterboth--- a/tests/src/eth/reFungibleToken.test.ts
+++ b/tests/src/eth/reFungibleToken.test.ts
@@ -81,7 +81,7 @@
const receiver = helper.eth.createAccount();
const collectionHelper = helper.ethNativeContract.collectionHelpers(owner);
- let result = await collectionHelper.methods.createERC721MetadataCompatibleCollection('Mint collection', 'a', 'b', tokenPrefix).send({value: Number(2n * helper.balance.getOneTokenNominal())});
+ let result = await collectionHelper.methods.createERC721MetadataNFTCollection('Mint collection', 'a', 'b', tokenPrefix).send({value: Number(2n * helper.balance.getOneTokenNominal())});
const collectionAddress = helper.ethAddress.normalizeAddress(result.events.CollectionCreated.returnValues.collectionId);
const contract = helper.ethNativeContract.collection(collectionAddress, 'rft', owner);
@@ -294,7 +294,7 @@
itEth('Receiving Transfer event on burning into full ownership', async ({helper}) => {
const caller = await helper.eth.createAccountWithBalance(donor);
const receiver = await helper.eth.createAccountWithBalance(donor);
- const {collectionId, collectionAddress} = await helper.eth.createRefungibleCollection(caller, 'Devastation', '6', '6');
+ const {collectionId, collectionAddress} = await helper.eth.createRFTCollection(caller, 'Devastation', '6', '6');
const contract = helper.ethNativeContract.collection(collectionAddress, 'rft', caller);
const tokenId = await contract.methods.nextTokenId().call();
@@ -479,7 +479,7 @@
itEth('Default parent token address and id', async ({helper}) => {
const owner = await helper.eth.createAccountWithBalance(donor);
- const {collectionId, collectionAddress} = await helper.eth.createRefungibleCollection(owner, 'Sands', '', 'GRAIN');
+ const {collectionId, collectionAddress} = await helper.eth.createRFTCollection(owner, 'Sands', '', 'GRAIN');
const collectionContract = helper.ethNativeContract.collection(collectionAddress, 'rft', owner);
const tokenId = await collectionContract.methods.nextTokenId().call();
tests/src/eth/util/playgrounds/unique.dev.tsdiffbeforeafterboth--- a/tests/src/eth/util/playgrounds/unique.dev.ts
+++ b/tests/src/eth/util/playgrounds/unique.dev.ts
@@ -174,11 +174,23 @@
return await this.helper.callRpc('api.rpc.eth.call', [{from: signer, to: contractAddress, data: abi}]);
}
- async createNonfungibleCollection(signer: string, name: string, description: string, tokenPrefix: string): Promise<{collectionId: number, collectionAddress: string}> {
+ async createNFTCollection(signer: string, name: string, description: string, tokenPrefix: string): Promise<{collectionId: number, collectionAddress: string}> {
const collectionCreationPrice = this.helper.balance.getCollectionCreationPrice();
const collectionHelper = this.helper.ethNativeContract.collectionHelpers(signer);
- const result = await collectionHelper.methods.createNonfungibleCollection(name, description, tokenPrefix).send({value: Number(collectionCreationPrice)});
+ const result = await collectionHelper.methods.createNFTCollection(name, description, tokenPrefix).send({value: Number(collectionCreationPrice)});
+
+ const collectionAddress = this.helper.ethAddress.normalizeAddress(result.events.CollectionCreated.returnValues.collectionId);
+ const collectionId = this.helper.ethAddress.extractCollectionId(collectionAddress);
+
+ return {collectionId, collectionAddress};
+ }
+
+ async createERC721MetadataNFTCollection(signer: string, name: string, description: string, tokenPrefix: string, baseUri: string): Promise<{collectionId: number, collectionAddress: string}> {
+ const collectionCreationPrice = this.helper.balance.getCollectionCreationPrice();
+ const collectionHelper = this.helper.ethNativeContract.collectionHelpers(signer);
+
+ const result = await collectionHelper.methods.createERC721MetadataNFTCollection(name, description, tokenPrefix, baseUri).send({value: Number(collectionCreationPrice)});
const collectionAddress = this.helper.ethAddress.normalizeAddress(result.events.CollectionCreated.returnValues.collectionId);
const collectionId = this.helper.ethAddress.extractCollectionId(collectionAddress);
@@ -186,7 +198,7 @@
return {collectionId, collectionAddress};
}
- async createRefungibleCollection(signer: string, name: string, description: string, tokenPrefix: string): Promise<{collectionId: number, collectionAddress: string}> {
+ async createRFTCollection(signer: string, name: string, description: string, tokenPrefix: string): Promise<{collectionId: number, collectionAddress: string}> {
const collectionCreationPrice = this.helper.balance.getCollectionCreationPrice();
const collectionHelper = this.helper.ethNativeContract.collectionHelpers(signer);
@@ -198,6 +210,18 @@
return {collectionId, collectionAddress};
}
+ async createERC721MetadataRFTCollection(signer: string, name: string, description: string, tokenPrefix: string, baseUri: string): Promise<{collectionId: number, collectionAddress: string}> {
+ const collectionCreationPrice = this.helper.balance.getCollectionCreationPrice();
+ const collectionHelper = this.helper.ethNativeContract.collectionHelpers(signer);
+
+ const result = await collectionHelper.methods.createERC721MetadataRFTCollection(name, description, tokenPrefix, baseUri).send({value: Number(collectionCreationPrice)});
+
+ const collectionAddress = this.helper.ethAddress.normalizeAddress(result.events.CollectionCreated.returnValues.collectionId);
+ const collectionId = this.helper.ethAddress.extractCollectionId(collectionAddress);
+
+ return {collectionId, collectionAddress};
+ }
+
async deployCollectorContract(signer: string): Promise<Contract> {
return await this.helper.ethContract.deployByCode(signer, 'Collector', `
// SPDX-License-Identifier: UNLICENSED
tests/src/nesting/properties.test.tsdiffbeforeafterboth--- a/tests/src/nesting/properties.test.ts
+++ b/tests/src/nesting/properties.test.ts
@@ -18,6 +18,52 @@
import {itSub, Pallets, requirePalletsOrSkip, usingPlaygrounds, expect} from '../util/playgrounds';
import {UniqueHelper, UniqueBaseCollection, UniqueNFTCollection, UniqueNFToken, UniqueRFTCollection, UniqueRFToken} from '../util/playgrounds/unique';
+
+describe('Composite Properties Test', () => {
+ let alice: IKeyringPair;
+
+ before(async () => {
+ await usingPlaygrounds(async (helper, privateKey) => {
+ const donor = privateKey('//Alice');
+ [alice] = await helper.arrange.createAccounts([50n], donor);
+ });
+ });
+
+ async function testMakeSureSuppliesRequired(baseCollection: UniqueNFTCollection | UniqueRFTCollection) {
+
+ const collectionOption = await baseCollection.getOptions();
+ expect(collectionOption).is.not.null;
+ let collection = collectionOption;
+ expect(collection.tokenPropertyPermissions).to.be.empty;
+ expect(collection.properties).to.be.deep.equal([{key: 'ERC721Metadata', value: '1'}]);
+
+ const propertyPermissions = [
+ {key: 'mindgame', permission: {collectionAdmin: true, mutable: false, tokenOwner: true}},
+ {key: 'skullduggery', permission: {collectionAdmin: false, mutable: true, tokenOwner: false}},
+ ];
+ await expect(await baseCollection.setTokenPropertyPermissions(alice, propertyPermissions)).to.be.true;
+
+ const collectionProperties = [
+ {key: 'ERC721Metadata', value: '1'},
+ {key: 'black_hole', value: 'LIGO'},
+ {key: 'electron', value: 'come bond'},
+ ];
+
+ await expect(await baseCollection.setProperties(alice, collectionProperties)).to.be.true;
+
+ collection = await baseCollection.getOptions();
+ expect(collection.tokenPropertyPermissions).to.be.deep.equal(propertyPermissions);
+ expect(collection.properties).to.be.deep.equal(collectionProperties);
+ }
+
+ itSub('Makes sure collectionById supplies required fields for NFT', async ({helper}) => {
+ await testMakeSureSuppliesRequired(await helper.nft.mintCollection(alice, {name: 'A', description: 'B', tokenPrefix: 'C'}));
+ });
+
+ itSub.ifWithPallets('Makes sure collectionById supplies required fields for ReFungible', [Pallets.ReFungible], async ({helper}) => {
+ await testMakeSureSuppliesRequired(await helper.rft.mintCollection(alice, {name: 'A', description: 'B', tokenPrefix: 'C'}));
+ });
+});
// ---------- COLLECTION PROPERTIES
describe('Integration Test: Collection Properties', () => {
@@ -33,7 +79,11 @@
itSub('Properties are initially empty', async ({helper}) => {
const collection = await helper.nft.mintCollection(alice);
- expect(await collection.getProperties()).to.be.empty;
+ const properties = await collection.getProperties();
+ expect(properties).to.be.deep.equal([{
+ 'key': 'ERC721Metadata',
+ 'value': '1',
+ }]);
});
async function testSetsPropertiesForCollection(collection: UniqueBaseCollection) {
@@ -150,7 +200,11 @@
await expect(collection.setProperties(bob, [{key: 'electron', value: 'come bond'}, {key: 'black_hole', value: 'LIGO'}]))
.to.be.rejectedWith(/common\.NoPermission/);
- expect(await collection.getProperties()).to.be.empty;
+ const properties = await collection.getProperties();
+ expect(properties).to.be.deep.equal([{
+ 'key': 'ERC721Metadata',
+ 'value': '1',
+ }]);
}
itSub('Fails to set properties in a NFT collection if not its onwer/administrator', async ({helper}) => {
@@ -202,7 +256,11 @@
await expect(collection.setProperties(alice, propertiesToBeSet)).
to.be.rejectedWith(/common\.PropertyLimitReached/);
- expect(await collection.getProperties()).to.be.empty;
+ const properties = await collection.getProperties();
+ expect(properties).to.be.deep.equal([{
+ 'key': 'ERC721Metadata',
+ 'value': '1',
+ }]);
}
itSub('Fails to set more properties than it is allowed (NFT)', async ({helper}) => {
tests/src/util/playgrounds/unique.tsdiffbeforeafterboth--- a/tests/src/util/playgrounds/unique.ts
+++ b/tests/src/util/playgrounds/unique.ts
@@ -981,6 +981,10 @@
return (await this.helper.callRpc('api.rpc.unique.collectionProperties', [collectionId, propertyKeys])).toHuman();
}
+ async getCollectionOptions(collectionId: number) {
+ return (await this.helper.callRpc('api.rpc.unique.collectionById', [collectionId])).toHuman();
+ }
+
/**
* Deletes onchain properties from the collection.
*
@@ -1293,6 +1297,7 @@
async mintCollection(signer: TSigner, collectionOptions: ICollectionCreationOptions, mode: 'NFT' | 'RFT'): Promise<UniqueBaseCollection> {
collectionOptions = JSON.parse(JSON.stringify(collectionOptions)) as ICollectionCreationOptions; // Clone object
collectionOptions.mode = (mode === 'NFT') ? {nft: null} : {refungible: null};
+ collectionOptions.properties = collectionOptions.properties || [{key: 'ERC721Metadata', value: '1'}];
for (const key of ['name', 'description', 'tokenPrefix']) {
if (typeof collectionOptions[key as 'name' | 'description' | 'tokenPrefix'] === 'string') collectionOptions[key as 'name' | 'description' | 'tokenPrefix'] = this.helper.util.str2vec(collectionOptions[key as 'name' | 'description' | 'tokenPrefix'] as string);
}
@@ -2476,6 +2481,10 @@
return await this.helper.collection.getTokenNextSponsored(this.collectionId, tokenId, addressObj);
}
+ async getOptions() {
+ return await this.helper.collection.getCollectionOptions(this.collectionId);
+ }
+
async setSponsor(signer: TSigner, sponsorAddress: TSubstrateAccount) {
return await this.helper.collection.setSponsor(signer, this.collectionId, sponsorAddress);
}