git.delta.rocks / unique-network / refs/commits / 13a0a851fa96

difftreelog

feat set_variable_meta_data chain extension

Yaroslav Bolyukin2021-05-06parent: #3c083fe.patch.diff
in: master

2 files changed

modifiedpallets/nft/src/lib.rsdiffbeforeafterboth
--- a/pallets/nft/src/lib.rs
+++ b/pallets/nft/src/lib.rs
@@ -1334,23 +1334,9 @@
         ) -> DispatchResult {
             let sender = ensure_signed(origin)?;
             
-            let target_collection = Self::get_collection(collection_id)?;
-            Self::token_exists(&target_collection, item_id)?;
-
-            ensure!(ChainLimit::get().custom_data_limit >= data.len() as u32, Error::<T>::TokenVariableDataLimitExceeded);
-
-            // Modify permissions check
-            ensure!(Self::is_item_owner(sender.clone(), &target_collection, item_id) ||
-                Self::is_owner_or_admin_permissions(&target_collection, sender.clone()),
-                Error::<T>::NoPermission);
+            let collection = Self::get_collection(collection_id)?;
 
-            match target_collection.mode
-            {
-                CollectionMode::NFT => Self::set_nft_variable_data(&target_collection, item_id, data)?,
-                CollectionMode::ReFungible  => Self::set_re_fungible_variable_data(&target_collection, item_id, data)?,
-                CollectionMode::Fungible(_) => fail!(Error::<T>::CantStoreMetadataInFungibleTokens),
-                _ => fail!(Error::<T>::UnexpectedCollectionType)
-            };
+            Self::set_variable_meta_data_internal(sender, &collection, item_id, data)?;
 
             Ok(())
         }
@@ -1821,6 +1807,32 @@
 		Ok(())
 	}
 
+    pub fn set_variable_meta_data_internal(
+        sender: T::AccountId,
+        collection: &CollectionHandle<T>, 
+        item_id: TokenId,
+        data: Vec<u8>,
+    ) -> DispatchResult {
+        Self::token_exists(&collection, item_id)?;
+
+        ensure!(ChainLimit::get().custom_data_limit >= data.len() as u32, Error::<T>::TokenVariableDataLimitExceeded);
+
+        // Modify permissions check
+        ensure!(Self::is_item_owner(sender.clone(), &collection, item_id) ||
+            Self::is_owner_or_admin_permissions(&collection, sender.clone()),
+            Error::<T>::NoPermission);
+
+        match collection.mode
+        {
+            CollectionMode::NFT => Self::set_nft_variable_data(&collection, item_id, data)?,
+            CollectionMode::ReFungible  => Self::set_re_fungible_variable_data(&collection, item_id, data)?,
+            CollectionMode::Fungible(_) => fail!(Error::<T>::CantStoreMetadataInFungibleTokens),
+            _ => fail!(Error::<T>::UnexpectedCollectionType)
+        };
+
+        Ok(())
+    }
+
     pub fn create_multiple_items_internal(
         sender: T::AccountId,
         collection: &CollectionHandle<T>,
modifiedruntime/src/chain_extension.rsdiffbeforeafterboth
before · runtime/src/chain_extension.rs
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/// The chain Extension of NFT pallet64pub struct NFTExtension;6566impl<C: Config> ChainExtension<C> for NFTExtension {67    fn call<E: Ext>(func_id: u32, env: Environment<E, InitState>) -> Result<RetVal, DispatchError>68    where69        E: Ext<T = C>,70        <E::T as SysConfig>::AccountId: UncheckedFrom<<E::T as SysConfig>::Hash> + AsRef<[u8]>,71    {72        // The memory of the vm stores buf in scale-codec73        match func_id {74            0 => {75                let mut env = env.buf_in_buf_out();76                let input: NFTExtTransfer<E> = env.read_as()?;7778                let collection = pallet_nft::Module::<C>::get_collection(input.collection_id)?;7980                match pallet_nft::Module::<C>::transfer_internal(81                    env.ext().caller().clone(),82                    input.recipient,83                    &collection,84                    input.token_id,85                    input.amount,86                ) {87                    Ok(_) => Ok(RetVal::Converging(func_id)),88                    _ => Err(DispatchError::Other("Transfer error"))89                }90            },91            1 => {92                // Create Item93                let mut env = env.buf_in_buf_out();94                let input: NFTExtCreateItem<E> = env.read_as()?;9596                match pallet_nft::Module::<C>::create_item_internal(97                    env.ext().address().clone(),98                    input.collection_id,99                    input.owner,100                    input.data,101                ) {102                    Ok(_) => Ok(RetVal::Converging(func_id)),103                    _ => Err(DispatchError::Other("CreateItem error"))104                }105            },106            2 => {107                // Create multiple items108                let mut env = env.buf_in_buf_out();109                let input: NFTExtCreateMultipleItems<E> = env.read_as()?;110111                let collection = pallet_nft::Module::<C>::get_collection(input.collection_id)?;112113                match pallet_nft::Module::<C>::create_multiple_items_internal(114                    env.ext().address().clone(),115                    &collection,116                    input.owner,117                    input.data,118                ) {119                    Ok(_) => Ok(RetVal::Converging(func_id)),120                    _ => Err(DispatchError::Other("CreateMultipleItems error"))121                }122            },123            3 => {124                // Approve125                let mut env = env.buf_in_buf_out();126                let input: NFTExtApprove<E> = env.read_as()?;127128                let collection = pallet_nft::Module::<C>::get_collection(input.collection_id)?;129130                pallet_nft::Module::<C>::approve_internal(131                    env.ext().address().clone(),132                    input.spender,133                    &collection,134                    input.item_id,135                    input.amount,136                )?;137                Ok(RetVal::Converging(func_id))138            },139            4 => {140                // Transfer from141                let mut env = env.buf_in_buf_out();142                let input: NFTExtTransferFrom<E> = env.read_as()?;143144                let collection = pallet_nft::Module::<C>::get_collection(input.collection_id)?;145146                pallet_nft::Module::<C>::transfer_from_internal(147                    env.ext().address().clone(),148                    input.owner,149                    input.recipient,150                    &collection,151                    input.item_id,152                    input.amount153                )?;154                Ok(RetVal::Converging(func_id))155            },156            _ => {157                panic!("Passed unknown func_id to test chain extension: {}", func_id);158            }159        }160    }161}
after · runtime/src/chain_extension.rs
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/// 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}