git.delta.rocks / unique-network / refs/commits / 5c36133bb18f

binary blob — no preview

--- a/pallets/nonfungible/src/stubs/UniqueNFT.sol
+++ b/pallets/nonfungible/src/stubs/UniqueNFT.sol
@@ -17,49 +17,6 @@
 	}
 }
 
-/// @title ERC-721 Non-Fungible Token Standard, optional metadata extension
-/// @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 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 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.
-	///
-	/// @dev If the token has a `url` property and it is not empty, it is returned.
-	///  Else If the collection does not have a property with key `schemaName` or its value is not equal to `ERC721Metadata`, it return an error `tokenURI not set`.
-	///  If the collection property `baseURI` is empty or absent, return "" (empty string)
-	///  otherwise, if token property `suffix` present and is non-empty, return concatenation of baseURI and suffix
-	///  otherwise, return concatenation of `baseURI` and stringified token id (decimal stringifying, without paddings).
-	///
-	/// @return token's const_metadata
-	/// @dev EVM selector for this function is: 0xc87b56dd,
-	///  or in textual repr: tokenURI(uint256)
-	function tokenURI(uint256 tokenId) public view returns (string memory) {
-		require(false, stub_error);
-		tokenId;
-		dummy;
-		return "";
-	}
-}
-
 /// @title A contract that allows to set and delete token properties and change token property permissions.
 /// @dev the ERC-165 identifier for this interface is 0x41369377
 contract TokenProperties is Dummy, ERC165 {
@@ -220,10 +177,10 @@
 	/// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.
 	/// @dev EVM selector for this function is: 0x6ec0a9f1,
 	///  or in textual repr: collectionSponsor()
-	function collectionSponsor() public view returns (Tuple15 memory) {
+	function collectionSponsor() public view returns (Tuple17 memory) {
 		require(false, stub_error);
 		dummy;
-		return Tuple15(0x0000000000000000000000000000000000000000, 0);
+		return Tuple17(0x0000000000000000000000000000000000000000, 0);
 	}
 
 	/// Set limits for the collection.
@@ -402,10 +359,10 @@
 	/// If address is canonical then substrate mirror is zero and vice versa.
 	/// @dev EVM selector for this function is: 0xdf727d3b,
 	///  or in textual repr: collectionOwner()
-	function collectionOwner() public view returns (Tuple15 memory) {
+	function collectionOwner() public view returns (Tuple17 memory) {
 		require(false, stub_error);
 		dummy;
-		return Tuple15(0x0000000000000000000000000000000000000000, 0);
+		return Tuple17(0x0000000000000000000000000000000000000000, 0);
 	}
 
 	/// Changes collection owner to another account
@@ -422,11 +379,54 @@
 }
 
 /// @dev anonymous struct
-struct Tuple15 {
+struct Tuple17 {
 	address field_0;
 	uint256 field_1;
 }
 
+/// @title ERC-721 Non-Fungible Token Standard, optional metadata extension
+/// @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 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 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.
+	///
+	/// @dev If the token has a `url` property and it is not empty, it is returned.
+	///  Else If the collection does not have a property with key `schemaName` or its value is not equal to `ERC721Metadata`, it return an error `tokenURI not set`.
+	///  If the collection property `baseURI` is empty or absent, return "" (empty string)
+	///  otherwise, if token property `suffix` present and is non-empty, return concatenation of baseURI and suffix
+	///  otherwise, return concatenation of `baseURI` and stringified token id (decimal stringifying, without paddings).
+	///
+	/// @return token's const_metadata
+	/// @dev EVM selector for this function is: 0xc87b56dd,
+	///  or in textual repr: tokenURI(uint256)
+	function tokenURI(uint256 tokenId) public view returns (string memory) {
+		require(false, stub_error);
+		tokenId;
+		dummy;
+		return "";
+	}
+}
+
 /// @title ERC721 Token that can be irreversibly burned (destroyed).
 /// @dev the ERC-165 identifier for this interface is 0x42966c68
 contract ERC721Burnable is Dummy, ERC165 {
@@ -790,7 +790,7 @@
 	ERC721UniqueExtensions,
 	ERC721Mintable,
 	ERC721Burnable,
+	ERC721Metadata,
 	Collection,
-	TokenProperties,
-	ERC721Metadata
+	TokenProperties
 {}

binary blob — no preview

17	}17	}
18}18}
19
20/// @dev the ERC-165 identifier for this interface is 0x5b5e139f
21contract ERC721Metadata is Dummy, ERC165 {
22	/// @notice A descriptive name for a collection of RFTs in this contract
23	/// @dev EVM selector for this function is: 0x06fdde03,
24	///  or in textual repr: name()
25	function name() public view returns (string memory) {
26		require(false, stub_error);
27		dummy;
28		return "";
29	}
30
31	/// @notice An abbreviated name for RFTs in this contract
32	/// @dev EVM selector for this function is: 0x95d89b41,
33	///  or in textual repr: symbol()
34	function symbol() public view returns (string memory) {
35		require(false, stub_error);
36		dummy;
37		return "";
38	}
39
40	/// @notice A distinct Uniform Resource Identifier (URI) for a given asset.
41	///
42	/// @dev If the token has a `url` property and it is not empty, it is returned.
43	///  Else If the collection does not have a property with key `schemaName` or its value is not equal to `ERC721Metadata`, it return an error `tokenURI not set`.
44	///  If the collection property `baseURI` is empty or absent, return "" (empty string)
45	///  otherwise, if token property `suffix` present and is non-empty, return concatenation of baseURI and suffix
46	///  otherwise, return concatenation of `baseURI` and stringified token id (decimal stringifying, without paddings).
47	///
48	/// @return token's const_metadata
49	/// @dev EVM selector for this function is: 0xc87b56dd,
50	///  or in textual repr: tokenURI(uint256)
51	function tokenURI(uint256 tokenId) public view returns (string memory) {
52		require(false, stub_error);
53		tokenId;
54		dummy;
55		return "";
56	}
57}
5819
59/// @title A contract that allows to set and delete token properties and change token property permissions.20/// @title A contract that allows to set and delete token properties and change token property permissions.
60/// @dev the ERC-165 identifier for this interface is 0x4136937721/// @dev the ERC-165 identifier for this interface is 0x41369377
216	/// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.177	/// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.
217	/// @dev EVM selector for this function is: 0x6ec0a9f1,178	/// @dev EVM selector for this function is: 0x6ec0a9f1,
218	///  or in textual repr: collectionSponsor()179	///  or in textual repr: collectionSponsor()
219	function collectionSponsor() public view returns (Tuple15 memory) {180	function collectionSponsor() public view returns (Tuple17 memory) {
220		require(false, stub_error);181		require(false, stub_error);
221		dummy;182		dummy;
222		return Tuple15(0x0000000000000000000000000000000000000000, 0);183		return Tuple17(0x0000000000000000000000000000000000000000, 0);
223	}184	}
224185
225	/// Set limits for the collection.186	/// Set limits for the collection.
398	/// If address is canonical then substrate mirror is zero and vice versa.359	/// If address is canonical then substrate mirror is zero and vice versa.
399	/// @dev EVM selector for this function is: 0xdf727d3b,360	/// @dev EVM selector for this function is: 0xdf727d3b,
400	///  or in textual repr: collectionOwner()361	///  or in textual repr: collectionOwner()
401	function collectionOwner() public view returns (Tuple15 memory) {362	function collectionOwner() public view returns (Tuple17 memory) {
402		require(false, stub_error);363		require(false, stub_error);
403		dummy;364		dummy;
404		return Tuple15(0x0000000000000000000000000000000000000000, 0);365		return Tuple17(0x0000000000000000000000000000000000000000, 0);
405	}366	}
406367
407	/// Changes collection owner to another account368	/// Changes collection owner to another account
418}379}
419380
420/// @dev anonymous struct381/// @dev anonymous struct
421struct Tuple15 {382struct Tuple17 {
422	address field_0;383	address field_0;
423	uint256 field_1;384	uint256 field_1;
424}385}
386
387/// @dev the ERC-165 identifier for this interface is 0x5b5e139f
388contract ERC721Metadata is Dummy, ERC165 {
389	// /// @notice A descriptive name for a collection of NFTs in this contract
390	// /// @dev real implementation of this function lies in `ERC721UniqueExtensions`
391	// /// @dev EVM selector for this function is: 0x06fdde03,
392	// ///  or in textual repr: name()
393	// function name() public view returns (string memory) {
394	// 	require(false, stub_error);
395	// 	dummy;
396	// 	return "";
397	// }
398
399	// /// @notice An abbreviated name for NFTs in this contract
400	// /// @dev real implementation of this function lies in `ERC721UniqueExtensions`
401	// /// @dev EVM selector for this function is: 0x95d89b41,
402	// ///  or in textual repr: symbol()
403	// function symbol() public view returns (string memory) {
404	// 	require(false, stub_error);
405	// 	dummy;
406	// 	return "";
407	// }
408
409	/// @notice A distinct Uniform Resource Identifier (URI) for a given asset.
410	///
411	/// @dev If the token has a `url` property and it is not empty, it is returned.
412	///  Else If the collection does not have a property with key `schemaName` or its value is not equal to `ERC721Metadata`, it return an error `tokenURI not set`.
413	///  If the collection property `baseURI` is empty or absent, return "" (empty string)
414	///  otherwise, if token property `suffix` present and is non-empty, return concatenation of baseURI and suffix
415	///  otherwise, return concatenation of `baseURI` and stringified token id (decimal stringifying, without paddings).
416	///
417	/// @return token's const_metadata
418	/// @dev EVM selector for this function is: 0xc87b56dd,
419	///  or in textual repr: tokenURI(uint256)
420	function tokenURI(uint256 tokenId) public view returns (string memory) {
421		require(false, stub_error);
422		tokenId;
423		dummy;
424		return "";
425	}
426}
425427
426/// @title ERC721 Token that can be irreversibly burned (destroyed).428/// @title ERC721 Token that can be irreversibly burned (destroyed).
427/// @dev the ERC-165 identifier for this interface is 0x42966c68429/// @dev the ERC-165 identifier for this interface is 0x42966c68
502}504}
503505
504/// @title Unique extensions for ERC721.506/// @title Unique extensions for ERC721.
505/// @dev the ERC-165 identifier for this interface is 0x7c3bef89507/// @dev the ERC-165 identifier for this interface is 0xef1eaacb
506contract ERC721UniqueExtensions is Dummy, ERC165 {508contract ERC721UniqueExtensions is Dummy, ERC165 {
509	/// @notice A descriptive name for a collection of NFTs in this contract
510	/// @dev EVM selector for this function is: 0x06fdde03,
511	///  or in textual repr: name()
512	function name() public view returns (string memory) {
513		require(false, stub_error);
514		dummy;
515		return "";
516	}
517
518	/// @notice An abbreviated name for NFTs in this contract
519	/// @dev EVM selector for this function is: 0x95d89b41,
520	///  or in textual repr: symbol()
521	function symbol() public view returns (string memory) {
522		require(false, stub_error);
523		dummy;
524		return "";
525	}
526
507	/// @notice Transfer ownership of an RFT527	/// @notice Transfer ownership of an RFT
508	/// @dev Throws unless `msg.sender` is the current owner. Throws if `to`528	/// @dev Throws unless `msg.sender` is the current owner. Throws if `to`
780	ERC721UniqueExtensions,800	ERC721UniqueExtensions,
781	ERC721Mintable,801	ERC721Mintable,
782	ERC721Burnable,802	ERC721Burnable,
803	ERC721Metadata,
783	Collection,804	Collection,
784	TokenProperties,805	TokenProperties
785	ERC721Metadata
786{}806{}
787807

--- a/tests/src/eth/api/UniqueNFT.sol
+++ b/tests/src/eth/api/UniqueNFT.sol
@@ -12,36 +12,6 @@
 	function supportsInterface(bytes4 interfaceID) external view returns (bool);
 }
 
-/// @title ERC-721 Non-Fungible Token Standard, optional metadata extension
-/// @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 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 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.
-	///
-	/// @dev If the token has a `url` property and it is not empty, it is returned.
-	///  Else If the collection does not have a property with key `schemaName` or its value is not equal to `ERC721Metadata`, it return an error `tokenURI not set`.
-	///  If the collection property `baseURI` is empty or absent, return "" (empty string)
-	///  otherwise, if token property `suffix` present and is non-empty, return concatenation of baseURI and suffix
-	///  otherwise, return concatenation of `baseURI` and stringified token id (decimal stringifying, without paddings).
-	///
-	/// @return token's const_metadata
-	/// @dev EVM selector for this function is: 0xc87b56dd,
-	///  or in textual repr: tokenURI(uint256)
-	function tokenURI(uint256 tokenId) external view returns (string memory);
-}
-
 /// @title A contract that allows to set and delete token properties and change token property permissions.
 /// @dev the ERC-165 identifier for this interface is 0x41369377
 interface TokenProperties is Dummy, ERC165 {
@@ -150,7 +120,7 @@
 	/// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.
 	/// @dev EVM selector for this function is: 0x6ec0a9f1,
 	///  or in textual repr: collectionSponsor()
-	function collectionSponsor() external view returns (Tuple15 memory);
+	function collectionSponsor() external view returns (Tuple17 memory);
 
 	/// Set limits for the collection.
 	/// @dev Throws error if limit not found.
@@ -267,7 +237,7 @@
 	/// If address is canonical then substrate mirror is zero and vice versa.
 	/// @dev EVM selector for this function is: 0xdf727d3b,
 	///  or in textual repr: collectionOwner()
-	function collectionOwner() external view returns (Tuple15 memory);
+	function collectionOwner() external view returns (Tuple17 memory);
 
 	/// Changes collection owner to another account
 	///
@@ -279,11 +249,41 @@
 }
 
 /// @dev anonymous struct
