git.delta.rocks / unique-network / refs/commits / f27580fc65c7

difftreelog

feat make collection ERC721 compatible

Yaroslav Bolyukin2022-10-13parent: #8ad09da.patch.diff
in: master

4 files changed

modifiedpallets/unique/src/eth/mod.rsdiffbeforeafterboth
--- a/pallets/unique/src/eth/mod.rs
+++ b/pallets/unique/src/eth/mod.rs
@@ -27,6 +27,7 @@
 		CollectionHelpersEvents,
 		static_property::{key, value as property_value},
 	},
+	Pallet as PalletCommon,
 };
 use pallet_evm_coder_substrate::{dispatch_to_evm, SubstrateRecorder, WithRecorder};
 use pallet_evm::{account::CrossAccountId, OnMethodCall, PrecompileHandle, PrecompileResult};
@@ -340,6 +341,83 @@
 		)
 	}
 
+	#[solidity(rename_selector = "makeCollectionERC721MetadataCompatible")]
+	fn make_collection_metadata_compatible(
+		&mut self,
+		caller: caller,
+		collection: address,
+		base_uri: string,
+	) -> Result<()> {
+		let caller = T::CrossAccountId::from_eth(caller);
+		let collection =
+			pallet_common::eth::map_eth_to_id(&collection).ok_or("not a collection address")?;
+		let mut collection =
+			<crate::CollectionHandle<T>>::new(collection).ok_or("collection not found")?;
+
+		if !matches!(
+			collection.mode,
+			CollectionMode::NFT | CollectionMode::ReFungible
+		) {
+			return Err("target collection should be either NFT or Refungible".into());
+		}
+
+		self.recorder().consume_sstore()?;
+		collection
+			.check_is_owner_or_admin(&caller)
+			.map_err(dispatch_to_evm::<T>)?;
+
+		if collection.flags.erc721metadata {
+			return Err("target collection is already Erc721Metadata compatible".into());
+		}
+		collection.flags.erc721metadata = true;
+
+		let all_permissions = <pallet_common::CollectionPropertyPermissions<T>>::get(collection.id);
+		if all_permissions.get(&key::url()).is_none() {
+			self.recorder().consume_sstore()?;
+			<PalletCommon<T>>::set_property_permission(&collection, &caller, default_url_pkp())
+				.map_err(dispatch_to_evm::<T>)?;
+		}
+		if all_permissions.get(&key::suffix()).is_none() {
+			self.recorder().consume_sstore()?;
+			<PalletCommon<T>>::set_property_permission(&collection, &caller, default_suffix_pkp())
+				.map_err(dispatch_to_evm::<T>)?;
+		}
+
+		let all_properties = <pallet_common::CollectionProperties<T>>::get(collection.id);
+		let mut new_properties = vec![];
+		if all_properties.get(&key::schema_name()).is_none() {
+			self.recorder().consume_sstore()?;
+			new_properties.push(up_data_structs::Property {
+				key: key::schema_name(),
+				value: property_value::erc721(),
+			});
+			new_properties.push(up_data_structs::Property {
+				key: key::schema_version(),
+				value: property_value::schema_version(),
+			});
+		}
+		if all_properties.get(&key::base_uri()).is_none() && !base_uri.is_empty() {
+			new_properties.push(up_data_structs::Property {
+				key: key::base_uri(),
+				value: base_uri
+					.into_bytes()
+					.try_into()
+					.map_err(|_| "base uri is too large")?,
+			});
+		}
+
+		if !new_properties.is_empty() {
+			self.recorder().consume_sstore()?;
+			<PalletCommon<T>>::set_collection_properties(&collection, &caller, new_properties)
+				.map_err(dispatch_to_evm::<T>)?;
+		}
+
+		self.recorder().consume_sstore()?;
+		collection.save().map_err(dispatch_to_evm::<T>)?;
+
+		Ok(())
+	}
+
 	/// Check if a collection exists
 	/// @param collectionAddress Address of the collection in question
 	/// @return bool Does the collection exist?
modifiedpallets/unique/src/eth/stubs/CollectionHelpers.soldiffbeforeafterboth
--- a/pallets/unique/src/eth/stubs/CollectionHelpers.sol
+++ b/pallets/unique/src/eth/stubs/CollectionHelpers.sol
@@ -23,7 +23,7 @@
 }
 
 /// @title Contract, which allows users to operate with collections
