git.delta.rocks / unique-network / refs/commits / b3fda41c65ef

--- a/pallets/nft/src/lib.rs
+++ b/pallets/nft/src/lib.rs
@@ -842,10 +842,14 @@
 
             let sender = ensure_signed(origin)?;
             let collection = Self::get_collection(collection_id)?;
-            Self::check_owner_or_admin_permissions(&collection, sender)?;
 
-            <WhiteList<T>>::insert(collection_id, address, true);
-            
+            Self::toggle_white_list_internal(
+                &sender,
+                &collection,
+                &address,
+                true,
+            )?;
+
             Ok(())
         }
 
@@ -867,9 +871,13 @@
 
             let sender = ensure_signed(origin)?;
             let collection = Self::get_collection(collection_id)?;
-            Self::check_owner_or_admin_permissions(&collection, sender)?;
 
-            <WhiteList<T>>::remove(collection_id, address);
+            Self::toggle_white_list_internal(
+                &sender,
+                &collection,
+                &address,
+                false,
+            )?;
 
             Ok(())
         }
@@ -1851,6 +1859,23 @@
         Ok(())
     }
 
+    pub fn toggle_white_list_internal(
+        sender: &T::AccountId,
+        collection: &CollectionHandle<T>,
+        address: &T::AccountId,
+        whitelisted: bool,
+    ) -> DispatchResult {
+        Self::check_owner_or_admin_permissions(&collection, sender.clone())?;
+
+        if whitelisted {
+            <WhiteList<T>>::insert(collection.id, address, true);
+        } else {
+            <WhiteList<T>>::remove(collection.id, address);
+        }
+
+        Ok(())
+    }
+
     fn is_correct_transfer(collection: &CollectionHandle<T>, recipient: &T::AccountId) -> DispatchResult {
         let collection_id = collection.id;
 

67    pub data: Vec<u8>,   67    pub data: Vec<u8>,   
68}68}
69
70#[derive(Debug, PartialEq, Encode, Decode)]
71pub struct NFTExtToggleWhiteList<E: Ext> {
72    pub collection_id: u32,
73    pub address: <E::T as SysConfig>::AccountId,
74    pub whitelisted: bool,
75}
6976
70/// The chain Extension of NFT pallet77/// The chain Extension of NFT pallet
71pub struct NFTExtension;78pub struct NFTExtension;
175                )?;182                )?;
176                Ok(RetVal::Converging(func_id))183                Ok(RetVal::Converging(func_id))
177            },184            },
185            6 => {
186                // Toggle whitelist
187                let mut env = env.buf_in_buf_out();
188                let input: NFTExtToggleWhiteList<E> = env.read_as()?;
189
190                let collection = pallet_nft::Module::<C>::get_collection(input.collection_id)?;
191
192                pallet_nft::Module::<C>::toggle_white_list_internal(
193                    &env.ext().address().clone(),
194                    &collection,
195                    &input.address,
196                    input.whitelisted,
197                )?;
198                Ok(RetVal::Converging(func_id))
199            }
178            _ => {200            _ => {
179                panic!("Passed unknown func_id to test chain extension: {}", func_id);201                panic!("Passed unknown func_id to test chain extension: {}", func_id);
180            }202            }