`15e4512df81d`

4 files changed

addedpallets/nonfungible/expand.rsdiff before after both

no changes

modifiedpallets/nonfungible/src/stubs/UniqueNFT.soldiff before after both

105105
106/// @title A contract that allows you to work with collections.106/// @title A contract that allows you to work with collections.
107<<<<<<< HEAD107<<<<<<< HEAD
108<<<<<<< HEAD
108/// @dev the ERC-165 identifier for this interface is 0xb3152af3109/// @dev the ERC-165 identifier for this interface is 0xb3152af3
109=======110=======
110/// @dev the ERC-165 identifier for this interface is 0x674be726111/// @dev the ERC-165 identifier for this interface is 0x674be726
111>>>>>>> feat: Add custum signature with unlimited nesting.112>>>>>>> feat: Add custum signature with unlimited nesting.
113=======
114/// @dev the ERC-165 identifier for this interface is 0x943ee094
115>>>>>>> fix: after rebase
112contract Collection is Dummy, ERC165 {116contract Collection is Dummy, ERC165 {
113	/// Set collection property.117	/// Set collection property.
114	///118	///
126	/// Set collection properties.130	/// Set collection properties.
127	///131	///
128	/// @param properties Vector of properties key/value pair.132	/// @param properties Vector of properties key/value pair.
129	/// @dev EVM selector for this function is: 0x50b26b2a,133	/// @dev EVM selector for this function is: 0xf90c1ce9,
130	///  or in textual repr: setCollectionProperties((string,bytes)[])134	///  or in textual repr: setCollectionProperties((string,bytes)[])
131	function setCollectionProperties(Tuple19[] memory properties) public {135	function setCollectionProperties(Tuple21[] memory properties) public {
132		require(false, stub_error);136		require(false, stub_error);
133		properties;137		properties;
134		dummy = 0;138		dummy = 0;
148	/// Delete collection properties.152	/// Delete collection properties.
149	///153	///
150	/// @param keys Properties keys.154	/// @param keys Properties keys.
151	/// @dev EVM selector for this function is: 0xee206ee3,155	/// @dev EVM selector for this function is: 0x56d4684a,
152	///  or in textual repr: deleteCollectionProperties(string[])156	///  or in textual repr: deleteCollectionProperties(string[])
153	function deleteCollectionProperties(string[] memory keys) public {157	function deleteCollectionProperties(string[] memory keys) public {
154		require(false, stub_error);158		require(false, stub_error);
175	///179	///
176	/// @param keys Properties keys. Empty keys for all propertyes.180	/// @param keys Properties keys. Empty keys for all propertyes.
177	/// @return Vector of properties key/value pairs.181	/// @return Vector of properties key/value pairs.
178	/// @dev EVM selector for this function is: 0x285fb8e6,182	/// @dev EVM selector for this function is: 0x5cad7311,
179	///  or in textual repr: collectionProperties(string[])183	///  or in textual repr: collectionProperties(string[])
180	function collectionProperties(string[] memory keys) public view returns (Tuple19[] memory) {184	function collectionProperties(string[] memory keys) public view returns (Tuple21[] memory) {
181		require(false, stub_error);185		require(false, stub_error);
182		keys;186		keys;
183		dummy;187		dummy;
184		return new Tuple19[](0);188		return new Tuple21[](0);
185	}189	}
186190
187	/// Set the sponsor of the collection.191	/// Set the sponsor of the collection.
489493
490	/// Get collection owner.494	/// Get collection owner.
491	///495	///
492	/// @return Tuble with sponsor address and his substrate mirror.496	/// @return Tuple with sponsor address and his substrate mirror.
493	/// If address is canonical then substrate mirror is zero and vice versa.497	/// If address is canonical then substrate mirror is zero and vice versa.
494	/// @dev EVM selector for this function is: 0xdf727d3b,498	/// @dev EVM selector for this function is: 0xdf727d3b,
495	///  or in textual repr: collectionOwner()499	///  or in textual repr: collectionOwner()
551}555}
552556
553<<<<<<< HEAD557<<<<<<< HEAD
558<<<<<<< HEAD
554/// @dev anonymous struct559/// @dev anonymous struct
555struct Tuple19 {560struct Tuple19 {
556	address field_0;561	address field_0;
602607
603=======608=======
604>>>>>>> feat: Add custum signature with unlimited nesting.609>>>>>>> feat: Add custum signature with unlimited nesting.
610=======
611/// @dev anonymous struct
612struct Tuple21 {
613	string field_0;
614	bytes field_1;
615}
616
617>>>>>>> fix: after rebase
605/// @title ERC721 Token that can be irreversibly burned (destroyed).618/// @title ERC721 Token that can be irreversibly burned (destroyed).
606/// @dev the ERC-165 identifier for this interface is 0x42966c68619/// @dev the ERC-165 identifier for this interface is 0x42966c68
607contract ERC721Burnable is Dummy, ERC165 {620contract ERC721Burnable is Dummy, ERC165 {

modifiedtests/src/eth/api/UniqueNFT.soldiff before after both

7171
72/// @title A contract that allows you to work with collections.72/// @title A contract that allows you to work with collections.
73<<<<<<< HEAD73<<<<<<< HEAD
74<<<<<<< HEAD
74/// @dev the ERC-165 identifier for this interface is 0xb3152af375/// @dev the ERC-165 identifier for this interface is 0xb3152af3
75=======76=======
76/// @dev the ERC-165 identifier for this interface is 0x674be72677/// @dev the ERC-165 identifier for this interface is 0x674be726
77>>>>>>> feat: Add custum signature with unlimited nesting.78>>>>>>> feat: Add custum signature with unlimited nesting.
79=======
80/// @dev the ERC-165 identifier for this interface is 0x943ee094
81>>>>>>> fix: after rebase
78interface Collection is Dummy, ERC165 {82interface Collection is Dummy, ERC165 {
79	/// Set collection property.83	/// Set collection property.
80	///84	///
87	/// Set collection properties.91	/// Set collection properties.
88	///92	///
89	/// @param properties Vector of properties key/value pair.93	/// @param properties Vector of properties key/value pair.
90	/// @dev EVM selector for this function is: 0x50b26b2a,94	/// @dev EVM selector for this function is: 0xf90c1ce9,
91	///  or in textual repr: setCollectionProperties((string,bytes)[])95	///  or in textual repr: setCollectionProperties((string,bytes)[])
92	function setCollectionProperties(Tuple19[] memory properties) external;96	function setCollectionProperties(Tuple21[] memory properties) external;
9397
94	/// Delete collection property.98	/// Delete collection property.
95	///99	///
101	/// Delete collection properties.105	/// Delete collection properties.
102	///106	///
103	/// @param keys Properties keys.107	/// @param keys Properties keys.
104	/// @dev EVM selector for this function is: 0xee206ee3,108	/// @dev EVM selector for this function is: 0x56d4684a,
105	///  or in textual repr: deleteCollectionProperties(string[])109	///  or in textual repr: deleteCollectionProperties(string[])
106	function deleteCollectionProperties(string[] memory keys) external;110	function deleteCollectionProperties(string[] memory keys) external;
107111
119	///123	///
120	/// @param keys Properties keys. Empty keys for all propertyes.124	/// @param keys Properties keys. Empty keys for all propertyes.
121	/// @return Vector of properties key/value pairs.125	/// @return Vector of properties key/value pairs.
122	/// @dev EVM selector for this function is: 0x285fb8e6,126	/// @dev EVM selector for this function is: 0x5cad7311,
123	///  or in textual repr: collectionProperties(string[])127	///  or in textual repr: collectionProperties(string[])
124	function collectionProperties(string[] memory keys) external view returns (Tuple19[] memory);128	function collectionProperties(string[] memory keys) external view returns (Tuple21[] memory);
125129
126	/// Set the sponsor of the collection.130	/// Set the sponsor of the collection.
127	///131	///
310314
311	/// Get collection owner.315	/// Get collection owner.
312	///316	///
313	/// @return Tuble with sponsor address and his substrate mirror.317	/// @return Tuple with sponsor address and his substrate mirror.
314	/// If address is canonical then substrate mirror is zero and vice versa.318	/// If address is canonical then substrate mirror is zero and vice versa.
315	/// @dev EVM selector for this function is: 0xdf727d3b,319	/// @dev EVM selector for this function is: 0xdf727d3b,
316	///  or in textual repr: collectionOwner()320	///  or in textual repr: collectionOwner()
348	uint256 field_1;352	uint256 field_1;
349}353}
350354
355<<<<<<< HEAD
351/// @title ERC-721 Non-Fungible Token Standard, optional metadata extension356/// @title ERC-721 Non-Fungible Token Standard, optional metadata extension
352/// @dev See https://eips.ethereum.org/EIPS/eip-721357/// @dev See https://eips.ethereum.org/EIPS/eip-721
353/// @dev the ERC-165 identifier for this interface is 0x5b5e139f358/// @dev the ERC-165 identifier for this interface is 0x5b5e139f
380385
381=======386=======
382>>>>>>> feat: Add custum signature with unlimited nesting.387>>>>>>> feat: Add custum signature with unlimited nesting.
388=======
389/// @dev anonymous struct
390struct Tuple21 {
391	string field_0;
392	bytes field_1;
393}
394
395>>>>>>> fix: after rebase
383/// @title ERC721 Token that can be irreversibly burned (destroyed).396/// @title ERC721 Token that can be irreversibly burned (destroyed).
384/// @dev the ERC-165 identifier for this interface is 0x42966c68397/// @dev the ERC-165 identifier for this interface is 0x42966c68
385interface ERC721Burnable is Dummy, ERC165 {398interface ERC721Burnable is Dummy, ERC165 {

modifiedtests/src/eth/nonFungibleAbi.jsondiff before after both

268  },268  },
269  {269  {
270<<<<<<< HEAD270<<<<<<< HEAD
271<<<<<<< HEAD
272=======
273>>>>>>> fix: after rebase
271    "inputs": [274    "inputs": [
272      { "internalType": "string[]", "name": "keys", "type": "string[]" }275      { "internalType": "string[]", "name": "keys", "type": "string[]" }
273    ],276    ],
278          { "internalType": "string", "name": "field_0", "type": "string" },281          { "internalType": "string", "name": "field_0", "type": "string" },
279          { "internalType": "bytes", "name": "field_1", "type": "bytes" }282          { "internalType": "bytes", "name": "field_1", "type": "bytes" }
280        ],283        ],
284<<<<<<< HEAD
281        "internalType": "struct Tuple19[]",285        "internalType": "struct Tuple19[]",
286=======
287        "internalType": "struct Tuple21[]",
288>>>>>>> fix: after rebase
282        "name": "",289        "name": "",
283        "type": "tuple[]"290        "type": "tuple[]"
284      }291      }
285    ],292    ],
293<<<<<<< HEAD
286=======294=======
287    "inputs": [{ "internalType": "string", "name": "key", "type": "string" }],295    "inputs": [{ "internalType": "string", "name": "key", "type": "string" }],
288    "name": "collectionProperty",296    "name": "collectionProperty",
289    "outputs": [{ "internalType": "bytes", "name": "", "type": "bytes" }],297    "outputs": [{ "internalType": "bytes", "name": "", "type": "bytes" }],
290>>>>>>> feat: Add custum signature with unlimited nesting.298>>>>>>> feat: Add custum signature with unlimited nesting.
299=======
300>>>>>>> fix: after rebase
291    "stateMutability": "view",301    "stateMutability": "view",
292    "type": "function"302    "type": "function"
293  },303  },
339  },349  },
340  {350  {
341<<<<<<< HEAD351<<<<<<< HEAD
352<<<<<<< HEAD
353=======
354>>>>>>> fix: after rebase
342    "inputs": [355    "inputs": [
343      { "internalType": "string[]", "name": "keys", "type": "string[]" }356      { "internalType": "string[]", "name": "keys", "type": "string[]" }
344    ],357    ],
348    "type": "function"361    "type": "function"
349  },362  },
350  {363  {
364<<<<<<< HEAD
351=======365=======
352>>>>>>> feat: Add custum signature with unlimited nesting.366>>>>>>> feat: Add custum signature with unlimited nesting.
367=======
368>>>>>>> fix: after rebase
353    "inputs": [{ "internalType": "string", "name": "key", "type": "string" }],369    "inputs": [{ "internalType": "string", "name": "key", "type": "string" }],
354    "name": "deleteCollectionProperty",370    "name": "deleteCollectionProperty",
355    "outputs": [],371    "outputs": [],
677  {693  {
678    "inputs": [694    "inputs": [
679<<<<<<< HEAD695<<<<<<< HEAD
696<<<<<<< HEAD
697=======
698>>>>>>> fix: after rebase
680      {699      {
681        "components": [700        "components": [
682          { "internalType": "string", "name": "field_0", "type": "string" },701          { "internalType": "string", "name": "field_0", "type": "string" },
683          { "internalType": "bytes", "name": "field_1", "type": "bytes" }702          { "internalType": "bytes", "name": "field_1", "type": "bytes" }
684        ],703        ],
704<<<<<<< HEAD
685        "internalType": "struct Tuple19[]",705        "internalType": "struct Tuple19[]",
686        "name": "properties",706        "name": "properties",
687        "type": "tuple[]"707        "type": "tuple[]"
690      { "internalType": "string", "name": "key", "type": "string" },710      { "internalType": "string", "name": "key", "type": "string" },
691      { "internalType": "bytes", "name": "value", "type": "bytes" }711      { "internalType": "bytes", "name": "value", "type": "bytes" }
692>>>>>>> feat: Add custum signature with unlimited nesting.712>>>>>>> feat: Add custum signature with unlimited nesting.
713=======
714        "internalType": "struct Tuple21[]",
715        "name": "properties",
716        "type": "tuple[]"
717      }
718>>>>>>> fix: after rebase
693    ],719    ],
694    "name": "setCollectionProperties",720    "name": "setCollectionProperties",
695    "outputs": [],721    "outputs": [],