git.delta.rocks / unique-network / refs/commits / 4afba3743846

difftreelog

add `collectionComtractAddress` funtion to `CollectionHelpers` interface

PraetorP2022-11-28parent: #b7593be.patch.diff
in: master

13 files changed

modifiedpallets/fungible/src/stubs/UniqueFungible.rawdiffbeforeafterboth

binary blob — no preview

modifiedpallets/nonfungible/src/erc.rsdiffbeforeafterboth
--- a/pallets/nonfungible/src/erc.rs
+++ b/pallets/nonfungible/src/erc.rs
@@ -490,8 +490,8 @@
 		// TODO: Not implemetable
 		Err("not implemented".into())
 	}
-	
-	/// @notice Returns collection helper contract address 
+
+	/// @notice Returns collection helper contract address
 	fn collection_helper_address(&self) -> Result<address> {
 		Ok(T::ContractAddress::get())
 	}
modifiedpallets/nonfungible/src/stubs/UniqueNFT.rawdiffbeforeafterboth

binary blob — no preview

modifiedpallets/refungible/src/erc.rsdiffbeforeafterboth
--- a/pallets/refungible/src/erc.rs
+++ b/pallets/refungible/src/erc.rs
@@ -482,7 +482,7 @@
 		// TODO: Not implemetable
 		Err("not implemented".into())
 	}