-struct Tuple15 {
+struct Tuple17 {
 	address field_0;
 	uint256 field_1;
 }
 
+/// @title ERC-721 Non-Fungible Token Standard, optional metadata extension
+/// @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 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 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.
+	///
+	/// @dev If the token has a `url` property and it is not empty, it is returned.
+	///  Else If the collection does not have a property with key `schemaName` or its value is not equal to `ERC721Metadata`, it return an error `tokenURI not set`.
+	///  If the collection property `baseURI` is empty or absent, return "" (empty string)
+	///  otherwise, if token property `suffix` present and is non-empty, return concatenation of baseURI and suffix
+	///  otherwise, return concatenation of `baseURI` and stringified token id (decimal stringifying, without paddings).
+	///
+	/// @return token's const_metadata
+	/// @dev EVM selector for this function is: 0xc87b56dd,
+	///  or in textual repr: tokenURI(uint256)
+	function tokenURI(uint256 tokenId) external view returns (string memory);
+}
+
 /// @title ERC721 Token that can be irreversibly burned (destroyed).
 /// @dev the ERC-165 identifier for this interface is 0x42966c68
 interface ERC721Burnable is Dummy, ERC165 {
@@ -523,7 +523,7 @@
 	ERC721UniqueExtensions,
 	ERC721Mintable,
 	ERC721Burnable,
+	ERC721Metadata,
 	Collection,
-	TokenProperties,
-	ERC721Metadata
+	TokenProperties
 {}

--- a/tests/src/eth/api/UniqueRefungible.sol
+++ b/tests/src/eth/api/UniqueRefungible.sol
@@ -12,32 +12,6 @@
 	function supportsInterface(bytes4 interfaceID) external view returns (bool);
 }
 
