git.delta.rocks / unique-network / refs/commits / 2ba119d71c40

difftreelog

misc: update stubs

Trubnikov Sergey2022-08-25parent: #41b5a1d.patch.diff
in: master

12 files changed

modifiedpallets/evm-contract-helpers/src/stubs/ContractHelpers.soldiffbeforeafterboth
--- a/pallets/evm-contract-helpers/src/stubs/ContractHelpers.sol
+++ b/pallets/evm-contract-helpers/src/stubs/ContractHelpers.sol
@@ -22,6 +22,7 @@
 }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
 /// @title Magic contract, which allows users to reconfigure other contracts
 /// @dev the ERC-165 identifier for this interface is 0xd77fab70
 =======
@@ -31,6 +32,9 @@
 // Selector: 06fc42e9
 >>>>>>> path: add stubs
 >>>>>>> path: add stubs
+=======
+// Selector: 6073d917
+>>>>>>> misc: update stubs
 contract ContractHelpers is Dummy, ERC165 {
 	/// Get user, which deployed specified contract
 	/// @dev May return zero address in case if contract is deployed
@@ -53,6 +57,7 @@
 	}
 
 <<<<<<< HEAD
+<<<<<<< HEAD
 	/// Set sponsor.
 	/// @param contractAddress Contract for which a sponsor is being established.
 	/// @param sponsor User address who set as pending sponsor.
@@ -60,13 +65,13 @@
 	///  or in textual repr: setSponsor(address,address)
 =======
 <<<<<<< HEAD
+=======
+>>>>>>> misc: update stubs
 	// Set sponsor.
 	//
 	// @param contract_address Contract for which a sponsor is being established.
 	// @param sponsor User address who set as pending sponsor.
 	//
-=======
->>>>>>> path: add stubs
 	// Selector: setSponsor(address,address) f01fba93
 >>>>>>> path: add stubs
 	function setSponsor(address contractAddress, address sponsor) public {
@@ -77,6 +82,7 @@
 	}
 
 <<<<<<< HEAD
+<<<<<<< HEAD
 	/// Set contract as self sponsored.
 	///
 	/// @param contractAddress Contract for which a self sponsoring is being enabled.
@@ -84,6 +90,8 @@
 	///  or in textual repr: selfSponsoredEnable(address)
 =======
 <<<<<<< HEAD
+=======
+>>>>>>> misc: update stubs
 	// Set contract as self sponsored.
 	//
 	// @param contract_address Contract for which a self sponsoring is being enabled.
@@ -91,16 +99,13 @@
 	// Selector: selfSponsoredEnable(address) 89f7d9ae
 >>>>>>> path: add stubs
 	function selfSponsoredEnable(address contractAddress) public {
-=======
-	// Selector: confirmSponsorship(address) abc00001
-	function confirmSponsorship(address contractAddress) public {
->>>>>>> path: add stubs
 		require(false, stub_error);
 		contractAddress;
 		dummy = 0;
 	}
 
 <<<<<<< HEAD
+<<<<<<< HEAD
 	/// Remove sponsor.
 	///
 	/// @param contractAddress Contract for which a sponsorship is being removed.
@@ -108,6 +113,8 @@
 	///  or in textual repr: removeSponsor(address)
 =======
 <<<<<<< HEAD
+=======
+>>>>>>> misc: update stubs
 	// Remove sponsor.
 	//
 	// @param contract_address Contract for which a sponsorship is being removed.
@@ -140,9 +147,6 @@
 	/// @dev EVM selector for this function is: 0x743fc745,
 	///  or in textual repr: getSponsor(address)
 	function getSponsor(address contractAddress)
-=======
-	// Selector: getSponsor(address) 743fc745
-	function getSponsor(address contractAddress)
 		public
 		view
 		returns (Tuple0 memory)
@@ -153,27 +157,6 @@
 		return Tuple0(0x0000000000000000000000000000000000000000, 0);
 	}
 
-	// Selector: hasSponsor(address) 97418603
-	function hasSponsor(address contractAddress) public view returns (bool) {
-		require(false, stub_error);
-		contractAddress;
-		dummy;
-		return false;
-	}
-
-	// Selector: hasPendingSponsor(address) 39b9b242
-	function hasPendingSponsor(address contractAddress)
->>>>>>> path: add stubs
-		public
-		view
-		returns (Tuple0 memory)
-	{
-		require(false, stub_error);
-		contractAddress;
-		dummy;
-		return Tuple0(0x0000000000000000000000000000000000000000, 0);
-	}
-
 	/// Check tat contract has confirmed sponsor.
 	///
 	/// @param contractAddress The contract for which the presence of a confirmed sponsor is checked.
@@ -188,6 +171,7 @@
 	}
 
 <<<<<<< HEAD
+<<<<<<< HEAD
 	/// Check tat contract has pending sponsor.
 	///
 	/// @param contractAddress The contract for which the presence of a pending sponsor is checked.
@@ -196,6 +180,8 @@
 	///  or in textual repr: hasPendingSponsor(address)
 =======
 <<<<<<< HEAD
+=======
+>>>>>>> misc: update stubs
 	// Check tat contract has pending sponsor.
 	//
 	// @param contract_address The contract for which the presence of a pending sponsor is checked.
@@ -204,10 +190,6 @@
 	// Selector: hasPendingSponsor(address) 39b9b242
 >>>>>>> path: add stubs
 	function hasPendingSponsor(address contractAddress)
-=======
-	// Selector: sponsoringEnabled(address) 6027dc61
-	function sponsoringEnabled(address contractAddress)
->>>>>>> path: add stubs
 		public
 		view
 		returns (bool)
@@ -216,7 +198,6 @@
 		contractAddress;
 		dummy;
 		return false;
-<<<<<<< HEAD
 	}
 
 	/// @dev EVM selector for this function is: 0x6027dc61,
@@ -230,8 +211,6 @@
 		contractAddress;
 		dummy;
 		return false;
-=======
->>>>>>> path: add stubs
 	}
 
 	/// @dev EVM selector for this function is: 0xfde8a560,
modifiedpallets/fungible/src/stubs/UniqueFungible.soldiffbeforeafterboth
--- a/pallets/fungible/src/stubs/UniqueFungible.sol
+++ b/pallets/fungible/src/stubs/UniqueFungible.sol
@@ -45,7 +45,6 @@
 	);
 }
 
-<<<<<<< HEAD
 // Selector: 79cc6790
 contract ERC20UniqueExtensions is Dummy, ERC165 {
 	// Selector: burnFrom(address,uint256) 79cc6790
@@ -142,11 +141,15 @@
 	}
 }
 
+<<<<<<< HEAD
 // Selector: ffe4da23
 =======
 // Selector: 765e2fae
 >>>>>>> misk: Update stubs
 >>>>>>> misk: Update stubs
