git.delta.rocks / unique-network / refs/commits / 2e2e4a210638

difftreelog

Merge branch 'develop' into feature/NFTPAR-90

Greg Zaitsev2020-10-02parents: #fa2ebd3 #3f41342.patch.diff
in: master

7 files changed

modifiedREADME.mddiffbeforeafterboth
--- a/README.md
+++ b/README.md
@@ -142,6 +142,12 @@
     "enable_println": "bool",
     "max_subject_len": "u32"
   },
+  "AccessMode": {
+    "_enum": [
+      "Normal",
+      "WhiteList"
+    ]
+  },
   "CollectionMode": {
     "_enum": {
       "Invalid": null,
@@ -181,12 +187,13 @@
   "CollectionType": {
     "Owner": "AccountId",
     "Mode": "CollectionMode",
-    "Access": "u8",
+    "Access": "AccessMode",
     "DecimalPoints": "u32",
     "Name": "Vec<u16>",
     "Description": "Vec<u16>",
     "TokenPrefix": "Vec<u8>",
     "CustomDataSize": "u32",
+    "MintMode": "bool",
     "OffchainSchema": "Vec<u8>",
     "Sponsor": "AccountId",
     "UnconfirmedSponsor": "AccountId"
@@ -196,4 +203,5 @@
   "LookupSource": "AccountId",
   "Weight": "u64"
 }
+
 ```
\ No newline at end of file
modifiednode/src/chain_spec.rsdiffbeforeafterboth
--- a/node/src/chain_spec.rs
+++ b/node/src/chain_spec.rs
@@ -1,8 +1,9 @@
-use nft_runtime::{
-    AccountId, AuraConfig, BalancesConfig, GenesisConfig, GrandpaConfig, Signature, SudoConfig,
-    SystemConfig, WASM_BINARY,
-};
-use nft_runtime::{ContractsConfig, ContractsSchedule};
+// use nft_runtime::{
+//     AccountId, AuraConfig, BalancesConfig, GenesisConfig, GrandpaConfig, Signature, SudoConfig,
+//     SystemConfig, WASM_BINARY,
+// };
+// use nft_runtime::{ContractsConfig, ContractsSchedule, NftConfig, CollectionType};
+use nft_runtime::*;
 use sc_service::ChainType;
 use sp_consensus_aura::sr25519::AuthorityId as AuraId;
 use sp_core::{sr25519, Pair, Public};
@@ -128,6 +129,25 @@
                 .collect(),
         }),
         sudo: Some(SudoConfig { key: root_key }),
+        nft: Some(NftConfig {
+            collection: vec![(1, CollectionType { 
+                owner: get_account_id_from_seed::<sr25519::Public>("Alice"),
+                mode: CollectionMode::NFT(50),
+                access: AccessMode::Normal,
+                decimal_points: 0,
+                name: vec!(),
+                description: vec!(),
+                token_prefix: vec!(),
+                custom_data_size: 50,
+                mint_mode: false,
+                offchain_schema: vec!(),
+                sponsor: get_account_id_from_seed::<sr25519::Public>("Alice"),
+                unconfirmed_sponsor: get_account_id_from_seed::<sr25519::Public>("Alice"),
+            })],
+            nft_item_id: vec!(),
+            fungible_item_id: vec!(),
+            refungible_item_id: vec!(),
+        }),
         contracts: Some(ContractsConfig {
             current_schedule: ContractsSchedule {
                 enable_println,
modifiedpallets/nft/src/lib.rsdiffbeforeafterboth
1#![cfg_attr(not(feature = "std"), no_std)]1#![cfg_attr(not(feature = "std"), no_std)]
22
3/// For more guidance on Substrate FRAME, see the example pallet3#[cfg(feature = "std")]
4/// https://github.com/paritytech/substrate/blob/master/frame/example/src/lib.rs4pub use serde::*;
5
5use codec::{Decode, Encode};6use codec::{Decode, Encode};
6pub use frame_support::{7pub use frame_support::{
32    },33    },
33    FixedPointOperand, FixedU128,34    FixedPointOperand, FixedU128,
34};35};
35use sp_std::prelude::*;
3636
37#[cfg(test)]37#[cfg(test)]
38mod mock;38mod mock;
3939
40#[cfg(test)]40#[cfg(test)]
41mod tests;41mod tests;
4242
43// Structs
43#[derive(Encode, Decode, Debug, Eq, Clone, PartialEq)]44// #region
45
46#[derive(Encode, Decode, Eq, Debug, Clone, PartialEq)]
47#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
44pub enum CollectionMode {48pub enum CollectionMode {
45    Invalid,49    Invalid,
46    // custom data size50    // custom data size
62    }66    }
63}67}
6468
65#[derive(Encode, Decode, Debug, Clone, PartialEq)]69#[derive(Encode, Decode, Eq, Debug, Clone, PartialEq)]
70#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
66pub enum AccessMode {71pub enum AccessMode {
67    Normal,72    Normal,
68    WhiteList,73    WhiteList,
79    }84    }
80}85}
8186
82#[derive(Encode, Decode, Default, Clone, PartialEq)]87#[derive(Encode, Decode, Default, Debug, Clone, PartialEq)]
83#[cfg_attr(feature = "std", derive(Debug))]88#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
84pub struct Ownership<AccountId> {89pub struct Ownership<AccountId> {
85    pub owner: AccountId,90    pub owner: AccountId,
86    pub fraction: u128,91    pub fraction: u128,
87}92}
8893
89#[derive(Encode, Decode, Default, Clone, PartialEq)]94#[derive(Encode, Decode, Default, Debug, Clone, PartialEq)]
90#[cfg_attr(feature = "std", derive(Debug))]95#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
91pub struct CollectionType<AccountId> {96pub struct CollectionType<AccountId> {
92    pub owner: AccountId,97    pub owner: AccountId,
93    pub mode: CollectionMode,98    pub mode: CollectionMode,
97    pub description: Vec<u16>, // 256 include null escape char102    pub description: Vec<u16>, // 256 include null escape char
98    pub token_prefix: Vec<u8>, // 16 include null escape char103    pub token_prefix: Vec<u8>, // 16 include null escape char
99    pub custom_data_size: u32,104    pub custom_data_size: u32,
105    pub mint_mode: bool,
100    pub offchain_schema: Vec<u8>,106    pub offchain_schema: Vec<u8>,
101    pub sponsor: AccountId, // Who pays fees. If set to default address, the fees are applied to the transaction sender107    pub sponsor: AccountId, // Who pays fees. If set to default address, the fees are applied to the transaction sender
102    pub unconfirmed_sponsor: AccountId, // Sponsor address that has not yet confirmed sponsorship108    pub unconfirmed_sponsor: AccountId, // Sponsor address that has not yet confirmed sponsorship
103}109}
104110
105#[derive(Encode, Decode, Default, Clone, PartialEq)]111#[derive(Encode, Decode, Default, Debug, Clone, PartialEq)]
106#[cfg_attr(feature = "std", derive(Debug))]112#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
107pub struct CollectionAdminsType<AccountId> {113pub struct CollectionAdminsType<AccountId> {
108    pub admin: AccountId,114    pub admin: AccountId,
109    pub collection_id: u64,115    pub collection_id: u64,
110}116}
111117
112#[derive(Encode, Decode, Default, Clone, PartialEq)]118#[derive(Encode, Decode, Default, Debug, Clone, PartialEq)]
113#[cfg_attr(feature = "std", derive(Debug))]119#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
114pub struct NftItemType<AccountId> {120pub struct NftItemType<AccountId> {
115    pub collection: u64,121    pub collection: u64,
116    pub owner: AccountId,122    pub owner: AccountId,
117    pub data: Vec<u8>,123    pub data: Vec<u8>,
118}124}
119125
120#[derive(Encode, Decode, Default, Clone, PartialEq)]126#[derive(Encode, Decode, Default, Debug, Clone, PartialEq)]
121#[cfg_attr(feature = "std", derive(Debug))]127#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
122pub struct FungibleItemType<AccountId> {128pub struct FungibleItemType<AccountId> {
123    pub collection: u64,129    pub collection: u64,
124    pub owner: AccountId,130    pub owner: AccountId,
125    pub value: u128,131    pub value: u128,
126}132}
127133
128#[derive(Encode, Decode, Default, Clone, PartialEq)]134#[derive(Encode, Decode, Default, Debug, Clone, PartialEq)]
129#[cfg_attr(feature = "std", derive(Debug))]135#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
130pub struct ReFungibleItemType<AccountId> {136pub struct ReFungibleItemType<AccountId> {
131    pub collection: u64,137    pub collection: u64,
132    pub owner: Vec<Ownership<AccountId>>,138    pub owner: Vec<Ownership<AccountId>>,
133    pub data: Vec<u8>,139    pub data: Vec<u8>,
134}140}
135141
136#[derive(Encode, Decode, Default, Clone, PartialEq)]142#[derive(Encode, Decode, Default, Debug, Clone, PartialEq)]
137#[cfg_attr(feature = "std", derive(Debug))]143#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
138pub struct ApprovePermissions<AccountId> {144pub struct ApprovePermissions<AccountId> {
139    pub approved: AccountId,145    pub approved: AccountId,
140    pub amount: u64,146    pub amount: u64,
141}147}
142148
143#[derive(Encode, Decode, Default, Clone, PartialEq)]149#[derive(Encode, Decode, Default, Debug, Clone, PartialEq)]
144#[cfg_attr(feature = "std", derive(Debug))]150#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
145pub struct VestingItem<AccountId, Moment> {151pub struct VestingItem<AccountId, Moment> {
146    pub sender: AccountId,152    pub sender: AccountId,
147    pub recipient: AccountId,153    pub recipient: AccountId,
155    type Event: From<Event<Self>> + Into<<Self as system::Trait>::Event>;161    type Event: From<Event<Self>> + Into<<Self as system::Trait>::Event>;
156}162}
157163
164// #endregion
165
158decl_storage! {166decl_storage! {
159    trait Store for Module<T: Trait> as Nft {167    trait Store for Module<T: Trait> as Nft {
160168
164        ChainVersion: u64;172        ChainVersion: u64;
165        ItemListIndex: map hasher(blake2_128_concat) u64 => u64;173        ItemListIndex: map hasher(blake2_128_concat) u64 => u64;
166174
167        pub Collection get(fn collection): map hasher(identity) u64 => CollectionType<T::AccountId>;175        pub Collection get(fn collection) config(): map hasher(identity) u64 => CollectionType<T::AccountId>;
168        pub AdminList get(fn admin_list_collection): map hasher(identity) u64 => Vec<T::AccountId>;176        pub AdminList get(fn admin_list_collection): map hasher(identity) u64 => Vec<T::AccountId>;
169        pub WhiteList get(fn white_list): map hasher(identity) u64 => Vec<T::AccountId>;177        pub WhiteList get(fn white_list): map hasher(identity) u64 => Vec<T::AccountId>;
170178
175        pub ApprovedList get(fn approved): double_map hasher(blake2_128_concat) u64, hasher(blake2_128_concat) (u64, T::AccountId) => Vec<ApprovePermissions<T::AccountId>>;183        pub ApprovedList get(fn approved): double_map hasher(blake2_128_concat) u64, hasher(blake2_128_concat) (u64, T::AccountId) => Vec<ApprovePermissions<T::AccountId>>;
176184
177        /// Item collections185        /// Item collections
178        pub NftItemList get(fn nft_item_id): double_map hasher(blake2_128_concat) u64, hasher(blake2_128_concat) u64 => NftItemType<T::AccountId>;186        pub NftItemList get(fn nft_item_id) config(): double_map hasher(blake2_128_concat) u64, hasher(blake2_128_concat) u64 => NftItemType<T::AccountId>;
179        pub FungibleItemList get(fn fungible_item_id): double_map hasher(blake2_128_concat) u64, hasher(blake2_128_concat) u64 => FungibleItemType<T::AccountId>;187        pub FungibleItemList get(fn fungible_item_id) config(): 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>;188        pub ReFungibleItemList get(fn refungible_item_id) config(): double_map hasher(blake2_128_concat) u64, hasher(blake2_128_concat) u64 => ReFungibleItemType<T::AccountId>;
181189
182        // Active vesting list
183        // pub VestingList get(fn vesting): double_map hasher(blake2_128_concat) u64, hasher(blake2_128_concat) u64 => VestingItem<T::AccountId, T::Moment>;
184
185        /// Index list190        /// Index list
186        pub AddressTokens get(fn address_tokens): double_map hasher(blake2_128_concat) u64, hasher(blake2_128_concat) T::AccountId => Vec<u64>;191        pub AddressTokens get(fn address_tokens): double_map hasher(blake2_128_concat) u64, hasher(blake2_128_concat) T::AccountId => Vec<u64>;
187192
188        // Sponsorship193        // Sponsorship
189        pub ContractSponsor get(fn contract_sponsor): map hasher(identity) T::AccountId => T::AccountId;194        pub ContractSponsor get(fn contract_sponsor): map hasher(identity) T::AccountId => T::AccountId;
190        pub UnconfirmedContractSponsor get(fn unconfirmed_contract_sponsor): map hasher(identity) T::AccountId => T::AccountId;195        pub UnconfirmedContractSponsor get(fn unconfirmed_contract_sponsor): map hasher(identity) T::AccountId => T::AccountId;
191    }196    }
197    add_extra_genesis {
198        build(|config: &GenesisConfig<T>| {
199			// Modification of storage
200            for (_num, _c) in &config.collection {
201                <Module<T>>::init_collection(_c);
202            }
203
204            for (_num, _q, _i) in &config.nft_item_id {
205                <Module<T>>::init_nft_token(_i);
206            }
207
208            for (_num, _q, _i) in &config.fungible_item_id {
209                <Module<T>>::init_fungible_token(_i);
210            }
211
212            for (_num, _q, _i) in &config.refungible_item_id {
213                <Module<T>>::init_refungible_token(_i);
214            }
215		})
216    }
192}217}
193218
194decl_event!(219decl_event!(
209234
210        fn on_initialize(now: T::BlockNumber) -> Weight {235        fn on_initialize(now: T::BlockNumber) -> Weight {
211236
212            if ChainVersion::get() == 0237            if ChainVersion::get() < 2
213            {238            {
214                let value = NextCollectionID::get();239                let value = NextCollectionID::get();
215                CreatedCollectionCount::put(value);240                CreatedCollectionCount::put(value);
224        // @param customDataSz size of custom data in each collection item249        // @param customDataSz size of custom data in each collection item
225        // returns collection ID250        // returns collection ID
226        #[weight = 0]251        #[weight = 0]
227        pub fn create_collection(   origin,252        pub fn create_collection(origin,
228                                    collection_name: Vec<u16>,253                                 collection_name: Vec<u16>,
229                                    collection_description: Vec<u16>,254                                 collection_description: Vec<u16>,
230                                    token_prefix: Vec<u8>,255                                 token_prefix: Vec<u8>,
231                                    mode: CollectionMode) -> DispatchResult {256                                 mode: CollectionMode) -> DispatchResult {
232257
233            // Anyone can create a collection258            // Anyone can create a collection
234            let who = ensure_signed(origin)?;259            let who = ensure_signed(origin)?;
271                owner: who.clone(),296                owner: who.clone(),
272                name: name,297                name: name,
273                mode: mode.clone(),298                mode: mode.clone(),
299                mint_mode: false,
274                access: AccessMode::Normal,300                access: AccessMode::Normal,
275                description: description,301                description: description,
276                decimal_points: decimal_points,302                decimal_points: decimal_points,
309        }335        }
310336
311        #[weight = 0]337        #[weight = 0]
338        pub fn add_to_white_list(origin, collection_id: u64, address: T::AccountId) -> DispatchResult{
339
340            let sender = ensure_signed(origin)?;
341            Self::check_owner_or_admin_permissions(collection_id, sender)?;
342
343            let mut white_list_collection: Vec<T::AccountId>;
344            if <WhiteList<T>>::contains_key(collection_id) {
345                white_list_collection = <WhiteList<T>>::get(collection_id);
346                if !white_list_collection.contains(&address.clone())
347                {
348                    white_list_collection.push(address.clone());
349                }
350            }
351            else {
352                white_list_collection = Vec::new();
353                white_list_collection.push(address.clone());
354            }
355
356            <WhiteList<T>>::insert(collection_id, white_list_collection);
357            Ok(())
358        }
359
360        #[weight = 0]
361        pub fn remove_from_white_list(origin, collection_id: u64, address: T::AccountId) -> DispatchResult{
362
363            let sender = ensure_signed(origin)?;
364            Self::check_owner_or_admin_permissions(collection_id, sender)?;
365
366            if <WhiteList<T>>::contains_key(collection_id) {
367                let mut white_list_collection = <WhiteList<T>>::get(collection_id);
368                if white_list_collection.contains(&address.clone())
369                {
370                    white_list_collection.retain(|i| *i != address.clone());
371                    <WhiteList<T>>::insert(collection_id, white_list_collection);
372                }
373            }
374
375            Ok(())
376        }
377
378        #[weight = 0]
379        pub fn set_public_access_mode(origin, collection_id: u64, mode: AccessMode) -> DispatchResult
380        {
381            let sender = ensure_signed(origin)?;
382
383            Self::check_owner_permissions(collection_id, sender)?;
384            let mut target_collection = <Collection<T>>::get(collection_id);
385            target_collection.access = mode;
386            <Collection<T>>::insert(collection_id, target_collection);
387
388            Ok(())
389        }
390
391        #[weight = 0]
392        pub fn set_mint_permission(origin, collection_id: u64, mint_permission: bool) -> DispatchResult
393        {
394            let sender = ensure_signed(origin)?;
395
396            Self::check_owner_permissions(collection_id, sender)?;
397            let mut target_collection = <Collection<T>>::get(collection_id);
398            target_collection.mint_mode = mint_permission;
399            <Collection<T>>::insert(collection_id, target_collection);
400
401            Ok(())
402        }
403
404        #[weight = 0]
312        pub fn change_collection_owner(origin, collection_id: u64, new_owner: T::AccountId) -> DispatchResult {405        pub fn change_collection_owner(origin, collection_id: u64, new_owner: T::AccountId) -> DispatchResult {
313406
314            let sender = ensure_signed(origin)?;407            let sender = ensure_signed(origin)?;
405        pub fn create_item(origin, collection_id: u64, properties: Vec<u8>, owner: T::AccountId) -> DispatchResult {498        pub fn create_item(origin, collection_id: u64, properties: Vec<u8>, owner: T::AccountId) -> DispatchResult {
406499
407            let sender = ensure_signed(origin)?;500            let sender = ensure_signed(origin)?;
501            Self::collection_exists(collection_id)?;
408            let target_collection = <Collection<T>>::get(collection_id);502            let target_collection = <Collection<T>>::get(collection_id);
409            Self::check_owner_or_admin_permissions(collection_id, sender.clone())?;
410503
504            if !Self::is_owner_or_admin_permissions(collection_id, sender.clone()) {
505                ensure!(target_collection.mint_mode == true, "Collection is not in mint mode");
506                Self::check_white_list(collection_id, owner.clone())?;
507            }
508
411            match target_collection.mode509            match target_collection.mode
412            {510            {
413                CollectionMode::NFT(_) => {511                CollectionMode::NFT(_) => {
469        pub fn burn_item(origin, collection_id: u64, item_id: u64) -> DispatchResult {567        pub fn burn_item(origin, collection_id: u64, item_id: u64) -> DispatchResult {
470568
471            let sender = ensure_signed(origin)?;569            let sender = ensure_signed(origin)?;
472            let item_owner = Self::is_item_owner(sender.clone(), collection_id, item_id);570            Self::collection_exists(collection_id)?;
473            if !item_owner571
474            {572            // Transfer permissions check
475                Self::check_owner_or_admin_permissions(collection_id, sender.clone())?;
476            }
477            let target_collection = <Collection<T>>::get(collection_id);573            let target_collection = <Collection<T>>::get(collection_id);
574            ensure!(Self::is_item_owner(sender.clone(), collection_id, item_id) || 
575                Self::is_owner_or_admin_permissions(collection_id, sender.clone()), 
576                "Only item owner, collection owner and admins can modify item");
478577
578            if target_collection.access == AccessMode::WhiteList {
579                Self::check_white_list(collection_id, sender.clone())?;
580            }
581
479            match target_collection.mode582            match target_collection.mode
480            {583            {
481                CollectionMode::NFT(_) => Self::burn_nft_item(collection_id, item_id)?,584                CollectionMode::NFT(_) => Self::burn_nft_item(collection_id, item_id)?,
494        pub fn transfer(origin, recipient: T::AccountId, collection_id: u64, item_id: u64, value: u64) -> DispatchResult {597        pub fn transfer(origin, recipient: T::AccountId, collection_id: u64, item_id: u64, value: u64) -> DispatchResult {
495598
496            let sender = ensure_signed(origin)?;599            let sender = ensure_signed(origin)?;
497            ensure!(Self::is_item_owner(sender.clone(), collection_id, item_id), "Only item owner can call transfer method");
498600
601            // Transfer permissions check
499            let target_collection = <Collection<T>>::get(collection_id);602            let target_collection = <Collection<T>>::get(collection_id);
603            ensure!(Self::is_item_owner(sender.clone(), collection_id, item_id) || 
604                Self::is_owner_or_admin_permissions(collection_id, sender.clone()), 
605                "Only item owner, collection owner and admins can modify item");
500606
501            // TODO: implement other modes607            if target_collection.access == AccessMode::WhiteList {
608                Self::check_white_list(collection_id, sender.clone())?;
609                Self::check_white_list(collection_id, recipient.clone())?;
610            }
611
502            match target_collection.mode612            match target_collection.mode
503            {613            {
515625
516            let sender = ensure_signed(origin)?;626            let sender = ensure_signed(origin)?;
517627
628            // Transfer permissions check
629            let target_collection = <Collection<T>>::get(collection_id);
630            ensure!(Self::is_item_owner(sender.clone(), collection_id, item_id) || 
631                Self::is_owner_or_admin_permissions(collection_id, sender.clone()), 
632                "Only item owner, collection owner and admins can approve");
633
634            if target_collection.access == AccessMode::WhiteList {
635                Self::check_white_list(collection_id, sender.clone())?;
636                Self::check_white_list(collection_id, approved.clone())?;
637            }
638
518            // amount param stub639            // amount param stub
519            let amount = 100000000;640            let amount = 100000000;
520641
521            ensure!(Self::is_item_owner(sender.clone(), collection_id, item_id), "Only item owner can call transfer method");
522
523            let list_exists = <ApprovedList<T>>::contains_key(collection_id, (item_id, sender.clone()));642            let list_exists = <ApprovedList<T>>::contains_key(collection_id, (item_id, sender.clone()));
524            if list_exists {643            if list_exists {
525644
544        pub fn transfer_from(origin, from: T::AccountId, recipient: T::AccountId, collection_id: u64, item_id: u64, value: u64 ) -> DispatchResult {663        pub fn transfer_from(origin, from: T::AccountId, recipient: T::AccountId, collection_id: u64, item_id: u64, value: u64 ) -> DispatchResult {
545664
546            let sender = ensure_signed(origin)?;665            let sender = ensure_signed(origin)?;
547            let approved_list_exists = <ApprovedList<T>>::contains_key(collection_id, (item_id, from.clone()));666            let mut appoved_transfer = false;
667
548            if approved_list_exists668            // Check approve
549            {669            if <ApprovedList<T>>::contains_key(collection_id, (item_id, from.clone())) {
550                let list_itm = <ApprovedList<T>>::get(collection_id, (item_id, from.clone()));670                let list_itm = <ApprovedList<T>>::get(collection_id, (item_id, from.clone()));
551                let opt_item = list_itm.iter().find(|i| i.approved == sender.clone());671                let opt_item = list_itm.iter().find(|i| i.approved == sender.clone());
552                ensure!(opt_item.is_some(), "No approve found");672                appoved_transfer = opt_item.is_some();
553                ensure!(opt_item.unwrap().amount >= value, "Requested value more than approved");673                ensure!(opt_item.unwrap().amount >= value, "Requested value more than approved");
554
555                // remove approve
556                let approve_list: Vec<ApprovePermissions<T::AccountId>> = <ApprovedList<T>>::get(collection_id, (item_id, from.clone()))
557                    .into_iter().filter(|i| i.approved != sender.clone()).collect();
558                <ApprovedList<T>>::insert(collection_id, (item_id, from.clone()), approve_list);
559            }674            }
560            else
561            {
562                Self::check_owner_or_admin_permissions(collection_id, sender)?;
563            }
564675
676            // Transfer permissions check
565            let target_collection = <Collection<T>>::get(collection_id);677            let target_collection = <Collection<T>>::get(collection_id);
678            ensure!(appoved_transfer || Self::is_owner_or_admin_permissions(collection_id, sender.clone()), 
679                "Only item owner, collection owner and admins can modify items");
566680
681            if target_collection.access == AccessMode::WhiteList {
682                Self::check_white_list(collection_id, sender.clone())?;
683                Self::check_white_list(collection_id, recipient.clone())?;
684            }
685
686            // remove approve
687            let approve_list: Vec<ApprovePermissions<T::AccountId>> = <ApprovedList<T>>::get(collection_id, (item_id, from.clone()))
688                .into_iter().filter(|i| i.approved != sender.clone()).collect();
689            <ApprovedList<T>>::insert(collection_id, (item_id, from.clone()), approve_list);
690
691
567            match target_collection.mode692            match target_collection.mode
568            {693            {
569                CollectionMode::NFT(_) => Self::transfer_nft(collection_id, item_id, from, recipient)?,694                CollectionMode::NFT(_) => Self::transfer_nft(collection_id, item_id, from, recipient)?,
675        Ok(())800        Ok(())
676    }801    }
677802
678    fn burn_refungible_item(803    fn burn_refungible_item(collection_id: u64, item_id: u64, owner: T::AccountId) -> DispatchResult {
679        collection_id: u64,
680        item_id: u64,
681        owner: T::AccountId,
682    ) -> DispatchResult {
683        ensure!(804        ensure!(
684            <ReFungibleItemList<T>>::contains_key(collection_id, item_id),805            <ReFungibleItemList<T>>::contains_key(collection_id, item_id),
685            "Item does not exists"806            "Item does not exists"
770        Ok(())891        Ok(())
771    }892    }
772893
773    fn check_owner_or_admin_permissions(894    fn is_owner_or_admin_permissions(collection_id: u64, subject: T::AccountId) -> bool {
774        collection_id: u64,
775        subject: T::AccountId,
776    ) -> DispatchResult {
777        Self::collection_exists(collection_id)?;
778895
779        let target_collection = <Collection<T>>::get(collection_id);896        let target_collection = <Collection<T>>::get(collection_id);
780        let is_owner = subject == target_collection.owner;897        let mut result: bool = subject == target_collection.owner;
781
782        let no_perm_mes = "You do not have permissions to modify this collection";
783        let exists = <AdminList<T>>::contains_key(collection_id);898        let exists = <AdminList<T>>::contains_key(collection_id);
784899
785        if !is_owner {900        if !result & exists {
786            ensure!(exists, no_perm_mes);
787            ensure!(901            if <AdminList<T>>::get(collection_id).contains(&subject) {
788                <AdminList<T>>::get(collection_id).contains(&subject),
789                no_perm_mes902                result = true
790            );903            }
791        }904        }
905
906        result
907    }
908
909    fn check_owner_or_admin_permissions(collection_id: u64, subject: T::AccountId) -> DispatchResult {
910        
911        Self::collection_exists(collection_id)?;
912        let result = Self::is_owner_or_admin_permissions(collection_id, subject.clone());
913
914        ensure!(result, "You do not have permissions to modify this collection");
792        Ok(())915        Ok(())
793    }916    }
794917
812        }935        }
813    }936    }
814937
938    fn check_white_list(collection_id: u64, address: T::AccountId) -> DispatchResult {
939
940        let mes = "Address is not in white list";
941        ensure!(<WhiteList<T>>::contains_key(collection_id), mes);
942        let wl = <WhiteList<T>>::get(collection_id);
943        ensure!(wl.contains(&address.clone()), mes);
944
945        Ok(())
946    }
947
815    fn transfer_fungible(948    fn transfer_fungible(
816        collection_id: u64,949        collection_id: u64,
817        item_id: u64,950        item_id: u64,
818        value: u64,951        value: u64,
819        owner: T::AccountId,952        owner: T::AccountId,
820        new_owner: T::AccountId,953        new_owner: T::AccountId,
821    ) -> DispatchResult {954    ) -> DispatchResult {
955
956        ensure!(
957            <FungibleItemList<T>>::contains_key(collection_id, item_id),
958            "Item not exists"
959        );
960
822        let full_item = <FungibleItemList<T>>::get(collection_id, item_id);961        let full_item = <FungibleItemList<T>>::get(collection_id, item_id);
823        let amount = full_item.value;962        let amount = full_item.value;
824963
903        owner: T::AccountId,1042        owner: T::AccountId,
904        new_owner: T::AccountId,1043        new_owner: T::AccountId,
905    ) -> DispatchResult {1044    ) -> DispatchResult {
1045
1046        ensure!(
1047            <ReFungibleItemList<T>>::contains_key(collection_id, item_id),
1048            "Item not exists"
1049        );
1050
906        let full_item = <ReFungibleItemList<T>>::get(collection_id, item_id);1051        let full_item = <ReFungibleItemList<T>>::get(collection_id, item_id);
907        let item = full_item1052        let item = full_item
908            .owner1053            .owner
983        sender: T::AccountId,1128        sender: T::AccountId,
984        new_owner: T::AccountId,1129        new_owner: T::AccountId,
985    ) -> DispatchResult {1130    ) -> DispatchResult {
1131    
1132        ensure!(
1133            <NftItemList<T>>::contains_key(collection_id, item_id),
1134            "Item not exists"
1135        );
1136
986        let mut item = <NftItemList<T>>::get(collection_id, item_id);1137        let mut item = <NftItemList<T>>::get(collection_id, item_id);
9871138
988        ensure!(1139        ensure!(
1012        // reset approved list1163        // reset approved list
1013        <ApprovedList<T>>::remove(collection_id, (item_id, old_owner));1164        <ApprovedList<T>>::remove(collection_id, (item_id, old_owner));
1014        Ok(())1165        Ok(())
1166    }
1167
1168    fn init_collection(item: &CollectionType<T::AccountId>){
1169
1170                // check params
1171                assert!(item.decimal_points <= 4, "decimal_points parameter must be lower than 4");
1172                assert!(item.name.len() <= 64, "Collection name can not be longer than 63 char");
1173                assert!(item.name.len() <= 256, "Collection description can not be longer than 255 char");
1174                assert!(item.token_prefix.len() <= 16, "Token prefix can not be longer than 15 char");
1175    
1176                // Generate next collection ID
1177                let next_id = CreatedCollectionCount::get()
1178                    .checked_add(1)
1179                    .expect("collection id error");
1180    
1181                CreatedCollectionCount::put(next_id);  
1182    }
1183
1184    fn init_nft_token(item: &NftItemType<T::AccountId>){
1185
1186        let current_index = <ItemListIndex>::get(item.collection)
1187            .checked_add(1)
1188            .expect("Item list index id error");
1189
1190        let item_owner = item.owner.clone();
1191        let collection_id = item.collection.clone();
1192        Self::add_token_index(collection_id, current_index, item.owner.clone()).unwrap();
1193
1194        <ItemListIndex>::insert(collection_id, current_index);
1195
1196        // Update balance
1197        let new_balance = <Balance<T>>::get(collection_id, item_owner.clone())
1198            .checked_add(1)
1199            .unwrap();
1200        <Balance<T>>::insert(collection_id, item_owner.clone(), new_balance);
1201    }
1202
1203    fn init_fungible_token(item: &FungibleItemType<T::AccountId>){
1204
1205        let current_index = <ItemListIndex>::get(item.collection)
1206            .checked_add(1)
1207            .expect("Item list index id error");
1208        let owner = item.owner.clone();
1209        let value = item.value as u64;
1210
1211        Self::add_token_index(item.collection, current_index, owner.clone()).unwrap();
1212
1213        <ItemListIndex>::insert(item.collection, current_index);
1214
1215        // Update balance
1216        let new_balance = <Balance<T>>::get(item.collection, owner.clone())
1217            .checked_add(value)
1218            .unwrap();
1219        <Balance<T>>::insert(item.collection, owner.clone(), new_balance);
1220    }
1221
1222    fn init_refungible_token(item: &ReFungibleItemType<T::AccountId>){
1223
1224        let current_index = <ItemListIndex>::get(item.collection)
1225            .checked_add(1)
1226            .expect("Item list index id error");
1227
1228        let value = item.owner.first().unwrap().fraction as u64;
1229        let owner = item.owner.first().unwrap().owner.clone();
1230
1231        Self::add_token_index(item.collection, current_index, owner.clone()).unwrap();
1232
1233        <ItemListIndex>::insert(item.collection, current_index);
1234
1235        // Update balance
1236        let new_balance = <Balance<T>>::get(item.collection, owner.clone())
1237            .checked_add(value)
1238            .unwrap();
1239        <Balance<T>>::insert(item.collection, owner.clone(), new_balance);
1015    }1240    }
10161241
1017    fn add_token_index(collection_id: u64, item_index: u64, owner: T::AccountId) -> DispatchResult {1242    fn add_token_index(collection_id: u64, item_index: u64, owner: T::AccountId) -> DispatchResult {
10681293
1069////////////////////////////////////////////////////////////////////////////////////////////////////1294////////////////////////////////////////////////////////////////////////////////////////////////////
1070// Economic models1295// Economic models
1296// #region
10711297
1072/// Fee multiplier.1298/// Fee multiplier.
1073pub type Multiplier = FixedU128;1299pub type Multiplier = FixedU128;
1262        Ok(())1488        Ok(())
1263    }1489    }
1264}1490}
12651491// #endregion
modifiedpallets/nft/src/tests.rsdiffbeforeafterboth
--- a/pallets/nft/src/tests.rs
+++ b/pallets/nft/src/tests.rs
@@ -1,8 +1,10 @@
 // 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};
 
+// Use cases tests region
+// #region
 #[test]
 fn create_nft_item() {
     new_test_ext().execute_with(|| {
@@ -321,15 +323,16 @@
         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));
         assert_eq!(TemplateModule::approved(1, (1, 1)).len(), 1);
-        assert_ok!(TemplateModule::approve(origin1.clone(), 10, 1, 1));
+        assert_ok!(TemplateModule::approve(origin1.clone(), 3, 1, 1));
         assert_eq!(TemplateModule::approved(1, (1, 1)).len(), 2);
         assert_eq!(
             TemplateModule::approved(1, (1, 1))[0],
@@ -390,15 +393,16 @@
         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));
         assert_eq!(TemplateModule::approved(1, (1, 1)).len(), 1);
-        assert_ok!(TemplateModule::approve(origin1.clone(), 10, 1, 1));
+        assert_ok!(TemplateModule::approve(origin1.clone(), 3, 1, 1));
         assert_eq!(TemplateModule::approved(1, (1, 1)).len(), 2);
         assert_eq!(
             TemplateModule::approved(1, (1, 1))[0],
@@ -425,7 +429,7 @@
         assert_eq!(
             TemplateModule::approved(1, (1, 1))[0],
             ApprovePermissions {
-                approved: 10,
+                approved: 3,
                 amount: 100000000
             }
         );
@@ -461,15 +465,16 @@
         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));
         assert_eq!(TemplateModule::approved(1, (1, 1)).len(), 1);
-        assert_ok!(TemplateModule::approve(origin1.clone(), 10, 1, 1));
+        assert_ok!(TemplateModule::approve(origin1.clone(), 3, 1, 1));
         assert_eq!(TemplateModule::approved(1, (1, 1)).len(), 2);
         assert_eq!(
             TemplateModule::approved(1, (1, 1))[0],
@@ -496,7 +501,7 @@
         assert_eq!(
             TemplateModule::approved(1, (1, 1))[0],
             ApprovePermissions {
-                approved: 10,
+                approved: 3,
                 amount: 100000000
             }
         );
@@ -573,7 +578,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 +587,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 +618,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 +627,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 +664,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 +936,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,
@@ -942,3 +957,833 @@
         assert_eq!(TemplateModule::balance_count(1, 2), 1);
     });
 }
+
+// #endregion
+
+// Coverage tests region
+// #region
+
+#[test]
+fn owner_can_add_address_to_white_list() {
+    new_test_ext().execute_with(|| {
+        let col_name1: Vec<u16> = "Test1\0".encode_utf16().collect::<Vec<u16>>();
+        let col_desc1: Vec<u16> = "TestDescription1\0".encode_utf16().collect::<Vec<u16>>();
+        let token_prefix1: Vec<u8> = b"token_prefix1\0".to_vec();
+        let mode: CollectionMode = CollectionMode::NFT(2000);
+        let origin1 = Origin::signed(1);
+
+        assert_ok!(TemplateModule::create_collection(
+            origin1.clone(),
+            col_name1.clone(),
+            col_desc1.clone(),
+            token_prefix1.clone(),
+            mode
+        ));
+
+        assert_ok!(TemplateModule::add_to_white_list(origin1.clone(), 1, 2));
+        assert_eq!(TemplateModule::white_list(1)[0], 2);
+    });
+}
+
+#[test]
+fn admin_can_add_address_to_white_list() {
+    new_test_ext().execute_with(|| {
+        let col_name1: Vec<u16> = "Test1\0".encode_utf16().collect::<Vec<u16>>();
+        let col_desc1: Vec<u16> = "TestDescription1\0".encode_utf16().collect::<Vec<u16>>();
+        let token_prefix1: Vec<u8> = b"token_prefix1\0".to_vec();
+        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(),
+            col_desc1.clone(),
+            token_prefix1.clone(),
+            mode
+        ));
+
+        assert_ok!(TemplateModule::add_collection_admin(origin1.clone(), 1, 2));
+        assert_ok!(TemplateModule::add_to_white_list(origin2.clone(), 1, 3));
+        assert_eq!(TemplateModule::white_list(1)[0], 3);
+    });
+}
+
+#[test]
+fn nonprivileged_user_cannot_add_address_to_white_list() {
+    new_test_ext().execute_with(|| {
+        let col_name1: Vec<u16> = "Test1\0".encode_utf16().collect::<Vec<u16>>();
+        let col_desc1: Vec<u16> = "TestDescription1\0".encode_utf16().collect::<Vec<u16>>();
+        let token_prefix1: Vec<u8> = b"token_prefix1\0".to_vec();
+        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(),
+            col_desc1.clone(),
+            token_prefix1.clone(),
+            mode
+        ));
+
+        assert_noop!(TemplateModule::add_to_white_list(origin2.clone(), 1, 3), "You do not have permissions to modify this collection");
+    });
+}
+
+#[test]
+fn nobody_can_add_address_to_white_list_of_nonexisting_collection() {
+    new_test_ext().execute_with(|| {
+
+        let origin1 = Origin::signed(1);
+        assert_noop!(TemplateModule::add_to_white_list(origin1.clone(), 1, 2), "This collection does not exist");
+    });
+}
+
+#[test]
+fn nobody_can_add_address_to_white_list_of_deleted_collection() {
+    new_test_ext().execute_with(|| {
+        let col_name1: Vec<u16> = "Test1\0".encode_utf16().collect::<Vec<u16>>();
+        let col_desc1: Vec<u16> = "TestDescription1\0".encode_utf16().collect::<Vec<u16>>();
+        let token_prefix1: Vec<u8> = b"token_prefix1\0".to_vec();
+        let mode: CollectionMode = CollectionMode::NFT(2000);
+        let origin1 = Origin::signed(1);
+
+        assert_ok!(TemplateModule::create_collection(
+            origin1.clone(),
+            col_name1.clone(),
+            col_desc1.clone(),
+            token_prefix1.clone(),
+            mode
+        ));
+
+        assert_ok!(TemplateModule::destroy_collection(origin1.clone(), 1));
+        assert_noop!(TemplateModule::add_to_white_list(origin1.clone(), 1, 2), "This collection does not exist");
+    });
+}
+
+// If address is already added to white list, nothing happens
+#[test]
+fn address_is_already_added_to_white_list() {
+    new_test_ext().execute_with(|| {
+
+        let col_name1: Vec<u16> = "Test1\0".encode_utf16().collect::<Vec<u16>>();
+        let col_desc1: Vec<u16> = "TestDescription1\0".encode_utf16().collect::<Vec<u16>>();
+        let token_prefix1: Vec<u8> = b"token_prefix1\0".to_vec();
+        let mode: CollectionMode = CollectionMode::NFT(2000);
+        let origin1 = Origin::signed(1);
+
+        assert_ok!(TemplateModule::create_collection(
+            origin1.clone(),
+            col_name1.clone(),
+            col_desc1.clone(),
+            token_prefix1.clone(),
+            mode
+        ));
+
+        assert_ok!(TemplateModule::add_to_white_list(origin1.clone(), 1, 2));
+        assert_ok!(TemplateModule::add_to_white_list(origin1.clone(), 1, 2));
+        assert_eq!(TemplateModule::white_list(1)[0], 2);
+        assert_eq!(TemplateModule::white_list(1).len(), 1);
+    });
+}
+
+#[test]
+fn owner_can_remove_address_from_white_list() {
+    new_test_ext().execute_with(|| {
+        
+        let col_name1: Vec<u16> = "Test1\0".encode_utf16().collect::<Vec<u16>>();
+        let col_desc1: Vec<u16> = "TestDescription1\0".encode_utf16().collect::<Vec<u16>>();
+        let token_prefix1: Vec<u8> = b"token_prefix1\0".to_vec();
+        let mode: CollectionMode = CollectionMode::NFT(2000);
+        let origin1 = Origin::signed(1);
+
+        assert_ok!(TemplateModule::create_collection(
+            origin1.clone(),
+            col_name1.clone(),
+            col_desc1.clone(),
+            token_prefix1.clone(),
+            mode
+        ));
+
+        assert_ok!(TemplateModule::add_to_white_list(origin1.clone(), 1, 2));
+        assert_ok!(TemplateModule::remove_from_white_list(origin1.clone(), 1, 2));
+        assert_eq!(TemplateModule::white_list(1).len(), 0);
+    });
+}
+
+#[test]
+fn admin_can_remove_address_from_white_list() {
+    new_test_ext().execute_with(|| {
+
+        let col_name1: Vec<u16> = "Test1\0".encode_utf16().collect::<Vec<u16>>();
+        let col_desc1: Vec<u16> = "TestDescription1\0".encode_utf16().collect::<Vec<u16>>();
+        let token_prefix1: Vec<u8> = b"token_prefix1\0".to_vec();
+        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(),
+            col_desc1.clone(),
+            token_prefix1.clone(),
+            mode
+        ));
+
+        assert_ok!(TemplateModule::add_collection_admin(origin1.clone(), 1, 2));
+
+        assert_ok!(TemplateModule::add_to_white_list(origin1.clone(), 1, 3));
+        assert_ok!(TemplateModule::remove_from_white_list(origin2.clone(), 1, 3));
+        assert_eq!(TemplateModule::white_list(1).len(), 0);
+    });
+}
+
+#[test]
+fn nonprivileged_user_cannot_remove_address_from_white_list() {
+    new_test_ext().execute_with(|| {
+
+        let col_name1: Vec<u16> = "Test1\0".encode_utf16().collect::<Vec<u16>>();
+        let col_desc1: Vec<u16> = "TestDescription1\0".encode_utf16().collect::<Vec<u16>>();
+        let token_prefix1: Vec<u8> = b"token_prefix1\0".to_vec();
+        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(),
+            col_desc1.clone(),
+            token_prefix1.clone(),
+            mode
+        ));
+
+        assert_ok!(TemplateModule::add_to_white_list(origin1.clone(), 1, 2));
+        assert_noop!(TemplateModule::remove_from_white_list(origin2.clone(), 1, 2), "You do not have permissions to modify this collection");
+        assert_eq!(TemplateModule::white_list(1)[0], 2);
+    });
+}
+
+#[test]
+fn nobody_can_remove_address_from_white_list_of_nonexisting_collection() {
+    new_test_ext().execute_with(|| {
+
+        let origin1 = Origin::signed(1);
+        assert_noop!(TemplateModule::remove_from_white_list(origin1.clone(), 1, 2), "This collection does not exist");
+    });
+}
+
+#[test]
+fn nobody_can_remove_address_from_white_list_of_deleted_collection() {
+    new_test_ext().execute_with(|| {
+
+        let col_name1: Vec<u16> = "Test1\0".encode_utf16().collect::<Vec<u16>>();
+        let col_desc1: Vec<u16> = "TestDescription1\0".encode_utf16().collect::<Vec<u16>>();
+        let token_prefix1: Vec<u8> = b"token_prefix1\0".to_vec();
+        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(),
+            col_desc1.clone(),
+            token_prefix1.clone(),
+            mode
+        ));
+
+        assert_ok!(TemplateModule::add_to_white_list(origin1.clone(), 1, 2));
+        assert_ok!(TemplateModule::destroy_collection(origin1.clone(), 1));
+        assert_noop!(TemplateModule::remove_from_white_list(origin2.clone(), 1, 2), "This collection does not exist");
+        assert_eq!(TemplateModule::white_list(1).len(), 0);
+    });
+}
+
+// If address is already removed from white list, nothing happens
+#[test]
+fn address_is_already_removed_from_white_list() {
+    new_test_ext().execute_with(|| {
+        let col_name1: Vec<u16> = "Test1\0".encode_utf16().collect::<Vec<u16>>();
+        let col_desc1: Vec<u16> = "TestDescription1\0".encode_utf16().collect::<Vec<u16>>();
+        let token_prefix1: Vec<u8> = b"token_prefix1\0".to_vec();
+        let mode: CollectionMode = CollectionMode::NFT(2000);
+        let origin1 = Origin::signed(1);
+
+        assert_ok!(TemplateModule::create_collection(
+            origin1.clone(),
+            col_name1.clone(),
+            col_desc1.clone(),
+            token_prefix1.clone(),
+            mode
+        ));
+
+        assert_ok!(TemplateModule::add_to_white_list(origin1.clone(), 1, 2));
+        assert_ok!(TemplateModule::remove_from_white_list(origin1.clone(), 1, 2));
+        assert_ok!(TemplateModule::remove_from_white_list(origin1.clone(), 1, 2));
+        assert_eq!(TemplateModule::white_list(1).len(), 0);
+    });
+}
+
+// If Public Access mode is set to WhiteList, tokens can’t be transferred from a non-whitelisted address with transfer or transferFrom (2 tests)
+#[test]
+fn white_list_test_1() {
+    new_test_ext().execute_with(|| {
+        let col_name1: Vec<u16> = "Test1\0".encode_utf16().collect::<Vec<u16>>();
+        let col_desc1: Vec<u16> = "TestDescription1\0".encode_utf16().collect::<Vec<u16>>();
+        let token_prefix1: Vec<u8> = b"token_prefix1\0".to_vec();
+        let mode: CollectionMode = CollectionMode::NFT(2000);
+
+        let origin1 = Origin::signed(1);
+        assert_ok!(TemplateModule::create_collection(
+            origin1.clone(),
+            col_name1.clone(),
+            col_desc1.clone(),
+            token_prefix1.clone(),
+            mode
+        ));
+        assert_eq!(TemplateModule::collection(1).owner, 1);
+
+        assert_ok!(TemplateModule::create_item(
+            origin1.clone(),
+            1,
+            [1, 2, 3].to_vec(),
+            1
+        ));
+
+        assert_ok!(TemplateModule::set_public_access_mode(origin1.clone(), 1, AccessMode::WhiteList));
+        assert_ok!(TemplateModule::add_to_white_list(origin1.clone(), 1, 2));
+
+        assert_noop!(TemplateModule::transfer(
+            origin1.clone(),
+            3,
+            1,
+            1,
+            1
+        ), "Address is not in white list");
+    });
+}
+
+#[test]
+fn white_list_test_2() {
+    new_test_ext().execute_with(|| {
+        let col_name1: Vec<u16> = "Test1\0".encode_utf16().collect::<Vec<u16>>();
+        let col_desc1: Vec<u16> = "TestDescription1\0".encode_utf16().collect::<Vec<u16>>();
+        let token_prefix1: Vec<u8> = b"token_prefix1\0".to_vec();
+        let mode: CollectionMode = CollectionMode::NFT(2000);
+
+        let origin1 = Origin::signed(1);
+        assert_ok!(TemplateModule::create_collection(
+            origin1.clone(),
+            col_name1.clone(),
+            col_desc1.clone(),
+            token_prefix1.clone(),
+            mode
+        ));
+        assert_eq!(TemplateModule::collection(1).owner, 1);
+
+        assert_ok!(TemplateModule::create_item(
+            origin1.clone(),
+            1,
+            [1, 2, 3].to_vec(),
+            1
+        ));
+
+        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));
+
+        // do approve
+        assert_ok!(TemplateModule::approve(origin1.clone(), 1, 1, 1));
+        assert_eq!(TemplateModule::approved(1, (1, 1)).len(), 1);
+
+        assert_ok!(TemplateModule::remove_from_white_list(origin1.clone(), 1, 1));
+
+        assert_noop!(TemplateModule::transfer_from(
+            origin1.clone(),
+            1,
+            3,
+            1,
+            1,
+            1
+        ), "Address is not in white list");
+    });
+}
+
+// If Public Access mode is set to WhiteList, tokens can’t be transferred to a non-whitelisted address with transfer or transferFrom (2 tests)
+#[test]
+fn white_list_test_3() {
+    new_test_ext().execute_with(|| {
+        let col_name1: Vec<u16> = "Test1\0".encode_utf16().collect::<Vec<u16>>();
+        let col_desc1: Vec<u16> = "TestDescription1\0".encode_utf16().collect::<Vec<u16>>();
+        let token_prefix1: Vec<u8> = b"token_prefix1\0".to_vec();
+        let mode: CollectionMode = CollectionMode::NFT(2000);
+
+        let origin1 = Origin::signed(1);
+        assert_ok!(TemplateModule::create_collection(
+            origin1.clone(),
+            col_name1.clone(),
+            col_desc1.clone(),
+            token_prefix1.clone(),
+            mode
+        ));
+        assert_eq!(TemplateModule::collection(1).owner, 1);
+
+        assert_ok!(TemplateModule::create_item(
+            origin1.clone(),
+            1,
+            [1, 2, 3].to_vec(),
+            1
+        ));
+
+        assert_ok!(TemplateModule::set_public_access_mode(origin1.clone(), 1, AccessMode::WhiteList));
+        assert_ok!(TemplateModule::add_to_white_list(origin1.clone(), 1, 1));
+
+        assert_noop!(TemplateModule::transfer(
+            origin1.clone(),
+            3,
+            1,
+            1,
+            1
+        ), "Address is not in white list");
+    });
+}
+
+#[test]
+fn white_list_test_4() {
+    new_test_ext().execute_with(|| {
+        let col_name1: Vec<u16> = "Test1\0".encode_utf16().collect::<Vec<u16>>();
+        let col_desc1: Vec<u16> = "TestDescription1\0".encode_utf16().collect::<Vec<u16>>();
+        let token_prefix1: Vec<u8> = b"token_prefix1\0".to_vec();
+        let mode: CollectionMode = CollectionMode::NFT(2000);
+
+        let origin1 = Origin::signed(1);
+        assert_ok!(TemplateModule::create_collection(
+            origin1.clone(),
+            col_name1.clone(),
+            col_desc1.clone(),
+            token_prefix1.clone(),
+            mode
+        ));
+        assert_eq!(TemplateModule::collection(1).owner, 1);
+
+        assert_ok!(TemplateModule::create_item(
+            origin1.clone(),
+            1,
+            [1, 2, 3].to_vec(),
+            1
+        ));
+
+        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));
+
+        // do approve
+        assert_ok!(TemplateModule::approve(origin1.clone(), 1, 1, 1));
+        assert_eq!(TemplateModule::approved(1, (1, 1)).len(), 1);
+
+        assert_ok!(TemplateModule::remove_from_white_list(origin1.clone(), 1, 2));
+
+        assert_noop!(TemplateModule::transfer_from(
+            origin1.clone(),
+            1,
+            3,
+            1,
+            1,
+            1
+        ), "Address is not in white list");
+    });
+}
+
+// If Public Access mode is set to WhiteList, tokens can’t be destroyed by a non-whitelisted address (even if it owned them before enabling WhiteList mode)
+#[test]
+fn white_list_test_5() {
+    new_test_ext().execute_with(|| {
+        let col_name1: Vec<u16> = "Test1\0".encode_utf16().collect::<Vec<u16>>();
+        let col_desc1: Vec<u16> = "TestDescription1\0".encode_utf16().collect::<Vec<u16>>();
+        let token_prefix1: Vec<u8> = b"token_prefix1\0".to_vec();
+        let mode: CollectionMode = CollectionMode::NFT(2000);
+
+        let origin1 = Origin::signed(1);
+        assert_ok!(TemplateModule::create_collection(
+            origin1.clone(),
+            col_name1.clone(),
+            col_desc1.clone(),
+            token_prefix1.clone(),
+            mode
+        ));
+        assert_eq!(TemplateModule::collection(1).owner, 1);
+
+        assert_ok!(TemplateModule::create_item(
+            origin1.clone(),
+            1,
+            [1, 2, 3].to_vec(),
+            1
+        ));
+
+        assert_ok!(TemplateModule::set_public_access_mode(origin1.clone(), 1, AccessMode::WhiteList));
+        assert_noop!(TemplateModule::burn_item(origin1.clone(), 1, 1), "Address is not in white list");
+    });
+}
+
+// If Public Access mode is set to WhiteList, oken transfers can’t be Approved by a non-whitelisted address (see Approve method).
+#[test]
+fn white_list_test_6() {
+    new_test_ext().execute_with(|| {
+        let col_name1: Vec<u16> = "Test1\0".encode_utf16().collect::<Vec<u16>>();
+        let col_desc1: Vec<u16> = "TestDescription1\0".encode_utf16().collect::<Vec<u16>>();
+        let token_prefix1: Vec<u8> = b"token_prefix1\0".to_vec();
+        let mode: CollectionMode = CollectionMode::NFT(2000);
+
+        let origin1 = Origin::signed(1);
+        assert_ok!(TemplateModule::create_collection(
+            origin1.clone(),
+            col_name1.clone(),
+            col_desc1.clone(),
+            token_prefix1.clone(),
+            mode
+        ));
+        assert_ok!(TemplateModule::set_public_access_mode(origin1.clone(), 1, AccessMode::WhiteList));
+
+        // do approve
+        assert_noop!(TemplateModule::approve(origin1.clone(), 1, 1, 1), "Address is not in white list");
+    });
+}
+
+// If Public Access mode is set to WhiteList, tokens can be transferred from a whitelisted address with transfer or transferFrom (2 tests) and
+//          tokens can be transferred from a whitelisted address with transfer or transferFrom (2 tests)
+#[test]
+fn white_list_test_7() {
+    new_test_ext().execute_with(|| {
+        let col_name1: Vec<u16> = "Test1\0".encode_utf16().collect::<Vec<u16>>();
+        let col_desc1: Vec<u16> = "TestDescription1\0".encode_utf16().collect::<Vec<u16>>();
+        let token_prefix1: Vec<u8> = b"token_prefix1\0".to_vec();
+        let mode: CollectionMode = CollectionMode::NFT(2000);
+
+        let origin1 = Origin::signed(1);
+        assert_ok!(TemplateModule::create_collection(
+            origin1.clone(),
+            col_name1.clone(),
+            col_desc1.clone(),
+            token_prefix1.clone(),
+            mode
+        ));
+        assert_eq!(TemplateModule::collection(1).owner, 1);
+
+        assert_ok!(TemplateModule::create_item(
+            origin1.clone(),
+            1,
+            [1, 2, 3].to_vec(),
+            1
+        ));
+
+        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::transfer(
+            origin1.clone(),
+            2,
+            1,
+            1,
+            1
+        ));
+    });
+}
+
+#[test]
+fn white_list_test_8() {
+    new_test_ext().execute_with(|| {
+        let col_name1: Vec<u16> = "Test1\0".encode_utf16().collect::<Vec<u16>>();
+        let col_desc1: Vec<u16> = "TestDescription1\0".encode_utf16().collect::<Vec<u16>>();
+        let token_prefix1: Vec<u8> = b"token_prefix1\0".to_vec();
+        let mode: CollectionMode = CollectionMode::NFT(2000);
+
+        let origin1 = Origin::signed(1);
+        assert_ok!(TemplateModule::create_collection(
+            origin1.clone(),
+            col_name1.clone(),
+            col_desc1.clone(),
+            token_prefix1.clone(),
+            mode
+        ));
+        assert_eq!(TemplateModule::collection(1).owner, 1);
+
+        assert_ok!(TemplateModule::create_item(
+            origin1.clone(),
+            1,
+            [1, 2, 3].to_vec(),
+            1
+        ));
+
+        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));
+
+        // do approve
+        assert_ok!(TemplateModule::approve(origin1.clone(), 1, 1, 1));
+        assert_eq!(TemplateModule::approved(1, (1, 1)).len(), 1);
+
+        assert_ok!(TemplateModule::transfer_from(
+            origin1.clone(),
+            1,
+            2,
+            1,
+            1,
+            1
+        ));
+    });
+}
+
+// If Public Access mode is set to WhiteList, and Mint Permission is set to false, tokens can be created by owner.
+#[test]
+fn white_list_test_9() {
+    new_test_ext().execute_with(|| {
+        let col_name1: Vec<u16> = "Test1\0".encode_utf16().collect::<Vec<u16>>();
+        let col_desc1: Vec<u16> = "TestDescription1\0".encode_utf16().collect::<Vec<u16>>();
+        let token_prefix1: Vec<u8> = b"token_prefix1\0".to_vec();
+        let mode: CollectionMode = CollectionMode::NFT(2000);
+
+        let origin1 = Origin::signed(1);
+        assert_ok!(TemplateModule::create_collection(
+            origin1.clone(),
+            col_name1.clone(),
+            col_desc1.clone(),
+            token_prefix1.clone(),
+            mode
+        ));
+
+        assert_ok!(TemplateModule::set_public_access_mode(origin1.clone(), 1, AccessMode::WhiteList));
+        assert_ok!(TemplateModule::set_mint_permission(origin1.clone(), 1, false));
+
+        assert_ok!(TemplateModule::create_item(
+            origin1.clone(),
+            1,
+            [1, 2, 3].to_vec(),
+            1
+        ));
+    });
+}
+
+// If Public Access mode is set to WhiteList, and Mint Permission is set to false, tokens can be created by admin.
+#[test]
+fn white_list_test_10() {
+    new_test_ext().execute_with(|| {
+        let col_name1: Vec<u16> = "Test1\0".encode_utf16().collect::<Vec<u16>>();
+        let col_desc1: Vec<u16> = "TestDescription1\0".encode_utf16().collect::<Vec<u16>>();
+        let token_prefix1: Vec<u8> = b"token_prefix1\0".to_vec();
+        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(),
+            col_desc1.clone(),
+            token_prefix1.clone(),
+            mode
+        ));
+
+        assert_ok!(TemplateModule::set_public_access_mode(origin1.clone(), 1, AccessMode::WhiteList));
+        assert_ok!(TemplateModule::set_mint_permission(origin1.clone(), 1, false));
+
+        assert_ok!(TemplateModule::add_collection_admin(origin1.clone(), 1, 2));
+
+        assert_ok!(TemplateModule::create_item(
+            origin2.clone(),
+            1,
+            [1, 2, 3].to_vec(),
+            2
+        ));
+    });
+}
+
+// If Public Access mode is set to WhiteList, and Mint Permission is set to false, tokens cannot be created by non-privileged and white listed address.
+#[test]
+fn white_list_test_11() {
+    new_test_ext().execute_with(|| {
+        let col_name1: Vec<u16> = "Test1\0".encode_utf16().collect::<Vec<u16>>();
+        let col_desc1: Vec<u16> = "TestDescription1\0".encode_utf16().collect::<Vec<u16>>();
+        let token_prefix1: Vec<u8> = b"token_prefix1\0".to_vec();
+        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(),
+            col_desc1.clone(),
+            token_prefix1.clone(),
+            mode
+        ));
+
+        assert_ok!(TemplateModule::set_public_access_mode(origin1.clone(), 1, AccessMode::WhiteList));
+        assert_ok!(TemplateModule::set_mint_permission(origin1.clone(), 1, false));
+        assert_ok!(TemplateModule::add_to_white_list(origin1.clone(), 1, 2));
+
+        assert_noop!(TemplateModule::create_item(
+            origin2.clone(),
+            1,
+            [1, 2, 3].to_vec(),
+            2
+        ), "Collection is not in mint mode");
+    });
+}
+
+// If Public Access mode is set to WhiteList, and Mint Permission is set to false, tokens cannot be created by non-privileged and non-white listed address.
+#[test]
+fn white_list_test_12() {
+    new_test_ext().execute_with(|| {
+        let col_name1: Vec<u16> = "Test1\0".encode_utf16().collect::<Vec<u16>>();
+        let col_desc1: Vec<u16> = "TestDescription1\0".encode_utf16().collect::<Vec<u16>>();
+        let token_prefix1: Vec<u8> = b"token_prefix1\0".to_vec();
+        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(),
+            col_desc1.clone(),
+            token_prefix1.clone(),
+            mode
+        ));
+
+        assert_ok!(TemplateModule::set_public_access_mode(origin1.clone(), 1, AccessMode::WhiteList));
+        assert_ok!(TemplateModule::set_mint_permission(origin1.clone(), 1, false));
+
+        assert_noop!(TemplateModule::create_item(
+            origin2.clone(),
+            1,
+            [1, 2, 3].to_vec(),
+            2
+        ), "Collection is not in mint mode");
+    });
+}
+
+// If Public Access mode is set to WhiteList, and Mint Permission is set to true, tokens can be created by owner.
+#[test]
+fn white_list_test_13() {
+    new_test_ext().execute_with(|| {
+        let col_name1: Vec<u16> = "Test1\0".encode_utf16().collect::<Vec<u16>>();
+        let col_desc1: Vec<u16> = "TestDescription1\0".encode_utf16().collect::<Vec<u16>>();
+        let token_prefix1: Vec<u8> = b"token_prefix1\0".to_vec();
+        let mode: CollectionMode = CollectionMode::NFT(2000);
+
+        let origin1 = Origin::signed(1);
+        assert_ok!(TemplateModule::create_collection(
+            origin1.clone(),
+            col_name1.clone(),
+            col_desc1.clone(),
+            token_prefix1.clone(),
+            mode
+        ));
+
+        assert_ok!(TemplateModule::set_public_access_mode(origin1.clone(), 1, AccessMode::WhiteList));
+        assert_ok!(TemplateModule::set_mint_permission(origin1.clone(), 1, true));
+
+        assert_ok!(TemplateModule::create_item(
+            origin1.clone(),
+            1,
+            [1, 2, 3].to_vec(),
+            1
+        ));
+    });
+}
+
+// If Public Access mode is set to WhiteList, and Mint Permission is set to true, tokens can be created by admin.
+#[test]
+fn white_list_test_14() {
+    new_test_ext().execute_with(|| {
+        let col_name1: Vec<u16> = "Test1\0".encode_utf16().collect::<Vec<u16>>();
+        let col_desc1: Vec<u16> = "TestDescription1\0".encode_utf16().collect::<Vec<u16>>();
+        let token_prefix1: Vec<u8> = b"token_prefix1\0".to_vec();
+        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(),
+            col_desc1.clone(),
+            token_prefix1.clone(),
+            mode
+        ));
+
+        assert_ok!(TemplateModule::set_public_access_mode(origin1.clone(), 1, AccessMode::WhiteList));
+        assert_ok!(TemplateModule::set_mint_permission(origin1.clone(), 1, true));
+
+        assert_ok!(TemplateModule::add_collection_admin(origin1.clone(), 1, 2));
+
+        assert_ok!(TemplateModule::create_item(
+            origin2.clone(),
+            1,
+            [1, 2, 3].to_vec(),
+            2
+        ));
+    });
+}
+
+// If Public Access mode is set to WhiteList, and Mint Permission is set to true, tokens cannot be created by non-privileged and non-white listed address.
+#[test]
+fn white_list_test_15() {
+    new_test_ext().execute_with(|| {
+        let col_name1: Vec<u16> = "Test1\0".encode_utf16().collect::<Vec<u16>>();
+        let col_desc1: Vec<u16> = "TestDescription1\0".encode_utf16().collect::<Vec<u16>>();
+        let token_prefix1: Vec<u8> = b"token_prefix1\0".to_vec();
+        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(),
+            col_desc1.clone(),
+            token_prefix1.clone(),
+            mode
+        ));
+
+        assert_ok!(TemplateModule::set_public_access_mode(origin1.clone(), 1, AccessMode::WhiteList));
+        assert_ok!(TemplateModule::set_mint_permission(origin1.clone(), 1, true));
+
+        assert_noop!(TemplateModule::create_item(
+            origin2.clone(),
+            1,
+            [1, 2, 3].to_vec(),
+            2
+        ), "Address is not in white list");
+    });
+}
+
+// If Public Access mode is set to WhiteList, and Mint Permission is set to true, tokens can be created by non-privileged and white listed address.
+#[test]
+fn white_list_test_16() {
+    new_test_ext().execute_with(|| {
+        let col_name1: Vec<u16> = "Test1\0".encode_utf16().collect::<Vec<u16>>();
+        let col_desc1: Vec<u16> = "TestDescription1\0".encode_utf16().collect::<Vec<u16>>();
+        let token_prefix1: Vec<u8> = b"token_prefix1\0".to_vec();
+        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(),
+            col_desc1.clone(),
+            token_prefix1.clone(),
+            mode
+        ));
+
+        assert_ok!(TemplateModule::set_public_access_mode(origin1.clone(), 1, AccessMode::WhiteList));
+        assert_ok!(TemplateModule::set_mint_permission(origin1.clone(), 1, true));
+        assert_ok!(TemplateModule::add_to_white_list(origin1.clone(), 1, 2));
+
+        assert_ok!(TemplateModule::create_item(
+            origin2.clone(),
+            1,
+            [1, 2, 3].to_vec(),
+            2
+        ));
+    });
+}
+
+// #endregion
\ No newline at end of file
modifiedrun-testnet.shdiffbeforeafterboth
--- a/run-testnet.sh
+++ b/run-testnet.sh
@@ -49,6 +49,7 @@
   --rpc-port $RPCPORT \
   --name $NODE \
   --ws-external \
+  --ws-max-connections 10000 \
   --rpc-cors all \
   -lruntime \
   $BOOTNODES;
modifiedruntime/src/lib.rsdiffbeforeafterboth
--- a/runtime/src/lib.rs
+++ b/runtime/src/lib.rs
@@ -53,8 +53,10 @@
 
 pub use timestamp::Call as TimestampCall;
 
-/// Importing a nft pallet
-pub use nft;
+/// Re-export a nft pallet
+/// TODO: Check this re-export. Is this safe and good style?
+extern crate nft;
+pub use nft::*;
 
 /// An index to a block.
 pub type BlockNumber = u32;
@@ -111,7 +113,7 @@
     spec_name: create_runtime_str!("nft"),
     impl_name: create_runtime_str!("nft"),
     authoring_version: 1,
-    spec_version: 1,
+    spec_version: 2,
     impl_version: 1,
     apis: RUNTIME_API_VERSIONS,
     transaction_version: 1,
@@ -318,7 +320,7 @@
         Balances: balances::{Module, Call, Storage, Config<T>, Event<T>},
         TransactionPayment: transaction_payment::{Module, Storage},
         Sudo: sudo::{Module, Call, Config<T>, Storage, Event<T>},
-        Nft: nft::{Module, Call, Storage, Event<T>},
+        Nft: nft::{Module, Call, Config<T>, Storage, Event<T>},
     }
 );
addedtests/src/blocks-production.test.tsdiffbeforeafterboth
--- /dev/null
+++ b/tests/src/blocks-production.test.ts
@@ -0,0 +1,48 @@
+import usingApi from "./substrate/substrate-api";
+import promisifySubstrate from "./substrate/promisify-substrate";
+import { expect } from "chai";
+
+describe('Blocks Production', () => {
+  it('Node produces new blocks', async () => {
+    await usingApi(async api => {
+      const blocksPromise = promisifySubstrate(api, () => {
+        return new Promise<number[]>((resolve, reject) => {
+          const blockNumbers: number[] = [];
+          const unsubscribe = api.rpc.chain.subscribeNewHeads(async head => {
+            blockNumbers.push(head.number.toNumber());
+            if(blockNumbers.length >= 2) {
+              (await unsubscribe)();
+              resolve(blockNumbers);
+            }
+          });
+        })
+      })();
+
+      let blocks: number[] | undefined = undefined;
+
+      const timeoutPromise = new Promise<void>((resolve, reject) => {
+        let secondsPassed = 0;
+        let incrementSeconds = () => {
+          secondsPassed++;
+          if(secondsPassed > 5 * 60) {
+            reject('Block production test failed due to timeout.');
+            return;
+          }
+
+          if(blocks) {
+            resolve();
+            return;
+          }
+
+          setTimeout(incrementSeconds, 1000);
+        }
+
+        incrementSeconds();
+      });
+
+      blocks = await Promise.race([blocksPromise, timeoutPromise]) as number[];
+
+      expect(blocks[0]).to.be.lessThan(blocks[1]);
+    });
+  });
+});