git.delta.rocks / unique-network / refs/commits / 6afd9fe97b2d

difftreelog

misk: update stubs

Trubnikov Sergey2022-10-25parent: #846b910.patch.diff
in: master

7 files changed

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/// @dev common stubs holder7contract Dummy {8	uint8 dummy;9	string stub_error = "this contract is implemented in native";10}1112contract ERC165 is Dummy {13	function supportsInterface(bytes4 interfaceID) external view returns (bool) {14		require(false, stub_error);15		interfaceID;16		return true;17	}18}1920/// @title A contract that allows to set and delete token properties and change token property permissions.21/// @dev the ERC-165 identifier for this interface is 0x55dba91922contract TokenProperties is Dummy, ERC165 {23	/// @notice Set permissions for token property.24	/// @dev Throws error if `msg.sender` is not admin or owner of the collection.25	/// @param key Property key.26	/// @param isMutable Permission to mutate property.27	/// @param collectionAdmin Permission to mutate property by collection admin if property is mutable.28	/// @param tokenOwner Permission to mutate property by token owner if property is mutable.29	/// @dev EVM selector for this function is: 0x222d97fa,30	///  or in textual repr: setTokenPropertyPermission(string,bool,bool,bool)31	function setTokenPropertyPermission(32		string memory key,33		bool isMutable,34		bool collectionAdmin,35		bool tokenOwner36	) public {37		require(false, stub_error);38		key;39		isMutable;40		collectionAdmin;41		tokenOwner;42		dummy = 0;43	}4445	/// @notice Set token property value.46	/// @dev Throws error if `msg.sender` has no permission to edit the property.47	/// @param tokenId ID of the token.48	/// @param key Property key.49	/// @param value Property value.50	/// @dev EVM selector for this function is: 0x1752d67b,51	///  or in textual repr: setProperty(uint256,string,bytes)52	function setProperty(53		uint256 tokenId,54		string memory key,55		bytes memory value56	) public {57		require(false, stub_error);58		tokenId;59		key;60		value;61		dummy = 0;62	}6364	/// @notice Set token properties value.65	/// @dev Throws error if `msg.sender` has no permission to edit the property.66	/// @param tokenId ID of the token.67	/// @param properties settable properties68	/// @dev EVM selector for this function is: 0x14ed3a6e,69	///  or in textual repr: setProperties(uint256,(string,bytes)[])70	function setProperties(uint256 tokenId, Tuple19[] memory properties) public {71		require(false, stub_error);72		tokenId;73		properties;74		dummy = 0;75	}7677	/// @notice Delete token property value.78	/// @dev Throws error if `msg.sender` has no permission to edit the property.79	/// @param tokenId ID of the token.80	/// @param key Property key.81	/// @dev EVM selector for this function is: 0x066111d1,82	///  or in textual repr: deleteProperty(uint256,string)83	function deleteProperty(uint256 tokenId, string memory key) public {84		require(false, stub_error);85		tokenId;86		key;87		dummy = 0;88	}8990	/// @notice Get token property value.91	/// @dev Throws error if key not found92	/// @param tokenId ID of the token.93	/// @param key Property key.94	/// @return Property value bytes95	/// @dev EVM selector for this function is: 0x7228c327,96	///  or in textual repr: property(uint256,string)97	function property(uint256 tokenId, string memory key) public view returns (bytes memory) {98		require(false, stub_error);99		tokenId;100		key;101		dummy;102		return hex"";103	}104}105106/// @title A contract that allows you to work with collections.107<<<<<<< HEAD108<<<<<<< HEAD109/// @dev the ERC-165 identifier for this interface is 0xb3152af3110=======111/// @dev the ERC-165 identifier for this interface is 0x674be726112>>>>>>> feat: Add custum signature with unlimited nesting.113=======114/// @dev the ERC-165 identifier for this interface is 0x943ee094115>>>>>>> fix: after rebase116contract Collection is Dummy, ERC165 {117	/// Set collection property.118	///119	/// @param key Property key.120	/// @param value Propery value.121	/// @dev EVM selector for this function is: 0x2f073f66,122	///  or in textual repr: setCollectionProperty(string,bytes)123	function setCollectionProperty(string memory key, bytes memory value) public {124		require(false, stub_error);125		key;126		value;127		dummy = 0;128	}129130	/// Set collection properties.131	///132	/// @param properties Vector of properties key/value pair.133	/// @dev EVM selector for this function is: 0xf90c1ce9,134	///  or in textual repr: setCollectionProperties((string,bytes)[])135	function setCollectionProperties(Tuple21[] memory properties) public {136		require(false, stub_error);137		properties;138		dummy = 0;139	}140141	/// Delete collection property.142	///143	/// @param key Property key.144	/// @dev EVM selector for this function is: 0x7b7debce,145	///  or in textual repr: deleteCollectionProperty(string)146	function deleteCollectionProperty(string memory key) public {147		require(false, stub_error);148		key;149		dummy = 0;150	}151152	/// Delete collection properties.153	///154	/// @param keys Properties keys.155	/// @dev EVM selector for this function is: 0x56d4684a,156	///  or in textual repr: deleteCollectionProperties(string[])157	function deleteCollectionProperties(string[] memory keys) public {158		require(false, stub_error);159		keys;160		dummy = 0;161	}162163	/// Get collection property.164	///165	/// @dev Throws error if key not found.166	///167	/// @param key Property key.168	/// @return bytes The property corresponding to the key.169	/// @dev EVM selector for this function is: 0xcf24fd6d,170	///  or in textual repr: collectionProperty(string)171	function collectionProperty(string memory key) public view returns (bytes memory) {172		require(false, stub_error);173		key;174		dummy;175		return hex"";176	}177178	/// Get collection properties.179	///180	/// @param keys Properties keys. Empty keys for all propertyes.181	/// @return Vector of properties key/value pairs.182	/// @dev EVM selector for this function is: 0x5cad7311,183	///  or in textual repr: collectionProperties(string[])184	function collectionProperties(string[] memory keys) public view returns (Tuple21[] memory) {185		require(false, stub_error);186		keys;187		dummy;188		return new Tuple21[](0);189	}190191	/// Set the sponsor of the collection.192	///193	/// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.194	///195	/// @param sponsor Address of the sponsor from whose account funds will be debited for operations with the contract.196	/// @dev EVM selector for this function is: 0x7623402e,197	///  or in textual repr: setCollectionSponsor(address)198	function setCollectionSponsor(address sponsor) public {199		require(false, stub_error);200		sponsor;201		dummy = 0;202	}203204	/// Set the sponsor of the collection.205	///206	/// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.207	///208	/// @param sponsor Cross account address of the sponsor from whose account funds will be debited for operations with the contract.209	/// @dev EVM selector for this function is: 0x403e96a7,210	///  or in textual repr: setCollectionSponsorCross((address,uint256))211	function setCollectionSponsorCross(Tuple6 memory sponsor) public {212		require(false, stub_error);213		sponsor;214		dummy = 0;215	}216217	/// Whether there is a pending sponsor.218	/// @dev EVM selector for this function is: 0x058ac185,219	///  or in textual repr: hasCollectionPendingSponsor()220	function hasCollectionPendingSponsor() public view returns (bool) {221		require(false, stub_error);222		dummy;223		return false;224	}225226	/// Collection sponsorship confirmation.227	///228	/// @dev After setting the sponsor for the collection, it must be confirmed with this function.229	/// @dev EVM selector for this function is: 0x3c50e97a,230	///  or in textual repr: confirmCollectionSponsorship()231	function confirmCollectionSponsorship() public {232		require(false, stub_error);233		dummy = 0;234	}235236	/// Remove collection sponsor.237	/// @dev EVM selector for this function is: 0x6e0326a3,238	///  or in textual repr: removeCollectionSponsor()239	function removeCollectionSponsor() public {240		require(false, stub_error);241		dummy = 0;242	}243244	/// Get current sponsor.245	///246	/// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.247	/// @dev EVM selector for this function is: 0x6ec0a9f1,248	///  or in textual repr: collectionSponsor()249<<<<<<< HEAD250<<<<<<< HEAD251	function collectionSponsor() public view returns (Tuple6 memory) {252		require(false, stub_error);253		dummy;254		return Tuple6(0x0000000000000000000000000000000000000000, 0);255=======256	function collectionSponsor() public view returns (Tuple19 memory) {257		require(false, stub_error);258		dummy;259		return Tuple19(0x0000000000000000000000000000000000000000, 0);260>>>>>>> feat: add `EthCrossAccount` type261=======262	function collectionSponsor() public view returns (Tuple8 memory) {263		require(false, stub_error);264		dummy;265		return Tuple8(0x0000000000000000000000000000000000000000, 0);266>>>>>>> feat: Add custum signature with unlimited nesting.267	}268269	/// Set limits for the collection.270	/// @dev Throws error if limit not found.271	/// @param limit Name of the limit. Valid names:272	/// 	"accountTokenOwnershipLimit",273	/// 	"sponsoredDataSize",274	/// 	"sponsoredDataRateLimit",275	/// 	"tokenLimit",276	/// 	"sponsorTransferTimeout",277	/// 	"sponsorApproveTimeout"278	/// @param value Value of the limit.279	/// @dev EVM selector for this function is: 0x6a3841db,280	///  or in textual repr: setCollectionLimit(string,uint32)281	function setCollectionLimit(string memory limit, uint32 value) public {282		require(false, stub_error);283		limit;284		value;285		dummy = 0;286	}287288	/// Set limits for the collection.289	/// @dev Throws error if limit not found.290	/// @param limit Name of the limit. Valid names:291	/// 	"ownerCanTransfer",292	/// 	"ownerCanDestroy",293	/// 	"transfersEnabled"294	/// @param value Value of the limit.295	/// @dev EVM selector for this function is: 0x993b7fba,296	///  or in textual repr: setCollectionLimit(string,bool)297	function setCollectionLimit(string memory limit, bool value) public {298		require(false, stub_error);299		limit;300		value;301		dummy = 0;302	}303304	/// Get contract address.305	/// @dev EVM selector for this function is: 0xf6b4dfb4,306	///  or in textual repr: contractAddress()307	function contractAddress() public view returns (address) {308		require(false, stub_error);309		dummy;310		return 0x0000000000000000000000000000000000000000;311	}312313	/// Add collection admin.314	/// @param newAdmin Cross account administrator address.315	/// @dev EVM selector for this function is: 0x62e3c7c2,316	///  or in textual repr: addCollectionAdminCross((address,uint256))317	function addCollectionAdminCross(Tuple6 memory newAdmin) public {318		require(false, stub_error);319		newAdmin;320		dummy = 0;321	}322323	/// Remove collection admin.324	/// @param admin Cross account administrator address.325	/// @dev EVM selector for this function is: 0x810d1503,326	///  or in textual repr: removeCollectionAdminCross((address,uint256))327	function removeCollectionAdminCross(Tuple6 memory admin) public {328		require(false, stub_error);329		admin;330		dummy = 0;331	}332333	/// Add collection admin.334	/// @param newAdmin Address of the added administrator.335	/// @dev EVM selector for this function is: 0x92e462c7,336	///  or in textual repr: addCollectionAdmin(address)337	function addCollectionAdmin(address newAdmin) public {338		require(false, stub_error);339		newAdmin;340		dummy = 0;341	}342343	/// Remove collection admin.344	///345	/// @param admin Address of the removed administrator.346	/// @dev EVM selector for this function is: 0xfafd7b42,347	///  or in textual repr: removeCollectionAdmin(address)348	function removeCollectionAdmin(address admin) public {349		require(false, stub_error);350		admin;351		dummy = 0;352	}353354	/// Toggle accessibility of collection nesting.355	///356	/// @param enable If "true" degenerates to nesting: 'Owner' else to nesting: 'Disabled'357	/// @dev EVM selector for this function is: 0x112d4586,358	///  or in textual repr: setCollectionNesting(bool)359	function setCollectionNesting(bool enable) public {360		require(false, stub_error);361		enable;362		dummy = 0;363	}364365	/// Toggle accessibility of collection nesting.366	///367	/// @param enable If "true" degenerates to nesting: {OwnerRestricted: [1, 2, 3]} else to nesting: 'Disabled'368	/// @param collections Addresses of collections that will be available for nesting.369	/// @dev EVM selector for this function is: 0x112d4586,370	///  or in textual repr: setCollectionNesting(bool,address[])371	function setCollectionNesting(bool enable, address[] memory collections) public {372		require(false, stub_error);373		enable;374		collections;375		dummy = 0;376	}377378	/// Set the collection access method.379	/// @param mode Access mode380	/// 	0 for Normal381	/// 	1 for AllowList382	/// @dev EVM selector for this function is: 0x41835d4c,383	///  or in textual repr: setCollectionAccess(uint8)384	function setCollectionAccess(uint8 mode) public {385		require(false, stub_error);386		mode;387		dummy = 0;388	}389390	/// Checks that user allowed to operate with collection.391	///392	/// @param user User address to check.393	/// @dev EVM selector for this function is: 0xd63a8e11,394	///  or in textual repr: allowed(address)395	function allowed(address user) public view returns (bool) {396		require(false, stub_error);397		user;398		dummy;399		return false;400	}401402	/// Add the user to the allowed list.403	///404	/// @param user Address of a trusted user.405	/// @dev EVM selector for this function is: 0x67844fe6,406	///  or in textual repr: addToCollectionAllowList(address)407	function addToCollectionAllowList(address user) public {408		require(false, stub_error);409		user;410		dummy = 0;411	}412413	/// Add user to allowed list.414	///415	/// @param user User cross account address.416	/// @dev EVM selector for this function is: 0xf074da88,417	///  or in textual repr: addToCollectionAllowListCross((address,uint256))418	function addToCollectionAllowListCross(Tuple6 memory user) public {419		require(false, stub_error);420		user;421		dummy = 0;422	}423424	/// Remove the user from the allowed list.425	///426	/// @param user Address of a removed user.427	/// @dev EVM selector for this function is: 0x85c51acb,428	///  or in textual repr: removeFromCollectionAllowList(address)429	function removeFromCollectionAllowList(address user) public {430		require(false, stub_error);431		user;432		dummy = 0;433	}434435	/// Remove user from allowed list.436	///437	/// @param user User cross account address.438	/// @dev EVM selector for this function is: 0xc00df45c,439	///  or in textual repr: removeFromCollectionAllowListCross((address,uint256))440	function removeFromCollectionAllowListCross(Tuple6 memory user) public {441		require(false, stub_error);442		user;443		dummy = 0;444	}445446	/// Switch permission for minting.447	///448	/// @param mode Enable if "true".449	/// @dev EVM selector for this function is: 0x00018e84,450	///  or in textual repr: setCollectionMintMode(bool)451	function setCollectionMintMode(bool mode) public {452		require(false, stub_error);453		mode;454		dummy = 0;455	}456457	/// Check that account is the owner or admin of the collection458	///459	/// @param user account to verify460	/// @return "true" if account is the owner or admin461	/// @dev EVM selector for this function is: 0x9811b0c7,462	///  or in textual repr: isOwnerOrAdmin(address)463	function isOwnerOrAdmin(address user) public view returns (bool) {464		require(false, stub_error);465		user;466		dummy;467		return false;468	}469470	/// Check that account is the owner or admin of the collection471	///472	/// @param user User cross account to verify473	/// @return "true" if account is the owner or admin474	/// @dev EVM selector for this function is: 0x5aba3351,475	///  or in textual repr: isOwnerOrAdminCross((address,uint256))476	function isOwnerOrAdminCross(Tuple6 memory user) public view returns (bool) {477		require(false, stub_error);478		user;479		dummy;480		return false;481	}482483	/// Returns collection type484	///485	/// @return `Fungible` or `NFT` or `ReFungible`486	/// @dev EVM selector for this function is: 0xd34b55b8,487	///  or in textual repr: uniqueCollectionType()488	function uniqueCollectionType() public view returns (string memory) {489		require(false, stub_error);490		dummy;491		return "";492	}493494	/// Get collection owner.495	///496	/// @return Tuple with sponsor address and his substrate mirror.497	/// If address is canonical then substrate mirror is zero and vice versa.498	/// @dev EVM selector for this function is: 0xdf727d3b,499	///  or in textual repr: collectionOwner()500<<<<<<< HEAD501<<<<<<< HEAD502	function collectionOwner() public view returns (Tuple6 memory) {503		require(false, stub_error);504		dummy;505		return Tuple6(0x0000000000000000000000000000000000000000, 0);506=======507	function collectionOwner() public view returns (Tuple19 memory) {508		require(false, stub_error);509		dummy;510		return Tuple19(0x0000000000000000000000000000000000000000, 0);511>>>>>>> feat: add `EthCrossAccount` type512=======513	function collectionOwner() public view returns (Tuple8 memory) {514		require(false, stub_error);515		dummy;516		return Tuple8(0x0000000000000000000000000000000000000000, 0);517>>>>>>> feat: Add custum signature with unlimited nesting.518	}519520	/// Changes collection owner to another account521	///522	/// @dev Owner can be changed only by current owner523	/// @param newOwner new owner account524	/// @dev EVM selector for this function is: 0x4f53e226,525	///  or in textual repr: changeCollectionOwner(address)526	function changeCollectionOwner(address newOwner) public {527		require(false, stub_error);528		newOwner;529		dummy = 0;530	}531532	/// Get collection administrators533	///534	/// @return Vector of tuples with admins address and his substrate mirror.535	/// If address is canonical then substrate mirror is zero and vice versa.536	/// @dev EVM selector for this function is: 0x5813216b,537	///  or in textual repr: collectionAdmins()538	function collectionAdmins() public view returns (Tuple6[] memory) {539		require(false, stub_error);540		dummy;541		return new Tuple6[](0);542	}543544	/// Changes collection owner to another account545	///546	/// @dev Owner can be changed only by current owner547	/// @param newOwner new owner cross account548	/// @dev EVM selector for this function is: 0xbdff793d,549	///  or in textual repr: setOwnerCross((address,uint256))550	function setOwnerCross(Tuple6 memory newOwner) public {551		require(false, stub_error);552		newOwner;553		dummy = 0;554	}555}556557<<<<<<< HEAD558<<<<<<< HEAD559/// @dev anonymous struct560struct Tuple19 {561	address field_0;562	uint256 field_1;563}564565/// @title ERC-721 Non-Fungible Token Standard, optional metadata extension566/// @dev See https://eips.ethereum.org/EIPS/eip-721567/// @dev the ERC-165 identifier for this interface is 0x5b5e139f568contract ERC721Metadata is Dummy, ERC165 {569	// /// @notice A descriptive name for a collection of NFTs in this contract570	// /// @dev real implementation of this function lies in `ERC721UniqueExtensions`571	// /// @dev EVM selector for this function is: 0x06fdde03,572	// ///  or in textual repr: name()573	// function name() public view returns (string memory) {574	// 	require(false, stub_error);575	// 	dummy;576	// 	return "";577	// }578579	// /// @notice An abbreviated name for NFTs in this contract580	// /// @dev real implementation of this function lies in `ERC721UniqueExtensions`581	// /// @dev EVM selector for this function is: 0x95d89b41,582	// ///  or in textual repr: symbol()583	// function symbol() public view returns (string memory) {584	// 	require(false, stub_error);585	// 	dummy;586	// 	return "";587	// }588589	/// @notice A distinct Uniform Resource Identifier (URI) for a given asset.590	///591	/// @dev If the token has a `url` property and it is not empty, it is returned.592	///  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`.593	///  If the collection property `baseURI` is empty or absent, return "" (empty string)594	///  otherwise, if token property `suffix` present and is non-empty, return concatenation of baseURI and suffix595	///  otherwise, return concatenation of `baseURI` and stringified token id (decimal stringifying, without paddings).596	///597	/// @return token's const_metadata598	/// @dev EVM selector for this function is: 0xc87b56dd,599	///  or in textual repr: tokenURI(uint256)600	function tokenURI(uint256 tokenId) public view returns (string memory) {601		require(false, stub_error);602		tokenId;603		dummy;604		return "";605	}606}607608=======609>>>>>>> feat: Add custum signature with unlimited nesting.610=======611/// @dev anonymous struct612struct Tuple21 {613	string field_0;614	bytes field_1;615}616617>>>>>>> fix: after rebase618/// @title ERC721 Token that can be irreversibly burned (destroyed).619/// @dev the ERC-165 identifier for this interface is 0x42966c68620contract ERC721Burnable is Dummy, ERC165 {621	/// @notice Burns a specific ERC721 token.622	/// @dev Throws unless `msg.sender` is the current NFT owner, or an authorized623	///  operator of the current owner.624	/// @param tokenId The NFT to approve625	/// @dev EVM selector for this function is: 0x42966c68,626	///  or in textual repr: burn(uint256)627	function burn(uint256 tokenId) public {628		require(false, stub_error);629		tokenId;630		dummy = 0;631	}632}633634/// @dev inlined interface635contract ERC721UniqueMintableEvents {636	event MintingFinished();637}638639/// @title ERC721 minting logic.640/// @dev the ERC-165 identifier for this interface is 0x476ff149641contract ERC721UniqueMintable is Dummy, ERC165, ERC721UniqueMintableEvents {642	/// @dev EVM selector for this function is: 0x05d2035b,643	///  or in textual repr: mintingFinished()644	function mintingFinished() public view returns (bool) {645		require(false, stub_error);646		dummy;647		return false;648	}649650	/// @notice Function to mint token.651	/// @param to The new owner652	/// @return uint256 The id of the newly minted token653	/// @dev EVM selector for this function is: 0x6a627842,654	///  or in textual repr: mint(address)655	function mint(address to) public returns (uint256) {656		require(false, stub_error);657		to;658		dummy = 0;659		return 0;660	}661662	// /// @notice Function to mint token.663	// /// @dev `tokenId` should be obtained with `nextTokenId` method,664	// ///  unlike standard, you can't specify it manually665	// /// @param to The new owner666	// /// @param tokenId ID of the minted NFT667	// /// @dev EVM selector for this function is: 0x40c10f19,668	// ///  or in textual repr: mint(address,uint256)669	// function mint(address to, uint256 tokenId) public returns (bool) {670	// 	require(false, stub_error);671	// 	to;672	// 	tokenId;673	// 	dummy = 0;674	// 	return false;675	// }676677	/// @notice Function to mint token with the given tokenUri.678	/// @param to The new owner679	/// @param tokenUri Token URI that would be stored in the NFT properties680	/// @return uint256 The id of the newly minted token681	/// @dev EVM selector for this function is: 0x45c17782,682	///  or in textual repr: mintWithTokenURI(address,string)683	function mintWithTokenURI(address to, string memory tokenUri) public returns (uint256) {684		require(false, stub_error);685		to;686		tokenUri;687		dummy = 0;688		return 0;689	}690691	// /// @notice Function to mint token with the given tokenUri.692	// /// @dev `tokenId` should be obtained with `nextTokenId` method,693	// ///  unlike standard, you can't specify it manually694	// /// @param to The new owner695	// /// @param tokenId ID of the minted NFT696	// /// @param tokenUri Token URI that would be stored in the NFT properties697	// /// @dev EVM selector for this function is: 0x50bb4e7f,698	// ///  or in textual repr: mintWithTokenURI(address,uint256,string)699	// function mintWithTokenURI(address to, uint256 tokenId, string memory tokenUri) public returns (bool) {700	// 	require(false, stub_error);701	// 	to;702	// 	tokenId;703	// 	tokenUri;704	// 	dummy = 0;705	// 	return false;706	// }707708	/// @dev Not implemented709	/// @dev EVM selector for this function is: 0x7d64bcb4,710	///  or in textual repr: finishMinting()711	function finishMinting() public returns (bool) {712		require(false, stub_error);713		dummy = 0;714		return false;715	}716}717718/// @title Unique extensions for ERC721.719<<<<<<< HEAD720/// @dev the ERC-165 identifier for this interface is 0x244543ee721=======722/// @dev the ERC-165 identifier for this interface is 0xcc97cb35723>>>>>>> feat: Add custum signature with unlimited nesting.724contract ERC721UniqueExtensions is Dummy, ERC165 {725	/// @notice A descriptive name for a collection of NFTs in this contract726	/// @dev EVM selector for this function is: 0x06fdde03,727	///  or in textual repr: name()728	function name() public view returns (string memory) {729		require(false, stub_error);730		dummy;731		return "";732	}733734	/// @notice An abbreviated name for NFTs in this contract735	/// @dev EVM selector for this function is: 0x95d89b41,736	///  or in textual repr: symbol()737	function symbol() public view returns (string memory) {738		require(false, stub_error);739		dummy;740		return "";741	}742743	/// @notice Set or reaffirm the approved address for an NFT744	/// @dev The zero address indicates there is no approved address.745	/// @dev Throws unless `msg.sender` is the current NFT owner, or an authorized746	///  operator of the current owner.747	/// @param approved The new substrate address approved NFT controller748	/// @param tokenId The NFT to approve749	/// @dev EVM selector for this function is: 0x106fdb59,750	///  or in textual repr: approveCross((address,uint256),uint256)751	function approveCross(Tuple6 memory approved, uint256 tokenId) public {752		require(false, stub_error);753		approved;754		tokenId;755		dummy = 0;756	}757758	/// @notice Transfer ownership of an NFT759	/// @dev Throws unless `msg.sender` is the current owner. Throws if `to`760	///  is the zero address. Throws if `tokenId` is not a valid NFT.761	/// @param to The new owner762	/// @param tokenId The NFT to transfer763	/// @dev EVM selector for this function is: 0xa9059cbb,764	///  or in textual repr: transfer(address,uint256)765	function transfer(address to, uint256 tokenId) public {766		require(false, stub_error);767		to;768		tokenId;769		dummy = 0;770	}771772	/// @notice Transfer ownership of an NFT from cross account address to cross account address773	/// @dev Throws unless `msg.sender` is the current owner. Throws if `to`774	///  is the zero address. Throws if `tokenId` is not a valid NFT.775	/// @param from Cross acccount address of current owner776	/// @param to Cross acccount address of new owner777	/// @param tokenId The NFT to transfer778	/// @dev EVM selector for this function is: 0xd5cf430b,779	///  or in textual repr: transferFromCross(EthCrossAccount,EthCrossAccount,uint256)780	function transferFromCross(781<<<<<<< HEAD782		Tuple6 memory from,783		Tuple6 memory to,784=======785		EthCrossAccount memory from,786		EthCrossAccount memory to,787>>>>>>> feat: Add custum signature with unlimited nesting.788		uint256 tokenId789	) public {790		require(false, stub_error);791		from;792		to;793		tokenId;794		dummy = 0;795	}796797	/// @notice Burns a specific ERC721 token.798	/// @dev Throws unless `msg.sender` is the current owner or an authorized799	///  operator for this NFT. Throws if `from` is not the current owner. Throws800	///  if `to` is the zero address. Throws if `tokenId` is not a valid NFT.801	/// @param from The current owner of the NFT802	/// @param tokenId The NFT to transfer803	/// @dev EVM selector for this function is: 0x79cc6790,804	///  or in textual repr: burnFrom(address,uint256)805	function burnFrom(address from, uint256 tokenId) public {806		require(false, stub_error);807		from;808		tokenId;809		dummy = 0;810	}811812	/// @notice Burns a specific ERC721 token.813	/// @dev Throws unless `msg.sender` is the current owner or an authorized814	///  operator for this NFT. Throws if `from` is not the current owner. Throws815	///  if `to` is the zero address. Throws if `tokenId` is not a valid NFT.816	/// @param from The current owner of the NFT817	/// @param tokenId The NFT to transfer818	/// @dev EVM selector for this function is: 0xa8106d4a,819	///  or in textual repr: burnFromCross((address,uint256),uint256)820	function burnFromCross(Tuple6 memory from, uint256 tokenId) public {821		require(false, stub_error);822		from;823		tokenId;824		dummy = 0;825	}826827	/// @notice Returns next free NFT ID.828	/// @dev EVM selector for this function is: 0x75794a3c,829	///  or in textual repr: nextTokenId()830	function nextTokenId() public view returns (uint256) {831		require(false, stub_error);832		dummy;833		return 0;834	}835	// /// @notice Function to mint multiple tokens.836	// /// @dev `tokenIds` should be an array of consecutive numbers and first number837	// ///  should be obtained with `nextTokenId` method838	// /// @param to The new owner839	// /// @param tokenIds IDs of the minted NFTs840	// /// @dev EVM selector for this function is: 0x44a9945e,841	// ///  or in textual repr: mintBulk(address,uint256[])842	// function mintBulk(address to, uint256[] memory tokenIds) public returns (bool) {843	// 	require(false, stub_error);844	// 	to;845	// 	tokenIds;846	// 	dummy = 0;847	// 	return false;848	// }849850	// /// @notice Function to mint multiple tokens with the given tokenUris.851	// /// @dev `tokenIds` is array of pairs of token ID and token URI. Token IDs should be consecutive852	// ///  numbers and first number should be obtained with `nextTokenId` method853	// /// @param to The new owner854	// /// @param tokens array of pairs of token ID and token URI for minted tokens855	// /// @dev EVM selector for this function is: 0x36543006,856	// ///  or in textual repr: mintBulkWithTokenURI(address,(uint256,string)[])857	// function mintBulkWithTokenURI(address to, Tuple8[] memory tokens) public returns (bool) {858	// 	require(false, stub_error);859	// 	to;860	// 	tokens;861	// 	dummy = 0;862	// 	return false;863	// }864865<<<<<<< HEAD866}867868/// @dev anonymous struct869struct Tuple8 {870=======871	/// @notice Function to mint multiple tokens.872	/// @dev `tokenIds` should be an array of consecutive numbers and first number873	///  should be obtained with `nextTokenId` method874	/// @param to The new owner875	/// @param tokenIds IDs of the minted NFTs876	/// @dev EVM selector for this function is: 0xf9d9a5a3,877	///  or in textual repr: mintBulk(address,uint256[])878	function mintBulk(address to, uint256[] memory tokenIds) public returns (bool) {879		require(false, stub_error);880		to;881		tokenIds;882		dummy = 0;883		return false;884	}885886	/// @notice Function to mint multiple tokens with the given tokenUris.887	/// @dev `tokenIds` is array of pairs of token ID and token URI. Token IDs should be consecutive888	///  numbers and first number should be obtained with `nextTokenId` method889	/// @param to The new owner890	/// @param tokens array of pairs of token ID and token URI for minted tokens891	/// @dev EVM selector for this function is: 0xfd4e2a99,892	///  or in textual repr: mintBulkWithTokenURI(address,(uint256,string)[])893	function mintBulkWithTokenURI(address to, Tuple12[] memory tokens) public returns (bool) {894		require(false, stub_error);895		to;896		tokens;897		dummy = 0;898		return false;899	}900}901902/// @dev anonymous struct903struct Tuple12 {904>>>>>>> feat: Add custum signature with unlimited nesting.905	uint256 field_0;906	string field_1;907}908909<<<<<<< HEAD910/// @dev anonymous struct911struct Tuple6 {912	address field_0;913	uint256 field_1;914=======915/// @dev Cross account struct916struct EthCrossAccount {917	address eth;918	uint256 sub;919>>>>>>> feat: add `EthCrossAccount` type920}921922/// @dev anonymous struct923struct Tuple8 {924	address field_0;925	uint256 field_1;926}927928/// @title ERC-721 Non-Fungible Token Standard, optional enumeration extension929/// @dev See https://eips.ethereum.org/EIPS/eip-721930/// @dev the ERC-165 identifier for this interface is 0x780e9d63931contract ERC721Enumerable is Dummy, ERC165 {932	/// @notice Enumerate valid NFTs933	/// @param index A counter less than `totalSupply()`934	/// @return The token identifier for the `index`th NFT,935	///  (sort order not specified)936	/// @dev EVM selector for this function is: 0x4f6ccce7,937	///  or in textual repr: tokenByIndex(uint256)938	function tokenByIndex(uint256 index) public view returns (uint256) {939		require(false, stub_error);940		index;941		dummy;942		return 0;943	}944945	/// @dev Not implemented946	/// @dev EVM selector for this function is: 0x2f745c59,947	///  or in textual repr: tokenOfOwnerByIndex(address,uint256)948	function tokenOfOwnerByIndex(address owner, uint256 index) public view returns (uint256) {949		require(false, stub_error);950		owner;951		index;952		dummy;953		return 0;954	}955956	/// @notice Count NFTs tracked by this contract957	/// @return A count of valid NFTs tracked by this contract, where each one of958	///  them has an assigned and queryable owner not equal to the zero address959	/// @dev EVM selector for this function is: 0x18160ddd,960	///  or in textual repr: totalSupply()961	function totalSupply() public view returns (uint256) {962		require(false, stub_error);963		dummy;964		return 0;965	}966}967968/// @dev inlined interface969contract ERC721Events {970	event Transfer(address indexed from, address indexed to, uint256 indexed tokenId);971	event Approval(address indexed owner, address indexed approved, uint256 indexed tokenId);972	event ApprovalForAll(address indexed owner, address indexed operator, bool approved);973}974975/// @title ERC-721 Non-Fungible Token Standard976/// @dev See https://github.com/ethereum/EIPs/blob/master/EIPS/eip-721.md977/// @dev the ERC-165 identifier for this interface is 0x80ac58cd978contract ERC721 is Dummy, ERC165, ERC721Events {979	/// @notice Count all NFTs assigned to an owner980	/// @dev NFTs assigned to the zero address are considered invalid, and this981	///  function throws for queries about the zero address.982	/// @param owner An address for whom to query the balance983	/// @return The number of NFTs owned by `owner`, possibly zero984	/// @dev EVM selector for this function is: 0x70a08231,985	///  or in textual repr: balanceOf(address)986	function balanceOf(address owner) public view returns (uint256) {987		require(false, stub_error);988		owner;989		dummy;990		return 0;991	}992993	/// @notice Find the owner of an NFT994	/// @dev NFTs assigned to zero address are considered invalid, and queries995	///  about them do throw.996	/// @param tokenId The identifier for an NFT997	/// @return The address of the owner of the NFT998	/// @dev EVM selector for this function is: 0x6352211e,999	///  or in textual repr: ownerOf(uint256)1000	function ownerOf(uint256 tokenId) public view returns (address) {1001		require(false, stub_error);1002		tokenId;1003		dummy;1004		return 0x0000000000000000000000000000000000000000;1005	}10061007	/// @dev Not implemented1008	/// @dev EVM selector for this function is: 0xb88d4fde,1009	///  or in textual repr: safeTransferFrom(address,address,uint256,bytes)1010	function safeTransferFrom(1011		address from,1012		address to,1013		uint256 tokenId,1014		bytes memory data1015	) public {1016		require(false, stub_error);1017		from;1018		to;1019		tokenId;1020		data;1021		dummy = 0;1022	}10231024	/// @dev Not implemented1025	/// @dev EVM selector for this function is: 0x42842e0e,1026	///  or in textual repr: safeTransferFrom(address,address,uint256)1027	function safeTransferFrom(1028		address from,1029		address to,1030		uint256 tokenId1031	) public {1032		require(false, stub_error);1033		from;1034		to;1035		tokenId;1036		dummy = 0;1037	}10381039	/// @notice Transfer ownership of an NFT -- THE CALLER IS RESPONSIBLE1040	///  TO CONFIRM THAT `to` IS CAPABLE OF RECEIVING NFTS OR ELSE1041	///  THEY MAY BE PERMANENTLY LOST1042	/// @dev Throws unless `msg.sender` is the current owner or an authorized1043	///  operator for this NFT. Throws if `from` is not the current owner. Throws1044	///  if `to` is the zero address. Throws if `tokenId` is not a valid NFT.1045	/// @param from The current owner of the NFT1046	/// @param to The new owner1047	/// @param tokenId The NFT to transfer1048	/// @dev EVM selector for this function is: 0x23b872dd,1049	///  or in textual repr: transferFrom(address,address,uint256)1050	function transferFrom(1051		address from,1052		address to,1053		uint256 tokenId1054	) public {1055		require(false, stub_error);1056		from;1057		to;1058		tokenId;1059		dummy = 0;1060	}10611062	/// @notice Set or reaffirm the approved address for an NFT1063	/// @dev The zero address indicates there is no approved address.1064	/// @dev Throws unless `msg.sender` is the current NFT owner, or an authorized1065	///  operator of the current owner.1066	/// @param approved The new approved NFT controller1067	/// @param tokenId The NFT to approve1068	/// @dev EVM selector for this function is: 0x095ea7b3,1069	///  or in textual repr: approve(address,uint256)1070	function approve(address approved, uint256 tokenId) public {1071		require(false, stub_error);1072		approved;1073		tokenId;1074		dummy = 0;1075	}10761077	/// @dev Not implemented1078	/// @dev EVM selector for this function is: 0xa22cb465,1079	///  or in textual repr: setApprovalForAll(address,bool)1080	function setApprovalForAll(address operator, bool approved) public {1081		require(false, stub_error);1082		operator;1083		approved;1084		dummy = 0;1085	}10861087	/// @dev Not implemented1088	/// @dev EVM selector for this function is: 0x081812fc,1089	///  or in textual repr: getApproved(uint256)1090	function getApproved(uint256 tokenId) public view returns (address) {1091		require(false, stub_error);1092		tokenId;1093		dummy;1094		return 0x0000000000000000000000000000000000000000;1095	}10961097	/// @dev Not implemented1098	/// @dev EVM selector for this function is: 0xe985e9c5,1099	///  or in textual repr: isApprovedForAll(address,address)1100	function isApprovedForAll(address owner, address operator) public view returns (address) {1101		require(false, stub_error);1102		owner;1103		operator;1104		dummy;1105		return 0x0000000000000000000000000000000000000000;1106	}1107}11081109contract UniqueNFT is1110	Dummy,1111	ERC165,1112	ERC721,1113	ERC721Enumerable,1114	ERC721UniqueExtensions,1115	ERC721UniqueMintable,1116	ERC721Burnable,1117	ERC721Metadata,1118	Collection,1119	TokenProperties1120{}
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/// @dev common stubs holder7contract Dummy {8	uint8 dummy;9	string stub_error = "this contract is implemented in native";10}1112contract ERC165 is Dummy {13	function supportsInterface(bytes4 interfaceID) external view returns (bool) {14		require(false, stub_error);15		interfaceID;16		return true;17	}18}1920/// @title A contract that allows to set and delete token properties and change token property permissions.21/// @dev the ERC-165 identifier for this interface is 0x55dba91922contract TokenProperties is Dummy, ERC165 {23	/// @notice Set permissions for token property.24	/// @dev Throws error if `msg.sender` is not admin or owner of the collection.25	/// @param key Property key.26	/// @param isMutable Permission to mutate property.27	/// @param collectionAdmin Permission to mutate property by collection admin if property is mutable.28	/// @param tokenOwner Permission to mutate property by token owner if property is mutable.29	/// @dev EVM selector for this function is: 0x222d97fa,30	///  or in textual repr: setTokenPropertyPermission(string,bool,bool,bool)31	function setTokenPropertyPermission(32		string memory key,33		bool isMutable,34		bool collectionAdmin,35		bool tokenOwner36	) public {37		require(false, stub_error);38		key;39		isMutable;40		collectionAdmin;41		tokenOwner;42		dummy = 0;43	}4445	/// @notice Set token property value.46	/// @dev Throws error if `msg.sender` has no permission to edit the property.47	/// @param tokenId ID of the token.48	/// @param key Property key.49	/// @param value Property value.50	/// @dev EVM selector for this function is: 0x1752d67b,51	///  or in textual repr: setProperty(uint256,string,bytes)52	function setProperty(53		uint256 tokenId,54		string memory key,55		bytes memory value56	) public {57		require(false, stub_error);58		tokenId;59		key;60		value;61		dummy = 0;62	}6364	/// @notice Set token properties value.65	/// @dev Throws error if `msg.sender` has no permission to edit the property.66	/// @param tokenId ID of the token.67	/// @param properties settable properties68	/// @dev EVM selector for this function is: 0x14ed3a6e,69	///  or in textual repr: setProperties(uint256,(string,bytes)[])70	function setProperties(uint256 tokenId, Tuple19[] memory properties) public {71		require(false, stub_error);72		tokenId;73		properties;74		dummy = 0;75	}7677	/// @notice Delete token property value.78	/// @dev Throws error if `msg.sender` has no permission to edit the property.79	/// @param tokenId ID of the token.80	/// @param key Property key.81	/// @dev EVM selector for this function is: 0x066111d1,82	///  or in textual repr: deleteProperty(uint256,string)83	function deleteProperty(uint256 tokenId, string memory key) public {84		require(false, stub_error);85		tokenId;86		key;87		dummy = 0;88	}8990	/// @notice Get token property value.91	/// @dev Throws error if key not found92	/// @param tokenId ID of the token.93	/// @param key Property key.94	/// @return Property value bytes95	/// @dev EVM selector for this function is: 0x7228c327,96	///  or in textual repr: property(uint256,string)97	function property(uint256 tokenId, string memory key) public view returns (bytes memory) {98		require(false, stub_error);99		tokenId;100		key;101		dummy;102		return hex"";103	}104}105106/// @title A contract that allows you to work with collections.107<<<<<<< HEAD108<<<<<<< HEAD109<<<<<<< HEAD110/// @dev the ERC-165 identifier for this interface is 0xb3152af3111=======112/// @dev the ERC-165 identifier for this interface is 0x674be726113>>>>>>> feat: Add custum signature with unlimited nesting.114=======115/// @dev the ERC-165 identifier for this interface is 0x943ee094116>>>>>>> fix: after rebase117=======118/// @dev the ERC-165 identifier for this interface is 0xefe988e0119>>>>>>> misk: update stubs120contract Collection is Dummy, ERC165 {121	/// Set collection property.122	///123	/// @param key Property key.124	/// @param value Propery value.125	/// @dev EVM selector for this function is: 0x2f073f66,126	///  or in textual repr: setCollectionProperty(string,bytes)127	function setCollectionProperty(string memory key, bytes memory value) public {128		require(false, stub_error);129		key;130		value;131		dummy = 0;132	}133134	/// Set collection properties.135	///136	/// @param properties Vector of properties key/value pair.137	/// @dev EVM selector for this function is: 0x50b26b2a,138	///  or in textual repr: setCollectionProperties((string,bytes)[])139	function setCollectionProperties(Tuple21[] memory properties) public {140		require(false, stub_error);141		properties;142		dummy = 0;143	}144145	/// Delete collection property.146	///147	/// @param key Property key.148	/// @dev EVM selector for this function is: 0x7b7debce,149	///  or in textual repr: deleteCollectionProperty(string)150	function deleteCollectionProperty(string memory key) public {151		require(false, stub_error);152		key;153		dummy = 0;154	}155156	/// Delete collection properties.157	///158	/// @param keys Properties keys.159	/// @dev EVM selector for this function is: 0xee206ee3,160	///  or in textual repr: deleteCollectionProperties(string[])161	function deleteCollectionProperties(string[] memory keys) public {162		require(false, stub_error);163		keys;164		dummy = 0;165	}166167	/// Get collection property.168	///169	/// @dev Throws error if key not found.170	///171	/// @param key Property key.172	/// @return bytes The property corresponding to the key.173	/// @dev EVM selector for this function is: 0xcf24fd6d,174	///  or in textual repr: collectionProperty(string)175	function collectionProperty(string memory key) public view returns (bytes memory) {176		require(false, stub_error);177		key;178		dummy;179		return hex"";180	}181182	/// Get collection properties.183	///184	/// @param keys Properties keys. Empty keys for all propertyes.185	/// @return Vector of properties key/value pairs.186	/// @dev EVM selector for this function is: 0x285fb8e6,187	///  or in textual repr: collectionProperties(string[])188	function collectionProperties(string[] memory keys) public view returns (Tuple21[] memory) {189		require(false, stub_error);190		keys;191		dummy;192		return new Tuple21[](0);193	}194195	/// Set the sponsor of the collection.196	///197	/// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.198	///199	/// @param sponsor Address of the sponsor from whose account funds will be debited for operations with the contract.200	/// @dev EVM selector for this function is: 0x7623402e,201	///  or in textual repr: setCollectionSponsor(address)202	function setCollectionSponsor(address sponsor) public {203		require(false, stub_error);204		sponsor;205		dummy = 0;206	}207208	/// Set the sponsor of the collection.209	///210	/// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.211	///212	/// @param sponsor Cross account address of the sponsor from whose account funds will be debited for operations with the contract.213<<<<<<< HEAD214	/// @dev EVM selector for this function is: 0x403e96a7,215	///  or in textual repr: setCollectionSponsorCross((address,uint256))216	function setCollectionSponsorCross(Tuple6 memory sponsor) public {217=======218	/// @dev EVM selector for this function is: 0x84a1d5a8,219	///  or in textual repr: setCollectionSponsorCross(EthCrossAccount)220	///  or in the expanded repr: setCollectionSponsorCross((address,uint256))221	function setCollectionSponsorCross(EthCrossAccount memory sponsor) public {222>>>>>>> misk: update stubs223		require(false, stub_error);224		sponsor;225		dummy = 0;226	}227228	/// Whether there is a pending sponsor.229	/// @dev EVM selector for this function is: 0x058ac185,230	///  or in textual repr: hasCollectionPendingSponsor()231	function hasCollectionPendingSponsor() public view returns (bool) {232		require(false, stub_error);233		dummy;234		return false;235	}236237	/// Collection sponsorship confirmation.238	///239	/// @dev After setting the sponsor for the collection, it must be confirmed with this function.240	/// @dev EVM selector for this function is: 0x3c50e97a,241	///  or in textual repr: confirmCollectionSponsorship()242	function confirmCollectionSponsorship() public {243		require(false, stub_error);244		dummy = 0;245	}246247	/// Remove collection sponsor.248	/// @dev EVM selector for this function is: 0x6e0326a3,249	///  or in textual repr: removeCollectionSponsor()250	function removeCollectionSponsor() public {251		require(false, stub_error);252		dummy = 0;253	}254255	/// Get current sponsor.256	///257	/// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.258	/// @dev EVM selector for this function is: 0x6ec0a9f1,259	///  or in textual repr: collectionSponsor()260<<<<<<< HEAD261<<<<<<< HEAD262<<<<<<< HEAD263	function collectionSponsor() public view returns (Tuple6 memory) {264		require(false, stub_error);265		dummy;266		return Tuple6(0x0000000000000000000000000000000000000000, 0);267=======268	function collectionSponsor() public view returns (Tuple19 memory) {269		require(false, stub_error);270		dummy;271		return Tuple19(0x0000000000000000000000000000000000000000, 0);272>>>>>>> feat: add `EthCrossAccount` type273=======274	function collectionSponsor() public view returns (Tuple8 memory) {275		require(false, stub_error);276		dummy;277		return Tuple8(0x0000000000000000000000000000000000000000, 0);278>>>>>>> feat: Add custum signature with unlimited nesting.279=======280	function collectionSponsor() public view returns (Tuple24 memory) {281		require(false, stub_error);282		dummy;283		return Tuple24(0x0000000000000000000000000000000000000000, 0);284>>>>>>> misk: update stubs285	}286287	/// Set limits for the collection.288	/// @dev Throws error if limit not found.289	/// @param limit Name of the limit. Valid names:290	/// 	"accountTokenOwnershipLimit",291	/// 	"sponsoredDataSize",292	/// 	"sponsoredDataRateLimit",293	/// 	"tokenLimit",294	/// 	"sponsorTransferTimeout",295	/// 	"sponsorApproveTimeout"296	/// @param value Value of the limit.297	/// @dev EVM selector for this function is: 0x6a3841db,298	///  or in textual repr: setCollectionLimit(string,uint32)299	function setCollectionLimit(string memory limit, uint32 value) public {300		require(false, stub_error);301		limit;302		value;303		dummy = 0;304	}305306	/// Set limits for the collection.307	/// @dev Throws error if limit not found.308	/// @param limit Name of the limit. Valid names:309	/// 	"ownerCanTransfer",310	/// 	"ownerCanDestroy",311	/// 	"transfersEnabled"312	/// @param value Value of the limit.313	/// @dev EVM selector for this function is: 0x993b7fba,314	///  or in textual repr: setCollectionLimit(string,bool)315	function setCollectionLimit(string memory limit, bool value) public {316		require(false, stub_error);317		limit;318		value;319		dummy = 0;320	}321322	/// Get contract address.323	/// @dev EVM selector for this function is: 0xf6b4dfb4,324	///  or in textual repr: contractAddress()325	function contractAddress() public view returns (address) {326		require(false, stub_error);327		dummy;328		return 0x0000000000000000000000000000000000000000;329	}330331	/// Add collection admin.332	/// @param newAdmin Cross account administrator address.333<<<<<<< HEAD334	/// @dev EVM selector for this function is: 0x62e3c7c2,335	///  or in textual repr: addCollectionAdminCross((address,uint256))336	function addCollectionAdminCross(Tuple6 memory newAdmin) public {337=======338	/// @dev EVM selector for this function is: 0x859aa7d6,339	///  or in textual repr: addCollectionAdminCross(EthCrossAccount)340	///  or in the expanded repr: addCollectionAdminCross((address,uint256))341	function addCollectionAdminCross(EthCrossAccount memory newAdmin) public {342>>>>>>> misk: update stubs343		require(false, stub_error);344		newAdmin;345		dummy = 0;346	}347348	/// Remove collection admin.349	/// @param admin Cross account administrator address.350<<<<<<< HEAD351	/// @dev EVM selector for this function is: 0x810d1503,352	///  or in textual repr: removeCollectionAdminCross((address,uint256))353	function removeCollectionAdminCross(Tuple6 memory admin) public {354=======355	/// @dev EVM selector for this function is: 0x6c0cd173,356	///  or in textual repr: removeCollectionAdminCross(EthCrossAccount)357	///  or in the expanded repr: removeCollectionAdminCross((address,uint256))358	function removeCollectionAdminCross(EthCrossAccount memory admin) public {359>>>>>>> misk: update stubs360		require(false, stub_error);361		admin;362		dummy = 0;363	}364365	/// Add collection admin.366	/// @param newAdmin Address of the added administrator.367	/// @dev EVM selector for this function is: 0x92e462c7,368	///  or in textual repr: addCollectionAdmin(address)369	function addCollectionAdmin(address newAdmin) public {370		require(false, stub_error);371		newAdmin;372		dummy = 0;373	}374375	/// Remove collection admin.376	///377	/// @param admin Address of the removed administrator.378	/// @dev EVM selector for this function is: 0xfafd7b42,379	///  or in textual repr: removeCollectionAdmin(address)380	function removeCollectionAdmin(address admin) public {381		require(false, stub_error);382		admin;383		dummy = 0;384	}385386	/// Toggle accessibility of collection nesting.387	///388	/// @param enable If "true" degenerates to nesting: 'Owner' else to nesting: 'Disabled'389	/// @dev EVM selector for this function is: 0x112d4586,390	///  or in textual repr: setCollectionNesting(bool)391	function setCollectionNesting(bool enable) public {392		require(false, stub_error);393		enable;394		dummy = 0;395	}396397	/// Toggle accessibility of collection nesting.398	///399	/// @param enable If "true" degenerates to nesting: {OwnerRestricted: [1, 2, 3]} else to nesting: 'Disabled'400	/// @param collections Addresses of collections that will be available for nesting.401	/// @dev EVM selector for this function is: 0x64872396,402	///  or in textual repr: setCollectionNesting(bool,address[])403	function setCollectionNesting(bool enable, address[] memory collections) public {404		require(false, stub_error);405		enable;406		collections;407		dummy = 0;408	}409410	/// Set the collection access method.411	/// @param mode Access mode412	/// 	0 for Normal413	/// 	1 for AllowList414	/// @dev EVM selector for this function is: 0x41835d4c,415	///  or in textual repr: setCollectionAccess(uint8)416	function setCollectionAccess(uint8 mode) public {417		require(false, stub_error);418		mode;419		dummy = 0;420	}421422	/// Checks that user allowed to operate with collection.423	///424	/// @param user User address to check.425	/// @dev EVM selector for this function is: 0xd63a8e11,426	///  or in textual repr: allowed(address)427	function allowed(address user) public view returns (bool) {428		require(false, stub_error);429		user;430		dummy;431		return false;432	}433434	/// Add the user to the allowed list.435	///436	/// @param user Address of a trusted user.437	/// @dev EVM selector for this function is: 0x67844fe6,438	///  or in textual repr: addToCollectionAllowList(address)439	function addToCollectionAllowList(address user) public {440		require(false, stub_error);441		user;442		dummy = 0;443	}444445	/// Add user to allowed list.446	///447	/// @param user User cross account address.448<<<<<<< HEAD449	/// @dev EVM selector for this function is: 0xf074da88,450	///  or in textual repr: addToCollectionAllowListCross((address,uint256))451	function addToCollectionAllowListCross(Tuple6 memory user) public {452=======453	/// @dev EVM selector for this function is: 0xa0184a3a,454	///  or in textual repr: addToCollectionAllowListCross(EthCrossAccount)455	///  or in the expanded repr: addToCollectionAllowListCross((address,uint256))456	function addToCollectionAllowListCross(EthCrossAccount memory user) public {457>>>>>>> misk: update stubs458		require(false, stub_error);459		user;460		dummy = 0;461	}462463	/// Remove the user from the allowed list.464	///465	/// @param user Address of a removed user.466	/// @dev EVM selector for this function is: 0x85c51acb,467	///  or in textual repr: removeFromCollectionAllowList(address)468	function removeFromCollectionAllowList(address user) public {469		require(false, stub_error);470		user;471		dummy = 0;472	}473474	/// Remove user from allowed list.475	///476	/// @param user User cross account address.477<<<<<<< HEAD478	/// @dev EVM selector for this function is: 0xc00df45c,479	///  or in textual repr: removeFromCollectionAllowListCross((address,uint256))480	function removeFromCollectionAllowListCross(Tuple6 memory user) public {481=======482	/// @dev EVM selector for this function is: 0x09ba452a,483	///  or in textual repr: removeFromCollectionAllowListCross(EthCrossAccount)484	///  or in the expanded repr: removeFromCollectionAllowListCross((address,uint256))485	function removeFromCollectionAllowListCross(EthCrossAccount memory user) public {486>>>>>>> misk: update stubs487		require(false, stub_error);488		user;489		dummy = 0;490	}491492	/// Switch permission for minting.493	///494	/// @param mode Enable if "true".495	/// @dev EVM selector for this function is: 0x00018e84,496	///  or in textual repr: setCollectionMintMode(bool)497	function setCollectionMintMode(bool mode) public {498		require(false, stub_error);499		mode;500		dummy = 0;501	}502503	/// Check that account is the owner or admin of the collection504	///505	/// @param user account to verify506	/// @return "true" if account is the owner or admin507	/// @dev EVM selector for this function is: 0x9811b0c7,508	///  or in textual repr: isOwnerOrAdmin(address)509	function isOwnerOrAdmin(address user) public view returns (bool) {510		require(false, stub_error);511		user;512		dummy;513		return false;514	}515516	/// Check that account is the owner or admin of the collection517	///518	/// @param user User cross account to verify519	/// @return "true" if account is the owner or admin520<<<<<<< HEAD521	/// @dev EVM selector for this function is: 0x5aba3351,522	///  or in textual repr: isOwnerOrAdminCross((address,uint256))523	function isOwnerOrAdminCross(Tuple6 memory user) public view returns (bool) {524=======525	/// @dev EVM selector for this function is: 0x3e75a905,526	///  or in textual repr: isOwnerOrAdminCross(EthCrossAccount)527	///  or in the expanded repr: isOwnerOrAdminCross((address,uint256))528	function isOwnerOrAdminCross(EthCrossAccount memory user) public view returns (bool) {529>>>>>>> misk: update stubs530		require(false, stub_error);531		user;532		dummy;533		return false;534	}535536	/// Returns collection type537	///538	/// @return `Fungible` or `NFT` or `ReFungible`539	/// @dev EVM selector for this function is: 0xd34b55b8,540	///  or in textual repr: uniqueCollectionType()541	function uniqueCollectionType() public view returns (string memory) {542		require(false, stub_error);543		dummy;544		return "";545	}546547	/// Get collection owner.548	///549	/// @return Tuple with sponsor address and his substrate mirror.550	/// If address is canonical then substrate mirror is zero and vice versa.551	/// @dev EVM selector for this function is: 0xdf727d3b,552	///  or in textual repr: collectionOwner()553<<<<<<< HEAD554<<<<<<< HEAD555<<<<<<< HEAD556	function collectionOwner() public view returns (Tuple6 memory) {557		require(false, stub_error);558		dummy;559		return Tuple6(0x0000000000000000000000000000000000000000, 0);560=======561	function collectionOwner() public view returns (Tuple19 memory) {562		require(false, stub_error);563		dummy;564		return Tuple19(0x0000000000000000000000000000000000000000, 0);565>>>>>>> feat: add `EthCrossAccount` type566=======567	function collectionOwner() public view returns (Tuple8 memory) {568		require(false, stub_error);569		dummy;570		return Tuple8(0x0000000000000000000000000000000000000000, 0);571>>>>>>> feat: Add custum signature with unlimited nesting.572=======573	function collectionOwner() public view returns (EthCrossAccount memory) {574		require(false, stub_error);575		dummy;576		return EthCrossAccount(0x0000000000000000000000000000000000000000, 0);577>>>>>>> misk: update stubs578	}579580	/// Changes collection owner to another account581	///582	/// @dev Owner can be changed only by current owner583	/// @param newOwner new owner account584	/// @dev EVM selector for this function is: 0x4f53e226,585	///  or in textual repr: changeCollectionOwner(address)586	function changeCollectionOwner(address newOwner) public {587		require(false, stub_error);588		newOwner;589		dummy = 0;590	}591592	/// Get collection administrators593	///594	/// @return Vector of tuples with admins address and his substrate mirror.595	/// If address is canonical then substrate mirror is zero and vice versa.596	/// @dev EVM selector for this function is: 0x5813216b,597	///  or in textual repr: collectionAdmins()598<<<<<<< HEAD599	function collectionAdmins() public view returns (Tuple6[] memory) {600		require(false, stub_error);601		dummy;602		return new Tuple6[](0);603=======604	function collectionAdmins() public view returns (EthCrossAccount[] memory) {605		require(false, stub_error);606		dummy;607		return new EthCrossAccount[](0);608>>>>>>> misk: update stubs609	}610611	/// Changes collection owner to another account612	///613	/// @dev Owner can be changed only by current owner614	/// @param newOwner new owner cross account615<<<<<<< HEAD616	/// @dev EVM selector for this function is: 0xbdff793d,617	///  or in textual repr: setOwnerCross((address,uint256))618	function setOwnerCross(Tuple6 memory newOwner) public {619=======620	/// @dev EVM selector for this function is: 0xe5c9913f,621	///  or in textual repr: setOwnerCross(EthCrossAccount)622	///  or in the expanded repr: setOwnerCross((address,uint256))623	function setOwnerCross(EthCrossAccount memory newOwner) public {624>>>>>>> misk: update stubs625		require(false, stub_error);626		newOwner;627		dummy = 0;628	}629}630631<<<<<<< HEAD632<<<<<<< HEAD633<<<<<<< HEAD634/// @dev anonymous struct635struct Tuple19 {636=======637/// @dev Cross account struct638struct EthCrossAccount {639	address eth;640	uint256 sub;641}642643/// @dev anonymous struct644struct Tuple24 {645>>>>>>> misk: update stubs646	address field_0;647	uint256 field_1;648}649650<<<<<<< HEAD651/// @title ERC-721 Non-Fungible Token Standard, optional metadata extension652/// @dev See https://eips.ethereum.org/EIPS/eip-721653/// @dev the ERC-165 identifier for this interface is 0x5b5e139f654contract ERC721Metadata is Dummy, ERC165 {655	// /// @notice A descriptive name for a collection of NFTs in this contract656	// /// @dev real implementation of this function lies in `ERC721UniqueExtensions`657	// /// @dev EVM selector for this function is: 0x06fdde03,658	// ///  or in textual repr: name()659	// function name() public view returns (string memory) {660	// 	require(false, stub_error);661	// 	dummy;662	// 	return "";663	// }664665	// /// @notice An abbreviated name for NFTs in this contract666	// /// @dev real implementation of this function lies in `ERC721UniqueExtensions`667	// /// @dev EVM selector for this function is: 0x95d89b41,668	// ///  or in textual repr: symbol()669	// function symbol() public view returns (string memory) {670	// 	require(false, stub_error);671	// 	dummy;672	// 	return "";673	// }674675	/// @notice A distinct Uniform Resource Identifier (URI) for a given asset.676	///677	/// @dev If the token has a `url` property and it is not empty, it is returned.678	///  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`.679	///  If the collection property `baseURI` is empty or absent, return "" (empty string)680	///  otherwise, if token property `suffix` present and is non-empty, return concatenation of baseURI and suffix681	///  otherwise, return concatenation of `baseURI` and stringified token id (decimal stringifying, without paddings).682	///683	/// @return token's const_metadata684	/// @dev EVM selector for this function is: 0xc87b56dd,685	///  or in textual repr: tokenURI(uint256)686	function tokenURI(uint256 tokenId) public view returns (string memory) {687		require(false, stub_error);688		tokenId;689		dummy;690		return "";691	}692}693694=======695>>>>>>> feat: Add custum signature with unlimited nesting.696=======697=======698>>>>>>> misk: update stubs699/// @dev anonymous struct700struct Tuple21 {701	string field_0;702	bytes field_1;703}704705>>>>>>> fix: after rebase706/// @title ERC721 Token that can be irreversibly burned (destroyed).707/// @dev the ERC-165 identifier for this interface is 0x42966c68708contract ERC721Burnable is Dummy, ERC165 {709	/// @notice Burns a specific ERC721 token.710	/// @dev Throws unless `msg.sender` is the current NFT owner, or an authorized711	///  operator of the current owner.712	/// @param tokenId The NFT to approve713	/// @dev EVM selector for this function is: 0x42966c68,714	///  or in textual repr: burn(uint256)715	function burn(uint256 tokenId) public {716		require(false, stub_error);717		tokenId;718		dummy = 0;719	}720}721722/// @dev inlined interface723contract ERC721UniqueMintableEvents {724	event MintingFinished();725}726727/// @title ERC721 minting logic.728/// @dev the ERC-165 identifier for this interface is 0x476ff149729contract ERC721UniqueMintable is Dummy, ERC165, ERC721UniqueMintableEvents {730	/// @dev EVM selector for this function is: 0x05d2035b,731	///  or in textual repr: mintingFinished()732	function mintingFinished() public view returns (bool) {733		require(false, stub_error);734		dummy;735		return false;736	}737738	/// @notice Function to mint token.739	/// @param to The new owner740	/// @return uint256 The id of the newly minted token741	/// @dev EVM selector for this function is: 0x6a627842,742	///  or in textual repr: mint(address)743	function mint(address to) public returns (uint256) {744		require(false, stub_error);745		to;746		dummy = 0;747		return 0;748	}749750	// /// @notice Function to mint token.751	// /// @dev `tokenId` should be obtained with `nextTokenId` method,752	// ///  unlike standard, you can't specify it manually753	// /// @param to The new owner754	// /// @param tokenId ID of the minted NFT755	// /// @dev EVM selector for this function is: 0x40c10f19,756	// ///  or in textual repr: mint(address,uint256)757	// function mint(address to, uint256 tokenId) public returns (bool) {758	// 	require(false, stub_error);759	// 	to;760	// 	tokenId;761	// 	dummy = 0;762	// 	return false;763	// }764765	/// @notice Function to mint token with the given tokenUri.766	/// @param to The new owner767	/// @param tokenUri Token URI that would be stored in the NFT properties768	/// @return uint256 The id of the newly minted token769	/// @dev EVM selector for this function is: 0x45c17782,770	///  or in textual repr: mintWithTokenURI(address,string)771	function mintWithTokenURI(address to, string memory tokenUri) public returns (uint256) {772		require(false, stub_error);773		to;774		tokenUri;775		dummy = 0;776		return 0;777	}778779	// /// @notice Function to mint token with the given tokenUri.780	// /// @dev `tokenId` should be obtained with `nextTokenId` method,781	// ///  unlike standard, you can't specify it manually782	// /// @param to The new owner783	// /// @param tokenId ID of the minted NFT784	// /// @param tokenUri Token URI that would be stored in the NFT properties785	// /// @dev EVM selector for this function is: 0x50bb4e7f,786	// ///  or in textual repr: mintWithTokenURI(address,uint256,string)787	// function mintWithTokenURI(address to, uint256 tokenId, string memory tokenUri) public returns (bool) {788	// 	require(false, stub_error);789	// 	to;790	// 	tokenId;791	// 	tokenUri;792	// 	dummy = 0;793	// 	return false;794	// }795796	/// @dev Not implemented797	/// @dev EVM selector for this function is: 0x7d64bcb4,798	///  or in textual repr: finishMinting()799	function finishMinting() public returns (bool) {800		require(false, stub_error);801		dummy = 0;802		return false;803	}804}805806/// @title Unique extensions for ERC721.807<<<<<<< HEAD808<<<<<<< HEAD809/// @dev the ERC-165 identifier for this interface is 0x244543ee810=======811/// @dev the ERC-165 identifier for this interface is 0xcc97cb35812>>>>>>> feat: Add custum signature with unlimited nesting.813=======814/// @dev the ERC-165 identifier for this interface is 0xb76006ac815>>>>>>> misk: update stubs816contract ERC721UniqueExtensions is Dummy, ERC165 {817	/// @notice A descriptive name for a collection of NFTs in this contract818	/// @dev EVM selector for this function is: 0x06fdde03,819	///  or in textual repr: name()820	function name() public view returns (string memory) {821		require(false, stub_error);822		dummy;823		return "";824	}825826	/// @notice An abbreviated name for NFTs in this contract827	/// @dev EVM selector for this function is: 0x95d89b41,828	///  or in textual repr: symbol()829	function symbol() public view returns (string memory) {830		require(false, stub_error);831		dummy;832		return "";833	}834835	/// @notice Set or reaffirm the approved address for an NFT836	/// @dev The zero address indicates there is no approved address.837	/// @dev Throws unless `msg.sender` is the current NFT owner, or an authorized838	///  operator of the current owner.839	/// @param approved The new substrate address approved NFT controller840	/// @param tokenId The NFT to approve841<<<<<<< HEAD842	/// @dev EVM selector for this function is: 0x106fdb59,843	///  or in textual repr: approveCross((address,uint256),uint256)844	function approveCross(Tuple6 memory approved, uint256 tokenId) public {845=======846	/// @dev EVM selector for this function is: 0x0ecd0ab0,847	///  or in textual repr: approveCross(EthCrossAccount,uint256)848	///  or in the expanded repr: approveCross((address,uint256),uint256)849	function approveCross(EthCrossAccount memory approved, uint256 tokenId) public {850>>>>>>> misk: update stubs851		require(false, stub_error);852		approved;853		tokenId;854		dummy = 0;855	}856857	/// @notice Transfer ownership of an NFT858	/// @dev Throws unless `msg.sender` is the current owner. Throws if `to`859	///  is the zero address. Throws if `tokenId` is not a valid NFT.860	/// @param to The new owner861	/// @param tokenId The NFT to transfer862	/// @dev EVM selector for this function is: 0xa9059cbb,863	///  or in textual repr: transfer(address,uint256)864	function transfer(address to, uint256 tokenId) public {865		require(false, stub_error);866		to;867		tokenId;868		dummy = 0;869	}870871	/// @notice Transfer ownership of an NFT from cross account address to cross account address872	/// @dev Throws unless `msg.sender` is the current owner. Throws if `to`873	///  is the zero address. Throws if `tokenId` is not a valid NFT.874	/// @param from Cross acccount address of current owner875	/// @param to Cross acccount address of new owner876	/// @param tokenId The NFT to transfer877	/// @dev EVM selector for this function is: 0xd5cf430b,878	///  or in textual repr: transferFromCross(EthCrossAccount,EthCrossAccount,uint256)879	///  or in the expanded repr: transferFromCross((address,uint256),(address,uint256),uint256)880	function transferFromCross(881<<<<<<< HEAD882		Tuple6 memory from,883		Tuple6 memory to,884=======885		EthCrossAccount memory from,886		EthCrossAccount memory to,887>>>>>>> feat: Add custum signature with unlimited nesting.888		uint256 tokenId889	) public {890		require(false, stub_error);891		from;892		to;893		tokenId;894		dummy = 0;895	}896897	/// @notice Burns a specific ERC721 token.898	/// @dev Throws unless `msg.sender` is the current owner or an authorized899	///  operator for this NFT. Throws if `from` is not the current owner. Throws900	///  if `to` is the zero address. Throws if `tokenId` is not a valid NFT.901	/// @param from The current owner of the NFT902	/// @param tokenId The NFT to transfer903	/// @dev EVM selector for this function is: 0x79cc6790,904	///  or in textual repr: burnFrom(address,uint256)905	function burnFrom(address from, uint256 tokenId) public {906		require(false, stub_error);907		from;908		tokenId;909		dummy = 0;910	}911912	/// @notice Burns a specific ERC721 token.913	/// @dev Throws unless `msg.sender` is the current owner or an authorized914	///  operator for this NFT. Throws if `from` is not the current owner. Throws915	///  if `to` is the zero address. Throws if `tokenId` is not a valid NFT.916	/// @param from The current owner of the NFT917	/// @param tokenId The NFT to transfer918<<<<<<< HEAD919	/// @dev EVM selector for this function is: 0xa8106d4a,920	///  or in textual repr: burnFromCross((address,uint256),uint256)921	function burnFromCross(Tuple6 memory from, uint256 tokenId) public {922=======923	/// @dev EVM selector for this function is: 0xbb2f5a58,924	///  or in textual repr: burnFromCross(EthCrossAccount,uint256)925	///  or in the expanded repr: burnFromCross((address,uint256),uint256)926	function burnFromCross(EthCrossAccount memory from, uint256 tokenId) public {927>>>>>>> misk: update stubs928		require(false, stub_error);929		from;930		tokenId;931		dummy = 0;932	}933934	/// @notice Returns next free NFT ID.935	/// @dev EVM selector for this function is: 0x75794a3c,936	///  or in textual repr: nextTokenId()937	function nextTokenId() public view returns (uint256) {938		require(false, stub_error);939		dummy;940		return 0;941	}942	// /// @notice Function to mint multiple tokens.943	// /// @dev `tokenIds` should be an array of consecutive numbers and first number944	// ///  should be obtained with `nextTokenId` method945	// /// @param to The new owner946	// /// @param tokenIds IDs of the minted NFTs947	// /// @dev EVM selector for this function is: 0x44a9945e,948	// ///  or in textual repr: mintBulk(address,uint256[])949	// function mintBulk(address to, uint256[] memory tokenIds) public returns (bool) {950	// 	require(false, stub_error);951	// 	to;952	// 	tokenIds;953	// 	dummy = 0;954	// 	return false;955	// }956957	// /// @notice Function to mint multiple tokens with the given tokenUris.958	// /// @dev `tokenIds` is array of pairs of token ID and token URI. Token IDs should be consecutive959	// ///  numbers and first number should be obtained with `nextTokenId` method960	// /// @param to The new owner961	// /// @param tokens array of pairs of token ID and token URI for minted tokens962	// /// @dev EVM selector for this function is: 0x36543006,963	// ///  or in textual repr: mintBulkWithTokenURI(address,(uint256,string)[])964	// function mintBulkWithTokenURI(address to, Tuple8[] memory tokens) public returns (bool) {965	// 	require(false, stub_error);966	// 	to;967	// 	tokens;968	// 	dummy = 0;969	// 	return false;970	// }971972<<<<<<< HEAD973}974975/// @dev anonymous struct976struct Tuple8 {977=======978	/// @notice Function to mint multiple tokens.979	/// @dev `tokenIds` should be an array of consecutive numbers and first number980	///  should be obtained with `nextTokenId` method981	/// @param to The new owner982	/// @param tokenIds IDs of the minted NFTs983	/// @dev EVM selector for this function is: 0x44a9945e,984	///  or in textual repr: mintBulk(address,uint256[])985	function mintBulk(address to, uint256[] memory tokenIds) public returns (bool) {986		require(false, stub_error);987		to;988		tokenIds;989		dummy = 0;990		return false;991	}992993	/// @notice Function to mint multiple tokens with the given tokenUris.994	/// @dev `tokenIds` is array of pairs of token ID and token URI. Token IDs should be consecutive995	///  numbers and first number should be obtained with `nextTokenId` method996	/// @param to The new owner997	/// @param tokens array of pairs of token ID and token URI for minted tokens998	/// @dev EVM selector for this function is: 0x36543006,999	///  or in textual repr: mintBulkWithTokenURI(address,(uint256,string)[])1000	function mintBulkWithTokenURI(address to, Tuple12[] memory tokens) public returns (bool) {1001		require(false, stub_error);1002		to;1003		tokens;1004		dummy = 0;1005		return false;1006	}1007}10081009/// @dev anonymous struct1010struct Tuple12 {1011>>>>>>> feat: Add custum signature with unlimited nesting.1012	uint256 field_0;1013	string field_1;1014}10151016<<<<<<< HEAD1017<<<<<<< HEAD1018/// @dev anonymous struct1019struct Tuple6 {1020	address field_0;1021	uint256 field_1;1022=======1023/// @dev Cross account struct1024struct EthCrossAccount {1025	address eth;1026	uint256 sub;1027>>>>>>> feat: add `EthCrossAccount` type1028}10291030/// @dev anonymous struct1031struct Tuple8 {1032	address field_0;1033	uint256 field_1;1034}10351036=======1037>>>>>>> misk: update stubs1038/// @title ERC-721 Non-Fungible Token Standard, optional enumeration extension1039/// @dev See https://eips.ethereum.org/EIPS/eip-7211040/// @dev the ERC-165 identifier for this interface is 0x780e9d631041contract ERC721Enumerable is Dummy, ERC165 {1042	/// @notice Enumerate valid NFTs1043	/// @param index A counter less than `totalSupply()`1044	/// @return The token identifier for the `index`th NFT,1045	///  (sort order not specified)1046	/// @dev EVM selector for this function is: 0x4f6ccce7,1047	///  or in textual repr: tokenByIndex(uint256)1048	function tokenByIndex(uint256 index) public view returns (uint256) {1049		require(false, stub_error);1050		index;1051		dummy;1052		return 0;1053	}10541055	/// @dev Not implemented1056	/// @dev EVM selector for this function is: 0x2f745c59,1057	///  or in textual repr: tokenOfOwnerByIndex(address,uint256)1058	function tokenOfOwnerByIndex(address owner, uint256 index) public view returns (uint256) {1059		require(false, stub_error);1060		owner;1061		index;1062		dummy;1063		return 0;1064	}10651066	/// @notice Count NFTs tracked by this contract1067	/// @return A count of valid NFTs tracked by this contract, where each one of1068	///  them has an assigned and queryable owner not equal to the zero address1069	/// @dev EVM selector for this function is: 0x18160ddd,1070	///  or in textual repr: totalSupply()1071	function totalSupply() public view returns (uint256) {1072		require(false, stub_error);1073		dummy;1074		return 0;1075	}1076}10771078/// @dev inlined interface1079contract ERC721Events {1080	event Transfer(address indexed from, address indexed to, uint256 indexed tokenId);1081	event Approval(address indexed owner, address indexed approved, uint256 indexed tokenId);1082	event ApprovalForAll(address indexed owner, address indexed operator, bool approved);1083}10841085/// @title ERC-721 Non-Fungible Token Standard1086/// @dev See https://github.com/ethereum/EIPs/blob/master/EIPS/eip-721.md1087/// @dev the ERC-165 identifier for this interface is 0x80ac58cd1088contract ERC721 is Dummy, ERC165, ERC721Events {1089	/// @notice Count all NFTs assigned to an owner1090	/// @dev NFTs assigned to the zero address are considered invalid, and this1091	///  function throws for queries about the zero address.1092	/// @param owner An address for whom to query the balance1093	/// @return The number of NFTs owned by `owner`, possibly zero1094	/// @dev EVM selector for this function is: 0x70a08231,1095	///  or in textual repr: balanceOf(address)1096	function balanceOf(address owner) public view returns (uint256) {1097		require(false, stub_error);1098		owner;1099		dummy;1100		return 0;1101	}11021103	/// @notice Find the owner of an NFT1104	/// @dev NFTs assigned to zero address are considered invalid, and queries1105	///  about them do throw.1106	/// @param tokenId The identifier for an NFT1107	/// @return The address of the owner of the NFT1108	/// @dev EVM selector for this function is: 0x6352211e,1109	///  or in textual repr: ownerOf(uint256)1110	function ownerOf(uint256 tokenId) public view returns (address) {1111		require(false, stub_error);1112		tokenId;1113		dummy;1114		return 0x0000000000000000000000000000000000000000;1115	}11161117	/// @dev Not implemented1118	/// @dev EVM selector for this function is: 0xb88d4fde,1119	///  or in textual repr: safeTransferFrom(address,address,uint256,bytes)1120	function safeTransferFrom(1121		address from,1122		address to,1123		uint256 tokenId,1124		bytes memory data1125	) public {1126		require(false, stub_error);1127		from;1128		to;1129		tokenId;1130		data;1131		dummy = 0;1132	}11331134	/// @dev Not implemented1135	/// @dev EVM selector for this function is: 0x42842e0e,1136	///  or in textual repr: safeTransferFrom(address,address,uint256)1137	function safeTransferFrom(1138		address from,1139		address to,1140		uint256 tokenId1141	) public {1142		require(false, stub_error);1143		from;1144		to;1145		tokenId;1146		dummy = 0;1147	}11481149	/// @notice Transfer ownership of an NFT -- THE CALLER IS RESPONSIBLE1150	///  TO CONFIRM THAT `to` IS CAPABLE OF RECEIVING NFTS OR ELSE1151	///  THEY MAY BE PERMANENTLY LOST1152	/// @dev Throws unless `msg.sender` is the current owner or an authorized1153	///  operator for this NFT. Throws if `from` is not the current owner. Throws1154	///  if `to` is the zero address. Throws if `tokenId` is not a valid NFT.1155	/// @param from The current owner of the NFT1156	/// @param to The new owner1157	/// @param tokenId The NFT to transfer1158	/// @dev EVM selector for this function is: 0x23b872dd,1159	///  or in textual repr: transferFrom(address,address,uint256)1160	function transferFrom(1161		address from,1162		address to,1163		uint256 tokenId1164	) public {1165		require(false, stub_error);1166		from;1167		to;1168		tokenId;1169		dummy = 0;1170	}11711172	/// @notice Set or reaffirm the approved address for an NFT1173	/// @dev The zero address indicates there is no approved address.1174	/// @dev Throws unless `msg.sender` is the current NFT owner, or an authorized1175	///  operator of the current owner.1176	/// @param approved The new approved NFT controller1177	/// @param tokenId The NFT to approve1178	/// @dev EVM selector for this function is: 0x095ea7b3,1179	///  or in textual repr: approve(address,uint256)1180	function approve(address approved, uint256 tokenId) public {1181		require(false, stub_error);1182		approved;1183		tokenId;1184		dummy = 0;1185	}11861187	/// @dev Not implemented1188	/// @dev EVM selector for this function is: 0xa22cb465,1189	///  or in textual repr: setApprovalForAll(address,bool)1190	function setApprovalForAll(address operator, bool approved) public {1191		require(false, stub_error);1192		operator;1193		approved;1194		dummy = 0;1195	}11961197	/// @dev Not implemented1198	/// @dev EVM selector for this function is: 0x081812fc,1199	///  or in textual repr: getApproved(uint256)1200	function getApproved(uint256 tokenId) public view returns (address) {1201		require(false, stub_error);1202		tokenId;1203		dummy;1204		return 0x0000000000000000000000000000000000000000;1205	}12061207	/// @dev Not implemented1208	/// @dev EVM selector for this function is: 0xe985e9c5,1209	///  or in textual repr: isApprovedForAll(address,address)1210	function isApprovedForAll(address owner, address operator) public view returns (address) {1211		require(false, stub_error);1212		owner;1213		operator;1214		dummy;1215		return 0x0000000000000000000000000000000000000000;1216	}1217}12181219contract UniqueNFT is1220	Dummy,1221	ERC165,1222	ERC721,1223	ERC721Enumerable,1224	ERC721UniqueExtensions,1225	ERC721UniqueMintable,1226	ERC721Burnable,1227	ERC721Metadata,1228	Collection,1229	TokenProperties1230{}
modifiedpallets/refungible/src/stubs/UniqueRefungible.soldiffbeforeafterboth
--- a/pallets/refungible/src/stubs/UniqueRefungible.sol
+++ b/pallets/refungible/src/stubs/UniqueRefungible.sol
@@ -124,7 +124,7 @@
 	/// @param properties Vector of properties key/value pair.
 	/// @dev EVM selector for this function is: 0x50b26b2a,
 	///  or in textual repr: setCollectionProperties((string,bytes)[])
