git.delta.rocks / unique-network / refs/commits / f5a501ec99bf

difftreelog

chore generate stubs & types

PraetorP2022-12-16parent: #6dd747e.patch.diff
in: master

11 files changed

modifiedCargo.lockdiffbeforeafterboth
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6342,7 +6342,7 @@
 
 [[package]]
 name = "pallet-nonfungible"
-version = "0.1.11"
+version = "0.1.12"
 dependencies = [
  "ethereum 0.14.0",
  "evm-coder",
@@ -6501,7 +6501,7 @@
 
 [[package]]
 name = "pallet-refungible"
-version = "0.2.10"
+version = "0.2.11"
 dependencies = [
  "derivative",
  "ethereum 0.14.0",
modifiedpallets/nonfungible/Cargo.tomldiffbeforeafterboth
--- a/pallets/nonfungible/Cargo.toml
+++ b/pallets/nonfungible/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-nonfungible"
-version = "0.1.11"
+version = "0.1.12"
 license = "GPLv3"
 edition = "2021"
 
modifiedpallets/nonfungible/src/stubs/UniqueNFT.soldiffbeforeafterboth
--- a/pallets/nonfungible/src/stubs/UniqueNFT.sol
+++ b/pallets/nonfungible/src/stubs/UniqueNFT.sol
@@ -42,7 +42,11 @@
 	/// @param permissions Permissions for keys.
 	/// @dev EVM selector for this function is: 0xbd92983a,
 	///  or in textual repr: setTokenPropertyPermissions((string,(uint8,bool)[])[])
+<<<<<<< HEAD
 	function setTokenPropertyPermissions(Tuple59[] memory permissions) public {
+=======
+	function setTokenPropertyPermissions(Tuple56[] memory permissions) public {
+>>>>>>> 9e929f90... chore: generate stubs & types
 		require(false, stub_error);
 		permissions;
 		dummy = 0;
@@ -51,10 +55,17 @@
 	/// @notice Get permissions for token properties.
 	/// @dev EVM selector for this function is: 0xf23d7790,
 	///  or in textual repr: tokenPropertyPermissions()
+<<<<<<< HEAD
 	function tokenPropertyPermissions() public view returns (Tuple59[] memory) {
 		require(false, stub_error);
 		dummy;
 		return new Tuple59[](0);
+=======
+	function tokenPropertyPermissions() public view returns (Tuple56[] memory) {
+		require(false, stub_error);
+		dummy;
+		return new Tuple56[](0);
+>>>>>>> 9e929f90... chore: generate stubs & types
 	}
 
 	// /// @notice Set token property value.
@@ -144,6 +155,7 @@
 }
 
 /// @dev anonymous struct
+<<<<<<< HEAD
 struct Tuple59 {
 	string field_0;
 	Tuple57[] field_1;
@@ -151,6 +163,15 @@
 
 /// @dev anonymous struct
 struct Tuple57 {
+=======
+struct Tuple56 {
+	string field_0;
+	Tuple54[] field_1;
+}
+
+/// @dev anonymous struct
+struct Tuple54 {
+>>>>>>> 9e929f90... chore: generate stubs & types
 	EthTokenPermissions field_0;
 	bool field_1;
 }
modifiedpallets/refungible/Cargo.tomldiffbeforeafterboth
--- a/pallets/refungible/Cargo.toml
+++ b/pallets/refungible/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-refungible"
-version = "0.2.10"
+version = "0.2.11"
 license = "GPLv3"
 edition = "2021"
 
modifiedpallets/refungible/src/lib.rsdiffbeforeafterboth
--- a/pallets/refungible/src/lib.rs
+++ b/pallets/refungible/src/lib.rs
@@ -113,7 +113,8 @@
 	AccessMode, budget::Budget, CollectionId, CollectionFlags, CollectionPropertiesVec,
 	CreateCollectionData, CustomDataLimit, mapping::TokenAddressMapping, MAX_ITEMS_PER_BATCH,
 	MAX_REFUNGIBLE_PIECES, Property, PropertyKey, PropertyKeyPermission, PropertyPermission,
-	PropertyScope, PropertyValue, TokenId, TrySetProperty, PropertiesPermissionMap, CreateRefungibleExMultipleOwners,
+	PropertyScope, PropertyValue, TokenId, TrySetProperty, PropertiesPermissionMap,
+	CreateRefungibleExMultipleOwners,
 };
 
 pub use pallet::*;
modifiedpallets/refungible/src/stubs/UniqueRefungible.soldiffbeforeafterboth
before · pallets/refungible/src/stubs/UniqueRefungible.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 0xde0695c222contract 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(string memory key, bool isMutable, bool collectionAdmin, bool tokenOwner) public {32	// 	require(false, stub_error);33	// 	key;34	// 	isMutable;35	// 	collectionAdmin;36	// 	tokenOwner;37	// 	dummy = 0;38	// }3940	/// @notice Set permissions for token property.41	/// @dev Throws error if `msg.sender` is not admin or owner of the collection.42	/// @param permissions Permissions for keys.43	/// @dev EVM selector for this function is: 0xbd92983a,44	///  or in textual repr: setTokenPropertyPermissions((string,(uint8,bool)[])[])45	function setTokenPropertyPermissions(Tuple58[] memory permissions) public {46		require(false, stub_error);47		permissions;48		dummy = 0;49	}5051	/// @notice Get permissions for token properties.52	/// @dev EVM selector for this function is: 0xf23d7790,53	///  or in textual repr: tokenPropertyPermissions()54	function tokenPropertyPermissions() public view returns (Tuple58[] memory) {55		require(false, stub_error);56		dummy;57		return new Tuple58[](0);58	}5960	// /// @notice Set token property value.61	// /// @dev Throws error if `msg.sender` has no permission to edit the property.62	// /// @param tokenId ID of the token.63	// /// @param key Property key.64	// /// @param value Property value.65	// /// @dev EVM selector for this function is: 0x1752d67b,66	// ///  or in textual repr: setProperty(uint256,string,bytes)67	// function setProperty(uint256 tokenId, string memory key, bytes memory value) public {68	// 	require(false, stub_error);69	// 	tokenId;70	// 	key;71	// 	value;72	// 	dummy = 0;73	// }7475	/// @notice Set token properties value.76	/// @dev Throws error if `msg.sender` has no permission to edit the property.77	/// @param tokenId ID of the token.78	/// @param properties settable properties79	/// @dev EVM selector for this function is: 0x14ed3a6e,80	///  or in textual repr: setProperties(uint256,(string,bytes)[])81	function setProperties(uint256 tokenId, Property[] memory properties) public {82		require(false, stub_error);83		tokenId;84		properties;85		dummy = 0;86	}8788	// /// @notice Delete token property value.89	// /// @dev Throws error if `msg.sender` has no permission to edit the property.90	// /// @param tokenId ID of the token.91	// /// @param key Property key.92	// /// @dev EVM selector for this function is: 0x066111d1,93	// ///  or in textual repr: deleteProperty(uint256,string)94	// function deleteProperty(uint256 tokenId, string memory key) public {95	// 	require(false, stub_error);96	// 	tokenId;97	// 	key;98	// 	dummy = 0;99	// }100101	/// @notice Delete token properties value.102	/// @dev Throws error if `msg.sender` has no permission to edit the property.103	/// @param tokenId ID of the token.104	/// @param keys Properties key.105	/// @dev EVM selector for this function is: 0xc472d371,106	///  or in textual repr: deleteProperties(uint256,string[])107	function deleteProperties(uint256 tokenId, string[] memory keys) public {108		require(false, stub_error);109		tokenId;110		keys;111		dummy = 0;112	}113114	/// @notice Get token property value.115	/// @dev Throws error if key not found116	/// @param tokenId ID of the token.117	/// @param key Property key.118	/// @return Property value bytes119	/// @dev EVM selector for this function is: 0x7228c327,120	///  or in textual repr: property(uint256,string)121	function property(uint256 tokenId, string memory key) public view returns (bytes memory) {122		require(false, stub_error);123		tokenId;124		key;125		dummy;126		return hex"";127	}128}129130/// @dev Property struct131struct Property {132	string key;133	bytes value;134}135136/// @dev Ethereum representation of TokenPermissions (see [`up_data_structs::PropertyPermission`]) fields as an enumeration.137enum EthTokenPermissions {138	/// @dev Permission to change the property and property permission. See [`up_data_structs::PropertyPermission::mutable`]139	Mutable,140	/// @dev Change permission for the collection administrator. See [`up_data_structs::PropertyPermission::token_owner`]141	TokenOwner,142	/// @dev Permission to change the property for the owner of the token. See [`up_data_structs::PropertyPermission::collection_admin`]143	CollectionAdmin144}145146/// @dev anonymous struct147struct Tuple58 {148	string field_0;149	Tuple56[] field_1;150}151152/// @dev anonymous struct153struct Tuple56 {154	EthTokenPermissions field_0;155	bool field_1;156}157158/// @title A contract that allows you to work with collections.159/// @dev the ERC-165 identifier for this interface is 0x81172a75160contract Collection is Dummy, ERC165 {161	// /// Set collection property.162	// ///163	// /// @param key Property key.164	// /// @param value Propery value.165	// /// @dev EVM selector for this function is: 0x2f073f66,166	// ///  or in textual repr: setCollectionProperty(string,bytes)167	// function setCollectionProperty(string memory key, bytes memory value) public {168	// 	require(false, stub_error);169	// 	key;170	// 	value;171	// 	dummy = 0;172	// }173174	/// Set collection properties.175	///176	/// @param properties Vector of properties key/value pair.177	/// @dev EVM selector for this function is: 0x50b26b2a,178	///  or in textual repr: setCollectionProperties((string,bytes)[])179	function setCollectionProperties(Property[] memory properties) public {180		require(false, stub_error);181		properties;182		dummy = 0;183	}184185	// /// Delete collection property.186	// ///187	// /// @param key Property key.188	// /// @dev EVM selector for this function is: 0x7b7debce,189	// ///  or in textual repr: deleteCollectionProperty(string)190	// function deleteCollectionProperty(string memory key) public {191	// 	require(false, stub_error);192	// 	key;193	// 	dummy = 0;194	// }195196	/// Delete collection properties.197	///198	/// @param keys Properties keys.199	/// @dev EVM selector for this function is: 0xee206ee3,200	///  or in textual repr: deleteCollectionProperties(string[])201	function deleteCollectionProperties(string[] memory keys) public {202		require(false, stub_error);203		keys;204		dummy = 0;205	}206207	/// Get collection property.208	///209	/// @dev Throws error if key not found.210	///211	/// @param key Property key.212	/// @return bytes The property corresponding to the key.213	/// @dev EVM selector for this function is: 0xcf24fd6d,214	///  or in textual repr: collectionProperty(string)215	function collectionProperty(string memory key) public view returns (bytes memory) {216		require(false, stub_error);217		key;218		dummy;219		return hex"";220	}221222	/// Get collection properties.223	///224	/// @param keys Properties keys. Empty keys for all propertyes.225	/// @return Vector of properties key/value pairs.226	/// @dev EVM selector for this function is: 0x285fb8e6,227	///  or in textual repr: collectionProperties(string[])228	function collectionProperties(string[] memory keys) public view returns (Property[] memory) {229		require(false, stub_error);230		keys;231		dummy;232		return new Property[](0);233	}234235	// /// Set the sponsor of the collection.236	// ///237	// /// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.238	// ///239	// /// @param sponsor Address of the sponsor from whose account funds will be debited for operations with the contract.240	// /// @dev EVM selector for this function is: 0x7623402e,241	// ///  or in textual repr: setCollectionSponsor(address)242	// function setCollectionSponsor(address sponsor) public {243	// 	require(false, stub_error);244	// 	sponsor;245	// 	dummy = 0;246	// }247248	/// Set the sponsor of the collection.249	///250	/// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.251	///252	/// @param sponsor Cross account address of the sponsor from whose account funds will be debited for operations with the contract.253	/// @dev EVM selector for this function is: 0x84a1d5a8,254	///  or in textual repr: setCollectionSponsorCross((address,uint256))255	function setCollectionSponsorCross(EthCrossAccount memory sponsor) public {256		require(false, stub_error);257		sponsor;258		dummy = 0;259	}260261	/// Whether there is a pending sponsor.262	/// @dev EVM selector for this function is: 0x058ac185,263	///  or in textual repr: hasCollectionPendingSponsor()264	function hasCollectionPendingSponsor() public view returns (bool) {265		require(false, stub_error);266		dummy;267		return false;268	}269270	/// Collection sponsorship confirmation.271	///272	/// @dev After setting the sponsor for the collection, it must be confirmed with this function.273	/// @dev EVM selector for this function is: 0x3c50e97a,274	///  or in textual repr: confirmCollectionSponsorship()275	function confirmCollectionSponsorship() public {276		require(false, stub_error);277		dummy = 0;278	}279280	/// Remove collection sponsor.281	/// @dev EVM selector for this function is: 0x6e0326a3,282	///  or in textual repr: removeCollectionSponsor()283	function removeCollectionSponsor() public {284		require(false, stub_error);285		dummy = 0;286	}287288	/// Get current sponsor.289	///290	/// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.291	/// @dev EVM selector for this function is: 0x6ec0a9f1,292	///  or in textual repr: collectionSponsor()293	function collectionSponsor() public view returns (EthCrossAccount memory) {294		require(false, stub_error);295		dummy;296		return EthCrossAccount(0x0000000000000000000000000000000000000000, 0);297	}298299	/// Get current collection limits.300	///301	/// @return Array of tuples (byte, bool, uint256) with limits and their values. Order of limits:302	/// 	"accountTokenOwnershipLimit",303	/// 	"sponsoredDataSize",304	/// 	"sponsoredDataRateLimit",305	/// 	"tokenLimit",306	/// 	"sponsorTransferTimeout",307	/// 	"sponsorApproveTimeout"308	///  	"ownerCanTransfer",309	/// 	"ownerCanDestroy",310	/// 	"transfersEnabled"311	/// Return `false` if a limit not set.312	/// @dev EVM selector for this function is: 0xf63bc572,313	///  or in textual repr: collectionLimits()314	function collectionLimits() public view returns (Tuple32[] memory) {315		require(false, stub_error);316		dummy;317		return new Tuple32[](0);318	}319320	/// Set limits for the collection.321	/// @dev Throws error if limit not found.322	/// @param limit Name of the limit. Valid names:323	/// 	"accountTokenOwnershipLimit",324	/// 	"sponsoredDataSize",325	/// 	"sponsoredDataRateLimit",326	/// 	"tokenLimit",327	/// 	"sponsorTransferTimeout",328	/// 	"sponsorApproveTimeout"329	///  	"ownerCanTransfer",330	/// 	"ownerCanDestroy",331	/// 	"transfersEnabled"332	/// @param status enable\disable limit. Works only with `true`.333	/// @param value Value of the limit.334	/// @dev EVM selector for this function is: 0x88150bd0,335	///  or in textual repr: setCollectionLimit(uint8,bool,uint256)336	function setCollectionLimit(337		CollectionLimits limit,338		bool status,339		uint256 value340	) public {341		require(false, stub_error);342		limit;343		status;344		value;345		dummy = 0;346	}347348	/// Get contract address.349	/// @dev EVM selector for this function is: 0xf6b4dfb4,350	///  or in textual repr: contractAddress()351	function contractAddress() public view returns (address) {352		require(false, stub_error);353		dummy;354		return 0x0000000000000000000000000000000000000000;355	}356357	/// Add collection admin.358	/// @param newAdmin Cross account administrator address.359	/// @dev EVM selector for this function is: 0x859aa7d6,360	///  or in textual repr: addCollectionAdminCross((address,uint256))361	function addCollectionAdminCross(EthCrossAccount memory newAdmin) public {362		require(false, stub_error);363		newAdmin;364		dummy = 0;365	}366367	/// Remove collection admin.368	/// @param admin Cross account administrator address.369	/// @dev EVM selector for this function is: 0x6c0cd173,370	///  or in textual repr: removeCollectionAdminCross((address,uint256))371	function removeCollectionAdminCross(EthCrossAccount memory admin) public {372		require(false, stub_error);373		admin;374		dummy = 0;375	}376377	// /// Add collection admin.378	// /// @param newAdmin Address of the added administrator.379	// /// @dev EVM selector for this function is: 0x92e462c7,380	// ///  or in textual repr: addCollectionAdmin(address)381	// function addCollectionAdmin(address newAdmin) public {382	// 	require(false, stub_error);383	// 	newAdmin;384	// 	dummy = 0;385	// }386387	// /// Remove collection admin.388	// ///389	// /// @param admin Address of the removed administrator.390	// /// @dev EVM selector for this function is: 0xfafd7b42,391	// ///  or in textual repr: removeCollectionAdmin(address)392	// function removeCollectionAdmin(address admin) public {393	// 	require(false, stub_error);394	// 	admin;395	// 	dummy = 0;396	// }397398	/// Toggle accessibility of collection nesting.399	///400	/// @param enable If "true" degenerates to nesting: 'Owner' else to nesting: 'Disabled'401	/// @dev EVM selector for this function is: 0x112d4586,402	///  or in textual repr: setCollectionNesting(bool)403	function setCollectionNesting(bool enable) public {404		require(false, stub_error);405		enable;406		dummy = 0;407	}408409	/// Toggle accessibility of collection nesting.410	///411	/// @param enable If "true" degenerates to nesting: {OwnerRestricted: [1, 2, 3]} else to nesting: 'Disabled'412	/// @param collections Addresses of collections that will be available for nesting.413	/// @dev EVM selector for this function is: 0x64872396,414	///  or in textual repr: setCollectionNesting(bool,address[])415	function setCollectionNesting(bool enable, address[] memory collections) public {416		require(false, stub_error);417		enable;418		collections;419		dummy = 0;420	}421422	/// Returns nesting for a collection423	/// @dev EVM selector for this function is: 0x22d25bfe,424	///  or in textual repr: collectionNestingRestrictedCollectionIds()425<<<<<<< HEAD426	function collectionNestingRestrictedCollectionIds() public view returns (Tuple38 memory) {427		require(false, stub_error);428		dummy;429		return Tuple38(false, new uint256[](0));430=======431	function collectionNestingRestrictedCollectionIds() public view returns (Tuple35 memory) {432		require(false, stub_error);433		dummy;434		return Tuple35(false, new uint256[](0));435>>>>>>> 09f69700... chore: generate stubs436	}437438	/// Returns permissions for a collection439	/// @dev EVM selector for this function is: 0x5b2eaf4b,440	///  or in textual repr: collectionNestingPermissions()441<<<<<<< HEAD442	function collectionNestingPermissions() public view returns (Tuple41[] memory) {443		require(false, stub_error);444		dummy;445		return new Tuple41[](0);446=======447	function collectionNestingPermissions() public view returns (Tuple38[] memory) {448		require(false, stub_error);449		dummy;450		return new Tuple38[](0);451>>>>>>> 09f69700... chore: generate stubs452	}453454	/// Set the collection access method.455	/// @param mode Access mode456	/// 	0 for Normal457	/// 	1 for AllowList458	/// @dev EVM selector for this function is: 0x41835d4c,459	///  or in textual repr: setCollectionAccess(uint8)460	function setCollectionAccess(uint8 mode) public {461		require(false, stub_error);462		mode;463		dummy = 0;464	}465466	/// Checks that user allowed to operate with collection.467	///468	/// @param user User address to check.469	/// @dev EVM selector for this function is: 0x91b6df49,470	///  or in textual repr: allowlistedCross((address,uint256))471	function allowlistedCross(EthCrossAccount memory user) public view returns (bool) {472		require(false, stub_error);473		user;474		dummy;475		return false;476	}477478	// /// Add the user to the allowed list.479	// ///480	// /// @param user Address of a trusted user.481	// /// @dev EVM selector for this function is: 0x67844fe6,482	// ///  or in textual repr: addToCollectionAllowList(address)483	// function addToCollectionAllowList(address user) public {484	// 	require(false, stub_error);485	// 	user;486	// 	dummy = 0;487	// }488489	/// Add user to allowed list.490	///491	/// @param user User cross account address.492	/// @dev EVM selector for this function is: 0xa0184a3a,493	///  or in textual repr: addToCollectionAllowListCross((address,uint256))494	function addToCollectionAllowListCross(EthCrossAccount memory user) public {495		require(false, stub_error);496		user;497		dummy = 0;498	}499500	// /// Remove the user from the allowed list.501	// ///502	// /// @param user Address of a removed user.503	// /// @dev EVM selector for this function is: 0x85c51acb,504	// ///  or in textual repr: removeFromCollectionAllowList(address)505	// function removeFromCollectionAllowList(address user) public {506	// 	require(false, stub_error);507	// 	user;508	// 	dummy = 0;509	// }510511	/// Remove user from allowed list.512	///513	/// @param user User cross account address.514	/// @dev EVM selector for this function is: 0x09ba452a,515	///  or in textual repr: removeFromCollectionAllowListCross((address,uint256))516	function removeFromCollectionAllowListCross(EthCrossAccount memory user) public {517		require(false, stub_error);518		user;519		dummy = 0;520	}521522	/// Switch permission for minting.523	///524	/// @param mode Enable if "true".525	/// @dev EVM selector for this function is: 0x00018e84,526	///  or in textual repr: setCollectionMintMode(bool)527	function setCollectionMintMode(bool mode) public {528		require(false, stub_error);529		mode;530		dummy = 0;531	}532533	// /// Check that account is the owner or admin of the collection534	// ///535	// /// @param user account to verify536	// /// @return "true" if account is the owner or admin537	// /// @dev EVM selector for this function is: 0x9811b0c7,538	// ///  or in textual repr: isOwnerOrAdmin(address)539	// function isOwnerOrAdmin(address user) public view returns (bool) {540	// 	require(false, stub_error);541	// 	user;542	// 	dummy;543	// 	return false;544	// }545546	/// Check that account is the owner or admin of the collection547	///548	/// @param user User cross account to verify549	/// @return "true" if account is the owner or admin550	/// @dev EVM selector for this function is: 0x3e75a905,551	///  or in textual repr: isOwnerOrAdminCross((address,uint256))552	function isOwnerOrAdminCross(EthCrossAccount memory user) public view returns (bool) {553		require(false, stub_error);554		user;555		dummy;556		return false;557	}558559	/// Returns collection type560	///561	/// @return `Fungible` or `NFT` or `ReFungible`562	/// @dev EVM selector for this function is: 0xd34b55b8,563	///  or in textual repr: uniqueCollectionType()564	function uniqueCollectionType() public view returns (string memory) {565		require(false, stub_error);566		dummy;567		return "";568	}569570	/// Get collection owner.571	///572	/// @return Tuble with sponsor address and his substrate mirror.573	/// If address is canonical then substrate mirror is zero and vice versa.574	/// @dev EVM selector for this function is: 0xdf727d3b,575	///  or in textual repr: collectionOwner()576	function collectionOwner() public view returns (EthCrossAccount memory) {577		require(false, stub_error);578		dummy;579		return EthCrossAccount(0x0000000000000000000000000000000000000000, 0);580	}581582	// /// Changes collection owner to another account583	// ///584	// /// @dev Owner can be changed only by current owner585	// /// @param newOwner new owner account586	// /// @dev EVM selector for this function is: 0x4f53e226,587	// ///  or in textual repr: changeCollectionOwner(address)588	// function changeCollectionOwner(address newOwner) public {589	// 	require(false, stub_error);590	// 	newOwner;591	// 	dummy = 0;592	// }593594	/// Get collection administrators595	///596	/// @return Vector of tuples with admins address and his substrate mirror.597	/// If address is canonical then substrate mirror is zero and vice versa.598	/// @dev EVM selector for this function is: 0x5813216b,599	///  or in textual repr: collectionAdmins()600	function collectionAdmins() public view returns (EthCrossAccount[] memory) {601		require(false, stub_error);602		dummy;603		return new EthCrossAccount[](0);604	}605606	/// Changes collection owner to another account607	///608	/// @dev Owner can be changed only by current owner609	/// @param newOwner new owner cross account610	/// @dev EVM selector for this function is: 0x6496c497,611	///  or in textual repr: changeCollectionOwnerCross((address,uint256))612	function changeCollectionOwnerCross(EthCrossAccount memory newOwner) public {613		require(false, stub_error);614		newOwner;615		dummy = 0;616	}617}618619/// @dev Cross account struct620struct EthCrossAccount {621	address eth;622	uint256 sub;623}624625enum CollectionPermissions {626	CollectionAdmin,627	TokenOwner628}629630/// @dev anonymous struct631<<<<<<< HEAD632struct Tuple41 {633=======634struct Tuple38 {635>>>>>>> 09f69700... chore: generate stubs636	CollectionPermissions field_0;637	bool field_1;638}639640/// @dev anonymous struct641<<<<<<< HEAD642struct Tuple38 {643=======644struct Tuple35 {645>>>>>>> 09f69700... chore: generate stubs646	bool field_0;647	uint256[] field_1;648}649650<<<<<<< HEAD651/// @dev [`CollectionLimits`](up_data_structs::CollectionLimits) representation for EVM.652enum CollectionLimits {653	/// @dev How many tokens can a user have on one account.654	AccountTokenOwnership,655	/// @dev How many bytes of data are available for sponsorship.656	SponsoredDataSize,657	/// @dev In any case, chain default: [`SponsoringRateLimit::SponsoringDisabled`]658	SponsoredDataRateLimit,659	/// @dev How many tokens can be mined into this collection.660	TokenLimit,661	/// @dev Timeouts for transfer sponsoring.662	SponsorTransferTimeout,663	/// @dev Timeout for sponsoring an approval in passed blocks.664	SponsorApproveTimeout,665	/// @dev Whether the collection owner of the collection can send tokens (which belong to other users).666	OwnerCanTransfer,667	/// @dev Can the collection owner burn other people's tokens.668	OwnerCanDestroy,669	/// @dev Is it possible to send tokens from this collection between users.670	TransferEnabled671}672673/// @dev anonymous struct674struct Tuple32 {675	CollectionLimits field_0;676	bool field_1;677	uint256 field_2;678}679680/// @dev anonymous struct681struct Tuple31 {682	address field_0;683	uint256 field_1;684}685686=======687>>>>>>> 09f69700... chore: generate stubs688/// @dev the ERC-165 identifier for this interface is 0x5b5e139f689contract ERC721Metadata is Dummy, ERC165 {690	// /// @notice A descriptive name for a collection of NFTs in this contract691	// /// @dev real implementation of this function lies in `ERC721UniqueExtensions`692	// /// @dev EVM selector for this function is: 0x06fdde03,693	// ///  or in textual repr: name()694	// function name() public view returns (string memory) {695	// 	require(false, stub_error);696	// 	dummy;697	// 	return "";698	// }699700	// /// @notice An abbreviated name for NFTs in this contract701	// /// @dev real implementation of this function lies in `ERC721UniqueExtensions`702	// /// @dev EVM selector for this function is: 0x95d89b41,703	// ///  or in textual repr: symbol()704	// function symbol() public view returns (string memory) {705	// 	require(false, stub_error);706	// 	dummy;707	// 	return "";708	// }709710	/// @notice A distinct Uniform Resource Identifier (URI) for a given asset.711	///712	/// @dev If the token has a `url` property and it is not empty, it is returned.713	///  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`.714	///  If the collection property `baseURI` is empty or absent, return "" (empty string)715	///  otherwise, if token property `suffix` present and is non-empty, return concatenation of baseURI and suffix716	///  otherwise, return concatenation of `baseURI` and stringified token id (decimal stringifying, without paddings).717	///718	/// @return token's const_metadata719	/// @dev EVM selector for this function is: 0xc87b56dd,720	///  or in textual repr: tokenURI(uint256)721	function tokenURI(uint256 tokenId) public view returns (string memory) {722		require(false, stub_error);723		tokenId;724		dummy;725		return "";726	}727}728729/// @title ERC721 Token that can be irreversibly burned (destroyed).730/// @dev the ERC-165 identifier for this interface is 0x42966c68731contract ERC721Burnable is Dummy, ERC165 {732	/// @notice Burns a specific ERC721 token.733	/// @dev Throws unless `msg.sender` is the current RFT owner, or an authorized734	///  operator of the current owner.735	/// @param tokenId The RFT to approve736	/// @dev EVM selector for this function is: 0x42966c68,737	///  or in textual repr: burn(uint256)738	function burn(uint256 tokenId) public {739		require(false, stub_error);740		tokenId;741		dummy = 0;742	}743}744745/// @dev inlined interface746contract ERC721UniqueMintableEvents {747	event MintingFinished();748}749750/// @title ERC721 minting logic.751/// @dev the ERC-165 identifier for this interface is 0x476ff149752contract ERC721UniqueMintable is Dummy, ERC165, ERC721UniqueMintableEvents {753	/// @dev EVM selector for this function is: 0x05d2035b,754	///  or in textual repr: mintingFinished()755	function mintingFinished() public view returns (bool) {756		require(false, stub_error);757		dummy;758		return false;759	}760761	/// @notice Function to a mint token.762	/// @param to The new owner763	/// @return uint256 The id of the newly minted token764	/// @dev EVM selector for this function is: 0x6a627842,765	///  or in textual repr: mint(address)766	function mint(address to) public returns (uint256) {767		require(false, stub_error);768		to;769		dummy = 0;770		return 0;771	}772773	// /// @notice Function to a mint token.774	// /// @dev `tokenId` should be obtained with `nextTokenId` method,775	// ///  unlike standard, you can't specify it manually776	// /// @param to The new owner777	// /// @param tokenId ID of the minted RFT778	// /// @dev EVM selector for this function is: 0x40c10f19,779	// ///  or in textual repr: mint(address,uint256)780	// function mint(address to, uint256 tokenId) public returns (bool) {781	// 	require(false, stub_error);782	// 	to;783	// 	tokenId;784	// 	dummy = 0;785	// 	return false;786	// }787788	/// @notice Function to mint token with the given tokenUri.789	/// @param to The new owner790	/// @param tokenUri Token URI that would be stored in the NFT properties791	/// @return uint256 The id of the newly minted token792	/// @dev EVM selector for this function is: 0x45c17782,793	///  or in textual repr: mintWithTokenURI(address,string)794	function mintWithTokenURI(address to, string memory tokenUri) public returns (uint256) {795		require(false, stub_error);796		to;797		tokenUri;798		dummy = 0;799		return 0;800	}801802	// /// @notice Function to mint token with the given tokenUri.803	// /// @dev `tokenId` should be obtained with `nextTokenId` method,804	// ///  unlike standard, you can't specify it manually805	// /// @param to The new owner806	// /// @param tokenId ID of the minted RFT807	// /// @param tokenUri Token URI that would be stored in the RFT properties808	// /// @dev EVM selector for this function is: 0x50bb4e7f,809	// ///  or in textual repr: mintWithTokenURI(address,uint256,string)810	// function mintWithTokenURI(address to, uint256 tokenId, string memory tokenUri) public returns (bool) {811	// 	require(false, stub_error);812	// 	to;813	// 	tokenId;814	// 	tokenUri;815	// 	dummy = 0;816	// 	return false;817	// }818819	/// @dev Not implemented820	/// @dev EVM selector for this function is: 0x7d64bcb4,821	///  or in textual repr: finishMinting()822	function finishMinting() public returns (bool) {823		require(false, stub_error);824		dummy = 0;825		return false;826	}827}828829/// @title Unique extensions for ERC721.830/// @dev the ERC-165 identifier for this interface is 0xabf30dc2831contract ERC721UniqueExtensions is Dummy, ERC165 {832	/// @notice A descriptive name for a collection of NFTs in this contract833	/// @dev EVM selector for this function is: 0x06fdde03,834	///  or in textual repr: name()835	function name() public view returns (string memory) {836		require(false, stub_error);837		dummy;838		return "";839	}840841	/// @notice An abbreviated name for NFTs in this contract842	/// @dev EVM selector for this function is: 0x95d89b41,843	///  or in textual repr: symbol()844	function symbol() public view returns (string memory) {845		require(false, stub_error);846		dummy;847		return "";848	}849850	/// @notice A description for the collection.851	/// @dev EVM selector for this function is: 0x7284e416,852	///  or in textual repr: description()853	function description() public view returns (string memory) {854		require(false, stub_error);855		dummy;856		return "";857	}858859	/// Returns the owner (in cross format) of the token.860	///861	/// @param tokenId Id for the token.862	/// @dev EVM selector for this function is: 0x2b29dace,863	///  or in textual repr: crossOwnerOf(uint256)864	function crossOwnerOf(uint256 tokenId) public view returns (EthCrossAccount memory) {865		require(false, stub_error);866		tokenId;867		dummy;868		return EthCrossAccount(0x0000000000000000000000000000000000000000, 0);869	}870871	/// Returns the token properties.872	///873	/// @param tokenId Id for the token.874	/// @param keys Properties keys. Empty keys for all propertyes.875	/// @return Vector of properties key/value pairs.876	/// @dev EVM selector for this function is: 0xe07ede7e,877	///  or in textual repr: properties(uint256,string[])878	function properties(uint256 tokenId, string[] memory keys) public view returns (Property[] memory) {879		require(false, stub_error);880		tokenId;881		keys;882		dummy;883		return new Property[](0);884	}885886	/// @notice Transfer ownership of an RFT887	/// @dev Throws unless `msg.sender` is the current owner. Throws if `to`888	///  is the zero address. Throws if `tokenId` is not a valid RFT.889	///  Throws if RFT pieces have multiple owners.890	/// @param to The new owner891	/// @param tokenId The RFT to transfer892	/// @dev EVM selector for this function is: 0xa9059cbb,893	///  or in textual repr: transfer(address,uint256)894	function transfer(address to, uint256 tokenId) public {895		require(false, stub_error);896		to;897		tokenId;898		dummy = 0;899	}900901	/// @notice Transfer ownership of an RFT902	/// @dev Throws unless `msg.sender` is the current owner. Throws if `to`903	///  is the zero address. Throws if `tokenId` is not a valid RFT.904	///  Throws if RFT pieces have multiple owners.905	/// @param to The new owner906	/// @param tokenId The RFT to transfer907	/// @dev EVM selector for this function is: 0x2ada85ff,908	///  or in textual repr: transferCross((address,uint256),uint256)909	function transferCross(EthCrossAccount memory to, uint256 tokenId) public {910		require(false, stub_error);911		to;912		tokenId;913		dummy = 0;914	}915916	/// @notice Transfer ownership of an RFT917	/// @dev Throws unless `msg.sender` is the current owner. Throws if `to`918	///  is the zero address. Throws if `tokenId` is not a valid RFT.919	///  Throws if RFT pieces have multiple owners.920	/// @param to The new owner921	/// @param tokenId The RFT to transfer922	/// @dev EVM selector for this function is: 0xd5cf430b,923	///  or in textual repr: transferFromCross((address,uint256),(address,uint256),uint256)924	function transferFromCross(925		EthCrossAccount memory from,926		EthCrossAccount memory to,927		uint256 tokenId928	) public {929		require(false, stub_error);930		from;931		to;932		tokenId;933		dummy = 0;934	}935936	// /// @notice Burns a specific ERC721 token.937	// /// @dev Throws unless `msg.sender` is the current owner or an authorized938	// ///  operator for this RFT. Throws if `from` is not the current owner. Throws939	// ///  if `to` is the zero address. Throws if `tokenId` is not a valid RFT.940	// ///  Throws if RFT pieces have multiple owners.941	// /// @param from The current owner of the RFT942	// /// @param tokenId The RFT to transfer943	// /// @dev EVM selector for this function is: 0x79cc6790,944	// ///  or in textual repr: burnFrom(address,uint256)945	// function burnFrom(address from, uint256 tokenId) public {946	// 	require(false, stub_error);947	// 	from;948	// 	tokenId;949	// 	dummy = 0;950	// }951952	/// @notice Burns a specific ERC721 token.953	/// @dev Throws unless `msg.sender` is the current owner or an authorized954	///  operator for this RFT. Throws if `from` is not the current owner. Throws955	///  if `to` is the zero address. Throws if `tokenId` is not a valid RFT.956	///  Throws if RFT pieces have multiple owners.957	/// @param from The current owner of the RFT958	/// @param tokenId The RFT to transfer959	/// @dev EVM selector for this function is: 0xbb2f5a58,960	///  or in textual repr: burnFromCross((address,uint256),uint256)961	function burnFromCross(EthCrossAccount memory from, uint256 tokenId) public {962		require(false, stub_error);963		from;964		tokenId;965		dummy = 0;966	}967968	/// @notice Returns next free RFT ID.969	/// @dev EVM selector for this function is: 0x75794a3c,970	///  or in textual repr: nextTokenId()971	function nextTokenId() public view returns (uint256) {972		require(false, stub_error);973		dummy;974		return 0;975	}976977	// /// @notice Function to mint multiple tokens.978	// /// @dev `tokenIds` should be an array of consecutive numbers and first number979	// ///  should be obtained with `nextTokenId` method980	// /// @param to The new owner981	// /// @param tokenIds IDs of the minted RFTs982	// /// @dev EVM selector for this function is: 0x44a9945e,983	// ///  or in textual repr: mintBulk(address,uint256[])984	// function mintBulk(address to, uint256[] memory tokenIds) public returns (bool) {985	// 	require(false, stub_error);986	// 	to;987	// 	tokenIds;988	// 	dummy = 0;989	// 	return false;990	// }991992	// /// @notice Function to mint multiple tokens with the given tokenUris.993	// /// @dev `tokenIds` is array of pairs of token ID and token URI. Token IDs should be consecutive994	// ///  numbers and first number should be obtained with `nextTokenId` method995	// /// @param to The new owner996	// /// @param tokens array of pairs of token ID and token URI for minted tokens997	// /// @dev EVM selector for this function is: 0x36543006,998	// ///  or in textual repr: mintBulkWithTokenURI(address,(uint256,string)[])999	// function mintBulkWithTokenURI(address to, Tuple14[] memory tokens) public returns (bool) {1000	// 	require(false, stub_error);1001	// 	to;1002	// 	tokens;1003	// 	dummy = 0;1004	// 	return false;1005	// }10061007	/// @notice Function to a mint token.1008	/// @param to The new owner crossAccountId1009	/// @param properties Properties of minted token1010	/// @return uint256 The id of the newly minted token1011	/// @dev EVM selector for this function is: 0xb904db03,1012	///  or in textual repr: mintCross((address,uint256),(string,bytes)[])1013	function mintCross(EthCrossAccount memory to, Property[] memory properties) public returns (uint256) {1014		require(false, stub_error);1015		to;1016		properties;1017		dummy = 0;1018		return 0;1019	}10201021	/// Returns EVM address for refungible token1022	///1023	/// @param token ID of the token1024	/// @dev EVM selector for this function is: 0xab76fac6,1025	///  or in textual repr: tokenContractAddress(uint256)1026	function tokenContractAddress(uint256 token) public view returns (address) {1027		require(false, stub_error);1028		token;1029		dummy;1030		return 0x0000000000000000000000000000000000000000;1031	}1032}10331034/// @dev anonymous struct1035struct Tuple14 {1036	uint256 field_0;1037	string field_1;1038}10391040/// @title ERC-721 Non-Fungible Token Standard, optional enumeration extension1041/// @dev See https://eips.ethereum.org/EIPS/eip-7211042/// @dev the ERC-165 identifier for this interface is 0x780e9d631043contract ERC721Enumerable is Dummy, ERC165 {1044	/// @notice Enumerate valid RFTs1045	/// @param index A counter less than `totalSupply()`1046	/// @return The token identifier for the `index`th NFT,1047	///  (sort order not specified)1048	/// @dev EVM selector for this function is: 0x4f6ccce7,1049	///  or in textual repr: tokenByIndex(uint256)1050	function tokenByIndex(uint256 index) public view returns (uint256) {1051		require(false, stub_error);1052		index;1053		dummy;1054		return 0;1055	}10561057	/// Not implemented1058	/// @dev EVM selector for this function is: 0x2f745c59,1059	///  or in textual repr: tokenOfOwnerByIndex(address,uint256)1060	function tokenOfOwnerByIndex(address owner, uint256 index) public view returns (uint256) {1061		require(false, stub_error);1062		owner;1063		index;1064		dummy;1065		return 0;1066	}10671068	/// @notice Count RFTs tracked by this contract1069	/// @return A count of valid RFTs tracked by this contract, where each one of1070	///  them has an assigned and queryable owner not equal to the zero address1071	/// @dev EVM selector for this function is: 0x18160ddd,1072	///  or in textual repr: totalSupply()1073	function totalSupply() public view returns (uint256) {1074		require(false, stub_error);1075		dummy;1076		return 0;1077	}1078}10791080/// @dev inlined interface1081contract ERC721Events {1082	event Transfer(address indexed from, address indexed to, uint256 indexed tokenId);1083	event Approval(address indexed owner, address indexed approved, uint256 indexed tokenId);1084	event ApprovalForAll(address indexed owner, address indexed operator, bool approved);1085}10861087/// @title ERC-721 Non-Fungible Token Standard1088/// @dev See https://github.com/ethereum/EIPs/blob/master/EIPS/eip-721.md1089/// @dev the ERC-165 identifier for this interface is 0x4016cd871090contract ERC721 is Dummy, ERC165, ERC721Events {1091	/// @notice Count all RFTs assigned to an owner1092	/// @dev RFTs assigned to the zero address are considered invalid, and this1093	///  function throws for queries about the zero address.1094	/// @param owner An address for whom to query the balance1095	/// @return The number of RFTs owned by `owner`, possibly zero1096	/// @dev EVM selector for this function is: 0x70a08231,1097	///  or in textual repr: balanceOf(address)1098	function balanceOf(address owner) public view returns (uint256) {1099		require(false, stub_error);1100		owner;1101		dummy;1102		return 0;1103	}11041105	/// @notice Find the owner of an RFT1106	/// @dev RFTs assigned to zero address are considered invalid, and queries1107	///  about them do throw.1108	///  Returns special 0xffffffffffffffffffffffffffffffffffffffff address for1109	///  the tokens that are partially owned.1110	/// @param tokenId The identifier for an RFT1111	/// @return The address of the owner of the RFT1112	/// @dev EVM selector for this function is: 0x6352211e,1113	///  or in textual repr: ownerOf(uint256)1114	function ownerOf(uint256 tokenId) public view returns (address) {1115		require(false, stub_error);1116		tokenId;1117		dummy;1118		return 0x0000000000000000000000000000000000000000;1119	}11201121	/// @dev Not implemented1122	/// @dev EVM selector for this function is: 0x60a11672,1123	///  or in textual repr: safeTransferFromWithData(address,address,uint256,bytes)1124	function safeTransferFromWithData(1125		address from,1126		address to,1127		uint256 tokenId,1128		bytes memory data1129	) public {1130		require(false, stub_error);1131		from;1132		to;1133		tokenId;1134		data;1135		dummy = 0;1136	}11371138	/// @dev Not implemented1139	/// @dev EVM selector for this function is: 0x42842e0e,1140	///  or in textual repr: safeTransferFrom(address,address,uint256)1141	function safeTransferFrom(1142		address from,1143		address to,1144		uint256 tokenId1145	) public {1146		require(false, stub_error);1147		from;1148		to;1149		tokenId;1150		dummy = 0;1151	}11521153	/// @notice Transfer ownership of an RFT -- THE CALLER IS RESPONSIBLE1154	///  TO CONFIRM THAT `to` IS CAPABLE OF RECEIVING NFTS OR ELSE1155	///  THEY MAY BE PERMANENTLY LOST1156	/// @dev Throws unless `msg.sender` is the current owner or an authorized1157	///  operator for this RFT. Throws if `from` is not the current owner. Throws1158	///  if `to` is the zero address. Throws if `tokenId` is not a valid RFT.1159	///  Throws if RFT pieces have multiple owners.1160	/// @param from The current owner of the NFT1161	/// @param to The new owner1162	/// @param tokenId The NFT to transfer1163	/// @dev EVM selector for this function is: 0x23b872dd,1164	///  or in textual repr: transferFrom(address,address,uint256)1165	function transferFrom(1166		address from,1167		address to,1168		uint256 tokenId1169	) public {1170		require(false, stub_error);1171		from;1172		to;1173		tokenId;1174		dummy = 0;1175	}11761177	/// @dev Not implemented1178	/// @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	/// @notice Sets or unsets the approval of a given operator.1188	///  The `operator` is allowed to transfer all token pieces of the `caller` on their behalf.1189	/// @param operator Operator1190	/// @param approved Should operator status be granted or revoked?1191	/// @dev EVM selector for this function is: 0xa22cb465,1192	///  or in textual repr: setApprovalForAll(address,bool)1193	function setApprovalForAll(address operator, bool approved) public {1194		require(false, stub_error);1195		operator;1196		approved;1197		dummy = 0;1198	}11991200	/// @dev Not implemented1201	/// @dev EVM selector for this function is: 0x081812fc,1202	///  or in textual repr: getApproved(uint256)1203	function getApproved(uint256 tokenId) public view returns (address) {1204		require(false, stub_error);1205		tokenId;1206		dummy;1207		return 0x0000000000000000000000000000000000000000;1208	}12091210	/// @notice Tells whether the given `owner` approves the `operator`.1211	/// @dev EVM selector for this function is: 0xe985e9c5,1212	///  or in textual repr: isApprovedForAll(address,address)1213	function isApprovedForAll(address owner, address operator) public view returns (bool) {1214		require(false, stub_error);1215		owner;1216		operator;1217		dummy;1218		return false;1219	}12201221	/// @notice Returns collection helper contract address1222	/// @dev EVM selector for this function is: 0x1896cce6,1223	///  or in textual repr: collectionHelperAddress()1224	function collectionHelperAddress() public view returns (address) {1225		require(false, stub_error);1226		dummy;1227		return 0x0000000000000000000000000000000000000000;1228	}1229}12301231contract UniqueRefungible is1232	Dummy,1233	ERC165,1234	ERC721,1235	ERC721Enumerable,1236	ERC721UniqueExtensions,1237	ERC721UniqueMintable,1238	ERC721Burnable,1239	ERC721Metadata,1240	Collection,1241	TokenProperties1242{}
modifiedtests/src/eth/abi/nonFungible.jsondiffbeforeafterboth
--- a/tests/src/eth/abi/nonFungible.json
+++ b/tests/src/eth/abi/nonFungible.json
@@ -770,12 +770,20 @@
               },
               { "internalType": "bool", "name": "field_1", "type": "bool" }
             ],
+<<<<<<< HEAD
             "internalType": "struct Tuple57[]",
+=======
+            "internalType": "struct Tuple54[]",
+>>>>>>> 9e929f90... chore: generate stubs & types
             "name": "field_1",
             "type": "tuple[]"
           }
         ],
+<<<<<<< HEAD
         "internalType": "struct Tuple59[]",
+=======
+        "internalType": "struct Tuple56[]",
+>>>>>>> 9e929f90... chore: generate stubs & types
         "name": "permissions",
         "type": "tuple[]"
       }
@@ -836,12 +844,20 @@
               },
               { "internalType": "bool", "name": "field_1", "type": "bool" }
             ],