-/// @dev the ERC-165 identifier for this interface is 0x5b5e139f
-interface ERC721Metadata is Dummy, ERC165 {
-	/// @notice A descriptive name for a collection of RFTs 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 RFTs in this contract
-	/// @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.
-	///
-	/// @dev If the token has a `url` property and it is not empty, it is returned.
-	///  Else If the collection does not have a property with key `schemaName` or its value is not equal to `ERC721Metadata`, it return an error `tokenURI not set`.
-	///  If the collection property `baseURI` is empty or absent, return "" (empty string)
-	///  otherwise, if token property `suffix` present and is non-empty, return concatenation of baseURI and suffix
-	///  otherwise, return concatenation of `baseURI` and stringified token id (decimal stringifying, without paddings).
-	///
-	/// @return token's const_metadata
-	/// @dev EVM selector for this function is: 0xc87b56dd,
-	///  or in textual repr: tokenURI(uint256)
-	function tokenURI(uint256 tokenId) external view returns (string memory);
-}
-
 /// @title A contract that allows to set and delete token properties and change token property permissions.
 /// @dev the ERC-165 identifier for this interface is 0x41369377
 interface TokenProperties is Dummy, ERC165 {
@@ -146,7 +120,7 @@
 	/// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.
 	/// @dev EVM selector for this function is: 0x6ec0a9f1,
 	///  or in textual repr: collectionSponsor()
-	function collectionSponsor() external view returns (Tuple15 memory);
+	function collectionSponsor() external view returns (Tuple17 memory);
 
 	/// Set limits for the collection.
 	/// @dev Throws error if limit not found.
@@ -263,7 +237,7 @@
 	/// If address is canonical then substrate mirror is zero and vice versa.
 	/// @dev EVM selector for this function is: 0xdf727d3b,
 	///  or in textual repr: collectionOwner()
-	function collectionOwner() external view returns (Tuple15 memory);
+	function collectionOwner() external view returns (Tuple17 memory);
 
 	/// Changes collection owner to another account
 	///
@@ -275,11 +249,39 @@
 }
 
 /// @dev anonymous struct