-/// @dev the ERC-165 identifier for this interface is 0xd14d1221
+/// @dev the ERC-165 identifier for this interface is 0x542f5079
 contract CollectionHelpers is Dummy, ERC165, CollectionHelpersEvents {
 	/// Create an NFT collection
 	/// @param name Name of the collection
@@ -114,6 +114,15 @@
 		return 0x0000000000000000000000000000000000000000;
 	}
 
+	/// @dev EVM selector for this function is: 0x85624258,
+	///  or in textual repr: makeCollectionERC721MetadataCompatible(address,string)
+	function makeCollectionERC721MetadataCompatible(address collection, string memory baseUri) public {
+		require(false, stub_error);
+		collection;
+		baseUri;
+		dummy = 0;
+	}
+
 	/// Check if a collection exists
 	/// @param collectionAddress Address of the collection in question
 	/// @return bool Does the collection exist?
modifiedtests/src/eth/api/CollectionHelpers.soldiffbeforeafterboth
before · tests/src/eth/api/CollectionHelpers.sol
1// SPDX-License-Identifier: OTHER2// This code is automatically generated34pragma solidity >=0.8.0 <0.9.0;56/// @dev common stubs holder7interface Dummy {89}1011interface ERC165 is Dummy {12	function supportsInterface(bytes4 interfaceID) external view returns (bool);13}1415/// @dev inlined interface16interface CollectionHelpersEvents {17	event CollectionCreated(address indexed owner, address indexed collectionId);18}1920/// @title Contract, which allows users to operate with collections21/// @dev the ERC-165 identifier for this interface is 0xd14d122122interface CollectionHelpers is Dummy, ERC165, CollectionHelpersEvents {23	/// Create an NFT collection24	/// @param name Name of the collection25	/// @param description Informative description of the collection26	/// @param tokenPrefix Token prefix to represent the collection tokens in UI and user applications27	/// @return address Address of the newly created collection28	/// @dev EVM selector for this function is: 0x844af658,29	///  or in textual repr: createNFTCollection(string,string,string)30	function createNFTCollection(31		string memory name,32		string memory description,33		string memory tokenPrefix34	) external payable returns (address);3536	/// Create an NFT collection37	/// @param name Name of the collection38	/// @param description Informative description of the collection39	/// @param tokenPrefix Token prefix to represent the collection tokens in UI and user applications40	/// @return address Address of the newly created collection41	/// @dev EVM selector for this function is: 0xe34a6844,42	///  or in textual repr: createNonfungibleCollection(string,string,string)43	function createNonfungibleCollection(44		string memory name,45		string memory description,46		string memory tokenPrefix47	) external payable returns (address);4849	/// @dev EVM selector for this function is: 0xa9e7b5c0,50	///  or in textual repr: createERC721MetadataCompatibleNFTCollection(string,string,string,string)51	function createERC721MetadataCompatibleNFTCollection(52		string memory name,53		string memory description,54		string memory tokenPrefix,55		string memory baseUri56	) external payable returns (address);5758	/// @dev EVM selector for this function is: 0xab173450,59	///  or in textual repr: createRFTCollection(string,string,string)60	function createRFTCollection(61		string memory name,62		string memory description,63		string memory tokenPrefix64	) external payable returns (address);6566	/// @dev EVM selector for this function is: 0xa5596388,67	///  or in textual repr: createERC721MetadataCompatibleRFTCollection(string,string,string,string)68	function createERC721MetadataCompatibleRFTCollection(69		string memory name,70		string memory description,71		string memory tokenPrefix,72		string memory baseUri73	) external payable returns (address);7475	/// Check if a collection exists76	/// @param collectionAddress Address of the collection in question77	/// @return bool Does the collection exist?78	/// @dev EVM selector for this function is: 0xc3de1494,79	///  or in textual repr: isCollectionExist(address)80	function isCollectionExist(address collectionAddress) external view returns (bool);8182	/// @dev EVM selector for this function is: 0xd23a7ab1,83	///  or in textual repr: collectionCreationFee()84	function collectionCreationFee() external view returns (uint256);85}
modifiedtests/src/eth/collectionHelpersAbi.jsondiffbeforeafterboth
--- a/tests/src/eth/collectionHelpersAbi.json
+++ b/tests/src/eth/collectionHelpersAbi.json
@@ -97,6 +97,16 @@
   },
   {
     "inputs": [
+      { "internalType": "address", "name": "collection", "type": "address" },
+      { "internalType": "string", "name": "baseUri", "type": "string" }
+    ],
+    "name": "makeCollectionERC721MetadataCompatible",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [
       { "internalType": "bytes4", "name": "interfaceID", "type": "bytes4" }
     ],
     "name": "supportsInterface",