git.delta.rocks / unique-network / refs/commits / 8ad09da9d2af

203#[solidity_interface(name = ERC721Metadata, expect_selector = 0x5b5e139f)]203#[solidity_interface(name = ERC721Metadata, expect_selector = 0x5b5e139f)]
204impl<T: Config> NonfungibleHandle<T> {204impl<T: Config> NonfungibleHandle<T> {
205	/// @notice A descriptive name for a collection of NFTs in this contract205	/// @notice A descriptive name for a collection of NFTs in this contract
206	/// @dev real implementation of this function lies in `ERC721UniqueExtensions`
207	#[solidity(hide, rename_selector = "name")]
206	fn name(&self) -> Result<string> {208	fn name_proxy(&self) -> Result<string> {
207		Ok(decode_utf16(self.name.iter().copied())209		self.name()
208			.map(|r| r.unwrap_or(REPLACEMENT_CHARACTER))
209			.collect::<string>())
210	}210	}
211211
212	/// @notice An abbreviated name for NFTs in this contract212	/// @notice An abbreviated name for NFTs in this contract
213	/// @dev real implementation of this function lies in `ERC721UniqueExtensions`
214	#[solidity(hide, rename_selector = "symbol")]
213	fn symbol(&self) -> Result<string> {215	fn symbol_proxy(&self) -> Result<string> {
214		Ok(string::from_utf8_lossy(&self.token_prefix).into())216		self.symbol()
215	}217	}
216218
217	/// @notice A distinct Uniform Resource Identifier (URI) for a given asset.219	/// @notice A distinct Uniform Resource Identifier (URI) for a given asset.
571/// @title Unique extensions for ERC721.573/// @title Unique extensions for ERC721.
572#[solidity_interface(name = ERC721UniqueExtensions)]574#[solidity_interface(name = ERC721UniqueExtensions)]
573impl<T: Config> NonfungibleHandle<T> {575impl<T: Config> NonfungibleHandle<T> {
576	/// @notice A descriptive name for a collection of NFTs in this contract
577	fn name(&self) -> Result<string> {
578		Ok(decode_utf16(self.name.iter().copied())
579			.map(|r| r.unwrap_or(REPLACEMENT_CHARACTER))
580			.collect::<string>())
581	}
582
583	/// @notice An abbreviated name for NFTs in this contract
584	fn symbol(&self) -> Result<string> {
585		Ok(string::from_utf8_lossy(&self.token_prefix).into())
586	}
587
574	/// @notice Transfer ownership of an NFT588	/// @notice Transfer ownership of an NFT
575	/// @dev Throws unless `msg.sender` is the current owner. Throws if `to`589	/// @dev Throws unless `msg.sender` is the current owner. Throws if `to`

binary blob — no preview

--- a/pallets/nonfungible/src/stubs/UniqueNFT.sol
+++ b/pallets/nonfungible/src/stubs/UniqueNFT.sol
@@ -21,23 +21,25 @@
 /// @dev See https://eips.ethereum.org/EIPS/eip-721
 /// @dev the ERC-165 identifier for this interface is 0x5b5e139f
 contract ERC721Metadata is Dummy, ERC165 {
-	/// @notice A descriptive name for a collection of NFTs in this contract
-	/// @dev EVM selector for this function is: 0x06fdde03,
-	///  or in textual repr: name()
-	function name() public view returns (string memory) {
-		require(false, stub_error);
-		dummy;
-		return "";
-	}
+	// /// @notice A descriptive name for a collection of NFTs in this contract
+	// /// @dev real implementation of this function lies in `ERC721UniqueExtensions`
+	// /// @dev EVM selector for this function is: 0x06fdde03,
+	// ///  or in textual repr: name()
+	// function name() public view returns (string memory) {
+	// 	require(false, stub_error);
+	// 	dummy;
+	// 	return "";
+	// }
 
-	/// @notice An abbreviated name for NFTs in this contract
-	/// @dev EVM selector for this function is: 0x95d89b41,
-	///  or in textual repr: symbol()
-	function symbol() public view returns (string memory) {
-		require(false, stub_error);
-		dummy;
-		return "";
-	}
+	// /// @notice An abbreviated name for NFTs in this contract
+	// /// @dev real implementation of this function lies in `ERC721UniqueExtensions`
+	// /// @dev EVM selector for this function is: 0x95d89b41,
+	// ///  or in textual repr: symbol()
+	// function symbol() public view returns (string memory) {
+	// 	require(false, stub_error);
+	// 	dummy;
+	// 	return "";
+	// }
 
 	/// @notice A distinct Uniform Resource Identifier (URI) for a given asset.
 	///
@@ -504,8 +506,26 @@
 }
 
 /// @title Unique extensions for ERC721.
-/// @dev the ERC-165 identifier for this interface is 0xd74d154f
+/// @dev the ERC-165 identifier for this interface is 0x4468500d
 contract ERC721UniqueExtensions is Dummy, ERC165 {
+	/// @notice A descriptive name for a collection of NFTs in this contract
+	/// @dev EVM selector for this function is: 0x06fdde03,
+	///  or in textual repr: name()
+	function name() public view returns (string memory) {
+		require(false, stub_error);
+		dummy;
+		return "";
+	}
+
+	/// @notice An abbreviated name for NFTs in this contract
+	/// @dev EVM selector for this function is: 0x95d89b41,
+	///  or in textual repr: symbol()
+	function symbol() public view returns (string memory) {
+		require(false, stub_error);
+		dummy;
+		return "";
+	}
+
 	/// @notice Transfer ownership of an NFT
 	/// @dev Throws unless `msg.sender` is the current owner. Throws if `to`
 	///  is the zero address. Throws if `tokenId` is not a valid NFT.

--- a/tests/src/eth/api/UniqueNFT.sol
+++ b/tests/src/eth/api/UniqueNFT.sol
@@ -16,15 +16,17 @@
 /// @dev See https://eips.ethereum.org/EIPS/eip-721
 /// @dev the ERC-165 identifier for this interface is 0x5b5e139f
 interface ERC721Metadata is Dummy, ERC165 {
-	/// @notice A descriptive name for a collection of NFTs in this contract
-	/// @dev EVM selector for this function is: 0x06fdde03,
-	///  or in textual repr: name()
-	function name() external view returns (string memory);
+	// /// @notice A descriptive name for a collection of NFTs in this contract
+	// /// @dev real implementation of this function lies in `ERC721UniqueExtensions`
+	// /// @dev EVM selector for this function is: 0x06fdde03,
+	// ///  or in textual repr: name()
+	// function name() external view returns (string memory);
 
-	/// @notice An abbreviated name for NFTs in this contract
-	/// @dev EVM selector for this function is: 0x95d89b41,
-	///  or in textual repr: symbol()
-	function symbol() external view returns (string memory);
+	// /// @notice An abbreviated name for NFTs in this contract
+	// /// @dev real implementation of this function lies in `ERC721UniqueExtensions`
+	// /// @dev EVM selector for this function is: 0x95d89b41,
+	// ///  or in textual repr: symbol()
+	// function symbol() external view returns (string memory);
 
 	/// @notice A distinct Uniform Resource Identifier (URI) for a given asset.
 	///
@@ -336,8 +338,18 @@
 }
 
 /// @title Unique extensions for ERC721.
-/// @dev the ERC-165 identifier for this interface is 0xd74d154f
+/// @dev the ERC-165 identifier for this interface is 0x4468500d
 interface ERC721UniqueExtensions is Dummy, ERC165 {
+	/// @notice A descriptive name for a collection of NFTs in this contract
+	/// @dev EVM selector for this function is: 0x06fdde03,
+	///  or in textual repr: name()
+	function name() external view returns (string memory);
+
+	/// @notice An abbreviated name for NFTs in this contract
+	/// @dev EVM selector for this function is: 0x95d89b41,
+	///  or in textual repr: symbol()
+	function symbol() external view returns (string memory);
+
 	/// @notice Transfer ownership of an NFT
 	/// @dev Throws unless `msg.sender` is the current owner. Throws if `to`
 	///  is the zero address. Throws if `tokenId` is not a valid NFT.