-struct Tuple15 {
+struct Tuple17 {
 	address field_0;
 	uint256 field_1;
 }
 
+/// @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 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 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.
+	///
+	/// @dev If the token has a `url` property and it is not empty, it is returned.
+	///  Else If the collection does not have a property with key `schemaName` or its value is not equal to `ERC721Metadata`, it return an error `tokenURI not set`.
+	///  If the collection property `baseURI` is empty or absent, return "" (empty string)
+	///  otherwise, if token property `suffix` present and is non-empty, return concatenation of baseURI and suffix
+	///  otherwise, return concatenation of `baseURI` and stringified token id (decimal stringifying, without paddings).
+	///
+	/// @return token's const_metadata
+	/// @dev EVM selector for this function is: 0xc87b56dd,
+	///  or in textual repr: tokenURI(uint256)
+	function tokenURI(uint256 tokenId) external view returns (string memory);
+}
+
 /// @title ERC721 Token that can be irreversibly burned (destroyed).
 /// @dev the ERC-165 identifier for this interface is 0x42966c68
 interface ERC721Burnable is Dummy, ERC165 {
@@ -334,8 +336,18 @@
 }
 
 /// @title Unique extensions for ERC721.
-/// @dev the ERC-165 identifier for this interface is 0x7c3bef89
+/// @dev the ERC-165 identifier for this interface is 0xef1eaacb
 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 RFT
 	/// @dev Throws unless `msg.sender` is the current owner. Throws if `to`
 	///  is the zero address. Throws if `tokenId` is not a valid RFT.