+=======
+// Selector: e54be640
+>>>>>>> misc: update stubs
 contract Collection is Dummy, ERC165 {
 	/// Set collection property.
 	///
modifiedpallets/nonfungible/src/stubs/UniqueNFT.soldiffbeforeafterboth
before · pallets/nonfungible/src/stubs/UniqueNFT.sol
1// SPDX-License-Identifier: OTHER2// This code is automatically generated34pragma solidity >=0.8.0 <0.9.0;56<<<<<<< HEAD7/// @dev common stubs holder8=======9// Anonymous struct10struct Tuple0 {11	uint256 field_0;12	string field_1;13}1415// Anonymous struct16struct Tuple1 {17	address field_0;18	uint256 field_1;19}2021// Common stubs holder22>>>>>>> misk: Update stubs23contract Dummy {24	uint8 dummy;25	string stub_error = "this contract is implemented in native";26}2728contract ERC165 is Dummy {29	function supportsInterface(bytes4 interfaceID)30		external31		view32		returns (bool)33	{34		require(false, stub_error);35		interfaceID;36		return true;37	}38}3940/// @title A contract that allows to set and delete token properties and change token property permissions.41/// @dev the ERC-165 identifier for this interface is 0x4136937742contract TokenProperties is Dummy, ERC165 {43	/// @notice Set permissions for token property.44	/// @dev Throws error if `msg.sender` is not admin or owner of the collection.45	/// @param key Property key.46	/// @param isMutable Permission to mutate property.47	/// @param collectionAdmin Permission to mutate property by collection admin if property is mutable.48	/// @param tokenOwner Permission to mutate property by token owner if property is mutable.49	/// @dev EVM selector for this function is: 0x222d97fa,50	///  or in textual repr: setTokenPropertyPermission(string,bool,bool,bool)51	function setTokenPropertyPermission(52		string memory key,53		bool isMutable,54		bool collectionAdmin,55		bool tokenOwner56	) public {57		require(false, stub_error);58		key;59		isMutable;60		collectionAdmin;61		tokenOwner;62		dummy = 0;63	}6465	/// @notice Set token property value.66	/// @dev Throws error if `msg.sender` has no permission to edit the property.67	/// @param tokenId ID of the token.68	/// @param key Property key.69	/// @param value Property value.70	/// @dev EVM selector for this function is: 0x1752d67b,71	///  or in textual repr: setProperty(uint256,string,bytes)72	function setProperty(73		uint256 tokenId,74		string memory key,75		bytes memory value76	) public {77		require(false, stub_error);78		tokenId;79		key;80		value;81		dummy = 0;82	}8384	/// @notice Delete token property value.85	/// @dev Throws error if `msg.sender` has no permission to edit the property.86	/// @param tokenId ID of the token.87	/// @param key Property key.88	/// @dev EVM selector for this function is: 0x066111d1,89	///  or in textual repr: deleteProperty(uint256,string)90	function deleteProperty(uint256 tokenId, string memory key) public {91		require(false, stub_error);92		tokenId;93		key;94		dummy = 0;95	}9697	/// @notice Get token property value.98	/// @dev Throws error if key not found99	/// @param tokenId ID of the token.100	/// @param key Property key.101	/// @return Property value bytes102	/// @dev EVM selector for this function is: 0x7228c327,103	///  or in textual repr: property(uint256,string)104	function property(uint256 tokenId, string memory key)105		public106		view107		returns (bytes memory)108	{109		require(false, stub_error);110		tokenId;111		key;112		dummy;113		return hex"";114	}115}116117/// @title A contract that allows you to work with collections.118/// @dev the ERC-165 identifier for this interface is 0xffe4da23119contract Collection is Dummy, ERC165 {120	/// Set collection property.121	///122	/// @param key Property key.123	/// @param value Propery value.124	/// @dev EVM selector for this function is: 0x2f073f66,125	///  or in textual repr: setCollectionProperty(string,bytes)126	function setCollectionProperty(string memory key, bytes memory value)127		public128	{129		require(false, stub_error);130		key;131		value;132		dummy = 0;133	}134135	/// Delete collection property.136	///137	/// @param key Property key.138	/// @dev EVM selector for this function is: 0x7b7debce,139	///  or in textual repr: deleteCollectionProperty(string)140	function deleteCollectionProperty(string memory key) public {141		require(false, stub_error);142		key;143		dummy = 0;144	}145146	/// Get collection property.147	///148	/// @dev Throws error if key not found.149	///150	/// @param key Property key.151	/// @return bytes The property corresponding to the key.152	/// @dev EVM selector for this function is: 0xcf24fd6d,153	///  or in textual repr: collectionProperty(string)154	function collectionProperty(string memory key)155		public156		view157		returns (bytes memory)158	{159		require(false, stub_error);160		key;161		dummy;162		return hex"";163	}164165	/// Set the sponsor of the collection.166	///167	/// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.168	///169	/// @param sponsor Address of the sponsor from whose account funds will be debited for operations with the contract.170	/// @dev EVM selector for this function is: 0x7623402e,171	///  or in textual repr: setCollectionSponsor(address)172	function setCollectionSponsor(address sponsor) public {173		require(false, stub_error);174		sponsor;175		dummy = 0;176	}177178	/// Collection sponsorship confirmation.179	///180	/// @dev After setting the sponsor for the collection, it must be confirmed with this function.181	/// @dev EVM selector for this function is: 0x3c50e97a,182	///  or in textual repr: confirmCollectionSponsorship()183	function confirmCollectionSponsorship() public {184		require(false, stub_error);185		dummy = 0;186	}187188	/// Set limits for the collection.189	/// @dev Throws error if limit not found.190	/// @param limit Name of the limit. Valid names:191	/// 	"accountTokenOwnershipLimit",192	/// 	"sponsoredDataSize",193	/// 	"sponsoredDataRateLimit",194	/// 	"tokenLimit",195	/// 	"sponsorTransferTimeout",196	/// 	"sponsorApproveTimeout"197	/// @param value Value of the limit.198	/// @dev EVM selector for this function is: 0x6a3841db,199	///  or in textual repr: setCollectionLimit(string,uint32)200	function setCollectionLimit(string memory limit, uint32 value) public {201		require(false, stub_error);202		limit;203		value;204		dummy = 0;205	}206207	/// Set limits for the collection.208	/// @dev Throws error if limit not found.209	/// @param limit Name of the limit. Valid names:210	/// 	"ownerCanTransfer",211	/// 	"ownerCanDestroy",212	/// 	"transfersEnabled"213	/// @param value Value of the limit.214	/// @dev EVM selector for this function is: 0x993b7fba,215	///  or in textual repr: setCollectionLimit(string,bool)216	function setCollectionLimit(string memory limit, bool value) public {217		require(false, stub_error);218		limit;219		value;220		dummy = 0;221	}222223	/// Get contract address.224	/// @dev EVM selector for this function is: 0xf6b4dfb4,225	///  or in textual repr: contractAddress()226	function contractAddress() public view returns (address) {227		require(false, stub_error);228		dummy;229		return 0x0000000000000000000000000000000000000000;230	}231232	/// Add collection admin by substrate address.233	/// @param newAdmin Substrate administrator address.234	/// @dev EVM selector for this function is: 0x5730062b,235	///  or in textual repr: addCollectionAdminSubstrate(uint256)236	function addCollectionAdminSubstrate(uint256 newAdmin) public {237		require(false, stub_error);238		newAdmin;239		dummy = 0;240	}241242	/// Remove collection admin by substrate address.243	/// @param admin Substrate administrator address.244	/// @dev EVM selector for this function is: 0x4048fcf9,245	///  or in textual repr: removeCollectionAdminSubstrate(uint256)246	function removeCollectionAdminSubstrate(uint256 admin) public {247		require(false, stub_error);248		admin;249		dummy = 0;250	}251252	/// Add collection admin.253	/// @param newAdmin Address of the added administrator.254	/// @dev EVM selector for this function is: 0x92e462c7,255	///  or in textual repr: addCollectionAdmin(address)256	function addCollectionAdmin(address newAdmin) public {257		require(false, stub_error);258		newAdmin;259		dummy = 0;260	}261262	/// Remove collection admin.263	///264	/// @param admin Address of the removed administrator.265	/// @dev EVM selector for this function is: 0xfafd7b42,266	///  or in textual repr: removeCollectionAdmin(address)267	function removeCollectionAdmin(address admin) public {268		require(false, stub_error);269		admin;270		dummy = 0;271	}272273	/// Toggle accessibility of collection nesting.274	///275	/// @param enable If "true" degenerates to nesting: 'Owner' else to nesting: 'Disabled'276	/// @dev EVM selector for this function is: 0x112d4586,277	///  or in textual repr: setCollectionNesting(bool)278	function setCollectionNesting(bool enable) public {279		require(false, stub_error);280		enable;281		dummy = 0;282	}283284	/// Toggle accessibility of collection nesting.285	///286	/// @param enable If "true" degenerates to nesting: {OwnerRestricted: [1, 2, 3]} else to nesting: 'Disabled'287	/// @param collections Addresses of collections that will be available for nesting.288	/// @dev EVM selector for this function is: 0x64872396,289	///  or in textual repr: setCollectionNesting(bool,address[])290	function setCollectionNesting(bool enable, address[] memory collections)291		public292	{293		require(false, stub_error);294		enable;295		collections;296		dummy = 0;297	}298299	/// Set the collection access method.300	/// @param mode Access mode301	/// 	0 for Normal302	/// 	1 for AllowList303	/// @dev EVM selector for this function is: 0x41835d4c,304	///  or in textual repr: setCollectionAccess(uint8)305	function setCollectionAccess(uint8 mode) public {306		require(false, stub_error);307		mode;308		dummy = 0;309	}310311	/// Add the user to the allowed list.312	///313	/// @param user Address of a trusted user.314	/// @dev EVM selector for this function is: 0x67844fe6,315	///  or in textual repr: addToCollectionAllowList(address)316	function addToCollectionAllowList(address user) public {317		require(false, stub_error);318		user;319		dummy = 0;320	}321322	/// Remove the user from the allowed list.323	///324	/// @param user Address of a removed user.325	/// @dev EVM selector for this function is: 0x85c51acb,326	///  or in textual repr: removeFromCollectionAllowList(address)327	function removeFromCollectionAllowList(address user) public {328		require(false, stub_error);329		user;330		dummy = 0;331	}332333	/// Switch permission for minting.334	///335	/// @param mode Enable if "true".336	/// @dev EVM selector for this function is: 0x00018e84,337	///  or in textual repr: setCollectionMintMode(bool)338	function setCollectionMintMode(bool mode) public {339		require(false, stub_error);340		mode;341		dummy = 0;342	}343344	/// Check that account is the owner or admin of the collection345	///346	/// @param user account to verify347	/// @return "true" if account is the owner or admin348	/// @dev EVM selector for this function is: 0x9811b0c7,349	///  or in textual repr: isOwnerOrAdmin(address)350	function isOwnerOrAdmin(address user) public view returns (bool) {351		require(false, stub_error);352		user;353		dummy;354		return false;355	}356357	/// Check that substrate account is the owner or admin of the collection358	///359	/// @param user account to verify360	/// @return "true" if account is the owner or admin361	/// @dev EVM selector for this function is: 0x68910e00,362	///  or in textual repr: isOwnerOrAdminSubstrate(uint256)363	function isOwnerOrAdminSubstrate(uint256 user) public view returns (bool) {364		require(false, stub_error);365		user;366		dummy;367		return false;368	}369370	/// Returns collection type371	///372	/// @return `Fungible` or `NFT` or `ReFungible`373	/// @dev EVM selector for this function is: 0xd34b55b8,374	///  or in textual repr: uniqueCollectionType()375	function uniqueCollectionType() public returns (string memory) {376		require(false, stub_error);377		dummy = 0;378		return "";379	}380381	/// Changes collection owner to another account382	///383	/// @dev Owner can be changed only by current owner384	/// @param newOwner new owner account385	/// @dev EVM selector for this function is: 0x13af4035,386	///  or in textual repr: setOwner(address)387	function setOwner(address newOwner) public {388		require(false, stub_error);389		newOwner;390		dummy = 0;391	}392393	/// Changes collection owner to another substrate account394	///395	/// @dev Owner can be changed only by current owner396	/// @param newOwner new owner substrate account397	/// @dev EVM selector for this function is: 0xb212138f,398	///  or in textual repr: setOwnerSubstrate(uint256)399	function setOwnerSubstrate(uint256 newOwner) public {400		require(false, stub_error);401		newOwner;402		dummy = 0;403	}404}405406/// @title ERC721 Token that can be irreversibly burned (destroyed).407/// @dev the ERC-165 identifier for this interface is 0x42966c68408contract ERC721Burnable is Dummy, ERC165 {409	/// @notice Burns a specific ERC721 token.410	/// @dev Throws unless `msg.sender` is the current NFT owner, or an authorized411	///  operator of the current owner.412	/// @param tokenId The NFT to approve413	/// @dev EVM selector for this function is: 0x42966c68,414	///  or in textual repr: burn(uint256)415	function burn(uint256 tokenId) public {416		require(false, stub_error);417		tokenId;418		dummy = 0;419	}420}421422/// @dev inlined interface423contract ERC721MintableEvents {424	event MintingFinished();425}426427/// @title ERC721 minting logic.428/// @dev the ERC-165 identifier for this interface is 0x68ccfe89429contract ERC721Mintable is Dummy, ERC165, ERC721MintableEvents {430	/// @dev EVM selector for this function is: 0x05d2035b,431	///  or in textual repr: mintingFinished()432	function mintingFinished() public view returns (bool) {433		require(false, stub_error);434		dummy;435		return false;436	}437438	/// @notice Function to mint token.439	/// @dev `tokenId` should be obtained with `nextTokenId` method,440	///  unlike standard, you can't specify it manually441	/// @param to The new owner442	/// @param tokenId ID of the minted NFT443	/// @dev EVM selector for this function is: 0x40c10f19,444	///  or in textual repr: mint(address,uint256)445	function mint(address to, uint256 tokenId) public returns (bool) {446		require(false, stub_error);447		to;448		tokenId;449		dummy = 0;450		return false;451	}452453	/// @notice Function to mint token with the given tokenUri.454	/// @dev `tokenId` should be obtained with `nextTokenId` method,455	///  unlike standard, you can't specify it manually456	/// @param to The new owner457	/// @param tokenId ID of the minted NFT458	/// @param tokenUri Token URI that would be stored in the NFT properties459	/// @dev EVM selector for this function is: 0x50bb4e7f,460	///  or in textual repr: mintWithTokenURI(address,uint256,string)461	function mintWithTokenURI(462		address to,463		uint256 tokenId,464		string memory tokenUri465	) public returns (bool) {466		require(false, stub_error);467		to;468		tokenId;469		tokenUri;470		dummy = 0;471		return false;472	}473474	/// @dev Not implemented475	/// @dev EVM selector for this function is: 0x7d64bcb4,476	///  or in textual repr: finishMinting()477	function finishMinting() public returns (bool) {478		require(false, stub_error);479		dummy = 0;480		return false;481	}482}483484<<<<<<< HEAD485/// @title Unique extensions for ERC721.486/// @dev the ERC-165 identifier for this interface is 0xd74d154f487=======488<<<<<<< HEAD489// Selector: 780e9d63490contract ERC721Enumerable is Dummy, ERC165 {491	// @notice Enumerate valid NFTs492	// @param index A counter less than `totalSupply()`493	// @return The token identifier for the `index`th NFT,494	//  (sort order not specified)495	//496	// Selector: tokenByIndex(uint256) 4f6ccce7497	function tokenByIndex(uint256 index) public view returns (uint256) {498		require(false, stub_error);499		index;500		dummy;501		return 0;502	}503504	// @dev Not implemented505	//506	// Selector: tokenOfOwnerByIndex(address,uint256) 2f745c59507	function tokenOfOwnerByIndex(address owner, uint256 index)508		public509		view510		returns (uint256)511	{512		require(false, stub_error);513		owner;514		index;515		dummy;516		return 0;517	}518519	// @notice Count NFTs tracked by this contract520	// @return A count of valid NFTs tracked by this contract, where each one of521	//  them has an assigned and queryable owner not equal to the zero address522	//523	// Selector: totalSupply() 18160ddd524	function totalSupply() public view returns (uint256) {525		require(false, stub_error);526		dummy;527		return 0;528	}529}530531// Selector: d74d154f532>>>>>>> misk: Update stubs533contract ERC721UniqueExtensions is Dummy, ERC165 {534	/// @notice Transfer ownership of an NFT535	/// @dev Throws unless `msg.sender` is the current owner. Throws if `to`536	///  is the zero address. Throws if `tokenId` is not a valid NFT.537	/// @param to The new owner538	/// @param tokenId The NFT to transfer539	/// @dev EVM selector for this function is: 0xa9059cbb,540	///  or in textual repr: transfer(address,uint256)541	function transfer(address to, uint256 tokenId) public {542		require(false, stub_error);543		to;544		tokenId;545		dummy = 0;546	}547548	/// @notice Burns a specific ERC721 token.549	/// @dev Throws unless `msg.sender` is the current owner or an authorized550	///  operator for this NFT. Throws if `from` is not the current owner. Throws551	///  if `to` is the zero address. Throws if `tokenId` is not a valid NFT.552	/// @param from The current owner of the NFT553	/// @param tokenId The NFT to transfer554	/// @dev EVM selector for this function is: 0x79cc6790,555	///  or in textual repr: burnFrom(address,uint256)556	function burnFrom(address from, uint256 tokenId) public {557		require(false, stub_error);558		from;559		tokenId;560		dummy = 0;561	}562563	/// @notice Returns next free NFT ID.564	/// @dev EVM selector for this function is: 0x75794a3c,565	///  or in textual repr: nextTokenId()566	function nextTokenId() public view returns (uint256) {567		require(false, stub_error);568		dummy;569		return 0;570	}571572	/// @notice Function to mint multiple tokens.573	/// @dev `tokenIds` should be an array of consecutive numbers and first number574	///  should be obtained with `nextTokenId` method575	/// @param to The new owner576	/// @param tokenIds IDs of the minted NFTs577	/// @dev EVM selector for this function is: 0x44a9945e,578	///  or in textual repr: mintBulk(address,uint256[])579	function mintBulk(address to, uint256[] memory tokenIds)580		public581		returns (bool)582	{583		require(false, stub_error);584		to;585		tokenIds;586		dummy = 0;587		return false;588	}589590	/// @notice Function to mint multiple tokens with the given tokenUris.591	/// @dev `tokenIds` is array of pairs of token ID and token URI. Token IDs should be consecutive592	///  numbers and first number should be obtained with `nextTokenId` method593	/// @param to The new owner594	/// @param tokens array of pairs of token ID and token URI for minted tokens595	/// @dev EVM selector for this function is: 0x36543006,596	///  or in textual repr: mintBulkWithTokenURI(address,(uint256,string)[])597	function mintBulkWithTokenURI(address to, Tuple8[] memory tokens)598		public599		returns (bool)600	{601		require(false, stub_error);602		to;603		tokens;604		dummy = 0;605		return false;606	}607}608609<<<<<<< HEAD610/// @dev anonymous struct611struct Tuple8 {612	uint256 field_0;613	string field_1;614}615=======616// Selector: ffe4da23617=======618// Selector: 765e2fae619>>>>>>> misk: Update stubs620contract Collection is Dummy, ERC165 {621	// Set collection property.622	//623	// @param key Property key.624	// @param value Propery value.625	//626	// Selector: setCollectionProperty(string,bytes) 2f073f66627	function setCollectionProperty(string memory key, bytes memory value)628		public629	{630		require(false, stub_error);631		key;632		value;633		dummy = 0;634	}635>>>>>>> misk: Update stubs636637/// @title ERC-721 Non-Fungible Token Standard, optional enumeration extension638/// @dev See https://eips.ethereum.org/EIPS/eip-721639/// @dev the ERC-165 identifier for this interface is 0x780e9d63640contract ERC721Enumerable is Dummy, ERC165 {641	/// @notice Enumerate valid NFTs642	/// @param index A counter less than `totalSupply()`643	/// @return The token identifier for the `index`th NFT,644	///  (sort order not specified)645	/// @dev EVM selector for this function is: 0x4f6ccce7,646	///  or in textual repr: tokenByIndex(uint256)647	function tokenByIndex(uint256 index) public view returns (uint256) {648		require(false, stub_error);649		index;650		dummy;651		return 0;652	}653654	/// @dev Not implemented655	/// @dev EVM selector for this function is: 0x2f745c59,656	///  or in textual repr: tokenOfOwnerByIndex(address,uint256)657	function tokenOfOwnerByIndex(address owner, uint256 index)658		public659		view660		returns (uint256)661	{662		require(false, stub_error);663		owner;664		index;665		dummy;666<<<<<<< HEAD667		return 0;668=======669		return hex"";670	}671672	// Set the sponsor of the collection.673	//674	// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.675	//676	// @param sponsor Address of the sponsor from whose account funds will be debited for operations with the contract.677	//678	// Selector: setCollectionSponsor(address) 7623402e679	function setCollectionSponsor(address sponsor) public {680		require(false, stub_error);681		sponsor;682		dummy = 0;683	}684685	// Set the substrate sponsor of the collection.686	//687	// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.688	//689	// @param sponsor Substrate address of the sponsor from whose account funds will be debited for operations with the contract.690	//691	// Selector: setCollectionSponsorSubstrate(uint256) c74d6751692	function setCollectionSponsorSubstrate(uint256 sponsor) public {693		require(false, stub_error);694		sponsor;695		dummy = 0;696	}697698	// Selector: hasCollectionPendingSponsor() 058ac185699	function hasCollectionPendingSponsor() public view returns (bool) {700		require(false, stub_error);701		dummy;702		return false;703	}704705	// Collection sponsorship confirmation.706	//707	// @dev After setting the sponsor for the collection, it must be confirmed with this function.708	//709	// Selector: confirmCollectionSponsorship() 3c50e97a710	function confirmCollectionSponsorship() public {711		require(false, stub_error);712		dummy = 0;713	}714715	// Remove collection sponsor.716	//717	// Selector: removeCollectionSponsor() 6e0326a3718	function removeCollectionSponsor() public {719		require(false, stub_error);720		dummy = 0;721	}722723	// Get current sponsor.724	//725	// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.726	//727	// Selector: getCollectionSponsor() b66bbc14728	function getCollectionSponsor() public view returns (Tuple1 memory) {729		require(false, stub_error);730		dummy;731		return Tuple1(0x0000000000000000000000000000000000000000, 0);732	}733734	// Set limits for the collection.735	// @dev Throws error if limit not found.736	// @param limit Name of the limit. Valid names:737	// 	"accountTokenOwnershipLimit",738	// 	"sponsoredDataSize",739	// 	"sponsoredDataRateLimit",740	// 	"tokenLimit",741	// 	"sponsorTransferTimeout",742	// 	"sponsorApproveTimeout"743	// @param value Value of the limit.744	//745	// Selector: setCollectionLimit(string,uint32) 6a3841db746	function setCollectionLimit(string memory limit, uint32 value) public {747		require(false, stub_error);748		limit;749		value;750		dummy = 0;751>>>>>>> misk: Update stubs752	}753754	/// @notice Count NFTs tracked by this contract755	/// @return A count of valid NFTs tracked by this contract, where each one of756	///  them has an assigned and queryable owner not equal to the zero address757	/// @dev EVM selector for this function is: 0x18160ddd,758	///  or in textual repr: totalSupply()759	function totalSupply() public view returns (uint256) {760		require(false, stub_error);761		dummy;762		return 0;763	}764}765766/// @title ERC-721 Non-Fungible Token Standard, optional metadata extension767/// @dev See https://eips.ethereum.org/EIPS/eip-721768/// @dev the ERC-165 identifier for this interface is 0x5b5e139f769contract ERC721Metadata is Dummy, ERC165 {770	/// @notice A descriptive name for a collection of NFTs in this contract771	/// @dev EVM selector for this function is: 0x06fdde03,772	///  or in textual repr: name()773	function name() public view returns (string memory) {774		require(false, stub_error);775		dummy;776		return "";777	}778779	/// @notice An abbreviated name for NFTs in this contract780	/// @dev EVM selector for this function is: 0x95d89b41,781	///  or in textual repr: symbol()782	function symbol() public view returns (string memory) {783		require(false, stub_error);784		dummy;785		return "";786	}787788	/// @notice A distinct Uniform Resource Identifier (URI) for a given asset.789	///790	/// @dev If the token has a `url` property and it is not empty, it is returned.791	///  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`.792	///  If the collection property `baseURI` is empty or absent, return "" (empty string)793	///  otherwise, if token property `suffix` present and is non-empty, return concatenation of baseURI and suffix794	///  otherwise, return concatenation of `baseURI` and stringified token id (decimal stringifying, without paddings).795	///796	/// @return token's const_metadata797	/// @dev EVM selector for this function is: 0xc87b56dd,798	///  or in textual repr: tokenURI(uint256)799	function tokenURI(uint256 tokenId) public view returns (string memory) {800		require(false, stub_error);801		tokenId;802		dummy;803		return "";804	}805}806807/// @dev inlined interface808contract ERC721Events {809	event Transfer(810		address indexed from,811		address indexed to,812		uint256 indexed tokenId813	);814	event Approval(815		address indexed owner,816		address indexed approved,817		uint256 indexed tokenId818	);819	event ApprovalForAll(820		address indexed owner,821		address indexed operator,822		bool approved823	);824}825826/// @title ERC-721 Non-Fungible Token Standard827/// @dev See https://github.com/ethereum/EIPs/blob/master/EIPS/eip-721.md828/// @dev the ERC-165 identifier for this interface is 0x80ac58cd829contract ERC721 is Dummy, ERC165, ERC721Events {830	/// @notice Count all NFTs assigned to an owner831	/// @dev NFTs assigned to the zero address are considered invalid, and this832	///  function throws for queries about the zero address.833	/// @param owner An address for whom to query the balance834	/// @return The number of NFTs owned by `owner`, possibly zero835	/// @dev EVM selector for this function is: 0x70a08231,836	///  or in textual repr: balanceOf(address)837	function balanceOf(address owner) public view returns (uint256) {838		require(false, stub_error);839		owner;840		dummy;841		return 0;842	}843844	/// @notice Find the owner of an NFT845	/// @dev NFTs assigned to zero address are considered invalid, and queries846	///  about them do throw.847	/// @param tokenId The identifier for an NFT848	/// @return The address of the owner of the NFT849	/// @dev EVM selector for this function is: 0x6352211e,850	///  or in textual repr: ownerOf(uint256)851	function ownerOf(uint256 tokenId) public view returns (address) {852		require(false, stub_error);853		tokenId;854		dummy;855		return 0x0000000000000000000000000000000000000000;856	}857858	/// @dev Not implemented859	/// @dev EVM selector for this function is: 0xb88d4fde,860	///  or in textual repr: safeTransferFrom(address,address,uint256,bytes)861	function safeTransferFrom(862		address from,863		address to,864		uint256 tokenId,865		bytes memory data866	) public {867		require(false, stub_error);868		from;869		to;870		tokenId;871		data;872		dummy = 0;873	}874875	/// @dev Not implemented876	/// @dev EVM selector for this function is: 0x42842e0e,877	///  or in textual repr: safeTransferFrom(address,address,uint256)878	function safeTransferFrom(879		address from,880		address to,881		uint256 tokenId882	) public {883		require(false, stub_error);884		from;885		to;886		tokenId;887		dummy = 0;888	}889890	/// @notice Transfer ownership of an NFT -- THE CALLER IS RESPONSIBLE891	///  TO CONFIRM THAT `to` IS CAPABLE OF RECEIVING NFTS OR ELSE892	///  THEY MAY BE PERMANENTLY LOST893	/// @dev Throws unless `msg.sender` is the current owner or an authorized894	///  operator for this NFT. Throws if `from` is not the current owner. Throws895	///  if `to` is the zero address. Throws if `tokenId` is not a valid NFT.896	/// @param from The current owner of the NFT897	/// @param to The new owner898	/// @param tokenId The NFT to transfer899	/// @dev EVM selector for this function is: 0x23b872dd,900	///  or in textual repr: transferFrom(address,address,uint256)901	function transferFrom(902		address from,903		address to,904		uint256 tokenId905	) public {906		require(false, stub_error);907		from;908		to;909		tokenId;910		dummy = 0;911	}912913	/// @notice Set or reaffirm the approved address for an NFT914	/// @dev The zero address indicates there is no approved address.915	/// @dev Throws unless `msg.sender` is the current NFT owner, or an authorized916	///  operator of the current owner.917	/// @param approved The new approved NFT controller918	/// @param tokenId The NFT to approve919	/// @dev EVM selector for this function is: 0x095ea7b3,920	///  or in textual repr: approve(address,uint256)921	function approve(address approved, uint256 tokenId) public {922		require(false, stub_error);923		approved;924		tokenId;925		dummy = 0;926	}927928	/// @dev Not implemented929	/// @dev EVM selector for this function is: 0xa22cb465,930	///  or in textual repr: setApprovalForAll(address,bool)931	function setApprovalForAll(address operator, bool approved) public {932		require(false, stub_error);933		operator;934		approved;935		dummy = 0;936	}937938	/// @dev Not implemented939	/// @dev EVM selector for this function is: 0x081812fc,940	///  or in textual repr: getApproved(uint256)941	function getApproved(uint256 tokenId) public view returns (address) {942		require(false, stub_error);943		tokenId;944		dummy;945		return 0x0000000000000000000000000000000000000000;946	}947948	/// @dev Not implemented949	/// @dev EVM selector for this function is: 0xe985e9c5,950	///  or in textual repr: isApprovedForAll(address,address)951	function isApprovedForAll(address owner, address operator)952		public953		view954		returns (address)955	{956		require(false, stub_error);957		owner;958		operator;959		dummy;960		return 0x0000000000000000000000000000000000000000;961	}962}963964contract UniqueNFT is965	Dummy,966	ERC165,967	ERC721,968	ERC721Metadata,969	ERC721Enumerable,970	ERC721UniqueExtensions,971	ERC721Mintable,972	ERC721Burnable,973	Collection,974	TokenProperties975{}
after · pallets/nonfungible/src/stubs/UniqueNFT.sol
1// SPDX-License-Identifier: OTHER2// This code is automatically generated34pragma solidity >=0.8.0 <0.9.0;56<<<<<<< HEAD7/// @dev common stubs holder8=======9// Anonymous struct10struct Tuple0 {11	uint256 field_0;12	string field_1;13}1415// Anonymous struct16struct Tuple1 {17	address field_0;18	uint256 field_1;19}2021// Common stubs holder22>>>>>>> misk: Update stubs23contract Dummy {24	uint8 dummy;25	string stub_error = "this contract is implemented in native";26}2728contract ERC165 is Dummy {29	function supportsInterface(bytes4 interfaceID)30		external31		view32		returns (bool)33	{34		require(false, stub_error);35		interfaceID;36		return true;37	}38}3940/// @title A contract that allows to set and delete token properties and change token property permissions.41/// @dev the ERC-165 identifier for this interface is 0x4136937742contract TokenProperties is Dummy, ERC165 {43	/// @notice Set permissions for token property.44	/// @dev Throws error if `msg.sender` is not admin or owner of the collection.45	/// @param key Property key.46	/// @param isMutable Permission to mutate property.47	/// @param collectionAdmin Permission to mutate property by collection admin if property is mutable.48	/// @param tokenOwner Permission to mutate property by token owner if property is mutable.49	/// @dev EVM selector for this function is: 0x222d97fa,50	///  or in textual repr: setTokenPropertyPermission(string,bool,bool,bool)51	function setTokenPropertyPermission(52		string memory key,53		bool isMutable,54		bool collectionAdmin,55		bool tokenOwner56	) public {57		require(false, stub_error);58		key;59		isMutable;60		collectionAdmin;61		tokenOwner;62		dummy = 0;63	}6465	/// @notice Set token property value.66	/// @dev Throws error if `msg.sender` has no permission to edit the property.67	/// @param tokenId ID of the token.68	/// @param key Property key.69	/// @param value Property value.70	/// @dev EVM selector for this function is: 0x1752d67b,71	///  or in textual repr: setProperty(uint256,string,bytes)72	function setProperty(73		uint256 tokenId,74		string memory key,75		bytes memory value76	) public {77		require(false, stub_error);78		tokenId;79		key;80		value;81		dummy = 0;82	}8384	/// @notice Delete token property value.85	/// @dev Throws error if `msg.sender` has no permission to edit the property.86	/// @param tokenId ID of the token.87	/// @param key Property key.88	/// @dev EVM selector for this function is: 0x066111d1,89	///  or in textual repr: deleteProperty(uint256,string)90	function deleteProperty(uint256 tokenId, string memory key) public {91		require(false, stub_error);92		tokenId;93		key;94		dummy = 0;95	}9697	/// @notice Get token property value.98	/// @dev Throws error if key not found99	/// @param tokenId ID of the token.100	/// @param key Property key.101	/// @return Property value bytes102	/// @dev EVM selector for this function is: 0x7228c327,103	///  or in textual repr: property(uint256,string)104	function property(uint256 tokenId, string memory key)105		public106		view107		returns (bytes memory)108	{109		require(false, stub_error);110		tokenId;111		key;112		dummy;113		return hex"";114	}115}116117/// @title A contract that allows you to work with collections.118/// @dev the ERC-165 identifier for this interface is 0xffe4da23119contract Collection is Dummy, ERC165 {120	/// Set collection property.121	///122	/// @param key Property key.123	/// @param value Propery value.124	/// @dev EVM selector for this function is: 0x2f073f66,125	///  or in textual repr: setCollectionProperty(string,bytes)126	function setCollectionProperty(string memory key, bytes memory value)127		public128	{129		require(false, stub_error);130		key;131		value;132		dummy = 0;133	}134135	/// Delete collection property.136	///137	/// @param key Property key.138	/// @dev EVM selector for this function is: 0x7b7debce,139	///  or in textual repr: deleteCollectionProperty(string)140	function deleteCollectionProperty(string memory key) public {141		require(false, stub_error);142		key;143		dummy = 0;144	}145146	/// Get collection property.147	///148	/// @dev Throws error if key not found.149	///150	/// @param key Property key.151	/// @return bytes The property corresponding to the key.152	/// @dev EVM selector for this function is: 0xcf24fd6d,153	///  or in textual repr: collectionProperty(string)154	function collectionProperty(string memory key)155		public156		view157		returns (bytes memory)158	{159		require(false, stub_error);160		key;161		dummy;162		return hex"";163	}164165	/// Set the sponsor of the collection.166	///167	/// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.168	///169	/// @param sponsor Address of the sponsor from whose account funds will be debited for operations with the contract.170	/// @dev EVM selector for this function is: 0x7623402e,171	///  or in textual repr: setCollectionSponsor(address)172	function setCollectionSponsor(address sponsor) public {173		require(false, stub_error);174		sponsor;175		dummy = 0;176	}177178	/// Collection sponsorship confirmation.179	///180	/// @dev After setting the sponsor for the collection, it must be confirmed with this function.181	/// @dev EVM selector for this function is: 0x3c50e97a,182	///  or in textual repr: confirmCollectionSponsorship()183	function confirmCollectionSponsorship() public {184		require(false, stub_error);185		dummy = 0;186	}187188	/// Set limits for the collection.189	/// @dev Throws error if limit not found.190	/// @param limit Name of the limit. Valid names:191	/// 	"accountTokenOwnershipLimit",192	/// 	"sponsoredDataSize",193	/// 	"sponsoredDataRateLimit",194	/// 	"tokenLimit",195	/// 	"sponsorTransferTimeout",196	/// 	"sponsorApproveTimeout"197	/// @param value Value of the limit.198	/// @dev EVM selector for this function is: 0x6a3841db,199	///  or in textual repr: setCollectionLimit(string,uint32)200	function setCollectionLimit(string memory limit, uint32 value) public {201		require(false, stub_error);202		limit;203		value;204		dummy = 0;205	}206207	/// Set limits for the collection.208	/// @dev Throws error if limit not found.209	/// @param limit Name of the limit. Valid names:210	/// 	"ownerCanTransfer",211	/// 	"ownerCanDestroy",212	/// 	"transfersEnabled"213	/// @param value Value of the limit.214	/// @dev EVM selector for this function is: 0x993b7fba,215	///  or in textual repr: setCollectionLimit(string,bool)216	function setCollectionLimit(string memory limit, bool value) public {217		require(false, stub_error);218		limit;219		value;220		dummy = 0;221	}222223	/// Get contract address.224	/// @dev EVM selector for this function is: 0xf6b4dfb4,225	///  or in textual repr: contractAddress()226	function contractAddress() public view returns (address) {227		require(false, stub_error);228		dummy;229		return 0x0000000000000000000000000000000000000000;230	}231232	/// Add collection admin by substrate address.233	/// @param newAdmin Substrate administrator address.234	/// @dev EVM selector for this function is: 0x5730062b,235	///  or in textual repr: addCollectionAdminSubstrate(uint256)236	function addCollectionAdminSubstrate(uint256 newAdmin) public {237		require(false, stub_error);238		newAdmin;239		dummy = 0;240	}241242	/// Remove collection admin by substrate address.243	/// @param admin Substrate administrator address.244	/// @dev EVM selector for this function is: 0x4048fcf9,245	///  or in textual repr: removeCollectionAdminSubstrate(uint256)246	function removeCollectionAdminSubstrate(uint256 admin) public {247		require(false, stub_error);248		admin;249		dummy = 0;250	}251252	/// Add collection admin.253	/// @param newAdmin Address of the added administrator.254	/// @dev EVM selector for this function is: 0x92e462c7,255	///  or in textual repr: addCollectionAdmin(address)256	function addCollectionAdmin(address newAdmin) public {257		require(false, stub_error);258		newAdmin;259		dummy = 0;260	}261262	/// Remove collection admin.263	///264	/// @param admin Address of the removed administrator.265	/// @dev EVM selector for this function is: 0xfafd7b42,266	///  or in textual repr: removeCollectionAdmin(address)267	function removeCollectionAdmin(address admin) public {268		require(false, stub_error);269		admin;270		dummy = 0;271	}272273	/// Toggle accessibility of collection nesting.274	///275	/// @param enable If "true" degenerates to nesting: 'Owner' else to nesting: 'Disabled'276	/// @dev EVM selector for this function is: 0x112d4586,277	///  or in textual repr: setCollectionNesting(bool)278	function setCollectionNesting(bool enable) public {279		require(false, stub_error);280		enable;281		dummy = 0;282	}283284	/// Toggle accessibility of collection nesting.285	///286	/// @param enable If "true" degenerates to nesting: {OwnerRestricted: [1, 2, 3]} else to nesting: 'Disabled'287	/// @param collections Addresses of collections that will be available for nesting.288	/// @dev EVM selector for this function is: 0x64872396,289	///  or in textual repr: setCollectionNesting(bool,address[])290	function setCollectionNesting(bool enable, address[] memory collections)291		public292	{293		require(false, stub_error);294		enable;295		collections;296		dummy = 0;297	}298299	/// Set the collection access method.300	/// @param mode Access mode301	/// 	0 for Normal302	/// 	1 for AllowList303	/// @dev EVM selector for this function is: 0x41835d4c,304	///  or in textual repr: setCollectionAccess(uint8)305	function setCollectionAccess(uint8 mode) public {306		require(false, stub_error);307		mode;308		dummy = 0;309	}310311	/// Add the user to the allowed list.312	///313	/// @param user Address of a trusted user.314	/// @dev EVM selector for this function is: 0x67844fe6,315	///  or in textual repr: addToCollectionAllowList(address)316	function addToCollectionAllowList(address user) public {317		require(false, stub_error);318		user;319		dummy = 0;320	}321322	/// Remove the user from the allowed list.323	///324	/// @param user Address of a removed user.325	/// @dev EVM selector for this function is: 0x85c51acb,326	///  or in textual repr: removeFromCollectionAllowList(address)327	function removeFromCollectionAllowList(address user) public {328		require(false, stub_error);329		user;330		dummy = 0;331	}332333	/// Switch permission for minting.334	///335	/// @param mode Enable if "true".336	/// @dev EVM selector for this function is: 0x00018e84,337	///  or in textual repr: setCollectionMintMode(bool)338	function setCollectionMintMode(bool mode) public {339		require(false, stub_error);340		mode;341		dummy = 0;342	}343344	/// Check that account is the owner or admin of the collection345	///346	/// @param user account to verify347	/// @return "true" if account is the owner or admin348	/// @dev EVM selector for this function is: 0x9811b0c7,349	///  or in textual repr: isOwnerOrAdmin(address)350	function isOwnerOrAdmin(address user) public view returns (bool) {351		require(false, stub_error);352		user;353		dummy;354		return false;355	}356357	/// Check that substrate account is the owner or admin of the collection358	///359	/// @param user account to verify360	/// @return "true" if account is the owner or admin361	/// @dev EVM selector for this function is: 0x68910e00,362	///  or in textual repr: isOwnerOrAdminSubstrate(uint256)363	function isOwnerOrAdminSubstrate(uint256 user) public view returns (bool) {364		require(false, stub_error);365		user;366		dummy;367		return false;368	}369370	/// Returns collection type371	///372	/// @return `Fungible` or `NFT` or `ReFungible`373	/// @dev EVM selector for this function is: 0xd34b55b8,374	///  or in textual repr: uniqueCollectionType()375	function uniqueCollectionType() public returns (string memory) {376		require(false, stub_error);377		dummy = 0;378		return "";379	}380381	/// Changes collection owner to another account382	///383	/// @dev Owner can be changed only by current owner384	/// @param newOwner new owner account385	/// @dev EVM selector for this function is: 0x13af4035,386	///  or in textual repr: setOwner(address)387	function setOwner(address newOwner) public {388		require(false, stub_error);389		newOwner;390		dummy = 0;391	}392393	/// Changes collection owner to another substrate account394	///395	/// @dev Owner can be changed only by current owner396	/// @param newOwner new owner substrate account397	/// @dev EVM selector for this function is: 0xb212138f,398	///  or in textual repr: setOwnerSubstrate(uint256)399	function setOwnerSubstrate(uint256 newOwner) public {400		require(false, stub_error);401		newOwner;402		dummy = 0;403	}404}405406/// @title ERC721 Token that can be irreversibly burned (destroyed).407/// @dev the ERC-165 identifier for this interface is 0x42966c68408contract ERC721Burnable is Dummy, ERC165 {409	/// @notice Burns a specific ERC721 token.410	/// @dev Throws unless `msg.sender` is the current NFT owner, or an authorized411	///  operator of the current owner.412	/// @param tokenId The NFT to approve413	/// @dev EVM selector for this function is: 0x42966c68,414	///  or in textual repr: burn(uint256)415	function burn(uint256 tokenId) public {416		require(false, stub_error);417		tokenId;418		dummy = 0;419	}420}421422/// @dev inlined interface423contract ERC721MintableEvents {424	event MintingFinished();425}426427/// @title ERC721 minting logic.428/// @dev the ERC-165 identifier for this interface is 0x68ccfe89429contract ERC721Mintable is Dummy, ERC165, ERC721MintableEvents {430	/// @dev EVM selector for this function is: 0x05d2035b,431	///  or in textual repr: mintingFinished()432	function mintingFinished() public view returns (bool) {433		require(false, stub_error);434		dummy;435		return false;436	}437438	/// @notice Function to mint token.439	/// @dev `tokenId` should be obtained with `nextTokenId` method,440	///  unlike standard, you can't specify it manually441	/// @param to The new owner442	/// @param tokenId ID of the minted NFT443	/// @dev EVM selector for this function is: 0x40c10f19,444	///  or in textual repr: mint(address,uint256)445	function mint(address to, uint256 tokenId) public returns (bool) {446		require(false, stub_error);447		to;448		tokenId;449		dummy = 0;450		return false;451	}452453	/// @notice Function to mint token with the given tokenUri.454	/// @dev `tokenId` should be obtained with `nextTokenId` method,455	///  unlike standard, you can't specify it manually456	/// @param to The new owner457	/// @param tokenId ID of the minted NFT458	/// @param tokenUri Token URI that would be stored in the NFT properties459	/// @dev EVM selector for this function is: 0x50bb4e7f,460	///  or in textual repr: mintWithTokenURI(address,uint256,string)461	function mintWithTokenURI(462		address to,463		uint256 tokenId,464		string memory tokenUri465	) public returns (bool) {466		require(false, stub_error);467		to;468		tokenId;469		tokenUri;470		dummy = 0;471		return false;472	}473474	/// @dev Not implemented475	/// @dev EVM selector for this function is: 0x7d64bcb4,476	///  or in textual repr: finishMinting()477	function finishMinting() public returns (bool) {478		require(false, stub_error);479		dummy = 0;480		return false;481	}482}483484<<<<<<< HEAD485<<<<<<< HEAD486/// @title Unique extensions for ERC721.487/// @dev the ERC-165 identifier for this interface is 0xd74d154f488=======489<<<<<<< HEAD490=======491>>>>>>> misc: update stubs492// Selector: 780e9d63493contract ERC721Enumerable is Dummy, ERC165 {494	// @notice Enumerate valid NFTs495	// @param index A counter less than `totalSupply()`496	// @return The token identifier for the `index`th NFT,497	//  (sort order not specified)498	//499	// Selector: tokenByIndex(uint256) 4f6ccce7500	function tokenByIndex(uint256 index) public view returns (uint256) {501		require(false, stub_error);502		index;503		dummy;504		return 0;505	}506507	// @dev Not implemented508	//509	// Selector: tokenOfOwnerByIndex(address,uint256) 2f745c59510	function tokenOfOwnerByIndex(address owner, uint256 index)511		public512		view513		returns (uint256)514	{515		require(false, stub_error);516		owner;517		index;518		dummy;519		return 0;520	}521522	// @notice Count NFTs tracked by this contract523	// @return A count of valid NFTs tracked by this contract, where each one of524	//  them has an assigned and queryable owner not equal to the zero address525	//526	// Selector: totalSupply() 18160ddd527	function totalSupply() public view returns (uint256) {528		require(false, stub_error);529		dummy;530		return 0;531	}532}533534// Selector: d74d154f535>>>>>>> misk: Update stubs536contract ERC721UniqueExtensions is Dummy, ERC165 {537	/// @notice Transfer ownership of an NFT538	/// @dev Throws unless `msg.sender` is the current owner. Throws if `to`539	///  is the zero address. Throws if `tokenId` is not a valid NFT.540	/// @param to The new owner541	/// @param tokenId The NFT to transfer542	/// @dev EVM selector for this function is: 0xa9059cbb,543	///  or in textual repr: transfer(address,uint256)544	function transfer(address to, uint256 tokenId) public {545		require(false, stub_error);546		to;547		tokenId;548		dummy = 0;549	}550551	/// @notice Burns a specific ERC721 token.552	/// @dev Throws unless `msg.sender` is the current owner or an authorized553	///  operator for this NFT. Throws if `from` is not the current owner. Throws554	///  if `to` is the zero address. Throws if `tokenId` is not a valid NFT.555	/// @param from The current owner of the NFT556	/// @param tokenId The NFT to transfer557	/// @dev EVM selector for this function is: 0x79cc6790,558	///  or in textual repr: burnFrom(address,uint256)559	function burnFrom(address from, uint256 tokenId) public {560		require(false, stub_error);561		from;562		tokenId;563		dummy = 0;564	}565566	/// @notice Returns next free NFT ID.567	/// @dev EVM selector for this function is: 0x75794a3c,568	///  or in textual repr: nextTokenId()569	function nextTokenId() public view returns (uint256) {570		require(false, stub_error);571		dummy;572		return 0;573	}574575	/// @notice Function to mint multiple tokens.576	/// @dev `tokenIds` should be an array of consecutive numbers and first number577	///  should be obtained with `nextTokenId` method578	/// @param to The new owner579	/// @param tokenIds IDs of the minted NFTs580	/// @dev EVM selector for this function is: 0x44a9945e,581	///  or in textual repr: mintBulk(address,uint256[])582	function mintBulk(address to, uint256[] memory tokenIds)583		public584		returns (bool)585	{586		require(false, stub_error);587		to;588		tokenIds;589		dummy = 0;590		return false;591	}592593	/// @notice Function to mint multiple tokens with the given tokenUris.594	/// @dev `tokenIds` is array of pairs of token ID and token URI. Token IDs should be consecutive595	///  numbers and first number should be obtained with `nextTokenId` method596	/// @param to The new owner597	/// @param tokens array of pairs of token ID and token URI for minted tokens598	/// @dev EVM selector for this function is: 0x36543006,599	///  or in textual repr: mintBulkWithTokenURI(address,(uint256,string)[])600	function mintBulkWithTokenURI(address to, Tuple8[] memory tokens)601		public602		returns (bool)603	{604		require(false, stub_error);605		to;606		tokens;607		dummy = 0;608		return false;609	}610}611612<<<<<<< HEAD613<<<<<<< HEAD614/// @dev anonymous struct615struct Tuple8 {616	uint256 field_0;617	string field_1;618}619=======620// Selector: ffe4da23621=======622// Selector: 765e2fae623>>>>>>> misk: Update stubs624=======625// Selector: e54be640626>>>>>>> misc: update stubs627contract Collection is Dummy, ERC165 {628	// Set collection property.629	//630	// @param key Property key.631	// @param value Propery value.632	//633	// Selector: setCollectionProperty(string,bytes) 2f073f66634	function setCollectionProperty(string memory key, bytes memory value)635		public636	{637		require(false, stub_error);638		key;639		value;640		dummy = 0;641	}642>>>>>>> misk: Update stubs643644/// @title ERC-721 Non-Fungible Token Standard, optional enumeration extension645/// @dev See https://eips.ethereum.org/EIPS/eip-721646/// @dev the ERC-165 identifier for this interface is 0x780e9d63647contract ERC721Enumerable is Dummy, ERC165 {648	/// @notice Enumerate valid NFTs649	/// @param index A counter less than `totalSupply()`650	/// @return The token identifier for the `index`th NFT,651	///  (sort order not specified)652	/// @dev EVM selector for this function is: 0x4f6ccce7,653	///  or in textual repr: tokenByIndex(uint256)654	function tokenByIndex(uint256 index) public view returns (uint256) {655		require(false, stub_error);656		index;657		dummy;658		return 0;659	}660661	/// @dev Not implemented662	/// @dev EVM selector for this function is: 0x2f745c59,663	///  or in textual repr: tokenOfOwnerByIndex(address,uint256)664	function tokenOfOwnerByIndex(address owner, uint256 index)665		public666		view667		returns (uint256)668	{669		require(false, stub_error);670		owner;671		index;672		dummy;673<<<<<<< HEAD674		return 0;675=======676		return hex"";677	}678679	// Set the sponsor of the collection.680	//681	// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.682	//683	// @param sponsor Address of the sponsor from whose account funds will be debited for operations with the contract.684	//685	// Selector: setCollectionSponsor(address) 7623402e686	function setCollectionSponsor(address sponsor) public {687		require(false, stub_error);688		sponsor;689		dummy = 0;690	}691692	// Set the substrate sponsor of the collection.693	//694	// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.695	//696	// @param sponsor Substrate address of the sponsor from whose account funds will be debited for operations with the contract.697	//698	// Selector: setCollectionSponsorSubstrate(uint256) c74d6751699	function setCollectionSponsorSubstrate(uint256 sponsor) public {700		require(false, stub_error);701		sponsor;702		dummy = 0;703	}704705	// Selector: hasCollectionPendingSponsor() 058ac185706	function hasCollectionPendingSponsor() public view returns (bool) {707		require(false, stub_error);708		dummy;709		return false;710	}711712	// Collection sponsorship confirmation.713	//714	// @dev After setting the sponsor for the collection, it must be confirmed with this function.715	//716	// Selector: confirmCollectionSponsorship() 3c50e97a717	function confirmCollectionSponsorship() public {718		require(false, stub_error);719		dummy = 0;720	}721722	// Remove collection sponsor.723	//724	// Selector: removeCollectionSponsor() 6e0326a3725	function removeCollectionSponsor() public {726		require(false, stub_error);727		dummy = 0;728	}729730	// Get current sponsor.731	//732	// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.733	//734	// Selector: getCollectionSponsor() b66bbc14735	function getCollectionSponsor() public view returns (Tuple1 memory) {736		require(false, stub_error);737		dummy;738		return Tuple1(0x0000000000000000000000000000000000000000, 0);739	}740741	// Set limits for the collection.742	// @dev Throws error if limit not found.743	// @param limit Name of the limit. Valid names:744	// 	"accountTokenOwnershipLimit",745	// 	"sponsoredDataSize",746	// 	"sponsoredDataRateLimit",747	// 	"tokenLimit",748	// 	"sponsorTransferTimeout",749	// 	"sponsorApproveTimeout"750	// @param value Value of the limit.751	//752	// Selector: setCollectionLimit(string,uint32) 6a3841db753	function setCollectionLimit(string memory limit, uint32 value) public {754		require(false, stub_error);755		limit;756		value;757		dummy = 0;758>>>>>>> misk: Update stubs759	}760761	/// @notice Count NFTs tracked by this contract762	/// @return A count of valid NFTs tracked by this contract, where each one of763	///  them has an assigned and queryable owner not equal to the zero address764	/// @dev EVM selector for this function is: 0x18160ddd,765	///  or in textual repr: totalSupply()766	function totalSupply() public view returns (uint256) {767		require(false, stub_error);768		dummy;769		return 0;770	}771}772773/// @title ERC-721 Non-Fungible Token Standard, optional metadata extension774/// @dev See https://eips.ethereum.org/EIPS/eip-721775/// @dev the ERC-165 identifier for this interface is 0x5b5e139f776contract ERC721Metadata is Dummy, ERC165 {777	/// @notice A descriptive name for a collection of NFTs in this contract778	/// @dev EVM selector for this function is: 0x06fdde03,779	///  or in textual repr: name()780	function name() public view returns (string memory) {781		require(false, stub_error);782		dummy;783		return "";784	}785786	/// @notice An abbreviated name for NFTs in this contract787	/// @dev EVM selector for this function is: 0x95d89b41,788	///  or in textual repr: symbol()789	function symbol() public view returns (string memory) {790		require(false, stub_error);791		dummy;792		return "";793	}794795	/// @notice A distinct Uniform Resource Identifier (URI) for a given asset.796	///797	/// @dev If the token has a `url` property and it is not empty, it is returned.798	///  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`.799	///  If the collection property `baseURI` is empty or absent, return "" (empty string)800	///  otherwise, if token property `suffix` present and is non-empty, return concatenation of baseURI and suffix801	///  otherwise, return concatenation of `baseURI` and stringified token id (decimal stringifying, without paddings).802	///803	/// @return token's const_metadata804	/// @dev EVM selector for this function is: 0xc87b56dd,805	///  or in textual repr: tokenURI(uint256)806	function tokenURI(uint256 tokenId) public view returns (string memory) {807		require(false, stub_error);808		tokenId;809		dummy;810		return "";811	}812}813814/// @dev inlined interface815contract ERC721Events {816	event Transfer(817		address indexed from,818		address indexed to,819		uint256 indexed tokenId820	);821	event Approval(822		address indexed owner,823		address indexed approved,824		uint256 indexed tokenId825	);826	event ApprovalForAll(827		address indexed owner,828		address indexed operator,829		bool approved830	);831}832833/// @title ERC-721 Non-Fungible Token Standard834/// @dev See https://github.com/ethereum/EIPs/blob/master/EIPS/eip-721.md835/// @dev the ERC-165 identifier for this interface is 0x80ac58cd836contract ERC721 is Dummy, ERC165, ERC721Events {837	/// @notice Count all NFTs assigned to an owner838	/// @dev NFTs assigned to the zero address are considered invalid, and this839	///  function throws for queries about the zero address.840	/// @param owner An address for whom to query the balance841	/// @return The number of NFTs owned by `owner`, possibly zero842	/// @dev EVM selector for this function is: 0x70a08231,843	///  or in textual repr: balanceOf(address)844	function balanceOf(address owner) public view returns (uint256) {845		require(false, stub_error);846		owner;847		dummy;848		return 0;849	}850851	/// @notice Find the owner of an NFT852	/// @dev NFTs assigned to zero address are considered invalid, and queries853	///  about them do throw.854	/// @param tokenId The identifier for an NFT855	/// @return The address of the owner of the NFT856	/// @dev EVM selector for this function is: 0x6352211e,857	///  or in textual repr: ownerOf(uint256)858	function ownerOf(uint256 tokenId) public view returns (address) {859		require(false, stub_error);860		tokenId;861		dummy;862		return 0x0000000000000000000000000000000000000000;863	}864865	/// @dev Not implemented866	/// @dev EVM selector for this function is: 0xb88d4fde,867	///  or in textual repr: safeTransferFrom(address,address,uint256,bytes)868	function safeTransferFrom(869		address from,870		address to,871		uint256 tokenId,872		bytes memory data873	) public {874		require(false, stub_error);875		from;876		to;877		tokenId;878		data;879		dummy = 0;880	}881882	/// @dev Not implemented883	/// @dev EVM selector for this function is: 0x42842e0e,884	///  or in textual repr: safeTransferFrom(address,address,uint256)885	function safeTransferFrom(886		address from,887		address to,888		uint256 tokenId889	) public {890		require(false, stub_error);891		from;892		to;893		tokenId;894		dummy = 0;895	}896897	/// @notice Transfer ownership of an NFT -- THE CALLER IS RESPONSIBLE898	///  TO CONFIRM THAT `to` IS CAPABLE OF RECEIVING NFTS OR ELSE899	///  THEY MAY BE PERMANENTLY LOST900	/// @dev Throws unless `msg.sender` is the current owner or an authorized901	///  operator for this NFT. Throws if `from` is not the current owner. Throws902	///  if `to` is the zero address. Throws if `tokenId` is not a valid NFT.903	/// @param from The current owner of the NFT904	/// @param to The new owner905	/// @param tokenId The NFT to transfer906	/// @dev EVM selector for this function is: 0x23b872dd,907	///  or in textual repr: transferFrom(address,address,uint256)908	function transferFrom(909		address from,910		address to,911		uint256 tokenId912	) public {913		require(false, stub_error);914		from;915		to;916		tokenId;917		dummy = 0;918	}919920	/// @notice Set or reaffirm the approved address for an NFT921	/// @dev The zero address indicates there is no approved address.922	/// @dev Throws unless `msg.sender` is the current NFT owner, or an authorized923	///  operator of the current owner.924	/// @param approved The new approved NFT controller925	/// @param tokenId The NFT to approve926	/// @dev EVM selector for this function is: 0x095ea7b3,927	///  or in textual repr: approve(address,uint256)928	function approve(address approved, uint256 tokenId) public {929		require(false, stub_error);930		approved;931		tokenId;932		dummy = 0;933	}934935	/// @dev Not implemented936	/// @dev EVM selector for this function is: 0xa22cb465,937	///  or in textual repr: setApprovalForAll(address,bool)938	function setApprovalForAll(address operator, bool approved) public {939		require(false, stub_error);940		operator;941		approved;942		dummy = 0;943	}944945	/// @dev Not implemented946	/// @dev EVM selector for this function is: 0x081812fc,947	///  or in textual repr: getApproved(uint256)948	function getApproved(uint256 tokenId) public view returns (address) {949		require(false, stub_error);950		tokenId;951		dummy;952		return 0x0000000000000000000000000000000000000000;953	}954955	/// @dev Not implemented956	/// @dev EVM selector for this function is: 0xe985e9c5,957	///  or in textual repr: isApprovedForAll(address,address)958	function isApprovedForAll(address owner, address operator)959		public960		view961		returns (address)962	{963		require(false, stub_error);964		owner;965		operator;966		dummy;967		return 0x0000000000000000000000000000000000000000;968	}969}970971contract UniqueNFT is972	Dummy,973	ERC165,974	ERC721,975	ERC721Metadata,976	ERC721Enumerable,977	ERC721UniqueExtensions,978	ERC721Mintable,979	ERC721Burnable,980	Collection,981	TokenProperties982{}
modifiedpallets/refungible/src/stubs/UniqueRefungible.soldiffbeforeafterboth
--- a/pallets/refungible/src/stubs/UniqueRefungible.sol
+++ b/pallets/refungible/src/stubs/UniqueRefungible.sol
@@ -482,10 +482,13 @@
 }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
 /// @title Unique extensions for ERC721.
 /// @dev the ERC-165 identifier for this interface is 0x7c3bef89
 =======
 <<<<<<< HEAD