-	
+
 	/// @notice Returns collection helper contract address
 	fn collection_helper_address(&self) -> Result<address> {
 		Ok(T::ContractAddress::get())
modifiedpallets/refungible/src/stubs/UniqueRefungible.rawdiffbeforeafterboth

binary blob — no preview

modifiedpallets/unique/src/eth/mod.rsdiffbeforeafterboth
before · pallets/unique/src/eth/mod.rs
1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617//! Implementation of CollectionHelpers contract.1819use core::marker::PhantomData;20use ethereum as _;21use evm_coder::{22	abi::AbiType, execution::*, generate_stubgen, solidity, solidity_interface, types::*, weight,23};24use frame_support::traits::Get;25use crate::Pallet;2627use pallet_common::{28	CollectionById,29	dispatch::CollectionDispatch,30	erc::{CollectionHelpersEvents, static_property::key},31	Pallet as PalletCommon,32};33use pallet_evm::{account::CrossAccountId, OnMethodCall, PrecompileHandle, PrecompileResult};34use pallet_evm_coder_substrate::{dispatch_to_evm, SubstrateRecorder, WithRecorder};35use sp_std::vec;36use up_data_structs::{37	CollectionDescription, CollectionMode, CollectionName, CollectionTokenPrefix,38	CreateCollectionData,39};4041use crate::{weights::WeightInfo, Config, SelfWeightOf};4243use alloc::format;44use sp_std::vec::Vec;4546/// See [`CollectionHelpersCall`]47pub struct EvmCollectionHelpers<T: Config>(SubstrateRecorder<T>);48impl<T: Config> WithRecorder<T> for EvmCollectionHelpers<T> {49	fn recorder(&self) -> &SubstrateRecorder<T> {50		&self.051	}5253	fn into_recorder(self) -> SubstrateRecorder<T> {54		self.055	}56}5758fn convert_data<T: Config>(59	caller: caller,60	name: string,61	description: string,62	token_prefix: string,63) -> Result<(64	T::CrossAccountId,65	CollectionName,66	CollectionDescription,67	CollectionTokenPrefix,68)> {69	let caller = T::CrossAccountId::from_eth(caller);70	let name = name71		.encode_utf16()72		.collect::<Vec<u16>>()73		.try_into()74		.map_err(|_| error_field_too_long(stringify!(name), CollectionName::bound()))?;75	let description = description76		.encode_utf16()77		.collect::<Vec<u16>>()78		.try_into()79		.map_err(|_| {80			error_field_too_long(stringify!(description), CollectionDescription::bound())81		})?;82	let token_prefix = token_prefix.into_bytes().try_into().map_err(|_| {83		error_field_too_long(stringify!(token_prefix), CollectionTokenPrefix::bound())84	})?;85	Ok((caller, name, description, token_prefix))86}8788#[inline(always)]89fn create_collection_internal<T: Config>(90	caller: caller,91	value: value,92	name: string,93	collection_mode: CollectionMode,94	description: string,95	token_prefix: string,96) -> Result<address> {97	let (caller, name, description, token_prefix) =98		convert_data::<T>(caller, name, description, token_prefix)?;99	let data = CreateCollectionData {100		name,101		mode: collection_mode,102		description,103		token_prefix,104		..Default::default()105	};106	check_sent_amount_equals_collection_creation_price::<T>(value)?;107	let collection_helpers_address =108		T::CrossAccountId::from_eth(<T as pallet_common::Config>::ContractAddress::get());109110	let collection_id = T::CollectionDispatch::create(111		caller.clone(),112		collection_helpers_address,113		data,114		Default::default(),115	)116	.map_err(pallet_evm_coder_substrate::dispatch_to_evm::<T>)?;117	let address = pallet_common::eth::collection_id_to_address(collection_id);118	Ok(address)119}120121fn check_sent_amount_equals_collection_creation_price<T: Config>(value: value) -> Result<()> {122	let value = value.as_u128();123	let creation_price: u128 = T::CollectionCreationPrice::get()124		.try_into()125		.map_err(|_| ()) // workaround for `expect` requiring `Debug` trait126		.expect("Collection creation price should be convertible to u128");127	if value != creation_price {128		return Err(format!(129			"Sent amount not equals to collection creation price ({0})",130			creation_price131		)132		.into());133	}134	Ok(())135}136137/// @title Contract, which allows users to operate with collections138#[solidity_interface(name = CollectionHelpers, events(CollectionHelpersEvents))]139impl<T> EvmCollectionHelpers<T>140where141	T: Config + pallet_common::Config + pallet_nonfungible::Config + pallet_refungible::Config,142{143	/// Create an NFT collection144	/// @param name Name of the collection145	/// @param description Informative description of the collection146	/// @param tokenPrefix Token prefix to represent the collection tokens in UI and user applications147	/// @return address Address of the newly created collection148	#[weight(<SelfWeightOf<T>>::create_collection())]149	#[solidity(rename_selector = "createNFTCollection")]150	fn create_nft_collection(151		&mut self,152		caller: caller,153		value: value,154		name: string,155		description: string,156		token_prefix: string,157	) -> Result<address> {158		let (caller, name, description, token_prefix) =159			convert_data::<T>(caller, name, description, token_prefix)?;160		let data = CreateCollectionData {161			name,162			mode: CollectionMode::NFT,163			description,164			token_prefix,165			..Default::default()166		};167		check_sent_amount_equals_collection_creation_price::<T>(value)?;168		let collection_helpers_address =169			T::CrossAccountId::from_eth(<T as pallet_common::Config>::ContractAddress::get());170		let collection_id = T::CollectionDispatch::create(171			caller,172			collection_helpers_address,173			data,174			Default::default(),175		)176		.map_err(dispatch_to_evm::<T>)?;177178		let address = pallet_common::eth::collection_id_to_address(collection_id);179		Ok(address)180	}181	/// Create an NFT collection182	/// @param name Name of the collection183	/// @param description Informative description of the collection184	/// @param tokenPrefix Token prefix to represent the collection tokens in UI and user applications185	/// @return address Address of the newly created collection186	#[weight(<SelfWeightOf<T>>::create_collection())]187	#[deprecated(note = "mathod was renamed to `create_nft_collection`, prefer it instead")]188	#[solidity(hide)]189	fn create_nonfungible_collection(190		&mut self,191		caller: caller,192		value: value,193		name: string,194		description: string,195		token_prefix: string,196	) -> Result<address> {197		create_collection_internal::<T>(198			caller,199			value,200			name,201			CollectionMode::NFT,202			description,203			token_prefix,204		)205	}206207	#[weight(<SelfWeightOf<T>>::create_collection())]208	#[solidity(rename_selector = "createRFTCollection")]209	fn create_rft_collection(210		&mut self,211		caller: caller,212		value: value,213		name: string,214		description: string,215		token_prefix: string,216	) -> Result<address> {217		create_collection_internal::<T>(218			caller,219			value,220			name,221			CollectionMode::ReFungible,222			description,223			token_prefix,224		)225	}226227	#[weight(<SelfWeightOf<T>>::create_collection())]228	#[solidity(rename_selector = "createFTCollection")]229	fn create_fungible_collection(230		&mut self,231		caller: caller,232		value: value,233		name: string,234		decimals: uint8,235		description: string,236		token_prefix: string,237	) -> Result<address> {238		create_collection_internal::<T>(239			caller,240			value,241			name,242			CollectionMode::Fungible(decimals),243			description,244			token_prefix,245		)246	}247248	#[solidity(rename_selector = "makeCollectionERC721MetadataCompatible")]249	fn make_collection_metadata_compatible(250		&mut self,251		caller: caller,252		collection: address,253		base_uri: string,254	) -> Result<()> {255		let caller = T::CrossAccountId::from_eth(caller);256		let collection =257			pallet_common::eth::map_eth_to_id(&collection).ok_or("not a collection address")?;258		let mut collection =259			<crate::CollectionHandle<T>>::new(collection).ok_or("collection not found")?;260261		if !matches!(262			collection.mode,263			CollectionMode::NFT | CollectionMode::ReFungible264		) {265			return Err("target collection should be either NFT or Refungible".into());266		}267268		self.recorder().consume_sstore()?;269		collection270			.check_is_owner_or_admin(&caller)271			.map_err(dispatch_to_evm::<T>)?;272273		if collection.flags.erc721metadata {274			return Err("target collection is already Erc721Metadata compatible".into());275		}276		collection.flags.erc721metadata = true;277278		let all_permissions = <pallet_common::CollectionPropertyPermissions<T>>::get(collection.id);279		if all_permissions.get(&key::url()).is_none() {280			self.recorder().consume_sstore()?;281			<PalletCommon<T>>::set_property_permission(282				&collection,283				&caller,284				up_data_structs::PropertyKeyPermission {285					key: key::url(),286					permission: up_data_structs::PropertyPermission {287						mutable: true,288						collection_admin: true,289						token_owner: false,290					},291				},292			)293			.map_err(dispatch_to_evm::<T>)?;294		}295		if all_permissions.get(&key::suffix()).is_none() {296			self.recorder().consume_sstore()?;297			<PalletCommon<T>>::set_property_permission(298				&collection,299				&caller,300				up_data_structs::PropertyKeyPermission {301					key: key::suffix(),302					permission: up_data_structs::PropertyPermission {303						mutable: true,304						collection_admin: true,305						token_owner: false,306					},307				},308			)309			.map_err(dispatch_to_evm::<T>)?;310		}311312		let all_properties = <pallet_common::CollectionProperties<T>>::get(collection.id);313		if all_properties.get(&key::base_uri()).is_none() && !base_uri.is_empty() {314			self.recorder().consume_sstore()?;315			<PalletCommon<T>>::set_collection_properties(316				&collection,317				&caller,318				vec![up_data_structs::Property {319					key: key::base_uri(),320					value: base_uri321						.into_bytes()322						.try_into()323						.map_err(|_| "base uri is too large")?,324				}],325			)326			.map_err(dispatch_to_evm::<T>)?;327		}328329		self.recorder().consume_sstore()?;330		collection.save().map_err(dispatch_to_evm::<T>)?;331332		Ok(())333	}334335	#[weight(<SelfWeightOf<T>>::destroy_collection())]336	fn destroy_collection(&mut self, caller: caller, collection_address: address) -> Result<void> {337		let caller = T::CrossAccountId::from_eth(caller);338339		let collection_id = pallet_common::eth::map_eth_to_id(&collection_address)340			.ok_or("Invalid collection address format")?;341		<Pallet<T>>::destroy_collection_internal(caller, collection_id)342			.map_err(pallet_evm_coder_substrate::dispatch_to_evm::<T>)343	}344345	/// Check if a collection exists346	/// @param collectionAddress Address of the collection in question347	/// @return bool Does the collection exist?348	fn is_collection_exist(&self, _caller: caller, collection_address: address) -> Result<bool> {349		if let Some(id) = pallet_common::eth::map_eth_to_id(&collection_address) {350			let collection_id = id;351			return Ok(<CollectionById<T>>::contains_key(collection_id));352		}353354		Ok(false)355	}356357	fn collection_creation_fee(&self) -> Result<value> {358		let price: u128 = T::CollectionCreationPrice::get()359			.try_into()360			.map_err(|_| ()) // workaround for `expect` requiring `Debug` trait361			.expect("Collection creation price should be convertible to u128");362		Ok(price.into())363	}364}365366/// Implements [`OnMethodCall`], which delegates call to [`EvmCollectionHelpers`]367pub struct CollectionHelpersOnMethodCall<T: Config>(PhantomData<*const T>);368impl<T: Config + pallet_nonfungible::Config + pallet_refungible::Config> OnMethodCall<T>369	for CollectionHelpersOnMethodCall<T>370{371	fn is_reserved(contract: &sp_core::H160) -> bool {372		contract == &T::ContractAddress::get()373	}374375	fn is_used(contract: &sp_core::H160) -> bool {376		contract == &T::ContractAddress::get()377	}378379	fn call(handle: &mut impl PrecompileHandle) -> Option<PrecompileResult> {380		if handle.code_address() != T::ContractAddress::get() {381			return None;382		}383384		let helpers =385			EvmCollectionHelpers::<T>(SubstrateRecorder::<T>::new(handle.remaining_gas()));386		pallet_evm_coder_substrate::call(handle, helpers)387	}388389	fn get_code(contract: &sp_core::H160) -> Option<Vec<u8>> {390		(contract == &T::ContractAddress::get())391			.then(|| include_bytes!("./stubs/CollectionHelpers.raw").to_vec())392	}393}394395generate_stubgen!(collection_helper_impl, CollectionHelpersCall<()>, true);396generate_stubgen!(collection_helper_iface, CollectionHelpersCall<()>, false);397398fn error_field_too_long(feild: &str, bound: usize) -> Error {399	Error::Revert(format!("{} is too long. Max length is {}.", feild, bound))400}
modifiedpallets/unique/src/eth/stubs/CollectionHelpers.rawdiffbeforeafterboth

binary blob — no preview

modifiedpallets/unique/src/eth/stubs/CollectionHelpers.soldiffbeforeafterboth
--- a/pallets/unique/src/eth/stubs/CollectionHelpers.sol
+++ b/pallets/unique/src/eth/stubs/CollectionHelpers.sol
@@ -24,7 +24,7 @@
 }
 
 /// @title Contract, which allows users to operate with collections