+<<<<<<< HEAD
             "internalType": "struct Tuple57[]",
+=======
+            "internalType": "struct Tuple54[]",
+>>>>>>> 9e929f90... chore: generate stubs & types
             "name": "field_1",
             "type": "tuple[]"
           }
         ],
+<<<<<<< HEAD
         "internalType": "struct Tuple59[]",
+=======
+        "internalType": "struct Tuple56[]",
+>>>>>>> 9e929f90... chore: generate stubs & types
         "name": "",
         "type": "tuple[]"
       }
modifiedtests/src/eth/abi/reFungible.jsondiffbeforeafterboth
--- a/tests/src/eth/abi/reFungible.json
+++ b/tests/src/eth/abi/reFungible.json
@@ -752,12 +752,20 @@
               },
               { "internalType": "bool", "name": "field_1", "type": "bool" }
             ],
+<<<<<<< HEAD
             "internalType": "struct Tuple56[]",
+=======
+            "internalType": "struct Tuple53[]",
+>>>>>>> 9e929f90... chore: generate stubs & types
             "name": "field_1",
             "type": "tuple[]"
           }
         ],
+<<<<<<< HEAD
         "internalType": "struct Tuple58[]",
+=======
+        "internalType": "struct Tuple55[]",
+>>>>>>> 9e929f90... chore: generate stubs & types
         "name": "permissions",
         "type": "tuple[]"
       }