+=======
+>>>>>>> misc: update stubs
 // Selector: 780e9d63
 contract ERC721Enumerable is Dummy, ERC165 {
 	// @notice Enumerate valid RFTs
@@ -621,6 +624,7 @@
 }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
 /// @dev anonymous struct
 struct Tuple8 {
 	uint256 field_0;
@@ -631,6 +635,9 @@
 =======
 // Selector: 765e2fae
 >>>>>>> misk: Update stubs
+=======
+// Selector: e54be640
+>>>>>>> misc: update stubs
 contract Collection is Dummy, ERC165 {
 	// Set collection property.
 	//
modifiedtests/src/eth/api/ContractHelpers.soldiffbeforeafterboth
--- a/tests/src/eth/api/ContractHelpers.sol
+++ b/tests/src/eth/api/ContractHelpers.sol
@@ -13,6 +13,7 @@
 }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
 /// @title Magic contract, which allows users to reconfigure other contracts
 /// @dev the ERC-165 identifier for this interface is 0xd77fab70
 =======
@@ -22,6 +23,9 @@
 // Selector: 06fc42e9
 >>>>>>> path: add stubs
 >>>>>>> path: add stubs
+=======
+// Selector: 6073d917
+>>>>>>> misc: update stubs
 interface ContractHelpers is Dummy, ERC165 {
 	/// Get user, which deployed specified contract
 	/// @dev May return zero address in case if contract is deployed
@@ -38,6 +42,7 @@
 		returns (address);
 
 <<<<<<< HEAD
+<<<<<<< HEAD
 	/// Set sponsor.
 	/// @param contractAddress Contract for which a sponsor is being established.
 	/// @param sponsor User address who set as pending sponsor.
@@ -45,6 +50,8 @@
 	///  or in textual repr: setSponsor(address,address)
 =======
 <<<<<<< HEAD
+=======
+>>>>>>> misc: update stubs
 	// Set sponsor.
 	//
 	// @param contract_address Contract for which a sponsor is being established.
@@ -90,14 +97,6 @@
 	// @param contract_address The contract for which a sponsor is requested.
 	// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.
 	//
-=======
-	// Selector: setSponsor(address,address) f01fba93
-	function setSponsor(address contractAddress, address sponsor) external;
-
-	// Selector: confirmSponsorship(address) abc00001
-	function confirmSponsorship(address contractAddress) external;
-
->>>>>>> path: add stubs
 	// Selector: getSponsor(address) 743fc745
 >>>>>>> path: add stubs
 	function getSponsor(address contractAddress)
@@ -106,6 +105,7 @@
 		returns (Tuple0 memory);
 
 <<<<<<< HEAD
+<<<<<<< HEAD
 	/// Check tat contract has confirmed sponsor.
 	///
 	/// @param contractAddress The contract for which the presence of a confirmed sponsor is checked.
@@ -122,6 +122,8 @@
 	///  or in textual repr: hasPendingSponsor(address)
 =======
 <<<<<<< HEAD
+=======
+>>>>>>> misc: update stubs
 	// Check tat contract has confirmed sponsor.
 	//
 	// @param contract_address The contract for which the presence of a confirmed sponsor is checked.
@@ -135,11 +137,6 @@
 	// @param contract_address The contract for which the presence of a pending sponsor is checked.
 	// @return **true** if contract has pending sponsor.
 	//
-=======
-	// Selector: hasSponsor(address) 97418603
-	function hasSponsor(address contractAddress) external view returns (bool);
-
->>>>>>> path: add stubs
 	// Selector: hasPendingSponsor(address) 39b9b242
 >>>>>>> path: add stubs
 	function hasPendingSponsor(address contractAddress)
modifiedtests/src/eth/api/UniqueFungible.soldiffbeforeafterboth
--- a/tests/src/eth/api/UniqueFungible.sol
+++ b/tests/src/eth/api/UniqueFungible.sol
@@ -36,7 +36,6 @@
 	);
 }
 