-/// @dev the ERC-165 identifier for this interface is 0x7dea03b1
+/// @dev the ERC-165 identifier for this interface is 0xe65011aa
 contract CollectionHelpers is Dummy, ERC165, CollectionHelpersEvents {
 	/// Create an NFT collection
 	/// @param name Name of the collection
@@ -130,4 +130,28 @@
 		dummy;
 		return 0;
 	}
+
+	/// Returns address of a collection.
+	/// @param collectionId  - CollectionId  of the collection
+	/// @return eth mirror address of the collection
+	/// @dev EVM selector for this function is: 0x2e716683,
+	///  or in textual repr: collectionAddress(uint32)
+	function collectionAddress(uint32 collectionId) public view returns (address) {
+		require(false, stub_error);
+		collectionId;
+		dummy;
+		return 0x0000000000000000000000000000000000000000;
+	}
+
+	/// Returns collectionId of a collection.
+	/// @param collectionAddress  - Eth address of the collection
+	/// @return collectionId of the collection
+	/// @dev EVM selector for this function is: 0xb5cb7498,
+	///  or in textual repr: collectionId(address)
+	function collectionId(address collectionAddress) public view returns (uint32) {
+		require(false, stub_error);
+		collectionAddress;
+		dummy;
+		return 0;
+	}
 }