-	function setCollectionProperties(Tuple19[] memory properties) public {
+	function setCollectionProperties(Tuple20[] memory properties) public {
 		require(false, stub_error);
 		properties;
 		dummy = 0;
@@ -173,11 +173,11 @@
 	/// @return Vector of properties key/value pairs.
 	/// @dev EVM selector for this function is: 0x285fb8e6,
 	///  or in textual repr: collectionProperties(string[])
-	function collectionProperties(string[] memory keys) public view returns (Tuple19[] memory) {
+	function collectionProperties(string[] memory keys) public view returns (Tuple20[] memory) {
 		require(false, stub_error);
 		keys;
 		dummy;
-		return new Tuple19[](0);
+		return new Tuple20[](0);
 	}
 
 	/// Set the sponsor of the collection.
@@ -199,8 +199,14 @@
 	///
 	/// @param sponsor Cross account address of the sponsor from whose account funds will be debited for operations with the contract.
 	/// @dev EVM selector for this function is: 0x84a1d5a8,
+<<<<<<< HEAD
 	///  or in textual repr: setCollectionSponsorCross((address,uint256))
 	function setCollectionSponsorCross(Tuple6 memory sponsor) public {
+=======
+	///  or in textual repr: setCollectionSponsorCross(EthCrossAccount)
+	///  or in the expanded repr: setCollectionSponsorCross((address,uint256))
+	function setCollectionSponsorCross(EthCrossAccount memory sponsor) public {
+>>>>>>> misk: update stubs
 		require(false, stub_error);
 		sponsor;
 		dummy = 0;
@@ -238,10 +244,17 @@
 	/// @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()
+<<<<<<< HEAD
 	function collectionSponsor() public view returns (Tuple6 memory) {
 		require(false, stub_error);
 		dummy;
 		return Tuple6(0x0000000000000000000000000000000000000000, 0);
+=======
+	function collectionSponsor() public view returns (Tuple23 memory) {
+		require(false, stub_error);
+		dummy;
+		return Tuple23(0x0000000000000000000000000000000000000000, 0);
+>>>>>>> misk: update stubs
 	}
 
 	/// Set limits for the collection.
@@ -291,8 +304,14 @@
 	/// Add collection admin.
 	/// @param newAdmin Cross account administrator address.
 	/// @dev EVM selector for this function is: 0x859aa7d6,
+<<<<<<< HEAD
 	///  or in textual repr: addCollectionAdminCross((address,uint256))
 	function addCollectionAdminCross(Tuple6 memory newAdmin) public {
+=======
+	///  or in textual repr: addCollectionAdminCross(EthCrossAccount)
+	///  or in the expanded repr: addCollectionAdminCross((address,uint256))
+	function addCollectionAdminCross(EthCrossAccount memory newAdmin) public {
+>>>>>>> misk: update stubs
 		require(false, stub_error);
 		newAdmin;
 		dummy = 0;
@@ -301,8 +320,14 @@
 	/// Remove collection admin.
 	/// @param admin Cross account administrator address.
 	/// @dev EVM selector for this function is: 0x6c0cd173,
+<<<<<<< HEAD
 	///  or in textual repr: removeCollectionAdminCross((address,uint256))
 	function removeCollectionAdminCross(Tuple6 memory admin) public {
+=======
+	///  or in textual repr: removeCollectionAdminCross(EthCrossAccount)
+	///  or in the expanded repr: removeCollectionAdminCross((address,uint256))
+	function removeCollectionAdminCross(EthCrossAccount memory admin) public {
+>>>>>>> misk: update stubs
 		require(false, stub_error);
 		admin;
 		dummy = 0;
@@ -392,8 +417,14 @@
 	///
 	/// @param user User cross account address.
 	/// @dev EVM selector for this function is: 0xa0184a3a,
+<<<<<<< HEAD
 	///  or in textual repr: addToCollectionAllowListCross((address,uint256))
 	function addToCollectionAllowListCross(Tuple6 memory user) public {
+=======
+	///  or in textual repr: addToCollectionAllowListCross(EthCrossAccount)
+	///  or in the expanded repr: addToCollectionAllowListCross((address,uint256))
+	function addToCollectionAllowListCross(EthCrossAccount memory user) public {
+>>>>>>> misk: update stubs
 		require(false, stub_error);
 		user;
 		dummy = 0;
@@ -414,8 +445,14 @@
 	///
 	/// @param user User cross account address.
 	/// @dev EVM selector for this function is: 0x09ba452a,
+<<<<<<< HEAD
 	///  or in textual repr: removeFromCollectionAllowListCross((address,uint256))
 	function removeFromCollectionAllowListCross(Tuple6 memory user) public {
+=======
+	///  or in textual repr: removeFromCollectionAllowListCross(EthCrossAccount)
+	///  or in the expanded repr: removeFromCollectionAllowListCross((address,uint256))
+	function removeFromCollectionAllowListCross(EthCrossAccount memory user) public {
+>>>>>>> misk: update stubs
 		require(false, stub_error);
 		user;
 		dummy = 0;
@@ -450,8 +487,14 @@
 	/// @param user User cross account to verify
 	/// @return "true" if account is the owner or admin
 	/// @dev EVM selector for this function is: 0x3e75a905,
+<<<<<<< HEAD
 	///  or in textual repr: isOwnerOrAdminCross((address,uint256))
 	function isOwnerOrAdminCross(Tuple6 memory user) public view returns (bool) {
+=======
+	///  or in textual repr: isOwnerOrAdminCross(EthCrossAccount)
+	///  or in the expanded repr: isOwnerOrAdminCross((address,uint256))
+	function isOwnerOrAdminCross(EthCrossAccount memory user) public view returns (bool) {
+>>>>>>> misk: update stubs
 		require(false, stub_error);
 		user;
 		dummy;
@@ -471,14 +514,21 @@
 
 	/// Get collection owner.
 	///
-	/// @return Tuble with sponsor address and his substrate mirror.
+	/// @return Tuple with sponsor address and his substrate mirror.
 	/// 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()
+<<<<<<< HEAD
 	function collectionOwner() public view returns (Tuple6 memory) {
 		require(false, stub_error);
 		dummy;
 		return Tuple6(0x0000000000000000000000000000000000000000, 0);
+=======
+	function collectionOwner() public view returns (EthCrossAccount memory) {
+		require(false, stub_error);
+		dummy;
+		return EthCrossAccount(0x0000000000000000000000000000000000000000, 0);
+>>>>>>> misk: update stubs
 	}
 
 	/// Changes collection owner to another account
@@ -499,10 +549,17 @@
 	/// If address is canonical then substrate mirror is zero and vice versa.
 	/// @dev EVM selector for this function is: 0x5813216b,
 	///  or in textual repr: collectionAdmins()
+<<<<<<< HEAD
 	function collectionAdmins() public view returns (Tuple6[] memory) {
 		require(false, stub_error);
 		dummy;
 		return new Tuple6[](0);
+=======
+	function collectionAdmins() public view returns (EthCrossAccount[] memory) {
+		require(false, stub_error);
+		dummy;
+		return new EthCrossAccount[](0);
+>>>>>>> misk: update stubs
 	}
 
 	/// Changes collection owner to another account
@@ -510,16 +567,34 @@
 	/// @dev Owner can be changed only by current owner
 	/// @param newOwner new owner cross account
 	/// @dev EVM selector for this function is: 0xe5c9913f,
+<<<<<<< HEAD
 	///  or in textual repr: setOwnerCross((address,uint256))
 	function setOwnerCross(Tuple6 memory newOwner) public {
+=======
+	///  or in textual repr: setOwnerCross(EthCrossAccount)
+	///  or in the expanded repr: setOwnerCross((address,uint256))
+	function setOwnerCross(EthCrossAccount memory newOwner) public {
+>>>>>>> misk: update stubs
 		require(false, stub_error);
 		newOwner;
 		dummy = 0;
 	}
 }
 
+/// @dev Cross account struct
+struct EthCrossAccount {
+	address eth;
+	uint256 sub;
+}
+
+/// @dev anonymous struct
+struct Tuple23 {
+	address field_0;
+	uint256 field_1;
+}
+
 /// @dev anonymous struct
-struct Tuple19 {
+struct Tuple20 {
 	string field_0;
 	bytes field_1;
 }
@@ -708,10 +783,16 @@
 	/// @param to The new owner
 	/// @param tokenId The RFT to transfer
 	/// @dev EVM selector for this function is: 0xd5cf430b,
-	///  or in textual repr: transferFromCross((address,uint256),(address,uint256),uint256)
+	///  or in textual repr: transferFromCross(EthCrossAccount,EthCrossAccount,uint256)
+	///  or in the expanded repr: transferFromCross((address,uint256),(address,uint256),uint256)
 	function transferFromCross(
+<<<<<<< HEAD
 		Tuple6 memory from,
 		Tuple6 memory to,
+=======
+		EthCrossAccount memory from,
+		EthCrossAccount memory to,
+>>>>>>> misk: update stubs
 		uint256 tokenId
 	) public {
 		require(false, stub_error);
@@ -745,8 +826,14 @@
 	/// @param from The current owner of the RFT
 	/// @param tokenId The RFT to transfer
 	/// @dev EVM selector for this function is: 0xbb2f5a58,
+<<<<<<< HEAD
 	///  or in textual repr: burnFromCross((address,uint256),uint256)
 	function burnFromCross(Tuple6 memory from, uint256 tokenId) public {
+=======
+	///  or in textual repr: burnFromCross(EthCrossAccount,uint256)
+	///  or in the expanded repr: burnFromCross((address,uint256),uint256)
+	function burnFromCross(EthCrossAccount memory from, uint256 tokenId) public {
+>>>>>>> misk: update stubs
 		require(false, stub_error);
 		from;
 		tokenId;
@@ -762,6 +849,7 @@
 		return 0;
 	}
 
+<<<<<<< HEAD
 	// /// @notice Function to mint multiple tokens.
 	// /// @dev `tokenIds` should be an array of consecutive numbers and first number
 	// ///  should be obtained with `nextTokenId` method
@@ -791,6 +879,37 @@
 	// 	dummy = 0;
 	// 	return false;
 	// }
+=======
+	/// @notice Function to mint multiple tokens.
+	/// @dev `tokenIds` should be an array of consecutive numbers and first number
+	///  should be obtained with `nextTokenId` method
+	/// @param to The new owner
+	/// @param tokenIds IDs of the minted RFTs
+	/// @dev EVM selector for this function is: 0x44a9945e,
+	///  or in textual repr: mintBulk(address,uint256[])
+	function mintBulk(address to, uint256[] memory tokenIds) public returns (bool) {
+		require(false, stub_error);
+		to;
+		tokenIds;
+		dummy = 0;
+		return false;
+	}
+
+	/// @notice Function to mint multiple tokens with the given tokenUris.
+	/// @dev `tokenIds` is array of pairs of token ID and token URI. Token IDs should be consecutive
+	///  numbers and first number should be obtained with `nextTokenId` method
+	/// @param to The new owner
+	/// @param tokens array of pairs of token ID and token URI for minted tokens
+	/// @dev EVM selector for this function is: 0x36543006,
+	///  or in textual repr: mintBulkWithTokenURI(address,(uint256,string)[])
+	function mintBulkWithTokenURI(address to, Tuple11[] memory tokens) public returns (bool) {
+		require(false, stub_error);
+		to;
+		tokens;
+		dummy = 0;
+		return false;
+	}
+>>>>>>> misk: update stubs
 
 	/// Returns EVM address for refungible token
 	///
@@ -806,17 +925,24 @@
 }
 
 /// @dev anonymous struct
+<<<<<<< HEAD
 struct Tuple8 {
+=======
+struct Tuple11 {
+>>>>>>> misk: update stubs
 	uint256 field_0;
 	string field_1;
 }
 
+<<<<<<< HEAD
 /// @dev anonymous struct
 struct Tuple6 {
 	address field_0;
 	uint256 field_1;
 }
 
+=======
+>>>>>>> misk: update stubs
 /// @title ERC-721 Non-Fungible Token Standard, optional enumeration extension
 /// @dev See https://eips.ethereum.org/EIPS/eip-721
 /// @dev the ERC-165 identifier for this interface is 0x780e9d63
modifiedtests/src/eth/api/UniqueNFT.soldiffbeforeafterboth
--- a/tests/src/eth/api/UniqueNFT.sol
+++ b/tests/src/eth/api/UniqueNFT.sol
@@ -72,6 +72,7 @@
 /// @title A contract that allows you to work with collections.
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 /// @dev the ERC-165 identifier for this interface is 0xb3152af3
 =======
 /// @dev the ERC-165 identifier for this interface is 0x674be726
@@ -79,6 +80,9 @@
 =======
 /// @dev the ERC-165 identifier for this interface is 0x943ee094
 >>>>>>> fix: after rebase
+=======
+/// @dev the ERC-165 identifier for this interface is 0xefe988e0
+>>>>>>> misk: update stubs
 interface Collection is Dummy, ERC165 {
 	/// Set collection property.
 	///
@@ -91,7 +95,7 @@
 	/// Set collection properties.
 	///
 	/// @param properties Vector of properties key/value pair.
-	/// @dev EVM selector for this function is: 0xf90c1ce9,
+	/// @dev EVM selector for this function is: 0x50b26b2a,
 	///  or in textual repr: setCollectionProperties((string,bytes)[])
 	function setCollectionProperties(Tuple21[] memory properties) external;
 
@@ -105,7 +109,7 @@
 	/// Delete collection properties.
 	///
 	/// @param keys Properties keys.
-	/// @dev EVM selector for this function is: 0x56d4684a,
+	/// @dev EVM selector for this function is: 0xee206ee3,
 	///  or in textual repr: deleteCollectionProperties(string[])
 	function deleteCollectionProperties(string[] memory keys) external;
 
@@ -123,7 +127,7 @@
 	///
 	/// @param keys Properties keys. Empty keys for all propertyes.
 	/// @return Vector of properties key/value pairs.
-	/// @dev EVM selector for this function is: 0x5cad7311,
+	/// @dev EVM selector for this function is: 0x285fb8e6,
 	///  or in textual repr: collectionProperties(string[])
 	function collectionProperties(string[] memory keys) external view returns (Tuple21[] memory);
 
@@ -141,9 +145,16 @@
 	/// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.
 	///
 	/// @param sponsor Cross account address of the sponsor from whose account funds will be debited for operations with the contract.
+<<<<<<< HEAD
 	/// @dev EVM selector for this function is: 0x403e96a7,
 	///  or in textual repr: setCollectionSponsorCross((address,uint256))
 	function setCollectionSponsorCross(Tuple6 memory sponsor) external;
+=======
+	/// @dev EVM selector for this function is: 0x84a1d5a8,
+	///  or in textual repr: setCollectionSponsorCross(EthCrossAccount)
+	///  or in the expanded repr: setCollectionSponsorCross((address,uint256))
+	function setCollectionSponsorCross(EthCrossAccount memory sponsor) external;
+>>>>>>> misk: update stubs
 
 	/// Whether there is a pending sponsor.
 	/// @dev EVM selector for this function is: 0x058ac185,
@@ -167,7 +178,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 (Tuple8 memory);
+	function collectionSponsor() external view returns (Tuple24 memory);
 
 	/// Set limits for the collection.
 	/// @dev Throws error if limit not found.
@@ -201,6 +212,7 @@
 
 	/// Add collection admin.
 	/// @param newAdmin Cross account administrator address.
+<<<<<<< HEAD
 	/// @dev EVM selector for this function is: 0x62e3c7c2,
 	///  or in textual repr: addCollectionAdminCross((address,uint256))
 	function addCollectionAdminCross(Tuple6 memory newAdmin) external;
@@ -210,6 +222,19 @@
 	/// @dev EVM selector for this function is: 0x810d1503,
 	///  or in textual repr: removeCollectionAdminCross((address,uint256))
 	function removeCollectionAdminCross(Tuple6 memory admin) external;
+=======
+	/// @dev EVM selector for this function is: 0x859aa7d6,
+	///  or in textual repr: addCollectionAdminCross(EthCrossAccount)
+	///  or in the expanded repr: addCollectionAdminCross((address,uint256))
+	function addCollectionAdminCross(EthCrossAccount memory newAdmin) external;
+
+	/// Remove collection admin.
+	/// @param admin Cross account administrator address.
+	/// @dev EVM selector for this function is: 0x6c0cd173,
+	///  or in textual repr: removeCollectionAdminCross(EthCrossAccount)
+	///  or in the expanded repr: removeCollectionAdminCross((address,uint256))
+	function removeCollectionAdminCross(EthCrossAccount memory admin) external;
+>>>>>>> misk: update stubs
 
 	/// Add collection admin.
 	/// @param newAdmin Address of the added administrator.
@@ -235,7 +260,7 @@
 	///
 	/// @param enable If "true" degenerates to nesting: {OwnerRestricted: [1, 2, 3]} else to nesting: 'Disabled'
 	/// @param collections Addresses of collections that will be available for nesting.
-	/// @dev EVM selector for this function is: 0x112d4586,
+	/// @dev EVM selector for this function is: 0x64872396,
 	///  or in textual repr: setCollectionNesting(bool,address[])
 	function setCollectionNesting(bool enable, address[] memory collections) external;
 
@@ -264,9 +289,16 @@
 	/// Add user to allowed list.
 	///
 	/// @param user User cross account address.
+<<<<<<< HEAD
 	/// @dev EVM selector for this function is: 0xf074da88,
 	///  or in textual repr: addToCollectionAllowListCross((address,uint256))
 	function addToCollectionAllowListCross(Tuple6 memory user) external;
+=======
+	/// @dev EVM selector for this function is: 0xa0184a3a,
+	///  or in textual repr: addToCollectionAllowListCross(EthCrossAccount)
+	///  or in the expanded repr: addToCollectionAllowListCross((address,uint256))
+	function addToCollectionAllowListCross(EthCrossAccount memory user) external;
+>>>>>>> misk: update stubs
 
 	/// Remove the user from the allowed list.
 	///
@@ -278,9 +310,16 @@
 	/// Remove user from allowed list.
 	///
 	/// @param user User cross account address.
+<<<<<<< HEAD
 	/// @dev EVM selector for this function is: 0xc00df45c,
 	///  or in textual repr: removeFromCollectionAllowListCross((address,uint256))
 	function removeFromCollectionAllowListCross(Tuple6 memory user) external;
+=======
+	/// @dev EVM selector for this function is: 0x09ba452a,
+	///  or in textual repr: removeFromCollectionAllowListCross(EthCrossAccount)
+	///  or in the expanded repr: removeFromCollectionAllowListCross((address,uint256))
+	function removeFromCollectionAllowListCross(EthCrossAccount memory user) external;
+>>>>>>> misk: update stubs
 
 	/// Switch permission for minting.
 	///
@@ -301,9 +340,16 @@
 	///
 	/// @param user User cross account to verify
 	/// @return "true" if account is the owner or admin
+<<<<<<< HEAD
 	/// @dev EVM selector for this function is: 0x5aba3351,
 	///  or in textual repr: isOwnerOrAdminCross((address,uint256))
 	function isOwnerOrAdminCross(Tuple6 memory user) external view returns (bool);
+=======
+	/// @dev EVM selector for this function is: 0x3e75a905,
+	///  or in textual repr: isOwnerOrAdminCross(EthCrossAccount)
+	///  or in the expanded repr: isOwnerOrAdminCross((address,uint256))
+	function isOwnerOrAdminCross(EthCrossAccount memory user) external view returns (bool);
+>>>>>>> misk: update stubs
 
 	/// Returns collection type
 	///
@@ -318,7 +364,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 (Tuple8 memory);
+	function collectionOwner() external view returns (EthCrossAccount memory);
 
 	/// Changes collection owner to another account
 	///
@@ -334,15 +380,38 @@
 	/// If address is canonical then substrate mirror is zero and vice versa.
 	/// @dev EVM selector for this function is: 0x5813216b,
 	///  or in textual repr: collectionAdmins()
+<<<<<<< HEAD
 	function collectionAdmins() external view returns (Tuple6[] memory);
+=======
+	function collectionAdmins() external view returns (EthCrossAccount[] memory);
+>>>>>>> misk: update stubs
 
 	/// Changes collection owner to another account
 	///
 	/// @dev Owner can be changed only by current owner
 	/// @param newOwner new owner cross account
+<<<<<<< HEAD
 	/// @dev EVM selector for this function is: 0xbdff793d,
 	///  or in textual repr: setOwnerCross((address,uint256))
 	function setOwnerCross(Tuple6 memory newOwner) external;
+=======
+	/// @dev EVM selector for this function is: 0xe5c9913f,
+	///  or in textual repr: setOwnerCross(EthCrossAccount)
+	///  or in the expanded repr: setOwnerCross((address,uint256))
+	function setOwnerCross(EthCrossAccount memory newOwner) external;
+}
+
+/// @dev Cross account struct
+struct EthCrossAccount {
+	address eth;
+	uint256 sub;
+}
+
+/// @dev anonymous struct
+struct Tuple24 {
+	address field_0;
+	uint256 field_1;
+>>>>>>> misk: update stubs
 }
 
 <<<<<<< HEAD
@@ -459,10 +528,14 @@
 
 /// @title Unique extensions for ERC721.
 <<<<<<< HEAD
+<<<<<<< HEAD
 /// @dev the ERC-165 identifier for this interface is 0x244543ee
 =======
 /// @dev the ERC-165 identifier for this interface is 0xcc97cb35
 >>>>>>> feat: Add custum signature with unlimited nesting.
+=======
+/// @dev the ERC-165 identifier for this interface is 0xb76006ac
+>>>>>>> misk: update stubs
 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,
@@ -480,9 +553,16 @@
 	///  operator of the current owner.
 	/// @param approved The new substrate address approved NFT controller
 	/// @param tokenId The NFT to approve
+<<<<<<< HEAD
 	/// @dev EVM selector for this function is: 0x106fdb59,
 	///  or in textual repr: approveCross((address,uint256),uint256)
 	function approveCross(Tuple6 memory approved, uint256 tokenId) external;
+=======
+	/// @dev EVM selector for this function is: 0x0ecd0ab0,
+	///  or in textual repr: approveCross(EthCrossAccount,uint256)
+	///  or in the expanded repr: approveCross((address,uint256),uint256)
+	function approveCross(EthCrossAccount memory approved, uint256 tokenId) external;
+>>>>>>> misk: update stubs
 
 	/// @notice Transfer ownership of an NFT
 	/// @dev Throws unless `msg.sender` is the current owner. Throws if `to`
@@ -501,6 +581,7 @@
 	/// @param tokenId The NFT to transfer
 	/// @dev EVM selector for this function is: 0xd5cf430b,
 	///  or in textual repr: transferFromCross(EthCrossAccount,EthCrossAccount,uint256)
+	///  or in the expanded repr: transferFromCross((address,uint256),(address,uint256),uint256)
 	function transferFromCross(
 <<<<<<< HEAD
 		Tuple6 memory from,
@@ -528,9 +609,16 @@
 	///  if `to` is the zero address. Throws if `tokenId` is not a valid NFT.
 	/// @param from The current owner of the NFT
 	/// @param tokenId The NFT to transfer
+<<<<<<< HEAD
 	/// @dev EVM selector for this function is: 0xa8106d4a,
 	///  or in textual repr: burnFromCross((address,uint256),uint256)
 	function burnFromCross(Tuple6 memory from, uint256 tokenId) external;
+=======
+	/// @dev EVM selector for this function is: 0xbb2f5a58,
+	///  or in textual repr: burnFromCross(EthCrossAccount,uint256)
+	///  or in the expanded repr: burnFromCross((address,uint256),uint256)
+	function burnFromCross(EthCrossAccount memory from, uint256 tokenId) external;
+>>>>>>> misk: update stubs
 
 	/// @notice Returns next free NFT ID.
 	/// @dev EVM selector for this function is: 0x75794a3c,
@@ -565,7 +653,7 @@
 	///  should be obtained with `nextTokenId` method
 	/// @param to The new owner
 	/// @param tokenIds IDs of the minted NFTs
-	/// @dev EVM selector for this function is: 0xf9d9a5a3,
+	/// @dev EVM selector for this function is: 0x44a9945e,
 	///  or in textual repr: mintBulk(address,uint256[])
 	function mintBulk(address to, uint256[] memory tokenIds) external returns (bool);
 
@@ -574,7 +662,7 @@
 	///  numbers and first number should be obtained with `nextTokenId` method
 	/// @param to The new owner
 	/// @param tokens array of pairs of token ID and token URI for minted tokens
-	/// @dev EVM selector for this function is: 0xfd4e2a99,
+	/// @dev EVM selector for this function is: 0x36543006,
 	///  or in textual repr: mintBulkWithTokenURI(address,(uint256,string)[])
 	function mintBulkWithTokenURI(address to, Tuple12[] memory tokens) external returns (bool);
 }
@@ -586,6 +674,7 @@
 	string field_1;
 }
 
+<<<<<<< HEAD
 /// @dev anonymous struct
 struct Tuple8 {
 	address field_0;
@@ -598,6 +687,8 @@
 	uint256 field_1;
 }
 
+=======
+>>>>>>> misk: update stubs
 /// @title ERC-721 Non-Fungible Token Standard, optional enumeration extension
 /// @dev See https://eips.ethereum.org/EIPS/eip-721
 /// @dev the ERC-165 identifier for this interface is 0x780e9d63
modifiedtests/src/eth/api/UniqueRefungible.soldiffbeforeafterboth
--- a/tests/src/eth/api/UniqueRefungible.sol
+++ b/tests/src/eth/api/UniqueRefungible.sol
@@ -85,7 +85,7 @@
 	/// @param properties Vector of properties key/value pair.
 	/// @dev EVM selector for this function is: 0x50b26b2a,
 	///  or in textual repr: setCollectionProperties((string,bytes)[])
-	function setCollectionProperties(Tuple19[] memory properties) external;
+	function setCollectionProperties(Tuple20[] memory properties) external;
 
 	/// Delete collection property.
 	///
@@ -117,7 +117,7 @@
 	/// @return Vector of properties key/value pairs.
 	/// @dev EVM selector for this function is: 0x285fb8e6,
 	///  or in textual repr: collectionProperties(string[])
-	function collectionProperties(string[] memory keys) external view returns (Tuple19[] memory);
+	function collectionProperties(string[] memory keys) external view returns (Tuple20[] memory);
 
 	/// Set the sponsor of the collection.
 	///
@@ -134,8 +134,14 @@
 	///
 	/// @param sponsor Cross account address of the sponsor from whose account funds will be debited for operations with the contract.
 	/// @dev EVM selector for this function is: 0x84a1d5a8,
+<<<<<<< HEAD
 	///  or in textual repr: setCollectionSponsorCross((address,uint256))
 	function setCollectionSponsorCross(Tuple6 memory sponsor) external;
+=======
+	///  or in textual repr: setCollectionSponsorCross(EthCrossAccount)
+	///  or in the expanded repr: setCollectionSponsorCross((address,uint256))
+	function setCollectionSponsorCross(EthCrossAccount memory sponsor) external;
+>>>>>>> misk: update stubs
 
 	/// Whether there is a pending sponsor.
 	/// @dev EVM selector for this function is: 0x058ac185,
@@ -159,7 +165,11 @@
 	/// @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()
+<<<<<<< HEAD
 	function collectionSponsor() external view returns (Tuple6 memory);
+=======
+	function collectionSponsor() external view returns (Tuple23 memory);
+>>>>>>> misk: update stubs
 
 	/// Set limits for the collection.
 	/// @dev Throws error if limit not found.
@@ -194,14 +204,26 @@
 	/// Add collection admin.
 	/// @param newAdmin Cross account administrator address.
 	/// @dev EVM selector for this function is: 0x859aa7d6,
+<<<<<<< HEAD
 	///  or in textual repr: addCollectionAdminCross((address,uint256))
 	function addCollectionAdminCross(Tuple6 memory newAdmin) external;
+=======
+	///  or in textual repr: addCollectionAdminCross(EthCrossAccount)
+	///  or in the expanded repr: addCollectionAdminCross((address,uint256))
+	function addCollectionAdminCross(EthCrossAccount memory newAdmin) external;
+>>>>>>> misk: update stubs
 
 	/// Remove collection admin.
 	/// @param admin Cross account administrator address.
 	/// @dev EVM selector for this function is: 0x6c0cd173,
+<<<<<<< HEAD
 	///  or in textual repr: removeCollectionAdminCross((address,uint256))
 	function removeCollectionAdminCross(Tuple6 memory admin) external;
+=======
+	///  or in textual repr: removeCollectionAdminCross(EthCrossAccount)
+	///  or in the expanded repr: removeCollectionAdminCross((address,uint256))
+	function removeCollectionAdminCross(EthCrossAccount memory admin) external;
+>>>>>>> misk: update stubs
 
 	/// Add collection admin.
 	/// @param newAdmin Address of the added administrator.
@@ -257,8 +279,14 @@
 	///
 	/// @param user User cross account address.
 	/// @dev EVM selector for this function is: 0xa0184a3a,
+<<<<<<< HEAD
 	///  or in textual repr: addToCollectionAllowListCross((address,uint256))
 	function addToCollectionAllowListCross(Tuple6 memory user) external;
+=======
+	///  or in textual repr: addToCollectionAllowListCross(EthCrossAccount)
+	///  or in the expanded repr: addToCollectionAllowListCross((address,uint256))
+	function addToCollectionAllowListCross(EthCrossAccount memory user) external;
+>>>>>>> misk: update stubs
 
 	/// Remove the user from the allowed list.
 	///
@@ -271,8 +299,14 @@
 	///
 	/// @param user User cross account address.
 	/// @dev EVM selector for this function is: 0x09ba452a,
+<<<<<<< HEAD
 	///  or in textual repr: removeFromCollectionAllowListCross((address,uint256))
 	function removeFromCollectionAllowListCross(Tuple6 memory user) external;
+=======
+	///  or in textual repr: removeFromCollectionAllowListCross(EthCrossAccount)
+	///  or in the expanded repr: removeFromCollectionAllowListCross((address,uint256))
+	function removeFromCollectionAllowListCross(EthCrossAccount memory user) external;
+>>>>>>> misk: update stubs
 
 	/// Switch permission for minting.
 	///
@@ -294,8 +328,14 @@
 	/// @param user User cross account to verify
 	/// @return "true" if account is the owner or admin
 	/// @dev EVM selector for this function is: 0x3e75a905,
+<<<<<<< HEAD
 	///  or in textual repr: isOwnerOrAdminCross((address,uint256))
 	function isOwnerOrAdminCross(Tuple6 memory user) external view returns (bool);
+=======
+	///  or in textual repr: isOwnerOrAdminCross(EthCrossAccount)
+	///  or in the expanded repr: isOwnerOrAdminCross((address,uint256))
+	function isOwnerOrAdminCross(EthCrossAccount memory user) external view returns (bool);
+>>>>>>> misk: update stubs
 
 	/// Returns collection type
 	///
@@ -306,11 +346,15 @@
 
 	/// Get collection owner.
 	///
-	/// @return Tuble with sponsor address and his substrate mirror.
+	/// @return Tuple with sponsor address and his substrate mirror.
 	/// 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()
+<<<<<<< HEAD
 	function collectionOwner() external view returns (Tuple6 memory);
+=======
+	function collectionOwner() external view returns (EthCrossAccount memory);
+>>>>>>> misk: update stubs
 
 	/// Changes collection owner to another account
 	///
@@ -326,19 +370,41 @@
 	/// If address is canonical then substrate mirror is zero and vice versa.
 	/// @dev EVM selector for this function is: 0x5813216b,
 	///  or in textual repr: collectionAdmins()
+<<<<<<< HEAD
 	function collectionAdmins() external view returns (Tuple6[] memory);
+=======
+	function collectionAdmins() external view returns (EthCrossAccount[] memory);
+>>>>>>> misk: update stubs
 
 	/// Changes collection owner to another account
 	///
 	/// @dev Owner can be changed only by current owner
 	/// @param newOwner new owner cross account
 	/// @dev EVM selector for this function is: 0xe5c9913f,
+<<<<<<< HEAD
 	///  or in textual repr: setOwnerCross((address,uint256))
 	function setOwnerCross(Tuple6 memory newOwner) external;
+=======
+	///  or in textual repr: setOwnerCross(EthCrossAccount)
+	///  or in the expanded repr: setOwnerCross((address,uint256))
+	function setOwnerCross(EthCrossAccount memory newOwner) external;
+}
+
+/// @dev Cross account struct
+struct EthCrossAccount {
+	address eth;
+	uint256 sub;
+}
+
+/// @dev anonymous struct
+struct Tuple23 {
+	address field_0;
+	uint256 field_1;
+>>>>>>> misk: update stubs
 }
 
 /// @dev anonymous struct
-struct Tuple19 {
+struct Tuple20 {
 	string field_0;
 	bytes field_1;
 }
@@ -465,10 +531,16 @@
 	/// @param to The new owner
 	/// @param tokenId The RFT to transfer
 	/// @dev EVM selector for this function is: 0xd5cf430b,
-	///  or in textual repr: transferFromCross((address,uint256),(address,uint256),uint256)
+	///  or in textual repr: transferFromCross(EthCrossAccount,EthCrossAccount,uint256)
+	///  or in the expanded repr: transferFromCross((address,uint256),(address,uint256),uint256)
 	function transferFromCross(
+<<<<<<< HEAD
 		Tuple6 memory from,
 		Tuple6 memory to,
+=======
+		EthCrossAccount memory from,
+		EthCrossAccount memory to,
+>>>>>>> misk: update stubs
 		uint256 tokenId
 	) external;
 
@@ -491,14 +563,21 @@
 	/// @param from The current owner of the RFT
 	/// @param tokenId The RFT to transfer
 	/// @dev EVM selector for this function is: 0xbb2f5a58,
+<<<<<<< HEAD
 	///  or in textual repr: burnFromCross((address,uint256),uint256)
 	function burnFromCross(Tuple6 memory from, uint256 tokenId) external;
+=======
+	///  or in textual repr: burnFromCross(EthCrossAccount,uint256)
+	///  or in the expanded repr: burnFromCross((address,uint256),uint256)
+	function burnFromCross(EthCrossAccount memory from, uint256 tokenId) external;
+>>>>>>> misk: update stubs
 
 	/// @notice Returns next free RFT ID.
 	/// @dev EVM selector for this function is: 0x75794a3c,
 	///  or in textual repr: nextTokenId()
 	function nextTokenId() external view returns (uint256);
 
+<<<<<<< HEAD
 	// /// @notice Function to mint multiple tokens.
 	// /// @dev `tokenIds` should be an array of consecutive numbers and first number
 	// ///  should be obtained with `nextTokenId` method
@@ -516,6 +595,25 @@
 	// /// @dev EVM selector for this function is: 0x36543006,
 	// ///  or in textual repr: mintBulkWithTokenURI(address,(uint256,string)[])
 	// function mintBulkWithTokenURI(address to, Tuple8[] memory tokens) external returns (bool);
+=======
+	/// @notice Function to mint multiple tokens.
+	/// @dev `tokenIds` should be an array of consecutive numbers and first number
+	///  should be obtained with `nextTokenId` method
+	/// @param to The new owner
+	/// @param tokenIds IDs of the minted RFTs
+	/// @dev EVM selector for this function is: 0x44a9945e,
+	///  or in textual repr: mintBulk(address,uint256[])
+	function mintBulk(address to, uint256[] memory tokenIds) external returns (bool);
+
+	/// @notice Function to mint multiple tokens with the given tokenUris.
+	/// @dev `tokenIds` is array of pairs of token ID and token URI. Token IDs should be consecutive
+	///  numbers and first number should be obtained with `nextTokenId` method
+	/// @param to The new owner
+	/// @param tokens array of pairs of token ID and token URI for minted tokens
+	/// @dev EVM selector for this function is: 0x36543006,
+	///  or in textual repr: mintBulkWithTokenURI(address,(uint256,string)[])
+	function mintBulkWithTokenURI(address to, Tuple11[] memory tokens) external returns (bool);
+>>>>>>> misk: update stubs
 
 	/// Returns EVM address for refungible token
 	///
@@ -526,17 +624,24 @@
 }
 
 /// @dev anonymous struct
+<<<<<<< HEAD
 struct Tuple8 {
+=======
+struct Tuple11 {
+>>>>>>> misk: update stubs
 	uint256 field_0;
 	string field_1;
 }
 
+<<<<<<< HEAD
 /// @dev anonymous struct
 struct Tuple6 {
 	address field_0;
 	uint256 field_1;
 }
 
+=======
+>>>>>>> misk: update stubs
 /// @title ERC-721 Non-Fungible Token Standard, optional enumeration extension
 /// @dev See https://eips.ethereum.org/EIPS/eip-721
 /// @dev the ERC-165 identifier for this interface is 0x780e9d63
modifiedtests/src/eth/fungibleAbi.jsondiffbeforeafterboth
--- a/tests/src/eth/fungibleAbi.json
+++ b/tests/src/eth/fungibleAbi.json
@@ -62,10 +62,15 @@
     "inputs": [
       {
         "components": [
+<<<<<<< HEAD
           { "internalType": "address", "name": "field_0", "type": "address" },
           { "internalType": "uint256", "name": "field_1", "type": "uint256" }
+=======
+          { "internalType": "address", "name": "eth", "type": "address" },
+          { "internalType": "uint256", "name": "sub", "type": "uint256" }
+>>>>>>> misk: update stubs
         ],
-        "internalType": "struct Tuple6",
+        "internalType": "struct EthCrossAccount",
         "name": "newAdmin",
         "type": "tuple"
       }
@@ -88,10 +93,15 @@
     "inputs": [
       {
         "components": [
+<<<<<<< HEAD
           { "internalType": "address", "name": "field_0", "type": "address" },
           { "internalType": "uint256", "name": "field_1", "type": "uint256" }
+=======
+          { "internalType": "address", "name": "eth", "type": "address" },
+          { "internalType": "uint256", "name": "sub", "type": "uint256" }
+>>>>>>> misk: update stubs
         ],
-        "internalType": "struct Tuple6",
+        "internalType": "struct EthCrossAccount",
         "name": "user",
         "type": "tuple"
       }
@@ -134,10 +144,15 @@
     "inputs": [
       {
         "components": [
+<<<<<<< HEAD
           { "internalType": "address", "name": "field_0", "type": "address" },
           { "internalType": "uint256", "name": "field_1", "type": "uint256" }
+=======
+          { "internalType": "address", "name": "eth", "type": "address" },
+          { "internalType": "uint256", "name": "sub", "type": "uint256" }
+>>>>>>> misk: update stubs
         ],
-        "internalType": "struct Tuple6",
+        "internalType": "struct EthCrossAccount",
         "name": "spender",
         "type": "tuple"
       },
@@ -171,10 +186,15 @@
     "inputs": [
       {
         "components": [
+<<<<<<< HEAD
           { "internalType": "address", "name": "field_0", "type": "address" },
           { "internalType": "uint256", "name": "field_1", "type": "uint256" }
+=======
+          { "internalType": "address", "name": "eth", "type": "address" },
+          { "internalType": "uint256", "name": "sub", "type": "uint256" }
+>>>>>>> misk: update stubs
         ],
-        "internalType": "struct Tuple6",
+        "internalType": "struct EthCrossAccount",
         "name": "from",
         "type": "tuple"
       },
@@ -182,6 +202,7 @@
     ],
     "name": "burnFromCross",
     "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
+<<<<<<< HEAD
     "stateMutability": "nonpayable",
     "type": "function"
   },
@@ -191,6 +212,8 @@
     ],
     "name": "changeCollectionOwner",
     "outputs": [],
+=======
+>>>>>>> misk: update stubs
     "stateMutability": "nonpayable",
     "type": "function"
   },
@@ -200,10 +223,15 @@
     "outputs": [
       {
         "components": [
+<<<<<<< HEAD
           { "internalType": "address", "name": "field_0", "type": "address" },
           { "internalType": "uint256", "name": "field_1", "type": "uint256" }
+=======
+          { "internalType": "address", "name": "eth", "type": "address" },
+          { "internalType": "uint256", "name": "sub", "type": "uint256" }
+>>>>>>> misk: update stubs
         ],
-        "internalType": "struct Tuple6[]",
+        "internalType": "struct EthCrossAccount[]",
         "name": "",
         "type": "tuple[]"
       }
@@ -217,10 +245,15 @@
     "outputs": [
       {
         "components": [
+<<<<<<< HEAD
           { "internalType": "address", "name": "field_0", "type": "address" },
           { "internalType": "uint256", "name": "field_1", "type": "uint256" }
+=======
+          { "internalType": "address", "name": "eth", "type": "address" },
+          { "internalType": "uint256", "name": "sub", "type": "uint256" }
+>>>>>>> misk: update stubs
         ],
-        "internalType": "struct Tuple6",
+        "internalType": "struct EthCrossAccount",
         "name": "",
         "type": "tuple"
       }
@@ -239,7 +272,7 @@
           { "internalType": "string", "name": "field_0", "type": "string" },
           { "internalType": "bytes", "name": "field_1", "type": "bytes" }
         ],
-        "internalType": "struct Tuple10[]",
+        "internalType": "struct Tuple14[]",
         "name": "",
         "type": "tuple[]"
       }
@@ -263,7 +296,7 @@
           { "internalType": "address", "name": "field_0", "type": "address" },
           { "internalType": "uint256", "name": "field_1", "type": "uint256" }
         ],
-        "internalType": "struct Tuple6",
+        "internalType": "struct Tuple8",
         "name": "",
         "type": "tuple"
       }
@@ -328,10 +361,15 @@
     "inputs": [
       {
         "components": [
+<<<<<<< HEAD
           { "internalType": "address", "name": "field_0", "type": "address" },
           { "internalType": "uint256", "name": "field_1", "type": "uint256" }
+=======
+          { "internalType": "address", "name": "eth", "type": "address" },
+          { "internalType": "uint256", "name": "sub", "type": "uint256" }
+>>>>>>> misk: update stubs
         ],
-        "internalType": "struct Tuple6",
+        "internalType": "struct EthCrossAccount",
         "name": "user",
         "type": "tuple"
       }
@@ -358,7 +396,7 @@
           { "internalType": "address", "name": "field_0", "type": "address" },
           { "internalType": "uint256", "name": "field_1", "type": "uint256" }
         ],
-        "internalType": "struct Tuple6[]",
+        "internalType": "struct Tuple8[]",
         "name": "amounts",
         "type": "tuple[]"
       }
@@ -388,10 +426,15 @@
     "inputs": [
       {
         "components": [
+<<<<<<< HEAD
           { "internalType": "address", "name": "field_0", "type": "address" },
           { "internalType": "uint256", "name": "field_1", "type": "uint256" }
+=======
+          { "internalType": "address", "name": "eth", "type": "address" },
+          { "internalType": "uint256", "name": "sub", "type": "uint256" }
+>>>>>>> misk: update stubs
         ],
-        "internalType": "struct Tuple6",
+        "internalType": "struct EthCrossAccount",
         "name": "admin",
         "type": "tuple"
       }
@@ -421,10 +464,15 @@
     "inputs": [
       {
         "components": [
+<<<<<<< HEAD
           { "internalType": "address", "name": "field_0", "type": "address" },
           { "internalType": "uint256", "name": "field_1", "type": "uint256" }
+=======
+          { "internalType": "address", "name": "eth", "type": "address" },
+          { "internalType": "uint256", "name": "sub", "type": "uint256" }
+>>>>>>> misk: update stubs
         ],
-        "internalType": "struct Tuple6",
+        "internalType": "struct EthCrossAccount",
         "name": "user",
         "type": "tuple"
       }
@@ -496,7 +544,7 @@
           { "internalType": "string", "name": "field_0", "type": "string" },
           { "internalType": "bytes", "name": "field_1", "type": "bytes" }
         ],
-        "internalType": "struct Tuple10[]",
+        "internalType": "struct Tuple14[]",
         "name": "properties",
         "type": "tuple[]"
       }
@@ -529,10 +577,15 @@
     "inputs": [
       {
         "components": [
+<<<<<<< HEAD
           { "internalType": "address", "name": "field_0", "type": "address" },
           { "internalType": "uint256", "name": "field_1", "type": "uint256" }
+=======
+          { "internalType": "address", "name": "eth", "type": "address" },
+          { "internalType": "uint256", "name": "sub", "type": "uint256" }
+>>>>>>> misk: update stubs
         ],
-        "internalType": "struct Tuple6",
+        "internalType": "struct EthCrossAccount",
         "name": "sponsor",
         "type": "tuple"
       }
@@ -544,12 +597,28 @@
   },
   {
     "inputs": [
+<<<<<<< HEAD
       {
         "components": [
           { "internalType": "address", "name": "field_0", "type": "address" },
           { "internalType": "uint256", "name": "field_1", "type": "uint256" }
+=======
+      { "internalType": "address", "name": "newOwner", "type": "address" }
+    ],
+    "name": "setOwner",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "components": [
+          { "internalType": "address", "name": "eth", "type": "address" },
+          { "internalType": "uint256", "name": "sub", "type": "uint256" }
+>>>>>>> misk: update stubs
         ],
-        "internalType": "struct Tuple6",
+        "internalType": "struct EthCrossAccount",
         "name": "newOwner",
         "type": "tuple"
       }
@@ -607,19 +676,29 @@
     "inputs": [
       {
         "components": [
+<<<<<<< HEAD
           { "internalType": "address", "name": "field_0", "type": "address" },
           { "internalType": "uint256", "name": "field_1", "type": "uint256" }
+=======
+          { "internalType": "address", "name": "eth", "type": "address" },
+          { "internalType": "uint256", "name": "sub", "type": "uint256" }
+>>>>>>> misk: update stubs
         ],
-        "internalType": "struct Tuple6",
+        "internalType": "struct EthCrossAccount",
         "name": "from",
         "type": "tuple"
       },
       {
         "components": [
+<<<<<<< HEAD
           { "internalType": "address", "name": "field_0", "type": "address" },
           { "internalType": "uint256", "name": "field_1", "type": "uint256" }
+=======
+          { "internalType": "address", "name": "eth", "type": "address" },
+          { "internalType": "uint256", "name": "sub", "type": "uint256" }
+>>>>>>> misk: update stubs
         ],
-        "internalType": "struct Tuple6",
+        "internalType": "struct EthCrossAccount",
         "name": "to",
         "type": "tuple"
       },
modifiedtests/src/eth/nonFungibleAbi.jsondiffbeforeafterboth
--- a/tests/src/eth/nonFungibleAbi.json
+++ b/tests/src/eth/nonFungibleAbi.json
@@ -93,10 +93,14 @@
     "inputs": [
       {
         "components": [
-          { "internalType": "address", "name": "field_0", "type": "address" },
-          { "internalType": "uint256", "name": "field_1", "type": "uint256" }
+          { "internalType": "address", "name": "eth", "type": "address" },
+          { "internalType": "uint256", "name": "sub", "type": "uint256" }
         ],
+<<<<<<< HEAD
         "internalType": "struct Tuple6",
+=======
+        "internalType": "struct EthCrossAccount",
+>>>>>>> misk: update stubs
         "name": "newAdmin",
         "type": "tuple"
       }
@@ -119,10 +123,14 @@
     "inputs": [
       {
         "components": [
-          { "internalType": "address", "name": "field_0", "type": "address" },
-          { "internalType": "uint256", "name": "field_1", "type": "uint256" }
+          { "internalType": "address", "name": "eth", "type": "address" },
+          { "internalType": "uint256", "name": "sub", "type": "uint256" }
         ],
+<<<<<<< HEAD
         "internalType": "struct Tuple6",
+=======
+        "internalType": "struct EthCrossAccount",
+>>>>>>> misk: update stubs
         "name": "user",
         "type": "tuple"
       }
@@ -155,10 +163,14 @@
     "inputs": [
       {
         "components": [
-          { "internalType": "address", "name": "field_0", "type": "address" },
-          { "internalType": "uint256", "name": "field_1", "type": "uint256" }
+          { "internalType": "address", "name": "eth", "type": "address" },
+          { "internalType": "uint256", "name": "sub", "type": "uint256" }
         ],
+<<<<<<< HEAD
         "internalType": "struct Tuple6",
+=======
+        "internalType": "struct EthCrossAccount",
+>>>>>>> misk: update stubs
         "name": "approved",
         "type": "tuple"
       },
@@ -201,10 +213,14 @@
     "inputs": [
       {
         "components": [
-          { "internalType": "address", "name": "field_0", "type": "address" },
-          { "internalType": "uint256", "name": "field_1", "type": "uint256" }
+          { "internalType": "address", "name": "eth", "type": "address" },
+          { "internalType": "uint256", "name": "sub", "type": "uint256" }
         ],
+<<<<<<< HEAD
         "internalType": "struct Tuple6",
+=======
+        "internalType": "struct EthCrossAccount",
+>>>>>>> misk: update stubs
         "name": "from",
         "type": "tuple"
       },
@@ -230,10 +246,14 @@
     "outputs": [
       {
         "components": [
-          { "internalType": "address", "name": "field_0", "type": "address" },
-          { "internalType": "uint256", "name": "field_1", "type": "uint256" }
+          { "internalType": "address", "name": "eth", "type": "address" },
+          { "internalType": "uint256", "name": "sub", "type": "uint256" }
         ],
+<<<<<<< HEAD
         "internalType": "struct Tuple6[]",
+=======
+        "internalType": "struct EthCrossAccount[]",
+>>>>>>> misk: update stubs
         "name": "",
         "type": "tuple[]"
       }
@@ -247,11 +267,12 @@
     "outputs": [
       {
         "components": [
-          { "internalType": "address", "name": "field_0", "type": "address" },
-          { "internalType": "uint256", "name": "field_1", "type": "uint256" }
+          { "internalType": "address", "name": "eth", "type": "address" },
+          { "internalType": "uint256", "name": "sub", "type": "uint256" }
         ],
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
         "internalType": "struct Tuple6",
 =======
         "internalType": "struct Tuple19",
@@ -259,6 +280,9 @@
 =======
         "internalType": "struct Tuple8",
 >>>>>>> feat: Add custum signature with unlimited nesting.
+=======
+        "internalType": "struct EthCrossAccount",
+>>>>>>> misk: update stubs
         "name": "",
         "type": "tuple"
       }
@@ -319,6 +343,7 @@
         ],
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
         "internalType": "struct Tuple6",
 =======
         "internalType": "struct Tuple19",
@@ -326,6 +351,9 @@
 =======
         "internalType": "struct Tuple8",
 >>>>>>> feat: Add custum signature with unlimited nesting.
+=======
+        "internalType": "struct Tuple24",
+>>>>>>> misk: update stubs
         "name": "",
         "type": "tuple"
       }
@@ -428,10 +456,14 @@
     "inputs": [
       {
         "components": [
-          { "internalType": "address", "name": "field_0", "type": "address" },
-          { "internalType": "uint256", "name": "field_1", "type": "uint256" }
+          { "internalType": "address", "name": "eth", "type": "address" },
+          { "internalType": "uint256", "name": "sub", "type": "uint256" }
         ],
+<<<<<<< HEAD
         "internalType": "struct Tuple6",
+=======
+        "internalType": "struct EthCrossAccount",
+>>>>>>> misk: update stubs
         "name": "user",
         "type": "tuple"
       }
@@ -556,10 +588,14 @@
     "inputs": [
       {
         "components": [
-          { "internalType": "address", "name": "field_0", "type": "address" },
-          { "internalType": "uint256", "name": "field_1", "type": "uint256" }
+          { "internalType": "address", "name": "eth", "type": "address" },
+          { "internalType": "uint256", "name": "sub", "type": "uint256" }
         ],
+<<<<<<< HEAD
         "internalType": "struct Tuple6",
+=======
+        "internalType": "struct EthCrossAccount",
+>>>>>>> misk: update stubs
         "name": "admin",
         "type": "tuple"
       }
@@ -589,10 +625,14 @@
     "inputs": [
       {
         "components": [
-          { "internalType": "address", "name": "field_0", "type": "address" },
-          { "internalType": "uint256", "name": "field_1", "type": "uint256" }
+          { "internalType": "address", "name": "eth", "type": "address" },
+          { "internalType": "uint256", "name": "sub", "type": "uint256" }
         ],
+<<<<<<< HEAD
         "internalType": "struct Tuple6",
+=======
+        "internalType": "struct EthCrossAccount",
+>>>>>>> misk: update stubs
         "name": "user",
         "type": "tuple"
       }
@@ -745,10 +785,14 @@
     "inputs": [
       {
         "components": [
-          { "internalType": "address", "name": "field_0", "type": "address" },
-          { "internalType": "uint256", "name": "field_1", "type": "uint256" }
+          { "internalType": "address", "name": "eth", "type": "address" },
+          { "internalType": "uint256", "name": "sub", "type": "uint256" }
         ],
+<<<<<<< HEAD
         "internalType": "struct Tuple6",
+=======
+        "internalType": "struct EthCrossAccount",
+>>>>>>> misk: update stubs
         "name": "sponsor",
         "type": "tuple"
       }
@@ -785,6 +829,7 @@
       {
         "components": [
 <<<<<<< HEAD
+<<<<<<< HEAD
           { "internalType": "string", "name": "field_0", "type": "string" },
           { "internalType": "bytes", "name": "field_1", "type": "bytes" }
 =======
@@ -795,6 +840,14 @@
         "internalType": "struct Tuple19[]",
         "name": "properties",
         "type": "tuple[]"
+=======
+          { "internalType": "address", "name": "eth", "type": "address" },
+          { "internalType": "uint256", "name": "sub", "type": "uint256" }
+        ],
+        "internalType": "struct EthCrossAccount",
+        "name": "newOwner",
+        "type": "tuple"
+>>>>>>> misk: update stubs
       }
     ],
     "name": "setProperties",
modifiedtests/src/eth/reFungibleAbi.jsondiffbeforeafterboth
--- a/tests/src/eth/reFungibleAbi.json
+++ b/tests/src/eth/reFungibleAbi.json
@@ -93,10 +93,17 @@
     "inputs": [
       {
         "components": [
+<<<<<<< HEAD
           { "internalType": "address", "name": "field_0", "type": "address" },
           { "internalType": "uint256", "name": "field_1", "type": "uint256" }
         ],
         "internalType": "struct Tuple6",
+=======
+          { "internalType": "address", "name": "eth", "type": "address" },
+          { "internalType": "uint256", "name": "sub", "type": "uint256" }
+        ],
+        "internalType": "struct EthCrossAccount",
+>>>>>>> misk: update stubs
         "name": "newAdmin",
         "type": "tuple"
       }
@@ -119,10 +126,17 @@
     "inputs": [
       {
         "components": [
+<<<<<<< HEAD
           { "internalType": "address", "name": "field_0", "type": "address" },
           { "internalType": "uint256", "name": "field_1", "type": "uint256" }
         ],
         "internalType": "struct Tuple6",
+=======
+          { "internalType": "address", "name": "eth", "type": "address" },
+          { "internalType": "uint256", "name": "sub", "type": "uint256" }
+        ],
+        "internalType": "struct EthCrossAccount",
+>>>>>>> misk: update stubs
         "name": "user",
         "type": "tuple"
       }
@@ -183,10 +197,17 @@
     "inputs": [
       {
         "components": [
+<<<<<<< HEAD
           { "internalType": "address", "name": "field_0", "type": "address" },
           { "internalType": "uint256", "name": "field_1", "type": "uint256" }
         ],
         "internalType": "struct Tuple6",
+=======
+          { "internalType": "address", "name": "eth", "type": "address" },
+          { "internalType": "uint256", "name": "sub", "type": "uint256" }
+        ],
+        "internalType": "struct EthCrossAccount",
+>>>>>>> misk: update stubs
         "name": "from",
         "type": "tuple"
       },
@@ -212,10 +233,17 @@
     "outputs": [
       {
         "components": [
+<<<<<<< HEAD
           { "internalType": "address", "name": "field_0", "type": "address" },
           { "internalType": "uint256", "name": "field_1", "type": "uint256" }
         ],
         "internalType": "struct Tuple6[]",
+=======
+          { "internalType": "address", "name": "eth", "type": "address" },
+          { "internalType": "uint256", "name": "sub", "type": "uint256" }
+        ],
+        "internalType": "struct EthCrossAccount[]",
+>>>>>>> misk: update stubs
         "name": "",
         "type": "tuple[]"
       }
@@ -229,10 +257,17 @@
     "outputs": [
       {
         "components": [
+<<<<<<< HEAD
           { "internalType": "address", "name": "field_0", "type": "address" },
           { "internalType": "uint256", "name": "field_1", "type": "uint256" }
         ],
         "internalType": "struct Tuple6",
+=======
+          { "internalType": "address", "name": "eth", "type": "address" },
+          { "internalType": "uint256", "name": "sub", "type": "uint256" }
+        ],
+        "internalType": "struct EthCrossAccount",
+>>>>>>> misk: update stubs
         "name": "",
         "type": "tuple"
       }
@@ -251,7 +286,7 @@
           { "internalType": "string", "name": "field_0", "type": "string" },
           { "internalType": "bytes", "name": "field_1", "type": "bytes" }
         ],
-        "internalType": "struct Tuple19[]",
+        "internalType": "struct Tuple20[]",
         "name": "",
         "type": "tuple[]"
       }
@@ -275,7 +310,11 @@
           { "internalType": "address", "name": "field_0", "type": "address" },
           { "internalType": "uint256", "name": "field_1", "type": "uint256" }
         ],
+<<<<<<< HEAD
         "internalType": "struct Tuple6",
+=======
+        "internalType": "struct Tuple23",
+>>>>>>> misk: update stubs
         "name": "",
         "type": "tuple"
       }
@@ -369,10 +408,17 @@
     "inputs": [
       {
         "components": [
+<<<<<<< HEAD
           { "internalType": "address", "name": "field_0", "type": "address" },
           { "internalType": "uint256", "name": "field_1", "type": "uint256" }
         ],
         "internalType": "struct Tuple6",
+=======
+          { "internalType": "address", "name": "eth", "type": "address" },
+          { "internalType": "uint256", "name": "sub", "type": "uint256" }
+        ],
+        "internalType": "struct EthCrossAccount",
+>>>>>>> misk: update stubs
         "name": "user",
         "type": "tuple"
       }
@@ -383,23 +429,68 @@
     "type": "function"
   },
   {
+<<<<<<< HEAD
     "inputs": [{ "internalType": "address", "name": "to", "type": "address" }],
     "name": "mint",
     "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],
+=======
+    "inputs": [
+      { "internalType": "address", "name": "to", "type": "address" },
+      { "internalType": "uint256", "name": "tokenId", "type": "uint256" }
+    ],
+    "name": "mint",
+    "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
+>>>>>>> misk: update stubs
     "stateMutability": "nonpayable",
     "type": "function"
   },
   {
     "inputs": [
       { "internalType": "address", "name": "to", "type": "address" },
+<<<<<<< HEAD
       { "internalType": "string", "name": "tokenUri", "type": "string" }
     ],
     "name": "mintWithTokenURI",
     "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],
+=======
+      { "internalType": "uint256[]", "name": "tokenIds", "type": "uint256[]" }
+    ],
+    "name": "mintBulk",
+    "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
     "stateMutability": "nonpayable",
     "type": "function"
   },
   {
+    "inputs": [
+      { "internalType": "address", "name": "to", "type": "address" },
+      {
+        "components": [
+          { "internalType": "uint256", "name": "field_0", "type": "uint256" },
+          { "internalType": "string", "name": "field_1", "type": "string" }
+        ],
+        "internalType": "struct Tuple11[]",
+        "name": "tokens",
+        "type": "tuple[]"
+      }
+    ],
+    "name": "mintBulkWithTokenURI",
+    "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      { "internalType": "address", "name": "to", "type": "address" },
+      { "internalType": "uint256", "name": "tokenId", "type": "uint256" },
+      { "internalType": "string", "name": "tokenUri", "type": "string" }
+    ],
+    "name": "mintWithTokenURI",
+    "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
+>>>>>>> misk: update stubs
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
     "inputs": [],
     "name": "mintingFinished",
     "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
@@ -452,10 +543,17 @@
     "inputs": [
       {
         "components": [
+<<<<<<< HEAD
           { "internalType": "address", "name": "field_0", "type": "address" },
           { "internalType": "uint256", "name": "field_1", "type": "uint256" }
         ],
         "internalType": "struct Tuple6",
+=======
+          { "internalType": "address", "name": "eth", "type": "address" },
+          { "internalType": "uint256", "name": "sub", "type": "uint256" }
+        ],
+        "internalType": "struct EthCrossAccount",
+>>>>>>> misk: update stubs
         "name": "admin",
         "type": "tuple"
       }
@@ -485,10 +583,17 @@
     "inputs": [
       {
         "components": [
+<<<<<<< HEAD
           { "internalType": "address", "name": "field_0", "type": "address" },
           { "internalType": "uint256", "name": "field_1", "type": "uint256" }
         ],
         "internalType": "struct Tuple6",
+=======
+          { "internalType": "address", "name": "eth", "type": "address" },
+          { "internalType": "uint256", "name": "sub", "type": "uint256" }
+        ],
+        "internalType": "struct EthCrossAccount",
+>>>>>>> misk: update stubs
         "name": "user",
         "type": "tuple"
       }
@@ -593,7 +698,7 @@
           { "internalType": "string", "name": "field_0", "type": "string" },
           { "internalType": "bytes", "name": "field_1", "type": "bytes" }
         ],
-        "internalType": "struct Tuple19[]",
+        "internalType": "struct Tuple20[]",
         "name": "properties",
         "type": "tuple[]"
       }
@@ -626,10 +731,17 @@
     "inputs": [
       {
         "components": [
+<<<<<<< HEAD
           { "internalType": "address", "name": "field_0", "type": "address" },
           { "internalType": "uint256", "name": "field_1", "type": "uint256" }
         ],
         "internalType": "struct Tuple6",
+=======
+          { "internalType": "address", "name": "eth", "type": "address" },
+          { "internalType": "uint256", "name": "sub", "type": "uint256" }
+        ],
+        "internalType": "struct EthCrossAccount",
+>>>>>>> misk: update stubs
         "name": "sponsor",
         "type": "tuple"
       }
@@ -641,6 +753,7 @@
   },
   {
     "inputs": [
+<<<<<<< HEAD
       {
         "components": [
           { "internalType": "address", "name": "field_0", "type": "address" },
@@ -650,6 +763,9 @@
         "name": "newOwner",
         "type": "tuple"
       }
+=======
+      { "internalType": "address", "name": "newOwner", "type": "address" }
+>>>>>>> misk: update stubs
     ],
     "name": "setOwnerCross",
     "outputs": [],
@@ -661,12 +777,21 @@
       { "internalType": "uint256", "name": "tokenId", "type": "uint256" },
       {
         "components": [
+<<<<<<< HEAD
           { "internalType": "string", "name": "field_0", "type": "string" },
           { "internalType": "bytes", "name": "field_1", "type": "bytes" }
         ],
         "internalType": "struct Tuple19[]",
         "name": "properties",
         "type": "tuple[]"
+=======
+          { "internalType": "address", "name": "eth", "type": "address" },
+          { "internalType": "uint256", "name": "sub", "type": "uint256" }
+        ],
+        "internalType": "struct EthCrossAccount",
+        "name": "newOwner",
+        "type": "tuple"
+>>>>>>> misk: update stubs
       }
     ],
     "name": "setProperties",
@@ -782,19 +907,33 @@
     "inputs": [
       {
         "components": [
+<<<<<<< HEAD
           { "internalType": "address", "name": "field_0", "type": "address" },
           { "internalType": "uint256", "name": "field_1", "type": "uint256" }
         ],
         "internalType": "struct Tuple6",
+=======
+          { "internalType": "address", "name": "eth", "type": "address" },
+          { "internalType": "uint256", "name": "sub", "type": "uint256" }
+        ],
+        "internalType": "struct EthCrossAccount",
+>>>>>>> misk: update stubs
         "name": "from",
         "type": "tuple"
       },
       {
         "components": [
+<<<<<<< HEAD
           { "internalType": "address", "name": "field_0", "type": "address" },
           { "internalType": "uint256", "name": "field_1", "type": "uint256" }
         ],
         "internalType": "struct Tuple6",
+=======
+          { "internalType": "address", "name": "eth", "type": "address" },
+          { "internalType": "uint256", "name": "sub", "type": "uint256" }
+        ],
+        "internalType": "struct EthCrossAccount",
+>>>>>>> misk: update stubs
         "name": "to",
         "type": "tuple"
       },