difftreelog
Merge branch 'develop' into feature/NFTPAR-142
in: master
# Conflicts: # pallets/nft/src/lib.rs
5 files changed
pallets/nft/src/benchmarking.rsdiffbeforeafterboth--- a/pallets/nft/src/benchmarking.rs
+++ b/pallets/nft/src/benchmarking.rs
@@ -165,7 +165,7 @@
let token_prefix1: Vec<u8> = b"token_prefix1".to_vec();
let mode: CollectionMode = CollectionMode::NFT;
let caller: T::AccountId = T::AccountId::from(whitelisted_caller());
- let nft_data = CreateNftData {
+ let mut nft_data = CreateNftData {
const_data: vec![],
variable_data: vec![]
};
@@ -173,7 +173,7 @@
nft_data.const_data.push(10);
nft_data.variable_data.push(10);
}
- let mut data = CreateItemData::NFT(nft_data);
+ let data = CreateItemData::NFT(nft_data);
Nft::<T>::create_collection(RawOrigin::Signed(caller.clone()).into(), col_name1.clone(), col_desc1.clone(), token_prefix1.clone(), mode.clone())?;
}: create_item(RawOrigin::Signed(caller.clone()), 2, caller.clone(), data)
pallets/nft/src/default_weights.rsdiffbeforeafterboth--- a/pallets/nft/src/default_weights.rs
+++ b/pallets/nft/src/default_weights.rs
@@ -63,7 +63,7 @@
}
fn create_item(s: usize, ) -> Weight {
(130_000_000 as Weight)
- .saturating_add((2135 as Weight).saturating_mul(s as Weight))
+ .saturating_add((2135 as Weight).saturating_mul(s as Weight).saturating_mul(500 as Weight)) // 500 is temporary multiplier, fee for storage
.saturating_add(DbWeight::get().reads(10 as Weight))
.saturating_add(DbWeight::get().writes(8 as Weight))
}
pallets/nft/src/lib.rsdiffbeforeafterboth889use codec::{Decode, Encode};9use codec::{Decode, Encode};10pub use frame_support::{10pub use frame_support::{11 construct_runtime, decl_event, decl_module, decl_storage,11 construct_runtime, decl_event, decl_module, decl_storage, decl_error,12 dispatch::DispatchResult,12 dispatch::DispatchResult,13 ensure, parameter_types, fail,13 ensure, fail, parameter_types,14 traits::{14 traits::{15 Currency, ExistenceRequirement, Get, Imbalance, KeyOwnerProofSystem, OnUnbalanced,15 Currency, ExistenceRequirement, Get, Imbalance, KeyOwnerProofSystem, OnUnbalanced,16 Randomness, WithdrawReason,16 Randomness, WithdrawReason,22 },22 },23 IsSubType, StorageValue,23 IsSubType, StorageValue,24};24};25// use frame_support::weights::{Weight, constants::RocksDbWeight as DbWeight};262527use frame_system::{self as system, ensure_signed, ensure_root};26use frame_system::{self as system, ensure_signed, ensure_root};28use sp_runtime::sp_std::prelude::Vec;27use sp_runtime::sp_std::prelude::Vec;114 pub const_on_chain_schema: Vec<u8>, //113 pub const_on_chain_schema: Vec<u8>, //115}114}116117#[derive(Encode, Decode, Default, Debug, Clone, PartialEq)]118#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]119pub struct CollectionAdminsType<AccountId> {120 pub admin: AccountId,121 pub collection_id: u64,122}123115124#[derive(Encode, Decode, Default, Debug, Clone, PartialEq)]116#[derive(Encode, Decode, Default, Debug, Clone, PartialEq)]125#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]117#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]269}261}262263264decl_error! {265 /// Error for non-fungible-token module.266 pub enum Error for Module<T: Trait> {267 /// Total collections bound exceeded268 TotalCollectionsLimitExceeded,269 /// Decimal_points parameter must be lower than 4270 CollectionDecimalPointLimitExceeded, 271 /// Collection name can not be longer than 63 char272 CollectionNameLimitExceeded, 273 /// Collection description can not be longer than 255 char274 CollectionDescriptionLimitExceeded, 275 /// Token prefix can not be longer than 15 char276 CollectionTokenPrefixLimitExceeded,277 /// This collection does not exist278 CollectionNotFound,279 /// Item not exists280 TokenNotFound,281 /// Arithmetic calculation overflow282 NumOverflow, 283 /// Account already has admin role284 AlreadyAdmin, 285 /// You do not own this collection286 NoPermission,287 /// This address is not set as sponsor, use setCollectionSponsor first288 ConfirmUnsetSponsorFail,289 /// Collection is not in mint mode290 PublicMintingNotAllowed,291 /// Sender parameter and item owner must be equal292 MustBeTokenOwner,293 /// Item balance not enouth294 TokenValueTooLow,295 /// Size of item is too large296 NftSizeLimitExceeded,297 /// Size of item must be 0 with fungible type298 FungibleUnexpectedParam,299 /// No approve found300 ApproveNotFound,301 /// Requested value more than approved302 TokenValueNotEnough,303 /// Only approved addresses can call this method304 ApproveRequired,305 /// Address is not in white list306 AddresNotInWhiteList,307 /// Number of collection admins bound exceeded308 CollectionAdminsLimitExceeded,309 /// Owned tokens by a single address bound exceeded310 AddressOwnershipLimitExceeded,311 /// Length of items properties must be greater than 0312 EmptyArgument,313 }314}270315271pub trait Trait: system::Trait + Sized + transaction_payment::Trait + pallet_contracts::Trait {316pub trait Trait: system::Trait + Sized + transaction_payment::Trait + pallet_contracts::Trait {272 type Event: From<Event<Self>> + Into<<Self as system::Trait>::Event>;317 type Event: From<Event<Self>> + Into<<Self as system::Trait>::Event>;386 pub struct Module<T: Trait> for enum Call where origin: T::Origin {431 pub struct Module<T: Trait> for enum Call where origin: T::Origin {387432388 fn deposit_event() = default;433 fn deposit_event() = default;434 type Error = Error<T>;389435390 fn on_initialize(now: T::BlockNumber) -> Weight {436 fn on_initialize(now: T::BlockNumber) -> Weight {391437432 };478 };433479434 // bound Total number of collections480 // bound Total number of collections435 ensure!(CollectionCount::get() < ChainLimit::get().collection_numbers_limit, "Total collections bound exceeded");481 ensure!(CollectionCount::get() < ChainLimit::get().collection_numbers_limit, Error::<T>::TotalCollectionsLimitExceeded);436482437 // check params483 // check params438 ensure!(decimal_points <= 4, "decimal_points parameter must be lower than 4");484 ensure!(decimal_points <= 4, Error::<T>::CollectionDecimalPointLimitExceeded);439485440 let mut name = collection_name.to_vec();486 let mut name = collection_name.to_vec();441 name.push(0);487 name.push(0);442 ensure!(name.len() <= 64, "Collection name can not be longer than 63 char");488 ensure!(name.len() <= 64, Error::<T>::CollectionNameLimitExceeded);443489444 let mut description = collection_description.to_vec();490 let mut description = collection_description.to_vec();445 description.push(0);491 description.push(0);446 ensure!(name.len() <= 256, "Collection description can not be longer than 255 char");492 ensure!(name.len() <= 256, Error::<T>::CollectionDescriptionLimitExceeded);447493448 let mut prefix = token_prefix.to_vec();494 let mut prefix = token_prefix.to_vec();449 prefix.push(0);495 prefix.push(0);450 ensure!(prefix.len() <= 16, "Token prefix can not be longer than 15 char");496 ensure!(prefix.len() <= 16, Error::<T>::CollectionTokenPrefixLimitExceeded);451497452 // Generate next collection ID498 // Generate next collection ID453 let next_id = CreatedCollectionCount::get()499 let next_id = CreatedCollectionCount::get()454 .checked_add(1)500 .checked_add(1)455 .expect("collection id error");501 .ok_or(Error::<T>::NumOverflow)?;456502457 // bound counter503 // bound counter458 let total = CollectionCount::get()504 let total = CollectionCount::get()459 .checked_add(1)505 .checked_add(1)460 .expect("collection counter error");506 .ok_or(Error::<T>::NumOverflow)?;461507462 CreatedCollectionCount::put(next_id);508 CreatedCollectionCount::put(next_id);463 CollectionCount::put(total);509 CollectionCount::put(total);489 }535 }490536491 /// **DANGEROUS**: Destroys collection and all NFTs within this collection. Users irrecoverably lose their assets and may lose real money.537 /// **DANGEROUS**: Destroys collection and all NFTs within this collection. Users irrecoverably lose their assets and may lose real money.492 /// 538 /// 493 /// # Permissions539 /// # Permissions494 /// 540 /// 495 /// * Collection Owner.541 /// * Collection Owner.524 // bound couter570 // bound couter525 let total = CollectionCount::get()571 let total = CollectionCount::get()526 .checked_sub(1)572 .checked_sub(1)527 .expect("collection counter error");573 .ok_or(Error::<T>::NumOverflow)?;528574529 CollectionCount::put(total);575 CollectionCount::put(total);530 }576 }693 if <AdminList<T>>::contains_key(collection_id)739 if <AdminList<T>>::contains_key(collection_id)694 {740 {695 admin_arr = <AdminList<T>>::get(collection_id);741 admin_arr = <AdminList<T>>::get(collection_id);696 ensure!(!admin_arr.contains(&new_admin_id), "Account already has admin role");742 ensure!(!admin_arr.contains(&new_admin_id), Error::<T>::AlreadyAdmin);697 }743 }698744699 // Number of collection admins745 // Number of collection admins700 ensure!((admin_arr.len() as u64) < ChainLimit::get().collections_admins_limit, "Number of collection admins bound exceeded");746 ensure!((admin_arr.len() as u64) < ChainLimit::get().collections_admins_limit, Error::<T>::CollectionAdminsLimitExceeded);701747702 admin_arr.push(new_admin_id);748 admin_arr.push(new_admin_id);703 <AdminList<T>>::insert(collection_id, admin_arr);749 <AdminList<T>>::insert(collection_id, admin_arr);746 pub fn set_collection_sponsor(origin, collection_id: u64, new_sponsor: T::AccountId) -> DispatchResult {792 pub fn set_collection_sponsor(origin, collection_id: u64, new_sponsor: T::AccountId) -> DispatchResult {747793748 let sender = ensure_signed(origin)?;794 let sender = ensure_signed(origin)?;749 ensure!(<Collection<T>>::contains_key(collection_id), "This collection does not exist");795 ensure!(<Collection<T>>::contains_key(collection_id), Error::<T>::CollectionNotFound);750796751 let mut target_collection = <Collection<T>>::get(collection_id);797 let mut target_collection = <Collection<T>>::get(collection_id);752 ensure!(sender == target_collection.owner, "You do not own this collection");798 ensure!(sender == target_collection.owner, Error::<T>::NoPermission);753799754 target_collection.unconfirmed_sponsor = new_sponsor;800 target_collection.unconfirmed_sponsor = new_sponsor;755 <Collection<T>>::insert(collection_id, target_collection);801 <Collection<T>>::insert(collection_id, target_collection);768 pub fn confirm_sponsorship(origin, collection_id: u64) -> DispatchResult {814 pub fn confirm_sponsorship(origin, collection_id: u64) -> DispatchResult {769815770 let sender = ensure_signed(origin)?;816 let sender = ensure_signed(origin)?;771 ensure!(<Collection<T>>::contains_key(collection_id), "This collection does not exist");817 ensure!(<Collection<T>>::contains_key(collection_id), Error::<T>::CollectionNotFound);772818773 let mut target_collection = <Collection<T>>::get(collection_id);819 let mut target_collection = <Collection<T>>::get(collection_id);774 ensure!(sender == target_collection.unconfirmed_sponsor, "This address is not set as sponsor, use setCollectionSponsor first");820 ensure!(sender == target_collection.unconfirmed_sponsor, Error::<T>::ConfirmUnsetSponsorFail);775821776 target_collection.sponsor = target_collection.unconfirmed_sponsor;822 target_collection.sponsor = target_collection.unconfirmed_sponsor;777 target_collection.unconfirmed_sponsor = T::AccountId::default();823 target_collection.unconfirmed_sponsor = T::AccountId::default();793 pub fn remove_collection_sponsor(origin, collection_id: u64) -> DispatchResult {839 pub fn remove_collection_sponsor(origin, collection_id: u64) -> DispatchResult {794840795 let sender = ensure_signed(origin)?;841 let sender = ensure_signed(origin)?;796 ensure!(<Collection<T>>::contains_key(collection_id), "This collection does not exist");842 ensure!(<Collection<T>>::contains_key(collection_id), Error::<T>::CollectionNotFound);797843798 let mut target_collection = <Collection<T>>::get(collection_id);844 let mut target_collection = <Collection<T>>::get(collection_id);799 ensure!(sender == target_collection.owner, "You do not own this collection");845 ensure!(sender == target_collection.owner, Error::<T>::NoPermission);800846801 target_collection.sponsor = T::AccountId::default();847 target_collection.sponsor = T::AccountId::default();802 <Collection<T>>::insert(collection_id, target_collection);848 <Collection<T>>::insert(collection_id, target_collection);829 // .saturating_add(RocksDbWeight::get().writes(8 as Weight))]875 // .saturating_add(RocksDbWeight::get().writes(8 as Weight))]830876831 #[weight = T::WeightInfo::create_item(data.len())]877 #[weight = T::WeightInfo::create_item(data.len())]832 pub fn create_item(origin, collection_id: u64, owner: T::AccountId, data: CreateItemData) -> DispatchResult {878 pub fn create_item(origin, collection_id: u64, owner: T::AccountId, data: CreateItemData) -> DispatchResult {833879834 let sender = ensure_signed(origin)?;880 let sender = ensure_signed(origin)?;881835 Self::collection_exists(collection_id)?;882 Self::collection_exists(collection_id)?;883836 let target_collection = <Collection<T>>::get(collection_id);884 let target_collection = <Collection<T>>::get(collection_id);837885838 if !Self::is_owner_or_admin_permissions(collection_id, sender.clone()) {886 Self::can_create_items_in_collection(collection_id, &target_collection, &sender, &owner)?;839 ensure!(target_collection.mint_mode == true, "Public minting is not allowed for this collection.");840 Self::check_white_list(collection_id, &owner)?;887 Self::validate_create_item_args(&target_collection, &data)?;841 Self::check_white_list(collection_id, &sender)?;888 Self::create_item_no_validation(collection_id, &target_collection, owner, data)?;842 }889843890 Ok(())844 match target_collection.mode891 }845 {892893 /// This method creates multiple instances of NFT Collection created with CreateCollection method.894 /// 895 /// # Permissions896 /// 897 /// * Collection Owner.898 /// * Collection Admin.899 /// * Anyone if900 /// * White List is enabled, and901 /// * Address is added to white list, and902 /// * MintPermission is enabled (see SetMintPermission method)903 /// 904 /// # Arguments905 /// 906 /// * collection_id: ID of the collection.907 /// 908 /// * itemsData: Array items properties. Each property is an array of bytes itself, see [create_item].909 /// 910 /// * owner: Address, initial owner of the NFT.846 CollectionMode::NFT => {911 #[weight = T::WeightInfo::create_item(items_data.into_iter()847 if let CreateItemData::NFT(data) = data {912 .map(|data| { data.len() })848 // check sizes849 ensure!(ChainLimit::get().custom_data_limit >= data.const_data.len() as u32, "const_data exceeded data limit.");850 ensure!(ChainLimit::get().custom_data_limit >= data.variable_data.len() as u32, "variable_data exceeded data limit.");913 .sum())]851 852 // Create nft item853 let item = NftItemType {854 collection: collection_id,914 pub fn create_multiple_items(origin, collection_id: u64, owner: T::AccountId, items_data: Vec<CreateItemData>) -> DispatchResult {855 owner: owner,915856 const_data: data.const_data.clone(),857 variable_data: data.variable_data.clone() 858 };859 860 Self::add_nft_item(item)?;861 862 } else {863 fail!("Not NFT item data used to mint in NFT collection.");916 ensure!(items_data.len() > 0, Error::<T>::EmptyArgument);864 }865 },866 CollectionMode::Fungible(_) => {867 if let CreateItemData::Fungible(_) = data {868 869 let item = FungibleItemType {917 let sender = ensure_signed(origin)?;870 collection: collection_id,918871 owner: owner,872 value: (10 as u128).pow(target_collection.decimal_points)873 };874 875 Self::add_fungible_item(item)?;919 Self::collection_exists(collection_id)?;876 } else {877 fail!("Not Fungible item data used to mint in Fungible collection.");878 }879 },880 CollectionMode::ReFungible(_) => {881 if let CreateItemData::ReFungible(data) = data {920 let target_collection = <Collection<T>>::get(collection_id);882 921883 // check sizes884 ensure!(ChainLimit::get().custom_data_limit >= data.const_data.len() as u32, "const_data exceeded data limit.");885 ensure!(ChainLimit::get().custom_data_limit >= data.variable_data.len() as u32, "variable_data exceeded data limit.");922 Self::can_create_items_in_collection(collection_id, &target_collection, &sender, &owner)?;886 923924 for data in &items_data {887 let mut owner_list = Vec::new();925 Self::validate_create_item_args(&target_collection, data)?;888 let value = (10 as u128).pow(target_collection.decimal_points);926 }889 owner_list.push(Ownership {owner: owner.clone(), fraction: value});927 for data in &items_data {890 891 let item = ReFungibleItemType {892 collection: collection_id,928 Self::create_item_no_validation(collection_id, &target_collection, owner.clone(), data.clone())?;893 owner: owner_list,929 }894 const_data: data.const_data.clone(),895 variable_data: data.variable_data.clone() 896 };897 898 Self::add_refungible_item(item)?;899 } else {900 fail!("Not Re Fungible item data used to mint in Re Fungible collection.");901 }902 },903 _ => { ensure!(1 == 0,"Unexpected collection type."); }904 };905906 // call event907 Self::deposit_event(RawEvent::ItemCreated(collection_id, <ItemListIndex>::get(collection_id)));908930909 Ok(())931 Ok(())910 }932 }911933912 /// Destroys a concrete instance of NFT.934 /// Destroys a concrete instance of NFT.913 /// 935 /// 932 let target_collection = <Collection<T>>::get(collection_id);954 let target_collection = <Collection<T>>::get(collection_id);933 ensure!(Self::is_item_owner(sender.clone(), collection_id, item_id) ||955 ensure!(Self::is_item_owner(sender.clone(), collection_id, item_id) ||934 Self::is_owner_or_admin_permissions(collection_id, sender.clone()),956 Self::is_owner_or_admin_permissions(collection_id, sender.clone()),935 "Only item owner, collection owner and admins can modify item");957 Error::<T>::NoPermission);936958937 if target_collection.access == AccessMode::WhiteList {959 if target_collection.access == AccessMode::WhiteList {938 Self::check_white_list(collection_id, &sender)?;960 Self::check_white_list(collection_id, &sender)?;984 let target_collection = <Collection<T>>::get(collection_id);1006 let target_collection = <Collection<T>>::get(collection_id);985 ensure!(Self::is_item_owner(sender.clone(), collection_id, item_id) ||1007 ensure!(Self::is_item_owner(sender.clone(), collection_id, item_id) ||986 Self::is_owner_or_admin_permissions(collection_id, sender.clone()),1008 Self::is_owner_or_admin_permissions(collection_id, sender.clone()),987 "Only item owner, collection owner and admins can modify item");1009 Error::<T>::NoPermission);9881010989 if target_collection.access == AccessMode::WhiteList {1011 if target_collection.access == AccessMode::WhiteList {990 Self::check_white_list(collection_id, &sender)?;1012 Self::check_white_list(collection_id, &sender)?;1026 let target_collection = <Collection<T>>::get(collection_id);1048 let target_collection = <Collection<T>>::get(collection_id);1027 ensure!(Self::is_item_owner(sender.clone(), collection_id, item_id) ||1049 ensure!(Self::is_item_owner(sender.clone(), collection_id, item_id) ||1028 Self::is_owner_or_admin_permissions(collection_id, sender.clone()),1050 Self::is_owner_or_admin_permissions(collection_id, sender.clone()),1029 "Only item owner, collection owner and admins can approve");1051 Error::<T>::NoPermission);103010521031 if target_collection.access == AccessMode::WhiteList {1053 if target_collection.access == AccessMode::WhiteList {1032 Self::check_white_list(collection_id, &sender)?;1054 Self::check_white_list(collection_id, &sender)?;1088 if opt_item.is_some()1110 if opt_item.is_some()1089 {1111 {1090 appoved_transfer = true;1112 appoved_transfer = true;1091 ensure!(opt_item.unwrap().amount >= value, "Requested value more than approved");1113 ensure!(opt_item.unwrap().amount >= value, Error::<T>::TokenValueNotEnough);1092 }1114 }1093 }1115 }109411161095 // Transfer permissions check1117 // Transfer permissions check1096 let target_collection = <Collection<T>>::get(collection_id);1118 let target_collection = <Collection<T>>::get(collection_id);1097 ensure!(appoved_transfer || Self::is_owner_or_admin_permissions(collection_id, sender.clone()),1119 ensure!(appoved_transfer || Self::is_owner_or_admin_permissions(collection_id, sender.clone()),1098 "Only item owner, collection owner and admins can modify items");1120 Error::<T>::NoPermission);109911211100 if target_collection.access == AccessMode::WhiteList {1122 if target_collection.access == AccessMode::WhiteList {1101 Self::check_white_list(collection_id, &sender)?;1123 Self::check_white_list(collection_id, &sender)?;1162 let target_collection = <Collection<T>>::get(collection_id);1184 let target_collection = <Collection<T>>::get(collection_id);1163 ensure!(Self::is_item_owner(sender.clone(), collection_id, item_id) ||1185 ensure!(Self::is_item_owner(sender.clone(), collection_id, item_id) ||1164 Self::is_owner_or_admin_permissions(collection_id, sender.clone()),1186 Self::is_owner_or_admin_permissions(collection_id, sender.clone()),1165 "Only item owner, collection owner and admins can modify item.");1187 Error::<T>::NoPermission);116611881167 Self::item_exists(collection_id, item_id, &target_collection.mode)?;1189 Self::item_exists(collection_id, item_id, &target_collection.mode)?;116811901296 let owner = <ContractOwner<T>>::get(&contract_address);1318 let owner = <ContractOwner<T>>::get(&contract_address);1297 is_owner = sender == owner;1319 is_owner = sender == owner;1298 }1320 }1299 ensure!(is_owner, "Only contract owner may call this method");1321 ensure!(is_owner, Error::<T>::NoPermission);130013221301 <ContractSelfSponsoring<T>>::insert(contract_address, enable);1323 <ContractSelfSponsoring<T>>::insert(contract_address, enable);1302 Ok(())1324 Ok(())130713291308impl<T: Trait> Module<T> {1330impl<T: Trait> Module<T> {13311332 fn can_create_items_in_collection(collection_id: u64, collection: &CollectionType<T::AccountId>, sender: &T::AccountId, owner: &T::AccountId) -> DispatchResult {13331334 if !Self::is_owner_or_admin_permissions(collection_id, sender.clone()) {1335 ensure!(collection.mint_mode == true, Error::<T>::PublicMintingNotAllowed);1336 Self::check_white_list(collection_id, owner)?;1337 Self::check_white_list(collection_id, sender)?;1338 }13391340 Ok(())1341 }13421343 fn validate_create_item_args(target_collection: &CollectionType<T::AccountId>, data: &CreateItemData) -> DispatchResult {1344 match target_collection.mode1345 {1346 CollectionMode::NFT => {1347 if let CreateItemData::NFT(data) = data {1348 // check sizes1349 ensure!(ChainLimit::get().custom_data_limit >= data.const_data.len() as u32, "const_data exceeded data limit.");1350 ensure!(ChainLimit::get().custom_data_limit >= data.variable_data.len() as u32, "variable_data exceeded data limit.");1351 } else {1352 fail!("Not NFT item data used to mint in NFT collection.");1353 }1354 },1355 CollectionMode::Fungible(_) => {1356 if let CreateItemData::Fungible(_) = data {1357 } else {1358 fail!("Not Fungible item data used to mint in Fungible collection.");1359 }1360 },1361 CollectionMode::ReFungible(_) => {1362 if let CreateItemData::ReFungible(data) = data {13631364 // check sizes1365 ensure!(ChainLimit::get().custom_data_limit >= data.const_data.len() as u32, "const_data exceeded data limit.");1366 ensure!(ChainLimit::get().custom_data_limit >= data.variable_data.len() as u32, "variable_data exceeded data limit.");1367 } else {1368 fail!("Not Re Fungible item data used to mint in Re Fungible collection.");1369 }1370 },1371 _ => { fail!("Unexpected collection type."); }1372 };13731374 Ok(())1375 }13761377 fn create_item_no_validation(collection_id: u64, collection: &CollectionType<T::AccountId>, owner: T::AccountId, data: CreateItemData) -> DispatchResult {1378 match data1379 {1380 CreateItemData::NFT(data) => {1381 let item = NftItemType {1382 collection: collection_id,1383 owner,1384 const_data: data.const_data,1385 variable_data: data.variable_data1386 };13871388 Self::add_nft_item(item)?;1389 },1390 CreateItemData::Fungible(_) => {1391 let item = FungibleItemType {1392 collection: collection_id,1393 owner,1394 value: (10 as u128).pow(collection.decimal_points)1395 };13961397 Self::add_fungible_item(item)?;1398 },1399 CreateItemData::ReFungible(data) => {1400 let mut owner_list = Vec::new();1401 let value = (10 as u128).pow(collection.decimal_points);1402 owner_list.push(Ownership {owner: owner.clone(), fraction: value});14031404 let item = ReFungibleItemType {1405 collection: collection_id,1406 owner: owner_list,1407 const_data: data.const_data,1408 variable_data: data.variable_data1409 };14101411 Self::add_refungible_item(item)?;1412 }1413 };141414151416 // call event1417 Self::deposit_event(RawEvent::ItemCreated(collection_id, <ItemListIndex>::get(collection_id)));14181419 Ok(())1420 }14211309 fn add_fungible_item(item: FungibleItemType<T::AccountId>) -> DispatchResult {1422 fn add_fungible_item(item: FungibleItemType<T::AccountId>) -> DispatchResult {1310 let current_index = <ItemListIndex>::get(item.collection)1423 let current_index = <ItemListIndex>::get(item.collection)1311 .checked_add(1)1424 .checked_add(1)1312 .expect("Item list index id error");1425 .ok_or(Error::<T>::NumOverflow)?;1313 let itemcopy = item.clone();1426 let itemcopy = item.clone();1314 let owner = item.owner.clone();1427 let owner = item.owner.clone();1315 let value = item.value as u64;1428 let value = item.value as u64;1326 // Update balance1439 // Update balance1327 let new_balance = <Balance<T>>::get(item.collection, owner.clone())1440 let new_balance = <Balance<T>>::get(item.collection, owner.clone())1328 .checked_add(value)1441 .checked_add(value)1329 .unwrap();1442 .ok_or(Error::<T>::NumOverflow)?;1330 <Balance<T>>::insert(item.collection, owner.clone(), new_balance);1443 <Balance<T>>::insert(item.collection, owner.clone(), new_balance);133114441332 Ok(())1445 Ok(())1335 fn add_refungible_item(item: ReFungibleItemType<T::AccountId>) -> DispatchResult {1448 fn add_refungible_item(item: ReFungibleItemType<T::AccountId>) -> DispatchResult {1336 let current_index = <ItemListIndex>::get(item.collection)1449 let current_index = <ItemListIndex>::get(item.collection)1337 .checked_add(1)1450 .checked_add(1)1338 .expect("Item list index id error");1451 .ok_or(Error::<T>::NumOverflow)?;1339 let itemcopy = item.clone();1452 let itemcopy = item.clone();134014531341 let value = item.owner.first().unwrap().fraction as u64;1454 let value = item.owner.first().unwrap().fraction as u64;1353 // Update balance1466 // Update balance1354 let new_balance = <Balance<T>>::get(item.collection, owner.clone())1467 let new_balance = <Balance<T>>::get(item.collection, owner.clone())1355 .checked_add(value)1468 .checked_add(value)1356 .unwrap();1469 .ok_or(Error::<T>::NumOverflow)?;1357 <Balance<T>>::insert(item.collection, owner.clone(), new_balance);1470 <Balance<T>>::insert(item.collection, owner.clone(), new_balance);135814711359 Ok(())1472 Ok(())1362 fn add_nft_item(item: NftItemType<T::AccountId>) -> DispatchResult {1475 fn add_nft_item(item: NftItemType<T::AccountId>) -> DispatchResult {1363 let current_index = <ItemListIndex>::get(item.collection)1476 let current_index = <ItemListIndex>::get(item.collection)1364 .checked_add(1)1477 .checked_add(1)1365 .expect("Item list index id error");1478 .ok_or(Error::<T>::NumOverflow)?;136614791367 let item_owner = item.owner.clone();1480 let item_owner = item.owner.clone();1368 let collection_id = item.collection.clone();1481 let collection_id = item.collection.clone();1378 // Update balance1491 // Update balance1379 let new_balance = <Balance<T>>::get(collection_id, item_owner.clone())1492 let new_balance = <Balance<T>>::get(collection_id, item_owner.clone())1380 .checked_add(1)1493 .checked_add(1)1381 .unwrap();1494 .ok_or(Error::<T>::NumOverflow)?;1382 <Balance<T>>::insert(collection_id, item_owner.clone(), new_balance);1495 <Balance<T>>::insert(collection_id, item_owner.clone(), new_balance);138314961384 Ok(())1497 Ok(())1391 ) -> DispatchResult {1504 ) -> DispatchResult {1392 ensure!(1505 ensure!(1393 <ReFungibleItemList<T>>::contains_key(collection_id, item_id),1506 <ReFungibleItemList<T>>::contains_key(collection_id, item_id),1394 "Item does not exists"1507 Error::<T>::TokenNotFound1395 );1508 );1396 let collection = <ReFungibleItemList<T>>::get(collection_id, item_id);1509 let collection = <ReFungibleItemList<T>>::get(collection_id, item_id);1397 let item = collection1510 let item = collection1408 // update balance1521 // update balance1409 let new_balance = <Balance<T>>::get(collection_id, item.owner.clone())1522 let new_balance = <Balance<T>>::get(collection_id, item.owner.clone())1410 .checked_sub(item.fraction as u64)1523 .checked_sub(item.fraction as u64)1411 .unwrap();1524 .ok_or(Error::<T>::NumOverflow)?;1412 <Balance<T>>::insert(collection_id, item.owner.clone(), new_balance);1525 <Balance<T>>::insert(collection_id, item.owner.clone(), new_balance);141315261414 <ReFungibleItemList<T>>::remove(collection_id, item_id);1527 <ReFungibleItemList<T>>::remove(collection_id, item_id);1419 fn burn_nft_item(collection_id: u64, item_id: u64) -> DispatchResult {1532 fn burn_nft_item(collection_id: u64, item_id: u64) -> DispatchResult {1420 ensure!(1533 ensure!(1421 <NftItemList<T>>::contains_key(collection_id, item_id),1534 <NftItemList<T>>::contains_key(collection_id, item_id),1422 "Item does not exists"1535 Error::<T>::TokenNotFound1423 );1536 );1424 let item = <NftItemList<T>>::get(collection_id, item_id);1537 let item = <NftItemList<T>>::get(collection_id, item_id);1425 Self::remove_token_index(collection_id, item_id, item.owner.clone())?;1538 Self::remove_token_index(collection_id, item_id, item.owner.clone())?;1430 // update balance1543 // update balance1431 let new_balance = <Balance<T>>::get(collection_id, item.owner.clone())1544 let new_balance = <Balance<T>>::get(collection_id, item.owner.clone())1432 .checked_sub(1)1545 .checked_sub(1)1433 .unwrap();1546 .ok_or(Error::<T>::NumOverflow)?;1434 <Balance<T>>::insert(collection_id, item.owner.clone(), new_balance);1547 <Balance<T>>::insert(collection_id, item.owner.clone(), new_balance);1435 <NftItemList<T>>::remove(collection_id, item_id);1548 <NftItemList<T>>::remove(collection_id, item_id);143615491440 fn burn_fungible_item(collection_id: u64, item_id: u64) -> DispatchResult {1553 fn burn_fungible_item(collection_id: u64, item_id: u64) -> DispatchResult {1441 ensure!(1554 ensure!(1442 <FungibleItemList<T>>::contains_key(collection_id, item_id),1555 <FungibleItemList<T>>::contains_key(collection_id, item_id),1443 "Item does not exists"1556 Error::<T>::TokenNotFound1444 );1557 );1445 let item = <FungibleItemList<T>>::get(collection_id, item_id);1558 let item = <FungibleItemList<T>>::get(collection_id, item_id);1446 Self::remove_token_index(collection_id, item_id, item.owner.clone())?;1559 Self::remove_token_index(collection_id, item_id, item.owner.clone())?;1451 // update balance1564 // update balance1452 let new_balance = <Balance<T>>::get(collection_id, item.owner.clone())1565 let new_balance = <Balance<T>>::get(collection_id, item.owner.clone())1453 .checked_sub(item.value as u64)1566 .checked_sub(item.value as u64)1454 .unwrap();1567 .ok_or(Error::<T>::NumOverflow)?;1455 <Balance<T>>::insert(collection_id, item.owner.clone(), new_balance);1568 <Balance<T>>::insert(collection_id, item.owner.clone(), new_balance);145615691457 <FungibleItemList<T>>::remove(collection_id, item_id);1570 <FungibleItemList<T>>::remove(collection_id, item_id);1462 fn collection_exists(collection_id: u64) -> DispatchResult {1575 fn collection_exists(collection_id: u64) -> DispatchResult {1463 ensure!(1576 ensure!(1464 <Collection<T>>::contains_key(collection_id),1577 <Collection<T>>::contains_key(collection_id),1465 "This collection does not exist"1578 Error::<T>::CollectionNotFound1466 );1579 );1467 Ok(())1580 Ok(())1468 }1581 }1473 let target_collection = <Collection<T>>::get(collection_id);1586 let target_collection = <Collection<T>>::get(collection_id);1474 ensure!(1587 ensure!(1475 subject == target_collection.owner,1588 subject == target_collection.owner,1476 "You do not own this collection"1589 Error::<T>::NoPermission1477 );1590 );147815911479 Ok(())1592 Ok(())150216151503 ensure!(1616 ensure!(1504 result,1617 result,1505 "You do not have permissions to modify this collection"1618 Error::<T>::NoPermission1506 );1619 );1507 Ok(())1620 Ok(())1508 }1621 }1528 }1641 }152916421530 fn check_white_list(collection_id: u64, address: &T::AccountId) -> DispatchResult {1643 fn check_white_list(collection_id: u64, address: &T::AccountId) -> DispatchResult {1531 let mes = "Address is not in white list";1644 let mes = Error::<T>::AddresNotInWhiteList;1532 ensure!(<WhiteList<T>>::contains_key(collection_id), mes);1645 ensure!(<WhiteList<T>>::contains_key(collection_id), mes);1533 let wl = <WhiteList<T>>::get(collection_id);1646 let wl = <WhiteList<T>>::get(collection_id);1534 ensure!(wl.contains(address), mes);1647 ensure!(wl.contains(address), mes);1545 ) -> DispatchResult {1658 ) -> DispatchResult {1546 ensure!(1659 ensure!(1547 <FungibleItemList<T>>::contains_key(collection_id, item_id),1660 <FungibleItemList<T>>::contains_key(collection_id, item_id),1548 "Item not exists"1661 Error::<T>::TokenNotFound1549 );1662 );155016631551 let full_item = <FungibleItemList<T>>::get(collection_id, item_id);1664 let full_item = <FungibleItemList<T>>::get(collection_id, item_id);1552 let amount = full_item.value;1665 let amount = full_item.value;155316661554 ensure!(amount >= value.into(), "Item balance not enouth");1667 ensure!(amount >= value.into(), Error::<T>::TokenValueTooLow);155516681556 // update balance1669 // update balance1557 let balance_old_owner = <Balance<T>>::get(collection_id, owner.clone())1670 let balance_old_owner = <Balance<T>>::get(collection_id, owner.clone())1558 .checked_sub(value)1671 .checked_sub(value)1559 .unwrap();1672 .ok_or(Error::<T>::NumOverflow)?;1560 <Balance<T>>::insert(collection_id, owner.clone(), balance_old_owner);1673 <Balance<T>>::insert(collection_id, owner.clone(), balance_old_owner);156116741562 let mut new_owner_account_id = 0;1675 let mut new_owner_account_id = 0;1578 // update balance1691 // update balance1579 let balance_new_owner = <Balance<T>>::get(collection_id, new_owner.clone())1692 let balance_new_owner = <Balance<T>>::get(collection_id, new_owner.clone())1580 .checked_add(value)1693 .checked_add(value)1581 .unwrap();1694 .ok_or(Error::<T>::NumOverflow)?;1582 <Balance<T>>::insert(collection_id, new_owner.clone(), balance_new_owner);1695 <Balance<T>>::insert(collection_id, new_owner.clone(), balance_new_owner);158316961584 // update index collection1697 // update index collection1596 // update balance1709 // update balance1597 let balance_new_owner = <Balance<T>>::get(collection_id, new_owner.clone())1710 let balance_new_owner = <Balance<T>>::get(collection_id, new_owner.clone())1598 .checked_add(value)1711 .checked_add(value)1599 .unwrap();1712 .ok_or(Error::<T>::NumOverflow)?;1600 <Balance<T>>::insert(collection_id, new_owner.clone(), balance_new_owner);1713 <Balance<T>>::insert(collection_id, new_owner.clone(), balance_new_owner);160117141602 <FungibleItemList<T>>::insert(collection_id, new_owner_account_id, item);1715 <FungibleItemList<T>>::insert(collection_id, new_owner_account_id, item);1634 ) -> DispatchResult {1747 ) -> DispatchResult {1635 ensure!(1748 ensure!(1636 <ReFungibleItemList<T>>::contains_key(collection_id, item_id),1749 <ReFungibleItemList<T>>::contains_key(collection_id, item_id),1637 "Item not exists"1750 Error::<T>::TokenNotFound1638 );1751 );163917521640 let full_item = <ReFungibleItemList<T>>::get(collection_id, item_id);1753 let full_item = <ReFungibleItemList<T>>::get(collection_id, item_id);1643 .iter()1756 .iter()1644 .filter(|i| i.owner == owner)1757 .filter(|i| i.owner == owner)1645 .next()1758 .next()1646 .unwrap();1759 .ok_or(Error::<T>::NumOverflow)?;1647 let amount = item.fraction;1760 let amount = item.fraction;164817611649 ensure!(amount >= value.into(), "Item balance not enouth");1762 ensure!(amount >= value.into(), Error::<T>::TokenValueTooLow);165017631651 // update balance1764 // update balance1652 let balance_old_owner = <Balance<T>>::get(collection_id, item.owner.clone())1765 let balance_old_owner = <Balance<T>>::get(collection_id, item.owner.clone())1653 .checked_sub(value)1766 .checked_sub(value)1654 .unwrap();1767 .ok_or(Error::<T>::NumOverflow)?;1655 <Balance<T>>::insert(collection_id, item.owner.clone(), balance_old_owner);1768 <Balance<T>>::insert(collection_id, item.owner.clone(), balance_old_owner);165617691657 let balance_new_owner = <Balance<T>>::get(collection_id, new_owner.clone())1770 let balance_new_owner = <Balance<T>>::get(collection_id, new_owner.clone())1658 .checked_add(value)1771 .checked_add(value)1659 .unwrap();1772 .ok_or(Error::<T>::NumOverflow)?;1660 <Balance<T>>::insert(collection_id, new_owner.clone(), balance_new_owner);1773 <Balance<T>>::insert(collection_id, new_owner.clone(), balance_new_owner);166117741662 let old_owner = item.owner.clone();1775 let old_owner = item.owner.clone();1719 ) -> DispatchResult {1832 ) -> DispatchResult {1720 ensure!(1833 ensure!(1721 <NftItemList<T>>::contains_key(collection_id, item_id),1834 <NftItemList<T>>::contains_key(collection_id, item_id),1722 "Item not exists"1835 Error::<T>::TokenNotFound1723 );1836 );172418371725 let mut item = <NftItemList<T>>::get(collection_id, item_id);1838 let mut item = <NftItemList<T>>::get(collection_id, item_id);172618391727 ensure!(1840 ensure!(1728 sender == item.owner,1841 sender == item.owner,1729 "sender parameter and item owner must be equal"1842 Error::<T>::MustBeTokenOwner1730 );1843 );173118441732 // update balance1845 // update balance1733 let balance_old_owner = <Balance<T>>::get(collection_id, item.owner.clone())1846 let balance_old_owner = <Balance<T>>::get(collection_id, item.owner.clone())1734 .checked_sub(1)1847 .checked_sub(1)1735 .unwrap();1848 .ok_or(Error::<T>::NumOverflow)?;1736 <Balance<T>>::insert(collection_id, item.owner.clone(), balance_old_owner);1849 <Balance<T>>::insert(collection_id, item.owner.clone(), balance_old_owner);173718501738 let balance_new_owner = <Balance<T>>::get(collection_id, new_owner.clone())1851 let balance_new_owner = <Balance<T>>::get(collection_id, new_owner.clone())1739 .checked_add(1)1852 .checked_add(1)1740 .unwrap();1853 .ok_or(Error::<T>::NumOverflow)?;1741 <Balance<T>>::insert(collection_id, new_owner.clone(), balance_new_owner);1854 <Balance<T>>::insert(collection_id, new_owner.clone(), balance_new_owner);174218551743 // change owner1856 // change owner1759 mode: &CollectionMode1872 mode: &CollectionMode1760 ) -> DispatchResult {1873 ) -> DispatchResult {1761 match mode {1874 match mode {1762 CollectionMode::NFT => ensure!(<NftItemList<T>>::contains_key(collection_id, item_id), "Item does not exists"),1875 CollectionMode::NFT => ensure!(<NftItemList<T>>::contains_key(collection_id, item_id), Error::<T>::TokenNotFound),1763 CollectionMode::ReFungible(_) => ensure!(<ReFungibleItemList<T>>::contains_key(collection_id, item_id), "Item does not exists"),1876 CollectionMode::ReFungible(_) => ensure!(<ReFungibleItemList<T>>::contains_key(collection_id, item_id), Error::<T>::TokenNotFound),1764 CollectionMode::Fungible(_) => ensure!(<FungibleItemList<T>>::contains_key(collection_id, item_id), "Item does not exists"),1877 CollectionMode::Fungible(_) => ensure!(<FungibleItemList<T>>::contains_key(collection_id, item_id), Error::<T>::TokenNotFound),1765 _ => ()1878 _ => ()1766 };1879 };1767 1880 1818 // Generate next collection ID1931 // Generate next collection ID1819 let next_id = CreatedCollectionCount::get()1932 let next_id = CreatedCollectionCount::get()1820 .checked_add(1)1933 .checked_add(1)1821 .expect("collection id error");1934 .unwrap();182219351823 CreatedCollectionCount::put(next_id);1936 CreatedCollectionCount::put(next_id);1824 }1937 }182519381826 fn init_nft_token(item: &NftItemType<T::AccountId>) {1939 fn init_nft_token(item: &NftItemType<T::AccountId>) {1827 let current_index = <ItemListIndex>::get(item.collection)1940 let current_index = <ItemListIndex>::get(item.collection)1828 .checked_add(1)1941 .checked_add(1)1829 .expect("Item list index id error");1942 .unwrap();183019431831 let item_owner = item.owner.clone();1944 let item_owner = item.owner.clone();1832 let collection_id = item.collection.clone();1945 let collection_id = item.collection.clone();1844 fn init_fungible_token(item: &FungibleItemType<T::AccountId>) {1957 fn init_fungible_token(item: &FungibleItemType<T::AccountId>) {1845 let current_index = <ItemListIndex>::get(item.collection)1958 let current_index = <ItemListIndex>::get(item.collection)1846 .checked_add(1)1959 .checked_add(1)1847 .expect("Item list index id error");1960 .unwrap();1848 let owner = item.owner.clone();1961 let owner = item.owner.clone();1849 let value = item.value as u64;1962 let value = item.value as u64;185019631862 fn init_refungible_token(item: &ReFungibleItemType<T::AccountId>) {1975 fn init_refungible_token(item: &ReFungibleItemType<T::AccountId>) {1863 let current_index = <ItemListIndex>::get(item.collection)1976 let current_index = <ItemListIndex>::get(item.collection)1864 .checked_add(1)1977 .checked_add(1)1865 .expect("Item list index id error");1978 .unwrap();186619791867 let value = item.owner.first().unwrap().fraction as u64;1980 let value = item.owner.first().unwrap().fraction as u64;1868 let owner = item.owner.first().unwrap().owner.clone();1981 let owner = item.owner.first().unwrap().owner.clone();188519981886 // bound Owned tokens by a single address1999 // bound Owned tokens by a single address1887 let count = <AccountItemCount<T>>::get(owner.clone());2000 let count = <AccountItemCount<T>>::get(owner.clone());1888 ensure!(count < ChainLimit::get().account_token_ownership_limit, "Owned tokens by a single address bound exceeded");2001 ensure!(count < ChainLimit::get().account_token_ownership_limit, Error::<T>::AddressOwnershipLimitExceeded);188920021890 <AccountItemCount<T>>::insert(owner.clone(), 2003 <AccountItemCount<T>>::insert(owner.clone(), count1891 count.checked_add(1).unwrap());2004 .checked_add(1)2005 .ok_or(Error::<T>::NumOverflow)?);1892 }2006 }1893 else {2007 else {1894 <AccountItemCount<T>>::insert(owner.clone(), 1);2008 <AccountItemCount<T>>::insert(owner.clone(), 1);192220361923 // update counter2037 // update counter1924 <AccountItemCount<T>>::insert(owner.clone(), 2038 <AccountItemCount<T>>::insert(owner.clone(), 1925 <AccountItemCount<T>>::get(owner.clone()).checked_sub(1).unwrap());2039 <AccountItemCount<T>>::get(owner.clone())2040 .checked_sub(1)2041 .ok_or(Error::<T>::NumOverflow)?);19262042192720431928 let list_exists = <AddressTokens<T>>::contains_key(collection_id, owner.clone());2044 let list_exists = <AddressTokens<T>>::contains_key(collection_id, owner.clone());pallets/nft/src/tests.rsdiffbeforeafterboth--- a/pallets/nft/src/tests.rs
+++ b/pallets/nft/src/tests.rs
@@ -87,6 +87,32 @@
});
}
+// Use cases tests region
+// #region
+#[test]
+fn create_nft_multiple_items() {
+ new_test_ext().execute_with(|| {
+ default_limits();
+
+ create_test_collection(&CollectionMode::NFT, 1);
+
+ let origin1 = Origin::signed(1);
+
+ let items_data = vec![default_nft_data(), default_nft_data(), default_nft_data()];
+
+ assert_ok!(TemplateModule::create_multiple_items(
+ origin1.clone(),
+ 1,
+ 1,
+ items_data.clone().into_iter().map(|d| { d.into() }).collect()
+ ));
+ for (index, data) in items_data.iter().enumerate() {
+ assert_eq!(TemplateModule::nft_item_id(1, (index + 1) as u64).const_data.to_vec(), data.const_data);
+ assert_eq!(TemplateModule::nft_item_id(1, (index + 1) as u64).variable_data.to_vec(), data.variable_data);
+ }
+ });
+}
+
#[test]
fn create_refungible_item() {
new_test_ext().execute_with(|| {
@@ -114,6 +140,39 @@
}
#[test]
+fn create_multiple_refungible_items() {
+ new_test_ext().execute_with(|| {
+ default_limits();
+
+ create_test_collection(&CollectionMode::ReFungible(3), 1);
+
+ let origin1 = Origin::signed(1);
+
+ let items_data = vec![default_re_fungible_data(), default_re_fungible_data(), default_re_fungible_data()];
+
+ assert_ok!(TemplateModule::create_multiple_items(
+ origin1.clone(),
+ 1,
+ 1,
+ items_data.clone().into_iter().map(|d| { d.into() }).collect()
+ ));
+ for (index, data) in items_data.iter().enumerate() {
+
+ let item = TemplateModule::refungible_item_id(1, (index + 1) as u64);
+ assert_eq!(item.const_data.to_vec(), data.const_data);
+ assert_eq!(item.variable_data.to_vec(), data.variable_data);
+ assert_eq!(
+ item.owner[0],
+ Ownership {
+ owner: 1,
+ fraction: 1000
+ }
+ );
+ }
+ });
+}
+
+#[test]
fn create_fungible_item() {
new_test_ext().execute_with(|| {
default_limits();
@@ -124,12 +183,36 @@
create_test_item(collection_id, &data.into());
assert_eq!(TemplateModule::fungible_item_id(collection_id, 1).owner, 1);
- assert_eq!(TemplateModule::balance_count(1, 1), 1000);
- assert_eq!(TemplateModule::address_tokens(1, 1), [1]);
});
}
#[test]
+fn create_multiple_fungible_items() {
+ new_test_ext().execute_with(|| {
+ default_limits();
+
+ create_test_collection(&CollectionMode::Fungible(3), 1);
+
+ let origin1 = Origin::signed(1);
+
+ let items_data = vec![default_fungible_data(), default_fungible_data(), default_fungible_data()];
+
+ assert_ok!(TemplateModule::create_multiple_items(
+ origin1.clone(),
+ 1,
+ 1,
+ items_data.clone().into_iter().map(|d| { d.into() }).collect()
+ ));
+
+ for (index, _) in items_data.iter().enumerate() {
+ assert_eq!(TemplateModule::fungible_item_id(1, (index + 1) as u64).owner, 1);
+ }
+ assert_eq!(TemplateModule::balance_count(1, 1), 3000);
+ assert_eq!(TemplateModule::address_tokens(1, 1), [1, 2, 3]);
+ });
+}
+
+#[test]
fn transfer_fungible_item() {
new_test_ext().execute_with(|| {
default_limits();
@@ -1333,7 +1416,7 @@
assert_noop!(
TemplateModule::create_item(origin2.clone(), 1, 2, default_nft_data().into()),
- "Public minting is not allowed for this collection."
+ "Public minting is not allowed for this collection"
);
});
}
@@ -1362,7 +1445,7 @@
assert_noop!(
TemplateModule::create_item(origin2.clone(), 1, 2, default_nft_data().into()),
- "Public minting is not allowed for this collection."
+ "Public minting is not allowed for this collection"
);
});
}
runtime/src/nft_weights.rsdiffbeforeafterboth--- a/runtime/src/nft_weights.rs
+++ b/runtime/src/nft_weights.rs
@@ -64,7 +64,7 @@
}
fn create_item(s: usize, ) -> Weight {
(130_000_000 as Weight)
- .saturating_add((2135 as Weight).saturating_mul(s as Weight))
+ .saturating_add((2135 as Weight).saturating_mul(s as Weight).saturating_mul(500 as Weight)) // 500 is temparary multiplier, fee for storage
.saturating_add(DbWeight::get().reads(10 as Weight))
.saturating_add(DbWeight::get().writes(8 as Weight))
}