difftreelog
feat add/remove from white list chain extension
in: master
2 files changed
pallets/nft/src/lib.rsdiffbeforeafterboth--- 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;
runtime/src/chain_extension.rsdiffbeforeafterboth1//! NFT Chain Extension23//4// This file is subject to the terms and conditions defined in5// file 'LICENSE', which is part of this source code package.6//78use codec::{Decode, Encode};910pub use pallet_contracts::chain_extension::RetVal;11use pallet_contracts::chain_extension::{12 ChainExtension, Environment, Ext, InitState, SysConfig, UncheckedFrom,13};1415pub use frame_support::debug;16use frame_support::dispatch::DispatchError;1718extern crate pallet_nft;19pub use pallet_nft::*;20use crate::Vec;2122/// Create item parameters23#[derive(Debug, PartialEq, Encode, Decode)]24pub struct NFTExtCreateItem<E: Ext> {25 pub owner: <E::T as SysConfig>::AccountId,26 pub collection_id: u32,27 pub data: CreateItemData,28}2930/// Transfer parameters31#[derive(Debug, PartialEq, Encode, Decode)]32pub struct NFTExtTransfer<E: Ext> {33 pub recipient: <E::T as SysConfig>::AccountId,34 pub collection_id: u32,35 pub token_id: u32,36 pub amount: u128,37}3839#[derive(Debug, PartialEq, Encode, Decode)]40pub struct NFTExtCreateMultipleItems<E: Ext> {41 pub owner: <E::T as SysConfig>::AccountId,42 pub collection_id: u32,43 pub data: Vec<CreateItemData>,44}4546#[derive(Debug, PartialEq, Encode, Decode)]47pub struct NFTExtApprove<E: Ext> {48 pub spender: <E::T as SysConfig>::AccountId,49 pub collection_id: u32,50 pub item_id: u32,51 pub amount: u128,52}5354#[derive(Debug, PartialEq, Encode, Decode)]55pub struct NFTExtTransferFrom<E: Ext> {56 pub owner: <E::T as SysConfig>::AccountId,57 pub recipient: <E::T as SysConfig>::AccountId,58 pub collection_id: u32,59 pub item_id: u32,60 pub amount: u128,61}6263#[derive(Debug, PartialEq, Encode, Decode)]64pub struct NFTExtSetVariableMetaData {65 pub collection_id: u32,66 pub item_id: u32,67 pub data: Vec<u8>, 68}6970/// The chain Extension of NFT pallet71pub struct NFTExtension;7273impl<C: Config> ChainExtension<C> for NFTExtension {74 fn call<E: Ext>(func_id: u32, env: Environment<E, InitState>) -> Result<RetVal, DispatchError>75 where76 E: Ext<T = C>,77 <E::T as SysConfig>::AccountId: UncheckedFrom<<E::T as SysConfig>::Hash> + AsRef<[u8]>,78 {79 // The memory of the vm stores buf in scale-codec80 match func_id {81 0 => {82 let mut env = env.buf_in_buf_out();83 let input: NFTExtTransfer<E> = env.read_as()?;8485 let collection = pallet_nft::Module::<C>::get_collection(input.collection_id)?;8687 match pallet_nft::Module::<C>::transfer_internal(88 env.ext().caller().clone(),89 input.recipient,90 &collection,91 input.token_id,92 input.amount,93 ) {94 Ok(_) => Ok(RetVal::Converging(func_id)),95 _ => Err(DispatchError::Other("Transfer error"))96 }97 },98 1 => {99 // Create Item100 let mut env = env.buf_in_buf_out();101 let input: NFTExtCreateItem<E> = env.read_as()?;102103 match pallet_nft::Module::<C>::create_item_internal(104 env.ext().address().clone(),105 input.collection_id,106 input.owner,107 input.data,108 ) {109 Ok(_) => Ok(RetVal::Converging(func_id)),110 _ => Err(DispatchError::Other("CreateItem error"))111 }112 },113 2 => {114 // Create multiple items115 let mut env = env.buf_in_buf_out();116 let input: NFTExtCreateMultipleItems<E> = env.read_as()?;117118 let collection = pallet_nft::Module::<C>::get_collection(input.collection_id)?;119120 match pallet_nft::Module::<C>::create_multiple_items_internal(121 env.ext().address().clone(),122 &collection,123 input.owner,124 input.data,125 ) {126 Ok(_) => Ok(RetVal::Converging(func_id)),127 _ => Err(DispatchError::Other("CreateMultipleItems error"))128 }129 },130 3 => {131 // Approve132 let mut env = env.buf_in_buf_out();133 let input: NFTExtApprove<E> = env.read_as()?;134135 let collection = pallet_nft::Module::<C>::get_collection(input.collection_id)?;136137 pallet_nft::Module::<C>::approve_internal(138 env.ext().address().clone(),139 input.spender,140 &collection,141 input.item_id,142 input.amount,143 )?;144 Ok(RetVal::Converging(func_id))145 },146 4 => {147 // Transfer from148 let mut env = env.buf_in_buf_out();149 let input: NFTExtTransferFrom<E> = env.read_as()?;150151 let collection = pallet_nft::Module::<C>::get_collection(input.collection_id)?;152153 pallet_nft::Module::<C>::transfer_from_internal(154 env.ext().address().clone(),155 input.owner,156 input.recipient,157 &collection,158 input.item_id,159 input.amount160 )?;161 Ok(RetVal::Converging(func_id))162 },163 5 => {164 // Set variable metadata165 let mut env = env.buf_in_buf_out();166 let input: NFTExtSetVariableMetaData = env.read_as()?;167168 let collection = pallet_nft::Module::<C>::get_collection(input.collection_id)?;169170 pallet_nft::Module::<C>::set_variable_meta_data_internal(171 env.ext().address().clone(),172 &collection,173 input.item_id,174 input.data,175 )?;176 Ok(RetVal::Converging(func_id))177 },178 _ => {179 panic!("Passed unknown func_id to test chain extension: {}", func_id);180 }181 }182 }183}1//! NFT Chain Extension23//4// This file is subject to the terms and conditions defined in5// file 'LICENSE', which is part of this source code package.6//78use codec::{Decode, Encode};910pub use pallet_contracts::chain_extension::RetVal;11use pallet_contracts::chain_extension::{12 ChainExtension, Environment, Ext, InitState, SysConfig, UncheckedFrom,13};1415pub use frame_support::debug;16use frame_support::dispatch::DispatchError;1718extern crate pallet_nft;19pub use pallet_nft::*;20use crate::Vec;2122/// Create item parameters23#[derive(Debug, PartialEq, Encode, Decode)]24pub struct NFTExtCreateItem<E: Ext> {25 pub owner: <E::T as SysConfig>::AccountId,26 pub collection_id: u32,27 pub data: CreateItemData,28}2930/// Transfer parameters31#[derive(Debug, PartialEq, Encode, Decode)]32pub struct NFTExtTransfer<E: Ext> {33 pub recipient: <E::T as SysConfig>::AccountId,34 pub collection_id: u32,35 pub token_id: u32,36 pub amount: u128,37}3839#[derive(Debug, PartialEq, Encode, Decode)]40pub struct NFTExtCreateMultipleItems<E: Ext> {41 pub owner: <E::T as SysConfig>::AccountId,42 pub collection_id: u32,43 pub data: Vec<CreateItemData>,44}4546#[derive(Debug, PartialEq, Encode, Decode)]47pub struct NFTExtApprove<E: Ext> {48 pub spender: <E::T as SysConfig>::AccountId,49 pub collection_id: u32,50 pub item_id: u32,51 pub amount: u128,52}5354#[derive(Debug, PartialEq, Encode, Decode)]55pub struct NFTExtTransferFrom<E: Ext> {56 pub owner: <E::T as SysConfig>::AccountId,57 pub recipient: <E::T as SysConfig>::AccountId,58 pub collection_id: u32,59 pub item_id: u32,60 pub amount: u128,61}6263#[derive(Debug, PartialEq, Encode, Decode)]64pub struct NFTExtSetVariableMetaData {65 pub collection_id: u32,66 pub item_id: u32,67 pub data: Vec<u8>, 68}6970#[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}7677/// The chain Extension of NFT pallet78pub struct NFTExtension;7980impl<C: Config> ChainExtension<C> for NFTExtension {81 fn call<E: Ext>(func_id: u32, env: Environment<E, InitState>) -> Result<RetVal, DispatchError>82 where83 E: Ext<T = C>,84 <E::T as SysConfig>::AccountId: UncheckedFrom<<E::T as SysConfig>::Hash> + AsRef<[u8]>,85 {86 // The memory of the vm stores buf in scale-codec87 match func_id {88 0 => {89 let mut env = env.buf_in_buf_out();90 let input: NFTExtTransfer<E> = env.read_as()?;9192 let collection = pallet_nft::Module::<C>::get_collection(input.collection_id)?;9394 match pallet_nft::Module::<C>::transfer_internal(95 env.ext().caller().clone(),96 input.recipient,97 &collection,98 input.token_id,99 input.amount,100 ) {101 Ok(_) => Ok(RetVal::Converging(func_id)),102 _ => Err(DispatchError::Other("Transfer error"))103 }104 },105 1 => {106 // Create Item107 let mut env = env.buf_in_buf_out();108 let input: NFTExtCreateItem<E> = env.read_as()?;109110 match pallet_nft::Module::<C>::create_item_internal(111 env.ext().address().clone(),112 input.collection_id,113 input.owner,114 input.data,115 ) {116 Ok(_) => Ok(RetVal::Converging(func_id)),117 _ => Err(DispatchError::Other("CreateItem error"))118 }119 },120 2 => {121 // Create multiple items122 let mut env = env.buf_in_buf_out();123 let input: NFTExtCreateMultipleItems<E> = env.read_as()?;124125 let collection = pallet_nft::Module::<C>::get_collection(input.collection_id)?;126127 match pallet_nft::Module::<C>::create_multiple_items_internal(128 env.ext().address().clone(),129 &collection,130 input.owner,131 input.data,132 ) {133 Ok(_) => Ok(RetVal::Converging(func_id)),134 _ => Err(DispatchError::Other("CreateMultipleItems error"))135 }136 },137 3 => {138 // Approve139 let mut env = env.buf_in_buf_out();140 let input: NFTExtApprove<E> = env.read_as()?;141142 let collection = pallet_nft::Module::<C>::get_collection(input.collection_id)?;143144 pallet_nft::Module::<C>::approve_internal(145 env.ext().address().clone(),146 input.spender,147 &collection,148 input.item_id,149 input.amount,150 )?;151 Ok(RetVal::Converging(func_id))152 },153 4 => {154 // Transfer from155 let mut env = env.buf_in_buf_out();156 let input: NFTExtTransferFrom<E> = env.read_as()?;157158 let collection = pallet_nft::Module::<C>::get_collection(input.collection_id)?;159160 pallet_nft::Module::<C>::transfer_from_internal(161 env.ext().address().clone(),162 input.owner,163 input.recipient,164 &collection,165 input.item_id,166 input.amount167 )?;168 Ok(RetVal::Converging(func_id))169 },170 5 => {171 // Set variable metadata172 let mut env = env.buf_in_buf_out();173 let input: NFTExtSetVariableMetaData = env.read_as()?;174175 let collection = pallet_nft::Module::<C>::get_collection(input.collection_id)?;176177 pallet_nft::Module::<C>::set_variable_meta_data_internal(178 env.ext().address().clone(),179 &collection,180 input.item_id,181 input.data,182 )?;183 Ok(RetVal::Converging(func_id))184 },185 6 => {186 // Toggle whitelist187 let mut env = env.buf_in_buf_out();188 let input: NFTExtToggleWhiteList<E> = env.read_as()?;189190 let collection = pallet_nft::Module::<C>::get_collection(input.collection_id)?;191192 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 }200 _ => {201 panic!("Passed unknown func_id to test chain extension: {}", func_id);202 }203 }204 }205}