-<<<<<<< HEAD
 // Selector: 79cc6790
 interface ERC20UniqueExtensions is Dummy, ERC165 {
 	// Selector: burnFrom(address,uint256) 79cc6790
@@ -80,11 +79,15 @@
 		returns (uint256);
 }
 
+<<<<<<< HEAD
 // Selector: ffe4da23
 =======
 // Selector: 765e2fae
 >>>>>>> misk: Update stubs
 >>>>>>> misk: Update stubs
+=======
+// Selector: e54be640
+>>>>>>> misc: update stubs
 interface Collection is Dummy, ERC165 {
 	/// Set collection property.
 	///
modifiedtests/src/eth/api/UniqueNFT.soldiffbeforeafterboth
--- a/tests/src/eth/api/UniqueNFT.sol
+++ b/tests/src/eth/api/UniqueNFT.sol
@@ -322,10 +322,13 @@
 }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
 /// @title Unique extensions for ERC721.
 /// @dev the ERC-165 identifier for this interface is 0xd74d154f
 =======
 <<<<<<< HEAD
+=======
+>>>>>>> misc: update stubs
 // Selector: 780e9d63
 interface ERC721Enumerable is Dummy, ERC165 {
 	// @notice Enumerate valid NFTs
@@ -403,6 +406,7 @@
 }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
 /// @dev anonymous struct
 struct Tuple8 {
 	uint256 field_0;
@@ -413,6 +417,9 @@
 =======
 // Selector: 765e2fae
 >>>>>>> misk: Update stubs
+=======
+// Selector: e54be640
+>>>>>>> misc: update stubs
 interface Collection is Dummy, ERC165 {
 	// Set collection property.
 	//
modifiedtests/src/eth/api/UniqueRefungible.soldiffbeforeafterboth
--- a/tests/src/eth/api/UniqueRefungible.sol
+++ b/tests/src/eth/api/UniqueRefungible.sol
@@ -322,10 +322,13 @@
 }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
 /// @title Unique extensions for ERC721.
 /// @dev the ERC-165 identifier for this interface is 0x7c3bef89
 =======
 <<<<<<< HEAD
+=======
+>>>>>>> misc: update stubs
 // Selector: 780e9d63
 interface ERC721Enumerable is Dummy, ERC165 {
 	// @notice Enumerate valid RFTs
@@ -415,6 +418,7 @@
 }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
 /// @dev anonymous struct
 struct Tuple8 {
 	uint256 field_0;
@@ -425,6 +429,9 @@
 =======
 // Selector: 765e2fae
 >>>>>>> misk: Update stubs
+=======
+// Selector: e54be640
+>>>>>>> misc: update stubs
 interface Collection is Dummy, ERC165 {
 	// Set collection property.
 	//
modifiedtests/src/eth/fungibleAbi.jsondiffbeforeafterboth
--- a/tests/src/eth/fungibleAbi.json
+++ b/tests/src/eth/fungibleAbi.json
@@ -151,24 +151,6 @@
     "type": "function"
   },
   {
-    "inputs": [
-      { "internalType": "address", "name": "user", "type": "address" }
-    ],
-    "name": "isOwnerOrAdmin",
-    "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      { "internalType": "uint256", "name": "user", "type": "uint256" }
-    ],
-    "name": "isOwnerOrAdminSubstrate",
-    "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
     "inputs": [],
     "name": "getCollectionSponsor",
     "outputs": [
@@ -193,6 +175,24 @@
     "type": "function"
   },
   {
+    "inputs": [
+      { "internalType": "address", "name": "user", "type": "address" }
+    ],
+    "name": "isOwnerOrAdmin",
+    "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      { "internalType": "uint256", "name": "user", "type": "uint256" }
+    ],
+    "name": "isOwnerOrAdminSubstrate",
+    "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
     "inputs": [],
     "name": "name",
     "outputs": [{ "internalType": "string", "name": "", "type": "string" }],
@@ -309,7 +309,15 @@
   },
   {
     "inputs": [
-<<<<<<< HEAD
+      { "internalType": "uint256", "name": "sponsor", "type": "uint256" }
+    ],
+    "name": "setCollectionSponsorSubstrate",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [
       { "internalType": "address", "name": "newOwner", "type": "address" }
     ],
     "name": "setOwner",
@@ -322,11 +330,6 @@
       { "internalType": "uint256", "name": "newOwner", "type": "uint256" }
     ],
     "name": "setOwnerSubstrate",
-=======
-      { "internalType": "uint256", "name": "sponsor", "type": "uint256" }
-    ],
-    "name": "setCollectionSponsorSubstrate",
->>>>>>> misk: Update stubs
     "outputs": [],
     "stateMutability": "nonpayable",
     "type": "function"