@@ -827,12 +835,20 @@
               },
               { "internalType": "bool", "name": "field_1", "type": "bool" }
             ],
+<<<<<<< HEAD
             "internalType": "struct Tuple56[]",
+=======
+            "internalType": "struct Tuple53[]",
+>>>>>>> 9e929f90... chore: generate stubs & types
             "name": "field_1",
             "type": "tuple[]"
           }
         ],
+<<<<<<< HEAD
         "internalType": "struct Tuple58[]",
+=======
+        "internalType": "struct Tuple55[]",
+>>>>>>> 9e929f90... chore: generate stubs & types
         "name": "",
         "type": "tuple[]"
       }
modifiedtests/src/eth/api/UniqueNFT.soldiffbeforeafterboth
--- a/tests/src/eth/api/UniqueNFT.sol
+++ b/tests/src/eth/api/UniqueNFT.sol
@@ -30,12 +30,20 @@
 	/// @param permissions Permissions for keys.
 	/// @dev EVM selector for this function is: 0xbd92983a,
 	///  or in textual repr: setTokenPropertyPermissions((string,(uint8,bool)[])[])
+<<<<<<< HEAD
 	function setTokenPropertyPermissions(Tuple52[] memory permissions) external;
+=======
+	function setTokenPropertyPermissions(Tuple49[] memory permissions) external;
+>>>>>>> 9e929f90... chore: generate stubs & types
 
 	/// @notice Get permissions for token properties.
 	/// @dev EVM selector for this function is: 0xf23d7790,
 	///  or in textual repr: tokenPropertyPermissions()
