difftreelog
Merge commit 'b3fda41c65ef3d5198749d60622f0184af244734' into feature/NFTPAR-366_upstream_updates
in: master
3 files changed
pallets/nft/src/eth/mod.rsdiffbeforeafterboth--- a/pallets/nft/src/eth/mod.rs
+++ b/pallets/nft/src/eth/mod.rs
@@ -117,8 +117,8 @@
let recipient = T::CrossAccountId::from_eth(recipient);
<Module<T>>::transfer_internal(
- sender,
- recipient,
+ &sender,
+ &recipient,
&collection,
1,
amount,
@@ -143,8 +143,8 @@
let spender = T::CrossAccountId::from_eth(spender);
<Module<T>>::approve_internal(
- sender,
- spender,
+ &sender,
+ &spender,
&collection,
1,
amount,
@@ -160,8 +160,8 @@
let token_id = token_id.try_into().map_err(|_| "bad token id")?;
<Module<T>>::approve_internal(
- sender,
- approved,
+ &sender,
+ &approved,
&collection,
token_id,
1,
@@ -176,9 +176,9 @@
let recipient = T::CrossAccountId::from_eth(recipient);
<Module<T>>::transfer_from_internal(
- sender,
- from,
- recipient,
+ &sender,
+ &from,
+ &recipient,
&collection,
1,
amount,
@@ -195,9 +195,9 @@
let token_id = token_id.try_into().map_err(|_| "bad token id")?;
<Module<T>>::transfer_from_internal(
- sender,
- from,
- recipient,
+ &sender,
+ &from,
+ &recipient,
&collection,
token_id,
1,
pallets/nft/src/lib.rsdiffbeforeafterboth871 let sender = T::CrossAccountId::from_sub(ensure_signed(origin)?);871 let sender = T::CrossAccountId::from_sub(ensure_signed(origin)?);872 let collection = Self::get_collection(collection_id)?;872 let collection = Self::get_collection(collection_id)?;873873 Self::check_owner_or_admin_permissions(&collection, &sender)?;874 Self::toggle_white_list_internal(874875 &sender,876 &collection,875 <WhiteList<T>>::insert(collection_id, address.as_sub(), true);877 &address,876 878 true,879 )?;880877 Ok(())881 Ok(())878 }882 }896 let sender = T::CrossAccountId::from_sub(ensure_signed(origin)?);900 let sender = T::CrossAccountId::from_sub(ensure_signed(origin)?);897 let collection = Self::get_collection(collection_id)?;901 let collection = Self::get_collection(collection_id)?;902898 Self::check_owner_or_admin_permissions(&collection, &sender)?;903 Self::toggle_white_list_internal(899904 &sender,900 <WhiteList<T>>::remove(collection_id, address.as_sub());905 &collection,906 &address,907 false,908 )?;901909902 Ok(())910 Ok(())11401141 let sender = T::CrossAccountId::from_sub(ensure_signed(origin)?);1148 let sender = T::CrossAccountId::from_sub(ensure_signed(origin)?);11421143 let target_collection = Self::get_collection(collection_id)?;1149 let collection = Self::get_collection(collection_id)?;114411501145 Self::can_create_items_in_collection(&target_collection, &sender, &owner, 1)?;1151 Self::create_item_internal(&sender, &collection, &owner, data);1146 Self::validate_create_item_args(&target_collection, &data)?;1147 Self::create_item_no_validation(&target_collection, owner, data)?;114811521149 Self::submit_logs(target_collection)?;1153 Self::submit_logs(collection)?;1150 Ok(())1154 Ok(())1151 }1155 }115211561178 let sender = T::CrossAccountId::from_sub(ensure_signed(origin)?);1182 let sender = T::CrossAccountId::from_sub(ensure_signed(origin)?);1179 let collection = Self::get_collection(collection_id)?;1183 let collection = Self::get_collection(collection_id)?;118011841181 Self::create_multiple_items_internal(sender, &collection, owner, items_data)?;1185 Self::create_multiple_items_internal(&sender, &collection, &owner, items_data)?;118211861183 Self::submit_logs(collection)?;1187 Self::submit_logs(collection)?;1184 Ok(())1188 Ok(())1239 let sender = T::CrossAccountId::from_sub(ensure_signed(origin)?);1243 let sender = T::CrossAccountId::from_sub(ensure_signed(origin)?);1240 let collection = Self::get_collection(collection_id)?;1244 let collection = Self::get_collection(collection_id)?;124112451242 Self::transfer_internal(sender, recipient, &collection, item_id, value)?;1246 Self::transfer_internal(&sender, &recipient, &collection, item_id, value)?;124312471244 Self::submit_logs(collection)?;1248 Self::submit_logs(collection)?;1245 Ok(())1249 Ok(())1267 let sender = T::CrossAccountId::from_sub(ensure_signed(origin)?);1270 let sender = T::CrossAccountId::from_sub(ensure_signed(origin)?);1268 let collection = Self::get_collection(collection_id)?;1271 let collection = Self::get_collection(collection_id)?;126912721270 Self::approve_internal(sender, spender, &collection, item_id, amount)?;1273 Self::approve_internal(&sender, &spender, &collection, item_id, amount)?;127112741272 Self::submit_logs(collection)?;1275 Self::submit_logs(collection)?;1273 Ok(())1276 Ok(())1299 let sender = T::CrossAccountId::from_sub(ensure_signed(origin)?);1301 let sender = T::CrossAccountId::from_sub(ensure_signed(origin)?);1300 let collection = Self::get_collection(collection_id)?;1302 let collection = Self::get_collection(collection_id)?;130113031302 Self::transfer_from_internal(sender, from, recipient, &collection, item_id, value)?;1304 Self::transfer_from_internal(&sender, &from, &recipient, &collection, item_id, value)?;130313051304 Self::submit_logs(collection)?;1306 Self::submit_logs(collection)?;1305 Ok(())1307 Ok(())1306 }1308 }13071308 // #[weight = 0]1309 // #[weight = 0]1309 // pub fn safe_transfer_from(origin, collection_id: CollectionId, item_id: TokenId, new_owner: T::AccountId) -> DispatchResult {13101311 // // let no_perm_mes = "You do not have permissions to modify this collection";1310 // // let no_perm_mes = "You do not have permissions to modify this collection";1312 // // ensure!(<ApprovedList<T>>::contains_key((collection_id, item_id)), no_perm_mes);1311 // // ensure!(<ApprovedList<T>>::contains_key((collection_id, item_id)), no_perm_mes);1342 ) -> DispatchResult {1341 ) -> DispatchResult {1343 let sender = T::CrossAccountId::from_sub(ensure_signed(origin)?);1342 let sender = T::CrossAccountId::from_sub(ensure_signed(origin)?);1344 1343 1345 let target_collection = Self::get_collection(collection_id)?;1344 let collection = Self::get_collection(collection_id)?;13451346 Self::set_variable_meta_data_internal(sender, &target_collection, item_id, data)?;1346 Self::set_variable_meta_data_internal(&sender, &collection, item_id, data)?;134713471348 Ok(())1348 Ok(())1349 }1349 }1679}1679}168016801681impl<T: Config> Module<T> {1681impl<T: Config> Module<T> {1682 pub fn create_item_internal(sender: &T::CrossAccountId, collection: &CollectionHandle<T>, owner: &T::CrossAccountId, data: CreateItemData) -> DispatchResult {1683 Self::can_create_items_in_collection(&collection, &sender, &owner, 1)?;1684 Self::validate_create_item_args(&collection, &data)?;1685 Self::create_item_no_validation(&collection, owner, data)?;16861687 Ok(())1688 }168216891683 pub fn transfer_internal(sender: T::CrossAccountId, recipient: T::CrossAccountId, target_collection: &CollectionHandle<T>, item_id: TokenId, value: u128) -> DispatchResult {1690 pub fn transfer_internal(sender: &T::CrossAccountId, recipient: &T::CrossAccountId, target_collection: &CollectionHandle<T>, item_id: TokenId, value: u128) -> DispatchResult {1684 // Limits check1691 // Limits check1685 Self::is_correct_transfer(target_collection, &recipient)?;1692 Self::is_correct_transfer(target_collection, &recipient)?;168616931702 _ => ()1709 _ => ()1703 };1710 };170417111705 Self::deposit_event(RawEvent::Transfer(target_collection.id, item_id, sender, recipient, value));1712 Self::deposit_event(RawEvent::Transfer(target_collection.id, item_id, sender.clone(), recipient.clone(), value));170617131707 Ok(())1714 Ok(())1708 }1715 }170917161710 pub fn approve_internal(1717 pub fn approve_internal(1711 sender: T::CrossAccountId,1718 sender: &T::CrossAccountId,1712 spender: T::CrossAccountId,1719 spender: &T::CrossAccountId,1713 collection: &CollectionHandle<T>,1720 collection: &CollectionHandle<T>,1714 item_id: TokenId,1721 item_id: TokenId,1715 amount: u1281722 amount: u1281772 );1779 );1773 }1780 }177417811775 Self::deposit_event(RawEvent::Approved(collection.id, item_id, sender, spender, allowance));1782 Self::deposit_event(RawEvent::Approved(collection.id, item_id, sender.clone(), spender.clone(), allowance));1776 Ok(())1783 Ok(())1777 }1784 }177817851779 pub fn transfer_from_internal(1786 pub fn transfer_from_internal(1780 sender: T::CrossAccountId,1787 sender: &T::CrossAccountId,1781 from: T::CrossAccountId,1788 from: &T::CrossAccountId,1782 recipient: T::CrossAccountId,1789 recipient: &T::CrossAccountId,1783 collection: &CollectionHandle<T>,1790 collection: &CollectionHandle<T>,1784 item_id: TokenId,1791 item_id: TokenId,1785 amount: u128,1792 amount: u128,1841 }1848 }184218491843 pub fn set_variable_meta_data_internal(1850 pub fn set_variable_meta_data_internal(1844 sender: T::CrossAccountId,1851 sender: &T::CrossAccountId,1845 collection: &CollectionHandle<T>, 1852 collection: &CollectionHandle<T>, 1846 item_id: TokenId,1853 item_id: TokenId,1847 data: Vec<u8>,1854 data: Vec<u8>,1867 }1874 }186818751869 pub fn create_multiple_items_internal(1876 pub fn create_multiple_items_internal(1870 sender: T::CrossAccountId,1877 sender: &T::CrossAccountId,1871 collection: &CollectionHandle<T>,1878 collection: &CollectionHandle<T>,1872 owner: T::CrossAccountId,1879 owner: &T::CrossAccountId,1873 items_data: Vec<CreateItemData>,1880 items_data: Vec<CreateItemData>,1874 ) -> DispatchResult {1881 ) -> DispatchResult {1875 Self::can_create_items_in_collection(&collection, &sender, &owner, items_data.len() as u32)?;1882 Self::can_create_items_in_collection(&collection, &sender, &owner, items_data.len() as u32)?;1878 Self::validate_create_item_args(&collection, data)?;1885 Self::validate_create_item_args(&collection, data)?;1879 }1886 }1880 for data in &items_data {1887 for data in &items_data {1881 Self::create_item_no_validation(&collection, owner.clone(), data.clone())?;1888 Self::create_item_no_validation(&collection, owner, data.clone())?;1882 }1889 }188318901884 Ok(())1891 Ok(())1914 Ok(())1921 Ok(())1915 }1922 }19231924 pub fn toggle_white_list_internal(1925 sender: &T::CrossAccountId,1926 collection: &CollectionHandle<T>,1927 address: &T::CrossAccountId,1928 whitelisted: bool,1929 ) -> DispatchResult {1930 Self::check_owner_or_admin_permissions(&collection, &sender)?;19311932 if whitelisted {1933 <WhiteList<T>>::insert(collection.id, address.as_sub(), true);1934 } else {1935 <WhiteList<T>>::remove(collection.id, address.as_sub());1936 }19371938 Ok(())1939 }191619401917 fn is_correct_transfer(collection: &CollectionHandle<T>, recipient: &T::CrossAccountId) -> DispatchResult {1941 fn is_correct_transfer(collection: &CollectionHandle<T>, recipient: &T::CrossAccountId) -> DispatchResult {1918 let collection_id = collection.id;1942 let collection_id = collection.id;1984 Ok(())2008 Ok(())1985 }2009 }198620101987 fn create_item_no_validation(collection: &CollectionHandle<T>, owner: T::CrossAccountId, data: CreateItemData) -> DispatchResult {2011 fn create_item_no_validation(collection: &CollectionHandle<T>, owner: &T::CrossAccountId, data: CreateItemData) -> DispatchResult {1988 match data2012 match data1989 {2013 {1990 CreateItemData::NFT(data) => {2014 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);
}
}
}