difftreelog
White list and mint permissions features
in: master
2 files changed
pallets/nft/src/lib.rsdiffbeforeafterboth97 pub description: Vec<u16>, // 256 include null escape char97 pub description: Vec<u16>, // 256 include null escape char98 pub token_prefix: Vec<u8>, // 16 include null escape char98 pub token_prefix: Vec<u8>, // 16 include null escape char99 pub custom_data_size: u32,99 pub custom_data_size: u32,100 pub mint_mode: bool,100 pub offchain_schema: Vec<u8>,101 pub offchain_schema: Vec<u8>,101 pub sponsor: AccountId, // Who pays fees. If set to default address, the fees are applied to the transaction sender102 pub sponsor: AccountId, // Who pays fees. If set to default address, the fees are applied to the transaction sender102 pub unconfirmed_sponsor: AccountId, // Sponsor address that has not yet confirmed sponsorship103 pub unconfirmed_sponsor: AccountId, // Sponsor address that has not yet confirmed sponsorship179 pub FungibleItemList get(fn fungible_item_id): double_map hasher(blake2_128_concat) u64, hasher(blake2_128_concat) u64 => FungibleItemType<T::AccountId>;180 pub FungibleItemList get(fn fungible_item_id): double_map hasher(blake2_128_concat) u64, hasher(blake2_128_concat) u64 => FungibleItemType<T::AccountId>;180 pub ReFungibleItemList get(fn refungible_item_id): double_map hasher(blake2_128_concat) u64, hasher(blake2_128_concat) u64 => ReFungibleItemType<T::AccountId>;181 pub ReFungibleItemList get(fn refungible_item_id): double_map hasher(blake2_128_concat) u64, hasher(blake2_128_concat) u64 => ReFungibleItemType<T::AccountId>;181182 // Active vesting list183 // pub VestingList get(fn vesting): double_map hasher(blake2_128_concat) u64, hasher(blake2_128_concat) u64 => VestingItem<T::AccountId, T::Moment>;184182185 /// Index list183 /// Index list186 pub AddressTokens get(fn address_tokens): double_map hasher(blake2_128_concat) u64, hasher(blake2_128_concat) T::AccountId => Vec<u64>;184 pub AddressTokens get(fn address_tokens): double_map hasher(blake2_128_concat) u64, hasher(blake2_128_concat) T::AccountId => Vec<u64>;271 owner: who.clone(),269 owner: who.clone(),272 name: name,270 name: name,273 mode: mode.clone(),271 mode: mode.clone(),272 mint_mode: false,274 access: AccessMode::Normal,273 access: AccessMode::Normal,275 description: description,274 description: description,276 decimal_points: decimal_points,275 decimal_points: decimal_points,309 }308 }310309311 #[weight = 0]310 #[weight = 0]311 pub fn add_to_white_list(origin, collection_id: u64, address: T::AccountId) -> DispatchResult{312313 let sender = ensure_signed(origin)?;314 Self::check_owner_or_admin_permissions(collection_id, sender)?;315316 let mut white_list_collection: Vec<T::AccountId>;317 if <WhiteList<T>>::contains_key(collection_id) {318 white_list_collection = <WhiteList<T>>::get(collection_id);319 if !white_list_collection.contains(&address.clone())320 {321 white_list_collection.push(address.clone());322 }323 }324 else {325 white_list_collection = Vec::new();326 white_list_collection.push(address.clone());327 }328329 <WhiteList<T>>::insert(collection_id, white_list_collection);330 Ok(())331 }332333 #[weight = 0]334 pub fn remove_from_white_list(origin, collection_id: u64, address: T::AccountId) -> DispatchResult{335336 let sender = ensure_signed(origin)?;337 Self::check_owner_or_admin_permissions(collection_id, sender)?;338339 if <WhiteList<T>>::contains_key(collection_id) {340 let mut white_list_collection = <WhiteList<T>>::get(collection_id);341 if white_list_collection.contains(&address.clone())342 {343 white_list_collection.retain(|i| *i != address.clone());344 <WhiteList<T>>::insert(collection_id, white_list_collection);345 }346 }347348 Ok(())349 }350351 #[weight = 0]352 pub fn set_public_access_mode(origin, collection_id: u64, mode: AccessMode) -> DispatchResult353 {354 let sender = ensure_signed(origin)?;355356 Self::check_owner_permissions(collection_id, sender)?;357 let mut target_collection = <Collection<T>>::get(collection_id);358 target_collection.access = mode;359 <Collection<T>>::insert(collection_id, target_collection);360361 Ok(())362 }363364 #[weight = 0]365 pub fn set_mint_permission(origin, collection_id: u64, mint_permission: bool) -> DispatchResult366 {367 let sender = ensure_signed(origin)?;368369 Self::check_owner_permissions(collection_id, sender)?;370 let mut target_collection = <Collection<T>>::get(collection_id);371 target_collection.mint_mode = mint_permission;372 <Collection<T>>::insert(collection_id, target_collection);373374 Ok(())375 }376377 #[weight = 0]312 pub fn change_collection_owner(origin, collection_id: u64, new_owner: T::AccountId) -> DispatchResult {378 pub fn change_collection_owner(origin, collection_id: u64, new_owner: T::AccountId) -> DispatchResult {313379314 let sender = ensure_signed(origin)?;380 let sender = ensure_signed(origin)?;405 pub fn create_item(origin, collection_id: u64, properties: Vec<u8>, owner: T::AccountId) -> DispatchResult {471 pub fn create_item(origin, collection_id: u64, properties: Vec<u8>, owner: T::AccountId) -> DispatchResult {406472407 let sender = ensure_signed(origin)?;473 let sender = ensure_signed(origin)?;474 Self::collection_exists(collection_id)?;408 let target_collection = <Collection<T>>::get(collection_id);475 let target_collection = <Collection<T>>::get(collection_id);476409 Self::check_owner_or_admin_permissions(collection_id, sender.clone())?;477 if !Self::is_owner_or_admin_permissions(collection_id, sender.clone()) {478 if target_collection.mint_mode == false {479 panic!("Collection is not in mint mode");480 }481482 Self::check_white_list(collection_id, owner.clone())?;483 }410484411 match target_collection.mode485 match target_collection.mode412 {486 {468 pub fn burn_item(origin, collection_id: u64, item_id: u64) -> DispatchResult {542 pub fn burn_item(origin, collection_id: u64, item_id: u64) -> DispatchResult {469543470 let sender = ensure_signed(origin)?;544 let sender = ensure_signed(origin)?;545 Self::collection_exists(collection_id)?;471 let item_owner = Self::is_item_owner(sender.clone(), collection_id, item_id);546 let item_owner = Self::is_item_owner(sender.clone(), collection_id, item_id);472 if !item_owner547 if !item_owner473 {548 {474 Self::check_owner_or_admin_permissions(collection_id, sender.clone())?;549 if !Self::is_owner_or_admin_permissions(collection_id, sender.clone()) { 550 Self::check_white_list(collection_id, sender.clone())?;551 }475 }552 }476 let target_collection = <Collection<T>>::get(collection_id);553 let target_collection = <Collection<T>>::get(collection_id);477554494571495 let sender = ensure_signed(origin)?;572 let sender = ensure_signed(origin)?;573496 ensure!(Self::is_item_owner(sender.clone(), collection_id, item_id), "Only item owner can call transfer method");574 let item_owner = Self::is_item_owner(sender.clone(), collection_id, item_id);575 if !item_owner {576 Self::check_white_list(collection_id, sender.clone())?;577 Self::check_white_list(collection_id, recipient.clone())?;578 }497579498 let target_collection = <Collection<T>>::get(collection_id);580 let target_collection = <Collection<T>>::get(collection_id);499581500 // TODO: implement other modes501 match target_collection.mode582 match target_collection.mode502 {583 {503 CollectionMode::NFT(_) => Self::transfer_nft(collection_id, item_id, sender.clone(), recipient)?,584 CollectionMode::NFT(_) => Self::transfer_nft(collection_id, item_id, sender.clone(), recipient)?,517 // amount param stub598 // amount param stub518 let amount = 100000000;599 let amount = 100000000;519600520 ensure!(Self::is_item_owner(sender.clone(), collection_id, item_id), "Only item owner can call transfer method");601 let item_owner = Self::is_item_owner(sender.clone(), collection_id, item_id);602 if !item_owner {603 Self::check_white_list(collection_id, approved.clone())?;604 }521605522 let list_exists = <ApprovedList<T>>::contains_key(collection_id, (item_id, sender.clone()));606 let list_exists = <ApprovedList<T>>::contains_key(collection_id, (item_id, sender.clone()));523 if list_exists {607 if list_exists {546 let approved_list_exists = <ApprovedList<T>>::contains_key(collection_id, (item_id, from.clone()));630 let approved_list_exists = <ApprovedList<T>>::contains_key(collection_id, (item_id, from.clone()));547 if approved_list_exists631 if approved_list_exists548 {632 {633 Self::check_white_list(collection_id, from.clone())?;634 Self::check_white_list(collection_id, recipient.clone())?;635549 let list_itm = <ApprovedList<T>>::get(collection_id, (item_id, from.clone()));636 let list_itm = <ApprovedList<T>>::get(collection_id, (item_id, from.clone()));550 let opt_item = list_itm.iter().find(|i| i.approved == sender.clone());637 let opt_item = list_itm.iter().find(|i| i.approved == sender.clone());558 }645 }559 else646 else560 {647 {561 Self::check_owner_or_admin_permissions(collection_id, sender)?;648 panic!("Only approved addresses can call this method");562 }649 }563650564 let target_collection = <Collection<T>>::get(collection_id);651 let target_collection = <Collection<T>>::get(collection_id);769 Ok(())852 Ok(())770 }853 }771854772 fn check_owner_or_admin_permissions(855 fn is_owner_or_admin_permissions(collection_id: u64, subject: T::AccountId) -> bool {773 collection_id: u64,774 subject: T::AccountId,775 ) -> DispatchResult {776 Self::collection_exists(collection_id)?;777856778 let target_collection = <Collection<T>>::get(collection_id);857 let target_collection = <Collection<T>>::get(collection_id);779 let is_owner = subject == target_collection.owner;858 let mut result: bool = subject == target_collection.owner;780781 let no_perm_mes = "You do not have permissions to modify this collection";782 let exists = <AdminList<T>>::contains_key(collection_id);859 let exists = <AdminList<T>>::contains_key(collection_id);783860784 if !is_owner {861 if !result & exists {785 ensure!(exists, no_perm_mes);786 ensure!(787 <AdminList<T>>::get(collection_id).contains(&subject),862 if <AdminList<T>>::get(collection_id).contains(&subject) {788 no_perm_mes863 result = true789 );864 }790 }865 }791 Ok(())866867 result792 }868 }869870 fn check_owner_or_admin_permissions(collection_id: u64, subject: T::AccountId) -> DispatchResult {871 872 Self::collection_exists(collection_id)?;873 let result = Self::is_owner_or_admin_permissions(collection_id, subject.clone());874875 if result == true {876 Ok(())877 } else {878 panic!("You do not have permissions to modify this collection")879 }880 }793881794 fn is_item_owner(subject: T::AccountId, collection_id: u64, item_id: u64) -> bool {882 fn is_item_owner(subject: T::AccountId, collection_id: u64, item_id: u64) -> bool {795 let target_collection = <Collection<T>>::get(collection_id);883 let target_collection = <Collection<T>>::get(collection_id);811 }899 }812 }900 }901902 fn check_white_list(collection_id: u64, address: T::AccountId) -> DispatchResult {903904 let mes = "Address is not in white list";905 if <WhiteList<T>>::contains_key(collection_id){906 let wl = <WhiteList<T>>::get(collection_id);907 if !wl.contains(&address.clone()) {908 panic!(mes);909 }910 }911 else {912 panic!(mes);913 }914 Ok(())915 }813916814 fn transfer_fungible(917 fn transfer_fungible(815 collection_id: u64,918 collection_id: u64,pallets/nft/src/tests.rsdiffbeforeafterboth--- a/pallets/nft/src/tests.rs
+++ b/pallets/nft/src/tests.rs
@@ -1,6 +1,6 @@
// Tests to be written here
use crate::mock::*;
-use crate::{ApprovePermissions, CollectionMode, Ownership};
+use crate::{ApprovePermissions, CollectionMode, AccessMode, Ownership};
use frame_support::{assert_noop, assert_ok};
#[test]
@@ -321,10 +321,11 @@
assert_eq!(TemplateModule::balance_count(1, 1), 1);
assert_eq!(TemplateModule::address_tokens(1, 1), [1]);
- assert_noop!(
- TemplateModule::transfer_from(origin2.clone(), 1, 3, 1, 1, 1),
- "You do not have permissions to modify this collection"
- );
+ assert_ok!(TemplateModule::set_mint_permission(origin1.clone(), 1, true));
+ assert_ok!(TemplateModule::set_public_access_mode(origin1.clone(), 1, AccessMode::WhiteList));
+ assert_ok!(TemplateModule::add_to_white_list(origin1.clone(), 1, 1));
+ assert_ok!(TemplateModule::add_to_white_list(origin1.clone(), 1, 2));
+ assert_ok!(TemplateModule::add_to_white_list(origin1.clone(), 1, 3));
// do approve
assert_ok!(TemplateModule::approve(origin1.clone(), 2, 1, 1));
@@ -390,10 +391,11 @@
assert_eq!(TemplateModule::balance_count(1, 1), 1000);
assert_eq!(TemplateModule::address_tokens(1, 1), [1]);
- assert_noop!(
- TemplateModule::transfer_from(origin2.clone(), 1, 3, 1, 1, 1),
- "You do not have permissions to modify this collection"
- );
+ assert_ok!(TemplateModule::set_mint_permission(origin1.clone(), 1, true));
+ assert_ok!(TemplateModule::set_public_access_mode(origin1.clone(), 1, AccessMode::WhiteList));
+ assert_ok!(TemplateModule::add_to_white_list(origin1.clone(), 1, 1));
+ assert_ok!(TemplateModule::add_to_white_list(origin1.clone(), 1, 2));
+ assert_ok!(TemplateModule::add_to_white_list(origin1.clone(), 1, 3));
// do approve
assert_ok!(TemplateModule::approve(origin1.clone(), 2, 1, 1));
@@ -461,10 +463,11 @@
assert_eq!(TemplateModule::balance_count(1, 1), 1000);
assert_eq!(TemplateModule::address_tokens(1, 1), [1]);
- assert_noop!(
- TemplateModule::transfer_from(origin2.clone(), 1, 3, 1, 1, 1),
- "You do not have permissions to modify this collection"
- );
+ assert_ok!(TemplateModule::set_mint_permission(origin1.clone(), 1, true));
+ assert_ok!(TemplateModule::set_public_access_mode(origin1.clone(), 1, AccessMode::WhiteList));
+ assert_ok!(TemplateModule::add_to_white_list(origin1.clone(), 1, 1));
+ assert_ok!(TemplateModule::add_to_white_list(origin1.clone(), 1, 2));
+ assert_ok!(TemplateModule::add_to_white_list(origin1.clone(), 1, 3));
// do approve
assert_ok!(TemplateModule::approve(origin1.clone(), 2, 1, 1));
@@ -573,7 +576,6 @@
let mode: CollectionMode = CollectionMode::NFT(2000);
let origin1 = Origin::signed(1);
- let origin2 = Origin::signed(2);
assert_ok!(TemplateModule::create_collection(
origin1.clone(),
col_name1.clone(),
@@ -583,7 +585,7 @@
));
assert_ok!(TemplateModule::add_collection_admin(origin1.clone(), 1, 2));
assert_ok!(TemplateModule::create_item(
- origin2.clone(),
+ origin1.clone(),
1,
[1, 2, 3].to_vec(),
1
@@ -614,7 +616,6 @@
let mode: CollectionMode = CollectionMode::Fungible(3);
let origin1 = Origin::signed(1);
- let origin2 = Origin::signed(2);
assert_ok!(TemplateModule::create_collection(
origin1.clone(),
col_name1.clone(),
@@ -624,7 +625,7 @@
));
assert_ok!(TemplateModule::add_collection_admin(origin1.clone(), 1, 2));
assert_ok!(TemplateModule::create_item(
- origin2.clone(),
+ origin1.clone(),
1,
[].to_vec(),
1
@@ -661,6 +662,11 @@
token_prefix1.clone(),
mode
));
+
+ assert_ok!(TemplateModule::set_mint_permission(origin1.clone(), 1, true));
+ assert_ok!(TemplateModule::set_public_access_mode(origin1.clone(), 1, AccessMode::WhiteList));
+ assert_ok!(TemplateModule::add_to_white_list(origin1.clone(), 1, 1));
+
assert_ok!(TemplateModule::add_collection_admin(origin1.clone(), 1, 2));
assert_ok!(TemplateModule::create_item(
origin2.clone(),
@@ -928,6 +934,13 @@
// approve
assert_ok!(TemplateModule::approve(origin1.clone(), 2, 1, 1));
assert_eq!(TemplateModule::approved(1, (1, 1))[0].approved, 2);
+
+ assert_ok!(TemplateModule::set_mint_permission(origin1.clone(), 1, true));
+ assert_ok!(TemplateModule::set_public_access_mode(origin1.clone(), 1, AccessMode::WhiteList));
+ assert_ok!(TemplateModule::add_to_white_list(origin1.clone(), 1, 1));
+ assert_ok!(TemplateModule::add_to_white_list(origin1.clone(), 1, 2));
+ assert_ok!(TemplateModule::add_to_white_list(origin1.clone(), 1, 3));
+
assert_ok!(TemplateModule::transfer_from(
origin2.clone(),
1,