+<<<<<<< HEAD
 	function tokenPropertyPermissions() external view returns (Tuple52[] memory);
+=======
+	function tokenPropertyPermissions() external view returns (Tuple49[] memory);
+>>>>>>> 9e929f90... chore: generate stubs & types
 
 	// /// @notice Set token property value.
 	// /// @dev Throws error if `msg.sender` has no permission to edit the property.
@@ -97,6 +105,7 @@
 }
 
 /// @dev anonymous struct
+<<<<<<< HEAD
 struct Tuple52 {
 	string field_0;
 	Tuple50[] field_1;
@@ -104,6 +113,15 @@
 
 /// @dev anonymous struct
 struct Tuple50 {
+=======
+struct Tuple49 {
+	string field_0;
+	Tuple47[] field_1;
+}
+
+/// @dev anonymous struct
+struct Tuple47 {
+>>>>>>> 9e929f90... chore: generate stubs & types
 	EthTokenPermissions field_0;
 	bool field_1;
 }
modifiedtests/src/eth/api/UniqueRefungible.soldiffbeforeafterboth
--- a/tests/src/eth/api/UniqueRefungible.sol
+++ b/tests/src/eth/api/UniqueRefungible.sol
@@ -30,12 +30,20 @@
 	/// @param permissions Permissions for keys.
 	/// @dev EVM selector for this function is: 0xbd92983a,
 	///  or in textual repr: setTokenPropertyPermissions((string,(uint8,bool)[])[])
+<<<<<<< HEAD
 	function setTokenPropertyPermissions(Tuple51[] memory permissions) external;
+=======
+	function setTokenPropertyPermissions(Tuple48[] memory permissions) external;
+>>>>>>> 9e929f90... chore: generate stubs & types
 
 	/// @notice Get permissions for token properties.
 	/// @dev EVM selector for this function is: 0xf23d7790,
 	///  or in textual repr: tokenPropertyPermissions()
+<<<<<<< HEAD
 	function tokenPropertyPermissions() external view returns (Tuple51[] memory);
+=======
+	function tokenPropertyPermissions() external view returns (Tuple48[] memory);
+>>>>>>> 9e929f90... chore: generate stubs & types
 
 	// /// @notice Set token property value.
 	// /// @dev Throws error if `msg.sender` has no permission to edit the property.
@@ -97,6 +105,7 @@
 }
 
 /// @dev anonymous struct
+<<<<<<< HEAD
 struct Tuple51 {
 	string field_0;
 	Tuple49[] field_1;
@@ -104,6 +113,15 @@
 
 /// @dev anonymous struct
 struct Tuple49 {
+=======
+struct Tuple48 {
+	string field_0;
+	Tuple46[] field_1;
+}
+
+/// @dev anonymous struct
+struct Tuple46 {
+>>>>>>> 9e929f90... chore: generate stubs & types
 	EthTokenPermissions field_0;
 	bool field_1;
 }
modifiedtests/src/interfaces/augment-api-consts.tsdiffbeforeafterboth
--- a/tests/src/interfaces/augment-api-consts.ts
+++ b/tests/src/interfaces/augment-api-consts.ts
@@ -83,7 +83,7 @@
       dayRelayBlocks: u32 & AugmentedConst<ApiType>;
       defaultMinGasPrice: u64 & AugmentedConst<ApiType>;
       defaultWeightToFeeCoefficient: u32 & AugmentedConst<ApiType>;
-      maxOverridedAllowedLocations: u32 & AugmentedConst<ApiType>;
+      maxXcmAllowedLocations: u32 & AugmentedConst<ApiType>;
       /**
        * Generic const
        **/