difftreelog
NFT-56 + 47 added
in: master
2 files changed
pallets/nft/src/lib.rsdiffbeforeafterboth--- a/pallets/nft/src/lib.rs
+++ b/pallets/nft/src/lib.rs
@@ -24,6 +24,9 @@
pub struct CollectionType<AccountId> {
pub owner: AccountId,
pub next_item_id: u64,
+ pub name: Vec<u16>, // 64 include null escape char
+ pub description: Vec<u16>, // 256 include null escape char
+ pub token_prefix: Vec<u8>, // 16 include null escape char
pub custom_data_size: u32,
}
@@ -58,21 +61,17 @@
/// Next available collection ID
pub NextCollectionID get(fn next_collection_id): u64;
-
- pub Collection get(collection): map hasher(identity) u64 => CollectionType<T::AccountId>;
- //pub Collection get(collection): map hasher(identity) u64 => CollectionType<T::AccountId>;
-
- pub AdminList get(admin_list_collection): map hasher(identity) u64 => Vec<T::AccountId>;
+ pub Collection get(fn collection): map hasher(identity) u64 => CollectionType<T::AccountId>;
+ pub AdminList get(fn admin_list_collection): map hasher(identity) u64 => Vec<T::AccountId>;
/// Balance owner per collection map
- pub Balance get(balance_count): map hasher(blake2_128_concat) (u64, T::AccountId) => u64;
- pub ApprovedList get(approved): map hasher(blake2_128_concat) (u64, u64) => Vec<T::AccountId>;
+ pub Balance get(fn balance_count): map hasher(blake2_128_concat) (u64, T::AccountId) => u64;
+ pub ApprovedList get(fn approved): map hasher(blake2_128_concat) (u64, u64) => Vec<T::AccountId>;
- pub ItemList get(item_id): map hasher(blake2_128_concat) (u64, u64) => NftItemType<T::AccountId>;
- // pub ItemList get(item_id): map hasher(blake2_128_concat) (u64, u64) => NftItemType<T::AccountId>;
+ pub ItemList get(fn item_id): map hasher(blake2_128_concat) (u64, u64) => NftItemType<T::AccountId>;
+ pub ItemListIndex get(fn item_index): map hasher(blake2_128_concat) u64 => u64;
- pub ItemListIndex get(item_index): map hasher(blake2_128_concat) u64 => u64;
- // pub ItemListIndex get(item_index): map hasher(blake2_128_concat) u64 => u64;
+ pub AddressTokens get(fn address_tokens): map hasher(blake2_128_concat) (u64, T::AccountId) => Vec<u64>;
}
}
@@ -82,7 +81,9 @@
where
AccountId = <T as system::Trait>::AccountId,
{
- Created(u32, AccountId),
+ Created(u64, AccountId),
+ ItemCreated(u64),
+ ItemDestroyed(u64, u64),
}
);
@@ -109,18 +110,41 @@
// @param customDataSz size of custom data in each collection item
// returns collection ID
#[weight = frame_support::weights::SimpleDispatchInfo::default()]
- pub fn create_collection(origin, custom_data_sz: u32) -> DispatchResult {
+ pub fn create_collection( origin,
+ collection_name: Vec<u16>,
+ collection_description: Vec<u16>,
+ token_prefix: Vec<u8>,
+ custom_data_sz: u32) -> DispatchResult {
+
// Anyone can create a collection
let who = ensure_signed(origin)?;
+ // check params
+ let mut name = collection_name.to_vec();
+ name.push(0);
+ ensure!(name.len() <= 64, "Collection name can not be longer than 63 char");
+
+ let mut description = collection_description.to_vec();
+ description.push(0);
+ ensure!(name.len() <= 256, "Collection description can not be longer than 255 char");
+
+ let mut prefix = token_prefix.to_vec();
+ prefix.push(0);
+ ensure!(prefix.len() <= 16, "Token prefix can not be longer than 15 char");
+
// Generate next collection ID
- let next_id = NextCollectionID::get();
+ let next_id = NextCollectionID::get()
+ .checked_add(1)
+ .expect("collection id error");
NextCollectionID::put(next_id);
// Create new collection
let new_collection = CollectionType {
- owner: who,
+ owner: who.clone(),
+ name: name,
+ description: description,
+ token_prefix: prefix,
next_item_id: next_id,
custom_data_size: custom_data_sz,
};
@@ -128,6 +152,9 @@
// Add new collection to map
<Collection<T>>::insert(next_id, new_collection);
+ // call event
+ Self::deposit_event(RawEvent::Created(next_id, who.clone()));
+
Ok(())
}
@@ -247,10 +274,19 @@
data: properties,
};
- let current_index = <ItemListIndex>::get(collection_id);
+
+ let current_index = <ItemListIndex>::get(collection_id)
+ .checked_add(1)
+ .expect("Item list index id error");
+
+ Self::add_token_index(collection_id, current_index, new_item.owner.clone())?;
+
<ItemListIndex>::insert(collection_id, current_index);
<ItemList<T>>::insert((collection_id, current_index), new_item);
+ // call event
+ Self::deposit_event(RawEvent::ItemCreated(collection_id));
+
Ok(())
}
@@ -279,10 +315,15 @@
}
<ItemList<T>>::remove((collection_id, item_id));
+ Self::remove_token_index(collection_id, item_id, item.owner.clone())?;
+
// update balance
let new_balance = <Balance<T>>::get((collection_id, item.owner.clone())) - 1;
<Balance<T>>::insert((collection_id, item.owner.clone()), new_balance);
+ // call event
+ Self::deposit_event(RawEvent::ItemDestroyed(collection_id, item_id));
+
Ok(())
}
@@ -319,9 +360,13 @@
<Balance<T>>::insert((collection_id, new_owner.clone()), balance_new_owner);
// change owner
- item.owner = new_owner;
+ let old_owner = item.owner.clone();
+ item.owner = new_owner.clone();
<ItemList<T>>::insert((collection_id, item_id), item);
+ // update index collection
+ Self::move_token_index(collection_id, item_id, old_owner, new_owner.clone())?;
+
// reset approved list
let itm: Vec<T::AccountId> = Vec::new();
<ApprovedList<T>>::insert((collection_id, item_id), itm);
@@ -401,3 +446,55 @@
}
}
}
+
+
+impl<T: Trait> Module<T> {
+ fn add_token_index(collection_id: u64, item_index: u64, owner: T::AccountId) -> DispatchResult {
+
+ let list_exists = <AddressTokens<T>>::contains_key((collection_id, owner.clone()));
+ if list_exists {
+
+ let mut list = <AddressTokens<T>>::get((collection_id, owner.clone()));
+ let item_contains = list.contains(&item_index.clone());
+
+ if !item_contains {
+ list.push(item_index.clone());
+ }
+
+ <AddressTokens<T>>::insert((collection_id, owner.clone()), list);
+
+ } else {
+
+ let mut itm = Vec::new();
+ itm.push(item_index.clone());
+ <AddressTokens<T>>::insert((collection_id, owner), itm);
+ }
+
+ Ok(())
+ }
+
+ fn remove_token_index(collection_id: u64, item_index: u64, owner: T::AccountId) -> DispatchResult {
+
+ let list_exists = <AddressTokens<T>>::contains_key((collection_id, owner.clone()));
+ if list_exists {
+
+ let mut list = <AddressTokens<T>>::get((collection_id, owner.clone()));
+ let item_contains = list.contains(&item_index.clone());
+
+ if item_contains {
+ list.retain(|&item| item != item_index);
+ <AddressTokens<T>>::insert((collection_id, owner), list);
+ }
+ }
+
+ Ok(())
+ }
+
+ fn move_token_index(collection_id: u64, item_index: u64, old_owner: T::AccountId, new_owner: T::AccountId) -> DispatchResult {
+
+ Self::remove_token_index(collection_id, item_index, old_owner)?;
+ Self::add_token_index(collection_id, item_index, new_owner)?;
+
+ Ok(())
+ }
+}
\ No newline at end of file
pallets/nft/src/tests.rsdiffbeforeafterboth1// Tests to be written here2use crate::mock::*;3use frame_support::{assert_noop, assert_ok};45#[test]6fn create_collection_test() {7 new_test_ext().execute_with(|| {8 let size = 1024;9 let origin1 = Origin::signed(1);10 assert_ok!(TemplateModule::create_collection(origin1.clone(), size));11 assert_eq!(TemplateModule::collection(1).owner, 1);12 });13}1415#[test]16fn change_collection_owner() {17 new_test_ext().execute_with(|| {18 let size = 1024;19 let origin1 = Origin::signed(1);2021 assert_ok!(TemplateModule::create_collection(origin1.clone(), size));22 assert_ok!(TemplateModule::change_collection_owner(23 origin1.clone(),24 1,25 226 ));27 assert_eq!(TemplateModule::collection(1).owner, 2);28 });29}3031#[test]32fn destroy_collection() {33 new_test_ext().execute_with(|| {34 let size = 1024;35 let origin1 = Origin::signed(1);3637 assert_ok!(TemplateModule::create_collection(origin1.clone(), size));38 assert_ok!(TemplateModule::destroy_collection(origin1.clone(), 1));39 });40}4142#[test]43fn create_item() {44 new_test_ext().execute_with(|| {45 let size = 1024;46 let origin1 = Origin::signed(1);47 let origin2 = Origin::signed(2);4849 assert_ok!(TemplateModule::create_collection(origin1.clone(), size));50 assert_ok!(TemplateModule::add_collection_admin(origin1.clone(), 1, 2));51 assert_ok!(TemplateModule::create_item(52 origin2.clone(),53 1,54 [1, 1, 1].to_vec()55 ));5657 // check balance (collection with id = 1, user id = 2)58 assert_eq!(TemplateModule::balance_count((1, 2)), 1);59 });60}6162#[test]63fn burn_item() {64 new_test_ext().execute_with(|| {65 let size = 1024;66 let origin1 = Origin::signed(1);67 let origin2 = Origin::signed(2);6869 assert_ok!(TemplateModule::create_collection(origin1.clone(), size));70 assert_ok!(TemplateModule::add_collection_admin(origin1.clone(), 1, 2));71 assert_ok!(TemplateModule::create_item(72 origin2.clone(),73 1,74 [1, 1, 1].to_vec()75 ));7677 // check balance (collection with id = 1, user id = 2)78 assert_eq!(TemplateModule::balance_count((1, 2)), 1);7980 // burn item81 assert_ok!(TemplateModule::burn_item(origin1.clone(), 1, 1));82 assert_noop!(83 TemplateModule::burn_item(origin1.clone(), 1, 1),84 "Item does not exists"85 );8687 assert_eq!(TemplateModule::balance_count((1, 1)), 0);88 });89}9091#[test]92fn add_collection_admin() {93 new_test_ext().execute_with(|| {94 let size = 1024;95 let origin1 = Origin::signed(1);96 let origin2 = Origin::signed(2);97 let origin3 = Origin::signed(3);9899 assert_ok!(TemplateModule::create_collection(origin1.clone(), size));100 assert_ok!(TemplateModule::create_collection(origin2.clone(), size));101 assert_ok!(TemplateModule::create_collection(origin3.clone(), size));102103 assert_eq!(TemplateModule::collection(1).owner, 1);104 assert_eq!(TemplateModule::collection(2).owner, 2);105 assert_eq!(TemplateModule::collection(3).owner, 3);106107 // collection admin108 assert_ok!(TemplateModule::add_collection_admin(origin1.clone(), 1, 2));109 assert_ok!(TemplateModule::add_collection_admin(origin1.clone(), 1, 3));110111 assert_eq!(TemplateModule::admin_list_collection(1).contains(&2), true);112 assert_eq!(TemplateModule::admin_list_collection(1).contains(&3), true);113 });114}115116#[test]117fn remove_collection_admin() {118 new_test_ext().execute_with(|| {119 let size = 1024;120 let origin1 = Origin::signed(1);121 let origin2 = Origin::signed(2);122 let origin3 = Origin::signed(3);123124 assert_ok!(TemplateModule::create_collection(origin1.clone(), size));125 assert_ok!(TemplateModule::create_collection(origin2.clone(), size));126 assert_ok!(TemplateModule::create_collection(origin3.clone(), size));127128 assert_eq!(TemplateModule::collection(1).owner, 1);129 assert_eq!(TemplateModule::collection(2).owner, 2);130 assert_eq!(TemplateModule::collection(3).owner, 3);131132 // collection admin133 assert_ok!(TemplateModule::add_collection_admin(origin1.clone(), 1, 2));134 assert_ok!(TemplateModule::add_collection_admin(origin1.clone(), 1, 3));135136 assert_eq!(TemplateModule::admin_list_collection(1).contains(&2), true);137 assert_eq!(TemplateModule::admin_list_collection(1).contains(&3), true);138139 // remove admin140 assert_ok!(TemplateModule::remove_collection_admin(141 origin2.clone(),142 1,143 3144 ));145 assert_eq!(TemplateModule::admin_list_collection(1).contains(&3), false);146 });147}148149#[test]150fn balance_of() {151 new_test_ext().execute_with(|| {152 let size = 1024;153 let origin1 = Origin::signed(1);154 let origin2 = Origin::signed(2);155 let origin3 = Origin::signed(3);156157 assert_ok!(TemplateModule::create_collection(origin1.clone(), size));158 assert_ok!(TemplateModule::create_collection(origin2.clone(), size));159 assert_ok!(TemplateModule::create_collection(origin3.clone(), size));160161 assert_eq!(TemplateModule::collection(1).owner, 1);162 assert_eq!(TemplateModule::collection(2).owner, 2);163 assert_eq!(TemplateModule::collection(3).owner, 3);164165 // check balance before166 assert_eq!(TemplateModule::balance_count((1, 1)), 0);167168 // create item169 assert_ok!(TemplateModule::create_item(170 origin1.clone(),171 1,172 [1, 1, 1].to_vec()173 ));174175 // check balance (collection with id = 1, user id = 2)176 assert_eq!(TemplateModule::balance_count((1, 1)), 1);177 assert_eq!(TemplateModule::item_id((1, 1)).owner, 1);178 });179}180181#[test]182fn transfer() {183 new_test_ext().execute_with(|| {184 let size = 1024;185 let origin1 = Origin::signed(1);186 let origin2 = Origin::signed(2);187 let origin3 = Origin::signed(3);188189 assert_ok!(TemplateModule::create_collection(origin1.clone(), size));190 assert_ok!(TemplateModule::create_collection(origin2.clone(), size));191 assert_ok!(TemplateModule::create_collection(origin3.clone(), size));192193 assert_eq!(TemplateModule::collection(1).owner, 1);194 assert_eq!(TemplateModule::collection(2).owner, 2);195 assert_eq!(TemplateModule::collection(3).owner, 3);196197 // create item198 assert_ok!(TemplateModule::create_item(199 origin1.clone(),200 1,201 [1, 1, 1].to_vec()202 ));203204 // transfer205 assert_ok!(TemplateModule::transfer(origin1.clone(), 1, 1, 2));206 assert_eq!(TemplateModule::item_id((1, 1)).owner, 2);207208 // balance_of check209 assert_eq!(TemplateModule::balance_count((1, 1)), 0);210 assert_eq!(TemplateModule::balance_count((1, 2)), 1);211 });212}213214#[test]215fn approve() {216 new_test_ext().execute_with(|| {217 let size = 1024;218 let origin1 = Origin::signed(1);219 let origin2 = Origin::signed(2);220 let origin3 = Origin::signed(3);221222 assert_ok!(TemplateModule::create_collection(origin1.clone(), size));223 assert_ok!(TemplateModule::create_collection(origin2.clone(), size));224 assert_ok!(TemplateModule::create_collection(origin3.clone(), size));225226 assert_eq!(TemplateModule::collection(1).owner, 1);227 assert_eq!(TemplateModule::collection(2).owner, 2);228 assert_eq!(TemplateModule::collection(3).owner, 3);229230 // create item231 assert_ok!(TemplateModule::create_item(232 origin1.clone(),233 1,234 [1, 1, 1].to_vec()235 ));236237 // approve238 assert_ok!(TemplateModule::approve(origin1.clone(), 2, 1, 1));239 assert_eq!(TemplateModule::approved((1, 1)).contains(&2), true);240 });241}242243#[test]244fn get_approved() {245 new_test_ext().execute_with(|| {246 let size = 1024;247 let origin1 = Origin::signed(1);248 let origin2 = Origin::signed(2);249 let origin3 = Origin::signed(3);250251 assert_ok!(TemplateModule::create_collection(origin1.clone(), size));252 assert_ok!(TemplateModule::create_collection(origin2.clone(), size));253 assert_ok!(TemplateModule::create_collection(origin3.clone(), size));254255 assert_eq!(TemplateModule::collection(1).owner, 1);256 assert_eq!(TemplateModule::collection(2).owner, 2);257 assert_eq!(TemplateModule::collection(3).owner, 3);258259 // create item260 assert_ok!(TemplateModule::create_item(261 origin1.clone(),262 1,263 [1, 1, 1].to_vec()264 ));265266 // approve267 assert_ok!(TemplateModule::approve(origin1.clone(), 2, 1, 1));268 assert_eq!(TemplateModule::approved((1, 1)).contains(&2), true);269 });270}271272#[test]273fn transfer_from() {274 new_test_ext().execute_with(|| {275 let size = 1024;276 let origin1 = Origin::signed(1);277 let origin2 = Origin::signed(2);278 let origin3 = Origin::signed(3);279280 assert_ok!(TemplateModule::create_collection(origin1.clone(), size));281 assert_ok!(TemplateModule::create_collection(origin2.clone(), size));282 assert_ok!(TemplateModule::create_collection(origin3.clone(), size));283284 assert_eq!(TemplateModule::collection(1).owner, 1);285 assert_eq!(TemplateModule::collection(2).owner, 2);286 assert_eq!(TemplateModule::collection(3).owner, 3);287288 // create item289 assert_ok!(TemplateModule::create_item(290 origin1.clone(),291 1,292 [1, 1, 1].to_vec()293 ));294295 // approve296 assert_ok!(TemplateModule::approve(origin1.clone(), 2, 1, 1));297 assert_ok!(TemplateModule::transfer_from(origin1.clone(), 1, 1, 2));298 });299}