@@ -516,7 +528,7 @@
 	ERC721UniqueExtensions,
 	ERC721Mintable,
 	ERC721Burnable,
+	ERC721Metadata,
 	Collection,
-	TokenProperties,
-	ERC721Metadata
+	TokenProperties
 {}

--- a/tests/src/eth/nonFungibleAbi.json
+++ b/tests/src/eth/nonFungibleAbi.json
@@ -154,7 +154,7 @@
           { "internalType": "address", "name": "field_0", "type": "address" },
           { "internalType": "uint256", "name": "field_1", "type": "uint256" }
         ],
-        "internalType": "struct Tuple15",
+        "internalType": "struct Tuple17",
         "name": "",
         "type": "tuple"
       }
@@ -178,7 +178,7 @@
           { "internalType": "address", "name": "field_0", "type": "address" },
           { "internalType": "uint256", "name": "field_1", "type": "uint256" }
         ],
-        "internalType": "struct Tuple15",
+        "internalType": "struct Tuple17",
         "name": "",
         "type": "tuple"
       }

--- a/tests/src/eth/reFungibleAbi.json
+++ b/tests/src/eth/reFungibleAbi.json
@@ -154,7 +154,7 @@
           { "internalType": "address", "name": "field_0", "type": "address" },
           { "internalType": "uint256", "name": "field_1", "type": "uint256" }
         ],
-        "internalType": "struct Tuple15",
+        "internalType": "struct Tuple17",
         "name": "",
         "type": "tuple"
       }
@@ -178,7 +178,7 @@
           { "internalType": "address", "name": "field_0", "type": "address" },
           { "internalType": "uint256", "name": "field_1", "type": "uint256" }
         ],
-        "internalType": "struct Tuple15",
+        "internalType": "struct Tuple17",
         "name": "",
         "type": "tuple"
       }