modifiedtests/src/eth/nonFungibleAbi.jsondiffbeforeafterboth
--- a/tests/src/eth/nonFungibleAbi.json
+++ b/tests/src/eth/nonFungibleAbi.json
@@ -483,7 +483,15 @@
   },
   {
     "inputs": [
-<<<<<<< HEAD
+      { "internalType": "uint256", "name": "sponsor", "type": "uint256" }
+    ],
+    "name": "setCollectionSponsorSubstrate",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [
       { "internalType": "address", "name": "newOwner", "type": "address" }
     ],
     "name": "setOwner",
@@ -496,11 +504,6 @@
       { "internalType": "uint256", "name": "newOwner", "type": "uint256" }
     ],
     "name": "setOwnerSubstrate",
-=======
-      { "internalType": "uint256", "name": "sponsor", "type": "uint256" }
-    ],
-    "name": "setCollectionSponsorSubstrate",
->>>>>>> misk: Update stubs
     "outputs": [],
     "stateMutability": "nonpayable",
     "type": "function"
modifiedtests/src/eth/reFungibleAbi.jsondiffbeforeafterboth
--- a/tests/src/eth/reFungibleAbi.json
+++ b/tests/src/eth/reFungibleAbi.json
@@ -483,7 +483,15 @@
   },
   {
     "inputs": [
-<<<<<<< HEAD
+      { "internalType": "uint256", "name": "sponsor", "type": "uint256" }
+    ],
+    "name": "setCollectionSponsorSubstrate",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [
       { "internalType": "address", "name": "newOwner", "type": "address" }
     ],
     "name": "setOwner",
@@ -496,11 +504,6 @@
       { "internalType": "uint256", "name": "newOwner", "type": "uint256" }
     ],
     "name": "setOwnerSubstrate",
-=======
-      { "internalType": "uint256", "name": "sponsor", "type": "uint256" }
-    ],
-    "name": "setCollectionSponsorSubstrate",
->>>>>>> misk: Update stubs
     "outputs": [],
     "stateMutability": "nonpayable",
     "type": "function"
modifiedtests/src/eth/util/contractHelpersAbi.jsondiffbeforeafterboth
--- a/tests/src/eth/util/contractHelpersAbi.json
+++ b/tests/src/eth/util/contractHelpersAbi.json
@@ -120,7 +120,6 @@
         "internalType": "address",
         "name": "contractAddress",
         "type": "address"
-<<<<<<< HEAD
       }
     ],
     "name": "removeSponsor",
@@ -147,8 +146,6 @@
         "internalType": "address",
         "name": "contractAddress",
         "type": "address"
-=======
->>>>>>> path: add stubs
       },
       { "internalType": "address", "name": "sponsor", "type": "address" }
     ],