difftreelog
Merge commit 'b3fda41c65ef3d5198749d60622f0184af244734' into feature/NFTPAR-366_upstream_updates
in: master
3 files changed
pallets/nft/src/eth/mod.rsdiffbeforeafterboth117 let recipient = T::CrossAccountId::from_eth(recipient);117 let recipient = T::CrossAccountId::from_eth(recipient);118118119 <Module<T>>::transfer_internal(119 <Module<T>>::transfer_internal(120 sender,120 &sender,121 recipient,121 &recipient,122 &collection,122 &collection,123 1,123 1,124 amount,124 amount,143 let spender = T::CrossAccountId::from_eth(spender);143 let spender = T::CrossAccountId::from_eth(spender);144144145 <Module<T>>::approve_internal(145 <Module<T>>::approve_internal(146 sender,146 &sender,147 spender,147 &spender,148 &collection,148 &collection,149 1,149 1,150 amount,150 amount,160 let token_id = token_id.try_into().map_err(|_| "bad token id")?;160 let token_id = token_id.try_into().map_err(|_| "bad token id")?;161161162 <Module<T>>::approve_internal(162 <Module<T>>::approve_internal(163 sender,163 &sender,164 approved,164 &approved,165 &collection,165 &collection,166 token_id,166 token_id,167 1,167 1,176 let recipient = T::CrossAccountId::from_eth(recipient);176 let recipient = T::CrossAccountId::from_eth(recipient);177177178 <Module<T>>::transfer_from_internal(178 <Module<T>>::transfer_from_internal(179 sender,179 &sender,180 from,180 &from,181 recipient,181 &recipient,182 &collection,182 &collection,183 1,183 1,184 amount,184 amount,195 let token_id = token_id.try_into().map_err(|_| "bad token id")?;195 let token_id = token_id.try_into().map_err(|_| "bad token id")?;196196197 <Module<T>>::transfer_from_internal(197 <Module<T>>::transfer_from_internal(198 sender,198 &sender,199 from,199 &from,200 recipient,200 &recipient,201 &collection,201 &collection,202 token_id,202 token_id,203 1,203 1,pallets/nft/src/lib.rsdiffbeforeafterboth--- a/pallets/nft/src/lib.rs
+++ b/pallets/nft/src/lib.rs
@@ -870,10 +870,14 @@
let sender = T::CrossAccountId::from_sub(ensure_signed(origin)?);
let collection = Self::get_collection(collection_id)?;
- Self::check_owner_or_admin_permissions(&collection, &sender)?;
- <WhiteList<T>>::insert(collection_id, address.as_sub(), true);
-
+ Self::toggle_white_list_internal(
+ &sender,
+ &collection,
+ &address,
+ true,
+ )?;
+
Ok(())
}
@@ -895,9 +899,13 @@
let sender = T::CrossAccountId::from_sub(ensure_signed(origin)?);
let collection = Self::get_collection(collection_id)?;
- Self::check_owner_or_admin_permissions(&collection, &sender)?;
- <WhiteList<T>>::remove(collection_id, address.as_sub());
+ Self::toggle_white_list_internal(
+ &sender,
+ &collection,
+ &address,
+ false,
+ )?;
Ok(())
}
@@ -1137,16 +1145,12 @@
#[weight = <T as Config>::WeightInfo::create_item(data.len())]
#[transactional]
pub fn create_item(origin, collection_id: CollectionId, owner: T::CrossAccountId, data: CreateItemData) -> DispatchResult {
-
let sender = T::CrossAccountId::from_sub(ensure_signed(origin)?);
+ let collection = Self::get_collection(collection_id)?;
- let target_collection = Self::get_collection(collection_id)?;
+ Self::create_item_internal(&sender, &collection, &owner, data);
- Self::can_create_items_in_collection(&target_collection, &sender, &owner, 1)?;
- Self::validate_create_item_args(&target_collection, &data)?;
- Self::create_item_no_validation(&target_collection, owner, data)?;
-
- Self::submit_logs(target_collection)?;
+ Self::submit_logs(collection)?;
Ok(())
}
@@ -1178,7 +1182,7 @@
let sender = T::CrossAccountId::from_sub(ensure_signed(origin)?);
let collection = Self::get_collection(collection_id)?;
- Self::create_multiple_items_internal(sender, &collection, owner, items_data)?;
+ Self::create_multiple_items_internal(&sender, &collection, &owner, items_data)?;
Self::submit_logs(collection)?;
Ok(())
@@ -1239,7 +1243,7 @@
let sender = T::CrossAccountId::from_sub(ensure_signed(origin)?);
let collection = Self::get_collection(collection_id)?;
- Self::transfer_internal(sender, recipient, &collection, item_id, value)?;
+ Self::transfer_internal(&sender, &recipient, &collection, item_id, value)?;
Self::submit_logs(collection)?;
Ok(())
@@ -1263,11 +1267,10 @@
#[weight = <T as Config>::WeightInfo::approve()]
#[transactional]
pub fn approve(origin, spender: T::CrossAccountId, collection_id: CollectionId, item_id: TokenId, amount: u128) -> DispatchResult {
-
let sender = T::CrossAccountId::from_sub(ensure_signed(origin)?);
let collection = Self::get_collection(collection_id)?;
- Self::approve_internal(sender, spender, &collection, item_id, amount)?;
+ Self::approve_internal(&sender, &spender, &collection, item_id, amount)?;
Self::submit_logs(collection)?;
Ok(())
@@ -1295,19 +1298,15 @@
#[weight = <T as Config>::WeightInfo::transfer_from()]
#[transactional]
pub fn transfer_from(origin, from: T::CrossAccountId, recipient: T::CrossAccountId, collection_id: CollectionId, item_id: TokenId, value: u128 ) -> DispatchResult {
-
let sender = T::CrossAccountId::from_sub(ensure_signed(origin)?);
let collection = Self::get_collection(collection_id)?;
- Self::transfer_from_internal(sender, from, recipient, &collection, item_id, value)?;
+ Self::transfer_from_internal(&sender, &from, &recipient, &collection, item_id, value)?;
Self::submit_logs(collection)?;
Ok(())
}
-
// #[weight = 0]
- // pub fn safe_transfer_from(origin, collection_id: CollectionId, item_id: TokenId, new_owner: T::AccountId) -> DispatchResult {
-
// // let no_perm_mes = "You do not have permissions to modify this collection";
// // ensure!(<ApprovedList<T>>::contains_key((collection_id, item_id)), no_perm_mes);
// // let list_itm = <ApprovedList<T>>::get((collection_id, item_id));
@@ -1342,8 +1341,9 @@
) -> DispatchResult {
let sender = T::CrossAccountId::from_sub(ensure_signed(origin)?);
- let target_collection = Self::get_collection(collection_id)?;
- Self::set_variable_meta_data_internal(sender, &target_collection, item_id, data)?;
+ let collection = Self::get_collection(collection_id)?;
+
+ Self::set_variable_meta_data_internal(&sender, &collection, item_id, data)?;
Ok(())
}
@@ -1679,8 +1679,15 @@
}
impl<T: Config> Module<T> {
+ pub fn create_item_internal(sender: &T::CrossAccountId, collection: &CollectionHandle<T>, owner: &T::CrossAccountId, data: CreateItemData) -> DispatchResult {
+ Self::can_create_items_in_collection(&collection, &sender, &owner, 1)?;
+ Self::validate_create_item_args(&collection, &data)?;
+ Self::create_item_no_validation(&collection, owner, data)?;
+
+ Ok(())
+ }
- pub fn transfer_internal(sender: T::CrossAccountId, recipient: T::CrossAccountId, target_collection: &CollectionHandle<T>, item_id: TokenId, value: u128) -> DispatchResult {
+ pub fn transfer_internal(sender: &T::CrossAccountId, recipient: &T::CrossAccountId, target_collection: &CollectionHandle<T>, item_id: TokenId, value: u128) -> DispatchResult {
// Limits check
Self::is_correct_transfer(target_collection, &recipient)?;
@@ -1702,14 +1709,14 @@
_ => ()
};
- Self::deposit_event(RawEvent::Transfer(target_collection.id, item_id, sender, recipient, value));
+ Self::deposit_event(RawEvent::Transfer(target_collection.id, item_id, sender.clone(), recipient.clone(), value));
Ok(())
}
pub fn approve_internal(
- sender: T::CrossAccountId,
- spender: T::CrossAccountId,
+ sender: &T::CrossAccountId,
+ spender: &T::CrossAccountId,
collection: &CollectionHandle<T>,
item_id: TokenId,
amount: u128
@@ -1772,14 +1779,14 @@
);
}
- Self::deposit_event(RawEvent::Approved(collection.id, item_id, sender, spender, allowance));
+ Self::deposit_event(RawEvent::Approved(collection.id, item_id, sender.clone(), spender.clone(), allowance));
Ok(())
}
pub fn transfer_from_internal(
- sender: T::CrossAccountId,
- from: T::CrossAccountId,
- recipient: T::CrossAccountId,
+ sender: &T::CrossAccountId,
+ from: &T::CrossAccountId,
+ recipient: &T::CrossAccountId,
collection: &CollectionHandle<T>,
item_id: TokenId,
amount: u128,
@@ -1841,7 +1848,7 @@
}
pub fn set_variable_meta_data_internal(
- sender: T::CrossAccountId,
+ sender: &T::CrossAccountId,
collection: &CollectionHandle<T>,
item_id: TokenId,
data: Vec<u8>,
@@ -1867,9 +1874,9 @@
}
pub fn create_multiple_items_internal(
- sender: T::CrossAccountId,
+ sender: &T::CrossAccountId,
collection: &CollectionHandle<T>,
- owner: T::CrossAccountId,
+ owner: &T::CrossAccountId,
items_data: Vec<CreateItemData>,
) -> DispatchResult {
Self::can_create_items_in_collection(&collection, &sender, &owner, items_data.len() as u32)?;
@@ -1878,7 +1885,7 @@
Self::validate_create_item_args(&collection, data)?;
}
for data in &items_data {
- Self::create_item_no_validation(&collection, owner.clone(), data.clone())?;
+ Self::create_item_no_validation(&collection, owner, data.clone())?;
}
Ok(())
@@ -1914,6 +1921,23 @@
Ok(())
}
+ pub fn toggle_white_list_internal(
+ sender: &T::CrossAccountId,
+ collection: &CollectionHandle<T>,
+ address: &T::CrossAccountId,
+ whitelisted: bool,
+ ) -> DispatchResult {
+ Self::check_owner_or_admin_permissions(&collection, &sender)?;
+
+ if whitelisted {
+ <WhiteList<T>>::insert(collection.id, address.as_sub(), true);
+ } else {
+ <WhiteList<T>>::remove(collection.id, address.as_sub());
+ }
+
+ Ok(())
+ }
+
fn is_correct_transfer(collection: &CollectionHandle<T>, recipient: &T::CrossAccountId) -> DispatchResult {
let collection_id = collection.id;
@@ -1984,7 +2008,7 @@
Ok(())
}
- fn create_item_no_validation(collection: &CollectionHandle<T>, owner: T::CrossAccountId, data: CreateItemData) -> DispatchResult {
+ fn create_item_no_validation(collection: &CollectionHandle<T>, owner: &T::CrossAccountId, data: CreateItemData) -> DispatchResult {
match data
{
CreateItemData::NFT(data) => {
runtime/src/chain_extension.rsdiffbeforeafterboth--- a/runtime/src/chain_extension.rs
+++ b/runtime/src/chain_extension.rs
@@ -17,10 +17,17 @@
extern crate pallet_nft;
pub use pallet_nft::*;
-use crate::Runtime;
-use sp_runtime::AccountId32;
+use pallet_nft::CrossAccountId;
use crate::Vec;
+/// Create item parameters
+#[derive(Debug, PartialEq, Encode, Decode)]
+pub struct NFTExtCreateItem<E: Ext> {
+ pub owner: <E::T as SysConfig>::AccountId,
+ pub collection_id: u32,
+ pub data: CreateItemData,
+}
+
/// Transfer parameters
#[derive(Debug, PartialEq, Encode, Decode)]
pub struct NFTExtTransfer<E: Ext> {
@@ -30,12 +37,51 @@
pub amount: u128,
}
+#[derive(Debug, PartialEq, Encode, Decode)]
+pub struct NFTExtCreateMultipleItems<E: Ext> {
+ pub owner: <E::T as SysConfig>::AccountId,
+ pub collection_id: u32,
+ pub data: Vec<CreateItemData>,
+}
+
+#[derive(Debug, PartialEq, Encode, Decode)]
+pub struct NFTExtApprove<E: Ext> {
+ pub spender: <E::T as SysConfig>::AccountId,
+ pub collection_id: u32,
+ pub item_id: u32,
+ pub amount: u128,
+}
+
+#[derive(Debug, PartialEq, Encode, Decode)]
+pub struct NFTExtTransferFrom<E: Ext> {
+ pub owner: <E::T as SysConfig>::AccountId,
+ pub recipient: <E::T as SysConfig>::AccountId,
+ pub collection_id: u32,
+ pub item_id: u32,
+ pub amount: u128,
+}
+
+#[derive(Debug, PartialEq, Encode, Decode)]
+pub struct NFTExtSetVariableMetaData {
+ pub collection_id: u32,
+ pub item_id: u32,
+ pub data: Vec<u8>,
+}
+
+#[derive(Debug, PartialEq, Encode, Decode)]
+pub struct NFTExtToggleWhiteList<E: Ext> {
+ pub collection_id: u32,
+ pub address: <E::T as SysConfig>::AccountId,
+ pub whitelisted: bool,
+}
+
/// The chain Extension of NFT pallet
pub struct NFTExtension;
impl<C: Config> ChainExtension<C> for NFTExtension {
fn call<E: Ext>(func_id: u32, env: Environment<E, InitState>) -> Result<RetVal, DispatchError>
where
+ E: Ext<T = C>,
<E::T as SysConfig>::AccountId: UncheckedFrom<<E::T as SysConfig>::Hash> + AsRef<[u8]>,
{
// The memory of the vm stores buf in scale-codec
@@ -44,37 +90,118 @@
let mut env = env.buf_in_buf_out();
let input: NFTExtTransfer<E> = env.read_as()?;
- // Sender to AccountId32
- let mut bytes_sender: [u8; 32] = [0; 32];
- let addr_vec_sender: Vec<u8> = env.ext().caller().encode();
- for i in 0..32 {
- bytes_sender[i] = addr_vec_sender[i];
+ let collection = pallet_nft::Module::<C>::get_collection(input.collection_id)?;
+
+ match pallet_nft::Module::<C>::transfer_internal(
+ &C::CrossAccountId::from_sub(env.ext().caller().clone()),
+ &C::CrossAccountId::from_sub(input.recipient),
+ &collection,
+ input.token_id,
+ input.amount,
+ ) {
+ Ok(_) => Ok(RetVal::Converging(func_id)),
+ _ => Err(DispatchError::Other("Transfer error"))
}
- let sender = AccountId32::from(bytes_sender);
+ },
+ 1 => {
+ // Create Item
+ let mut env = env.buf_in_buf_out();
+ let input: NFTExtCreateItem<E> = env.read_as()?;
- // Recipient to AccountId32
- let mut bytes_rec: [u8; 32] = [0; 32];
- let addr_vec_rec: Vec<u8> = input.recipient.encode();
- for i in 0..32 {
- bytes_rec[i] = addr_vec_rec[i];
+ let collection = pallet_nft::Module::<C>::get_collection(input.collection_id)?;
+
+ match pallet_nft::Module::<C>::create_item_internal(
+ &C::CrossAccountId::from_sub(env.ext().address().clone()),
+ &collection,
+ &C::CrossAccountId::from_sub(input.owner),
+ input.data,
+ ) {
+ Ok(_) => Ok(RetVal::Converging(func_id)),
+ _ => Err(DispatchError::Other("CreateItem error"))
}
- let recipient = AccountId32::from(bytes_rec);
+ },
+ 2 => {
+ // Create multiple items
+ let mut env = env.buf_in_buf_out();
+ let input: NFTExtCreateMultipleItems<E> = env.read_as()?;
- let collection = pallet_nft::Module::<Runtime>::get_collection(input.collection_id)?;
+ let collection = pallet_nft::Module::<C>::get_collection(input.collection_id)?;
- match pallet_nft::Module::<Runtime>::transfer_internal(
- <Runtime as Config>::CrossAccountId::from_sub(sender),
- <Runtime as Config>::CrossAccountId::from_sub(recipient),
+ match pallet_nft::Module::<C>::create_multiple_items_internal(
+ &C::CrossAccountId::from_sub(env.ext().address().clone()),
&collection,
- input.token_id,
- input.amount,
+ &C::CrossAccountId::from_sub(input.owner),
+ input.data,
) {
Ok(_) => Ok(RetVal::Converging(func_id)),
- _ => Err(DispatchError::Other("Transfer error"))
+ _ => Err(DispatchError::Other("CreateMultipleItems error"))
}
},
- _ => {
- panic!("Passed unknown func_id to test chain extension: {}", func_id);
+ 3 => {
+ // Approve
+ let mut env = env.buf_in_buf_out();
+ let input: NFTExtApprove<E> = env.read_as()?;
+
+ let collection = pallet_nft::Module::<C>::get_collection(input.collection_id)?;
+
+ pallet_nft::Module::<C>::approve_internal(
+ &C::CrossAccountId::from_sub(env.ext().address().clone()),
+ &C::CrossAccountId::from_sub(input.spender),
+ &collection,
+ input.item_id,
+ input.amount,
+ )?;
+ Ok(RetVal::Converging(func_id))
+ },
+ 4 => {
+ // Transfer from
+ let mut env = env.buf_in_buf_out();
+ let input: NFTExtTransferFrom<E> = env.read_as()?;
+
+ let collection = pallet_nft::Module::<C>::get_collection(input.collection_id)?;
+
+ pallet_nft::Module::<C>::transfer_from_internal(
+ &C::CrossAccountId::from_sub(env.ext().address().clone()),
+ &C::CrossAccountId::from_sub(input.owner),
+ &C::CrossAccountId::from_sub(input.recipient),
+ &collection,
+ input.item_id,
+ input.amount
+ )?;
+ Ok(RetVal::Converging(func_id))
+ },
+ 5 => {
+ // Set variable metadata
+ let mut env = env.buf_in_buf_out();
+ let input: NFTExtSetVariableMetaData = env.read_as()?;
+
+ let collection = pallet_nft::Module::<C>::get_collection(input.collection_id)?;
+
+ pallet_nft::Module::<C>::set_variable_meta_data_internal(
+ &C::CrossAccountId::from_sub(env.ext().address().clone()),
+ &collection,
+ input.item_id,
+ input.data,
+ )?;
+ Ok(RetVal::Converging(func_id))
+ },
+ 6 => {
+ // Toggle whitelist
+ let mut env = env.buf_in_buf_out();
+ let input: NFTExtToggleWhiteList<E> = env.read_as()?;
+
+ let collection = pallet_nft::Module::<C>::get_collection(input.collection_id)?;
+
+ pallet_nft::Module::<C>::toggle_white_list_internal(
+ &C::CrossAccountId::from_sub(env.ext().address().clone()),
+ &collection,
+ &C::CrossAccountId::from_sub(input.address),
+ input.whitelisted,
+ )?;
+ Ok(RetVal::Converging(func_id))
+ }
+ _ => {
+ panic!("Passed unknown func_id to test chain extension: {}", func_id);
}
}
}