modifiedtests/src/eth/abi/collectionHelpers.jsondiffbeforeafterboth
--- a/tests/src/eth/abi/collectionHelpers.json
+++ b/tests/src/eth/abi/collectionHelpers.json
@@ -32,6 +32,15 @@
     "type": "event"
   },
   {
+    "inputs": [
+      { "internalType": "uint32", "name": "collectionId", "type": "uint32" }
+    ],
+    "name": "collectionAddress",
+    "outputs": [{ "internalType": "address", "name": "", "type": "address" }],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
     "inputs": [],
     "name": "collectionCreationFee",
     "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],
@@ -40,6 +49,19 @@
   },
   {
     "inputs": [
+      {
+        "internalType": "address",
+        "name": "collectionAddress",
+        "type": "address"
+      }
+    ],
+    "name": "collectionId",
+    "outputs": [{ "internalType": "uint32", "name": "", "type": "uint32" }],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [
       { "internalType": "string", "name": "name", "type": "string" },
       { "internalType": "uint8", "name": "decimals", "type": "uint8" },
       { "internalType": "string", "name": "description", "type": "string" },
modifiedtests/src/eth/api/CollectionHelpers.soldiffbeforeafterboth
--- a/tests/src/eth/api/CollectionHelpers.sol
+++ b/tests/src/eth/api/CollectionHelpers.sol
@@ -19,7 +19,7 @@
 }
 
 /// @title Contract, which allows users to operate with collections
-/// @dev the ERC-165 identifier for this interface is 0x7dea03b1
+/// @dev the ERC-165 identifier for this interface is 0xe65011aa
 interface CollectionHelpers is Dummy, ERC165, CollectionHelpersEvents {
 	/// Create an NFT collection
 	/// @param name Name of the collection
@@ -78,4 +78,18 @@
 	/// @dev EVM selector for this function is: 0xd23a7ab1,
 	///  or in textual repr: collectionCreationFee()
 	function collectionCreationFee() external view returns (uint256);
+
+	/// Returns address of a collection.
+	/// @param collectionId  - CollectionId  of the collection
+	/// @return eth mirror address of the collection
+	/// @dev EVM selector for this function is: 0x2e716683,
+	///  or in textual repr: collectionAddress(uint32)
+	function collectionAddress(uint32 collectionId) external view returns (address);
+
+	/// Returns collectionId of a collection.
+	/// @param collectionAddress  - Eth address of the collection
+	/// @return collectionId of the collection
+	/// @dev EVM selector for this function is: 0xb5cb7498,
+	///  or in textual repr: collectionId(address)
+	function collectionId(address collectionAddress) external view returns (uint32);
 }
modifiedtests/src/eth/collectionHelperAddress.test.tsdiffbeforeafterboth
--- a/tests/src/eth/collectionHelperAddress.test.ts
+++ b/tests/src/eth/collectionHelperAddress.test.ts
@@ -16,10 +16,11 @@
 
 import {itEth, usingEthPlaygrounds, expect} from './util';
 import {IKeyringPair} from '@polkadot/types/types';
+import {Pallets} from '../util';
 
 const EVM_COLLECTION_HELPERS_ADDRESS = '0x6c4e9fe1ae37a41e93cee429e8e1881abdcbb54f';
 
-describe('[eth]CollectionHelerpAddress test: ERC721 ', () => {
+describe('[eth]CollectionHelperAddress test: ERC20/ERC721 ', () => {
   let donor: IKeyringPair;
 
   before(async function() {
@@ -28,18 +29,22 @@
     });
   });
 
-  itEth('NFT\\RFT', async ({helper}) => {
+  itEth('NFT', async ({helper}) => {
     const owner =  await helper.eth.createAccountWithBalance(donor);
     
     const {collectionAddress: nftCollectionAddress} = await helper.eth.createNFTCollection(owner, 'Sponsor', 'absolutely anything', 'ROC');
     const nftCollection = helper.ethNativeContract.collection(nftCollectionAddress, 'nft', owner);
-    
-    const {collectionAddress: rftCollectionAddress} = await helper.eth.createRFTCollection(owner, 'Sponsor', 'absolutely anything', 'ROC');
-    const rftCollection = helper.ethNativeContract.collection(rftCollectionAddress, 'rft', owner);
     
     expect((await nftCollection.methods.collectionHelperAddress().call())
       .toString().toLowerCase()).to.be.equal(EVM_COLLECTION_HELPERS_ADDRESS);
-    
+  });
+  
+  itEth.ifWithPallets('RFT ', [Pallets.ReFungible], async ({helper}) => {
+    const owner =  await helper.eth.createAccountWithBalance(donor);
+
+    const {collectionAddress: rftCollectionAddress} = await helper.eth.createRFTCollection(owner, 'Sponsor', 'absolutely anything', 'ROC');
+
+    const rftCollection = helper.ethNativeContract.collection(rftCollectionAddress, 'rft', owner);
     expect((await rftCollection.methods.collectionHelperAddress().call())
       .toString().toLowerCase()).to.be.equal(EVM_COLLECTION_HELPERS_ADDRESS);
   });
@@ -53,5 +58,15 @@
     expect((await collection.methods.collectionHelperAddress().call())
       .toString().toLowerCase()).to.be.equal(EVM_COLLECTION_HELPERS_ADDRESS);
   });
+  
+  itEth('[collectionHelpers] convert collectionId into address', async ({helper}) => {
+    const owner = await helper.eth.createAccountWithBalance(donor);
+    const collectionId = 7;
+    const collectionAddress = helper.ethAddress.fromCollectionId(collectionId);
+    const helperContract = helper.ethNativeContract.collectionHelpers(owner);
+    
+    expect(await helperContract.methods.collectionAddress(collectionId).call()).to.be.equal(collectionAddress);
+    expect(parseInt(await helperContract.methods.collectionId(collectionAddress).call())).to.be.equal(collectionId);
+  });
  
 });
modifiedtests/src/interfaces/lookup.tsdiffbeforeafterboth
--- a/tests/src/interfaces/lookup.ts
+++ b/tests/src/interfaces/lookup.ts
@@ -2936,13 +2936,13 @@
     }
   },
   /**
-   * Lookup338: pallet_maintenance::pallet::Call<T>
+   * Lookup340: pallet_maintenance::pallet::Call<T>
    **/
   PalletMaintenanceCall: {
     _enum: ['enable', 'disable']
   },
   /**
-   * Lookup339: pallet_test_utils::pallet::Call<T>
+   * Lookup341: pallet_test_utils::pallet::Call<T>
    **/
   PalletTestUtilsCall: {
     _enum: {
modifiedtests/src/interfaces/types-lookup.tsdiffbeforeafterboth
--- a/tests/src/interfaces/types-lookup.ts
+++ b/tests/src/interfaces/types-lookup.ts
@@ -3175,14 +3175,14 @@
     readonly type: 'Begin' | 'SetData' | 'Finish' | 'InsertEthLogs' | 'InsertEvents';
   }
 
-  /** @name PalletMaintenanceCall (338) */
+  /** @name PalletMaintenanceCall (340) */
   interface PalletMaintenanceCall extends Enum {
     readonly isEnable: boolean;
     readonly isDisable: boolean;
     readonly type: 'Enable' | 'Disable';
   }
 
-  /** @name PalletTestUtilsCall (339) */
+  /** @name PalletTestUtilsCall (341) */
   interface PalletTestUtilsCall extends Enum {
     readonly isEnable: boolean;
     readonly isSetTestValue: boolean;